From 1ce24a70417dcec8fb7f0e24d05baeb2f47d4493 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 26 Apr 2023 16:38:13 +1000
Subject: [PATCH 001/478] [VERSION-1.9.0-SNAPSHOT] Bump to version
 1.9.0-SNAPSHOT

---
 core/gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/gradle.properties b/core/gradle.properties
index 1ec3049866..bbebc1c830 100644
--- a/core/gradle.properties
+++ b/core/gradle.properties
@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=1.8.0-SNAPSHOT
-VERSION_CODE=280
+VERSION_NAME=1.9.0-SNAPSHOT
+VERSION_CODE=290
 
 GROUP=org.hisp.dhis
 

From 5c98af5330c7382449e1ad7b307b6c55ff33c368 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 26 Apr 2023 16:38:37 +1000
Subject: [PATCH 002/478] [VERSION-1.9.0-SNAPSHOT] Accept connections to
 version 2.41

---
 .../hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt    | 4 +++-
 .../org/hisp/dhis/android/core/systeminfo/DHISVersion.kt     | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt
index 7e3626a16f..c51b18e69d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt
@@ -66,7 +66,9 @@ enum class DHISPatchVersion(val majorVersion: DHISVersion, val strValue: String,
 
     V2_39_0(DHISVersion.V2_39, "2.39.0", SMSVersion.V2),
 
-    V2_40_0(DHISVersion.V2_40, "2.40.0", SMSVersion.V2);
+    V2_40_0(DHISVersion.V2_40, "2.40.0", SMSVersion.V2),
+
+    V2_41_0(DHISVersion.V2_41, "2.41.0", SMSVersion.V2);
 
     companion object {
         @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
index 816f3979e3..df8227126b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
@@ -39,7 +39,8 @@ enum class DHISVersion(internal val prefix: String) {
     V2_37("2.37"),
     V2_38("2.38"),
     V2_39("2.39"),
-    V2_40("2.40");
+    V2_40("2.40"),
+    V2_41("2.41");
 
     companion object {
         @JvmStatic
@@ -54,7 +55,7 @@ enum class DHISVersion(internal val prefix: String) {
 
         @JvmStatic
         fun allowedVersionsAsStr(): Array<String> {
-            return listOf(V2_30, V2_31, V2_32, V2_33, V2_34, V2_35, V2_36, V2_37, V2_38, V2_39, V2_40)
+            return listOf(V2_30, V2_31, V2_32, V2_33, V2_34, V2_35, V2_36, V2_37, V2_38, V2_39, V2_40, V2_41)
                 .map { it.prefix }
                 .toTypedArray()
         }

From c4ec3da70fcbb3e805cfa9e64d34411eaa70a1fd Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 9 May 2023 15:48:50 +1000
Subject: [PATCH 003/478] [ANDROSDK-1676] Implement AggregatedDataCall using
 coroutines

---
 ...aValueEndpointCallRealIntegrationShould.kt |  37 +++--
 ...AggregatedDataCallMockIntegrationShould.kt |   5 +
 .../api/executors/internal/APIDownloader.kt   |   4 +
 .../executors/internal/APIDownloaderImpl.kt   |   5 +
 .../arch/call/factories/internal/QueryCall.kt |   7 +-
 .../dataapproval/internal/DataApprovalCall.kt |  34 ++--
 .../internal/DataApprovalQuery.kt}            |  47 ++----
 ...valService.java => DataApprovalService.kt} |  37 ++---
 .../DataSetCompleteRegistrationCall.kt        |  39 +++--
 ...ataSetCompleteRegistrationCallProcessor.kt |   4 +-
 .../DataSetCompleteRegistrationQuery.kt}      |  50 ++----
 .../DataSetCompleteRegistrationService.kt     |   5 +-
 .../core/datavalue/internal/DataValueCall.kt  |  28 ++--
 ...{DataValueQuery.java => DataValueQuery.kt} |  25 ++-
 .../datavalue/internal/DataValueService.kt    |  17 +-
 .../data/internal/AggregatedDataCall.kt       | 151 ++++++++++--------
 .../internal/AggregatedDataDownloaderImpl.kt  |   3 +-
 17 files changed, 233 insertions(+), 265 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/DataSetCompleteRegistrationQuery.java => dataapproval/internal/DataApprovalQuery.kt} (61%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/{DataApprovalService.java => DataApprovalService.kt} (73%)
 rename core/src/main/java/org/hisp/dhis/android/core/{dataapproval/internal/DataApprovalQuery.java => dataset/internal/DataSetCompleteRegistrationQuery.kt} (58%)
 rename core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/{DataValueQuery.java => DataValueQuery.kt} (79%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
index 14a7f75adc..a0222dda4a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl
@@ -46,7 +46,24 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
      * metadataSyncCall. It works against the demo server.
      */
 
-    private fun download(): Single<List<DataValue>> {
+    // @Test
+    @Throws(Exception::class)
+    fun download_data_values() {
+        runBlocking {
+            if (!d2.userModule().isLogged().blockingGet()) {
+                d2.userModule().logIn(username, password, url).blockingGet()
+            }
+
+            /*  This test won't pass independently of the sync of metadata, as the foreign keys
+                constraints won't be satisfied.
+                To run the test, you will need to disable foreign key support in database in
+                DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
+                uncomment the @Test tag */
+            download()
+        }
+    }
+
+    private suspend fun download(): List<DataValue> {
         val dataValueHandler: Handler<DataValue> = ObjectWithoutUidHandlerImpl(
             DataValueStore.create(d2.databaseAdapter())
         )
@@ -71,20 +88,6 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
         val dataValueService = d2.retrofit().create(DataValueService::class.java)
 
         return DataValueCall(dataValueService, dataValueHandler, apiDownloader)
-            .download(DataValueQuery.create(bundle))
-    }
-
-    // @Test
-    @Throws(Exception::class)
-    fun download_data_values() {
-        if (!d2.userModule().isLogged().blockingGet()) {
-            d2.userModule().logIn(username, password, url).blockingGet()
-        }
-
-        /*  This test won't pass independently of the sync of metadata, as the foreign keys
-            constraints won't be satisfied.
-            To run the test, you will need to disable foreign key support in database in
-            DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
-            uncomment the @Test tag */download().blockingGet()
+            .download(DataValueQuery(bundle))
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt
index ffb6f94924..2a9f5e24dc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt
@@ -28,14 +28,19 @@
 package org.hisp.dhis.android.core.domain.aggregated.data
 
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataDispatcher
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
+import org.junit.runner.RunWith
 
+@RunWith(D2JunitRunner::class)
 class AggregatedDataCallMockIntegrationShould : BaseMockIntegrationTestMetadataDispatcher() {
 
     @Test
     fun emit_progress() {
         val testObserver = d2.aggregatedModule().data().download().test()
 
+        testObserver.awaitTerminalEvent()
+
         testObserver.assertValueCount(3)
 
         testObserver.assertValueAt(0) { v: AggregatedD2Progress ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index be42f57b5f..31eed8ab08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -34,6 +34,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.resource.internal.Resource
 
+@Suppress("TooManyFunctions")
 internal interface APIDownloader {
     fun <P> downloadPartitioned(
         uids: Set<String>,
@@ -78,6 +79,9 @@ internal interface APIDownloader {
 
     fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>>
     fun <P> downloadList(handler: Handler<P>, downloader: Single<List<P>>): Single<List<P>>
+
+    suspend fun <P> downloadListAsCoroutine(handler: Handler<P>, downloader: suspend () -> List<P>): List<P>
+
     fun <P> downloadObject(handler: Handler<P>, downloader: Single<P>): Single<P>
 
     fun <P> downloadPagedPayload(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 92cd5058d0..89d985af1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -180,6 +180,11 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
             .doOnSuccess { oCollection: List<P> -> handler.handleMany(oCollection) }
     }
 
+    override suspend fun <P> downloadListAsCoroutine(handler: Handler<P>, downloader: suspend () -> List<P>): List<P> {
+        return downloader.invoke()
+            .also { handler.handleMany(it) }
+    }
+
     override fun <P> downloadObject(handler: Handler<P>, downloader: Single<P>): Single<P> {
         return downloader
             .doOnSuccess { o: P -> handler.handle(o) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt
index 77ac540ca8..09eb40b01b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt
@@ -27,9 +27,8 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
-interface QueryCall<P, Q : BaseQuery> {
-    fun download(query: Q): Single<List<P>>
+internal interface QueryCall<P, Q : BaseQueryKt> {
+    suspend fun download(query: Q): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
index 9d4c94d113..c3180c3609 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
@@ -28,9 +28,6 @@
 package org.hisp.dhis.android.core.dataapproval.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.Single
-import java.util.ArrayList
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
@@ -54,26 +51,25 @@ internal class DataApprovalCall @Inject constructor(
     }
 
     @Suppress("MagicNumber")
-    override fun download(query: DataApprovalQuery): Single<List<DataApproval>> {
+    override suspend fun download(query: DataApprovalQuery): List<DataApproval> {
         val partitions = multiDimensionalPartitioner.partitionForSize(
             QUERY_WITHOUT_UIDS_LENGTH,
-            query.workflowsUids(),
-            query.periodIds(),
-            query.organisationUnistUids(),
-            query.attributeOptionCombosUids()
+            query.workflowsUids,
+            query.periodIds,
+            query.organisationUnistUids,
+            query.attributeOptionCombosUids
         )
-        return Observable.fromIterable(partitions).flatMapSingle { part ->
-            apiDownloader.downloadList(
-                handler,
+        return partitions.fold(emptyList()) { acc, part ->
+            acc + apiDownloader.downloadListAsCoroutine(handler) {
                 service.getDataApprovals(
-                    DataApprovalFields.allFields,
-                    query.lastUpdatedStr(),
-                    commaSeparatedCollectionValues(part[0]),
-                    commaSeparatedCollectionValues(part[1]),
-                    commaSeparatedCollectionValues(part[2]),
-                    commaSeparatedCollectionValues(part[3])
+                    fields = DataApprovalFields.allFields,
+                    lastUpdated = query.lastUpdatedStr,
+                    workflow = commaSeparatedCollectionValues(part[0]),
+                    periods = commaSeparatedCollectionValues(part[1]),
+                    organisationUnit = commaSeparatedCollectionValues(part[2]),
+                    attributeOptionCombo = commaSeparatedCollectionValues(part[3])
                 )
-            )
-        }.reduce(ArrayList(), { t1, t2 -> t1 + t2 })
+            }
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt
index c484aa2fd2..7ee945c5fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt
@@ -25,35 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import androidx.annotation.Nullable;
-
-import com.google.auto.value.AutoValue;
-
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-
-import java.util.Collection;
-
-@AutoValue
-public abstract class DataSetCompleteRegistrationQuery extends BaseQuery {
-
-    public abstract Collection<String> dataSetUids();
-
-    public abstract Collection<String> periodIds();
-
-    public abstract Collection<String> rootOrgUnitUids();
-
-    @Nullable
-    public abstract String lastUpdatedStr();
-
-    public static DataSetCompleteRegistrationQuery create(Collection<String> dataSetUids,
-                                                          Collection<String> periodIds,
-                                                          Collection<String> rootOrgUnitUids,
-                                                          String lastUpdatedStr) {
-
-        return new AutoValue_DataSetCompleteRegistrationQuery(1, BaseQuery.DEFAULT_PAGE_SIZE,
-                false, dataSetUids, periodIds, rootOrgUnitUids, lastUpdatedStr);
-    }
-}
+package org.hisp.dhis.android.core.dataapproval.internal
+
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
+
+internal data class DataApprovalQuery(
+    val workflowsUids: Collection<String>,
+    val organisationUnistUids: Collection<String>,
+    val periodIds: Collection<String>,
+    val attributeOptionCombosUids: Collection<String>,
+    val lastUpdatedStr: String?
+) : BaseQueryKt(
+    page = 1,
+    pageSize = DEFAULT_PAGE_SIZE,
+    paging = false
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt
index 3e5c13dd21..078b76d306 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt
@@ -25,28 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataapproval.internal
 
-package org.hisp.dhis.android.core.dataapproval.internal;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.dataapproval.DataApproval;
-
-import java.util.List;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface DataApprovalService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.dataapproval.DataApproval
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+@Suppress("LongParameterList")
+internal interface DataApprovalService {
     @GET("dataApprovals/multiple")
-    Single<List<DataApproval>> getDataApprovals(
-            @Query("fields") @Which Fields<DataApproval> fields,
-            @Query("lastUpdated") String lastUpdated,
-            @Query("wf") String workflow,
-            @Query("pe") String periods,
-            @Query("ou") String organisationUnit,
-            @Query("aoc") String attributeOptionCombo
-    );
+    suspend fun getDataApprovals(
+        @Query("fields") @Which fields: Fields<DataApproval>,
+        @Query("lastUpdated") lastUpdated: String?,
+        @Query("wf") workflow: String,
+        @Query("pe") periods: String,
+        @Query("ou") organisationUnit: String,
+        @Query("aoc") attributeOptionCombo: String
+    ): List<DataApproval>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
index fe77ff72e9..eba26d83e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
@@ -28,9 +28,6 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.Single
-import java.util.ArrayList
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
@@ -51,29 +48,29 @@ internal class DataSetCompleteRegistrationCall @Inject constructor(
             ).length
     }
 
-    override fun download(query: DataSetCompleteRegistrationQuery): Single<List<DataSetCompleteRegistration>> {
-        return downloadInternal(query).doOnSuccess { registrations -> processor.process(registrations, query) }
+    override suspend fun download(query: DataSetCompleteRegistrationQuery): List<DataSetCompleteRegistration> {
+        return downloadInternal(query)
+            .also { processor.process(it, query) }
     }
 
-    private fun downloadInternal(query: DataSetCompleteRegistrationQuery): Single<List<DataSetCompleteRegistration>> {
+    private suspend fun downloadInternal(query: DataSetCompleteRegistrationQuery): List<DataSetCompleteRegistration> {
         val partitions = multiDimensionalPartitioner.partitionForSize(
             QUERY_WITHOUT_UIDS_LENGTH,
-            query.dataSetUids(),
-            query.periodIds(),
-            query.rootOrgUnitUids()
+            query.dataSetUids,
+            query.periodIds,
+            query.rootOrgUnitUids
         )
 
-        return Observable.fromIterable(partitions).flatMapSingle { part ->
-            service.getDataSetCompleteRegistrations(
-                DataSetCompleteRegistrationFields.allFields,
-                query.lastUpdatedStr(),
-                commaSeparatedCollectionValues(part[0]),
-                commaSeparatedCollectionValues(part[1]),
-                commaSeparatedCollectionValues(part[2]),
-                true,
-                false
-            )
-        }.map { it.dataSetCompleteRegistrations }
-            .reduce(ArrayList(), { t1, t2 -> t1 + t2 })
+        return partitions.fold(emptyList()) { acc, part ->
+            acc + service.getDataSetCompleteRegistrations(
+                fields = DataSetCompleteRegistrationFields.allFields,
+                lastUpdated = query.lastUpdatedStr,
+                dataSetUids = commaSeparatedCollectionValues(part[0]),
+                periodIds = commaSeparatedCollectionValues(part[1]),
+                organisationUnitIds = commaSeparatedCollectionValues(part[2]),
+                children = true,
+                paging = false
+            ).dataSetCompleteRegistrations
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
index 40dd364d4e..8dd97129e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
@@ -55,9 +55,9 @@ internal class DataSetCompleteRegistrationCallProcessor @Inject internal constru
      linked to a particular query before storing the returned values. Only records in "SYNCED" state are removed.
      */
     private fun removeExistingRegistersForQuery(query: DataSetCompleteRegistrationQuery) {
-        for (rootOrgUnitUid in query.rootOrgUnitUids()) {
+        for (rootOrgUnitUid in query.rootOrgUnitUids) {
             dataSetCompleteRegistrationStore.removeNotPresentAndSynced(
-                query.dataSetUids(), query.periodIds(), rootOrgUnitUid
+                query.dataSetUids, query.periodIds, rootOrgUnitUid
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
index dac93403d3..ffe380d65d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
@@ -25,39 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataapproval.internal;
-
-import androidx.annotation.Nullable;
-
-import com.google.auto.value.AutoValue;
-
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-
-import java.util.Collection;
-
-@AutoValue
-public abstract class DataApprovalQuery extends BaseQuery {
-
-    public abstract Collection<String> workflowsUids();
-
-    public abstract Collection<String> organisationUnistUids();
-
-    public abstract Collection<String> periodIds();
-
-    public abstract Collection<String> attributeOptionCombosUids();
-
-    @Nullable
-    public abstract String lastUpdatedStr();
-
-    public static DataApprovalQuery create(Collection<String> workflowsUids,
-                                           Collection<String> organisationUnitsUids,
-                                           Collection<String> periodIds,
-                                           Collection<String> attributeOptionCombosUids,
-                                           String lastUpdatedStr) {
-
-        return new AutoValue_DataApprovalQuery(1, BaseQuery.DEFAULT_PAGE_SIZE,
-                false, workflowsUids, organisationUnitsUids,
-                periodIds, attributeOptionCombosUids, lastUpdatedStr);
-    }
-}
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
+
+internal data class DataSetCompleteRegistrationQuery(
+    val dataSetUids: Collection<String>,
+    val periodIds: Collection<String>,
+    val rootOrgUnitUids: Collection<String>,
+    val lastUpdatedStr: String?,
+) : BaseQueryKt(
+    page = 1,
+    pageSize = DEFAULT_PAGE_SIZE,
+    paging = false
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
index ad681fdb05..2fcc5506fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.common.Unit
@@ -41,7 +40,7 @@ import retrofit2.http.*
 internal interface DataSetCompleteRegistrationService {
 
     @GET("completeDataSetRegistrations")
-    fun getDataSetCompleteRegistrations(
+    suspend fun getDataSetCompleteRegistrations(
         @Query("fields") @Which fields: Fields<DataSetCompleteRegistration>,
         @Query("lastUpdated") lastUpdated: String?,
         @Query("dataSet") dataSetUids: String,
@@ -49,7 +48,7 @@ internal interface DataSetCompleteRegistrationService {
         @Query("orgUnit") organisationUnitIds: String,
         @Query("children") children: Boolean,
         @Query("paging") paging: Boolean
-    ): Single<DataSetCompleteRegistrationPayload>
+    ): DataSetCompleteRegistrationPayload
 
     @POST("completeDataSetRegistrations")
     fun postDataSetCompleteRegistrations(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
index 3cb5dab715..6b5e8a1254 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
@@ -44,20 +43,19 @@ internal class DataValueCall @Inject constructor(
     private val apiDownloader: APIDownloader
 ) : QueryCall<DataValue, DataValueQuery> {
 
-    override fun download(query: DataValueQuery): Single<List<DataValue>> {
-        val b = query.bundle()
-        return apiDownloader.downloadList(
-            handler,
+    override suspend fun download(query: DataValueQuery): List<DataValue> {
+        val b = query.bundle
+        return apiDownloader.downloadListAsCoroutine(handler) {
             service.getDataValues(
-                DataValueFields.allFields,
-                b.key.lastUpdatedStr(),
-                commaSeparatedUids(b.dataSets),
-                commaSeparatedCollectionValues(b.periodIds),
-                commaSeparatedCollectionValues(b.rootOrganisationUnitUids),
-                true,
-                false,
-                true
-            ).map { it.dataValues }
-        )
+                fields = DataValueFields.allFields,
+                lastUpdated = b.key.lastUpdatedStr(),
+                dataSetUids = commaSeparatedUids(b.dataSets),
+                periodIds = commaSeparatedCollectionValues(b.periodIds),
+                orgUnitUids = commaSeparatedCollectionValues(b.rootOrganisationUnitUids),
+                children = true,
+                paging = false,
+                includeDeleted = true
+            ).dataValues
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.java
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt
index daa12dc4e8..06f71f8e43 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt
@@ -25,20 +25,15 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.datavalue.internal
 
-package org.hisp.dhis.android.core.datavalue.internal;
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
+import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataCallBundle
 
-import com.google.auto.value.AutoValue;
-
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataCallBundle;
-
-@AutoValue
-public abstract class DataValueQuery extends BaseQuery {
-    public abstract AggregatedDataCallBundle bundle();
-
-    public static DataValueQuery create(AggregatedDataCallBundle bundle) {
-        return new AutoValue_DataValueQuery(1, BaseQuery.DEFAULT_PAGE_SIZE, false,
-                bundle);
-    }
-}
+internal data class DataValueQuery(
+    val bundle: AggregatedDataCallBundle
+) : BaseQueryKt(
+    page = 1,
+    pageSize = DEFAULT_PAGE_SIZE,
+    paging = false
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
index bc17ae7398..9679d75550 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.datavalue.DataValue
@@ -43,16 +42,16 @@ import retrofit2.http.Query
 internal interface DataValueService {
 
     @GET("dataValueSets")
-    fun getDataValues(
-        @Query("fields") @Which fields: Fields<DataValue?>?,
+    suspend fun getDataValues(
+        @Query("fields") @Which fields: Fields<DataValue>,
         @Query("lastUpdated") lastUpdated: String?,
-        @Query("dataSet") dataSetUids: String?,
-        @Query("period") periodIds: String?,
-        @Query("orgUnit") orgUnitUids: String?,
-        @Query("children") children: Boolean?,
-        @Query("paging") paging: Boolean?,
+        @Query("dataSet") dataSetUids: String,
+        @Query("period") periodIds: String,
+        @Query("orgUnit") orgUnitUids: String,
+        @Query("children") children: Boolean,
+        @Query("paging") paging: Boolean,
         @Query("includeDeleted") includeDeleted: Boolean?
-    ): Single<DataValueSet>
+    ): DataValueSet
 
     @POST("dataValueSets")
     fun postDataValues(@Body dataValueSet: DataValueSet): Call<DataValueImportSummary>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index f47d9d36bf..ce6d74ed3e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -28,10 +28,13 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.Single
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.rx2.asFlow
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2ProgressSyncStatus
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
@@ -58,105 +61,117 @@ internal class AggregatedDataCall @Inject constructor(
     private val dsCompleteRegistrationCall: QueryCall<DataSetCompleteRegistration, DataSetCompleteRegistrationQuery>,
     private val dataApprovalCall: QueryCall<DataApproval, DataApprovalQuery>,
     private val categoryOptionComboStore: CategoryOptionComboStore,
-    private val rxCallExecutor: RxAPICallExecutor,
+    private val coroutineCallExecutor: CoroutineAPICallExecutor,
     private val aggregatedDataSyncStore: ObjectWithoutUidStore<AggregatedDataSync>,
     private val aggregatedDataCallBundleFactory: AggregatedDataCallBundleFactory,
     private val resourceHandler: ResourceHandler,
     private val hashHelper: AggregatedDataSyncHashHelper
 ) {
-    fun download(): Observable<AggregatedD2Progress> {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun download(): Flow<AggregatedD2Progress> {
         val progressManager = AggregatedD2ProgressManager(null)
         return systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
-            .switchMap { selectDataSetsAndDownload(progressManager) }
+            .asFlow()
+            .flatMapLatest { selectDataSetsAndDownload(progressManager) }
     }
 
     private fun selectDataSetsAndDownload(
         progressManager: AggregatedD2ProgressManager
-    ): Observable<AggregatedD2Progress> {
-        val bundles = aggregatedDataCallBundleFactory.bundles
-        val dataSets = bundles.flatMap { it.dataSets }.mapNotNull { it.uid() }
+    ): Flow<AggregatedD2Progress> {
+        return flow {
+            val bundles = aggregatedDataCallBundleFactory.bundles
+            val dataSets = bundles.flatMap { it.dataSets }.mapNotNull { it.uid() }
 
-        progressManager.setTotalCalls(dataSets.size + 1)
-        progressManager.setDataSets(dataSets)
+            progressManager.setTotalCalls(bundles.size + 2)
+            progressManager.setDataSets(dataSets)
+            emit(progressManager.getProgress())
 
-        return Observable.merge(
-            Observable.fromCallable { progressManager.setDataSets(dataSets) },
-            Observable.fromIterable(bundles).flatMap { downloadInternal(it, progressManager) },
-            Observable.fromCallable { progressManager.complete() }
-        )
+            for (bundle in bundles) {
+                downloadBundle(bundle)
+
+                bundle.dataSets.forEach {
+                    progressManager.completeDataSet(it.uid(), D2ProgressSyncStatus.SUCCESS)
+                    progressManager.increaseProgress(DataValue::class.java, false)
+                }
+
+                emit(progressManager.getProgress())
+            }
+            emit(progressManager.complete())
+        }
     }
 
-    private fun downloadInternal(
-        bundle: AggregatedDataCallBundle,
-        progressManager: AggregatedD2ProgressManager
-    ): Observable<AggregatedD2Progress> {
-        val dataValueQuery = DataValueQuery.create(bundle)
-
-        val completeRegistrationQuery = DataSetCompleteRegistrationQuery.create(
-            getUids(bundle.dataSets),
-            bundle.periodIds,
-            bundle.rootOrganisationUnitUids,
-            bundle.key.lastUpdatedStr()
-        )
+    private suspend fun downloadBundle(
+        bundle: AggregatedDataCallBundle
+    ) {
+        return coroutineCallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+            downloadDataValues(bundle)
+            downloadCompleteRegistration(bundle)
+            downloadApproval(bundle)
+            updateAggregatedDataSync(bundle)
+        }
+    }
 
-        val observable =
-            dataValueCall.download(dataValueQuery)
-                .flatMap { dsCompleteRegistrationCall.download(completeRegistrationQuery) }
-                .flatMap { getApprovalSingle(bundle) }
-                .flatMap { updateAggregatedDataSync(bundle) }
-                .map {
-                    bundle.dataSets.forEach {
-                        progressManager.completeDataSet(it.uid(), D2ProgressSyncStatus.SUCCESS)
-                        progressManager.increaseProgress(DataValue::class.java, false)
-                    }
-                    progressManager.getProgress()
-                }
-                .toObservable()
+    private suspend fun downloadDataValues(
+        bundle: AggregatedDataCallBundle
+    ): List<DataValue> {
+        val dataValueQuery = DataValueQuery(bundle)
+        return dataValueCall.download(dataValueQuery)
+    }
+
+    private suspend fun downloadCompleteRegistration(
+        bundle: AggregatedDataCallBundle
+    ): List<DataSetCompleteRegistration> {
+        val completeRegistrationQuery = DataSetCompleteRegistrationQuery(
+            dataSetUids = getUids(bundle.dataSets),
+            periodIds = bundle.periodIds,
+            rootOrgUnitUids = bundle.rootOrganisationUnitUids,
+            lastUpdatedStr = bundle.key.lastUpdatedStr()
+        )
 
-        return rxCallExecutor.wrapObservableTransactionally(observable, cleanForeignKeys = true)
+        return dsCompleteRegistrationCall.download(completeRegistrationQuery)
     }
 
     private fun updateAggregatedDataSync(
         bundle: AggregatedDataCallBundle
-    ): Single<Unit> {
-        return Single.fromCallable {
-            for (dataSet in bundle.dataSets) {
-                aggregatedDataSyncStore.updateOrInsertWhere(
-                    AggregatedDataSync.builder()
-                        .dataSet(dataSet.uid())
-                        .periodType(dataSet.periodType())
-                        .pastPeriods(bundle.key.pastPeriods)
-                        .futurePeriods(dataSet.openFuturePeriods())
-                        .dataElementsHash(hashHelper.getDataSetDataElementsHash(dataSet))
-                        .organisationUnitsHash(bundle.allOrganisationUnitUidsSet.hashCode())
-                        .lastUpdated(resourceHandler.serverDate)
-                        .build()
-                )
-            }
+    ) {
+        for (dataSet in bundle.dataSets) {
+            aggregatedDataSyncStore.updateOrInsertWhere(
+                AggregatedDataSync.builder()
+                    .dataSet(dataSet.uid())
+                    .periodType(dataSet.periodType())
+                    .pastPeriods(bundle.key.pastPeriods)
+                    .futurePeriods(dataSet.openFuturePeriods())
+                    .dataElementsHash(hashHelper.getDataSetDataElementsHash(dataSet))
+                    .organisationUnitsHash(bundle.allOrganisationUnitUidsSet.hashCode())
+                    .lastUpdated(resourceHandler.serverDate)
+                    .build()
+            )
         }
     }
 
-    private fun getApprovalSingle(
+    private suspend fun downloadApproval(
         bundle: AggregatedDataCallBundle
-    ): Single<List<DataApproval>> {
+    ): List<DataApproval> {
         val dataSetsWithWorkflow = bundle.dataSets.filter { it.workflow() != null }
-        val workflowUids = dataSetsWithWorkflow.map { it.workflow()!!.uid() }
+        val workflowUids = dataSetsWithWorkflow.mapNotNull { it.workflow()?.uid() }
 
         return if (workflowUids.isEmpty()) {
-            Single.just(emptyList())
+            emptyList()
         } else {
             val attributeOptionComboUids = getAttributeOptionCombosUidsFrom(dataSetsWithWorkflow)
-            val dataApprovalQuery = DataApprovalQuery.create(
-                workflowUids,
-                bundle.allOrganisationUnitUidsSet, bundle.periodIds, attributeOptionComboUids,
-                bundle.key.lastUpdatedStr()
+            val dataApprovalQuery = DataApprovalQuery(
+                workflowsUids = workflowUids,
+                organisationUnistUids = bundle.allOrganisationUnitUidsSet,
+                periodIds = bundle.periodIds,
+                attributeOptionCombosUids = attributeOptionComboUids,
+                lastUpdatedStr = bundle.key.lastUpdatedStr()
             )
             dataApprovalCall.download(dataApprovalQuery)
         }
     }
 
     private fun getAttributeOptionCombosUidsFrom(dataSetsWithWorkflow: Collection<DataSet>): Set<String> {
-        val categoryComboUids = dataSetsWithWorkflow.map { it.categoryCombo()!!.uid() }.toSet()
+        val categoryComboUids = dataSetsWithWorkflow.mapNotNull { it.categoryCombo()?.uid() }.toSet()
 
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
@@ -166,8 +181,4 @@ internal class AggregatedDataCall @Inject constructor(
 
         return categoryOptionComboStore.selectWhere(whereClause).map { it.uid() }.toSet()
     }
-
-    fun blockingDownload() {
-        download().blockingSubscribe()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
index 74e8b039ba..76bdf49f18 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
@@ -31,6 +31,7 @@ package org.hisp.dhis.android.core.domain.aggregated.data.internal
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
 
@@ -40,7 +41,7 @@ internal class AggregatedDataDownloaderImpl @Inject constructor(
 ) : AggregatedDataDownloader {
 
     override fun download(): Observable<AggregatedD2Progress> {
-        return dataCall.download()
+        return dataCall.download().asObservable()
     }
 
     override fun blockingDownload() {

From 416b5296cfc07787e6fddf3c3f2a07a5bb187e53 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 10 May 2023 11:38:42 +1000
Subject: [PATCH 004/478] [ANDROSDK-1676] Simplify partition methods

---
 .../android/core/dataapproval/internal/DataApprovalCall.kt    | 4 ++--
 .../core/dataset/internal/DataSetCompleteRegistrationCall.kt  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
index c3180c3609..fcb9d1ab92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
@@ -59,8 +59,8 @@ internal class DataApprovalCall @Inject constructor(
             query.organisationUnistUids,
             query.attributeOptionCombosUids
         )
-        return partitions.fold(emptyList()) { acc, part ->
-            acc + apiDownloader.downloadListAsCoroutine(handler) {
+        return partitions.flatMap { part ->
+            apiDownloader.downloadListAsCoroutine(handler) {
                 service.getDataApprovals(
                     fields = DataApprovalFields.allFields,
                     lastUpdated = query.lastUpdatedStr,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
index eba26d83e4..3a527982e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
@@ -61,8 +61,8 @@ internal class DataSetCompleteRegistrationCall @Inject constructor(
             query.rootOrgUnitUids
         )
 
-        return partitions.fold(emptyList()) { acc, part ->
-            acc + service.getDataSetCompleteRegistrations(
+        return partitions.flatMap { part ->
+            service.getDataSetCompleteRegistrations(
                 fields = DataSetCompleteRegistrationFields.allFields,
                 lastUpdated = query.lastUpdatedStr,
                 dataSetUids = commaSeparatedCollectionValues(part[0]),

From 3e103d322ecd9d36bde776a8595a71cb7c9cfe4d Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 12 May 2023 16:39:10 +1000
Subject: [PATCH 005/478] [ANDROSDK-1676] Add failing test for error in
 aggregatedDataCall

---
 ...dDataCallEnqueableMockIntegrationShould.kt | 66 +++++++++++++++++++
 ...AggregatedDataCallMockIntegrationShould.kt | 20 ++++--
 .../period/PeriodMockIntegrationShould.java   |  2 +-
 ...ectionRepositoryMockIntegrationShould.java | 10 +--
 ...llectionRepositoryMockIntegrationShould.kt | 11 ++--
 ...llectionRepositoryMockIntegrationShould.kt | 14 ++--
 .../DataSetModuleMockIntegrationShould.java   |  4 +-
 ...llectionRepositoryMockIntegrationShould.kt | 14 ++--
 ...ectionRepositoryMockIntegrationShould.java |  4 +-
 .../MaintenanceMockIntegrationShould.java     |  2 +-
 .../core/mockwebserver/Dhis2MockServer.java   |  1 +
 .../resources/dataset/data_sets.json          | 52 +++++++++++++++
 .../resources/datavalue/data_values.json      | 12 ++++
 .../datavalue/data_values_monthly.json        | 52 +++++++++++++++
 .../datavalue/data_values_weekly.json         | 16 +++++
 15 files changed, 245 insertions(+), 35 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt
 create mode 100644 core/src/sharedTest/resources/datavalue/data_values_monthly.json
 create mode 100644 core/src/sharedTest/resources/datavalue/data_values_weekly.json

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt
new file mode 100644
index 0000000000..f3e6c4d062
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.domain.aggregated.data
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataEnqueable
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(D2JunitRunner::class)
+class AggregatedDataCallEnqueableMockIntegrationShould : BaseMockIntegrationTestMetadataEnqueable() {
+
+    @Test
+    fun should_rollback_full_bundles_on_error() {
+        val monthlyDataValues = "datavalue/data_values_monthly.json"
+        val weeklyDataValues = "datavalue/data_values_weekly.json"
+        val weeklyCompleteRegistrations = "dataset/data_set_complete_registrations.json"
+        val weeklyApprovals = "dataapproval/data_approvals_multiple.json"
+
+        dhis2MockServer.enqueueMockResponse(monthlyDataValues)
+        dhis2MockServer.enqueueMockResponse(403)
+        dhis2MockServer.enqueueMockResponse(weeklyDataValues)
+        dhis2MockServer.enqueueMockResponse(weeklyCompleteRegistrations)
+        dhis2MockServer.enqueueMockResponse(weeklyApprovals)
+
+        d2.aggregatedModule().data().blockingDownload()
+
+        val monthlyValues = d2.dataSetModule().dataSetInstances()
+                .byPeriodType().eq(PeriodType.Monthly)
+                .blockingGet()
+
+        val weeklyValues = d2.dataSetModule().dataSetInstances()
+                .byPeriodType().eq(PeriodType.Weekly)
+                .blockingGet()
+
+        assertThat(monthlyValues).isEmpty()
+        assertThat(weeklyValues).isNotEmpty()
+    }
+}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt
index 2a9f5e24dc..e8d3f3602a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallMockIntegrationShould.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.data
 
+import org.hisp.dhis.android.core.arch.call.D2ProgressStatus
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -41,18 +42,29 @@ class AggregatedDataCallMockIntegrationShould : BaseMockIntegrationTestMetadataD
 
         testObserver.awaitTerminalEvent()
 
-        testObserver.assertValueCount(3)
+        testObserver.assertValueCount(4)
 
         testObserver.assertValueAt(0) { v: AggregatedD2Progress ->
-            !v.isComplete && v.dataSets().all { (_, progress) -> !progress.isComplete }
+            !v.isComplete && hasNCompletedDataSets(v.dataSets(), number = 0)
         }
         testObserver.assertValueAt(1) { v: AggregatedD2Progress ->
-            !v.isComplete && v.dataSets().all { (_, progress) -> progress.isComplete }
+            !v.isComplete && hasNCompletedDataSets(v.dataSets(), number = 2)
         }
         testObserver.assertValueAt(2) { v: AggregatedD2Progress ->
-            v.isComplete && v.dataSets().all { (_, progress) -> progress.isComplete }
+            !v.isComplete && hasNCompletedDataSets(v.dataSets(), number = 3)
+        }
+        testObserver.assertValueAt(3) { v: AggregatedD2Progress ->
+            v.isComplete && hasAllCompletedDataSets(v.dataSets())
         }
 
         testObserver.dispose()
     }
+
+    private fun hasNCompletedDataSets(dataSets: Map<String, D2ProgressStatus>, number: Int): Boolean {
+        return dataSets.filter { (_, progress) -> progress.isComplete }.size == number
+    }
+
+    private fun hasAllCompletedDataSets(dataSets: Map<String, D2ProgressStatus>): Boolean {
+        return dataSets.all { (_, progress) -> progress.isComplete }
+    }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java
index 0378f7057a..266f1184d2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java
@@ -73,7 +73,7 @@ public void create_period_in_database_if_not_exist() throws ParseException {
 
     @Test
     public void get_periods() {
-        assertThat(d2.periodModule().periods().blockingCount()).isEqualTo(206);
+        assertThat(d2.periodModule().periods().blockingCount()).isEqualTo(225);
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetCollectionRepositoryMockIntegrationShould.java
index fb064f70ef..9f778461a3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetCollectionRepositoryMockIntegrationShould.java
@@ -48,7 +48,7 @@ public class DataSetCollectionRepositoryMockIntegrationShould extends BaseMockIn
     public void find_all() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets()
                 .blockingGet();
-        assertThat(dataSets.size()).isEqualTo(2);
+        assertThat(dataSets.size()).isEqualTo(3);
     }
 
     @Test
@@ -64,7 +64,7 @@ public void filter_by_category_combo() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets()
                 .byCategoryComboUid().eq("m2jTvAj5kkm")
                 .blockingGet();
-        assertThat(dataSets.size()).isEqualTo(1);
+        assertThat(dataSets.size()).isEqualTo(2);
     }
 
     @Test
@@ -88,7 +88,7 @@ public void filter_by_version_bigger_1() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets()
                 .byVersion().biggerThan(21)
                 .blockingGet();
-        assertThat(dataSets.size()).isEqualTo(1);
+        assertThat(dataSets.size()).isEqualTo(2);
     }
 
     @Test
@@ -96,7 +96,7 @@ public void filter_by_version_bigger_0() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets()
                 .byVersion().biggerThan(22)
                 .blockingGet();
-        assertThat(dataSets.size()).isEqualTo(0);
+        assertThat(dataSets.size()).isEqualTo(1);
     }
 
     @Test
@@ -208,7 +208,7 @@ public void filter_by_access_data_write() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets()
                 .byAccessDataWrite().isTrue()
                 .blockingGet();
-        assertThat(dataSets.size()).isEqualTo(2);
+        assertThat(dataSets.size()).isEqualTo(3);
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
index bddfceadfd..88bb79de36 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.testapp.dataset
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
@@ -43,7 +42,7 @@ class DataSetInstanceCollectionRepositoryMockIntegrationShould : BaseMockIntegra
         val dataSetInstances = d2.dataSetModule().dataSetInstances()
             .blockingGet()
 
-        assertThat(dataSetInstances.size).isEqualTo(3)
+        assertThat(dataSetInstances.size).isEqualTo(4)
     }
 
     @Test
@@ -79,16 +78,16 @@ class DataSetInstanceCollectionRepositoryMockIntegrationShould : BaseMockIntegra
             .byPeriodStartDate().after(DateUtils.SIMPLE_DATE_FORMAT.parse("2019-06-15T00:00:00.000"))
             .blockingGet()
 
-        assertThat(dataSetInstances.size).isEqualTo(2)
+        assertThat(dataSetInstances.size).isEqualTo(3)
     }
 
     @Test
     fun filter_by_period_end_date() {
         val dataSetInstances = d2.dataSetModule().dataSetInstances()
-            .byPeriodEndDate().after(BaseIdentifiableObject.parseDate("2018-07-15T00:00:00.000"))
+            .byPeriodEndDate().after(DateUtils.DATE_FORMAT.parse("2018-07-15T00:00:00.000"))
             .blockingGet()
 
-        assertThat(dataSetInstances.size).isEqualTo(3)
+        assertThat(dataSetInstances.size).isEqualTo(4)
     }
 
     @Test
@@ -97,7 +96,7 @@ class DataSetInstanceCollectionRepositoryMockIntegrationShould : BaseMockIntegra
             .byOrganisationUnitUid().eq("DiszpKrYNg8")
             .blockingGet()
 
-        assertThat(dataSetInstances.size).isEqualTo(2)
+        assertThat(dataSetInstances.size).isEqualTo(3)
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
index 058fc7430c..3a728b60db 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
@@ -43,7 +43,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
         val summaries = d2.dataSetModule().dataSetInstanceSummaries()
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
         summaries
             .filter { it.dataSetUid() == "lyLU2wR22tC" }
             .forEach {
@@ -58,7 +58,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
             .byDataSetUid().eq("lyLU2wR22tC")
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
         summaries
             .filter { it.dataSetUid() == "lyLU2wR22tC" }
             .forEach {
@@ -73,7 +73,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
             .byPeriod().eq("2018")
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
         summaries
             .filter { it.dataSetUid() == "lyLU2wR22tC" }
             .forEach {
@@ -88,7 +88,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
             .byPeriodType().eq(PeriodType.Yearly)
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
     }
 
     @Test
@@ -97,7 +97,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
             .byPeriodStartDate().after(BaseIdentifiableObject.parseDate("2018-07-15T00:00:00.000"))
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
     }
 
     @Test
@@ -106,7 +106,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
             .byPeriodEndDate().after(BaseIdentifiableObject.parseDate("2018-07-15T00:00:00.000"))
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
     }
 
     @Test
@@ -115,7 +115,7 @@ class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMock
             .byOrganisationUnitUid().eq("DiszpKrYNg8")
             .blockingGet()
 
-        assertThat(summaries.size).isEqualTo(2)
+        assertThat(summaries.size).isEqualTo(3)
         summaries
             .filter { it.dataSetUid() == "lyLU2wR22tC" }
             .forEach {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetModuleMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetModuleMockIntegrationShould.java
index 19ee2ca2f5..3bfe1929af 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetModuleMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetModuleMockIntegrationShould.java
@@ -49,7 +49,7 @@ public class DataSetModuleMockIntegrationShould extends BaseMockIntegrationTestF
     @Test
     public void allow_access_to_all_data_sets_without_children() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets().blockingGet();
-        assertThat(dataSets.size()).isEqualTo(2);
+        assertThat(dataSets.size()).isEqualTo(3);
         for (DataSet dataSet : dataSets) {
             assertThat(dataSet.dataSetElements() == null).isTrue();
         }
@@ -64,7 +64,7 @@ public void allow_access_to_one_data_set_without_children() {
     @Test
     public void allow_access_to_all_data_sets_with_children() {
         List<DataSet> dataSets = d2.dataSetModule().dataSets().withDataSetElements().blockingGet();
-        assertThat(dataSets.size()).isEqualTo(2);
+        assertThat(dataSets.size()).isEqualTo(3);
         for (DataSet dataSet : dataSets) {
             assertThat(dataSet.dataSetElements() == null).isFalse();
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
index 64032de61e..c6030817ec 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
@@ -43,7 +43,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
         val dataValues = d2.dataValueModule().dataValues()
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(7)
+        assertThat(dataValues.size).isEqualTo(8)
     }
 
     @Test
@@ -53,7 +53,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .eq("g9eOBujte1U")
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(7)
+        assertThat(dataValues.size).isEqualTo(8)
     }
 
     @Test
@@ -73,7 +73,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .eq("DiszpKrYNg8")
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(6)
+        assertThat(dataValues.size).isEqualTo(7)
     }
 
     @Test
@@ -83,7 +83,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .eq("Gmbgme7z9BF")
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(6)
+        assertThat(dataValues.size).isEqualTo(7)
     }
 
     @Test
@@ -152,7 +152,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .byFollowUp().isFalse
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(6)
+        assertThat(dataValues.size).isEqualTo(7)
     }
 
     @Test
@@ -161,7 +161,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .bySyncState().eq(State.SYNCED)
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(7)
+        assertThat(dataValues.size).isEqualTo(8)
     }
 
     @Test
@@ -170,7 +170,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .byDeleted().isFalse
             .blockingGet()
 
-        assertThat(dataValues.size).isEqualTo(7)
+        assertThat(dataValues.size).isEqualTo(8)
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/ForeignKeyViolationCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/ForeignKeyViolationCollectionRepositoryMockIntegrationShould.java
index bfd5c0fbaa..f6aa026ba5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/ForeignKeyViolationCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/ForeignKeyViolationCollectionRepositoryMockIntegrationShould.java
@@ -46,7 +46,7 @@ public class ForeignKeyViolationCollectionRepositoryMockIntegrationShould extend
     @Test
     public void find_all() {
         List<ForeignKeyViolation> foreignKeyViolations = d2.maintenanceModule().foreignKeyViolations().blockingGet();
-        assertThat(foreignKeyViolations.size()).isEqualTo(3);
+        assertThat(foreignKeyViolations.size()).isEqualTo(4);
     }
 
     @Test
@@ -102,6 +102,6 @@ public void filter_by_from_object_row() {
     public void filter_by_created() throws ParseException {
         List<ForeignKeyViolation> foreignKeyViolations = d2.maintenanceModule().foreignKeyViolations()
                 .byCreated().after(DateUtils.DATE_FORMAT.parse("2019-01-15T08:14:06.767")).blockingGet();
-        assertThat(foreignKeyViolations.size()).isEqualTo(3);
+        assertThat(foreignKeyViolations.size()).isEqualTo(4);
     }
 }
\ No newline at end of file
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/MaintenanceMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/MaintenanceMockIntegrationShould.java
index ea171e35e4..0159095b4f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/MaintenanceMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/maintenance/MaintenanceMockIntegrationShould.java
@@ -49,7 +49,7 @@ public class MaintenanceMockIntegrationShould extends BaseMockIntegrationTestFul
     @Test
     public void allow_access_to_foreign_key_violations() {
         List<ForeignKeyViolation> violations = d2.maintenanceModule().foreignKeyViolations().blockingGet();
-        assertThat(violations.size()).isEqualTo(3);
+        assertThat(violations.size()).isEqualTo(4);
 
         ForeignKeyViolation optionViolation = ForeignKeyViolation.builder()
                 .toTable(OptionSetTableInfo.TABLE_INFO.name())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java b/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java
index f4b3f8d81a..be408f780a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java
@@ -351,6 +351,7 @@ public void enqueueMetadataResponses() {
         enqueueMockResponse(DATA_ELEMENTS_JSON);
         enqueueMockResponse(VALIDATION_RULE_UIDS_JSON);
         enqueueMockResponse(VALIDATION_RULE_UIDS_JSON);
+        enqueueMockResponse(VALIDATION_RULE_UIDS_JSON);
         enqueueMockResponse(VALIDATION_RULES_JSON);
         enqueueMockResponse(CATEGORY_COMBOS_JSON);
         enqueueMockResponse(CATEGORIES_JSON);
diff --git a/core/src/sharedTest/resources/dataset/data_sets.json b/core/src/sharedTest/resources/dataset/data_sets.json
index ebc5c3c69c..2724a8d2f1 100644
--- a/core/src/sharedTest/resources/dataset/data_sets.json
+++ b/core/src/sharedTest/resources/dataset/data_sets.json
@@ -186,6 +186,58 @@
       ],
       "dataInputPeriods": [
       ]
+    },
+    {
+      "lastUpdated": "2014-08-09T12:35:36.743",
+      "id": "TaMAefItzgt",
+      "created": "2012-06-10T00:36:10.036",
+      "name": "Child Health Weekly",
+      "shortName": "Child Health",
+      "validCompleteOnly": true,
+      "skipOffline": true,
+      "version": 25,
+      "timelyDays": 5,
+      "dataElementDecoration": false,
+      "displayName": "Child Health",
+      "notifyCompletingUser": true,
+      "noValueRequiresComment": false,
+      "displayShortName": "Child Health",
+      "fieldCombinationRequired": true,
+      "renderHorizontally": true,
+      "renderAsTabs": false,
+      "mobile": true,
+      "periodType": "Weekly",
+      "openFuturePeriods": 2,
+      "expiryDays": 2,
+      "categoryCombo": {
+        "id": "m2jTvAj5kkm"
+      },
+      "dataSetElements": [
+        {
+          "dataSet": {
+            "id": "TaMAefItzgt"
+          },
+          "dataElement": {
+            "id": "g9eOBujte1U"
+          },
+          "categoryCombo": {
+            "id": "m2jTvAj5kkm"
+          }
+        }
+      ],
+      "indicators": [
+      ],
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
+      "sections": [
+      ],
+      "compulsoryDataElementOperands": [
+      ],
+      "dataInputPeriods": [
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/datavalue/data_values.json b/core/src/sharedTest/resources/datavalue/data_values.json
index 65e096a544..2520667400 100644
--- a/core/src/sharedTest/resources/datavalue/data_values.json
+++ b/core/src/sharedTest/resources/datavalue/data_values.json
@@ -86,6 +86,18 @@
       "created": "2012-08-11T00:00:00.000+0000",
       "lastUpdated": "2012-08-11T00:00:00.000+0000",
       "followup": false
+    },
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "2019W43",
+      "orgUnit": "DiszpKrYNg8",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "Gmbgme7z9BF",
+      "value": "5",
+      "storedBy": "bodata1",
+      "created": "2012-08-11T00:00:00.000+0000",
+      "lastUpdated": "2012-08-11T00:00:00.000+0000",
+      "followup": false
     }
   ]
 }
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/datavalue/data_values_monthly.json b/core/src/sharedTest/resources/datavalue/data_values_monthly.json
new file mode 100644
index 0000000000..a25e75a8c9
--- /dev/null
+++ b/core/src/sharedTest/resources/datavalue/data_values_monthly.json
@@ -0,0 +1,52 @@
+{
+  "dataValues": [
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "201907",
+      "orgUnit": "DiszpKrYNg8",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "bRowv6yZOF2",
+      "value": "12",
+      "storedBy": "bodata1",
+      "created": "2012-08-11T00:00:00.000+0000",
+      "lastUpdated": "2012-08-11T00:00:00.000+0000",
+      "followup": false
+    },
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "201907",
+      "orgUnit": "DiszpKrYNg8",
+      "categoryOptionCombo": "bRowv6yZOF2",
+      "attributeOptionCombo": "bRowv6yZOF2",
+      "value": "12",
+      "storedBy": "bodata1",
+      "created": "2012-08-11T00:00:00.000+0000",
+      "lastUpdated": "2012-08-11T00:00:00.000+0000",
+      "followup": false
+    },
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "201906",
+      "orgUnit": "g8upMTyEZGZ",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "bRowv6yZOF2",
+      "value": "4",
+      "storedBy": "bodata1",
+      "created": "2012-08-11T00:00:00.000+0000",
+      "lastUpdated": "2012-08-11T00:00:00.000+0000",
+      "followup": false
+    },
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "201908",
+      "orgUnit": "DiszpKrYNg8",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "Gmbgme7z9BF",
+      "value": "24",
+      "storedBy": "bodata1",
+      "created": "2012-08-11T00:00:00.000+0000",
+      "lastUpdated": "2012-08-11T00:00:00.000+0000",
+      "followup": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/datavalue/data_values_weekly.json b/core/src/sharedTest/resources/datavalue/data_values_weekly.json
new file mode 100644
index 0000000000..213cec5168
--- /dev/null
+++ b/core/src/sharedTest/resources/datavalue/data_values_weekly.json
@@ -0,0 +1,16 @@
+{
+  "dataValues": [
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "2019W43",
+      "orgUnit": "DiszpKrYNg8",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "Gmbgme7z9BF",
+      "value": "5",
+      "storedBy": "bodata1",
+      "created": "2012-08-11T00:00:00.000+0000",
+      "lastUpdated": "2012-08-11T00:00:00.000+0000",
+      "followup": false
+    }
+  ]
+}
\ No newline at end of file

From d80be094f2ca83e3ea5146ab90c54af990c37819 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 12 May 2023 16:54:05 +1000
Subject: [PATCH 006/478] [ANDROSDK-1676] Continue on bundle error

---
 ...atedDataCallEnqueableMockIntegrationShould.kt | 16 ++++++++--------
 .../arch/call/factories/internal/QueryCall.kt    |  2 +-
 .../data/internal/AggregatedDataCall.kt          | 14 +++++++++-----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt
index f3e6c4d062..31a6184d93 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/AggregatedDataCallEnqueableMockIntegrationShould.kt
@@ -42,25 +42,25 @@ class AggregatedDataCallEnqueableMockIntegrationShould : BaseMockIntegrationTest
         val monthlyDataValues = "datavalue/data_values_monthly.json"
         val weeklyDataValues = "datavalue/data_values_weekly.json"
         val weeklyCompleteRegistrations = "dataset/data_set_complete_registrations.json"
-        val weeklyApprovals = "dataapproval/data_approvals_multiple.json"
+
+        dhis2MockServer.enqueueSystemInfoResponse()
 
         dhis2MockServer.enqueueMockResponse(monthlyDataValues)
         dhis2MockServer.enqueueMockResponse(403)
+
         dhis2MockServer.enqueueMockResponse(weeklyDataValues)
         dhis2MockServer.enqueueMockResponse(weeklyCompleteRegistrations)
-        dhis2MockServer.enqueueMockResponse(weeklyApprovals)
 
         d2.aggregatedModule().data().blockingDownload()
 
         val monthlyValues = d2.dataSetModule().dataSetInstances()
-                .byPeriodType().eq(PeriodType.Monthly)
-                .blockingGet()
+            .byPeriodType().eq(PeriodType.Monthly)
+            .blockingGet()
+        assertThat(monthlyValues).isEmpty()
 
         val weeklyValues = d2.dataSetModule().dataSetInstances()
-                .byPeriodType().eq(PeriodType.Weekly)
-                .blockingGet()
-
-        assertThat(monthlyValues).isEmpty()
+            .byPeriodType().eq(PeriodType.Weekly)
+            .blockingGet()
         assertThat(weeklyValues).isNotEmpty()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt
index 09eb40b01b..9c1b5ae057 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCall.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
-internal interface QueryCall<P, Q : BaseQueryKt> {
+internal fun interface QueryCall<P, Q : BaseQueryKt> {
     suspend fun download(query: Q): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index ce6d74ed3e..b2b2ce96c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -50,6 +50,7 @@ import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationQu
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.internal.DataValueQuery
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
 
@@ -103,11 +104,14 @@ internal class AggregatedDataCall @Inject constructor(
     private suspend fun downloadBundle(
         bundle: AggregatedDataCallBundle
     ) {
-        return coroutineCallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
-            downloadDataValues(bundle)
-            downloadCompleteRegistration(bundle)
-            downloadApproval(bundle)
-            updateAggregatedDataSync(bundle)
+        return try {
+            coroutineCallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+                downloadDataValues(bundle)
+                downloadCompleteRegistration(bundle)
+                downloadApproval(bundle)
+                updateAggregatedDataSync(bundle)
+            }
+        } catch (_: D2Error) {
         }
     }
 

From 9b960bd0ab0a0da528bd03bdabcf123747b40ad7 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 17 May 2023 15:19:10 +0200
Subject: [PATCH 007/478] [ANDROID-1678] Refactor updateDataValues function to
 return Flow

---
 .../FileResourceCallRealIntegrationShould.kt  |  4 +-
 .../internal/DataValueFileResourcePostCall.kt |  4 +-
 .../datavalue/internal/DataValuePostCall.kt   | 49 +++++++++----------
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
index 268784df63..946a532331 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
@@ -191,8 +191,8 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
 
         d2.dataValueModule().dataValues()
             .value(
-                nextPeriod.periodId()!!, dataValue.organisationUnit(), dataValue.dataElement(),
-                dataValue.categoryOptionCombo(), dataValue.attributeOptionCombo()
+                nextPeriod.periodId()!!, dataValue.organisationUnit()!!, dataValue.dataElement()!!,
+                dataValue.categoryOptionCombo()!!, dataValue.attributeOptionCombo()!!
             )
             .blockingSet(uid)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
index cda24fab30..41d278241b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
@@ -40,7 +40,7 @@ internal class DataValueFileResourcePostCall @Inject constructor(
     private val fileResourceHelper: FileResourceHelper,
     private val fileResourcePostCall: FileResourcePostCall
 ) {
-    fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
+    suspend fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
         val fileResources = fileResourceHelper.getUploadableFileResources()
 
         return if (fileResources.isEmpty()) {
@@ -62,7 +62,7 @@ internal class DataValueFileResourcePostCall @Inject constructor(
         }
     }
 
-    fun updateFileResourceStates(fileResources: List<String>) {
+    suspend fun updateFileResourceStates(fileResources: List<String>) {
         fileResourceHelper.updateFileResourceStates(fileResources, FileResourceDomainType.AGGREGATED)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index 492c944701..8e0c6d1b07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -28,10 +28,12 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
 import java.net.HttpURLConnection
 import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.withContext
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
@@ -54,32 +56,27 @@ internal class DataValuePostCall @Inject constructor(
     private val dataValueStore: DataValueStore,
     private val versionManager: DHISVersionManager
 ) {
-    fun uploadDataValues(dataValues: List<DataValue>): Observable<D2Progress> {
-        return Observable.defer {
-            if (dataValues.isEmpty()) {
-                return@defer Observable.empty<D2Progress>()
-            } else {
-                val progressManager = D2ProgressManager(1)
-                return@defer Observable.create { emitter: ObservableEmitter<D2Progress> ->
-                    val result = fileResourcePostCall.uploadFileResource(dataValues)
-                    val validDataValues = result.dataValues
+    fun uploadDataValues(dataValues: List<DataValue>): Flow<D2Progress> = flow {
+        if (dataValues.isEmpty()) {
+            return@flow
+        }
+
+        val progressManager = D2ProgressManager(1)
+        val result = withContext(Dispatchers.IO) { fileResourcePostCall.uploadFileResource(dataValues) }
+        val validDataValues = result.dataValues
 
-                    markObjectsAs(validDataValues, State.UPLOADING)
-                    try {
-                        val dataValueSet = DataValueSet(validDataValues)
-                        val dataValueImportSummary = executePostCall(dataValueSet)
-                        dataValueImportHandler.handleImportSummary(dataValueSet, dataValueImportSummary)
-                        fileResourcePostCall.updateFileResourceStates(result.fileResources)
-                    } catch (e: D2Error) {
-                        markObjectsAs(validDataValues, errorIfOnline(e))
-                        fileResourcePostCall.updateFileResourceStates(result.fileResources)
-                        throw e
-                    }
-                    emitter.onNext(progressManager.increaseProgress(DataValue::class.java, true))
-                    emitter.onComplete()
-                }
-            }
+        markObjectsAs(validDataValues, State.UPLOADING)
+        try {
+            val dataValueSet = DataValueSet(validDataValues)
+            val dataValueImportSummary = executePostCall(dataValueSet)
+            dataValueImportHandler.handleImportSummary(dataValueSet, dataValueImportSummary)
+            fileResourcePostCall.updateFileResourceStates(result.fileResources)
+        } catch (e: D2Error) {
+            markObjectsAs(validDataValues, errorIfOnline(e))
+            fileResourcePostCall.updateFileResourceStates(result.fileResources)
+            throw e
         }
+        emit(progressManager.increaseProgress(DataValue::class.java, true))
     }
 
     private fun executePostCall(dataValueSet: DataValueSet): DataValueImportSummary? {

From e2af1b894da328cc375f8df1d485600441e858f4 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 17 May 2023 15:19:30 +0200
Subject: [PATCH 008/478] Rename .java to .kt

---
 ...CollectionRepository.java => DataValueCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/datavalue/{DataValueCollectionRepository.java => DataValueCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt

From aa0e1b12ac28effb8939c883a9e08da89d0cd170 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 17 May 2023 15:19:30 +0200
Subject: [PATCH 009/478] [ANDROID-1678] Refactor DataValueCollectionRepository
 to kotlin

---
 .../DataValueCollectionRepository.kt          | 191 +++++++++---------
 1 file changed, 92 insertions(+), 99 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
index 58f064a011..e3f9868f6e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
@@ -25,143 +25,136 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.datavalue;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.datavalue.internal.DataValuePostCall;
-import org.hisp.dhis.android.core.datavalue.internal.DataValueStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
-
-import static org.hisp.dhis.android.core.datavalue.DataValueTableInfo.Columns;
+package org.hisp.dhis.android.core.datavalue
+
+import dagger.Reusable
+import io.reactivex.Observable
+import javax.inject.Inject
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.rx2.asObservable
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.*
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.dataValueKey
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.operator
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
+import org.hisp.dhis.android.core.datavalue.internal.DataValuePostCall
+import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
 
 @Reusable
-public final class DataValueCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<DataValue, DataValueCollectionRepository>
-        implements ReadOnlyWithUploadCollectionRepository<DataValue> {
-
-    private final DataValueStore store;
-    private final DataValuePostCall postCall;
-
-    @Inject
-    DataValueCollectionRepository(final DataValueStore store,
-                                  final Map<String, ChildrenAppender<DataValue>> childrenAppenders,
-                                  final RepositoryScope scope,
-                                  final DataValuePostCall postCall) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new DataValueCollectionRepository(store, childrenAppenders, s, postCall)));
-        this.store = store;
-        this.postCall = postCall;
+class DataValueCollectionRepository @Inject internal constructor(
+    private val store: DataValueStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<DataValue>>,
+    scope: RepositoryScope,
+    private val postCall: DataValuePostCall
+) : ReadOnlyCollectionRepositoryImpl<DataValue, DataValueCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(scope) { s: RepositoryScope ->
+        DataValueCollectionRepository(store, childrenAppenders, s, postCall)
     }
+),
+    ReadOnlyWithUploadCollectionRepository<DataValue> {
 
-    @Override
-    public Observable<D2Progress> upload() {
-        return Observable.fromCallable(() ->
-                bySyncState().in(State.uploadableStatesIncludingError()).blockingGetWithoutChildren()
-        ).flatMap(postCall::uploadDataValues);
-    }
+    override fun upload(): Observable<D2Progress> = flow {
+        val dataValues =
+            bySyncState().`in`(State.uploadableStatesIncludingError().toMutableList()).blockingGetWithoutChildren()
+        emitAll(postCall.uploadDataValues(dataValues))
+    }.asObservable()
 
-    @Override
-    public void blockingUpload() {
-        upload().blockingSubscribe();
+    override fun blockingUpload() {
+        upload().blockingSubscribe()
     }
 
-    public DataValueObjectRepository value(String period,
-                                           String organisationUnit,
-                                           String dataElement,
-                                           String categoryOptionCombo,
-                                           String attributeOptionCombo) {
-        RepositoryScope updatedScope = byPeriod().eq(period)
-                .byOrganisationUnitUid().eq(organisationUnit)
-                .byDataElementUid().eq(dataElement)
-                .byCategoryOptionComboUid().eq(categoryOptionCombo)
-                .byAttributeOptionComboUid().eq(attributeOptionCombo)
-                .scope;
-        return new DataValueObjectRepository(store, childrenAppenders, updatedScope, period, organisationUnit,
-                dataElement, categoryOptionCombo, attributeOptionCombo);
+    fun value(
+        period: String,
+        organisationUnit: String,
+        dataElement: String,
+        categoryOptionCombo: String,
+        attributeOptionCombo: String
+    ): DataValueObjectRepository {
+        val updatedScope = byPeriod().eq(period)
+            .byOrganisationUnitUid().eq(organisationUnit)
+            .byDataElementUid().eq(dataElement)
+            .byCategoryOptionComboUid().eq(categoryOptionCombo)
+            .byAttributeOptionComboUid().eq(attributeOptionCombo).scope
+        return DataValueObjectRepository(
+            store, childrenAppenders, updatedScope, period, organisationUnit,
+            dataElement, categoryOptionCombo, attributeOptionCombo
+        )
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byDataElementUid() {
-        return cf.string(Columns.DATA_ELEMENT);
+    fun byDataElementUid(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.DATA_ELEMENT)
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byPeriod() {
-        return cf.string(Columns.PERIOD);
+    fun byPeriod(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.PERIOD)
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(Columns.ORGANISATION_UNIT);
+    fun byOrganisationUnitUid(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byCategoryOptionComboUid() {
-        return cf.string(Columns.CATEGORY_OPTION_COMBO);
+    fun byCategoryOptionComboUid(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.CATEGORY_OPTION_COMBO)
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byAttributeOptionComboUid() {
-        return cf.string(Columns.ATTRIBUTE_OPTION_COMBO);
+    fun byAttributeOptionComboUid(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.ATTRIBUTE_OPTION_COMBO)
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byValue() {
-        return cf.string(Columns.VALUE);
+    fun byValue(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.VALUE)
     }
 
-    public DataValueCollectionRepository byDataSetUid(String dataSetUid) {
-        return cf.subQuery(DataValueByDataSetQueryHelper.getDataValueKey())
-                .rawSubQuery(DataValueByDataSetQueryHelper.getOperator(),
-                        DataValueByDataSetQueryHelper.whereClause(dataSetUid));
+    fun byDataSetUid(dataSetUid: String?): DataValueCollectionRepository {
+        return cf.subQuery(dataValueKey)
+            .rawSubQuery(
+                operator,
+                whereClause(dataSetUid!!)
+            )!!
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byStoredBy() {
-        return cf.string(Columns.STORED_BY);
+    fun byStoredBy(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.STORED_BY)
     }
 
-    public DateFilterConnector<DataValueCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
+    fun byCreated(): DateFilterConnector<DataValueCollectionRepository> {
+        return cf.date(DataValueTableInfo.Columns.CREATED)
     }
 
-    public DateFilterConnector<DataValueCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<DataValueCollectionRepository> {
+        return cf.date(DataValueTableInfo.Columns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<DataValueCollectionRepository> byComment() {
-        return cf.string(Columns.COMMENT);
+    fun byComment(): StringFilterConnector<DataValueCollectionRepository> {
+        return cf.string(DataValueTableInfo.Columns.COMMENT)
     }
 
-    public BooleanFilterConnector<DataValueCollectionRepository> byFollowUp() {
-        return cf.bool(Columns.FOLLOW_UP);
+    fun byFollowUp(): BooleanFilterConnector<DataValueCollectionRepository> {
+        return cf.bool(DataValueTableInfo.Columns.FOLLOW_UP)
     }
 
     /**
-     * @deprecated Use {@link #bySyncState()} instead.
-     *
      * @return
      */
-    @Deprecated
-    public EnumFilterConnector<DataValueCollectionRepository, State> byState() {
-        return bySyncState();
+    @Deprecated("Use {@link #bySyncState()} instead.\n" + "     \n" + "      ")
+    fun byState(): EnumFilterConnector<DataValueCollectionRepository, State> {
+        return bySyncState()
     }
 
-    public EnumFilterConnector<DataValueCollectionRepository, State> bySyncState() {
-        return cf.enumC(Columns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<DataValueCollectionRepository, State> {
+        return cf.enumC<State>(DataValueTableInfo.Columns.SYNC_STATE)
     }
 
-    public BooleanFilterConnector<DataValueCollectionRepository> byDeleted() {
-        return cf.bool(Columns.DELETED);
+    fun byDeleted(): BooleanFilterConnector<DataValueCollectionRepository> {
+        return cf.bool(DataValueTableInfo.Columns.DELETED)
     }
-}
\ No newline at end of file
+}

From 22526ed95ea31b650135ace7656df75a830fd0a0 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 17 May 2023 15:51:22 +0200
Subject: [PATCH 010/478] [ANDROID-1678] Supress TooManyfunctions warning

---
 .../dhis/android/core/datavalue/DataValueCollectionRepository.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
index e3f9868f6e..26929cc626 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
@@ -46,6 +46,7 @@ import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereC
 import org.hisp.dhis.android.core.datavalue.internal.DataValuePostCall
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
 
+@Suppress("TooManyFunctions")
 @Reusable
 class DataValueCollectionRepository @Inject internal constructor(
     private val store: DataValueStore,

From 8bfbce936d83ad601dcc55d77299edeead205f42 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 18 May 2023 12:34:29 +0200
Subject: [PATCH 011/478] [ANDROID-1678] Refactor DataValueService methods to
 return a suspend function

---
 .../datavalue/internal/DataValuePostCall.kt   | 42 +++++++++++--------
 .../datavalue/internal/DataValueService.kt    |  5 +--
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index 8e0c6d1b07..7952bec460 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -30,13 +30,12 @@ package org.hisp.dhis.android.core.datavalue.internal
 import dagger.Reusable
 import java.net.HttpURLConnection
 import javax.inject.Inject
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.withContext
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.internal.DataStateHelper.errorIfOnline
 import org.hisp.dhis.android.core.arch.helpers.internal.DataStateHelper.forcedOrOwn
 import org.hisp.dhis.android.core.common.State
@@ -52,9 +51,9 @@ internal class DataValuePostCall @Inject constructor(
     private val dataValueService: DataValueService,
     private val dataValueImportHandler: DataValueImportHandler,
     private val fileResourcePostCall: DataValueFileResourcePostCall,
-    private val apiCallExecutor: APICallExecutor,
     private val dataValueStore: DataValueStore,
-    private val versionManager: DHISVersionManager
+    private val versionManager: DHISVersionManager,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) {
     fun uploadDataValues(dataValues: List<DataValue>): Flow<D2Progress> = flow {
         if (dataValues.isEmpty()) {
@@ -62,34 +61,41 @@ internal class DataValuePostCall @Inject constructor(
         }
 
         val progressManager = D2ProgressManager(1)
-        val result = withContext(Dispatchers.IO) { fileResourcePostCall.uploadFileResource(dataValues) }
+        val result = fileResourcePostCall.uploadFileResource(dataValues)
         val validDataValues = result.dataValues
 
         markObjectsAs(validDataValues, State.UPLOADING)
         try {
             val dataValueSet = DataValueSet(validDataValues)
-            val dataValueImportSummary = executePostCall(dataValueSet)
-            dataValueImportHandler.handleImportSummary(dataValueSet, dataValueImportSummary)
-            fileResourcePostCall.updateFileResourceStates(result.fileResources)
+            executePostCall(dataValueSet).fold(
+                onSuccess = {
+                    dataValueImportHandler.handleImportSummary(dataValueSet, it)
+                },
+                onFailure = {
+                    throw it
+                }
+            )
         } catch (e: D2Error) {
             markObjectsAs(validDataValues, errorIfOnline(e))
-            fileResourcePostCall.updateFileResourceStates(result.fileResources)
             throw e
+        } finally {
+            fileResourcePostCall.updateFileResourceStates(result.fileResources)
         }
         emit(progressManager.increaseProgress(DataValue::class.java, true))
     }
 
-    private fun executePostCall(dataValueSet: DataValueSet): DataValueImportSummary? {
+    private suspend fun executePostCall(dataValueSet: DataValueSet): Result<DataValueImportSummary, D2Error> {
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
-            apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-                dataValueService.postDataValuesWebResponse(dataValueSet),
-                listOf(HttpURLConnection.HTTP_CONFLICT),
-                DataValueImportSummaryWebResponse::class.java
-            ).response()
+            coroutineAPICallExecutor.wrap(
+                acceptedErrorCodes = listOf(HttpURLConnection.HTTP_CONFLICT),
+                errorClass = DataValueImportSummaryWebResponse::class.java
+            ) {
+                dataValueService.postDataValuesWebResponse(dataValueSet)
+            }.map { it.response()!! } // TODO ("Remove !! after refactor to DataClass")
         } else {
-            apiCallExecutor.executeObjectCall(
+            coroutineAPICallExecutor.wrap() {
                 dataValueService.postDataValues(dataValueSet)
-            )
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
index 9679d75550..0e3ac8deba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
@@ -32,7 +32,6 @@ import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -54,8 +53,8 @@ internal interface DataValueService {
     ): DataValueSet
 
     @POST("dataValueSets")
-    fun postDataValues(@Body dataValueSet: DataValueSet): Call<DataValueImportSummary>
+    suspend fun postDataValues(@Body dataValueSet: DataValueSet): DataValueImportSummary
 
     @POST("dataValueSets")
-    fun postDataValuesWebResponse(@Body dataValueSet: DataValueSet): Call<DataValueImportSummaryWebResponse>
+    suspend fun postDataValuesWebResponse(@Body dataValueSet: DataValueSet): DataValueImportSummaryWebResponse
 }

From b5c3ee936a443ebf7cc244eb15795687ee14968c Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 18 May 2023 13:33:45 +0200
Subject: [PATCH 012/478] [ANDROID-1678] Create CoroutineAPICallExecutorShould
 test

---
 .../datavalue/internal/DataValuePostCall.kt   |  2 +-
 .../CoroutineAPICallExecutorShould.kt         | 97 +++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index 7952bec460..f41803b7a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -93,7 +93,7 @@ internal class DataValuePostCall @Inject constructor(
                 dataValueService.postDataValuesWebResponse(dataValueSet)
             }.map { it.response()!! } // TODO ("Remove !! after refactor to DataClass")
         } else {
-            coroutineAPICallExecutor.wrap() {
+            coroutineAPICallExecutor.wrap {
                 dataValueService.postDataValues(dataValueSet)
             }
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
new file mode 100644
index 0000000000..755f0198d8
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.api.executors.internal
+
+import com.nhaarman.mockitokotlin2.mock
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
+import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class CoroutineAPICallExecutorShould {
+
+    private val errorMapper: APIErrorMapper = mock()
+    private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher = mock()
+    private val errorStore: ObjectStore<D2Error> = mock()
+    private val databaseAdapter: DatabaseAdapter = mock()
+    private val foreignKeyCleaner: ForeignKeyCleaner = mock()
+
+    private lateinit var coroutineAPICallExecutor: CoroutineAPICallExecutor
+
+    @Before
+    fun setUp() {
+        coroutineAPICallExecutor = CoroutineAPICallExecutorImpl(
+            errorMapper = errorMapper,
+            userAccountDisabledErrorCatcher = userAccountDisabledErrorCatcher,
+            errorStore = errorStore,
+            databaseAdapter = databaseAdapter,
+            foreignKeyCleaner = foreignKeyCleaner
+        )
+    }
+
+    @Test
+    fun `should return object when object api call succeed`() = runBlocking {
+        // Given suspend function returns an Int
+        val expectedResult = Result.Success<Int, D2Error>(13)
+        val block: suspend () -> Int = { 13 }
+
+        // When api call is executed
+        val result = coroutineAPICallExecutor.wrap {
+            block.invoke()
+        }
+
+        // Then the executor returns the expected result
+        assertEquals(expectedResult, result)
+    }
+
+    @Test
+    fun `should return D2Error when object api call fails`() = runBlocking {
+        // Given suspend function returns an error
+        val d2Error = D2Error.builder()
+            .errorCode(D2ErrorCode.API_UNSUCCESSFUL_RESPONSE)
+            .errorDescription("API call failed")
+            .build()
+        val expectedResult = Result.Failure<Int, D2Error>(d2Error)
+
+        // When api call is executed
+        val result = coroutineAPICallExecutor.wrap {
+            throw d2Error
+        }
+
+        // Then the executor returns the D2Error
+        assertEquals(expectedResult, result)
+    }
+}

From 52a76e653330fdbc235ff6aa1bbb59841e9c91f0 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 18 May 2023 13:35:30 +0200
Subject: [PATCH 013/478] [ANDROID-1678] Deprecate BaseQuery.java

---
 .../android/core/arch/call/queries/internal/BaseQuery.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java
index b807ed0ff8..9c73e4d5bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQuery.java
@@ -28,6 +28,9 @@
 
 package org.hisp.dhis.android.core.arch.call.queries.internal;
 
+import kotlin.Deprecated;
+
+@Deprecated(message = "Use BaseQueryKt instead")
 public abstract class BaseQuery {
     public static final int DEFAULT_PAGE_SIZE = 50;
 

From 0ade054c817dcf2d7a16003477f02e32ab996eb5 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 18 May 2023 14:01:55 +0200
Subject: [PATCH 014/478] Rename .java to .kt

---
 ...mmaryWebResponse.java => DataValueImportSummaryWebResponse.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/imports/internal/{DataValueImportSummaryWebResponse.java => DataValueImportSummaryWebResponse.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.java b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.java
rename to core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt

From 91fb4126dcc74d8a67a62c41c645865563bfe879 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 18 May 2023 14:01:55 +0200
Subject: [PATCH 015/478] [ANDROID-1678] Refactor
 DataValueImportSummaryWebResponse to data class

---
 .../DataSetCompleteRegistrationPostCall.kt    |  2 +-
 .../datavalue/internal/DataValuePostCall.kt   |  2 +-
 .../DataValueImportSummaryWebResponse.kt      | 39 ++++++-------------
 ...DataValueImportSummaryWebResponseShould.kt |  2 +-
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 41afb9ef88..992726f5db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -145,7 +145,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
                 dataSetCompleteRegistrationService.postDataSetCompleteRegistrationsWebResponse(payload),
                 listOf(HttpURLConnection.HTTP_CONFLICT),
                 DataValueImportSummaryWebResponse::class.java
-            ).response()
+            ).response
         } else {
             apiCallExecutor.executeObjectCall(
                 dataSetCompleteRegistrationService.postDataSetCompleteRegistrations(payload)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index f41803b7a9..918fa84578 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -91,7 +91,7 @@ internal class DataValuePostCall @Inject constructor(
                 errorClass = DataValueImportSummaryWebResponse::class.java
             ) {
                 dataValueService.postDataValuesWebResponse(dataValueSet)
-            }.map { it.response()!! } // TODO ("Remove !! after refactor to DataClass")
+            }.map { it.response }
         } else {
             coroutineAPICallExecutor.wrap {
                 dataValueService.postDataValues(dataValueSet)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
index 973022330a..6f3998a042 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
@@ -25,35 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.imports.internal
 
-package org.hisp.dhis.android.core.imports.internal;
+data class DataValueImportSummaryWebResponse(
+    val response: DataValueImportSummary,
+    val httpStatus: String,
+    val httpStatusCode: Int,
+    val status: String,
+    val message: String
+) : WebResponse() {
+    override fun httpStatus() = httpStatus
 
-import androidx.annotation.Nullable;
+    override fun httpStatusCode() = httpStatusCode
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
-import com.google.auto.value.AutoValue;
+    override fun status() = status
 
-@AutoValue
-@JsonDeserialize(builder = AutoValue_DataValueImportSummaryWebResponse.Builder.class)
-public abstract class DataValueImportSummaryWebResponse extends WebResponse {
-
-    private static final String RESPONSE = "response";
-
-    @Nullable
-    @JsonProperty(RESPONSE)
-    public abstract DataValueImportSummary response();
-
-    public static Builder builder() {
-        return new AutoValue_DataValueImportSummaryWebResponse.Builder();
-    }
-
-    @AutoValue.Builder
-    @JsonPOJOBuilder(withPrefix = "")
-    public static abstract class Builder extends WebResponse.Builder<Builder> {
-        public abstract Builder response(DataValueImportSummary response);
-
-        public abstract DataValueImportSummaryWebResponse build();
-    }
+    override fun message() = message
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponseShould.kt b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponseShould.kt
index 075ce3df55..bf57bc5452 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponseShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponseShould.kt
@@ -42,6 +42,6 @@ class DataValueImportSummaryWebResponseShould :
     @Test
     override fun map_from_json_string() {
         val webResponse = objectMapper.readValue(jsonStream, DataValueImportSummaryWebResponse::class.java)
-        assertThat(webResponse.response()!!.importStatus()).isEqualTo(ImportStatus.SUCCESS)
+        assertThat(webResponse.response.importStatus()).isEqualTo(ImportStatus.SUCCESS)
     }
 }

From 4b96723a0a3b693e43a7d874c5b0dab720d401b5 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 8 Jun 2023 13:25:57 +0200
Subject: [PATCH 016/478] [ANDROSDK-1689] Replace Observable in
 DataSetCompleteRegistrationPostCall to kotlin flows

---
 .../executors/internal/APICallExecutor.java   |   3 -
 .../internal/APICallExecutorImpl.java         |  26 +--
 ...pleteRegistrationCollectionRepository.java | 154 ------------------
 ...ompleteRegistrationCollectionRepository.kt | 136 ++++++++++++++++
 .../DataSetCompleteRegistrationPostCall.kt    |  84 ++++------
 .../DataSetCompleteRegistrationService.kt     |  13 +-
 6 files changed, 186 insertions(+), 230 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java
index 15c755b618..e344c1cde7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.arch.api.executors.internal;
 
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.common.Unit;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 
 import java.util.List;
@@ -47,6 +46,4 @@ <P> P executeObjectCallWithAcceptedErrorCodes(Call<P> call,
                                                   Class<P> errorClass) throws D2Error;
 
     <P> P executeObjectCallWithErrorCatcher(Call<P> call, APICallErrorCatcher errorCatcher) throws D2Error;
-
-    Unit executeObjectCallWithEmptyResponse(Call<Unit> call) throws D2Error;
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
index 08d6789edb..5a58f84ec5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
@@ -32,7 +32,6 @@
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory;
-import org.hisp.dhis.android.core.common.Unit;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
@@ -64,40 +63,34 @@ public APICallExecutorImpl(ObjectStore<D2Error> errorStore,
 
     @Override
     public <P> List<P> executePayloadCall(Call<Payload<P>> call) throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, null, false).items();
+        return executeObjectCallInternal(call, new ArrayList<>(), null, null).items();
     }
 
     @Override
     public <P> P executeObjectCall(Call<P> call) throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, null, false);
+        return executeObjectCallInternal(call, new ArrayList<>(), null, null);
     }
 
     @Override
     public <P> P executeObjectCallWithAcceptedErrorCodes(Call<P> call, List<Integer> acceptedErrorCodes,
                                                          Class<P> errorClass) throws D2Error {
-        return executeObjectCallInternal(call, acceptedErrorCodes, errorClass, null, false);
+        return executeObjectCallInternal(call, acceptedErrorCodes, errorClass, null);
     }
 
     @Override
     public <P> P executeObjectCallWithErrorCatcher(Call<P> call, APICallErrorCatcher errorCatcher)
             throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, errorCatcher, false);
-    }
-
-    @Override
-    public Unit executeObjectCallWithEmptyResponse(Call<Unit> call) throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, null, true);
+        return executeObjectCallInternal(call, new ArrayList<>(), null, errorCatcher);
     }
 
     private <P> P executeObjectCallInternal(Call<P> call,
                                             List<Integer> acceptedErrorCodes,
                                             Class<P> errorClass,
-                                            APICallErrorCatcher errorCatcher,
-                                            boolean emptyBodyExpected) throws D2Error {
+                                            APICallErrorCatcher errorCatcher) throws D2Error {
         try {
             Response<P> response = call.execute();
             if (response.isSuccessful()) {
-                return processSuccessfulResponse(errorBuilder(call), response, emptyBodyExpected);
+                return processSuccessfulResponse(errorBuilder(call), response);
             } else {
                 String errorBody = errorMapper.getErrorBody(response);
                 if (userAccountDisabledErrorCatcher.isUserAccountLocked(response, errorBody)) {
@@ -131,11 +124,8 @@ private <P> void catchAndThrow(APICallErrorCatcher errorCatcher, D2Error.Builder
         }
     }
 
-    private <P> P processSuccessfulResponse(D2Error.Builder errorBuilder, Response<P> response,
-                                            boolean emptyBodyExpected) throws D2Error {
-        if (emptyBodyExpected) {
-            return null;
-        } else if (response.body() == null) {
+    private <P> P processSuccessfulResponse(D2Error.Builder errorBuilder, Response<P> response) throws D2Error {
+        if (response.body() == null) {
             throw storeAndReturn(errorMapper.responseException(errorBuilder, response, null));
         } else {
             return response.body();
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java
deleted file mode 100644
index 8384e08fb4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo.Columns;
-import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationPostCall;
-import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore;
-import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
-
-@Reusable
-public final class DataSetCompleteRegistrationCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration,
-        DataSetCompleteRegistrationCollectionRepository>
-        implements ReadOnlyWithUploadCollectionRepository<DataSetCompleteRegistration> {
-
-    private final DataSetCompleteRegistrationPostCall postCall;
-    private final DataSetCompleteRegistrationStore dataSetCompleteRegistrationStore;
-    private final UserCredentialsObjectRepository credentialsRepository;
-
-    @Inject
-    DataSetCompleteRegistrationCollectionRepository(
-            final DataSetCompleteRegistrationStore store,
-            final Map<String, ChildrenAppender<DataSetCompleteRegistration>> childrenAppenders,
-            final RepositoryScope scope,
-            final Handler<DataSetCompleteRegistration> handler,
-            final DataSetCompleteRegistrationPostCall postCall,
-            final UserCredentialsObjectRepository credentialsRepository) {
-
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new DataSetCompleteRegistrationCollectionRepository(store, childrenAppenders,
-                        s, handler, postCall, credentialsRepository)));
-
-        this.postCall = postCall;
-        this.dataSetCompleteRegistrationStore = store;
-        this.credentialsRepository = credentialsRepository;
-    }
-
-    public DataSetCompleteRegistrationObjectRepository value(final String period,
-                                                             final String organisationUnit,
-                                                             final String dataSet,
-                                                             final String attributeOptionCombo) {
-
-        RepositoryScope updatedScope = byPeriod().eq(period)
-                .byOrganisationUnitUid().eq(organisationUnit)
-                .byDataSetUid().eq(dataSet)
-                .byAttributeOptionComboUid().eq(attributeOptionCombo)
-                .scope;
-
-        return new DataSetCompleteRegistrationObjectRepository(
-                dataSetCompleteRegistrationStore, credentialsRepository, childrenAppenders,
-                updatedScope, period, organisationUnit, dataSet, attributeOptionCombo);
-    }
-
-    @Override
-    public Observable<D2Progress> upload() {
-        return Observable.fromCallable(() ->
-                bySyncState().in(State.uploadableStatesIncludingError()).blockingGetWithoutChildren()
-        ).flatMap(postCall::uploadDataSetCompleteRegistrations);
-    }
-
-    @Override
-    public void blockingUpload() {
-        upload().blockingSubscribe();
-    }
-
-
-    public StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> byPeriod() {
-        return cf.string(Columns.PERIOD);
-    }
-
-    public StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> byDataSetUid() {
-        return cf.string(Columns.DATA_SET);
-    }
-
-    public StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(Columns.ORGANISATION_UNIT);
-    }
-
-    public StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> byAttributeOptionComboUid() {
-        return cf.string(Columns.ATTRIBUTE_OPTION_COMBO);
-    }
-
-    public DateFilterConnector<DataSetCompleteRegistrationCollectionRepository> byDate() {
-        return cf.date(Columns.DATE);
-    }
-
-    public StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> byStoredBy() {
-        return cf.string(Columns.STORED_BY);
-    }
-
-    public BooleanFilterConnector<DataSetCompleteRegistrationCollectionRepository> byDeleted() {
-        return cf.bool(Columns.DELETED);
-    }
-
-    /**
-     * @deprecated Use {@link #bySyncState()} instead.
-     *
-     * @return
-     */
-    @Deprecated
-    public EnumFilterConnector<DataSetCompleteRegistrationCollectionRepository, State> byState() {
-        return bySyncState();
-    }
-
-    public EnumFilterConnector<DataSetCompleteRegistrationCollectionRepository, State> bySyncState() {
-        return cf.enumC(Columns.SYNC_STATE);
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
new file mode 100644
index 0000000000..5a4e846e0b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset
+
+import dagger.Reusable
+import io.reactivex.Observable
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.rx2.asObservable
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationPostCall
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore
+import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository
+import javax.inject.Inject
+
+@Reusable
+class DataSetCompleteRegistrationCollectionRepository @Inject internal constructor(
+    private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<DataSetCompleteRegistration>>,
+    scope: RepositoryScope,
+    handler: Handler<DataSetCompleteRegistration>,
+    private val postCall: DataSetCompleteRegistrationPostCall,
+    private val credentialsRepository: UserCredentialsObjectRepository
+) : ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationCollectionRepository>(
+    dataSetCompleteRegistrationStore, childrenAppenders, scope, FilterConnectorFactory(
+        scope
+    ) { s: RepositoryScope ->
+        DataSetCompleteRegistrationCollectionRepository(
+            dataSetCompleteRegistrationStore, childrenAppenders,
+            s, handler, postCall, credentialsRepository
+        )
+    }), ReadOnlyWithUploadCollectionRepository<DataSetCompleteRegistration> {
+    fun value(
+        period: String,
+        organisationUnit: String,
+        dataSet: String,
+        attributeOptionCombo: String
+    ): DataSetCompleteRegistrationObjectRepository {
+        val updatedScope = byPeriod().eq(period)
+            .byOrganisationUnitUid().eq(organisationUnit)
+            .byDataSetUid().eq(dataSet)
+            .byAttributeOptionComboUid().eq(attributeOptionCombo).scope
+        return DataSetCompleteRegistrationObjectRepository(
+            dataSetCompleteRegistrationStore, credentialsRepository, childrenAppenders,
+            updatedScope, period, organisationUnit, dataSet, attributeOptionCombo
+        )
+    }
+
+    override fun upload(): Observable<D2Progress> = flow {
+        val dataSetCompleteRegistrations =
+            bySyncState().`in`(*uploadableStatesIncludingError()).blockingGetWithoutChildren()
+
+        emitAll(postCall.uploadDataSetCompleteRegistrations(dataSetCompleteRegistrations))
+    }.asObservable()
+
+    override fun blockingUpload() {
+        upload().blockingSubscribe()
+    }
+
+    fun byPeriod(): StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.string(DataSetCompleteRegistrationTableInfo.Columns.PERIOD)
+    }
+
+    fun byDataSetUid(): StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.string(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET)
+    }
+
+    fun byOrganisationUnitUid(): StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.string(DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT)
+    }
+
+    fun byAttributeOptionComboUid(): StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.string(DataSetCompleteRegistrationTableInfo.Columns.ATTRIBUTE_OPTION_COMBO)
+    }
+
+    fun byDate(): DateFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.date(DataSetCompleteRegistrationTableInfo.Columns.DATE)
+    }
+
+    fun byStoredBy(): StringFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.string(DataSetCompleteRegistrationTableInfo.Columns.STORED_BY)
+    }
+
+    fun byDeleted(): BooleanFilterConnector<DataSetCompleteRegistrationCollectionRepository> {
+        return cf.bool(DataSetCompleteRegistrationTableInfo.Columns.DELETED)
+    }
+
+    /**
+     * @return
+     */
+    @Deprecated("Use {@link #bySyncState()} instead.\n" + "     \n" + "      ", ReplaceWith("bySyncState()"))
+    fun byState(): EnumFilterConnector<DataSetCompleteRegistrationCollectionRepository, State> {
+        return bySyncState()
+    }
+
+    fun bySyncState(): EnumFilterConnector<DataSetCompleteRegistrationCollectionRepository, State> {
+        return cf.enumC<State>(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE)
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 992726f5db..f0dda0100e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
-import java.net.HttpURLConnection
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flow
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.helpers.internal.DataStateHelper.errorIfOnline
 import org.hisp.dhis.android.core.arch.helpers.internal.DataStateHelper.forcedOrOwn
@@ -47,52 +47,40 @@ import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResp
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetCompleteRegistrationPostCall @Inject constructor(
     private val dataSetCompleteRegistrationService: DataSetCompleteRegistrationService,
     private val dataSetCompleteRegistrationImportHandler: DataSetCompleteRegistrationImportHandler,
-    private val apiCallExecutor: APICallExecutor,
     private val categoryOptionComboCollectionRepository: CategoryOptionComboCollectionRepository,
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
-    private val versionManager: DHISVersionManager
+    private val versionManager: DHISVersionManager,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) {
-    fun uploadDataSetCompleteRegistrations(
+    suspend fun uploadDataSetCompleteRegistrations(
         dataSetCompleteRegistrations: List<DataSetCompleteRegistration>
-    ): Observable<D2Progress> {
-        return Observable.defer {
-            if (dataSetCompleteRegistrations.isEmpty()) {
-                return@defer Observable.empty<D2Progress>()
-            } else {
-                val toPostDataSetCompleteRegistrations: MutableList<DataSetCompleteRegistration> = ArrayList()
-                val toDeleteDataSetCompleteRegistrations: MutableList<DataSetCompleteRegistration> = ArrayList()
-                for (dscr in dataSetCompleteRegistrations) {
-                    if (dscr.deleted()!!) {
-                        toDeleteDataSetCompleteRegistrations.add(dscr)
-                    } else {
-                        toPostDataSetCompleteRegistrations.add(dscr)
-                    }
-                }
-                val progressManager = D2ProgressManager(1)
-                return@defer Observable.create { emitter: ObservableEmitter<D2Progress> ->
-                    uploadInternal(
-                        progressManager,
-                        emitter,
-                        toPostDataSetCompleteRegistrations,
-                        toDeleteDataSetCompleteRegistrations
-                    )
-                }
-            }
+    ): Flow<D2Progress> {
+        if (dataSetCompleteRegistrations.isEmpty()) {
+            return emptyFlow()
         }
+        val toPostDataSetCompleteRegistrations = dataSetCompleteRegistrations.filterNot { it.deleted() == true }
+        val toDeleteDataSetCompleteRegistrations = dataSetCompleteRegistrations.filter { it.deleted() == true }
+        val progressManager = D2ProgressManager(1)
+        return uploadInternal(
+            progressManager,
+            toPostDataSetCompleteRegistrations,
+            toDeleteDataSetCompleteRegistrations
+        )
     }
 
     @Throws(D2Error::class)
-    private fun uploadInternal(
+    private suspend fun uploadInternal(
         progressManager: D2ProgressManager,
-        emitter: ObservableEmitter<D2Progress>,
         toPostDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
         toDeleteDataSetCompleteRegistrations: List<DataSetCompleteRegistration>
-    ) {
+    ) = flow {
         val payload = DataSetCompleteRegistrationPayload(toPostDataSetCompleteRegistrations)
         val dataValueImportSummary: DataValueImportSummary =
             if (toPostDataSetCompleteRegistrations.isEmpty()) {
@@ -100,7 +88,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
             } else {
                 markObjectsAs(toPostDataSetCompleteRegistrations, State.UPLOADING)
                 try {
-                    postCompleteRegistrations(payload)!!
+                    postCompleteRegistrations(payload).getOrThrow()
                 } catch (e: D2Error) {
                     markObjectsAs(toPostDataSetCompleteRegistrations, errorIfOnline(e))
                     throw e
@@ -116,7 +104,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
                     .uid(dataSetCompleteRegistration.attributeOptionCombo())
                     .blockingGet()
                 markObjectsAs(toDeleteDataSetCompleteRegistrations, State.UPLOADING)
-                apiCallExecutor.executeObjectCallWithEmptyResponse(
+                coroutineAPICallExecutor.wrap {
                     dataSetCompleteRegistrationService.deleteDataSetCompleteRegistration(
                         dataSetCompleteRegistration.dataSet(),
                         dataSetCompleteRegistration.period(),
@@ -125,7 +113,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
                         CollectionsHelper.semicolonSeparatedCollectionValues(getUids(coc.categoryOptions()!!)),
                         false
                     )
-                )
+                }
                 deletedDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
             } catch (d2Error: D2Error) {
                 withErrorDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
@@ -135,21 +123,21 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
             payload, dataValueImportSummary, deletedDataSetCompleteRegistrations,
             withErrorDataSetCompleteRegistrations
         )
-        emitter.onNext(progressManager.increaseProgress(DataSetCompleteRegistration::class.java, true))
-        emitter.onComplete()
+        emit(progressManager.increaseProgress(DataSetCompleteRegistration::class.java, true))
     }
 
-    private fun postCompleteRegistrations(payload: DataSetCompleteRegistrationPayload): DataValueImportSummary? {
+    private suspend fun postCompleteRegistrations(payload: DataSetCompleteRegistrationPayload): Result<DataValueImportSummary, D2Error> {
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
-            apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-                dataSetCompleteRegistrationService.postDataSetCompleteRegistrationsWebResponse(payload),
-                listOf(HttpURLConnection.HTTP_CONFLICT),
-                DataValueImportSummaryWebResponse::class.java
-            ).response
+            coroutineAPICallExecutor.wrap(
+                acceptedErrorCodes = listOf(HttpURLConnection.HTTP_CONFLICT),
+                errorClass = DataValueImportSummaryWebResponse::class.java
+            ) {
+                dataSetCompleteRegistrationService.postDataSetCompleteRegistrationsWebResponse(payload)
+            }.map { it.response }
         } else {
-            apiCallExecutor.executeObjectCall(
+            coroutineAPICallExecutor.wrap {
                 dataSetCompleteRegistrationService.postDataSetCompleteRegistrations(payload)
-            )
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
index 2fcc5506fd..477e68b9eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.common.Unit
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResponse
-import retrofit2.Call
 import retrofit2.http.*
 
 @Suppress("LongParameterList")
@@ -51,22 +50,22 @@ internal interface DataSetCompleteRegistrationService {
     ): DataSetCompleteRegistrationPayload
 
     @POST("completeDataSetRegistrations")
-    fun postDataSetCompleteRegistrations(
+    suspend fun postDataSetCompleteRegistrations(
         @Body dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload
-    ): Call<DataValueImportSummary>
+    ): DataValueImportSummary
 
     @POST("completeDataSetRegistrations")
-    fun postDataSetCompleteRegistrationsWebResponse(
+    suspend fun postDataSetCompleteRegistrationsWebResponse(
         @Body dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload
-    ): Call<DataValueImportSummaryWebResponse>
+    ): DataValueImportSummaryWebResponse
 
     @DELETE("completeDataSetRegistrations")
-    fun deleteDataSetCompleteRegistration(
+    suspend fun deleteDataSetCompleteRegistration(
         @Query("ds") dataSet: String,
         @Query("pe") periodId: String,
         @Query("ou") orgUnit: String,
         @Query("cc") categoryComboUid: String,
         @Query("cp") categoryOptionUids: String,
         @Query("multiOu") multiOrganisationUnit: Boolean
-    ): Call<Unit>
+    ): Unit
 }

From 32d79e9be37a1d22e5ea89a07d94ae238c591545 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 8 Jun 2023 13:48:39 +0200
Subject: [PATCH 017/478] [ANDROSDK-1689]
 DataSetCompleteRegistrationPostCallMockIntegrationShould

---
 ...gistrationPostCallMockIntegrationShould.kt | 138 ++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
new file mode 100644
index 0000000000..6e58d3b5d8
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
@@ -0,0 +1,138 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataEnqueable
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.text.SimpleDateFormat
+
+@RunWith(D2JunitRunner::class)
+class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegrationTestMetadataEnqueable() {
+
+    @After
+    @Throws(D2Error::class)
+    fun tearDown() {
+        d2.wipeModule().wipeData()
+    }
+
+    @Test
+    fun post_dataset_complete_registration_success() {
+        //Given a DatasetComplete registration to post
+        dhis2MockServer.enqueueMockResponse(200, "imports/data_value_import_summary_web_response.json")
+        val dataSetCompleteRegistration = provideDataSetCompleteRegistration()
+        d2.dataSetModule().dataSetCompleteRegistrations().value(
+            period = dataSetCompleteRegistration.period(),
+            organisationUnit = dataSetCompleteRegistration.organisationUnit(),
+            dataSet = dataSetCompleteRegistration.dataSet(),
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo()
+        ).blockingSet()
+
+        val toPostRepository = d2.dataSetModule()
+            .dataSetCompleteRegistrations()
+            .bySyncState().eq(State.TO_POST)
+
+        val syncedRepository = d2.dataSetModule()
+            .dataSetCompleteRegistrations()
+            .bySyncState().eq(State.SYNCED)
+
+        assertEquals(toPostRepository.blockingGet().size, 1)
+        assertEquals(syncedRepository.blockingGet().size, 0)
+
+        //When the object is uploaded
+        d2.dataSetModule().dataSetCompleteRegistrations().blockingUpload()
+
+        //Then the status is synced
+        assertEquals(toPostRepository.blockingGet().size, 0)
+        assertEquals(syncedRepository.blockingGet().size, 1)
+    }
+
+    @Test
+    fun post_dataset_delete_complete_registration_success() {
+        val toPostRepository = d2.dataSetModule()
+            .dataSetCompleteRegistrations()
+            .bySyncState().eq(State.TO_POST)
+
+        val syncedRepository = d2.dataSetModule()
+            .dataSetCompleteRegistrations()
+            .bySyncState().eq(State.SYNCED)
+
+        val toUpdateRepository = d2.dataSetModule()
+            .dataSetCompleteRegistrations()
+            .bySyncState().eq(State.TO_UPDATE)
+
+        val dataSetCompleteRegistration = provideDataSetCompleteRegistration()
+        var dObject = d2.dataSetModule().dataSetCompleteRegistrations().value(
+            period = dataSetCompleteRegistration.period(),
+            organisationUnit = dataSetCompleteRegistration.organisationUnit(),
+            dataSet = dataSetCompleteRegistration.dataSet(),
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo()
+        )
+
+        dhis2MockServer.enqueueMockResponse(200, "imports/data_value_import_summary_web_response.json")
+        dObject.blockingSet()
+        assertEquals(toPostRepository.blockingGet().size, 1)
+        assertEquals(syncedRepository.blockingGet().size, 0)
+
+        d2.dataSetModule().dataSetCompleteRegistrations().blockingUpload()
+
+        assertEquals(toPostRepository.blockingGet().size, 0)
+        assertEquals(syncedRepository.blockingGet().size, 1)
+
+        dhis2MockServer.enqueueMockResponse(200)
+        dObject = d2.dataSetModule().dataSetCompleteRegistrations().value(
+            period = dataSetCompleteRegistration.period(),
+            organisationUnit = dataSetCompleteRegistration.organisationUnit(),
+            dataSet = dataSetCompleteRegistration.dataSet(),
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo())
+        dObject.blockingDelete()
+        assertEquals(toUpdateRepository.blockingGet().size, 1)
+
+        d2.dataSetModule().dataSetCompleteRegistrations().blockingUpload()
+
+        assertEquals(toUpdateRepository.blockingGet().size, 0)
+    }
+
+    private fun provideDataSetCompleteRegistration() = DataSetCompleteRegistration.builder()
+        .period("2018")
+        .dataSet("BfMAe6Itzgt")
+        .attributeOptionCombo("bRowv6yZOF2")
+        .organisationUnit("DiszpKrYNg8")
+        .date(dateFormat.parse("2010-03-02"))
+        .storedBy("android")
+        .build()
+
+    private val dateFormat = SimpleDateFormat("yyyy-MM-dd")
+}
\ No newline at end of file

From 6a8bc07000c18da775e0566b62007e6e7727d30f Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 8 Jun 2023 14:04:08 +0200
Subject: [PATCH 018/478] [ANDROSDK-1689] ktlintCheck

---
 ...leteRegistrationPostCallMockIntegrationShould.kt | 13 +++++++------
 ...taSetCompleteRegistrationCollectionRepository.kt | 12 ++++++++----
 .../internal/DataSetCompleteRegistrationPostCall.kt |  8 +++++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
index 6e58d3b5d8..2ea2d2c108 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
@@ -28,6 +28,7 @@
 
 package org.hisp.dhis.android.core.dataset.internal
 
+import java.text.SimpleDateFormat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -37,7 +38,6 @@ import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.text.SimpleDateFormat
 
 @RunWith(D2JunitRunner::class)
 class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegrationTestMetadataEnqueable() {
@@ -50,7 +50,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
 
     @Test
     fun post_dataset_complete_registration_success() {
-        //Given a DatasetComplete registration to post
+        // Given a DatasetComplete registration to post
         dhis2MockServer.enqueueMockResponse(200, "imports/data_value_import_summary_web_response.json")
         val dataSetCompleteRegistration = provideDataSetCompleteRegistration()
         d2.dataSetModule().dataSetCompleteRegistrations().value(
@@ -71,10 +71,10 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
         assertEquals(toPostRepository.blockingGet().size, 1)
         assertEquals(syncedRepository.blockingGet().size, 0)
 
-        //When the object is uploaded
+        // When the object is uploaded
         d2.dataSetModule().dataSetCompleteRegistrations().blockingUpload()
 
-        //Then the status is synced
+        // Then the status is synced
         assertEquals(toPostRepository.blockingGet().size, 0)
         assertEquals(syncedRepository.blockingGet().size, 1)
     }
@@ -116,7 +116,8 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
             period = dataSetCompleteRegistration.period(),
             organisationUnit = dataSetCompleteRegistration.organisationUnit(),
             dataSet = dataSetCompleteRegistration.dataSet(),
-            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo())
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo()
+        )
         dObject.blockingDelete()
         assertEquals(toUpdateRepository.blockingGet().size, 1)
 
@@ -135,4 +136,4 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
         .build()
 
     private val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
index 5a4e846e0b..2b488aad4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.dataset
 
 import dagger.Reusable
 import io.reactivex.Observable
+import javax.inject.Inject
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asObservable
@@ -48,9 +49,9 @@ import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludi
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationPostCall
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore
 import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository
-import javax.inject.Inject
 
 @Reusable
+@Suppress("SpreadOperator", "TooManyFunctions")
 class DataSetCompleteRegistrationCollectionRepository @Inject internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataSetCompleteRegistration>>,
@@ -59,14 +60,17 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     private val postCall: DataSetCompleteRegistrationPostCall,
     private val credentialsRepository: UserCredentialsObjectRepository
 ) : ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationCollectionRepository>(
-    dataSetCompleteRegistrationStore, childrenAppenders, scope, FilterConnectorFactory(
+    dataSetCompleteRegistrationStore, childrenAppenders, scope,
+    FilterConnectorFactory(
         scope
     ) { s: RepositoryScope ->
         DataSetCompleteRegistrationCollectionRepository(
             dataSetCompleteRegistrationStore, childrenAppenders,
             s, handler, postCall, credentialsRepository
         )
-    }), ReadOnlyWithUploadCollectionRepository<DataSetCompleteRegistration> {
+    }
+),
+    ReadOnlyWithUploadCollectionRepository<DataSetCompleteRegistration> {
     fun value(
         period: String,
         organisationUnit: String,
@@ -133,4 +137,4 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     fun bySyncState(): EnumFilterConnector<DataSetCompleteRegistrationCollectionRepository, State> {
         return cf.enumC<State>(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index f0dda0100e..0ab7b8f560 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -28,6 +28,8 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
+import java.net.HttpURLConnection
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flow
@@ -47,8 +49,6 @@ import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResp
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import java.net.HttpURLConnection
-import javax.inject.Inject
 
 @Reusable
 internal class DataSetCompleteRegistrationPostCall @Inject constructor(
@@ -126,7 +126,9 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
         emit(progressManager.increaseProgress(DataSetCompleteRegistration::class.java, true))
     }
 
-    private suspend fun postCompleteRegistrations(payload: DataSetCompleteRegistrationPayload): Result<DataValueImportSummary, D2Error> {
+    private suspend fun postCompleteRegistrations(
+        payload: DataSetCompleteRegistrationPayload
+    ): Result<DataValueImportSummary, D2Error> {
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
             coroutineAPICallExecutor.wrap(
                 acceptedErrorCodes = listOf(HttpURLConnection.HTTP_CONFLICT),

From 8a420a09cf12be29f008e8824df7602261610f4d Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 8 Jun 2023 16:47:43 +0200
Subject: [PATCH 019/478] [ANDROSDK-1689] remove suspend when returning flows

---
 .../dataset/internal/DataSetCompleteRegistrationPostCall.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 0ab7b8f560..8aef61252c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -59,7 +59,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
     private val versionManager: DHISVersionManager,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) {
-    suspend fun uploadDataSetCompleteRegistrations(
+    fun uploadDataSetCompleteRegistrations(
         dataSetCompleteRegistrations: List<DataSetCompleteRegistration>
     ): Flow<D2Progress> {
         if (dataSetCompleteRegistrations.isEmpty()) {
@@ -76,7 +76,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
     }
 
     @Throws(D2Error::class)
-    private suspend fun uploadInternal(
+    private fun uploadInternal(
         progressManager: D2ProgressManager,
         toPostDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
         toDeleteDataSetCompleteRegistrations: List<DataSetCompleteRegistration>

From a8ae773a3c0b54d572b0d4e211d030b6872434cf Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 9 Jun 2023 07:40:39 +0200
Subject: [PATCH 020/478] [ANDROSDK-1689] Change response on deletion by 204

---
 .../DataSetCompleteRegistrationPostCallMockIntegrationShould.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
index 2ea2d2c108..c37416fe93 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
@@ -111,7 +111,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
         assertEquals(toPostRepository.blockingGet().size, 0)
         assertEquals(syncedRepository.blockingGet().size, 1)
 
-        dhis2MockServer.enqueueMockResponse(200)
+        dhis2MockServer.enqueueMockResponse(204)
         dObject = d2.dataSetModule().dataSetCompleteRegistrations().value(
             period = dataSetCompleteRegistration.period(),
             organisationUnit = dataSetCompleteRegistration.organisationUnit(),

From b8284cc9b3f7acb3936fba96ad0ca01e554f27fb Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 9 Jun 2023 07:52:44 +0200
Subject: [PATCH 021/478] [ANDROSDK-1689] Use DataUtils.SIMPLE_DATE_FORMAT

---
 ...aSetCompleteRegistrationPostCallMockIntegrationShould.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
index c37416fe93..34ef6ecdd7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
@@ -28,7 +28,7 @@
 
 package org.hisp.dhis.android.core.dataset.internal
 
-import java.text.SimpleDateFormat
+import org.hisp.dhis.android.core.arch.helpers.DateUtils.SIMPLE_DATE_FORMAT
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -131,9 +131,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
         .dataSet("BfMAe6Itzgt")
         .attributeOptionCombo("bRowv6yZOF2")
         .organisationUnit("DiszpKrYNg8")
-        .date(dateFormat.parse("2010-03-02"))
+        .date(SIMPLE_DATE_FORMAT.parse("2010-03-02"))
         .storedBy("android")
         .build()
-
-    private val dateFormat = SimpleDateFormat("yyyy-MM-dd")
 }

From fb2a1577e90d1e7c7c2f0cc3eb6003f1a67f3160 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Tue, 13 Jun 2023 13:07:22 +0200
Subject: [PATCH 022/478] [ANDROSDK-1689] mock response with empty body

---
 ...gistrationPostCallMockIntegrationShould.kt |  2 +-
 .../core/mockwebserver/Dhis2MockServer.java   | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
index 34ef6ecdd7..22f1e35123 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
@@ -111,7 +111,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
         assertEquals(toPostRepository.blockingGet().size, 0)
         assertEquals(syncedRepository.blockingGet().size, 1)
 
-        dhis2MockServer.enqueueMockResponse(204)
+        dhis2MockServer.enqueueMockResponseWithEmptyBody(204)
         dObject = d2.dataSetModule().dataSetCompleteRegistrations().value(
             period = dataSetCompleteRegistration.period(),
             organisationUnit = dataSetCompleteRegistration.organisationUnit(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java b/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java
index 06a709ad44..178c33f91c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/mockwebserver/Dhis2MockServer.java
@@ -28,6 +28,8 @@
 
 package org.hisp.dhis.android.core.mockwebserver;
 
+import static okhttp3.internal.Util.UTC;
+
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -46,8 +48,6 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-import static okhttp3.internal.Util.UTC;
-
 @SuppressWarnings("PMD")
 public class Dhis2MockServer {
     private static final int OK_CODE = 200;
@@ -117,23 +117,23 @@ public class Dhis2MockServer {
     private static final String SMS_METADATA = "sms/metadata_ids.json";
     private static final String MOCKWEBSERVER = "Dhis2MockWebServer";
 
-    private MockWebServer server;
-    private IFileReader fileReader;
-    private Dhis2Dispatcher dhis2Dispatcher;
+    private final MockWebServer server;
+    private final IFileReader fileReader;
+    private final Dhis2Dispatcher dhis2Dispatcher;
 
-    public Dhis2MockServer(IFileReader fileReader, int port) throws IOException {
+    public Dhis2MockServer(IFileReader fileReader, int port) {
         this.fileReader = fileReader;
         this.server = new MockWebServer();
         dhis2Dispatcher = new Dhis2Dispatcher(fileReader, new ResponseController());
         start(port);
     }
 
-    public Dhis2MockServer(int port) throws IOException {
+    public Dhis2MockServer(int port) {
         this(new ResourcesFileReader(), port);
         dhis2Dispatcher.configInternalResponseController();
     }
 
-    private void start(int port) throws IOException {
+    private void start(int port) {
         try {
             this.server.start(port);
         } catch (IOException e) {
@@ -141,7 +141,7 @@ private void start(int port) throws IOException {
         }
     }
 
-    public void shutdown() throws IOException {
+    public void shutdown() {
         try {
             this.server.shutdown();
         } catch (IOException e) {
@@ -157,6 +157,12 @@ public void enqueueMockResponse(int code) {
         enqueueMockResponseText(code, "{}");
     }
 
+    public void enqueueMockResponseWithEmptyBody(int code) {
+        MockResponse mockResponse = new MockResponse();
+        mockResponse.setResponseCode(code);
+        server.enqueue(mockResponse);
+    }
+
     public void enqueueMockResponseText(int code, String response) {
         MockResponse mockResponse = new MockResponse();
         mockResponse.setResponseCode(code);

From cd54283901782dce0a31b674d053c45cc1191a02 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 14 Jun 2023 08:13:22 +0200
Subject: [PATCH 023/478] [ANDROSDK-1689] Change Retrofit 204 handling response
 from Unit to Response<Unit>

---
 .../DataSetCompleteRegistrationPostCall.kt    | 45 +++++++++++--------
 .../DataSetCompleteRegistrationService.kt     |  3 +-
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 8aef61252c..b0db683b67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -98,26 +98,33 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
         val deletedDataSetCompleteRegistrations: MutableList<DataSetCompleteRegistration> = ArrayList()
         val withErrorDataSetCompleteRegistrations: MutableList<DataSetCompleteRegistration> = ArrayList()
         for (dataSetCompleteRegistration in toDeleteDataSetCompleteRegistrations) {
-            try {
-                val coc = categoryOptionComboCollectionRepository
-                    .withCategoryOptions()
-                    .uid(dataSetCompleteRegistration.attributeOptionCombo())
-                    .blockingGet()
-                markObjectsAs(toDeleteDataSetCompleteRegistrations, State.UPLOADING)
-                coroutineAPICallExecutor.wrap {
-                    dataSetCompleteRegistrationService.deleteDataSetCompleteRegistration(
-                        dataSetCompleteRegistration.dataSet(),
-                        dataSetCompleteRegistration.period(),
-                        dataSetCompleteRegistration.organisationUnit(),
-                        coc.categoryCombo()!!.uid(),
-                        CollectionsHelper.semicolonSeparatedCollectionValues(getUids(coc.categoryOptions()!!)),
-                        false
-                    )
+            val coc = categoryOptionComboCollectionRepository
+                .withCategoryOptions()
+                .uid(dataSetCompleteRegistration.attributeOptionCombo())
+                .blockingGet()
+            markObjectsAs(toDeleteDataSetCompleteRegistrations, State.UPLOADING)
+            coroutineAPICallExecutor.wrap {
+                dataSetCompleteRegistrationService.deleteDataSetCompleteRegistration(
+                    dataSetCompleteRegistration.dataSet(),
+                    dataSetCompleteRegistration.period(),
+                    dataSetCompleteRegistration.organisationUnit(),
+                    coc.categoryCombo()!!.uid(),
+                    CollectionsHelper.semicolonSeparatedCollectionValues(getUids(coc.categoryOptions()!!)),
+                    false
+                )
+            }.fold(
+                onSuccess = { result ->
+                    if (result.isSuccessful) {
+                        deletedDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
+                    } else {
+                        withErrorDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
+                    }
+                },
+
+                onFailure = {
+                    withErrorDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
                 }
-                deletedDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
-            } catch (d2Error: D2Error) {
-                withErrorDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
-            }
+            )
         }
         dataSetCompleteRegistrationImportHandler.handleImportSummary(
             payload, dataValueImportSummary, deletedDataSetCompleteRegistrations,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
index 477e68b9eb..a096d89a94 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
@@ -33,6 +33,7 @@ import org.hisp.dhis.android.core.common.Unit
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResponse
+import retrofit2.Response
 import retrofit2.http.*
 
 @Suppress("LongParameterList")
@@ -67,5 +68,5 @@ internal interface DataSetCompleteRegistrationService {
         @Query("cc") categoryComboUid: String,
         @Query("cp") categoryOptionUids: String,
         @Query("multiOu") multiOrganisationUnit: Boolean
-    ): Unit
+    ): Response<Unit>
 }

From 9b9c902aacd514dc02d006c26109593c66b101f3 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 23 Jun 2023 10:48:19 +0200
Subject: [PATCH 024/478] [ANDROSDK-1688] feature: added Style to indicators

---
 ...ectionRepositoryMockIntegrationShould.java | 16 +++++++++++
 core/src/main/assets/migrations/148.sql       |  4 +++
 core/src/main/assets/snapshots/snapshot.sql   |  2 +-
 .../internal/BaseDatabaseOpenHelper.java      |  2 +-
 .../android/core/indicator/Indicator.java     | 26 +++++++++++++++---
 .../IndicatorCollectionRepository.java        |  8 ++++++
 .../core/indicator/IndicatorTableInfo.java    |  5 ++--
 .../indicator/internal/IndicatorFields.java   |  4 ++-
 .../indicator/internal/IndicatorStore.java    | 27 ++++++++++---------
 .../core/data/indicator/IndicatorSamples.java |  4 ++-
 .../resources/indicators/indicator.json       |  6 ++++-
 .../resources/indicators/indicators.json      |  6 ++++-
 .../core/indicator/IndicatorShould.java       |  2 ++
 13 files changed, 87 insertions(+), 25 deletions(-)
 create mode 100644 core/src/main/assets/migrations/148.sql

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java
index c67eb4f4d8..97149ae53f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java
@@ -116,6 +116,22 @@ public void filter_by_url() {
         assertThat(indicators.size()).isEqualTo(1);
     }
 
+    @Test
+    public void filter_by_color() {
+        List<Indicator> indicators = d2.indicatorModule().indicators()
+                .byColor().eq("#FF0000")
+                .blockingGet();
+        assertThat(indicators.size()).isEqualTo(1);
+    }
+
+    @Test
+    public void filter_by_icon() {
+        List<Indicator> indicators = d2.indicatorModule().indicators()
+                .byIcon().eq("circle")
+                .blockingGet();
+        assertThat(indicators.size()).isEqualTo(1);
+    }
+
     @Test
     public void filter_by_dataSetUid() {
         List<Indicator> indicators = d2.indicatorModule().indicators()
diff --git a/core/src/main/assets/migrations/148.sql b/core/src/main/assets/migrations/148.sql
new file mode 100644
index 0000000000..c2cacaa898
--- /dev/null
+++ b/core/src/main/assets/migrations/148.sql
@@ -0,0 +1,4 @@
+# Add style properties in Indicator table (ANDROSDK-1688)
+
+ALTER TABLE Indicator ADD COLUMN color TEXT;
+ALTER TABLE Indicator ADD COLUMN icon TEXT;
\ No newline at end of file
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index 46d3593e9b..85c8346ead 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -24,7 +24,7 @@ CREATE TABLE CategoryCategoryComboLink (_id INTEGER PRIMARY KEY AUTOINCREMENT, c
 CREATE TABLE CategoryOptionCombo (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, categoryCombo TEXT, FOREIGN KEY (categoryCombo) REFERENCES CategoryCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE DataSet (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, periodType TEXT, categoryCombo TEXT NOT NULL, mobile INTEGER, version INTEGER, expiryDays INTEGER, timelyDays INTEGER, notifyCompletingUser INTEGER, openFuturePeriods INTEGER, fieldCombinationRequired INTEGER, validCompleteOnly INTEGER, noValueRequiresComment INTEGER, skipOffline INTEGER, dataElementDecoration INTEGER, renderAsTabs INTEGER, renderHorizontally INTEGER, accessDataWrite INTEGER, workflow TEXT, color TEXT, icon TEXT, FOREIGN KEY (categoryCombo) REFERENCES CategoryCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE DataSetDataElementLink (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSet TEXT NOT NULL, dataElement TEXT NOT NULL, categoryCombo TEXT REFERENCES CategoryCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataSet) REFERENCES DataSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (dataSet, dataElement));
-CREATE TABLE Indicator (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, annualized INTEGER, indicatorType TEXT, numerator TEXT, numeratorDescription TEXT, denominator TEXT, denominatorDescription TEXT, url TEXT, decimals INTEGER, FOREIGN KEY (indicatorType) REFERENCES IndicatorType (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
+CREATE TABLE Indicator (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, annualized INTEGER, indicatorType TEXT, numerator TEXT, numeratorDescription TEXT, denominator TEXT, denominatorDescription TEXT, url TEXT, decimals INTEGER, color TEXT, icon TEXT, FOREIGN KEY (indicatorType) REFERENCES IndicatorType (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE DataSetIndicatorLink (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSet TEXT NOT NULL, indicator TEXT NOT NULL, FOREIGN KEY (dataSet) REFERENCES DataSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (indicator) REFERENCES Indicator (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (dataSet, indicator));
 CREATE TABLE Period (_id INTEGER PRIMARY KEY AUTOINCREMENT, periodId TEXT, periodType TEXT, startDate TEXT, endDate TEXT, UNIQUE (periodId));
 CREATE TABLE ValueTypeDeviceRendering (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, objectTable TEXT, deviceType TEXT, type TEXT, min INTEGER, max INTEGER, step INTEGER, decimalPoints INTEGER, UNIQUE (uid, deviceType));
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java
index 45075ea0dd..7b8897890c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java
@@ -35,7 +35,7 @@
 
 class BaseDatabaseOpenHelper {
 
-    static final int VERSION = 147;
+    static final int VERSION = 148;
 
     private final AssetManager assetManager;
     private final int targetVersion;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/Indicator.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/Indicator.java
index 0a2f3644c5..915a38d8d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/Indicator.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/Indicator.java
@@ -42,13 +42,16 @@
 import org.hisp.dhis.android.core.arch.db.adapters.ignore.internal.IgnoreObjectWithUidListColumnAdapter;
 import org.hisp.dhis.android.core.common.BaseNameableObject;
 import org.hisp.dhis.android.core.common.CoreObject;
+import org.hisp.dhis.android.core.common.ObjectStyle;
+import org.hisp.dhis.android.core.common.ObjectWithStyle;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 
 import java.util.List;
 
 @AutoValue
 @JsonDeserialize(builder = AutoValue_Indicator.Builder.class)
-public abstract class Indicator extends BaseNameableObject implements CoreObject {
+public abstract class Indicator extends BaseNameableObject
+        implements CoreObject, ObjectWithStyle<Indicator, Indicator.Builder> {
 
     @Nullable
     @JsonProperty()
@@ -86,7 +89,7 @@ public abstract class Indicator extends BaseNameableObject implements CoreObject
     @Nullable
     @JsonProperty()
     @ColumnAdapter(IgnoreObjectWithUidListColumnAdapter.class)
-    public abstract List<ObjectWithUid>  legendSets();
+    public abstract List<ObjectWithUid> legendSets();
 
     public static Builder builder() {
         return new $$AutoValue_Indicator.Builder();
@@ -100,7 +103,8 @@ public static Indicator create(Cursor cursor) {
 
     @AutoValue.Builder
     @JsonPOJOBuilder(withPrefix = "")
-    public static abstract class Builder extends BaseNameableObject.Builder<Builder> {
+    public static abstract class Builder extends BaseNameableObject.Builder<Builder>
+            implements ObjectWithStyle.Builder<Indicator, Indicator.Builder> {
         public abstract Builder id(Long id);
 
         public abstract Builder annualized(Boolean annualized);
@@ -121,6 +125,20 @@ public static abstract class Builder extends BaseNameableObject.Builder<Builder>
 
         public abstract Builder decimals(Integer decimals);
 
-        public abstract Indicator build();
+        abstract Indicator autoBuild();
+
+        // Auxiliary fields
+        abstract ObjectStyle style();
+
+        public Indicator build() {
+            try {
+                style();
+            } catch (IllegalStateException e) {
+                style(ObjectStyle.builder().build());
+            }
+
+            return autoBuild();
+        }
+
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
index 0bbe658d2d..2b31c27345 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
@@ -85,6 +85,14 @@ public StringFilterConnector<IndicatorCollectionRepository> byUrl() {
         return cf.string(Columns.URL);
     }
 
+    public StringFilterConnector<IndicatorCollectionRepository> byColor() {
+        return cf.string(Columns.COLOR);
+    }
+
+    public StringFilterConnector<IndicatorCollectionRepository> byIcon() {
+        return cf.string(Columns.ICON);
+    }
+
     public IndicatorCollectionRepository withLegendSets() {
         return cf.withChild(IndicatorFields.LEGEND_SETS);
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java
index cf94c01cc4..5d7cd65a04 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java
@@ -31,7 +31,7 @@
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo;
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
 import org.hisp.dhis.android.core.common.CoreColumns;
-import org.hisp.dhis.android.core.common.NameableColumns;
+import org.hisp.dhis.android.core.common.NameableWithStyleColumns;
 
 public final class IndicatorTableInfo {
 
@@ -51,7 +51,7 @@ public CoreColumns columns() {
         }
     };
 
-    public static class Columns extends NameableColumns {
+    public static class Columns extends NameableWithStyleColumns {
 
         public final static String ANNUALIZED = "annualized";
         public final static String INDICATOR_TYPE = "indicatorType";
@@ -59,6 +59,7 @@ public static class Columns extends NameableColumns {
         public final static String NUMERATOR_DESCRIPTION = "numeratorDescription";
         public final static String DENOMINATOR = "denominator";
         public final static String DENOMINATOR_DESCRIPTION = "denominatorDescription";
+
         public final static String URL = "url";
         public final static String DECIMALS = "decimals";
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
index ef0cfad99a..4da0475480 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
@@ -56,7 +56,9 @@ public final class IndicatorFields {
                     fh.<String>field(Columns.DENOMINATOR_DESCRIPTION),
                     fh.<String>field(Columns.URL),
                     fh.<LegendSet>nestedField(LEGEND_SETS).with(LegendSetFields.uid),
-                    fh.<Integer>field(Columns.DECIMALS)
+                    fh.<Integer>field(Columns.DECIMALS),
+                    fh.<String>field(Columns.COLOR),
+                    fh.<String>field(Columns.ICON)
             ).build();
 
     private IndicatorFields() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
index 99904cd062..2af1b86a77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
@@ -28,8 +28,10 @@
 
 package org.hisp.dhis.android.core.indicator.internal;
 
+import androidx.annotation.NonNull;
+
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder;
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
@@ -38,24 +40,23 @@
 import org.hisp.dhis.android.core.indicator.Indicator;
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo;
 
-import androidx.annotation.NonNull;
-
 public final class IndicatorStore {
 
-    private IndicatorStore() {}
+    private IndicatorStore() {
+    }
 
-    private static StatementBinder<Indicator> BINDER = new NameableStatementBinder<Indicator>() {
+    private static StatementBinder<Indicator> BINDER = new NameableWithStyleStatementBinder<Indicator>() {
         @Override
         public void bindToStatement(@NonNull Indicator o, @NonNull StatementWrapper w) {
             super.bindToStatement(o, w);
-            w.bind(11, o.annualized());
-            w.bind(12, UidsHelper.getUidOrNull(o.indicatorType()));
-            w.bind(13, o.numerator());
-            w.bind(14, o.numeratorDescription());
-            w.bind(15, o.denominator());
-            w.bind(16, o.denominatorDescription());
-            w.bind(17, o.url());
-            w.bind(18, o.decimals());
+            w.bind(13, o.annualized());
+            w.bind(14, UidsHelper.getUidOrNull(o.indicatorType()));
+            w.bind(15, o.numerator());
+            w.bind(16, o.numeratorDescription());
+            w.bind(17, o.denominator());
+            w.bind(18, o.denominatorDescription());
+            w.bind(19, o.url());
+            w.bind(20, o.decimals());
         }
     };
 
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java
index 561da203da..b1aa540491 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java
@@ -28,6 +28,7 @@
 
 package org.hisp.dhis.android.core.data.indicator;
 
+import org.hisp.dhis.android.core.common.ObjectStyle;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.indicator.Indicator;
 
@@ -48,7 +49,8 @@ public static Indicator getIndicator() {
                 .denominator("#{c.d}")
                 .denominatorDescription("den descr")
                 .url("dhis2.org")
-                .decimals(2);
+                .decimals(2)
+                .style(ObjectStyle.builder().color("#FF0000").icon("circle").build());
         return indicatorBuilder.build();
     }
 }
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/indicators/indicator.json b/core/src/sharedTest/resources/indicators/indicator.json
index 041a0e5b34..071fb0a536 100644
--- a/core/src/sharedTest/resources/indicators/indicator.json
+++ b/core/src/sharedTest/resources/indicators/indicator.json
@@ -17,5 +17,9 @@
   "indicatorType": {
     "id": "bWuNrMHEoZ0"
   },
-  "decimals": 3
+  "decimals": 3,
+  "style": {
+    "color": "#FF0000",
+    "icon": "circle"
+  }
 }
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/indicators/indicators.json b/core/src/sharedTest/resources/indicators/indicators.json
index d1e50acf4f..091733c36f 100644
--- a/core/src/sharedTest/resources/indicators/indicators.json
+++ b/core/src/sharedTest/resources/indicators/indicators.json
@@ -23,7 +23,11 @@
         {
           "id": "rtOkbpGEud4"
         }
-      ]
+      ],
+      "style": {
+        "color": "#FF0000",
+        "icon": "circle"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java
index 29fe7f5946..d64241e996 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java
@@ -31,6 +31,7 @@
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
 import org.hisp.dhis.android.core.common.BaseObjectShould;
 import org.hisp.dhis.android.core.common.ObjectShould;
+import org.hisp.dhis.android.core.common.ObjectStyle;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.junit.Test;
 
@@ -73,5 +74,6 @@ public void map_from_json_string() throws IOException, ParseException {
         assertThat(indicator.url()).isEqualTo("");
         assertThat(indicator.indicatorType()).isEqualTo(ObjectWithUid.create("bWuNrMHEoZ0"));
         assertThat(indicator.decimals()).isEqualTo(3);
+        assertThat(indicator.style()).isEqualTo(ObjectStyle.builder().color("#FF0000").icon("circle").build());
     }
 }
\ No newline at end of file

From 66f11a3710b5bed7bff8cfce1c445028265e99b5 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 25 Jun 2023 13:42:03 +0200
Subject: [PATCH 025/478] [ANDROSDK-1688] Refactor Indicator tests to Kotlin

---
 ...ava => IndicatorStoreIntegrationShould.kt} |  40 ++---
 ...ectionRepositoryMockIntegrationShould.java | 150 ------------------
 ...llectionRepositoryMockIntegrationShould.kt | 145 +++++++++++++++++
 .../core/indicator/IndicatorShould.java       |  79 ---------
 .../android/core/indicator/IndicatorShould.kt |  76 +++++++++
 5 files changed, 238 insertions(+), 252 deletions(-)
 rename core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorStoreIntegrationShould.java => IndicatorStoreIntegrationShould.kt} (65%)
 delete mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
similarity index 65%
rename from core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.java
rename to core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
index 907ca88602..778bbb85ae 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
@@ -26,33 +26,27 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.indicator.internal;
+package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractIntegrationShould;
-import org.hisp.dhis.android.core.data.indicator.IndicatorSamples;
-import org.hisp.dhis.android.core.indicator.Indicator;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo;
-import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory;
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
-import org.junit.runner.RunWith;
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractIntegrationShould
+import org.hisp.dhis.android.core.data.indicator.IndicatorSamples
+import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo
+import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 
-@RunWith(D2JunitRunner.class)
-public class IndicatorStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Indicator> {
-
-    public IndicatorStoreIntegrationShould() {
-        super(IndicatorStore.create(TestDatabaseAdapterFactory.get()), IndicatorTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
-    }
-
-    @Override
-    protected Indicator buildObject() {
-        return IndicatorSamples.getIndicator();
+class IndicatorStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Indicator>(
+    IndicatorStore.create(TestDatabaseAdapterFactory.get()),
+    IndicatorTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
+) {
+    override fun buildObject(): Indicator {
+        return IndicatorSamples.getIndicator()
     }
 
-    @Override
-    protected Indicator buildObjectToUpdate() {
+    override fun buildObjectToUpdate(): Indicator {
         return IndicatorSamples.getIndicator().toBuilder()
-                .indicatorType(ObjectWithUid.create("new_indicator_type_uid"))
-                .build();
+            .indicatorType(ObjectWithUid.create("new_indicator_type_uid"))
+            .build()
     }
 }
\ No newline at end of file
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java
deleted file mode 100644
index 97149ae53f..0000000000
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *  
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *  
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *  
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.testapp.indicator;
-
-import org.hisp.dhis.android.core.indicator.Indicator;
-import org.hisp.dhis.android.core.program.ProgramIndicator;
-import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(D2JunitRunner.class)
-public class IndicatorCollectionRepositoryMockIntegrationShould extends BaseMockIntegrationTestFullDispatcher {
-
-    @Test
-    public void find_all() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void include_legend_sets_as_children() {
-        Indicator indicator = d2.indicatorModule().indicators()
-                .withLegendSets()
-                .one()
-                .blockingGet();
-
-        assertThat(indicator.legendSets().size()).isEqualTo(1);
-        assertThat(indicator.legendSets().get(0).uid()).isEqualTo("rtOkbpGEud4");
-    }
-
-    @Test
-    public void filter_by_annualized() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byAnnualized().isFalse()
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_indicator_type_url() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byIndicatorTypeUid().eq("bWuNrMHEoZ0")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_numerator() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byNumerator().eq("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_numerator_description() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byNumeratorDescription().eq("ANC1-ANC3")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_denominator() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byDenominator().eq("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_denominator_description() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byDenominatorDescription().eq("Total 1st ANC visits")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_url() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byUrl().eq("url")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_color() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byColor().eq("#FF0000")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_icon() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byIcon().eq("circle")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_dataSetUid() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .byDataSetUid("lyLU2wR22tC")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-
-    @Test
-    public void filter_by_sectionUid() {
-        List<Indicator> indicators = d2.indicatorModule().indicators()
-                .bySectionUid("Y2rk0vzgvAx")
-                .blockingGet();
-        assertThat(indicators.size()).isEqualTo(1);
-    }
-}
\ No newline at end of file
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
new file mode 100644
index 0000000000..03777dfe3a
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -0,0 +1,145 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.testapp.indicator
+
+import com.google.common.truth.Truth
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@RunWith(D2JunitRunner::class)
+class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+    @Test
+    fun find_all() {
+        val indicators = d2.indicatorModule().indicators()
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun include_legend_sets_as_children() {
+        val indicator = d2.indicatorModule().indicators()
+            .withLegendSets()
+            .one()
+            .blockingGet()
+        Truth.assertThat(indicator.legendSets()!!.size).isEqualTo(1)
+        Truth.assertThat(indicator.legendSets()!![0].uid()).isEqualTo("rtOkbpGEud4")
+    }
+
+    @Test
+    fun filter_by_annualized() {
+        val indicators = d2.indicatorModule().indicators()
+            .byAnnualized().isFalse
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_indicator_type_url() {
+        val indicators = d2.indicatorModule().indicators()
+            .byIndicatorTypeUid().eq("bWuNrMHEoZ0")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_numerator() {
+        val indicators = d2.indicatorModule().indicators()
+            .byNumerator()
+            .eq("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_numerator_description() {
+        val indicators = d2.indicatorModule().indicators()
+            .byNumeratorDescription().eq("ANC1-ANC3")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_denominator() {
+        val indicators = d2.indicatorModule().indicators()
+            .byDenominator().eq("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_denominator_description() {
+        val indicators = d2.indicatorModule().indicators()
+            .byDenominatorDescription().eq("Total 1st ANC visits")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_url() {
+        val indicators = d2.indicatorModule().indicators()
+            .byUrl().eq("url")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_color() {
+        val indicators = d2.indicatorModule().indicators()
+            .byColor().eq("#FF0000")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_icon() {
+        val indicators = d2.indicatorModule().indicators()
+            .byIcon().eq("circle")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_dataSetUid() {
+        val indicators = d2.indicatorModule().indicators()
+            .byDataSetUid("lyLU2wR22tC")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+
+    @Test
+    fun filter_by_sectionUid() {
+        val indicators = d2.indicatorModule().indicators()
+            .bySectionUid("Y2rk0vzgvAx")
+            .blockingGet()
+        Truth.assertThat(indicators.size).isEqualTo(1)
+    }
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java
deleted file mode 100644
index d64241e996..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.indicator;
-
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.common.BaseObjectShould;
-import org.hisp.dhis.android.core.common.ObjectShould;
-import org.hisp.dhis.android.core.common.ObjectStyle;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.text.ParseException;
-
-import static com.google.common.truth.Truth.assertThat;
-
-public class IndicatorShould extends BaseObjectShould implements ObjectShould {
-
-    public IndicatorShould() {
-        super("indicators/indicator.json");
-    }
-
-    @Override
-    @Test
-    public void map_from_json_string() throws IOException, ParseException {
-        Indicator indicator = objectMapper.readValue(jsonStream, Indicator.class);
-
-        assertThat(indicator.code()).isEqualTo("IN_52462");
-        assertThat(indicator.lastUpdated()).isEqualTo(
-                BaseIdentifiableObject.DATE_FORMAT.parse("2013-03-21T11:17:44.926"));
-        assertThat(indicator.uid()).isEqualTo("ReUHfIn0pTQ");
-        assertThat(indicator.created()).isEqualTo(
-                BaseIdentifiableObject.DATE_FORMAT.parse("2012-11-05T09:16:29.054"));
-        assertThat(indicator.name()).isEqualTo("ANC 1-3 Dropout Rate");
-        assertThat(indicator.shortName()).isEqualTo("ANC 1-3 Dropout Rate");
-        assertThat(indicator.description()).isEqualTo("Indicates the percentage of clients dropping" +
-                " out between the 1st and the 3rd ANC visit. Calculated as the difference between" +
-                " ANC1 and ANC3 by the ANC 1 visits.");
-        assertThat(indicator.deleted()).isNull();
-
-        assertThat(indicator.annualized()).isFalse();
-        assertThat(indicator.numerator()).isEqualTo("#{fbfJHSPpUQD.pq2XI5kz2BY}+#" +
-                "{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}");
-        assertThat(indicator.numeratorDescription()).isEqualTo("ANC1-ANC3");
-        assertThat(indicator.denominator())
-                .isEqualTo("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}");
-        assertThat(indicator.denominatorDescription()).isEqualTo("Total 1st ANC visits");
-        assertThat(indicator.url()).isEqualTo("");
-        assertThat(indicator.indicatorType()).isEqualTo(ObjectWithUid.create("bWuNrMHEoZ0"));
-        assertThat(indicator.decimals()).isEqualTo(3);
-        assertThat(indicator.style()).isEqualTo(ObjectStyle.builder().color("#FF0000").icon("circle").build());
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
new file mode 100644
index 0000000000..6a0180f91b
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator
+
+import com.google.common.truth.Truth
+import java.io.IOException
+import java.text.ParseException
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.common.BaseObjectShould
+import org.hisp.dhis.android.core.common.ObjectShould
+import org.hisp.dhis.android.core.common.ObjectStyle
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.junit.Test
+
+class IndicatorShould : BaseObjectShould("indicators/indicator.json"), ObjectShould {
+    @Test
+    @Throws(IOException::class, ParseException::class)
+    override fun map_from_json_string() {
+        val indicator = objectMapper.readValue(jsonStream, Indicator::class.java)
+        Truth.assertThat(indicator.code()).isEqualTo("IN_52462")
+        Truth.assertThat(indicator.lastUpdated()).isEqualTo(
+            BaseIdentifiableObject.DATE_FORMAT.parse("2013-03-21T11:17:44.926")
+        )
+        Truth.assertThat(indicator.uid()).isEqualTo("ReUHfIn0pTQ")
+        Truth.assertThat(indicator.created()).isEqualTo(
+            BaseIdentifiableObject.DATE_FORMAT.parse("2012-11-05T09:16:29.054")
+        )
+        Truth.assertThat(indicator.name()).isEqualTo("ANC 1-3 Dropout Rate")
+        Truth.assertThat(indicator.shortName()).isEqualTo("ANC 1-3 Dropout Rate")
+        Truth.assertThat(indicator.description()).isEqualTo(
+            "Indicates the percentage of clients dropping" +
+                " out between the 1st and the 3rd ANC visit. Calculated as the difference between" +
+                " ANC1 and ANC3 by the ANC 1 visits."
+        )
+        Truth.assertThat(indicator.deleted()).isNull()
+        Truth.assertThat(indicator.annualized()).isFalse()
+        Truth.assertThat(indicator.numerator()).isEqualTo(
+            "#{fbfJHSPpUQD.pq2XI5kz2BY}+#" +
+                "{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}"
+        )
+        Truth.assertThat(indicator.numeratorDescription()).isEqualTo("ANC1-ANC3")
+        Truth.assertThat(indicator.denominator())
+            .isEqualTo("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}")
+        Truth.assertThat(indicator.denominatorDescription()).isEqualTo("Total 1st ANC visits")
+        Truth.assertThat(indicator.url()).isEqualTo("")
+        Truth.assertThat(indicator.indicatorType()).isEqualTo(ObjectWithUid.create("bWuNrMHEoZ0"))
+        Truth.assertThat(indicator.decimals()).isEqualTo(3)
+        Truth.assertThat(indicator.style()).isEqualTo(ObjectStyle.builder().color("#FF0000").icon("circle").build())
+    }
+}
\ No newline at end of file

From edb1f93340a613cc96158593be12bc9ae46ad28c Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 26 Jun 2023 09:14:31 +0200
Subject: [PATCH 026/478] [ANDROSDK-1688] Refactor indicator-related code (no
 base classes, tests already migrated) to Kotlin.

---
 .../IndicatorStoreIntegrationShould.kt        |  6 +-
 ...llectionRepositoryMockIntegrationShould.kt |  3 +-
 ...nHelper.java => BaseDatabaseOpenHelper.kt} | 44 +++++------
 .../IndicatorCollectionRepository.java        |  3 +-
 ...orTableInfo.java => IndicatorTableInfo.kt} | 79 +++++++++----------
 .../IndicatorTypeCollectionRepository.java    |  1 +
 ...bleInfo.java => IndicatorTypeTableInfo.kt} | 51 ++++++------
 .../DataSetIndicatorChildrenAppender.java     |  2 +-
 .../indicator/internal/IndicatorFields.java   |  3 +-
 .../internal/IndicatorModuleWiper.java        |  4 +-
 .../indicator/internal/IndicatorStore.java    |  3 +-
 .../internal/IndicatorTypeFields.java         |  1 +
 .../internal/IndicatorTypeStore.java          |  2 +-
 ...icatorSamples.java => IndicatorSamples.kt} | 32 ++++----
 14 files changed, 112 insertions(+), 122 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/{BaseDatabaseOpenHelper.java => BaseDatabaseOpenHelper.kt} (66%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/{IndicatorTableInfo.java => IndicatorTableInfo.kt} (53%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/{IndicatorTypeTableInfo.java => IndicatorTypeTableInfo.kt} (64%)
 rename core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/{IndicatorSamples.java => IndicatorSamples.kt} (76%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
index 778bbb85ae..85a05d0b6a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
@@ -41,12 +41,12 @@ class IndicatorStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrati
     TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): Indicator {
-        return IndicatorSamples.getIndicator()
+        return IndicatorSamples.indicator
     }
 
     override fun buildObjectToUpdate(): Indicator {
-        return IndicatorSamples.getIndicator().toBuilder()
+        return IndicatorSamples.indicator.toBuilder()
             .indicatorType(ObjectWithUid.create("new_indicator_type_uid"))
             .build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
index 03777dfe3a..7271446fb8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(D2JunitRunner::class)
 class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
@@ -142,4 +141,4 @@ class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .blockingGet()
         Truth.assertThat(indicators.size).isEqualTo(1)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index 7b8897890c..15117d4663 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -26,39 +26,39 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.arch.db.access.internal;
+package org.hisp.dhis.android.core.arch.db.access.internal
 
-import android.content.Context;
-import android.content.res.AssetManager;
+import android.content.Context
+import android.content.res.AssetManager
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
+internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
+    private val assetManager: AssetManager
+    private val targetVersion: Int
 
-class BaseDatabaseOpenHelper {
-
-    static final int VERSION = 148;
-
-    private final AssetManager assetManager;
-    private final int targetVersion;
+    init {
+        assetManager = context.assets
+        this.targetVersion = targetVersion
+    }
 
-    BaseDatabaseOpenHelper(Context context, int targetVersion) {
-        this.assetManager = context.getAssets();
-        this.targetVersion = targetVersion;
+    fun onOpen(databaseAdapter: DatabaseAdapter) {
+        databaseAdapter.setForeignKeyConstraintsEnabled(true)
+        databaseAdapter.enableWriteAheadLogging()
     }
 
-    void onOpen(DatabaseAdapter databaseAdapter) {
-        databaseAdapter.setForeignKeyConstraintsEnabled(true);
-        databaseAdapter.enableWriteAheadLogging();
+    fun onCreate(databaseAdapter: DatabaseAdapter) {
+        executor(databaseAdapter).upgradeFromTo(0, targetVersion)
     }
 
-    void onCreate(DatabaseAdapter databaseAdapter) {
-        executor(databaseAdapter).upgradeFromTo(0, targetVersion);
+    fun onUpgrade(databaseAdapter: DatabaseAdapter, oldVersion: Int, newVersion: Int) {
+        executor(databaseAdapter).upgradeFromTo(oldVersion, newVersion)
     }
 
-    void onUpgrade(DatabaseAdapter databaseAdapter, int oldVersion, int newVersion) {
-        executor(databaseAdapter).upgradeFromTo(oldVersion, newVersion);
+    private fun executor(databaseAdapter: DatabaseAdapter): DatabaseMigrationExecutor {
+        return DatabaseMigrationExecutor(databaseAdapter, assetManager)
     }
 
-    private DatabaseMigrationExecutor executor(DatabaseAdapter databaseAdapter) {
-        return new DatabaseMigrationExecutor(databaseAdapter, assetManager);
+    companion object {
+        const val VERSION = 148
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
index 2b31c27345..eb5302780d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
@@ -35,8 +35,9 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
 import org.hisp.dhis.android.core.indicator.internal.IndicatorFields;
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
+
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
similarity index 53%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
index 5d7cd65a04..f1293ff0b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
@@ -26,55 +26,48 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.indicator;
+package org.hisp.dhis.android.core.indicator
 
-import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo;
-import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
-import org.hisp.dhis.android.core.common.CoreColumns;
-import org.hisp.dhis.android.core.common.NameableWithStyleColumns;
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.common.CoreColumns
+import org.hisp.dhis.android.core.common.NameableWithStyleColumns
 
-public final class IndicatorTableInfo {
-
-    private IndicatorTableInfo() {
-    }
-
-    public static final TableInfo TABLE_INFO = new TableInfo() {
-
-        @Override
-        public String name() {
-            return "Indicator";
+object IndicatorTableInfo {
+    val TABLE_INFO: TableInfo = object : TableInfo() {
+        override fun name(): String {
+            return "Indicator"
         }
 
-        @Override
-        public CoreColumns columns() {
-            return new Columns();
+        override fun columns(): CoreColumns {
+            return Columns()
         }
-    };
-
-    public static class Columns extends NameableWithStyleColumns {
-
-        public final static String ANNUALIZED = "annualized";
-        public final static String INDICATOR_TYPE = "indicatorType";
-        public final static String NUMERATOR = "numerator";
-        public final static String NUMERATOR_DESCRIPTION = "numeratorDescription";
-        public final static String DENOMINATOR = "denominator";
-        public final static String DENOMINATOR_DESCRIPTION = "denominatorDescription";
+    }
 
-        public final static String URL = "url";
-        public final static String DECIMALS = "decimals";
+    class Columns : NameableWithStyleColumns() {
+        override fun all(): Array<String> {
+            return CollectionsHelper.appendInNewArray(
+                super.all(),
+                ANNUALIZED,
+                INDICATOR_TYPE,
+                NUMERATOR,
+                NUMERATOR_DESCRIPTION,
+                DENOMINATOR,
+                DENOMINATOR_DESCRIPTION,
+                URL,
+                DECIMALS
+            )
+        }
 
-        @Override
-        public String[] all() {
-            return CollectionsHelper.appendInNewArray(super.all(),
-                    ANNUALIZED,
-                    INDICATOR_TYPE,
-                    NUMERATOR,
-                    NUMERATOR_DESCRIPTION,
-                    DENOMINATOR,
-                    DENOMINATOR_DESCRIPTION,
-                    URL,
-                    DECIMALS
-            );
+        companion object {
+            const val ANNUALIZED = "annualized"
+            const val INDICATOR_TYPE = "indicatorType"
+            const val NUMERATOR = "numerator"
+            const val NUMERATOR_DESCRIPTION = "numeratorDescription"
+            const val DENOMINATOR = "denominator"
+            const val DENOMINATOR_DESCRIPTION = "denominatorDescription"
+            const val URL = "url"
+            const val DECIMALS = "decimals"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
index a3d4f8cfc8..d5a37f72ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
@@ -36,6 +36,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.Columns;
 
+
 import java.util.Map;
 
 import javax.inject.Inject;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt
index 625d9865f5..c6a8e11ea8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt
@@ -26,41 +26,36 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.indicator;
+package org.hisp.dhis.android.core.indicator
 
-import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo;
-import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
-import org.hisp.dhis.android.core.common.CoreColumns;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.common.CoreColumns
+import org.hisp.dhis.android.core.common.IdentifiableColumns
 
-public final class IndicatorTypeTableInfo {
-
-    private IndicatorTypeTableInfo() {
-    }
-
-    public static final TableInfo TABLE_INFO = new TableInfo() {
-
-        @Override
-        public String name() {
-            return "IndicatorType";
+object IndicatorTypeTableInfo {
+    val TABLE_INFO: TableInfo = object : TableInfo() {
+        override fun name(): String {
+            return "IndicatorType"
         }
 
-        @Override
-        public CoreColumns columns() {
-            return new Columns();
+        override fun columns(): CoreColumns {
+            return Columns()
         }
-    };
+    }
 
-    public static class Columns extends IdentifiableColumns {
-        public final static String NUMBER = "number";
-        public final static String FACTOR = "factor";
+    class Columns : IdentifiableColumns() {
+        override fun all(): Array<String> {
+            return CollectionsHelper.appendInNewArray(
+                super.all(),
+                NUMBER,
+                FACTOR
+            )
+        }
 
-        @Override
-        public String[] all() {
-            return CollectionsHelper.appendInNewArray(super.all(),
-                    NUMBER,
-                    FACTOR
-            );
+        companion object {
+            const val NUMBER = "number"
+            const val FACTOR = "factor"
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java
index d9d6c408ba..9bad7abdb6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java
@@ -40,7 +40,7 @@
 public final class DataSetIndicatorChildrenAppender extends ChildrenAppender<DataSet> {
 
     private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
-            IndicatorTableInfo.TABLE_INFO,
+            IndicatorTableInfo.INSTANCE.getTABLE_INFO(),
             DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
             DataSetIndicatorLinkTableInfo.Columns.INDICATOR);
     private final LinkChildStore<DataSet, Indicator> linkChildStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
index 4da0475480..03188b763f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
@@ -32,9 +32,10 @@
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper;
 import org.hisp.dhis.android.core.indicator.Indicator;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
 import org.hisp.dhis.android.core.legendset.LegendSet;
 import org.hisp.dhis.android.core.legendset.internal.LegendSetFields;
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
+
 
 public final class IndicatorFields {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java
index c051e7cc94..15850eed29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java
@@ -51,8 +51,8 @@ public final class IndicatorModuleWiper implements ModuleWiper {
     @Override
     public void wipeMetadata() {
         tableWiper.wipeTables(
-                IndicatorTableInfo.TABLE_INFO,
-                IndicatorTypeTableInfo.TABLE_INFO,
+                IndicatorTableInfo.INSTANCE.getTABLE_INFO(),
+                IndicatorTypeTableInfo.INSTANCE.getTABLE_INFO(),
                 DataSetIndicatorLinkTableInfo.TABLE_INFO);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
index 2af1b86a77..dbf7ee93fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
@@ -40,6 +40,7 @@
 import org.hisp.dhis.android.core.indicator.Indicator;
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo;
 
+
 public final class IndicatorStore {
 
     private IndicatorStore() {
@@ -61,7 +62,7 @@ public void bindToStatement(@NonNull Indicator o, @NonNull StatementWrapper w) {
     };
 
     public static IdentifiableObjectStore<Indicator> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, IndicatorTableInfo.TABLE_INFO, BINDER,
+        return StoreFactory.objectWithUidStore(databaseAdapter, IndicatorTableInfo.INSTANCE.getTABLE_INFO(), BINDER,
                 Indicator::create);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeFields.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeFields.java
index 0b2df9b089..53c1c267df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeFields.java
@@ -34,6 +34,7 @@
 import org.hisp.dhis.android.core.indicator.IndicatorType;
 import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.Columns;
 
+
 final class IndicatorTypeFields {
 
     private static final FieldsHelper<IndicatorType> fh = new FieldsHelper<>();
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java
index 883207562e..b800db76ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java
@@ -53,7 +53,7 @@ public void bindToStatement(@NonNull IndicatorType o, @NonNull StatementWrapper
     };
 
     public static IdentifiableObjectStore<IndicatorType> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, IndicatorTypeTableInfo.TABLE_INFO, BINDER,
+        return StoreFactory.objectWithUidStore(databaseAdapter, IndicatorTypeTableInfo.INSTANCE.getTABLE_INFO(), BINDER,
                 IndicatorType::create);
     }
 }
\ No newline at end of file
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.kt
similarity index 76%
rename from core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java
rename to core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.kt
index b1aa540491..0e9fa14516 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.java
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/indicator/IndicatorSamples.kt
@@ -26,21 +26,19 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.data.indicator;
+package org.hisp.dhis.android.core.data.indicator
 
-import org.hisp.dhis.android.core.common.ObjectStyle;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.indicator.Indicator;
+import org.hisp.dhis.android.core.common.ObjectStyle
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.fillNameableProperties
+import org.hisp.dhis.android.core.indicator.Indicator
 
-import static org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.fillNameableProperties;
-
-public class IndicatorSamples {
-
-    public static Indicator getIndicator() {
-        Indicator.Builder indicatorBuilder = Indicator.builder();
-
-        fillNameableProperties(indicatorBuilder);
-        indicatorBuilder
+object IndicatorSamples {
+    val indicator: Indicator
+        get() {
+            val indicatorBuilder = Indicator.builder()
+            fillNameableProperties(indicatorBuilder)
+            indicatorBuilder
                 .id(1L)
                 .annualized(false)
                 .indicatorType(ObjectWithUid.create("bWuNrMHEoZ0"))
@@ -50,7 +48,7 @@ public static Indicator getIndicator() {
                 .denominatorDescription("den descr")
                 .url("dhis2.org")
                 .decimals(2)
-                .style(ObjectStyle.builder().color("#FF0000").icon("circle").build());
-        return indicatorBuilder.build();
-    }
-}
\ No newline at end of file
+                .style(ObjectStyle.builder().color("#FF0000").icon("circle").build())
+            return indicatorBuilder.build()
+        }
+}

From f6fb280ae8dc69b83c1f4da1488faec26295ec85 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 27 Jun 2023 11:08:55 +0200
Subject: [PATCH 027/478] [ANDROSDK-1688] Added new line to end of new Kotlin
 files

---
 .../core/arch/db/access/internal/BaseDatabaseOpenHelper.kt      | 2 +-
 .../org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt  | 2 +-
 .../org/hisp/dhis/android/core/indicator/IndicatorShould.kt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index 15117d4663..5c6147a93d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -61,4 +61,4 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     companion object {
         const val VERSION = 148
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
index f1293ff0b4..a049d99533 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
@@ -70,4 +70,4 @@ object IndicatorTableInfo {
             const val DECIMALS = "decimals"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
index 6a0180f91b..3e9f654b69 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
@@ -73,4 +73,4 @@ class IndicatorShould : BaseObjectShould("indicators/indicator.json"), ObjectSho
         Truth.assertThat(indicator.decimals()).isEqualTo(3)
         Truth.assertThat(indicator.style()).isEqualTo(ObjectStyle.builder().color("#FF0000").icon("circle").build())
     }
-}
\ No newline at end of file
+}

From 5fd80dcea985e8d2a235ae6f6c899dc237880cf6 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 27 Jun 2023 11:08:55 +0200
Subject: [PATCH 028/478] [ANDROSDK-1688] Added new line to end of new Kotlin
 files

---
 .../IndicatorCollectionRepositoryMockIntegrationShould.kt    | 5 ++++-
 .../core/arch/db/access/internal/BaseDatabaseOpenHelper.kt   | 2 +-
 .../hisp/dhis/android/core/indicator/IndicatorTableInfo.kt   | 2 +-
 .../org/hisp/dhis/android/core/indicator/IndicatorShould.kt  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
index 7271446fb8..ebff92efb3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -73,7 +73,10 @@ class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
     fun filter_by_numerator() {
         val indicators = d2.indicatorModule().indicators()
             .byNumerator()
-            .eq("#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}")
+            .eq(
+                "#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}" +
+                    "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}"
+            )
             .blockingGet()
         Truth.assertThat(indicators.size).isEqualTo(1)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index 15117d4663..5c6147a93d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -61,4 +61,4 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     companion object {
         const val VERSION = 148
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
index f1293ff0b4..a049d99533 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
@@ -70,4 +70,4 @@ object IndicatorTableInfo {
             const val DECIMALS = "decimals"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
index 6a0180f91b..3e9f654b69 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
@@ -73,4 +73,4 @@ class IndicatorShould : BaseObjectShould("indicators/indicator.json"), ObjectSho
         Truth.assertThat(indicator.decimals()).isEqualTo(3)
         Truth.assertThat(indicator.style()).isEqualTo(ObjectStyle.builder().color("#FF0000").icon("circle").build())
     }
-}
\ No newline at end of file
+}

From d1738617ae489d6c065398d8fb19fc4069f11ac3 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 29 Jun 2023 13:37:27 +0200
Subject: [PATCH 029/478] [ANDROSDK-1688] fix: send style as object (nested
 field) instead of separate fields

---
 .../android/core/indicator/internal/IndicatorFields.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
index 03188b763f..29a0d7fa5f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorFields.java
@@ -31,15 +31,18 @@
 import org.hisp.dhis.android.core.arch.api.fields.internal.Field;
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper;
+import org.hisp.dhis.android.core.common.ObjectStyle;
+import org.hisp.dhis.android.core.common.objectstyle.internal.ObjectStyleFields;
 import org.hisp.dhis.android.core.indicator.Indicator;
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
 import org.hisp.dhis.android.core.legendset.LegendSet;
 import org.hisp.dhis.android.core.legendset.internal.LegendSetFields;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
 
 
 public final class IndicatorFields {
 
     public static final String LEGEND_SETS = "legendSets";
+    public static final String OBJECT_STYLE = "style";
     private static final FieldsHelper<Indicator> fh = new FieldsHelper<>();
 
     public static final Field<Indicator, String> uid = fh.uid();
@@ -58,8 +61,7 @@ public final class IndicatorFields {
                     fh.<String>field(Columns.URL),
                     fh.<LegendSet>nestedField(LEGEND_SETS).with(LegendSetFields.uid),
                     fh.<Integer>field(Columns.DECIMALS),
-                    fh.<String>field(Columns.COLOR),
-                    fh.<String>field(Columns.ICON)
+                    fh.<ObjectStyle>nestedField(OBJECT_STYLE).with(ObjectStyleFields.allFields)
             ).build();
 
     private IndicatorFields() {

From e6c40f77689aa1a21d5e180df646d58eacb05c81 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 21 Jun 2023 09:21:02 +1000
Subject: [PATCH 030/478] [ANDROSDK-1698] Refactor Handler and Store

---
 .../core/MockIntegrationTestObjects.kt        |   5 +-
 .../AnalyticsRepositoryIntegrationShould.kt   |   4 +-
 .../BaseEvaluatorIntegrationShould.kt         |  95 +++++----
 ...gramIndicatorEvaluatorIntegrationShould.kt |   4 +-
 .../AnalyticExpressionEngineFactoryHelper.kt  |  24 +--
 .../EventLineListIntegrationShould.kt         |  64 +++---
 .../collection/PagingMockIntegrationShould.kt |   4 +-
 ...ava => AttributeStoreIntegrationShould.kt} |  50 ++---
 ...ributeValueLinkStoreIntegrationShould.java |   2 +-
 ...ributeValueLinkStoreIntegrationShould.java |   2 +-
 ...ributeValueLinkStoreIntegrationShould.java |   2 +-
 ...CategoryComboLinkStoreIntegrationShould.kt |   3 +-
 ...egoryOptionLinkStoreIntegrationShould.java |   2 +-
 ...yComboEndpointCallRealIntegrationShould.kt |  10 +-
 ...egoryOptionLinkStoreIntegrationShould.java |   2 +-
 ...anisationUnitLinkStoreIntegrationShould.kt |   2 +-
 ...ntifiableObjectStoreIntegrationShould.java |   4 +-
 .../common/ObjectStoreIntegrationShould.java  |   4 +-
 ...DeviceRenderingStoreIntegrationShould.java |   4 +-
 .../DataStatePropagatorIntegrationShould.kt   |  25 +--
 .../ConfigurationStoreIntegrationShould.java  |   2 +-
 ...ConfigurationMigrationIntegrationShould.kt |   6 +-
 .../ConstantStoreIntegrationShould.java       |   2 +-
 ...aElementOperandStoreIntegrationShould.java |   2 +-
 .../DataElementStoreIntegrationShould.java    |   2 +-
 ...InputPeriodLinkStoreIntegrationShould.java |   2 +-
 ...strationPostCallRealIntegrationShould.java |   2 +-
 ...mentOperandLinkStoreIntegrationShould.java |   2 +-
 ...DataElementLinkStoreIntegrationShould.java |   2 +-
 .../DataSetInstanceStoreIntegrationShould.kt  |   7 +-
 ...isationUnitLinkStoreIntegrationShould.java |   2 +-
 .../DataSetStoreIntegrationShould.java        |   2 +-
 ...DataElementLinkStoreIntegrationShould.java |   2 +-
 ...reyedFieldsLinkStoreIntegrationShould.java |   2 +-
 ...tionIndicatorLinkStoreIntegrationShould.kt |   3 +-
 .../SectionStoreIntegrationShould.java        |   2 +-
 .../DataStoreEntryStoreIntegrationShould.kt   |   4 +-
 .../LocalDataStoreStoreIntegrationShould.kt   |   4 +-
 .../DataStorePostCallMockIntegrationShould.kt |   2 +-
 ...DataValueConflictStoreIntegrationShould.kt |   2 +-
 ...aValueEndpointCallRealIntegrationShould.kt |   6 +-
 ...ataValuePostCallRealIntegrationShould.java |   2 +-
 ...ggregatedDataSyncStoreIntegrationShould.kt |   3 +-
 .../EnrollmentStoreIntegrationShould.java     |   2 +-
 ...tWithLimitCallBaseMockIntegrationShould.kt |   8 +-
 .../EventDataFilterStoreIntegrationShould.kt  |   3 +-
 ...ntEndpointCallBaseMockIntegrationShould.kt |   6 +-
 .../EventEndpointCallRealIntegrationShould.kt |   7 +-
 .../EventFilterStoreIntegrationShould.kt      |   2 +-
 .../EventPostBaseMockIntegrationShould.kt     |  11 +-
 .../EventPostCallRealIntegrationShould.kt     |   5 +-
 .../internal/EventStoreIntegrationShould.java |   2 +-
 .../EventSyncStoreIntegrationShould.java      |   2 +-
 ...sionDimensionItemStoreIntegrationShould.kt |   4 +-
 ...aseFileResourceRoutineIntegrationShould.kt |  44 ++--
 .../FileResourceStoreIntegrationShould.kt     |   2 +-
 ...rImportConflictStoreIntegrationShould.java |   2 +-
 ...etIndicatorLinkStoreIntegrationShould.java |   2 +-
 .../IndicatorStoreIntegrationShould.kt        |   2 +-
 ...mentLegendSetLinkStoreIntegrationShould.kt |   4 +-
 ...atorLegendSetLinkStoreIntegrationShould.kt |   7 +-
 ...orLegendSetLinkStoreIntegrationShould.java |   4 +-
 .../LegendSetStoreIntegrationShould.java      |   3 +-
 .../LegendStoreIntegrationShould.java         |   3 +-
 .../D2ErrorStoreIntegrationShould.java        |   2 +-
 .../internal/ForeignKeyCleanerShould.kt       |  12 +-
 ...ignKeyViolationStoreIntegrationShould.java |   2 +-
 ...erImageryProviderStoreIntegrationShould.kt |   7 +-
 .../MapLayerStoreIntegrationShould.kt         |   7 +-
 .../internal/NoteStoreIntegrationShould.java  |   2 +-
 ...GroupOptionLinkStoreIntegrationShould.java |   2 +-
 .../OptionGroupStoreIntegrationShould.java    |   2 +-
 ...ganisationUnitCallMockIntegrationShould.kt |  28 +--
 ...sationUnitGroupStoreIntegrationShould.java |   2 +-
 ...sationUnitLevelStoreIntegrationShould.java |   2 +-
 ...onUnitGroupLinkStoreIntegrationShould.java |   2 +-
 ...UnitProgramLinkStoreIntegrationShould.java |   2 +-
 ...rganisationUnitStoreIntegrationShould.java |   2 +-
 .../period/PeriodMockIntegrationShould.java   |   2 +-
 .../internal/PeriodHelperIntegrationShould.kt |   2 +-
 .../PeriodStoreIntegrationShould.java         |   4 +-
 ...icsPeriodBoundaryStoreIntegrationShould.kt |   3 +-
 ...rogramEndpointCallMockIntegrationShould.kt |  10 +-
 ...rogramIndicatorStoreIntegrationShould.java |   2 +-
 ...ogramRuleActionStoreIntegrationShould.java |   2 +-
 .../ProgramRuleStoreIntegrationShould.java    |   2 +-
 ...ramRuleVariableStoreIntegrationShould.java |   2 +-
 ...onAttributeLinkStoreIntegrationShould.java |   2 +-
 .../ProgramSectionStoreIntegrationShould.kt   |   3 +-
 ...tageDataElementStoreIntegrationShould.java |   2 +-
 ...DataElementLinkStoreIntegrationShould.java |   2 +-
 ...ogramStageSectionStoreIntegrationShould.kt |   3 +-
 .../ProgramStageStoreIntegrationShould.java   |   2 +-
 .../ProgramStoreIntegrationShould.java        |   2 +-
 ...EntityAttributeStoreIntegrationShould.java |   2 +-
 ...amIndicatorSQLExecutorIntegrationShould.kt |  12 +-
 .../BaseTrackerDataIntegrationHelper.kt       |  18 +-
 ...ProgramIndicatorEngineIntegrationShould.kt |  24 +--
 ...ributeValueFilterStoreIntegrationShould.kt |   4 +-
 ...stEventDataFilterStoreIntegrationShould.kt |   4 +-
 ...mStageWorkingListStoreIntegrationShould.kt |   4 +-
 ...nshipConstraintStoreIntegrationShould.java |   2 +-
 .../RelationshipItemStoreIntegrationShould.kt |   3 +-
 .../RelationshipStoreIntegrationShould.java   |   2 +-
 .../ResourceStoreIntegrationShould.java       |   4 +-
 ...DhisVisualizationStoreIntegrationShould.kt |   2 +-
 ...yticsTeiAttributeStoreIntegrationShould.kt |   2 +-
 ...icsTeiDataElementStoreIntegrationShould.kt |   2 +-
 ...yticsTeiIndicatorStoreIntegrationShould.kt |   2 +-
 ...alyticsTeiSettingStoreIntegrationShould.kt |   2 +-
 ...iWHONutritionDataStoreIntegrationShould.kt |   3 +-
 .../DataSetSettingStoreIntegrationShould.java |   2 +-
 .../FilterSettingStoreIntegrationShould.kt    |   2 +-
 .../GeneralSettingsStoreIntegrationShould.kt  |   2 +-
 .../LatestAppVersionStoreIntegrationShould.kt |   3 +-
 ...figurationSettingStoreIntegrationShould.kt |   2 +-
 .../ProgramSettingStoreIntegrationShould.java |   2 +-
 ...onizationSettingsStoreIntegrationShould.kt |   2 +-
 .../SystemSettingStoreIntegrationShould.java  |   2 +-
 .../UserSettingsStoreIntegrationShould.java   |   2 +-
 .../SMSConfigStoreIntegrationShould.kt        |   2 +-
 .../SMSMetadataIdStoreIntegrationShould.kt    |   2 +-
 ...OngoingSubmissionStoreIntegrationShould.kt |   2 +-
 .../SystemInfoStoreIntegrationShould.java     |   2 +-
 ...rvedValueManagerRealIntegrationShould.java |  34 +--
 ...ributeValueFilterStoreIntegrationShould.kt |   3 +-
 .../BasePayloadGeneratorMockIntegration.kt    |  42 ++--
 ...vedValueSettingStoreIntegrationShould.java |   2 +-
 ...alueEndpointCallRealIntegrationShould.java |   4 +-
 ...teReservedValueStoreIntegrationShould.java |  16 +-
 ...EntityAttributeStoreIntegrationShould.java |   2 +-
 ...yAttributeValueStoreIntegrationShould.java |   2 +-
 ...EntityDataValueStoreIntegrationShould.java |  16 +-
 ...tyInstanceCallBaseMockIntegrationShould.kt |  14 +-
 ...anceEventFilterStoreIntegrationShould.java |   2 +-
 ...ityInstanceFilterStoreIntegrationShould.kt |   3 +-
 ...InstancePostCallRealIntegrationShould.java |  40 ++--
 ...dEntityInstanceStoreIntegrationShould.java |   2 +-
 ...ityInstanceSyncStoreIntegrationShould.java |   2 +-
 ...tyTypeAttributeStoreIntegrationShould.java |   2 +-
 ...ackedEntityTypeStoreIntegrationShould.java |   2 +-
 .../ProgramOwnerStoreIntegrationShould.kt     |   3 +-
 .../ProgramTempOwnerStoreIntegrationShould.kt |   3 +-
 ...ceLocalQueryHelperMockIntegrationShould.kt |   2 +-
 .../TrackerJobObjectStoreIntegrationShould.kt |   3 +-
 .../StockUseCaseStoreIntegrationShould.kt     |   3 +-
 ...seTransactionLinkStoreIntegrationShould.kt |   3 +-
 ...thenticatedUserStoreIntegrationShould.java |   2 +-
 .../AuthorityStoreIntegrationShould.java      |   2 +-
 .../LogoutCallRealIntegrationShould.kt        |   2 +-
 .../internal/UserCallMockIntegrationShould.kt |   2 +-
 ...anisationUnitLinkStoreIntegrationShould.kt |   3 +-
 .../UserRoleStoreIntegrationShould.kt         |   2 +-
 .../internal/UserStoreIntegrationShould.kt    |   2 +-
 .../BaseMockIntegrationTestFullDispatcher.kt  |  17 +-
 .../ValidationRuleStoreIntegrationShould.java |   2 +-
 ...tionDimensionItemStoreIntegrationShould.kt |   2 +-
 .../VisualizationStoreIntegrationShould.kt    |   2 +-
 .../wipe/WipeDBCallMockIntegrationShould.kt   |  48 ++---
 .../wipe/WipeDBCallRealIntegrationShould.kt   |   2 +-
 .../LocalAnalyticsDatabaseFiller.kt           |  40 ++--
 ...reObjectRepositoryMockIntegrationShould.kt |   8 +-
 ...ueObjectRepositoryMockIntegrationShould.kt |   6 +-
 ...ObjectRepositoryMockIntegrationShould.java |   6 +-
 ...ObjectRepositoryMockIntegrationShould.java |  10 +-
 .../FileResourceAddMockIntegrationShould.kt   |   2 +-
 ...ObjectRepositoryMockIntegrationShould.java |   6 +-
 ...llectionRepositoryBaseIntegrationShould.kt |   4 +-
 .../AnalyticsOrganisationUnitHelper.kt        |  15 +-
 .../AnalyticsServiceMetadataHelper.kt         |  47 ++--
 ...icsVisualizationsServiceDimensionHelper.kt |  21 +-
 .../AnalyticExpressionEngineFactory.kt        |  16 +-
 .../indicatorengine/IndicatorContext.kt       |   4 +-
 .../indicatorengine/IndicatorEngine.kt        |   7 +-
 .../indicatorengine/IndicatorSQLEngine.kt     |   7 +-
 .../internal/APICallExecutorImpl.java         |   8 +-
 .../internal/CoroutineAPICallExecutorImpl.kt  |   4 +-
 .../internal/RxAPICallExecutorImpl.kt         |   4 +-
 .../executors/internal/D2CallExecutor.java    |   8 +-
 .../cleaners/internal/CollectionCleaner.kt    |   2 +-
 .../arch/cleaners/internal/LinkCleaner.kt     |   2 +-
 .../arch/cleaners/internal/OrphanCleaner.kt   |   2 +-
 .../cleaners/internal/ParentOrphanCleaner.kt  |   2 +-
 .../cleaners/internal/SubCollectionCleaner.kt |   2 +-
 .../core/arch/d2/internal/D2DIComponent.kt    |  20 +-
 .../internal/DatabaseImportExportImpl.kt      |  18 +-
 .../internal/SQLStatementBuilderImpl.java     |   4 -
 .../IdentifiableDataObjectStoreImpl.kt        |  20 +-
 ...dentifiableDeletableDataObjectStoreImpl.kt |  21 +-
 .../internal/IdentifiableObjectStoreImpl.kt   |  14 ++
 .../arch/db/stores/internal/LinkStoreImpl.kt  |  21 ++
 .../db/stores/internal/ObjectStoreImpl.kt     |  14 ++
 .../internal/ObjectWithoutUidStoreImpl.kt     |  22 ++
 .../arch/db/stores/internal/StoreFactory.kt   |  63 ------
 .../core/arch/handlers/internal/Handler.kt    |   2 +-
 .../arch/handlers/internal/HandlerBaseImpl.kt |   2 +-
 .../internal/HandlerWithTransformer.kt        |   2 +-
 .../internal/IdentifiableDataHandler.kt       |   2 +-
 .../arch/handlers/internal/LinkHandler.kt     |   2 +-
 .../internal/OrderedLinkHandlerImpl.kt        |   4 +-
 .../internal/AttributeEntityDIModule.kt}      |  26 +--
 .../internal/AttributeHandler.kt}             |  14 +-
 .../internal/AttributePackageDIModule.kt}     |  10 +-
 .../attribute/internal/AttributeStore.java    |  94 --------
 .../core/attribute/internal/AttributeStore.kt |  34 +++
 .../attribute/internal/AttributeStoreImpl.kt  |  88 ++++++++
 .../DataElementAttributeValueLinkHandler.kt   |  37 ++++
 .../DataElementAttributeValueLinkStore.kt     |  34 +++
 ...DataElementAttributeValueLinkStoreImpl.kt} |  48 +++--
 .../ProgramAttributeValueLinkHandler.kt       |  37 ++++
 .../ProgramAttributeValueLinkStore.kt         |  34 +++
 ... => ProgramAttributeValueLinkStoreImpl.kt} |  47 ++--
 .../ProgramStageAttributeValueLinkHandler.kt  |  37 ++++
 .../ProgramStageAttributeValueLinkStore.kt    |  34 +++
 ...rogramStageAttributeValueLinkStoreImpl.kt} |  47 ++--
 .../CategoryCollectionRepository.java         |   4 +-
 .../CategoryComboCollectionRepository.java    |   4 +-
 .../CategoryOptionCollectionRepository.java   |   4 +-
 .../core/category/internal/CategoryCall.kt    |   3 +-
 .../CategoryCategoryComboEntityDIModule.kt    |  16 +-
 .../CategoryCategoryComboLinkHandler.kt       |  38 ++++
 .../CategoryCategoryComboLinkStore.kt         |  25 +--
 .../CategoryCategoryComboLinkStoreImpl.kt     |  57 +++++
 .../CategoryCategoryOptionEntityDIModule.kt   |  16 +-
 .../CategoryCategoryOptionLinkHandler.kt      |  37 ++++
 .../CategoryCategoryOptionLinkPersistor.kt    |   3 +-
 .../CategoryCategoryOptionLinkStore.kt        |  27 +--
 .../CategoryCategoryOptionLinkStoreImpl.kt    |  57 +++++
 .../category/internal/CategoryComboCall.kt    |   3 +-
 .../internal/CategoryComboEntityDIModule.kt   |  19 +-
 .../category/internal/CategoryComboHandler.kt |  21 +-
 .../category/internal/CategoryComboStore.kt   |  28 +--
 .../internal/CategoryComboStoreImpl.kt        |  57 +++++
 .../internal/CategoryEntityDIModule.kt        |  15 +-
 .../core/category/internal/CategoryHandler.kt |  36 ++++
 .../category/internal/CategoryOptionCall.kt   |   3 +-
 ...OptionComboCategoryOptionEntityDIModule.kt |  16 +-
 ...ategoryOptionComboCategoryOptionHandler.kt |  37 ++++
 ...egoryOptionComboCategoryOptionLinkStore.kt |  24 +--
 ...yOptionComboCategoryOptionLinkStoreImpl.kt |  56 +++++
 .../CategoryOptionComboEntityDIModule.kt      |  11 +-
 .../internal/CategoryOptionComboHandler.kt    |   9 +-
 .../internal/CategoryOptionComboStoreImpl.kt  |  26 +--
 .../internal/CategoryOptionEntityDIModule.kt  |  13 +-
 .../internal/CategoryOptionHandler.kt         |   5 +-
 ...yOptionOrganisationUnitChildrenAppender.kt |   2 +-
 ...oryOptionOrganisationUnitEntityDIModule.kt |  13 +-
 ...tegoryOptionOrganisationUnitLinkHandler.kt |  38 ++++
 ...CategoryOptionOrganisationUnitLinkStore.kt |  24 +--
 ...goryOptionOrganisationUnitLinkStoreImpl.kt |  56 +++++
 .../CategoryOptionOrganisationUnitsCall.kt    |   3 +-
 .../category/internal/CategoryOptionStore.kt  |  29 +--
 .../internal/CategoryOptionStoreImpl.kt       |  60 ++++++
 .../core/category/internal/CategoryStore.kt   |  28 +--
 .../internal/CategoryStoreImpl.kt}            |  52 ++---
 .../internal/CommonPackageDIModule.java       |   2 +-
 .../internal/DataStatePropagatorImpl.kt       |   8 +-
 .../common/internal/TrackerDataManagerImpl.kt |   4 +-
 ...alueTypeDeviceRenderingEntityDIModule.java |  56 -----
 .../ValueTypeDeviceRenderingEntityDIModule.kt |  48 +++++
 .../ValueTypeDeviceRenderingHandler.kt        |  36 ++++
 .../ValueTypeDeviceRenderingStore.kt}         |  10 +-
 ...a => ValueTypeDeviceRenderingStoreImpl.kt} |  79 +++----
 ...va => ValueTypeRenderingEntityDIModule.kt} |  22 +-
 ...dler.java => ValueTypeRenderingHandler.kt} |  65 +++---
 .../internal/ConfigurationPackageDIModule.kt  |   7 +-
 .../internal/ConfigurationStore.kt}           |  10 +-
 ...onStore.java => ConfigurationStoreImpl.kt} |  37 ++--
 .../DatabaseConfigurationInsecureStore.kt     |   9 +-
 .../DatabaseConfigurationInsecureStoreImpl.kt |  36 ++++
 .../DatabaseConfigurationMigration.kt         |   5 +-
 .../DatabaseConfigurationTransformer.kt       |   4 +-
 .../DatabaseEncryptionPasswordManager.java    |   6 -
 .../internal/MultiUserDatabaseManager.kt      |   3 +-
 .../MultiUserDatabaseManagerForD2Manager.kt   |   5 +-
 .../internal/migration/Migration260.kt        |   4 +-
 .../ConstantCollectionRepository.java         |   4 +-
 .../internal/ConstantCallFactory.java         |   5 +-
 .../core/constant/internal/ConstantHandler.kt |  42 ++++
 ...Module.java => ConstantPackageDIModule.kt} |  71 +++----
 .../core/constant/internal/ConstantStore.kt   |  27 +--
 .../internal/ConstantStoreImpl.kt}            |  51 ++---
 .../DataApprovalCollectionRepository.java     |   4 +-
 .../dataapproval/internal/DataApprovalCall.kt |   3 +-
 .../internal/DataApprovalEntityDIModule.kt    |  56 +++++
 .../internal/DataApprovalHandler.kt           |  36 ++++
 .../internal/DataApprovalStore.kt             |  34 +++
 ...valStore.java => DataApprovalStoreImpl.kt} |  87 ++++----
 .../DataElementCollectionRepository.java      |   4 +-
 ...taElementAttributeValueEntityDIModule.java |  58 -----
 ...DataElementAttributeValueEntityDIModule.kt |  53 +++++
 .../DataElementEndpointCallFactory.java       |   5 +-
 .../internal/DataElementEntityDIModule.java   |  65 ------
 .../internal/DataElementEntityDIModule.kt}    |  57 ++---
 .../internal/DataElementHandler.java          |  94 --------
 .../internal/DataElementHandler.kt            |  75 +++++++
 .../DataElementLegendSetEntityDIModule.java   |  58 -----
 .../DataElementLegendSetEntityDIModule.kt}    |  34 ++-
 .../DataElementOperandEntityDIModule.kt       |  48 +++++
 .../internal/DataElementOperandHandler.kt}    |  15 +-
 .../internal/DataElementOperandStore.kt}      |  17 +-
 ...re.java => DataElementOperandStoreImpl.kt} |  47 ++--
 .../dataelement/internal/DataElementStore.kt  |  34 +++
 ...mentStore.java => DataElementStoreImpl.kt} |  68 +++---
 .../dataset/DataSetCollectionRepository.java  |  10 +-
 ...ompleteRegistrationCollectionRepository.kt |   4 +-
 .../dataset/SectionCollectionRepository.java  |   4 +-
 .../DataInputPeriodChildrenAppender.java      |   2 +-
 .../DataInputPeriodEntityDIModule.kt}         |  26 +--
 .../internal/DataInputPeriodHandler.kt        |  36 ++++
 .../dataset/internal/DataInputPeriodStore.kt  |  34 +++
 ...Store.java => DataInputPeriodStoreImpl.kt} |  67 +++---
 ...ataSetCompleteRegistrationCallProcessor.kt |   3 +-
 ...SetCompleteRegistrationEntityDIModule.java |  67 ------
 ...aSetCompleteRegistrationEntityDIModule.kt} |  37 ++--
 .../DataSetCompleteRegistrationHandler.kt     |  36 ++++
 ...va => DataSetCompleteRegistrationStore.kt} |  38 ++--
 .../DataSetCompleteRegistrationStoreImpl.java | 144 -------------
 .../DataSetCompleteRegistrationStoreImpl.kt   | 133 ++++++++++++
 ...lsoryDataElementOperandEntityDIModule.java |  57 -----
 ...pulsoryDataElementOperandEntityDIModule.kt |  50 +++++
 ...aSetCompulsoryDataElementOperandHandler.kt |  37 ++++
 ...etCompulsoryDataElementOperandLinkStore.kt |  34 +++
 ...pulsoryDataElementOperandLinkStoreImpl.kt} |  50 +++--
 .../internal/DataSetElementEntityDIModule.kt  |  48 +++++
 .../dataset/internal/DataSetElementHandler.kt |  36 ++++
 .../dataset/internal/DataSetElementStore.kt   |  34 +++
 ...kStore.java => DataSetElementStoreImpl.kt} |  50 ++---
 .../internal/DataSetEndpointCallFactory.java  |   5 +-
 .../internal/DataSetEntityDIModule.java       | 106 ---------
 .../dataset/internal/DataSetEntityDIModule.kt | 128 +++++++++++
 .../core/dataset/internal/DataSetHandler.java | 130 -----------
 .../core/dataset/internal/DataSetHandler.kt   | 102 +++++++++
 .../internal/DataSetInstanceEntityDIModule.kt |  48 +++++
 .../internal/DataSetInstanceStore.java        |  54 -----
 .../dataset/internal/DataSetInstanceStore.kt  |  34 +++
 .../internal/DataSetInstanceStoreImpl.kt      |  42 ++++
 .../internal/DataSetInstanceSummaryStore.java |  54 -----
 .../internal/DataSetInstanceSummaryStore.kt   |  34 +++
 .../DataSetInstanceSummaryStoreImpl.kt        |  42 ++++
 .../internal/DataSetModuleDownloader.kt       |   4 +-
 ...taSetOrganisationUnitLinkEntityDIModule.kt |  14 +-
 .../DataSetOrganisationUnitLinkHandler.kt     |  37 ++++
 .../DataSetOrganisationUnitLinkStore.kt       |  34 +++
 ...> DataSetOrganisationUnitLinkStoreImpl.kt} |  46 ++--
 .../core/dataset/internal/DataSetStore.kt     |  34 +++
 .../internal/DataSetStoreImpl.kt}             |  79 +++----
 .../SectionDataElementEntityDIModule.java     |  56 -----
 .../SectionDataElementEntityDIModule.kt       |  48 +++++
 .../internal/SectionDataElementLinkHandler.kt |  37 ++++
 .../internal/SectionDataElementLinkStore.kt   |  34 +++
 ...ava => SectionDataElementLinkStoreImpl.kt} |  48 ++---
 .../dataset/internal/SectionEntityDIModule.kt |  12 +-
 .../SectionGreyedFieldsEntityDIModule.java    |  57 -----
 .../SectionGreyedFieldsEntityDIModule.kt      |  48 +++++
 .../SectionGreyedFieldsLinkHandler.kt         |  37 ++++
 .../internal/SectionGreyedFieldsLinkStore.kt  |  34 +++
 ...va => SectionGreyedFieldsLinkStoreImpl.kt} |  50 +++--
 .../core/dataset/internal/SectionHandler.kt   |  22 +-
 .../SectionIndicatorEntityDIModule.kt         |  13 +-
 .../internal/SectionIndicatorLinkHandler.kt   |  36 ++++
 .../internal/SectionIndicatorLinkStore.kt     |  22 +-
 .../SectionIndicatorLinkStoreImpl.kt}         |  44 ++--
 .../core/dataset/internal/SectionStore.kt     |  34 +++
 .../core/dataset/internal/SectionStoreImpl.kt |  62 ++++++
 .../LocalDataStoreCollectionRepository.java   |   3 +-
 .../internal/DataStoreDownloadCall.kt         |   3 +-
 .../internal/DataStoreEntityDIModule.kt       |   7 +-
 .../internal/DataStoreEntryStoreImpl.kt       |  35 +--
 .../datastore/internal/DataStoreHandler.kt    |   5 +-
 .../internal/LocalDataStoreEntityDIModule.kt  |   5 +-
 .../datastore/internal/LocalDataStoreStore.kt |  36 +---
 .../internal/LocalDataStoreStoreImpl.kt       |  66 ++++++
 ...DataValueConflictCollectionRepository.java |   3 +-
 .../core/datavalue/internal/DataValueCall.kt  |   3 +-
 ....kt => DataValueConflictEntityDIModule.kt} |   7 +-
 .../internal/DataValueConflictParser.kt       |   9 +-
 .../internal/DataValueConflictStore.kt        |  28 +--
 .../internal/DataValueConflictStoreImpl.kt}   |  56 ++---
 .../internal/DataValueEntityDIModule.kt}      |  37 ++--
 .../datavalue/internal/DataValueHandler.kt    |   7 +-
 .../internal/DataValueImportHandler.kt        |   3 +-
 .../datavalue/internal/DataValuePostCall.kt   |   4 +-
 .../datavalue/internal/DataValueStore.java    | 148 -------------
 .../core/datavalue/internal/DataValueStore.kt |  51 +++++
 .../datavalue/internal/DataValueStoreImpl.kt  | 137 ++++++++++++
 .../conflicts/PastExpiryDateConflict.kt       |   6 +-
 .../data/internal/AggregatedDataCall.kt       |   3 +-
 .../AggregatedDataCallBundleFactory.kt        |   3 +-
 .../internal/AggregatedDataPackageDIModule.kt |   5 +-
 .../data/internal/AggregatedDataSyncStore.kt  |  31 +--
 .../internal/AggregatedDataSyncStoreImpl.kt   |  64 ++++++
 .../internal/EnrollmentEntityDIModule.java    |  95 ---------
 .../internal/EnrollmentEntityDIModule.kt      | 120 +++++++++++
 .../enrollment/internal/EnrollmentHandler.kt  |   5 +-
 .../EnrollmentPersistenceCallFactory.kt       |   3 +-
 .../internal/EnrollmentServiceImpl.kt         |   7 +-
 .../internal/EnrollmentStoreImpl.kt           |  30 +--
 .../core/event/EventCollectionRepository.java |  11 +-
 .../EventFilterCollectionRepository.java      |   4 +-
 .../internal/EventDataFilterEntityDIModule.kt |  13 +-
 .../event/internal/EventDataFilterHandler.kt  |  36 ++++
 .../event/internal/EventDataFilterStore.kt    |  49 +----
 .../internal/EventDataFilterStoreImpl.kt      |  81 +++++++
 .../event/internal/EventEntityDIModule.java   |  87 --------
 .../event/internal/EventEntityDIModule.kt     | 103 +++++++++
 .../core/event/internal/EventFilterCall.java  |   2 +-
 .../internal/EventFilterEntityDIModule.java   |  69 ------
 .../internal/EventFilterEntityDIModule.kt     |  64 ++++++
 ...FilterEventDataFilterChildrenAppender.java |   2 +-
 .../core/event/internal/EventFilterHandler.kt |  11 +-
 .../core/event/internal/EventFilterStore.kt   |  39 +---
 .../event/internal/EventFilterStoreImpl.kt    |  72 +++++++
 .../core/event/internal/EventHandler.kt       |   4 +-
 .../event/internal/EventLastUpdatedManager.kt |   3 +-
 .../internal/EventPersistenceCallFactory.kt   |   8 +-
 .../event/internal/EventQueryBundleFactory.kt |   4 +-
 .../core/event/internal/EventStoreImpl.kt     |  29 +--
 .../event/internal/EventSyncEntityDIModule.kt |  42 ++++
 .../internal/EventSyncStore.kt}               |   9 +-
 .../core/event/internal/EventSyncStoreImpl.kt |  65 ++++++
 ...sionDimensionItemCollectionRepository.java |   4 +-
 .../internal/ExpressionDimensionItemCall.kt   |   3 +-
 .../ExpressionDimensionItemEntityDIModule.kt  |  10 +-
 .../ExpressionDimensionItemHandler.kt         |   8 +-
 .../internal/ExpressionDimensionItemStore.kt  |  27 +--
 .../ExpressionDimensionItemStoreImpl.kt}      |  56 ++---
 .../FileResourceCollectionRepository.java     |   7 +-
 .../core/fileresource/FileResourceRoutine.kt  |   4 +-
 .../internal/FileResourceDownloadCall.kt      |  17 +-
 .../FileResourceDownloadCallHelper.kt         |  13 +-
 .../internal/FileResourceEntityDIModule.kt    |  12 +-
 .../internal/FileResourceHandler.kt           |  36 ++++
 .../internal/FileResourceHelper.kt            |  11 +-
 .../internal/FileResourcePostCall.kt          |   6 +-
 .../internal/FileResourceStore.kt             |  34 +++
 .../internal/FileResourceStoreImpl.kt         |  29 +--
 ...=> TrackerImportConflictEntityDIModule.kt} |  32 ++-
 .../internal/TrackerImportConflictParser.kt   |  29 ++-
 .../TrackerImportConflictStoreImpl.java       | 107 ----------
 .../TrackerImportConflictStoreImpl.kt         | 104 +++++++++
 .../IndicatorCollectionRepository.java        |   7 +-
 .../IndicatorTypeCollectionRepository.java    |   5 +-
 .../DataSetIndicatorEngineImpl.kt             |   5 +-
 .../DataSetIndicatorEntityDIModule.java       |  56 -----
 .../DataSetIndicatorEntityDIModule.kt}        |  22 +-
 .../internal/DataSetIndicatorLinkHandler.kt   |  40 ++++
 .../internal/DataSetIndicatorLinkStore.kt     |  34 +++
 ....java => DataSetIndicatorLinkStoreImpl.kt} |  45 ++--
 .../IndicatorEndpointCallFactory.java         |   9 +-
 .../internal/IndicatorEntityDIModule.kt       |  52 +++++
 .../indicator/internal/IndicatorHandler.kt    |  10 +-
 .../core/indicator/internal/IndicatorStore.kt |  34 +++
 .../indicator/internal/IndicatorStoreImpl.kt  |  64 ++++++
 .../IndicatorTypeEndpointCallFactory.java     |   9 +-
 .../internal/IndicatorTypeEntityDIModule.kt   |  50 +++++
 .../internal/IndicatorTypeHandler.kt          |  39 ++++
 .../indicator/internal/IndicatorTypeStore.kt  |  34 +++
 ...peStore.java => IndicatorTypeStoreImpl.kt} |  54 +++--
 .../legendset/LegendCollectionRepository.java |   4 +-
 .../LegendSetCollectionRepository.java        |   4 +-
 .../DataElementLegendSetLinkHandler.kt        |  37 ++++
 .../internal/DataElementLegendSetLinkStore.kt |  34 +++
 ...a => DataElementLegendSetLinkStoreImpl.kt} |  47 ++--
 .../IndicatorLegendSetEntityDIModule.kt       |  15 +-
 .../internal/IndicatorLegendSetLinkHandler.kt |  37 ++++
 .../internal/IndicatorLegendSetLinkStore.kt   |  27 +--
 .../IndicatorLegendSetLinkStoreImpl.kt        |  57 +++++
 .../internal/LegendChildrenAppender.java      |   2 +-
 .../internal/LegendEntityDIModule.kt}         |  38 ++--
 .../core/legendset/internal/LegendHandler.kt  |  36 ++++
 .../core/legendset/internal/LegendSetCall.kt  |   4 +-
 .../internal/LegendSetEntityDIModule.java     |  75 -------
 .../internal/LegendSetEntityDIModule.kt}      |  66 +++---
 .../internal/LegendSetHandler.kt}             |  57 +++--
 .../core/legendset/internal/LegendSetStore.kt |  34 +++
 .../internal/LegendSetStoreImpl.kt}           |  53 +++--
 .../core/legendset/internal/LegendStore.kt    |  34 +++
 .../{LegendStore.java => LegendStoreImpl.kt}  |  65 +++---
 .../ProgramIndicatorLegendSetLinkHandler.kt   |  37 ++++
 .../ProgramIndicatorLegendSetLinkStore.kt     |  34 +++
 ...ProgramIndicatorLegendSetLinkStoreImpl.kt} |  47 ++--
 .../D2ErrorCollectionRepository.java          |   4 +-
 ...reignKeyViolationCollectionRepository.java |   4 +-
 .../maintenance/PerformanceHintsService.java  |  12 +-
 .../internal/D2ErrorEntityDIModule.kt         |  50 +++++
 .../core/maintenance/internal/D2ErrorStore.kt |  34 +++
 .../internal/D2ErrorStoreImpl.kt}             |  49 +++--
 .../internal/ForeignKeyCleanerImpl.java       |   7 +-
 ...a => ForeignKeyViolationEntityDIModule.kt} |  33 ++-
 .../internal/ForeignKeyViolationStore.kt      |  34 +++
 ...e.java => ForeignKeyViolationStoreImpl.kt} |  57 ++---
 .../internal/MaintenancePackageDIModule.java  |   4 +-
 .../map/layer/MapLayerCollectionRepository.kt |   4 +-
 .../layer/internal/MapLayerEntityDIModule.kt  |  17 +-
 .../map/layer/internal/MapLayerHandler.kt     |  12 +-
 .../MapLayerImagerProviderChildrenAppender.kt |   4 +-
 .../MapLayerImageryProviderEntityDIModule.kt  |  14 +-
 .../MapLayerImageryProviderHandler.kt         |  36 ++++
 .../internal/MapLayerImageryProviderStore.kt  |  25 +--
 .../MapLayerImageryProviderStoreImpl.kt       |  57 +++++
 .../core/map/layer/internal/MapLayerStore.kt  |  30 +--
 .../map/layer/internal/MapLayerStoreImpl.kt   |  63 ++++++
 .../layer/internal/bing/BingCallFactory.kt    |   4 +-
 .../map/layer/internal/osm/OSMCallFactory.kt  |   4 +-
 .../core/note/NoteCollectionRepository.java   |   4 +-
 .../internal/NoteEntityDIModule.kt}           |  42 ++--
 .../NoteForEnrollmentChildrenAppender.java    |   2 +-
 .../NoteForEventChildrenAppender.java         |   2 +-
 .../android/core/note/internal/NoteHandler.kt |  36 ++++
 .../android/core/note/internal/NoteStore.kt   |  34 +++
 .../{NoteStore.java => NoteStoreImpl.kt}      |  71 ++++---
 .../note/internal/NoteUniquenessManager.java  |   5 +-
 .../option/OptionCollectionRepository.java    |   4 +-
 .../OptionGroupCollectionRepository.java      |   4 +-
 .../option/OptionSetCollectionRepository.java |   4 +-
 .../core/option/internal/OptionCall.kt        |   3 +-
 ...yDIModule.java => OptionEntityDIModule.kt} |  67 +++---
 .../core/option/internal/OptionGroupCall.java |   5 +-
 ...dule.java => OptionGroupEntityDIModule.kt} |  59 ++---
 .../option/internal/OptionGroupHandler.java   |  71 -------
 .../internal/OptionGroupHandler.kt}           |  52 +++--
 .../OptionGroupOptionEntityDIModule.java      |  56 -----
 .../OptionGroupOptionEntityDIModule.kt        |  48 +++++
 .../internal/OptionGroupOptionLinkHandler.kt  |  37 ++++
 .../internal/OptionGroupOptionLinkStore.kt    |  34 +++
 ...java => OptionGroupOptionLinkStoreImpl.kt} |  44 ++--
 .../core/option/internal/OptionGroupStore.kt  |  34 +++
 .../option/internal/OptionGroupStoreImpl.kt   |  58 +++++
 .../core/option/internal/OptionHandler.kt     |  42 ++++
 .../core/option/internal/OptionSetCall.kt     |   3 +-
 .../internal/OptionSetEntityDIModule.kt}      |  53 ++---
 .../core/option/internal/OptionSetHandler.kt  |  36 ++++
 .../core/option/internal/OptionSetStore.kt    |  34 +++
 .../option/internal/OptionSetStoreImpl.kt     |  59 +++++
 .../core/option/internal/OptionStore.kt       |  34 +++
 .../core/option/internal/OptionStoreImpl.kt   |  60 ++++++
 .../OrganisationUnitCollectionRepository.java |   4 +-
 ...nisationUnitGroupCollectionRepository.java |   4 +-
 ...nisationUnitLevelCollectionRepository.java |   4 +-
 .../internal/OrganisationUnitCall.kt          |   3 +-
 .../OrganisationUnitEntityDIModule.kt         |  29 ++-
 .../OrganisationUnitGroupEntityDIModule.kt}   |  50 ++---
 .../internal/OrganisationUnitGroupHandler.kt  |  36 ++++
 .../internal/OrganisationUnitGroupStore.kt    |  28 +--
 .../OrganisationUnitGroupStoreImpl.kt         |  60 ++++++
 .../internal/OrganisationUnitHandler.kt       | 124 ++++++++++-
 .../internal/OrganisationUnitHandlerImpl.kt   | 159 --------------
 .../OrganisationUnitLevelEndpointCall.java    |   5 +-
 .../OrganisationUnitLevelEntityDIModule.java  |  82 -------
 .../OrganisationUnitLevelEntityDIModule.kt}   |  51 +++--
 .../internal/OrganisationUnitLevelHandler.kt  |  36 ++++
 .../internal/OrganisationUnitLevelStore.kt    |  30 +--
 .../OrganisationUnitLevelStoreImpl.kt}        |  62 +++---
 ...OrganisationUnitGroupLinkEntityDIModule.kt |  17 +-
 ...ionUnitOrganisationUnitGroupLinkHandler.kt |  37 ++++
 ...ationUnitOrganisationUnitGroupLinkStore.kt |  26 +--
 ...nUnitOrganisationUnitGroupLinkStoreImpl.kt |  56 +++++
 ...ganisationUnitProgramLinkEntityDIModule.kt |  14 +-
 .../OrganisationUnitProgramLinkHandler.kt     |  37 ++++
 .../OrganisationUnitProgramLinkStore.kt       |  34 +++
 ...> OrganisationUnitProgramLinkStoreImpl.kt} |  46 ++--
 .../internal/OrganisationUnitStore.kt         |  33 +--
 .../internal/OrganisationUnitStoreImpl.kt     |  66 ++++++
 .../internal/service/ExpressionService.kt     |  13 +-
 .../core/period/internal/CalendarProvider.kt  |   2 +-
 .../period/internal/ParentPeriodGenerator.kt  |   2 +-
 .../period/internal/PeriodEntityDIModule.kt   |  50 +++++
 ...DIModule.java => PeriodPackageDIModule.kt} |  32 ++-
 .../core/period/internal/PeriodStore.kt       |  39 ++++
 .../core/period/internal/PeriodStoreImpl.java | 102 ---------
 .../core/period/internal/PeriodStoreImpl.kt   |  95 +++++++++
 .../program/ProgramCollectionRepository.java  |   4 +-
 .../ProgramIndicatorCollectionRepository.java |   4 +-
 ...ProgramRuleActionCollectionRepository.java |   4 +-
 .../ProgramRuleCollectionRepository.java      |   4 +-
 ...ogramRuleVariableCollectionRepository.java |   4 +-
 .../ProgramSectionCollectionRepository.java   |   4 +-
 .../ProgramStageCollectionRepository.java     |   4 +-
 ...mStageDataElementCollectionRepository.java |   4 +-
 ...gramStageSectionsCollectionRepository.java |   4 +-
 ...edEntityAttributeCollectionRepository.java |   4 +-
 .../AnalyticsPeriodBoundaryEntityDIModule.kt  |  48 +++++
 .../AnalyticsPeriodBoundaryHandler.kt         |  36 ++++
 .../internal/AnalyticsPeriodBoundaryStore.kt  |  29 +--
 .../AnalyticsPeriodBoundaryStoreImpl.kt       |  59 +++++
 ...entValueTypeRenderingChildrenAppender.java |   5 +-
 .../ProgramAttributeValueEntityDIModule.java  |  58 -----
 .../ProgramAttributeValueEntityDIModule.kt}   |  32 ++-
 .../core/program/internal/ProgramCall.java    |   2 +-
 .../internal/ProgramEntityDIModule.java       |  97 ---------
 .../internal/ProgramEntityDIModule.kt}        |  70 +++---
 .../core/program/internal/ProgramHandler.java | 134 ------------
 .../core/program/internal/ProgramHandler.kt   |  99 +++++++++
 ...AnalyticsPeriodBoundaryChildrenAppender.kt |   2 +-
 .../program/internal/ProgramIndicatorCall.kt  |   5 +-
 .../ProgramIndicatorEntityDIModule.kt         |  13 +-
 .../internal/ProgramIndicatorHandler.kt       |  12 +-
 ...ogramIndicatorLegendSetEntityDIModule.java |  58 -----
 ...rogramIndicatorLegendSetEntityDIModule.kt} |  32 ++-
 .../program/internal/ProgramIndicatorStore.kt |  41 +---
 .../internal/ProgramIndicatorStoreImpl.kt}    |  68 +++---
 .../internal/ProgramModuleDownloader.kt       |   5 +-
 .../ProgramRuleActionChildrenAppender.java    |   2 +-
 .../ProgramRuleActionEntityDIModule.java      |  65 ------
 .../ProgramRuleActionEntityDIModule.kt        |  56 +++++
 .../internal/ProgramRuleActionHandler.kt      |  36 ++++
 .../internal/ProgramRuleActionStore.kt        |  34 +++
 ...ore.java => ProgramRuleActionStoreImpl.kt} |  87 ++++----
 .../program/internal/ProgramRuleCall.java     |   5 +-
 ...dule.java => ProgramRuleEntityDIModule.kt} |  80 ++++---
 .../program/internal/ProgramRuleHandler.java  |  76 -------
 .../internal/ProgramRuleHandler.kt}           |  64 +++---
 .../core/program/internal/ProgramRuleStore.kt |  34 +++
 ...RuleStore.java => ProgramRuleStoreImpl.kt} |  69 +++---
 .../ProgramRuleVariableEntityDIModule.java    |  65 ------
 .../ProgramRuleVariableEntityDIModule.kt      |  56 +++++
 .../internal/ProgramRuleVariableHandler.kt    |  36 ++++
 .../internal/ProgramRuleVariableStore.kt      |  34 +++
 ...e.java => ProgramRuleVariableStoreImpl.kt} |  76 +++----
 .../ProgramSectionAttributeEntityDIModule.kt  |  48 +++++
 .../ProgramSectionAttributeLinkHandler.kt     |  37 ++++
 .../ProgramSectionAttributeLinkStore.kt       |  34 +++
 ...> ProgramSectionAttributeLinkStoreImpl.kt} |  49 ++---
 .../ProgramSectionEntityDIModule.java         |  68 ------
 .../internal/ProgramSectionEntityDIModule.kt  |  52 +++++
 .../internal/ProgramSectionHandler.java       |  65 ------
 ...DIModule.java => ProgramSectionHandler.kt} |  50 +++--
 .../program/internal/ProgramSectionStore.kt   |  40 +---
 .../internal/ProgramSectionStoreImpl.kt       |  70 ++++++
 ...gramStageAttributeValueEntityDIModule.java |  58 -----
 ...rogramStageAttributeValueEntityDIModule.kt |  51 +++++
 .../program/internal/ProgramStageCall.java    |   5 +-
 ...ProgramStageDataElementEntityDIModule.java |  69 ------
 .../ProgramStageDataElementEntityDIModule.kt  |  54 +++++
 .../ProgramStageDataElementHandler.kt         |  55 +++++
 .../internal/ProgramStageDataElementStore.kt  |  34 +++
 ...va => ProgramStageDataElementStoreImpl.kt} |  76 +++----
 ...ule.java => ProgramStageEntityDIModule.kt} |  94 ++++----
 .../program/internal/ProgramStageHandler.java | 119 -----------
 .../program/internal/ProgramStageHandler.kt   | 100 +++++++++
 ...StageSectionDataElementEntityDIModule.java |  57 -----
 ...amStageSectionDataElementEntityDIModule.kt |  48 +++++
 ...ogramStageSectionDataElementLinkHandler.kt |  37 ++++
 ...ProgramStageSectionDataElementLinkStore.kt |  34 +++
 ...amStageSectionDataElementLinkStoreImpl.kt} |  49 ++---
 .../ProgramStageSectionEntityDIModule.java    |  70 ------
 .../ProgramStageSectionEntityDIModule.kt      |  55 +++++
 .../internal/ProgramStageSectionHandler.java  |  81 -------
 ...ler.java => ProgramStageSectionHandler.kt} |  73 +++----
 ...SectionProgramIndicatorEntityDIModule.java |  57 -----
 ...geSectionProgramIndicatorEntityDIModule.kt |  50 +++++
 ...StageSectionProgramIndicatorLinkHandler.kt |  37 ++++
 ...amStageSectionProgramIndicatorLinkStore.kt |  34 +++
 ...geSectionProgramIndicatorLinkStoreImpl.kt} |  48 ++---
 .../internal/ProgramStageSectionStore.kt      |  32 +--
 .../internal/ProgramStageSectionStoreImpl.kt  |  63 ++++++
 .../program/internal/ProgramStageStore.java   |  88 --------
 .../program/internal/ProgramStageStore.kt     |  34 +++
 .../program/internal/ProgramStageStoreImpl.kt |  87 ++++++++
 .../core/program/internal/ProgramStore.java   | 100 ---------
 ...ramStoreInterface.java => ProgramStore.kt} |  18 +-
 .../core/program/internal/ProgramStoreImpl.kt |  91 ++++++++
 ...mTrackedEntityAttributeEntityDIModule.java |  69 ------
 ...ramTrackedEntityAttributeEntityDIModule.kt |  54 +++++
 .../ProgramTrackedEntityAttributeHandler.kt}  |  34 ++-
 .../ProgramTrackedEntityAttributeStore.kt     |  34 +++
 ...ProgramTrackedEntityAttributeStoreImpl.kt} |  83 ++++----
 ...uteValueTypeRenderingChildrenAppender.java |   5 +-
 ...gramTrackedEntityTypeChildrenAppender.java |   6 +-
 .../internal/ProgramIndicatorEngineImpl.kt    |  20 +-
 .../internal/ProgramIndicatorSQLExecutor.kt   |  19 +-
 ...mStageWorkingListCollectionRepository.java |   4 +-
 ...istAttributeValueFilterChildrenAppender.kt |   2 +-
 ...gListAttributeValueFilterEntityDIModule.kt |  14 +-
 ...eWorkingListAttributeValueFilterHandler.kt |  36 ++++
 ...ageWorkingListAttributeValueFilterStore.kt |  50 +----
 ...orkingListAttributeValueFilterStoreImpl.kt |  80 +++++++
 .../internal/ProgramStageWorkingListCall.kt   |   3 +-
 ...geWorkingListDataFilterChildrenAppender.kt |   2 +-
 .../ProgramStageWorkingListEntityDIModule.kt  |  12 +-
 ...orkingListEventDataFilterEntityDIModule.kt |  14 +-
 ...mStageWorkingListEventDataFilterHandler.kt |  36 ++++
 ...ramStageWorkingListEventDataFilterStore.kt |  50 +----
 ...tageWorkingListEventDataFilterStoreImpl.kt |  81 +++++++
 .../ProgramStageWorkingListHandler.kt         |  10 +-
 .../internal/ProgramStageWorkingListStore.kt  |  49 +----
 .../ProgramStageWorkingListStoreImpl.kt       |  86 ++++++++
 .../RelationshipTypeCollectionRepository.kt   |   8 +-
 ...elationshipConstraintChildrenAppender.java |   5 +-
 .../RelationshipConstraintEntityDIModule.java |  55 -----
 .../RelationshipConstraintEntityDIModule.kt}  |  27 +--
 .../internal/RelationshipConstraintHandler.kt |  36 ++++
 .../internal/RelationshipConstraintStore.kt}  |  10 +-
 ...ava => RelationshipConstraintStoreImpl.kt} |  75 +++----
 .../RelationshipDHISVersionManager.java       |   5 +-
 .../internal/RelationshipEntityDIModule.kt    |  55 +++++
 .../internal/RelationshipHandler.kt           |  61 +++++-
 .../internal/RelationshipHandlerImpl.kt       |  90 --------
 ...> RelationshipItemElementStoreSelector.kt} |  10 +-
 ...ationshipItemElementStoreSelectorImpl.java |  80 -------
 ...lationshipItemElementStoreSelectorImpl.kt} |  51 ++---
 .../RelationshipItemEntityDIModule.kt}        |  48 ++---
 .../internal/RelationshipItemHandler.kt       |  36 ++++
 .../internal/RelationshipItemStoreImpl.kt     |  35 +--
 .../internal/RelationshipStoreImpl.kt         |  33 ++-
 .../internal/RelationshipTypeCall.java        |   5 +-
 .../RelationshipTypeEntityDIModule.kt         |  26 ++-
 .../internal/RelationshipTypeHandler.java     |  70 ------
 .../internal/RelationshipTypeHandler.kt}      |  68 +++---
 .../internal/RelationshipTypeStore.kt         |  34 +++
 ...tore.java => RelationshipTypeStoreImpl.kt} |  65 +++---
 ...IModule.java => ResourceEntityDIModule.kt} |  21 +-
 ...esourceHandler.java => ResourceHandler.kt} |  62 +++---
 .../internal/ResourcePackageDIModule.kt       |  33 +++
 .../core/resource/internal/ResourceStore.kt   |  35 +++
 .../resource/internal/ResourceStoreImpl.java  |  83 --------
 .../internal/ResourceStoreImpl.kt}            |  81 +++----
 ...VisualizationsSettingObjectRepository.java |   6 +-
 ...alyticsTeiSettingCollectionRepository.java |   8 +-
 .../AppearanceSettingsObjectRepository.java   |  12 +-
 .../DataSetSettingsObjectRepository.java      |   6 +-
 .../GeneralSettingObjectRepository.java       |  11 +-
 .../LatestAppVersionObjectRepository.kt       |   4 +-
 .../ProgramSettingsObjectRepository.java      |   6 +-
 ...ynchronizationSettingObjectRepository.java |   6 +-
 .../SystemSettingCollectionRepository.java    |   4 +-
 .../UserSettingsObjectRepository.java         |   6 +-
 ...nalyticsDhisVisualizationSettingHandler.kt |   3 +-
 .../AnalyticsDhisVisualizationStore.kt        |  33 +--
 .../AnalyticsDhisVisualizationStoreImpl.kt    |  70 ++++++
 .../settings/internal/AnalyticsSettingCall.kt |   6 +-
 .../AnalyticsSettingEntityDIModule.kt         |  83 ++------
 .../internal/AnalyticsTeiAttributeHandler.kt  |  39 ++++
 .../internal/AnalyticsTeiAttributeStore.kt    |  24 +--
 .../AnalyticsTeiAttributeStoreImpl.kt}        |  36 ++--
 .../AnalyticsTeiDataChildrenAppender.kt       |  15 +-
 .../AnalyticsTeiDataElementHandler.kt         |  39 ++++
 .../internal/AnalyticsTeiDataElementStore.kt  |  25 +--
 .../AnalyticsTeiDataElementStoreImpl.kt       |  58 +++++
 .../internal/AnalyticsTeiIndicatorHandler.kt  |  39 ++++
 .../internal/AnalyticsTeiIndicatorStore.kt    |  25 +--
 .../AnalyticsTeiIndicatorStoreImpl.kt         |  58 +++++
 .../internal/AnalyticsTeiSettingHandler.kt    |  14 +-
 .../internal/AnalyticsTeiSettingStore.kt      |  37 +---
 .../internal/AnalyticsTeiSettingStoreImpl.kt  |  69 ++++++
 .../AnalyticsTeiWHONutritionDataHandler.kt    |  14 +-
 .../AnalyticsTeiWHONutritionDataStore.kt      |  26 +--
 .../AnalyticsTeiWHONutritionDataStoreImpl.kt  |  59 +++++
 .../internal/AppearanceSettingCall.kt         |   7 +-
 .../settings/internal/DataSetSettingCall.kt   |   4 +-
 .../DataSetSettingEntityDIModule.java         |  54 -----
 .../internal/DataSetSettingEntityDIModule.kt  |  42 ++++
 .../internal/DataSetSettingHandler.kt         |   9 +-
 .../settings/internal/DataSetSettingStore.kt  |  34 +++
 ...gStore.java => DataSetSettingStoreImpl.kt} |  63 +++---
 .../internal/FilterSettingEntityDIModule.kt   |  13 +-
 .../settings/internal/FilterSettingHandler.kt |   9 +-
 .../settings/internal/FilterSettingStore.kt   |  34 +--
 .../internal/FilterSettingStoreImpl.kt        |  68 ++++++
 .../settings/internal/GeneralSettingCall.kt   |   3 +-
 .../internal/GeneralSettingEntityDIModule.kt  |  13 +-
 .../internal/GeneralSettingHandler.kt         |   6 +-
 .../settings/internal/GeneralSettingStore.kt  |  38 +---
 .../internal/GeneralSettingStoreImpl.kt       |  73 +++++++
 .../settings/internal/LatestAppVersionCall.kt |   3 +-
 .../internal/LatestAppVersionDIModule.kt      |  13 +-
 .../internal/LatestAppVersionHandler.kt       |   6 +-
 .../internal/LatestAppVersionStore.kt         |  31 +--
 .../internal/LatestAppVersionStoreImpl.kt     |  66 ++++++
 ...ogramConfigurationSettingEntityDIModule.kt |  13 +-
 .../ProgramConfigurationSettingHandler.kt     |   9 +-
 .../ProgramConfigurationSettingStore.kt       |  35 +--
 .../ProgramConfigurationSettingStoreImpl.kt   |  69 ++++++
 .../settings/internal/ProgramSettingCall.kt   |   4 +-
 .../ProgramSettingEntityDIModule.java         |  54 -----
 .../internal/ProgramSettingEntityDIModule.kt  |  42 ++++
 .../internal/ProgramSettingHandler.kt         |   6 +-
 .../settings/internal/ProgramSettingStore.kt  |  34 +++
 ...gStore.java => ProgramSettingStoreImpl.kt} |  89 ++++----
 .../internal/SynchronizationSettingCall.kt    |   3 +-
 .../SynchronizationSettingEntityDIModule.kt   |  19 +-
 .../internal/SynchronizationSettingHandler.kt |  15 +-
 .../internal/SynchronizationSettingStore.kt   |  34 +--
 .../SynchronizationSettingStoreImpl.kt        |  69 ++++++
 .../settings/internal/SystemSettingCall.kt    |   3 +-
 .../internal/SystemSettingEntityDIModule.java |  67 ------
 .../internal/SystemSettingEntityDIModule.kt   |  50 +++++
 .../settings/internal/SystemSettingHandler.kt |  39 ++++
 .../settings/internal/SystemSettingStore.kt   |  34 +++
 ...ngStore.java => SystemSettingStoreImpl.kt} |  63 +++---
 .../settings/internal/UserSettingsCall.kt     |   3 +-
 .../internal/UserSettingsEntityDIModule.java  |  66 ------
 .../internal/UserSettingsEntityDIModule.kt    |  50 +++++
 .../settings/internal/UserSettingsHandler.kt  |   9 +-
 .../settings/internal/UserSettingsStore.kt    |  34 +++
 ...ngsStore.java => UserSettingsStoreImpl.kt} |  59 ++---
 .../internal/MetadataIdsStore.kt              |   3 +-
 .../internal/OngoingSubmissionsStore.kt       |   3 +-
 .../internal/SMSConfigStoreImpl.kt            |  42 +---
 .../internal/SMSMetadataIdStore.kt            |  37 +---
 .../internal/SMSMetadataIdStoreImpl.kt        |  66 ++++++
 .../internal/SMSOngoingSubmissionStore.kt     |  36 +---
 .../internal/SMSOngoingSubmissionStoreImpl.kt |  65 ++++++
 .../{SmsDIModule.java => SmsDIModule.kt}      |  91 ++++----
 .../core/systeminfo/SystemInfoModule.kt       |   4 +-
 .../SystemInfoObjectRepository.java           |   4 +-
 .../internal/DHISVersionManagerImpl.kt        |   8 +-
 .../systeminfo/internal/SystemInfoCall.kt     |   3 +-
 .../internal/SystemInfoEntityDIModule.java    |  76 -------
 .../internal/SystemInfoEntityDIModule.kt      |  50 +++++
 .../systeminfo/internal/SystemInfoHandler.kt  |  39 ++++
 .../internal/SystemInfoModuleDownloader.kt    |   4 +-
 .../internal/SystemInfoModuleImpl.kt          |   7 +-
 .../systeminfo/internal/SystemInfoStore.kt    |  34 +++
 ...mInfoStore.java => SystemInfoStoreImpl.kt} |  64 +++---
 ...edEntityAttributeCollectionRepository.java |   4 +-
 ...edEntityAttributeReservedValueManager.java |  72 +++----
 ...ityInstanceFilterCollectionRepository.java |   4 +-
 ...tityTypeAttributeCollectionRepository.java |   4 +-
 ...TrackedEntityTypeCollectionRepository.java |   4 +-
 .../AttributeValueFilterEntityDIModule.kt     |  15 +-
 .../internal/AttributeValueFilterHandler.kt   |  39 ++++
 .../internal/AttributeValueFilterStore.kt     |  49 +----
 .../internal/AttributeValueFilterStoreImpl.kt |  81 +++++++
 ...porterTrackedEntityPostPayloadGenerator.kt |   9 +-
 ...erImporterTrackedEntityPostStateManager.kt |   5 +-
 .../OldTrackerImporterPayloadGenerator.kt     |  19 +-
 .../internal/ReservedValueSettingDIModule.kt  |  42 ++++
 .../internal/ReservedValueSettingStore.kt     |  19 +-
 .../ReservedValueSettingStoreImpl.kt}         |  45 ++--
 .../internal/TrackedEntityAttributeCall.java  |   5 +-
 .../TrackedEntityAttributeEntityDIModule.java |  55 -----
 .../TrackedEntityAttributeEntityDIModule.kt   |  42 ++++
 ....java => TrackedEntityAttributeHandler.kt} |  75 +++----
 ...TrackedEntityAttributeLegendSetDIModule.kt |  25 +--
 ...ckedEntityAttributeLegendSetLinkHandler.kt |  40 ++++
 ...rackedEntityAttributeLegendSetLinkStore.kt |  34 +++
 ...edEntityAttributeLegendSetLinkStoreImpl.kt |  58 +++++
 ...ibuteReservedValueEndpointCallFactory.java |   5 +-
 ...yAttributeReservedValueEntityDIModule.java |  62 ------
 ...ityAttributeReservedValueEntityDIModule.kt |  49 +++++
 ...ckedEntityAttributeReservedValueHandler.kt |  39 ++++
 ...ckedEntityAttributeReservedValueStore.java | 137 ------------
 ...ackedEntityAttributeReservedValueStore.kt} |  33 ++-
 ...edEntityAttributeReservedValueStoreImpl.kt | 122 +++++++++++
 ...yAttributeReservedValueStoreInterface.java |  49 -----
 .../internal/TrackedEntityAttributeStore.kt   |  34 +++
 ...ava => TrackedEntityAttributeStoreImpl.kt} |  91 ++++----
 ...dEntityAttributeValueChildrenAppender.java |   2 +-
 ...ackedEntityAttributeValueEntityDIModule.kt |  50 +++++
 .../TrackedEntityAttributeValueHandler.kt     |  11 +-
 .../TrackedEntityAttributeValueStoreImpl.kt   |  41 ++--
 ...rackedEntityDataValueChildrenAppender.java |   2 +-
 .../TrackedEntityDataValueEntityDIModule.kt   |  50 +++++
 .../TrackedEntityDataValueHandler.java        |  74 -------
 .../TrackedEntityDataValueHandler.kt}         |  48 ++---
 ...re.java => TrackedEntityDataValueStore.kt} |  41 ++--
 .../TrackedEntityDataValueStoreImpl.java      | 201 ------------------
 .../TrackedEntityDataValueStoreImpl.kt        | 164 ++++++++++++++
 .../TrackedEntityInstanceEntityDIModule.kt    |   9 +-
 ...tityInstanceEventFilterEntityDIModule.java |  56 -----
 ...EntityInstanceEventFilterEntityDIModule.kt |  42 ++++
 ...TrackedEntityInstanceEventFilterHandler.kt |  39 ++++
 .../TrackedEntityInstanceEventFilterStore.kt  |  38 +---
 ...ackedEntityInstanceEventFilterStoreImpl.kt |  68 ++++++
 ...terAttributeValueFilterChildrenAppender.kt |   2 +-
 .../TrackedEntityInstanceFilterCall.kt        |   3 +-
 ...ackedEntityInstanceFilterEntityDIModule.kt |  16 +-
 ...nstanceFilterEvenFilterChildrenAppender.kt |   2 +-
 .../TrackedEntityInstanceFilterHandler.kt     |   8 +-
 .../TrackedEntityInstanceFilterStore.kt       |  43 +---
 .../TrackedEntityInstanceFilterStoreImpl.kt   |  76 +++++++
 .../internal/TrackedEntityInstanceHandler.kt  |  14 +-
 ...TrackedEntityInstanceLastUpdatedManager.kt |   3 +-
 ...ore.java => TrackedEntityInstanceStore.kt} |  34 ++-
 .../TrackedEntityInstanceStoreImpl.java       | 130 -----------
 .../TrackedEntityInstanceStoreImpl.kt         | 108 ++++++++++
 ...TrackedEntityInstanceSyncEntityDIModule.kt |  42 ++++
 .../TrackedEntityInstanceSyncStore.java       |  63 ------
 .../TrackedEntityInstanceSyncStore.kt         |  33 +++
 .../TrackedEntityInstanceSyncStoreImpl.kt     |  65 ++++++
 .../TrackedEntityInstanceUidHelperImpl.kt     |   5 +-
 ...edEntityTypeAttributeChildrenAppender.java |   2 +-
 ...rackedEntityTypeAttributeEntityDIModule.kt |  50 +++++
 .../TrackedEntityTypeAttributeHandler.kt      |  39 ++++
 .../TrackedEntityTypeAttributeStore.kt        |  34 +++
 ...=> TrackedEntityTypeAttributeStoreImpl.kt} |  72 +++----
 .../internal/TrackedEntityTypeCall.java       |   5 +-
 .../TrackedEntityTypeEntityDIModule.java      |  80 -------
 ...ava => TrackedEntityTypeEntityDIModule.kt} |  48 ++---
 .../internal/TrackedEntityTypeHandler.java    |  72 -------
 .../internal/TrackedEntityTypeHandler.kt}     |  52 ++---
 .../internal/TrackedEntityTypeStore.kt        |  34 +++
 ...ore.java => TrackedEntityTypeStoreImpl.kt} |  58 ++---
 .../internal/TrackerPostStateManager.kt       |   5 +-
 .../internal/TrackerQueryBundleFactory.kt     |   4 +-
 .../internal/TrackerQueryFactory.kt           |   4 +-
 .../TrackerQueryFactoryCommonHelper.kt        |   5 +-
 .../ownership/OwnershipEntityDIModule.kt      |  16 +-
 .../ownership/OwnershipManagerImpl.kt         |   5 +-
 .../ownership/ProgramOwnerHandler.kt          |  12 +-
 .../ownership/ProgramOwnerPostCall.kt         |   3 +-
 .../ownership/ProgramOwnerStore.kt            |  36 +---
 .../ownership/ProgramOwnerStoreImpl.kt}       |  65 +++---
 .../ownership/ProgramTempOwnerStore.kt        |  40 +---
 .../ownership/ProgramTempOwnerStoreImpl.kt    |  72 +++++++
 .../tracker/TrackerPostParentCallHelper.kt    |   5 +-
 .../tracker/importer/internal/JobQueryCall.kt |   3 +-
 .../internal/JobReportEnrollmentHandler.kt    |   5 +-
 .../internal/JobReportEventHandler.kt         |   5 +-
 .../TrackerImporterBreakTheGlassHelper.kt     |   4 +-
 .../TrackerImporterPackageDIModule.kt         |  14 +-
 .../internal/TrackerImporterPostCall.kt       |   5 +-
 .../TrackerImporterProgramOwnerPostCall.kt    |   4 +-
 .../internal/TrackerJobObjectHandler.kt       |  38 ++++
 .../internal/TrackerJobObjectStore.kt         |  40 +---
 .../internal/TrackerJobObjectStoreImpl.kt     |  69 ++++++
 .../interpreters/InterpreterHelper.kt         |  21 +-
 .../stock/StockUseCaseCollectionRepository.kt |   4 +-
 .../stock/internal/StockUseCaseCall.kt        |   3 +-
 .../internal/StockUseCaseEntityDIModule.kt    |  20 +-
 .../stock/internal/StockUseCaseHandler.kt     |   9 +-
 .../stock/internal/StockUseCaseStore.kt       |  26 +--
 .../stock/internal/StockUseCaseStoreImpl.kt   |  59 +++++
 ...StockUseCaseTransactionChildrenAppender.kt |   4 +-
 .../StockUseCaseTransactionEntityDIModule.kt  |  15 +-
 .../StockUseCaseTransactionLinkHandler.kt     |  39 ++++
 .../StockUseCaseTransactionLinkStore.kt       |  35 +--
 .../StockUseCaseTransactionLinkStoreImpl.kt   |  68 ++++++
 .../AuthenticatedUserObjectRepository.java    |   4 +-
 .../user/AuthorityCollectionRepository.java   |   4 +-
 .../user/UserCredentialsObjectRepository.kt   |   4 +-
 .../core/user/UserObjectRepository.java       |   4 +-
 .../user/UserRoleCollectionRepository.java    |   4 +-
 .../core/user/internal/AccountManagerImpl.kt  |   5 +-
 .../AuthenticatedUserEntityDIModule.java      |  59 -----
 .../AuthenticatedUserEntityDIModule.kt        |  50 +++++
 .../user/internal/AuthenticatedUserStore.kt   |  34 +++
 ...ore.java => AuthenticatedUserStoreImpl.kt} |  63 +++---
 .../user/internal/AuthorityCallProcessor.java |   2 +-
 .../AuthorityEndpointCallFactory.java         |   2 +-
 .../internal/AuthorityEntityDIModule.java     |  68 ------
 .../user/internal/AuthorityEntityDIModule.kt  |  50 +++++
 .../core/user/internal/AuthorityHandler.kt    |  39 ++++
 .../core/user/internal/AuthorityStore.kt      |  34 +++
 .../core/user/internal/AuthorityStoreImpl.kt  |  58 +++++
 .../android/core/user/internal/LogInCall.kt   |  14 +-
 .../android/core/user/internal/UserCall.kt    |   3 +-
 .../core/user/internal/UserEntityDIModule.kt  |  16 +-
 .../android/core/user/internal/UserHandler.kt |   6 +-
 .../UserOrganisationUnitLinkEntityDIModule.kt |  13 +-
 .../UserOrganisationUnitLinkHandler.kt        |  40 ++++
 .../UserOrganisationUnitLinkStoreImpl.kt      |  37 +---
 .../user/internal/UserRoleChildrenAppender.kt |   4 +-
 .../user/internal/UserRoleEntityDIModule.java |  77 -------
 .../internal/UserRoleEntityDIModule.kt}       |  43 ++--
 .../core/user/internal/UserRoleHandler.kt     |  39 ++++
 .../core/user/internal/UserRoleStore.kt       |  34 +++
 .../core/user/internal/UserRoleStoreImpl.kt   |  55 +++++
 .../android/core/user/internal/UserStore.java |  70 ------
 .../android/core/user/internal/UserStore.kt   |  34 +++
 .../core/user/internal/UserStoreImpl.kt       |  70 ++++++
 .../ValidationRuleCollectionRepository.java   |   8 +-
 .../engine/internal/ValidationEngineImpl.kt   |   5 +-
 ...taSetValidationRuleLinkEntityDIModule.java |  56 -----
 ...DataSetValidationRuleLinkEntityDIModule.kt |  42 ++++
 .../DataSetValidationRuleLinkHandler.kt       |  40 ++++
 .../DataSetValidationRuleLinkStore.kt         |  34 +++
 ... => DataSetValidationRuleLinkStoreImpl.kt} |  44 ++--
 ...dule.java => ValidationPackageDIModule.kt} |  53 +++--
 .../internal/ValidationRuleCall.java          |   7 +-
 .../internal/ValidationRuleEntityDIModule.kt} |  42 ++--
 .../internal/ValidationRuleHandler.kt         |  44 ++++
 .../internal/ValidationRuleStore.kt           |  34 +++
 ...eStore.java => ValidationRuleStoreImpl.kt} |  77 ++++---
 .../internal/ValidationRuleUidsCallImpl.java  |   5 +-
 .../VisualizationCollectionRepository.java    |   4 +-
 .../internal/VisualizationCall.kt             |   3 +-
 ...isualizationDimensionItemEntityDIModule.kt |  15 +-
 .../VisualizationDimensionItemHandler.kt      |  39 ++++
 .../VisualizationDimensionItemStore.kt        |  26 +--
 .../VisualizationDimensionItemStoreImpl.kt    |  57 +++++
 .../internal/VisualizationEntityDIModule.kt   |  15 +-
 .../internal/VisualizationHandler.kt          |   6 +-
 .../internal/VisualizationModuleDownloader.kt |   5 +-
 .../internal/VisualizationStore.kt            |  54 +----
 .../internal/VisualizationStoreImpl.kt        |  86 ++++++++
 .../AnalyticsOrganisationUnitHelperShould.kt  |  14 +-
 .../AnalyticsServiceMetadataHelperShould.kt   |  40 ++--
 ...ualizationsServiceDimensionHelperShould.kt |  12 +-
 .../internal/APICallExecutorShould.java       |   4 +-
 .../CoroutineAPICallExecutorShould.kt         |   4 +-
 .../internal/CategoryComboHandlerShould.kt    |  19 +-
 .../internal/TrackerDataManagerShould.kt      |  12 +-
 .../ValueTypeRenderingHandlerShould.java      |  19 +-
 ...erDatabaseManagerForD2ManagerUnitShould.kt |   3 +-
 .../MultiUserDatabaseManagerUnitShould.kt     |   3 +-
 .../internal/DataElementHandlerShould.java    | 177 ---------------
 .../internal/DataElementHandlerShould.kt      | 146 +++++++++++++
 .../internal/DataSetHandlerShould.java        |  34 +--
 .../internal/SectionHandlerShould.java        |  41 ++--
 .../DataValueImportHandlerShould.java         |  16 +-
 .../AggregatedDataCallBundleFactoryShould.kt  |   3 +-
 .../enrollment/EnrollmentServiceShould.kt     |   4 +-
 .../internal/EventFilterHandlerShould.java    |  20 +-
 .../core/event/internal/EventHandlerShould.kt |   4 +-
 .../internal/EventQueryBundleFactoryShould.kt |   8 +-
 .../internal/LegendSetHandlerShould.java      |  25 ++-
 .../layer/internal/MapLayerHandlerShould.kt   |   7 +-
 .../option/internal/OptionHandlerShould.java  |  11 +-
 .../OrganisationUnitCallUnitShould.kt         |   5 +-
 .../internal/OrganisationUnitHandlerShould.kt |  23 +-
 .../expression/ExpressionServiceShould.kt     |  11 +-
 .../internal/ProgramEndpointCallShould.java   |  20 +-
 .../internal/ProgramHandlerShould.java        |  37 ++--
 .../ProgramIndicatorHandlerShould.java        |  31 ++-
 .../internal/ProgramModuleDownloaderShould.kt |   5 +-
 .../internal/ProgramRuleHandlerShould.java    |  26 ++-
 .../internal/ProgramSectionHandlerShould.java |  25 ++-
 .../ProgramStageDataElementHandlerShould.java |  28 ++-
 .../internal/ProgramStageHandlerShould.java   |  36 ++--
 .../ProgramStageSectionHandlerShould.java     |  26 +--
 ...amTrackedEntityAttributeHandlerShould.java |  19 +-
 .../ProgramStageWorkingListHandlerShould.kt   |   9 +-
 .../RelationshipDHISVersionManagerShould.kt   |   3 +-
 .../internal/RelationshipHandlerShould.kt     |   7 +-
 .../internal/AnalyticsSettingCallShould.kt    |   7 +-
 .../AnalyticsTeiSettingHandlerShould.kt       |  12 +-
 ...alyticsTeiWHONutritionDataHandlerShould.kt |   9 +-
 .../internal/AppearanceSettingsCallShould.kt  |   7 +-
 .../internal/DataSetSettingCallShould.kt      |   4 +-
 .../internal/DataSetSettingHandlerShould.java |  15 +-
 .../internal/FilterSettingHandlerShould.kt    |   3 +-
 .../internal/GeneralSettingCallShould.kt      |   3 +-
 .../internal/GeneralSettingsHandlerShould.kt  |   3 +-
 ...rogramConfigurationSettingHandlerShould.kt |   4 +-
 .../internal/ProgramSettingCallShould.kt      |   4 +-
 .../internal/ProgramSettingHandlerShould.java |  15 +-
 .../SynchronizationSettingCallShould.kt       |   3 +-
 .../SynchronizationSettingsHandlerShould.kt   |   9 +-
 .../internal/DHISVersionManagerShould.kt      |   9 +-
 .../internal/SystemInfoCallShould.kt          |   3 +-
 .../TrackedEntityAttributeHandlerShould.java  |   8 +-
 ...ckedEntityInstanceFilterHandlerShould.java |   9 +-
 .../TrackedEntityInstanceHandlerShould.kt     |  15 +-
 ...TrackedEntityInstanceQueryFactoryShould.kt |   8 +-
 .../TrackedEntityInstanceUidHelperShould.java |  13 +-
 .../ownership/OwnershipManagerShould.kt       |   5 +-
 .../TrackerPostParentCallHelperShould.kt      |   7 +-
 .../usecase/stock/StockUseCaseCallShould.kt   |   4 +-
 .../internal/AuthorityEndpointCallShould.kt   |   3 +-
 .../core/user/internal/LogInCallUnitShould.kt |  13 +-
 .../core/user/internal/UserCallShould.kt      |   3 +-
 .../core/user/internal/UserHandlerShould.kt   |   6 +-
 .../internal/VisualizationHandlerShould.kt    |   8 +-
 1056 files changed, 17753 insertions(+), 13354 deletions(-)
 rename core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/{AttributeStoreIntegrationShould.java => AttributeStoreIntegrationShould.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/DataSetInstanceEntityDIModule.java => attribute/internal/AttributeEntityDIModule.kt} (79%)
 rename core/src/main/java/org/hisp/dhis/android/core/{arch/di/internal/IdentifiableStoreProvider.java => attribute/internal/AttributeHandler.kt} (82%)
 rename core/src/main/java/org/hisp/dhis/android/core/{resource/internal/ResourcePackageDIModule.java => attribute/internal/AttributePackageDIModule.kt} (90%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/attribute/internal/{DataElementAttributeValueLinkStore.java => DataElementAttributeValueLinkStoreImpl.kt} (67%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/attribute/internal/{ProgramAttributeValueLinkStore.java => ProgramAttributeValueLinkStoreImpl.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/attribute/internal/{ProgramStageAttributeValueLinkStore.java => ProgramStageAttributeValueLinkStoreImpl.kt} (67%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{legendset/internal/LegendSetStore.java => category/internal/CategoryStoreImpl.kt} (66%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{arch/di/internal/ObjectWithoutUidStoreProvider.java => common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.kt} (86%)
 rename core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/{ValueTypeDeviceRenderingStore.java => ValueTypeDeviceRenderingStoreImpl.kt} (59%)
 rename core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/{ValueTypeRenderingEntityDIModule.java => ValueTypeRenderingEntityDIModule.kt} (80%)
 rename core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/{ValueTypeRenderingHandler.java => ValueTypeRenderingHandler.kt} (58%)
 rename core/src/main/java/org/hisp/dhis/android/core/{resource/internal/ResourceStore.java => configuration/internal/ConfigurationStore.kt} (87%)
 rename core/src/main/java/org/hisp/dhis/android/core/configuration/internal/{ConfigurationStore.java => ConfigurationStoreImpl.kt} (73%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantPackageDIModule.java => ConstantPackageDIModule.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/{user/internal/UserRoleStore.java => constant/internal/ConstantStoreImpl.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/{DataApprovalStore.java => DataApprovalStoreImpl.kt} (52%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{dataapproval/internal/DataApprovalEntityDIModule.java => dataelement/internal/DataElementEntityDIModule.kt} (56%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/DataInputPeriodEntityDIModule.java => dataelement/internal/DataElementLegendSetEntityDIModule.kt} (70%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{arch/di/internal/IdentifiableEntityDIModule.java => dataelement/internal/DataElementOperandHandler.kt} (81%)
 rename core/src/main/java/org/hisp/dhis/android/core/{attribute/internal/AttributePackageDIModule.java => dataelement/internal/DataElementOperandStore.kt} (84%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementOperandStore.java => DataElementOperandStoreImpl.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementStore.java => DataElementStoreImpl.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/{trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.java => dataset/internal/DataInputPeriodEntityDIModule.kt} (79%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataInputPeriodLinkStore.java => DataInputPeriodStoreImpl.kt} (61%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{datavalue/internal/DataValueEntityDIModule.java => dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt} (71%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetCompleteRegistrationStore.java => DataSetCompleteRegistrationStore.kt} (70%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetCompulsoryDataElementOperandLinkStore.java => DataSetCompulsoryDataElementOperandLinkStoreImpl.kt} (66%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetDataElementLinkStore.java => DataSetElementStoreImpl.kt} (65%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetOrganisationUnitLinkStore.java => DataSetOrganisationUnitLinkStoreImpl.kt} (69%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{indicator/internal/IndicatorStore.java => dataset/internal/DataSetStoreImpl.kt} (52%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{SectionDataElementLinkStore.java => SectionDataElementLinkStoreImpl.kt} (69%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{SectionGreyedFieldsLinkStore.java => SectionGreyedFieldsLinkStoreImpl.kt} (69%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{program/internal/AnalyticsPeriodBoundaryEntityDIModule.java => dataset/internal/SectionIndicatorLinkStoreImpl.kt} (66%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/{DataValueConflictDIModule.kt => DataValueConflictEntityDIModule.kt} (89%)
 rename core/src/main/java/org/hisp/dhis/android/core/{maintenance/internal/D2ErrorStore.java => datavalue/internal/DataValueConflictStoreImpl.kt} (61%)
 rename core/src/main/java/org/hisp/dhis/android/core/{maintenance/internal/D2ErrorEntityDIModule.java => datavalue/internal/DataValueEntityDIModule.kt} (74%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{imports/internal/EnrollmentWebResponseHandlerSummary.kt => event/internal/EventSyncStore.kt} (86%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{option/internal/OptionGroupStore.java => expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt} (62%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/imports/internal/{TrackerImportConflictEntityDIModule.java => TrackerImportConflictEntityDIModule.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{event/internal/EventSyncEntityDIModule.java => indicator/internal/DataSetIndicatorEntityDIModule.kt} (81%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{DataSetIndicatorLinkStore.java => DataSetIndicatorLinkStoreImpl.kt} (70%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorTypeStore.java => IndicatorTypeStoreImpl.kt} (66%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/internal/{DataElementLegendSetLinkStore.java => DataElementLegendSetLinkStoreImpl.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{period/PeriodEntityDIModule.java => legendset/internal/LegendEntityDIModule.kt} (75%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{option/internal/OptionSetEntityDIModule.java => legendset/internal/LegendSetEntityDIModule.kt} (61%)
 rename core/src/main/java/org/hisp/dhis/android/core/{option/internal/OptionHandler.java => legendset/internal/LegendSetHandler.kt} (61%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{option/internal/OptionSetStore.java => legendset/internal/LegendSetStoreImpl.kt} (65%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/internal/{LegendStore.java => LegendStoreImpl.kt} (61%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/internal/{ProgramIndicatorLegendSetLinkStore.java => ProgramIndicatorLegendSetLinkStoreImpl.kt} (67%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{user/internal/AuthorityStore.java => maintenance/internal/D2ErrorStoreImpl.kt} (68%)
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/{ForeignKeyViolationEntityDIModule.java => ForeignKeyViolationEntityDIModule.kt} (75%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/{ForeignKeyViolationStore.java => ForeignKeyViolationStoreImpl.kt} (66%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{trackedentity/internal/TrackedEntityDataValueEntityDIModule.java => note/internal/NoteEntityDIModule.kt} (69%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/note/internal/{NoteStore.java => NoteStoreImpl.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionEntityDIModule.java => OptionEntityDIModule.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionGroupEntityDIModule.java => OptionGroupEntityDIModule.kt} (61%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/{validation/internal/ValidationRuleHandler.java => option/internal/OptionGroupHandler.kt} (60%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionGroupOptionLinkStore.java => OptionGroupOptionLinkStoreImpl.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{indicator/internal/IndicatorEntityDIModule.java => option/internal/OptionSetEntityDIModule.kt} (62%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{validation/internal/ValidationRuleEntityDIModule.java => organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt} (63%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{note/internal/NoteEntityDIModule.java => organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt} (62%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/SectionStore.java => organisationunit/internal/OrganisationUnitLevelStoreImpl.kt} (61%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitProgramLinkStore.java => OrganisationUnitProgramLinkStoreImpl.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/period/internal/{PeriodPackageDIModule.java => PeriodPackageDIModule.kt} (74%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/DataSetElementEntityDIModule.java => program/internal/ProgramAttributeValueEntityDIModule.kt} (70%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{organisationunit/internal/OrganisationUnitGroupEntityDIModule.java => program/internal/ProgramEntityDIModule.kt} (55%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{attribute/internal/AttributeEntityDIModule.java => program/internal/ProgramIndicatorLegendSetEntityDIModule.kt} (69%)
 rename core/src/main/java/org/hisp/dhis/android/core/{option/internal/OptionStore.java => program/internal/ProgramIndicatorStoreImpl.kt} (54%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleActionStore.java => ProgramRuleActionStoreImpl.kt} (52%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleEntityDIModule.java => ProgramRuleEntityDIModule.kt} (55%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/{legendset/internal/LegendSetHandler.java => program/internal/ProgramRuleHandler.kt} (56%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleStore.java => ProgramRuleStoreImpl.kt} (59%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleVariableStore.java => ProgramRuleVariableStoreImpl.kt} (57%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramSectionAttributeLinkStore.java => ProgramSectionAttributeLinkStoreImpl.kt} (68%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramSectionAttributeEntityDIModule.java => ProgramSectionHandler.kt} (61%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageDataElementStore.java => ProgramStageDataElementStoreImpl.kt} (55%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageEntityDIModule.java => ProgramStageEntityDIModule.kt} (52%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageSectionDataElementLinkStore.java => ProgramStageSectionDataElementLinkStoreImpl.kt} (66%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageDataElementHandler.java => ProgramStageSectionHandler.kt} (50%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageSectionProgramIndicatorLinkStore.java => ProgramStageSectionProgramIndicatorLinkStoreImpl.kt} (66%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.java
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStoreInterface.java => ProgramStore.kt} (81%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{event/internal/EventPostNoteStore.kt => program/internal/ProgramTrackedEntityAttributeHandler.kt} (62%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramTrackedEntityAttributeStore.java => ProgramTrackedEntityAttributeStoreImpl.kt} (56%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{trackedentity/internal/ReservedValueSettingDIModule.java => relationship/internal/RelationshipConstraintEntityDIModule.kt} (77%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{arch/di/internal/ObjectWithoutUidEntityDIModule.java => relationship/internal/RelationshipConstraintStore.kt} (85%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipConstraintStore.java => RelationshipConstraintStoreImpl.kt} (55%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipItemElementStoreSelector.java => RelationshipItemElementStoreSelector.kt} (86%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/{constant/internal/ConstantHandler.java => relationship/internal/RelationshipItemElementStoreSelectorImpl.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/{legendset/internal/LegendEntityDIModule.java => relationship/internal/RelationshipItemEntityDIModule.kt} (63%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/{indicator/internal/IndicatorTypeEntityDIModule.java => relationship/internal/RelationshipTypeHandler.kt} (53%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipTypeStore.java => RelationshipTypeStoreImpl.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/resource/internal/{ResourceEntityDIModule.java => ResourceEntityDIModule.kt} (85%)
 rename core/src/main/java/org/hisp/dhis/android/core/resource/internal/{ResourceHandler.java => ResourceHandler.kt} (62%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/DataSetStore.java => resource/internal/ResourceStoreImpl.kt} (50%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{trackedentity/TrackedEntityAttributeLegendSetLinkStore.kt => settings/internal/AnalyticsTeiAttributeStoreImpl.kt} (70%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/internal/{DataSetSettingStore.java => DataSetSettingStoreImpl.kt} (60%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/internal/{ProgramSettingStore.java => ProgramSettingStoreImpl.kt} (51%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/internal/{SystemSettingStore.java => SystemSettingStoreImpl.kt} (63%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/internal/{UserSettingsStore.java => UserSettingsStoreImpl.kt} (64%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/sms/internal/{SmsDIModule.java => SmsDIModule.kt} (60%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/{SystemInfoStore.java => SystemInfoStoreImpl.kt} (60%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{dataelement/internal/DataElementOperandEntityDIModule.java => trackedentity/internal/ReservedValueSettingStoreImpl.kt} (67%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeHandler.java => TrackedEntityAttributeHandler.kt} (54%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.java
 rename core/src/main/java/org/hisp/dhis/android/core/{period/internal/PeriodStore.java => trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt} (73%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreInterface.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeStore.java => TrackedEntityAttributeStoreImpl.kt} (52%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/{relationship/internal/RelationshipItemEntityDIModule.java => trackedentity/internal/TrackedEntityDataValueHandler.kt} (58%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityDataValueStore.java => TrackedEntityDataValueStore.kt} (67%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityInstanceStore.java => TrackedEntityInstanceStore.kt} (74%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeAttributeStore.java => TrackedEntityTypeAttributeStoreImpl.kt} (60%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeAttributeEntityDIModule.java => TrackedEntityTypeEntityDIModule.kt} (64%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/{program/internal/ProgramTrackedEntityAttributeHandler.java => trackedentity/internal/TrackedEntityTypeHandler.kt} (57%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeStore.java => TrackedEntityTypeStoreImpl.kt} (66%)
 rename core/src/main/java/org/hisp/dhis/android/core/{event/internal/EventSyncStore.java => trackedentity/ownership/ProgramOwnerStoreImpl.kt} (61%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{AuthenticatedUserStore.java => AuthenticatedUserStoreImpl.kt} (62%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{relationship/internal/RelationshipEntityDIModule.java => user/internal/UserRoleEntityDIModule.kt} (68%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{DataSetValidationRuleLinkStore.java => DataSetValidationRuleLinkStoreImpl.kt} (69%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationPackageDIModule.java => ValidationPackageDIModule.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/{trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.java => validation/internal/ValidationRuleEntityDIModule.kt} (66%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.kt
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleStore.java => ValidationRuleStoreImpl.kt} (56%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.java
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
index 132b668207..3784d637bb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
@@ -44,8 +44,9 @@ class MockIntegrationTestObjects(val content: MockIntegrationTestDatabaseContent
 
     val d2: D2 = forNewDatabase()
     val databaseAdapter: DatabaseAdapter = d2.databaseAdapter()
-    var serverDate = Date()
-    var resourceHandler: ResourceHandler = ResourceHandler.create(databaseAdapter)
+
+    private var serverDate = Date()
+    private var resourceHandler: ResourceHandler = ResourceHandler.create(databaseAdapter)
 
     @JvmField
     internal val d2DIComponent: D2DIComponent = d2.d2DIComponent
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsRepositoryIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsRepositoryIntegrationShould.kt
index 4d1ffe2977..243f6d4ab0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsRepositoryIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsRepositoryIntegrationShould.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.common.RelativePeriod
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.junit.Test
 
@@ -91,7 +91,7 @@ class AnalyticsRepositoryIntegrationShould : BaseMockIntegrationTestFullDispatch
 
     @Test
     fun should_fail_if_unsupported_aggregation_type() {
-        val dataElementStore = DataElementStore.create(databaseAdapter)
+        val dataElementStore = DataElementStoreImpl(databaseAdapter)
         val dataElement = dataElementStore.selectByUid("g9eOBujte1U")!!
 
         val varianceDataElement = dataElement.toBuilder().aggregationType(AggregationType.VARIANCE.name).build()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
index 996a9eca31..12398f87ef 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
@@ -69,32 +69,43 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEv
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.relationshipTypeFrom
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.relationshipTypeTo
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEvaluatorSamples.trackedEntityType
-import org.hisp.dhis.android.core.category.internal.*
+import org.hisp.dhis.android.core.category.internal.CategoryCategoryComboLinkStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryCategoryOptionLinkStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryComboStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryOptionComboCategoryOptionLinkStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryStoreImpl
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
 import org.hisp.dhis.android.core.common.RelativePeriod
-import org.hisp.dhis.android.core.constant.internal.ConstantStore
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.constant.internal.ConstantStoreImpl
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
 import org.hisp.dhis.android.core.datavalue.DataValue
-import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
+import org.hisp.dhis.android.core.datavalue.internal.DataValueStoreImpl
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
-import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
-import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
-import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStoreImpl
+import org.hisp.dhis.android.core.indicator.internal.IndicatorStoreImpl
+import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
 import org.hisp.dhis.android.core.period.internal.PeriodStoreImpl
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore
-import org.hisp.dhis.android.core.program.internal.ProgramStore
-import org.hisp.dhis.android.core.relationship.internal.*
+import org.hisp.dhis.android.core.program.internal.ProgramStageStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
+import org.hisp.dhis.android.core.relationship.internal.RelationshipConstraintStoreImpl
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.internal.*
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.junit.After
 import org.junit.Before
@@ -102,43 +113,43 @@ import org.junit.Before
 internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
 
     // Data stores
-    protected val dataValueStore = DataValueStore.create(databaseAdapter)
-    protected val eventStore = EventStoreImpl.create(databaseAdapter)
-    protected val enrollmentStore = EnrollmentStoreImpl.create(databaseAdapter)
-    protected val trackedEntityStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
-    protected val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl.create(databaseAdapter)
-    protected val trackedEntityAttributeValueStore = TrackedEntityAttributeValueStoreImpl.create(databaseAdapter)
+    protected val dataValueStore = DataValueStoreImpl(databaseAdapter)
+    protected val eventStore = EventStoreImpl(databaseAdapter)
+    protected val enrollmentStore = EnrollmentStoreImpl(databaseAdapter)
+    protected val trackedEntityStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
+    protected val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl(databaseAdapter)
+    protected val trackedEntityAttributeValueStore = TrackedEntityAttributeValueStoreImpl(databaseAdapter)
 
     // Metadata stores
-    protected val categoryStore = CategoryStore.create(databaseAdapter)
-    protected val categoryOptionStore = CategoryOptionStore.create(databaseAdapter)
-    protected val categoryCategoryOptionStore = CategoryCategoryOptionLinkStore.create(databaseAdapter)
-    protected val categoryComboStore = CategoryComboStore.create(databaseAdapter)
-    protected val categoryOptionComboStore = CategoryOptionComboStoreImpl.create(databaseAdapter)
-    protected val categoryCategoryComboLinkStore = CategoryCategoryComboLinkStore.create(databaseAdapter)
-    protected val categoryOptionComboCategoryOptionLinkStore = CategoryOptionComboCategoryOptionLinkStore.create(
+    protected val categoryStore = CategoryStoreImpl(databaseAdapter)
+    protected val categoryOptionStore = CategoryOptionStoreImpl(databaseAdapter)
+    protected val categoryCategoryOptionStore = CategoryCategoryOptionLinkStoreImpl(databaseAdapter)
+    protected val categoryComboStore = CategoryComboStoreImpl(databaseAdapter)
+    protected val categoryOptionComboStore = CategoryOptionComboStoreImpl(databaseAdapter)
+    protected val categoryCategoryComboLinkStore = CategoryCategoryComboLinkStoreImpl(databaseAdapter)
+    protected val categoryOptionComboCategoryOptionLinkStore = CategoryOptionComboCategoryOptionLinkStoreImpl(
         databaseAdapter
     )
-    protected val dataElementStore = DataElementStore.create(databaseAdapter)
-    protected val organisationUnitStore = OrganisationUnitStore.create(databaseAdapter)
-    protected val organisationUnitLevelStore = OrganisationUnitLevelStore.create(databaseAdapter)
-    protected val organisationUnitGroupStore = OrganisationUnitGroupStore.create(databaseAdapter)
-    protected val periodStore = PeriodStoreImpl.create(databaseAdapter)
+    protected val dataElementStore = DataElementStoreImpl(databaseAdapter)
+    protected val organisationUnitStore = OrganisationUnitStoreImpl(databaseAdapter)
+    protected val organisationUnitLevelStore = OrganisationUnitLevelStoreImpl(databaseAdapter)
+    protected val organisationUnitGroupStore = OrganisationUnitGroupStoreImpl(databaseAdapter)
+    protected val periodStore = PeriodStoreImpl(databaseAdapter)
 
-    protected val trackedEntityTypeStore = TrackedEntityTypeStore.create(databaseAdapter)
-    protected val trackedEntityAttributeStore = TrackedEntityAttributeStore.create(databaseAdapter)
-    protected val programStore = ProgramStore.create(databaseAdapter)
-    protected val programStageStore = ProgramStageStore.create(databaseAdapter)
+    protected val trackedEntityTypeStore = TrackedEntityTypeStoreImpl(databaseAdapter)
+    protected val trackedEntityAttributeStore = TrackedEntityAttributeStoreImpl(databaseAdapter)
+    protected val programStore = ProgramStoreImpl(databaseAdapter)
+    protected val programStageStore = ProgramStageStoreImpl(databaseAdapter)
 
-    protected val indicatorTypeStore = IndicatorTypeStore.create(databaseAdapter)
-    protected val indicatorStore = IndicatorStore.create(databaseAdapter)
+    protected val indicatorTypeStore = IndicatorTypeStoreImpl.create(databaseAdapter)
+    protected val indicatorStore = IndicatorStoreImpl.create(databaseAdapter)
 
-    protected val relationshipTypeStore = RelationshipTypeStore.create(databaseAdapter)
-    protected val relationshipConstraintStore = RelationshipConstraintStore.create(databaseAdapter)
+    protected val relationshipTypeStore = RelationshipTypeStoreImpl(databaseAdapter)
+    protected val relationshipConstraintStore = RelationshipConstraintStoreImpl(databaseAdapter)
 
-    protected val constantStore = ConstantStore.create(databaseAdapter)
+    protected val constantStore = ConstantStoreImpl(databaseAdapter)
 
-    protected val expressionDimensionItemStore = ExpressionDimensionItemStore.create(databaseAdapter)
+    protected val expressionDimensionItemStore = ExpressionDimensionItemStoreImpl(databaseAdapter)
 
     protected val expressionService = ExpressionService(
         dataElementStore,
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
index 57dfbbfd5c..7d70077865 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
@@ -59,8 +59,8 @@ import org.junit.runner.RunWith
 internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegrationShould() {
 
     private val programIndicatorEvaluator = ProgramIndicatorEvaluator(
-        EventStoreImpl.create(databaseAdapter),
-        EnrollmentStoreImpl.create(databaseAdapter),
+        EventStoreImpl(databaseAdapter),
+        EnrollmentStoreImpl(databaseAdapter),
         d2.programModule().programIndicatorEngine()
     )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
index 823d504121..ccc7207d22 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
@@ -32,11 +32,11 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.DataEl
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.EventDataItemSQLEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ProgramIndicatorSQLEvaluator
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStoreImpl
-import org.hisp.dhis.android.core.constant.internal.ConstantStore
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
-import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.constant.internal.ConstantStoreImpl
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLExecutor
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
 
 internal object AnalyticExpressionEngineFactoryHelper {
 
@@ -46,9 +46,9 @@ internal object AnalyticExpressionEngineFactoryHelper {
         val dataElementEvaluator = DataElementSQLEvaluator(databaseAdapter)
 
         val programIndicatorExecutor = ProgramIndicatorSQLExecutor(
-            ConstantStore.create(databaseAdapter),
-            DataElementStore.create(databaseAdapter),
-            TrackedEntityAttributeStore.create(databaseAdapter),
+            ConstantStoreImpl(databaseAdapter),
+            DataElementStoreImpl(databaseAdapter),
+            TrackedEntityAttributeStoreImpl(databaseAdapter),
             databaseAdapter
         )
 
@@ -59,15 +59,15 @@ internal object AnalyticExpressionEngineFactoryHelper {
         val eventDataItemEvaluator = EventDataItemSQLEvaluator(databaseAdapter)
 
         return AnalyticExpressionEngineFactory(
-            DataElementStore.create(databaseAdapter),
-            TrackedEntityAttributeStore.create(databaseAdapter),
-            CategoryOptionComboStoreImpl.create(databaseAdapter),
-            ProgramStore.create(databaseAdapter),
+            DataElementStoreImpl(databaseAdapter),
+            TrackedEntityAttributeStoreImpl(databaseAdapter),
+            CategoryOptionComboStoreImpl(databaseAdapter),
+            ProgramStoreImpl(databaseAdapter),
             d2.programModule().programIndicators(),
             dataElementEvaluator,
             programIndicatorEvaluator,
             eventDataItemEvaluator,
-            ConstantStore.create(databaseAdapter),
+            ConstantStoreImpl(databaseAdapter),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
index 691368faa3..53c2455ba3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
@@ -49,33 +49,33 @@ import org.hisp.dhis.android.core.analytics.linelist.EventLineListParams
 import org.hisp.dhis.android.core.analytics.linelist.EventLineListService
 import org.hisp.dhis.android.core.analytics.linelist.EventLineListServiceImpl
 import org.hisp.dhis.android.core.analytics.linelist.LineListItem
-import org.hisp.dhis.android.core.category.internal.CategoryComboStore
+import org.hisp.dhis.android.core.category.internal.CategoryComboStoreImpl
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStoreImpl
 import org.hisp.dhis.android.core.common.*
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStore
-import org.hisp.dhis.android.core.legendset.internal.LegendSetStore
-import org.hisp.dhis.android.core.legendset.internal.LegendStore
-import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStoreImpl
+import org.hisp.dhis.android.core.legendset.internal.LegendSetStoreImpl
+import org.hisp.dhis.android.core.legendset.internal.LegendStoreImpl
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGeneratorImpl
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore
-import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStageStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreImpl
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
@@ -88,25 +88,25 @@ import org.junit.runner.RunWith
 class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
 
     // Stores
-    private val trackedEntityTypeStore = TrackedEntityTypeStore.create(databaseAdapter)
-    private val categoryComboStore = CategoryComboStore.create(databaseAdapter)
-    private val categoryOptionComboStore = CategoryOptionComboStoreImpl.create(databaseAdapter)
-    private val programStore = ProgramStore.create(databaseAdapter)
-    private val programStageStore = ProgramStageStore.create(databaseAdapter)
-    private val dataElementStore = DataElementStore.create(databaseAdapter)
-    private val dataElementLegendSetLinkStore = DataElementLegendSetLinkStore.create(databaseAdapter)
-    private val organisationUnitStore = OrganisationUnitStore.create(databaseAdapter)
-    private val userOrganisationUnitStore = UserOrganisationUnitLinkStoreImpl.create(databaseAdapter)
-    private val organisationUnitGroupLinkStore = OrganisationUnitOrganisationUnitGroupLinkStore.create(databaseAdapter)
-    private val organisationUnitLevelStore = OrganisationUnitLevelStore.create(databaseAdapter)
-    private val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
-    private val eventStore = EventStoreImpl.create(databaseAdapter)
-    private val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl.create(databaseAdapter)
-    private val programIndicatorStore = ProgramIndicatorStore.create(databaseAdapter)
-    private val programIndicatorLegendSetLinkStore = ProgramIndicatorLegendSetLinkStore.create(databaseAdapter)
-    private val enrollmentStore = EnrollmentStoreImpl.create(databaseAdapter)
-    private val legendSetStore = LegendSetStore.create(databaseAdapter)
-    private val legendStore = LegendStore.create(databaseAdapter)
+    private val trackedEntityTypeStore = TrackedEntityTypeStoreImpl(databaseAdapter)
+    private val categoryComboStore = CategoryComboStoreImpl(databaseAdapter)
+    private val categoryOptionComboStore = CategoryOptionComboStoreImpl(databaseAdapter)
+    private val programStore = ProgramStoreImpl(databaseAdapter)
+    private val programStageStore = ProgramStageStoreImpl(databaseAdapter)
+    private val dataElementStore = DataElementStoreImpl(databaseAdapter)
+    private val dataElementLegendSetLinkStore = DataElementLegendSetLinkStoreImpl(databaseAdapter)
+    private val organisationUnitStore = OrganisationUnitStoreImpl(databaseAdapter)
+    private val userOrganisationUnitStore = UserOrganisationUnitLinkStoreImpl(databaseAdapter)
+    private val organisationUnitGroupLinkStore = OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter)
+    private val organisationUnitLevelStore = OrganisationUnitLevelStoreImpl(databaseAdapter)
+    private val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
+    private val eventStore = EventStoreImpl(databaseAdapter)
+    private val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl(databaseAdapter)
+    private val programIndicatorStore = ProgramIndicatorStoreImpl(databaseAdapter)
+    private val programIndicatorLegendSetLinkStore = ProgramIndicatorLegendSetLinkStoreImpl(databaseAdapter)
+    private val enrollmentStore = EnrollmentStoreImpl(databaseAdapter)
+    private val legendSetStore = LegendSetStoreImpl(databaseAdapter)
+    private val legendStore = LegendStoreImpl(databaseAdapter)
     private val calendarProvider = CalendarProviderFactory.createFixed()
     private val dateFilterPeriodHelper =
         DateFilterPeriodHelper(calendarProvider, ParentPeriodGeneratorImpl.create(calendarProvider))
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index 6e4d927860..56a72dfc12 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -31,9 +31,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.paging.PagedList
 import com.jraska.livedata.TestObserver
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.CategoryOption
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Before
@@ -48,7 +48,7 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @get:Rule
     val rule: TestRule = InstantTaskExecutorRule()
 
-    private lateinit var store: IdentifiableObjectStore<CategoryOption>
+    private lateinit var store: CategoryOptionStore
     private lateinit var allValues: List<CategoryOption>
 
     private val empty = RepositoryScope.empty()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt
similarity index 60%
rename from core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.java
rename to core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt
index fba040971d..db42af7f18 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt
@@ -25,38 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.attribute.internal
 
-package org.hisp.dhis.android.core.attribute.internal;
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.AttributeTableInfo
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.data.attribute.AttributeSamples
+import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractIntegrationShould
+import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.runner.RunWith
 
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.AttributeTableInfo;
-import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.data.attribute.AttributeSamples;
-import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractIntegrationShould;
-import org.hisp.dhis.android.core.data.legendset.LegendSetSamples;
-import org.hisp.dhis.android.core.legendset.LegendSet;
-import org.hisp.dhis.android.core.legendset.LegendSetTableInfo;
-import org.hisp.dhis.android.core.legendset.internal.LegendSetStore;
-import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory;
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
-import org.junit.runner.RunWith;
-
-@RunWith(D2JunitRunner.class)
-public class AttributeStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Attribute> {
-
-    public AttributeStoreIntegrationShould() {
-        super(AttributeStore.create(TestDatabaseAdapterFactory.get()), AttributeTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
-    }
-
-    @Override
-    protected Attribute buildObject() {
-        return AttributeSamples.getAttribute();
+@RunWith(D2JunitRunner::class)
+class AttributeStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Attribute>(
+    AttributeStoreImpl(TestDatabaseAdapterFactory.get()),
+    AttributeTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
+) {
+    override fun buildObject(): Attribute {
+        return AttributeSamples.getAttribute()
     }
 
-    @Override
-    protected Attribute buildObjectToUpdate() {
+    override fun buildObjectToUpdate(): Attribute {
         return AttributeSamples.getAttribute().toBuilder()
-                .valueType(ValueType.AGE)
-                .build();
+            .valueType(ValueType.AGE)
+            .build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreIntegrationShould.java
index 719ebaef89..aeddb1a8bc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class DataElementAttributeValueLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataElementAttributeValueLink> {
 
     public DataElementAttributeValueLinkStoreIntegrationShould() {
-        super(DataElementAttributeValueLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new DataElementAttributeValueLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 DataElementAttributeValueLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreIntegrationShould.java
index fa20f8cfcc..319a81ab2d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramAttributeValueLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<ProgramAttributeValueLink> {
 
     public ProgramAttributeValueLinkStoreIntegrationShould() {
-        super(ProgramAttributeValueLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramAttributeValueLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramAttributeValueLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreIntegrationShould.java
index 1e7d874c02..3d39a9c4e1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramStageAttributeValueLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<ProgramStageAttributeValueLink> {
 
     public ProgramStageAttributeValueLinkStoreIntegrationShould() {
-        super(ProgramStageAttributeValueLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramStageAttributeValueLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramStageAttributeValueLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
index c182920df3..0b84041e5d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.category.internal
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo
-import org.hisp.dhis.android.core.category.internal.CategoryCategoryComboLinkStore.create
 import org.hisp.dhis.android.core.data.category.CategoryCategoryComboLinkSamples
 import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
@@ -40,7 +39,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class CategoryCategoryComboLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<CategoryCategoryComboLink>(
-    create(TestDatabaseAdapterFactory.get()),
+    CategoryCategoryComboLinkStoreImpl(TestDatabaseAdapterFactory.get()),
     CategoryCategoryComboLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreIntegrationShould.java
index 71dd213770..99694041a0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class CategoryCategoryOptionLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<CategoryCategoryOptionLink> {
 
     public CategoryCategoryOptionLinkStoreIntegrationShould() {
-        super(CategoryCategoryOptionLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new CategoryCategoryOptionLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 CategoryCategoryOptionLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
index dbe0145493..c795342db9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
@@ -66,32 +66,32 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
     }
 
     private fun assertNotCombosInDB() {
-        val categoryComboStore = CategoryComboStore.create(d2.databaseAdapter())
+        val categoryComboStore = CategoryComboStoreImpl(d2.databaseAdapter())
         val categoryCombos = categoryComboStore.selectAll()
         assertThat(categoryCombos.isEmpty()).isTrue()
     }
 
     private fun assertThereAreCombosInDB() {
-        val categoryComboStore = CategoryComboStore.create(d2.databaseAdapter())
+        val categoryComboStore = CategoryComboStoreImpl(d2.databaseAdapter())
         val categoryCombos = categoryComboStore.selectAll()
         assertThat(categoryCombos.isNotEmpty()).isTrue()
     }
 
     private val categoryCategoryComboLinks: List<CategoryCategoryComboLink>
         get() {
-            val categoryCategoryComboLinkStore = CategoryCategoryComboLinkStore.create(d2.databaseAdapter())
+            val categoryCategoryComboLinkStore = CategoryCategoryComboLinkStoreImpl(d2.databaseAdapter())
             return categoryCategoryComboLinkStore.selectAll()
         }
 
     private fun assertThereAreCategoryOptionCombosInDB() {
         val categoryOptionComboStore: IdentifiableObjectStore<CategoryOptionCombo> =
-            CategoryOptionComboStoreImpl.create(d2.databaseAdapter())
+            CategoryOptionComboStoreImpl(d2.databaseAdapter())
         val categoryOptionCombos = categoryOptionComboStore.selectAll()
         assertThat(categoryOptionCombos.isNotEmpty()).isTrue()
     }
 
     private fun assertThereAreCategoriesInDB() {
-        val categoryOptionStore = CategoryOptionStore.create(d2.databaseAdapter())
+        val categoryOptionStore = CategoryOptionStoreImpl(d2.databaseAdapter())
         val categoryOptionUids = categoryOptionStore.selectUids()
         assertThat(categoryOptionUids.isNotEmpty()).isTrue()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreIntegrationShould.java
index b4ca21cd74..8f0fe9d348 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class CategoryOptionComboCategoryOptionLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<CategoryOptionComboCategoryOptionLink> {
 
     public CategoryOptionComboCategoryOptionLinkStoreIntegrationShould() {
-        super(CategoryOptionComboCategoryOptionLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new CategoryOptionComboCategoryOptionLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt
index e0bc6a40b0..3919c5c414 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class CategoryOptionOrganisationUnitLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<CategoryOptionOrganisationUnitLink>(
-        CategoryOptionOrganisationUnitLinkStore.create(TestDatabaseAdapterFactory.get()),
+        CategoryOptionOrganisationUnitLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         CategoryOptionOrganisationUnitLinkTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java
index c388bc97bd..86aac9b21c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java
@@ -34,7 +34,7 @@
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.option.OptionSet;
 import org.hisp.dhis.android.core.option.OptionSetTableInfo;
-import org.hisp.dhis.android.core.option.internal.OptionSetStore;
+import org.hisp.dhis.android.core.option.internal.OptionSetStoreImpl;
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +59,7 @@ public void setUp() throws IOException {
         super.setUp();
         this.optionSet = StoreMocks.generateOptionSet();
         this.updatedOptionSet = StoreMocks.generateUpdatedOptionSet();
-        this.store = OptionSetStore.create(databaseAdapter());
+        this.store = new OptionSetStoreImpl(databaseAdapter());
     }
 
     private Cursor getCursor() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java
index 0cddec6e6a..34359a3340 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/ObjectStoreIntegrationShould.java
@@ -34,7 +34,7 @@
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.option.OptionSet;
 import org.hisp.dhis.android.core.option.OptionSetTableInfo;
-import org.hisp.dhis.android.core.option.internal.OptionSetStore;
+import org.hisp.dhis.android.core.option.internal.OptionSetStoreImpl;
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,7 +56,7 @@ public class ObjectStoreIntegrationShould extends BaseIntegrationTestWithDatabas
     public void setUp() throws IOException {
         super.setUp();
         this.optionSet = StoreMocks.generateOptionSet();
-        this.store = OptionSetStore.create(databaseAdapter());
+        this.store = new OptionSetStoreImpl(databaseAdapter());
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStoreIntegrationShould.java
index 8f7a762387..dddd4301a5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/ValueTypeDeviceRenderingStoreIntegrationShould.java
@@ -28,7 +28,7 @@
 
 package org.hisp.dhis.android.core.common;
 
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore;
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStoreImpl;
 import org.hisp.dhis.android.core.data.common.ValueTypeDeviceRenderingSamples;
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould;
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory;
@@ -40,7 +40,7 @@ public class ValueTypeDeviceRenderingStoreIntegrationShould
         extends ObjectWithoutUidStoreAbstractIntegrationShould<ValueTypeDeviceRendering> {
 
     public ValueTypeDeviceRenderingStoreIntegrationShould() {
-        super(ValueTypeDeviceRenderingStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ValueTypeDeviceRenderingStoreImpl(TestDatabaseAdapterFactory.get()),
                 ValueTypeDeviceRenderingTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
index 043c100098..3b157e0b2a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
@@ -32,28 +32,25 @@ import com.google.common.truth.Truth.assertThat
 import java.io.IOException
 import java.text.ParseException
 import java.util.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl.Companion.create
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl
 import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
-import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.relationship.internal.*
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.junit.Before
 import org.junit.Test
@@ -67,21 +64,21 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
     private lateinit var eventStore: EventStore
     private lateinit var relationshipStore: RelationshipStore
     private lateinit var relationshipItemStore: RelationshipItemStore
-    private lateinit var relationshipTypeStore: IdentifiableObjectStore<RelationshipType>
-    private lateinit var programOwnerStore: ObjectWithoutUidStore<ProgramOwner>
+    private lateinit var relationshipTypeStore: RelationshipTypeStore
+    private lateinit var programOwnerStore: ProgramOwnerStore
 
     private val relationshipType = "WiH6923nMtb"
 
     @Before
     @Throws(IOException::class)
     fun setUp() {
-        trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl.create(d2.databaseAdapter())
-        enrollmentStore = create(d2.databaseAdapter())
-        eventStore = EventStoreImpl.create(d2.databaseAdapter())
-        relationshipStore = RelationshipStoreImpl.create(d2.databaseAdapter())
-        relationshipItemStore = RelationshipItemStoreImpl.create(d2.databaseAdapter())
-        relationshipTypeStore = RelationshipTypeStore.create(d2.databaseAdapter())
-        programOwnerStore = ProgramOwnerStore.create(d2.databaseAdapter())
+        trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl(d2.databaseAdapter())
+        enrollmentStore = EnrollmentStoreImpl(d2.databaseAdapter())
+        eventStore = EventStoreImpl(d2.databaseAdapter())
+        relationshipStore = RelationshipStoreImpl(d2.databaseAdapter())
+        relationshipItemStore = RelationshipItemStoreImpl(d2.databaseAdapter())
+        relationshipTypeStore = RelationshipTypeStoreImpl(d2.databaseAdapter())
+        programOwnerStore = ProgramOwnerStoreImpl(d2.databaseAdapter())
 
         propagator = DataStatePropagatorImpl(
             trackedEntityInstanceStore, enrollmentStore, eventStore,
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreIntegrationShould.java
index b3e6ce3ea7..ac84f248d3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreIntegrationShould.java
@@ -38,7 +38,7 @@
 public class ConfigurationStoreIntegrationShould extends ObjectStoreAbstractIntegrationShould<Configuration> {
 
     public ConfigurationStoreIntegrationShould() {
-        super(ConfigurationStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ConfigurationStoreImpl(TestDatabaseAdapterFactory.get()),
                 ConfigurationTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
index 739ed9796b..e29ea12e96 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
@@ -66,13 +66,13 @@ class DatabaseConfigurationMigrationIntegrationShould {
         .build()
 
     private lateinit var migration: DatabaseConfigurationMigration
-    private lateinit var databasesConfigurationStore: ObjectKeyValueStore<DatabasesConfiguration>
+    private lateinit var databasesConfigurationStore: DatabaseConfigurationInsecureStore
     private lateinit var credentialsSecureStore: CredentialsSecureStore
 
     @Before
     @Throws(IOException::class)
     fun setUp() {
-        databasesConfigurationStore = DatabaseConfigurationInsecureStore[insecureStore]
+        databasesConfigurationStore = DatabaseConfigurationInsecureStoreImpl(insecureStore)
         credentialsSecureStore = CredentialsSecureStoreImpl(chunkedSecureStore)
 
         migration = DatabaseConfigurationMigration(
@@ -181,7 +181,7 @@ class DatabaseConfigurationMigrationIntegrationShould {
         databaseAdapter.execSQL("CREATE TABLE UserCredentials (_id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT)")
         databaseAdapter.setForeignKeyConstraintsEnabled(false)
         databaseAdapter.execSQL("INSERT INTO UserCredentials (username) VALUES ('${credentials.username()}')")
-        val configurationStore = ConfigurationStore.create(databaseAdapter)
+        val configurationStore = ConfigurationStoreImpl(databaseAdapter)
         configurationStore.insert(Configuration.forServerUrl(serverUrl))
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreIntegrationShould.java
index 39f3d7ae7e..1e5c163024 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ConstantStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<Constant> {
 
     public ConstantStoreIntegrationShould() {
-        super(ConstantStore.create(TestDatabaseAdapterFactory.get()), ConstantTableInfo.TABLE_INFO,
+        super(new ConstantStoreImpl(TestDatabaseAdapterFactory.get()), ConstantTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreIntegrationShould.java
index 96f5684bc8..3f4e979c9f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class DataElementOperandStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<DataElementOperand> {
 
     public DataElementOperandStoreIntegrationShould() {
-        super(DataElementOperandStore.create(TestDatabaseAdapterFactory.get()), DataElementOperandTableInfo.TABLE_INFO,
+        super(new DataElementOperandStoreImpl(TestDatabaseAdapterFactory.get()), DataElementOperandTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreIntegrationShould.java
index 2e1d7db62d..6199a1126a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class DataElementStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<DataElement> {
 
     public DataElementStoreIntegrationShould() {
-        super(DataElementStore.create(TestDatabaseAdapterFactory.get()), DataElementTableInfo.TABLE_INFO,
+        super(new DataElementStoreImpl(TestDatabaseAdapterFactory.get()), DataElementTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStoreIntegrationShould.java
index b3cd312839..b5dbf68fc1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class DataInputPeriodLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataInputPeriod> {
 
     public DataInputPeriodLinkStoreIntegrationShould() {
-        super(DataInputPeriodLinkStore.create(TestDatabaseAdapterFactory.get()), DataInputPeriodTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
+        super(new DataInputPeriodStoreImpl(TestDatabaseAdapterFactory.get()), DataInputPeriodTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallRealIntegrationShould.java
index b8244b8809..3f34068726 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallRealIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallRealIntegrationShould.java
@@ -47,7 +47,7 @@ public class DataSetCompleteRegistrationPostCallRealIntegrationShould extends Ba
     @Before
     public void setUp() {
         super.setUp();
-        dataSetCompleteRegistrationStore = DataSetCompleteRegistrationStoreImpl.create(d2.databaseAdapter());
+        dataSetCompleteRegistrationStore = new DataSetCompleteRegistrationStoreImpl(d2.databaseAdapter());
     }
 
     // commented out since it is a flaky test that works against a real server.
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreIntegrationShould.java
index a1b3e858bd..7ef5efa4a9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class DataSetCompulsoryDataElementOperandLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataSetCompulsoryDataElementOperandLink> {
 
     public DataSetCompulsoryDataElementOperandLinkStoreIntegrationShould() {
-        super(DataSetCompulsoryDataElementOperandLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new DataSetCompulsoryDataElementOperandLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStoreIntegrationShould.java
index cd75369b2e..871fc480ed 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class DataSetDataElementLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataSetElement> {
 
     public DataSetDataElementLinkStoreIntegrationShould() {
-        super(DataSetDataElementLinkStore.create(TestDatabaseAdapterFactory.get()), DataSetElementLinkTableInfo.TABLE_INFO,
+        super(new DataSetElementStoreImpl(TestDatabaseAdapterFactory.get()), DataSetElementLinkTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
index af097e1c93..19a47101b0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
@@ -32,6 +32,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
+import org.hisp.dhis.android.core.datavalue.internal.DataValueStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataDispatcher
 import org.junit.After
 import org.junit.Before
@@ -39,13 +40,13 @@ import org.junit.Test
 
 class DataSetInstanceStoreIntegrationShould : BaseMockIntegrationTestMetadataDispatcher() {
 
-    private lateinit var dataSetInstanceStore: DataSetInstanceStore
+    private lateinit var dataSetInstanceStore: DataSetInstanceStoreImpl
     private lateinit var dataValueStore: DataValueStore
 
     @Before
     fun setUp() {
-        dataSetInstanceStore = DataSetInstanceStore.create(databaseAdapter)
-        dataValueStore = DataValueStore.create(databaseAdapter)
+        dataSetInstanceStore = DataSetInstanceStoreImpl(databaseAdapter)
+        dataValueStore = DataValueStoreImpl(databaseAdapter)
 
         dataValueStore.delete()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreIntegrationShould.java
index 367250a0ac..0e86a1cdcb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class DataSetOrganisationUnitLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataSetOrganisationUnitLink> {
 
     public DataSetOrganisationUnitLinkStoreIntegrationShould() {
-        super(DataSetOrganisationUnitLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new DataSetOrganisationUnitLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 DataSetOrganisationUnitLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreIntegrationShould.java
index 272bf82c47..7caff0021e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class DataSetStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<DataSet> {
 
     public DataSetStoreIntegrationShould() {
-        super(DataSetStore.create(TestDatabaseAdapterFactory.get()), DataSetTableInfo.TABLE_INFO,
+        super(new DataSetStoreImpl(TestDatabaseAdapterFactory.get()), DataSetTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreIntegrationShould.java
index dde4e9b02f..c304292d5b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class SectionDataElementLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<SectionDataElementLink> {
 
     public SectionDataElementLinkStoreIntegrationShould() {
-        super(SectionDataElementLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new SectionDataElementLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 SectionDataElementLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreIntegrationShould.java
index 66cb03861b..5c924faa28 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class SectionGreyedFieldsLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<SectionGreyedFieldsLink> {
 
     public SectionGreyedFieldsLinkStoreIntegrationShould() {
-        super(SectionGreyedFieldsLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new SectionGreyedFieldsLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 SectionGreyedFieldsLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
index d2113db7d5..434782eaf6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
@@ -30,14 +30,13 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.dataset.SectionIndicatorLinkSamples
 import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
-import org.hisp.dhis.android.core.dataset.internal.SectionIndicatorLinkStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class SectionIndicatorLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<SectionIndicatorLink>(
-    create(TestDatabaseAdapterFactory.get()),
+    SectionIndicatorLinkStoreImpl(TestDatabaseAdapterFactory.get()),
     SectionIndicatorLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreIntegrationShould.java
index c3c562ae94..def633b006 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class SectionStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Section> {
 
     public SectionStoreIntegrationShould() {
-        super(SectionStore.create(TestDatabaseAdapterFactory.get()), SectionTableInfo.TABLE_INFO,
+        super(new SectionStoreImpl(TestDatabaseAdapterFactory.get()), SectionTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt
index c6396f6e0b..0670ab4666 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt
@@ -29,14 +29,14 @@ package org.hisp.dhis.android.core.datastore
 
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.datastore.DataStoreEntrySamples
-import org.hisp.dhis.android.core.datastore.internal.DataStoreEntryStoreImpl.Companion.create
+import org.hisp.dhis.android.core.datastore.internal.DataStoreEntryStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class DataStoreEntryStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<DataStoreEntry>(
-    create(TestDatabaseAdapterFactory.get()),
+    DataStoreEntryStoreImpl(TestDatabaseAdapterFactory.get()),
     DataStoreEntryTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt
index a9f79f10d7..71463d8160 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt
@@ -29,14 +29,14 @@ package org.hisp.dhis.android.core.datastore
 
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.datastore.KeyValuePairSamples.keyValuePairSample
-import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore.create
+import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class LocalDataStoreStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<KeyValuePair>(
-    create(TestDatabaseAdapterFactory.get()),
+    LocalDataStoreStoreImpl(TestDatabaseAdapterFactory.get()),
     LocalDataStoreTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCallMockIntegrationShould.kt
index f72e5acd07..f311e54fb9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCallMockIntegrationShould.kt
@@ -119,7 +119,7 @@ class DataStorePostCallMockIntegrationShould : BaseMockIntegrationTestMetadataEn
     private fun setState(state: State) {
         val entries = d2.dataStoreModule().dataStore().blockingGet()
 
-        val store = DataStoreEntryStoreImpl.create(databaseAdapter)
+        val store = DataStoreEntryStoreImpl(databaseAdapter)
         entries.forEach {
             store.setState(it, state)
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt
index fa8a42b3d7..a657152d57 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class DataValueConflictStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<DataValueConflict>(
-    DataValueConflictStore.create(TestDatabaseAdapterFactory.get()),
+    DataValueConflictStoreImpl(TestDatabaseAdapterFactory.get()),
     DataValueConflictTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
index a0222dda4a..410a243937 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
@@ -31,8 +31,6 @@ import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.data.datavalue.DataValueUtils
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataCallBundle
@@ -64,9 +62,7 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     private suspend fun download(): List<DataValue> {
-        val dataValueHandler: Handler<DataValue> = ObjectWithoutUidHandlerImpl(
-            DataValueStore.create(d2.databaseAdapter())
-        )
+        val dataValueHandler = DataValueHandler(DataValueStoreImpl(d2.databaseAdapter()))
 
         val key = AggregatedDataCallBundleKey(
             periodType = PeriodType.Daily,
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallRealIntegrationShould.java
index 88ad61016d..0ab2486050 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallRealIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallRealIntegrationShould.java
@@ -42,7 +42,7 @@ public class DataValuePostCallRealIntegrationShould extends BaseRealIntegrationT
     @Before
     public void setUp() {
         super.setUp();
-        dataValueStore = DataValueStore.create(d2.databaseAdapter());
+        dataValueStore = new DataValueStoreImpl(d2.databaseAdapter());
     }
 
     // commented out since it is a flaky test that works against a real server.
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt
index c148e95a08..dc012f193e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
-import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataSyncStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -36,7 +35,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 internal class AggregatedDataSyncStoreIntegrationShould :
     ObjectWithoutUidStoreAbstractIntegrationShould<AggregatedDataSync>(
-        create(TestDatabaseAdapterFactory.get()),
+        AggregatedDataSyncStoreImpl(TestDatabaseAdapterFactory.get()),
         AggregatedDataSyncTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreIntegrationShould.java
index fc48f931bf..f2dc3cf557 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreIntegrationShould.java
@@ -41,7 +41,7 @@
 public class EnrollmentStoreIntegrationShould extends IdentifiableDataObjectStoreAbstractIntegrationShould<Enrollment> {
 
     public EnrollmentStoreIntegrationShould() {
-        super(EnrollmentStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new EnrollmentStoreImpl(TestDatabaseAdapterFactory.get()),
                 EnrollmentTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventWithLimitCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventWithLimitCallBaseMockIntegrationShould.kt
index eb5eb0f2ee..35ec4d7855 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventWithLimitCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/EventWithLimitCallBaseMockIntegrationShould.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.event
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStoreImpl
 import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.tracker.TrackerImporterVersion
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataEnqueable
@@ -46,7 +46,7 @@ abstract class EventWithLimitCallBaseMockIntegrationShould : BaseMockIntegration
     abstract val downloadEventsByUidLimitedByOneFile: String
 
     private lateinit var initSyncParams: SynchronizationSettings
-    private val syncStore = SynchronizationSettingStore.create(databaseAdapter)
+    private val syncStore = SynchronizationSettingStoreImpl(databaseAdapter)
 
     @Before
     fun setUp() {
@@ -70,7 +70,7 @@ abstract class EventWithLimitCallBaseMockIntegrationShould : BaseMockIntegration
         dhis2MockServer.enqueueSystemInfoResponse()
         dhis2MockServer.enqueueMockResponse(downloadEventsFile)
         d2.eventModule().eventDownloader().limit(eventLimitByOrgUnit).blockingDownload()
-        val eventStore = EventStoreImpl.create(databaseAdapter)
+        val eventStore = EventStoreImpl(databaseAdapter)
         val downloadedEvents = eventStore.querySingleEvents()
         assertThat(downloadedEvents.size).isEqualTo(eventLimitByOrgUnit)
     }
@@ -85,7 +85,7 @@ abstract class EventWithLimitCallBaseMockIntegrationShould : BaseMockIntegration
             .`in`("wAiGPfJGMxt", "PpNGhvEYnXe")
             .limit(eventLimitByOrgUnit)
             .blockingDownload()
-        val eventStore = EventStoreImpl.create(databaseAdapter)
+        val eventStore = EventStoreImpl(databaseAdapter)
         val downloadedEvents = eventStore.querySingleEvents()
         assertThat(downloadedEvents.size).isEqualTo(eventLimitByOrgUnit)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt
index d718c5e876..c80f03b497 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.data.database.ObjectStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.event.EventDataFilterSamples
 import org.hisp.dhis.android.core.event.EventDataFilter
-import org.hisp.dhis.android.core.event.internal.EventDataFilterStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class EventDataFilterStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<EventDataFilter>(
-    create(TestDatabaseAdapterFactory.get()),
+    EventDataFilterStoreImpl(TestDatabaseAdapterFactory.get()),
     ItemFilterTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
index 32613d0827..228dcc2fa0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
@@ -31,7 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStoreImpl
 import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.tracker.TrackerImporterVersion
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataEnqueable
@@ -48,7 +48,7 @@ abstract class EventEndpointCallBaseMockIntegrationShould : BaseMockIntegrationT
     abstract val eventsWithUids: String
 
     private lateinit var initSyncParams: SynchronizationSettings
-    private val syncStore = SynchronizationSettingStore.create(databaseAdapter)
+    private val syncStore = SynchronizationSettingStoreImpl(databaseAdapter)
 
     @Before
     fun setUp() {
@@ -97,7 +97,7 @@ abstract class EventEndpointCallBaseMockIntegrationShould : BaseMockIntegrationT
         val event = events[0]
         assertThat(event.uid()).isEqualTo("V1CerIi3sdL")
         assertThat(events.size).isEqualTo(1)
-        EventStoreImpl.create(d2.databaseAdapter()).update(
+        EventStoreImpl(d2.databaseAdapter()).update(
             event.toBuilder()
                 .syncState(state)
                 .aggregatedSyncState(state)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
index 077c9381b4..1cdb13ec2d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.event.internal
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.event.internal.EventCallFactory.create
-import org.hisp.dhis.android.core.event.internal.EventStoreImpl.Companion.create
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 
 class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
@@ -65,20 +64,20 @@ class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     private fun verifyAtLeastOneEventWithOptionCombo(): Boolean {
-        val eventStore = create(d2.databaseAdapter())
+        val eventStore = EventStoreImpl(d2.databaseAdapter())
         val downloadedEvents = eventStore.querySingleEvents()
         return downloadedEvents.any { it.attributeOptionCombo() != null }
     }
 
     private fun verifyNumberOfDownloadedEvents(numEvents: Int) {
-        val eventStore = create(d2.databaseAdapter())
+        val eventStore = EventStoreImpl(d2.databaseAdapter())
         val downloadedEvents = eventStore.querySingleEvents()
 
         assertThat(downloadedEvents.size).isEqualTo(numEvents)
     }
 
     private fun verifyNumberOfDownloadedTrackedEntityDataValue(num: Int) {
-        val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl.create(d2.databaseAdapter())
+        val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl(d2.databaseAdapter())
         val numPersisted = trackedEntityDataValueStore.selectAll().size
 
         assertThat(numPersisted).isEqualTo(num)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
index 47448d85f0..159c3629c8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 internal class EventFilterStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<EventFilter>(
-    EventFilterStore.create(TestDatabaseAdapterFactory.get()),
+    EventFilterStoreImpl(TestDatabaseAdapterFactory.get()),
     EventFilterTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): EventFilter {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt
index ad9fcbc2ea..2bd41b18bd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt
@@ -31,9 +31,8 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.data.trackedentity.TrackedEntityDataValueSamples
 import org.hisp.dhis.android.core.event.Event
-import org.hisp.dhis.android.core.event.internal.EventStoreImpl.Companion.create
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.tracker.TrackerImporterVersion
@@ -55,7 +54,7 @@ abstract class EventPostBaseMockIntegrationShould : BaseMockIntegrationTestMetad
     private val event4Id = "event4Id"
 
     private lateinit var initSyncParams: SynchronizationSettings
-    private val syncStore = SynchronizationSettingStore.create(databaseAdapter)
+    private val syncStore = SynchronizationSettingStoreImpl(databaseAdapter)
 
     @Before
     fun setUp() {
@@ -169,7 +168,7 @@ abstract class EventPostBaseMockIntegrationShould : BaseMockIntegrationTestMetad
         eventStore.insert(event3)
         eventStore.insert(event4)
 
-        val tedvStore = TrackedEntityDataValueStoreImpl.create(databaseAdapter)
+        val tedvStore = TrackedEntityDataValueStoreImpl(databaseAdapter)
         tedvStore.insert(dataValue1)
         tedvStore.insert(dataValue2)
         tedvStore.insert(dataValue3)
@@ -185,9 +184,7 @@ abstract class EventPostBaseMockIntegrationShould : BaseMockIntegrationTestMetad
         @JvmStatic
         fun setUpClass() {
             BaseMockIntegrationTestMetadataEnqueable.setUpClass()
-            eventStore = create(
-                objects.databaseAdapter
-            )
+            eventStore = EventStoreImpl(objects.databaseAdapter)
         }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 1c2704302b..39ebd679b9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -37,7 +37,6 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.event.EventStatus
-import org.hisp.dhis.android.core.event.internal.EventStoreImpl.Companion.create
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
@@ -59,8 +58,8 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     @Before
     override fun setUp() {
         super.setUp()
-        eventStore = create(d2.databaseAdapter())
-        trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl.create(d2.databaseAdapter())
+        eventStore = EventStoreImpl(d2.databaseAdapter())
+        trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl(d2.databaseAdapter())
         val uidGenerator: UidGenerator = UidGeneratorImpl()
         eventUid1 = uidGenerator.generate()
         eventUid2 = uidGenerator.generate()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventStoreIntegrationShould.java
index f232ba0394..5f92679606 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventStoreIntegrationShould.java
@@ -42,7 +42,7 @@
 public class EventStoreIntegrationShould extends IdentifiableDataObjectStoreAbstractIntegrationShould<Event> {
 
     public EventStoreIntegrationShould() {
-        super(EventStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new EventStoreImpl(TestDatabaseAdapterFactory.get()),
                 EventTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreIntegrationShould.java
index 1424671a59..662311f0c5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreIntegrationShould.java
@@ -37,7 +37,7 @@
 public class EventSyncStoreIntegrationShould extends ObjectWithoutUidStoreAbstractIntegrationShould<EventSync> {
 
     public EventSyncStoreIntegrationShould() {
-        super(EventSyncStore.create(TestDatabaseAdapterFactory.get()), EventSyncTableInfo.TABLE_INFO,
+        super(new EventSyncStoreImpl(TestDatabaseAdapterFactory.get()), EventSyncTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt
index d7ac6e7212..1685a9a8f1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.expressiondimensionitem
 
 import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.expressiondimensionitem.ExpressionDimensionItemSamples
-import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class ExpressionDimensionItemStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<ExpressionDimensionItem>(
-        ExpressionDimensionItemStore.create(TestDatabaseAdapterFactory.get()),
+        ExpressionDimensionItemStoreImpl(TestDatabaseAdapterFactory.get()),
         ExpressionDimensionItemTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/BaseFileResourceRoutineIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/BaseFileResourceRoutineIntegrationShould.kt
index ea927d025b..680e10ecad 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/BaseFileResourceRoutineIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/BaseFileResourceRoutineIntegrationShould.kt
@@ -28,19 +28,18 @@
 
 package org.hisp.dhis.android.core.fileresource.internal
 
-import org.hisp.dhis.android.core.category.internal.CategoryComboStore
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl
+import org.hisp.dhis.android.core.category.internal.CategoryComboStoreImpl
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
-import org.hisp.dhis.android.core.option.internal.OptionSetStore
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore
-import org.hisp.dhis.android.core.program.internal.ProgramStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import org.hisp.dhis.android.core.option.internal.OptionSetStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStageStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataDispatcher
 import org.junit.After
 import org.junit.Before
@@ -48,24 +47,23 @@ import org.junit.Before
 internal open class BaseFileResourceRoutineIntegrationShould : BaseMockIntegrationTestMetadataDispatcher() {
 
     // Data stores
-    protected val eventStore = EventStoreImpl.create(databaseAdapter)
-    protected val enrollmentStore = EnrollmentStoreImpl.create(databaseAdapter)
-    protected val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl.create(databaseAdapter)
-    protected val trackedEntityAttributeValueStore = TrackedEntityAttributeValueStoreImpl.create(databaseAdapter)
-    protected val fileResourceStore = FileResourceStoreImpl.create(d2.databaseAdapter())
-    private val optionSetStore = OptionSetStore.create(d2.databaseAdapter())
+    protected val eventStore = EventStoreImpl(databaseAdapter)
+    protected val trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl(databaseAdapter)
+    protected val trackedEntityAttributeValueStore = TrackedEntityAttributeValueStoreImpl(databaseAdapter)
+    protected val fileResourceStore = FileResourceStoreImpl(d2.databaseAdapter())
+    private val optionSetStore = OptionSetStoreImpl(d2.databaseAdapter())
 
     // Metadata stores
-    protected val categoryComboStore = CategoryComboStore.create(databaseAdapter)
+    protected val categoryComboStore = CategoryComboStoreImpl(databaseAdapter)
 
-    protected val dataElementStore = DataElementStore.create(databaseAdapter)
-    protected val organisationUnitStore = OrganisationUnitStore.create(databaseAdapter)
+    protected val dataElementStore = DataElementStoreImpl(databaseAdapter)
+    protected val organisationUnitStore = OrganisationUnitStoreImpl(databaseAdapter)
 
-    protected val trackedEntityTypeStore = TrackedEntityTypeStore.create(databaseAdapter)
-    protected val trackedEntityAttributeStore = TrackedEntityAttributeStore.create(databaseAdapter)
-    protected val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
-    protected val programStore = ProgramStore.create(databaseAdapter)
-    protected val programStageStore = ProgramStageStore.create(databaseAdapter)
+    protected val trackedEntityTypeStore = TrackedEntityTypeStoreImpl(databaseAdapter)
+    protected val trackedEntityAttributeStore = TrackedEntityAttributeStoreImpl(databaseAdapter)
+    protected val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
+    protected val programStore = ProgramStoreImpl(databaseAdapter)
+    protected val programStageStore = ProgramStageStoreImpl(databaseAdapter)
 
     @Before
     fun setUp() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
index 9162d954e6..0d76bd8988 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class FileResourceStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<FileResource>(
-    FileResourceStoreImpl.create(TestDatabaseAdapterFactory.get()),
+    FileResourceStoreImpl(TestDatabaseAdapterFactory.get()),
     FileResourceTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): FileResource {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreIntegrationShould.java
index 4ce7a8053e..4c1e38d5be 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class TrackerImportConflictStoreIntegrationShould
         extends ObjectStoreAbstractIntegrationShould<TrackerImportConflict> {
 
     public TrackerImportConflictStoreIntegrationShould() {
-        super(TrackerImportConflictStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackerImportConflictStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackerImportConflictTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java
index 1f7c60c84c..2e054a2ffc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class DataSetIndicatorLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataSetIndicatorLink> {
 
     public DataSetIndicatorLinkStoreIntegrationShould() {
-        super(DataSetIndicatorLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(DataSetIndicatorLinkStoreImpl.create(TestDatabaseAdapterFactory.get()),
                 DataSetIndicatorLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
index 85a05d0b6a..ce35b6d70f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.indicator.IndicatorTableInfo
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 
 class IndicatorStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Indicator>(
-    IndicatorStore.create(TestDatabaseAdapterFactory.get()),
+    IndicatorStoreImpl.create(TestDatabaseAdapterFactory.get()),
     IndicatorTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
index d387889cbf..8f6dc370fc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.legendset
 
 import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.legendset.DataElementLegendSetLinkSamples
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStore
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class DataElementLegendSetLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<DataElementLegendSetLink>(
-        DataElementLegendSetLinkStore.create(TestDatabaseAdapterFactory.get()),
+        DataElementLegendSetLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         DataElementLegendSetLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
     ) {
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt
index 0bef7afc44..b62ef49d9c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt
@@ -31,7 +31,7 @@ package org.hisp.dhis.android.core.legendset
 import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.legendset.IndicatorLegendSetLinkSamples
 import org.hisp.dhis.android.core.indicator.IndicatorLegendSetLinkTableInfo
-import org.hisp.dhis.android.core.legendset.internal.IndicatorLegendSetLinkStore
+import org.hisp.dhis.android.core.legendset.internal.IndicatorLegendSetLinkStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -39,8 +39,9 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class IndicatorLegendSetLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<IndicatorLegendSetLink>(
-        IndicatorLegendSetLinkStore.create(TestDatabaseAdapterFactory.get()),
-        IndicatorLegendSetLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+        IndicatorLegendSetLinkStoreImpl(TestDatabaseAdapterFactory.get()),
+        IndicatorLegendSetLinkTableInfo.TABLE_INFO,
+        TestDatabaseAdapterFactory.get()
     ) {
     override fun addMasterUid(): String {
         return IndicatorLegendSetLinkSamples.getIndicatorLegendSetLink().indicator()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStoreIntegrationShould.java
index 71d9a95bec..735ca31e49 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/ProgramIndicatorLegendSetLinkStoreIntegrationShould.java
@@ -30,7 +30,7 @@
 
 import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShould;
 import org.hisp.dhis.android.core.data.legendset.ProgramIndicatorLegendSetLinkSamples;
-import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStore;
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStoreImpl;
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory;
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
 import org.junit.runner.RunWith;
@@ -40,7 +40,7 @@ public class ProgramIndicatorLegendSetLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<ProgramIndicatorLegendSetLink> {
 
     public ProgramIndicatorLegendSetLinkStoreIntegrationShould() {
-        super(ProgramIndicatorLegendSetLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramIndicatorLegendSetLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreIntegrationShould.java
index 76c7351a33..6673247c0f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreIntegrationShould.java
@@ -40,7 +40,8 @@
 public class LegendSetStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<LegendSet> {
 
     public LegendSetStoreIntegrationShould() {
-        super(LegendSetStore.create(TestDatabaseAdapterFactory.get()), LegendSetTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
+        super(new LegendSetStoreImpl(TestDatabaseAdapterFactory.get()),
+                LegendSetTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreIntegrationShould.java
index 866f0376c5..00bbeb8a1a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreIntegrationShould.java
@@ -41,7 +41,8 @@
 public class LegendStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Legend> {
 
     public LegendStoreIntegrationShould() {
-        super(LegendStore.create(TestDatabaseAdapterFactory.get()), LegendTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
+        super(new LegendStoreImpl(TestDatabaseAdapterFactory.get()),
+                LegendTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreIntegrationShould.java
index cd8d728795..b2b85c7027 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class D2ErrorStoreIntegrationShould extends ObjectStoreAbstractIntegrationShould<D2Error> {
 
     public D2ErrorStoreIntegrationShould() {
-        super(D2ErrorStore.create(TestDatabaseAdapterFactory.get()),
+        super(new D2ErrorStoreImpl(TestDatabaseAdapterFactory.get()),
                 D2ErrorTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
index 8c75d3402b..d3bb701c34 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
@@ -38,12 +38,12 @@ import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionSetTableInfo
 import org.hisp.dhis.android.core.option.OptionTableInfo
-import org.hisp.dhis.android.core.option.internal.OptionStore
+import org.hisp.dhis.android.core.option.internal.OptionStoreImpl
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 import org.hisp.dhis.android.core.program.ProgramRuleActionType
-import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStore
-import org.hisp.dhis.android.core.program.internal.ProgramRuleStore
+import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramRuleStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.junit.Before
 import org.junit.Test
@@ -92,7 +92,7 @@ class ForeignKeyCleanerShould : BaseMockIntegrationTestEmptyDispatcher() {
         val PROGRAM_RULE_UID = "program_rule_uid"
         val program = ObjectWithUid.create("nonexisent-program")
         executor.executeD2CallTransactionally<Any?> {
-            ProgramRuleStore.create(d2.databaseAdapter()).insert(
+            ProgramRuleStoreImpl(d2.databaseAdapter()).insert(
                 ProgramRule.builder()
                     .uid(PROGRAM_RULE_UID).name("Rule").program(program).build()
             )
@@ -102,7 +102,7 @@ class ForeignKeyCleanerShould : BaseMockIntegrationTestEmptyDispatcher() {
                 .programRuleActionType(ProgramRuleActionType.ASSIGN)
                 .programRule(ObjectWithUid.create(PROGRAM_RULE_UID))
                 .build()
-            ProgramRuleActionStore.create(d2.databaseAdapter()).insert(programRuleAction)
+            ProgramRuleActionStoreImpl(d2.databaseAdapter()).insert(programRuleAction)
             assertThat(d2.programModule().programRules().blockingCount()).isEqualTo(1)
             assertThat(d2.programModule().programRuleActions().blockingCount()).isEqualTo(1)
             val foreignKeyCleaner = ForeignKeyCleanerImpl.create(d2.databaseAdapter())
@@ -124,7 +124,7 @@ class ForeignKeyCleanerShould : BaseMockIntegrationTestEmptyDispatcher() {
                 .optionSet(optionSet)
                 .build()
             val optionStore: IdentifiableObjectStore<Option> =
-                OptionStore.create(d2.databaseAdapter())
+                OptionStoreImpl(d2.databaseAdapter())
             optionStore.insert(option)
             ForeignKeyCleanerImpl.create(d2.databaseAdapter()).cleanForeignKeyErrors()
             null
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreIntegrationShould.java
index 5a5751c9fc..752d459b66 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ForeignKeyViolationStoreIntegrationShould
         extends ObjectStoreAbstractIntegrationShould<ForeignKeyViolation> {
 
     public ForeignKeyViolationStoreIntegrationShould() {
-        super(ForeignKeyViolationStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ForeignKeyViolationStoreImpl(TestDatabaseAdapterFactory.get()),
                 ForeignKeyViolationTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt
index dbcd584c07..dc9ed193f8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt
@@ -31,15 +31,16 @@ import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShou
 import org.hisp.dhis.android.core.data.maps.MapLayerImageryProviderSamples
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
-import org.hisp.dhis.android.core.map.layer.internal.MapLayerImageryProviderStore
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerImageryProviderStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class MapLayerImageryProviderStoreIntegrationShould : LinkStoreAbstractIntegrationShould<MapLayerImageryProvider>(
-    MapLayerImageryProviderStore.create(TestDatabaseAdapterFactory.get()),
-    MapLayerImageryProviderTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    MapLayerImageryProviderStoreImpl(TestDatabaseAdapterFactory.get()),
+    MapLayerImageryProviderTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
 
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt
index 71b73e47e8..b682185261 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt
@@ -31,15 +31,16 @@ import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractI
 import org.hisp.dhis.android.core.data.maps.MapLayerSamples
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
-import org.hisp.dhis.android.core.map.layer.internal.MapLayerStore
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class MapLayerStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<MapLayer>(
-    MapLayerStore.create(TestDatabaseAdapterFactory.get()),
-    MapLayerTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    MapLayerStoreImpl(TestDatabaseAdapterFactory.get()),
+    MapLayerTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): MapLayer {
         return MapLayerSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/note/internal/NoteStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/note/internal/NoteStoreIntegrationShould.java
index 79351decda..aca70f656d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/note/internal/NoteStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/note/internal/NoteStoreIntegrationShould.java
@@ -41,7 +41,7 @@
 public class NoteStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Note> {
 
     public NoteStoreIntegrationShould() {
-        super(NoteStore.create(TestDatabaseAdapterFactory.get()),
+        super(new NoteStoreImpl(TestDatabaseAdapterFactory.get()),
                 NoteTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreIntegrationShould.java
index a5acb790eb..2b35e72136 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class OptionGroupOptionLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<OptionGroupOptionLink> {
 
     public OptionGroupOptionLinkStoreIntegrationShould() {
-        super(OptionGroupOptionLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OptionGroupOptionLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 OptionGroupOptionLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreIntegrationShould.java
index 5add345c69..9c0bb6b8ea 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class OptionGroupStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<OptionGroup> {
 
     public OptionGroupStoreIntegrationShould() {
-        super(OptionGroupStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OptionGroupStoreImpl(TestDatabaseAdapterFactory.get()),
                 OptionGroupTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
index 6fd3fcb656..0f581a5960 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
@@ -34,13 +34,13 @@ import java.io.IOException
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.data.organisationunit.OrganisationUnitSamples
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
-import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkStore
+import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
+import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 import org.hisp.dhis.android.core.program.ProgramTableInfo
@@ -86,13 +86,15 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
 
         // inserting dataSets for creating OrgUnitDataSetLinks
         insertDataSet()
-        val organisationUnitHandler = OrganisationUnitHandlerImpl(
-            OrganisationUnitStore.create(databaseAdapter),
-            LinkHandlerImpl(UserOrganisationUnitLinkStoreImpl.create(databaseAdapter)),
-            LinkHandlerImpl(OrganisationUnitProgramLinkStore.create(databaseAdapter)),
-            LinkHandlerImpl(DataSetOrganisationUnitLinkStore.create(databaseAdapter)),
-            IdentifiableHandlerImpl(OrganisationUnitGroupStore.create(databaseAdapter)),
-            LinkHandlerImpl(OrganisationUnitOrganisationUnitGroupLinkStore.create(databaseAdapter))
+        val organisationUnitHandler = OrganisationUnitHandler(
+            OrganisationUnitStoreImpl(databaseAdapter),
+            LinkHandlerImpl(UserOrganisationUnitLinkStoreImpl(databaseAdapter)),
+            OrganisationUnitProgramLinkHandler(OrganisationUnitProgramLinkStoreImpl(databaseAdapter)),
+            DataSetOrganisationUnitLinkHandler(DataSetOrganisationUnitLinkStoreImpl(databaseAdapter)),
+            OrganisationUnitGroupHandler(OrganisationUnitGroupStoreImpl(databaseAdapter)),
+            OrganisationUnitOrganisationUnitGroupLinkHandler(
+                OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter)
+            )
         )
         val organisationUnitCollectionCleaner: CollectionCleaner<OrganisationUnit> =
             CollectionCleanerImpl(OrganisationUnitTableInfo.TABLE_INFO.name(), databaseAdapter)
@@ -101,8 +103,8 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
             organisationUnitService,
             organisationUnitHandler,
             pathTransformer,
-            UserOrganisationUnitLinkStoreImpl.create(databaseAdapter),
-            OrganisationUnitStore.create(databaseAdapter),
+            UserOrganisationUnitLinkStoreImpl(databaseAdapter),
+            OrganisationUnitStoreImpl(databaseAdapter),
             organisationUnitCollectionCleaner
         )
             .download(user)
@@ -127,7 +129,7 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
     @Test
     fun persist_organisation_unit_tree() {
         organisationUnitCall.blockingAwait()
-        val organisationUnitStore = OrganisationUnitStore.create(databaseAdapter)
+        val organisationUnitStore = OrganisationUnitStoreImpl(databaseAdapter)
         val dbAfroArabicClinic = organisationUnitStore.selectByUid(expectedAfroArabicClinic.uid())
         val dbAdonkiaCHP = organisationUnitStore.selectByUid(expectedAdonkiaCHP.uid())
 
@@ -138,7 +140,7 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
     @Test
     fun persist_organisation_unit_user_links() {
         organisationUnitCall.blockingAwait()
-        val userOrganisationUnitStore = UserOrganisationUnitLinkStoreImpl.create(databaseAdapter)
+        val userOrganisationUnitStore = UserOrganisationUnitLinkStoreImpl(databaseAdapter)
         val userOrganisationUnitLinks = userOrganisationUnitStore.selectAll()
         val linkOrganisationUnits: MutableSet<String> = HashSet(2)
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreIntegrationShould.java
index e5a5e7089a..37b15e44e6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class OrganisationUnitGroupStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<OrganisationUnitGroup> {
 
     public OrganisationUnitGroupStoreIntegrationShould() {
-        super(OrganisationUnitGroupStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OrganisationUnitGroupStoreImpl(TestDatabaseAdapterFactory.get()),
                 OrganisationUnitGroupTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreIntegrationShould.java
index eb82f65604..6396dba8fe 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class OrganisationUnitLevelStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<OrganisationUnitLevel> {
 
     public OrganisationUnitLevelStoreIntegrationShould() {
-        super(OrganisationUnitLevelStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OrganisationUnitLevelStoreImpl(TestDatabaseAdapterFactory.get()),
                 OrganisationUnitLevelTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreIntegrationShould.java
index c72038bd27..5f6b4c935a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class OrganisationUnitOrganisationUnitGroupLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<OrganisationUnitOrganisationUnitGroupLink> {
 
     public OrganisationUnitOrganisationUnitGroupLinkStoreIntegrationShould() {
-        super(OrganisationUnitOrganisationUnitGroupLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OrganisationUnitOrganisationUnitGroupLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreIntegrationShould.java
index 4dd9b90907..666a7bff05 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class OrganisationUnitProgramLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<OrganisationUnitProgramLink> {
 
     public OrganisationUnitProgramLinkStoreIntegrationShould() {
-        super(OrganisationUnitProgramLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OrganisationUnitProgramLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 OrganisationUnitProgramLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreIntegrationShould.java
index 0f04cda292..1498d1ab51 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class OrganisationUnitStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<OrganisationUnit> {
 
     public OrganisationUnitStoreIntegrationShould() {
-        super(OrganisationUnitStore.create(TestDatabaseAdapterFactory.get()),
+        super(new OrganisationUnitStoreImpl(TestDatabaseAdapterFactory.get()),
                 OrganisationUnitTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java
index 266f1184d2..a2265dcde5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/period/PeriodMockIntegrationShould.java
@@ -53,7 +53,7 @@ public void get_period_passing_period_type_and_a_date() throws ParseException {
 
     @Test
     public void create_period_in_database_if_not_exist() throws ParseException {
-        PeriodStore periodStore = PeriodStoreImpl.create(databaseAdapter);
+        PeriodStore periodStore = new PeriodStoreImpl(databaseAdapter);
 
         Date date = BaseIdentifiableObject.DATE_FORMAT.parse("2010-12-24T12:24:25.319");
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt
index cb55c36f29..e09cb894a1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt
@@ -58,6 +58,6 @@ class PeriodHelperIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
 
         assertThat(periods.size).isEqualTo(1)
 
-        PeriodStoreImpl.create(databaseAdapter).delete()
+        PeriodStoreImpl(databaseAdapter).delete()
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java
index 3841ef3dc5..799b45e7d4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java
@@ -50,9 +50,9 @@ public class PeriodStoreIntegrationShould extends ObjectWithoutUidStoreAbstractI
     private PeriodStore periodStore;
 
     public PeriodStoreIntegrationShould() {
-        super(PeriodStoreImpl.create(TestDatabaseAdapterFactory.get()), PeriodTableInfo.TABLE_INFO,
+        super(new PeriodStoreImpl(TestDatabaseAdapterFactory.get()), PeriodTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
-        this.periodStore = PeriodStoreImpl.create(TestDatabaseAdapterFactory.get());
+        this.periodStore = new PeriodStoreImpl(TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
index 81ef2aaf68..7bed782a68 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
@@ -31,7 +31,6 @@ import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShou
 import org.hisp.dhis.android.core.data.program.AnalyticsPeriodBoundarySamples
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
-import org.hisp.dhis.android.core.program.internal.AnalyticsPeriodBoundaryStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -39,7 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 internal class AnalyticsPeriodBoundaryStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<AnalyticsPeriodBoundary>(
-        create(TestDatabaseAdapterFactory.get()), AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
+        AnalyticsPeriodBoundaryStoreImpl(TestDatabaseAdapterFactory.get()), AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
     override fun buildObject(): AnalyticsPeriodBoundary {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
index 7566dd367f..55ff3123b7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.dataelement.CreateDataElementUtils
 import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 import org.hisp.dhis.android.core.program.CreateProgramStageUtils
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
-import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStoreImpl
 import org.hisp.dhis.android.core.trackedentity.CreateTrackedEntityAttributeUtils
 import org.hisp.dhis.android.core.trackedentity.CreateTrackedEntityUtils
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
@@ -56,7 +56,7 @@ class ProgramEndpointCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnq
 
     @Test
     fun persist_program_when_call() {
-        val store = ProgramStore.create(databaseAdapter)
+        val store = ProgramStoreImpl(databaseAdapter)
 
         assertThat(store.count()).isEqualTo(3)
         assertThat(store.selectByUid(programUid)!!.toBuilder().id(null).build())
@@ -65,7 +65,7 @@ class ProgramEndpointCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnq
 
     @Test
     fun persist_program_rule_variables_on_call() {
-        val store = ProgramRuleVariableStore.create(databaseAdapter)
+        val store = ProgramRuleVariableStoreImpl(databaseAdapter)
 
         assertThat(store.count()).isEqualTo(2)
         assertThat(store.selectByUid("omrL0gtPpDL")).isEqualTo(ProgramRuleVariableSamples.getHemoglobin())
@@ -73,7 +73,7 @@ class ProgramEndpointCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnq
 
     @Test
     fun persist_program_tracker_entity_attributes_when_call() {
-        val store = ProgramTrackedEntityAttributeStore.create(databaseAdapter)
+        val store = ProgramTrackedEntityAttributeStoreImpl(databaseAdapter)
 
         assertThat(store.count()).isEqualTo(2)
         assertThat(store.selectByUid("YhqgQ6Iy4c4"))
@@ -82,7 +82,7 @@ class ProgramEndpointCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnq
 
     @Test
     fun not_persist_relationship_type_when_call() {
-        val store = RelationshipTypeStore.create(databaseAdapter)
+        val store = RelationshipTypeStoreImpl(databaseAdapter)
         assertThat(store.count()).isEqualTo(0)
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreIntegrationShould.java
index e16e536225..7db5b5a555 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class ProgramIndicatorStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramIndicator> {
 
     public ProgramIndicatorStoreIntegrationShould() {
-        super(ProgramIndicatorStore.create(TestDatabaseAdapterFactory.get()), ProgramIndicatorTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
+        super(new ProgramIndicatorStoreImpl(TestDatabaseAdapterFactory.get()), ProgramIndicatorTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreIntegrationShould.java
index 83c2347943..3898873b74 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class ProgramRuleActionStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramRuleAction> {
 
     public ProgramRuleActionStoreIntegrationShould() {
-        super(ProgramRuleActionStore.create(TestDatabaseAdapterFactory.get()), ProgramRuleActionTableInfo.TABLE_INFO,
+        super(new ProgramRuleActionStoreImpl(TestDatabaseAdapterFactory.get()), ProgramRuleActionTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreIntegrationShould.java
index f2a9e75323..3521bd2883 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramRuleStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramRule> {
 
     public ProgramRuleStoreIntegrationShould() {
-        super(ProgramRuleStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramRuleStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramRuleTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreIntegrationShould.java
index 5687145a49..a2fd20201a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class ProgramRuleVariableStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramRuleVariable> {
 
     public ProgramRuleVariableStoreIntegrationShould() {
-        super(ProgramRuleVariableStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramRuleVariableStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramRuleVariableTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreIntegrationShould.java
index 2f2b87e04f..c4e91c3c91 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramSectionAttributeLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<ProgramSectionAttributeLink> {
 
     public ProgramSectionAttributeLinkStoreIntegrationShould() {
-        super(ProgramSectionAttributeLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramSectionAttributeLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramSectionAttributeLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
index 3f82664bd3..fb9694b7b6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractI
 import org.hisp.dhis.android.core.data.program.ProgramSectionSamples
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
-import org.hisp.dhis.android.core.program.internal.ProgramSectionStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class ProgramSectionStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<ProgramSection>(
-    create(TestDatabaseAdapterFactory.get()),
+    ProgramSectionStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramSectionTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): ProgramSection {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreIntegrationShould.java
index cd7c5c603c..a59d55a839 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class ProgramStageDataElementStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramStageDataElement> {
 
     public ProgramStageDataElementStoreIntegrationShould() {
-        super(ProgramStageDataElementStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramStageDataElementStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramStageDataElementTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreIntegrationShould.java
index bc7a5f8610..13ac1f2708 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramStageSectionDataElementLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<ProgramStageSectionDataElementLink> {
 
     public ProgramStageSectionDataElementLinkStoreIntegrationShould() {
-        super(ProgramStageSectionDataElementLinkStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramStageSectionDataElementLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt
index 82db5437e6..f168348a8a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractI
 import org.hisp.dhis.android.core.data.program.ProgramStageSectionSamples.programStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
-import org.hisp.dhis.android.core.program.internal.ProgramStageSectionStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class ProgramStageSectionStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<ProgramStageSection>(
-    create(TestDatabaseAdapterFactory.get()),
+    ProgramStageSectionStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramStageSectionTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreIntegrationShould.java
index 98f7558ad5..fa37ad4786 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class ProgramStageStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramStage> {
 
     public ProgramStageStoreIntegrationShould() {
-        super(ProgramStageStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramStageStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramStageTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStoreIntegrationShould.java
index 5cd9c01e49..fbef4e986a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class ProgramStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Program> {
 
     public ProgramStoreIntegrationShould() {
-        super(ProgramStore.create(TestDatabaseAdapterFactory.get()), ProgramTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
+        super(new ProgramStoreImpl(TestDatabaseAdapterFactory.get()), ProgramTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreIntegrationShould.java
index ad44b3dfe2..ab5217e75c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramTrackedEntityAttributeStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<ProgramTrackedEntityAttribute> {
 
     public ProgramTrackedEntityAttributeStoreIntegrationShould() {
-        super(ProgramTrackedEntityAttributeStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ProgramTrackedEntityAttributeStoreImpl(TestDatabaseAdapterFactory.get()),
                 ProgramTrackedEntityAttributeTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt
index 41973b215e..9f5ad7181e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt
@@ -36,22 +36,22 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.BaseEv
 import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.common.AnalyticsType
 import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.constant.internal.ConstantStore
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.constant.internal.ConstantStoreImpl
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryType
 import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerDataIntegrationHelper.Companion.`var`
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLExecutor
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
 
 internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvaluatorIntegrationShould() {
 
     protected val programIndicatorEvaluator = ProgramIndicatorSQLExecutor(
-        ConstantStore.create(databaseAdapter),
-        DataElementStore.create(databaseAdapter),
-        TrackedEntityAttributeStore.create(databaseAdapter),
+        ConstantStoreImpl(databaseAdapter),
+        DataElementStoreImpl(databaseAdapter),
+        TrackedEntityAttributeStoreImpl(databaseAdapter),
         databaseAdapter
     )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt
index 7b80f92b01..e9116fcf2d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStoreImpl
 import org.hisp.dhis.android.core.relationship.*
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemStoreImpl
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStoreImpl
@@ -52,7 +52,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: DatabaseAdapter) {
 
     fun createTrackedEntity(teiUid: String, orgunitUid: String, teiTypeUid: String) {
-        val teiStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
+        val teiStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
         val trackedEntityInstance = TrackedEntityInstance.builder()
             .uid(teiUid)
             .created(Date())
@@ -77,7 +77,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         val enrollment = Enrollment.builder().uid(enrollmentUid).organisationUnit(orgunitUid).program(programUid)
             .enrollmentDate(enrollmentDate).incidentDate(incidentDate).trackedEntityInstance(teiUid)
             .created(created).lastUpdated(lastUpdated).status(status).build()
-        EnrollmentStoreImpl.create(databaseAdapter).insert(enrollment)
+        EnrollmentStoreImpl(databaseAdapter).insert(enrollment)
     }
 
     fun createEvent(
@@ -95,7 +95,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         val event = Event.builder().uid(eventUid).enrollment(enrollmentUid).created(created).lastUpdated(lastUpdated)
             .program(programUid).programStage(programStageUid).organisationUnit(orgunitUid)
             .eventDate(eventDate).deleted(deleted).status(status).build()
-        EventStoreImpl.create(databaseAdapter).insert(event)
+        EventStoreImpl(databaseAdapter).insert(event)
     }
 
     fun createTrackerEvent(
@@ -167,7 +167,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
     }
 
     fun setProgramIndicator(programIndicator: ProgramIndicator) {
-        ProgramIndicatorStore.create(databaseAdapter).updateOrInsert(programIndicator)
+        ProgramIndicatorStoreImpl(databaseAdapter).updateOrInsert(programIndicator)
     }
 
     fun insertTrackedEntityDataValue(eventUid: String, dataElementUid: String, value: String) {
@@ -175,20 +175,20 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
             .event(eventUid)
             .dataElement(dataElementUid)
             .value(value).build()
-        TrackedEntityDataValueStoreImpl.create(databaseAdapter).updateOrInsertWhere(trackedEntityDataValue)
+        TrackedEntityDataValueStoreImpl(databaseAdapter).updateOrInsertWhere(trackedEntityDataValue)
     }
 
     fun insertTrackedEntityAttributeValue(teiUid: String, attributeUid: String, value: String) {
         val trackedEntityAttributeValue = TrackedEntityAttributeValue.builder()
             .value(value).trackedEntityAttribute(attributeUid).trackedEntityInstance(teiUid).build()
-        TrackedEntityAttributeValueStoreImpl.create(databaseAdapter).updateOrInsertWhere(trackedEntityAttributeValue)
+        TrackedEntityAttributeValueStoreImpl(databaseAdapter).updateOrInsertWhere(trackedEntityAttributeValue)
     }
 
     fun createRelationship(typeUid: String, fromTei: String, toTei: String) {
         val relationship = RelationshipHelper.teiToTeiRelationship(fromTei, toTei, typeUid)
 
-        RelationshipStoreImpl.create(databaseAdapter).insert(relationship)
-        RelationshipItemStoreImpl.create(databaseAdapter).let {
+        RelationshipStoreImpl(databaseAdapter).insert(relationship)
+        RelationshipItemStoreImpl(databaseAdapter).let {
             val r = ObjectWithUid.create(relationship.uid())
             it.insert(
                 relationship.from()!!.toBuilder()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
index acb6393d9b..9810926386 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 import org.hisp.dhis.android.core.category.internal.CreateCategoryComboUtils
 import org.hisp.dhis.android.core.common.*
 import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore
-import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.program.internal.ProgramStageStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
 import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerDataIntegrationHelper.Companion.att
 import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerDataIntegrationHelper.Companion.de
 import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerDataIntegrationHelper.Companion.today
@@ -52,8 +52,8 @@ import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerData
 import org.hisp.dhis.android.core.program.programindicatorengine.BaseTrackerDataIntegrationHelper.Companion.`var`
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.junit.*
 import org.junit.runner.RunWith
@@ -91,10 +91,10 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
             setUpClass()
 
             val orgunit = OrganisationUnit.builder().uid(orgunitUid).build()
-            OrganisationUnitStore.create(databaseAdapter).insert(orgunit)
+            OrganisationUnitStoreImpl(databaseAdapter).insert(orgunit)
 
             val trackedEntityType = TrackedEntityType.builder().uid(teiTypeUid).build()
-            TrackedEntityTypeStore.create(databaseAdapter).insert(trackedEntityType)
+            TrackedEntityTypeStoreImpl(databaseAdapter).insert(trackedEntityType)
 
             val categoryCombo = CreateCategoryComboUtils.create(1L, CategoryCombo.DEFAULT_UID)
             databaseAdapter.insert(CategoryComboTableInfo.TABLE_INFO.name(), null, categoryCombo)
@@ -104,24 +104,24 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
                 .access(access)
                 .trackedEntityType(TrackedEntityType.builder().uid(teiTypeUid).build())
                 .build()
-            ProgramStore.create(databaseAdapter).insert(program)
+            ProgramStoreImpl(databaseAdapter).insert(program)
 
             val stage1 = ProgramStage.builder().uid(programStage1).program(ObjectWithUid.create(programUid))
                 .formType(FormType.CUSTOM).build()
             val stage2 = ProgramStage.builder().uid(programStage2).program(ObjectWithUid.create(programUid))
                 .formType(FormType.CUSTOM).build()
-            val programStageStore = ProgramStageStore.create(databaseAdapter)
+            val programStageStore = ProgramStageStoreImpl(databaseAdapter)
             programStageStore.insert(stage1)
             programStageStore.insert(stage2)
 
             val de1 = DataElement.builder().uid(dataElement1).valueType(ValueType.NUMBER).build()
             val de2 = DataElement.builder().uid(dataElement2).valueType(ValueType.NUMBER).build()
-            val dataElementStore = DataElementStore.create(databaseAdapter)
+            val dataElementStore = DataElementStoreImpl(databaseAdapter)
             dataElementStore.insert(de1)
             dataElementStore.insert(de2)
 
             val tea = TrackedEntityAttribute.builder().uid(attribute1).build()
-            TrackedEntityAttributeStore.create(databaseAdapter).insert(tea)
+            TrackedEntityAttributeStoreImpl(databaseAdapter).insert(tea)
         }
 
         @AfterClass
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt
index 79437502e3..377c5179be 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.programstageworkinglist
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.data.database.ObjectStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.programstageworkinglist.ProgramStageWorkingListAttributeValueFilterSamples
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListAttributeValueFilterStore
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListAttributeValueFilterStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<ProgramStageWorkingListAttributeValueFilter>(
-        ProgramStageWorkingListAttributeValueFilterStore.create(TestDatabaseAdapterFactory.get()),
+        ProgramStageWorkingListAttributeValueFilterStoreImpl(TestDatabaseAdapterFactory.get()),
         ItemFilterTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt
index cc639b43de..f83c8ea608 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.programstageworkinglist
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.data.database.ObjectStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.programstageworkinglist.ProgramStageWorkingListEventDataFilterSamples
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListEventDataFilterStore
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListEventDataFilterStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class ProgramStageWorkingListEventDataFilterStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<ProgramStageWorkingListEventDataFilter>(
-        ProgramStageWorkingListEventDataFilterStore.create(TestDatabaseAdapterFactory.get()),
+        ProgramStageWorkingListEventDataFilterStoreImpl(TestDatabaseAdapterFactory.get()),
         ItemFilterTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt
index e16a8b7727..9a0df42094 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.programstageworkinglist
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.programstageworkinglist.ProgramStageWorkingListSamples
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStore
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStoreImpl
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListTableInfo
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class ProgramStageWorkingListStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<ProgramStageWorkingList>(
-        ProgramStageWorkingListStore.create(TestDatabaseAdapterFactory.get()),
+        ProgramStageWorkingListStoreImpl(TestDatabaseAdapterFactory.get()),
         ProgramStageWorkingListTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreIntegrationShould.java
index fb493cff17..7862a08607 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class RelationshipConstraintStoreIntegrationShould extends
         ObjectWithoutUidStoreAbstractIntegrationShould<RelationshipConstraint> {
 
     public RelationshipConstraintStoreIntegrationShould() {
-        super(RelationshipConstraintStore.create(TestDatabaseAdapterFactory.get()),
+        super(new RelationshipConstraintStoreImpl(TestDatabaseAdapterFactory.get()),
                 RelationshipConstraintTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt
index 7bfb2780fa..2e7e8de58c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.data.relationship.RelationshipItemSamples
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.relationship.RelationshipItemEvent
 import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
-import org.hisp.dhis.android.core.relationship.internal.RelationshipItemStoreImpl.Companion.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -41,7 +40,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class RelationshipItemStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<RelationshipItem>(
-    create(TestDatabaseAdapterFactory.get()),
+    RelationshipItemStoreImpl(TestDatabaseAdapterFactory.get()),
     RelationshipItemTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreIntegrationShould.java
index 2ba0d8ae95..0c6405cf0b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class RelationshipStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<Relationship> {
 
     public RelationshipStoreIntegrationShould() {
-        super(RelationshipStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new RelationshipStoreImpl(TestDatabaseAdapterFactory.get()),
                 RelationshipTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreIntegrationShould.java
index b2e8a87219..77a721a9e7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreIntegrationShould.java
@@ -46,9 +46,9 @@ public class ResourceStoreIntegrationShould extends ObjectWithoutUidStoreAbstrac
     private ResourceStore store;
 
     public ResourceStoreIntegrationShould() {
-        super(ResourceStoreImpl.create(TestDatabaseAdapterFactory.get()), ResourceTableInfo.TABLE_INFO,
+        super(new ResourceStoreImpl(TestDatabaseAdapterFactory.get()), ResourceTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
-        this.store = ResourceStoreImpl.create(TestDatabaseAdapterFactory.get());
+        this.store = new ResourceStoreImpl(TestDatabaseAdapterFactory.get());
     }
 
     @Override
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt
index f38f860cf0..c16b924c95 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class AnalyticsDhisVisualizationStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<AnalyticsDhisVisualization>(
-        AnalyticsDhisVisualizationStore.create(TestDatabaseAdapterFactory.get()),
+        AnalyticsDhisVisualizationStoreImpl(TestDatabaseAdapterFactory.get()),
         AnalyticsDhisVisualizationTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt
index 0f7f2d370a..b4c306dd46 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class AnalyticsTeiAttributeStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiAttribute>(
-    AnalyticsTeiAttributeStore.create(TestDatabaseAdapterFactory.get()),
+    AnalyticsTeiAttributeStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiAttributeTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt
index c3e52d70c8..db9a49bba6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class AnalyticsTeiDataElementStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiDataElement>(
-    AnalyticsTeiDataElementStore.create(TestDatabaseAdapterFactory.get()),
+    AnalyticsTeiDataElementStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiDataElementTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt
index ae53852515..bb3254cefd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class AnalyticsTeiIndicatorStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiIndicator>(
-    AnalyticsTeiIndicatorStore.create(TestDatabaseAdapterFactory.get()),
+    AnalyticsTeiIndicatorStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiIndicatorTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt
index 026e926c5b..91e3a26c84 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class AnalyticsTeiSettingStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiSetting>(
-    AnalyticsTeiSettingStore.create(TestDatabaseAdapterFactory.get()),
+    AnalyticsTeiSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiSettingTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt
index 06533c1546..ff557831ef 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt
@@ -38,8 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class AnalyticsTeiWHONutritionDataStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<AnalyticsTeiWHONutritionData>(
-
-        AnalyticsTeiWHONutritionDataStore.create(TestDatabaseAdapterFactory.get()),
+        AnalyticsTeiWHONutritionDataStoreImpl(TestDatabaseAdapterFactory.get()),
         AnalyticsTeiWHONutritionDataTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreIntegrationShould.java
index f3c88436d3..5417bfa2c9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class DataSetSettingStoreIntegrationShould
         extends ObjectStoreAbstractIntegrationShould<DataSetSetting> {
 
     public DataSetSettingStoreIntegrationShould() {
-        super(DataSetSettingStore.create(TestDatabaseAdapterFactory.get()), DataSetSettingTableInfo.TABLE_INFO,
+        super(new DataSetSettingStoreImpl(TestDatabaseAdapterFactory.get()), DataSetSettingTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt
index 12d156135d..6318dc701a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class FilterSettingStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<FilterSetting>(
-    FilterSettingStore.create(TestDatabaseAdapterFactory.get()),
+    FilterSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     FilterSettingTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt
index 7be2c1637c..96f789ec67 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class GeneralSettingsStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<GeneralSettings>(
-    GeneralSettingStore.create(TestDatabaseAdapterFactory.get()),
+    GeneralSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     GeneralSettingTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt
index 3a3755802a..33438aa224 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.data.database.ObjectStoreAbstractIntegrationSh
 import org.hisp.dhis.android.core.data.settings.LatestAppVersionSamples.latestAppVersion
 import org.hisp.dhis.android.core.settings.LatestAppVersion
 import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo
-import org.hisp.dhis.android.core.settings.internal.LatestAppVersionStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class LatestAppVersionStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<LatestAppVersion>(
-    create(TestDatabaseAdapterFactory.get()),
+    LatestAppVersionStoreImpl(TestDatabaseAdapterFactory.get()),
     LatestAppVersionTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt
index d2f057801a..32d00c7666 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class ProgramConfigurationSettingStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<ProgramConfigurationSetting>(
-        ProgramConfigurationSettingStore.create(TestDatabaseAdapterFactory.get()),
+        ProgramConfigurationSettingStoreImpl(TestDatabaseAdapterFactory.get()),
         ProgramConfigurationSettingTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreIntegrationShould.java
index e73df10778..c00d4cfc17 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ProgramSettingStoreIntegrationShould
         extends ObjectStoreAbstractIntegrationShould<ProgramSetting> {
 
     public ProgramSettingStoreIntegrationShould() {
-        super(ProgramSettingStore.create(TestDatabaseAdapterFactory.get()), ProgramSettingTableInfo.TABLE_INFO,
+        super(new ProgramSettingStoreImpl(TestDatabaseAdapterFactory.get()), ProgramSettingTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt
index c8909f5da3..1d7c795751 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class SynchronizationSettingsStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<SynchronizationSettings>(
-    SynchronizationSettingStore.create(TestDatabaseAdapterFactory.get()),
+    SynchronizationSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     SynchronizationSettingTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreIntegrationShould.java
index 2bf77fc51d..eb93b48ba8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class SystemSettingStoreIntegrationShould extends ObjectWithoutUidStoreAbstractIntegrationShould<SystemSetting> {
 
     public SystemSettingStoreIntegrationShould() {
-        super(SystemSettingStore.create(TestDatabaseAdapterFactory.get()), SystemSettingTableInfo.TABLE_INFO,
+        super(new SystemSettingStoreImpl(TestDatabaseAdapterFactory.get()), SystemSettingTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreIntegrationShould.java
index a1004a760f..5ca96176a5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class UserSettingsStoreIntegrationShould
         extends ObjectStoreAbstractIntegrationShould<UserSettings> {
 
     public UserSettingsStoreIntegrationShould() {
-        super(UserSettingsStore.create(TestDatabaseAdapterFactory.get()), UserSettingsTableInfo.TABLE_INFO,
+        super(new UserSettingsStoreImpl(TestDatabaseAdapterFactory.get()), UserSettingsTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt
index 2b7dc15d5e..5371cf7ccf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt
@@ -36,7 +36,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class SMSConfigStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<KeyValuePair>(
-    SMSConfigStoreImpl.create(TestDatabaseAdapterFactory.get()),
+    SMSConfigStoreImpl(TestDatabaseAdapterFactory.get()),
     SMSConfigTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt
index 52c391a0bd..c9c62033ab 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class SMSMetadataIdStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<SMSMetadataId>(
-    SMSMetadataIdStore.create(TestDatabaseAdapterFactory.get()),
+    SMSMetadataIdStoreImpl(TestDatabaseAdapterFactory.get()),
     SMSMetadataIdTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt
index 7a435c5df5..2649d2b8ea 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt
@@ -36,7 +36,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class SMSOngoingSubmissionStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<SMSOngoingSubmission>(
-    SMSOngoingSubmissionStore.create(TestDatabaseAdapterFactory.get()),
+    SMSOngoingSubmissionStoreImpl(TestDatabaseAdapterFactory.get()),
     SMSOngoingSubmissionTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreIntegrationShould.java
index a84aa03d0a..1088ebb494 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class SystemInfoStoreIntegrationShould extends ObjectWithoutUidStoreAbstractIntegrationShould<SystemInfo> {
 
     public SystemInfoStoreIntegrationShould() {
-        super(SystemInfoStore.create(TestDatabaseAdapterFactory.get()), SystemInfoTableInfo.TABLE_INFO,
+        super(new SystemInfoStoreImpl(TestDatabaseAdapterFactory.get()), SystemInfoTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java
index 8f2305cd3d..d5a142d8f6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java
@@ -37,9 +37,6 @@
 
 import org.hisp.dhis.android.core.BaseRealIntegrationTest;
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
 import org.hisp.dhis.android.core.category.CategoryCombo;
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo;
 import org.hisp.dhis.android.core.common.Access;
@@ -48,16 +45,19 @@
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStoreImpl;
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
 import org.hisp.dhis.android.core.program.Program;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-import org.hisp.dhis.android.core.program.internal.ProgramStore;
-import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore;
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl;
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStoreImpl;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueHandler;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStoreInterface;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStoreImpl;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl;
 import org.junit.Before;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
@@ -69,7 +69,7 @@
 
 public class TrackedEntityAttributeReservedValueManagerRealIntegrationShould extends BaseRealIntegrationTest {
 
-    private TrackedEntityAttributeReservedValueStoreInterface store;
+    private TrackedEntityAttributeReservedValueStore store;
     private String organisationUnitUid = "org_unit_uid";
     private String programUid = "program_uid";
     private String categoryComboUid = "category_combo_uid";
@@ -94,17 +94,17 @@ public void setUp() {
 
         login();
 
-        store = TrackedEntityAttributeReservedValueStore.create(d2.databaseAdapter());
+        store = new TrackedEntityAttributeReservedValueStoreImpl(d2.databaseAdapter());
 
-        IdentifiableObjectStore<OrganisationUnit> organisationUnitStore =
-                OrganisationUnitStore.create(d2.databaseAdapter());
+        OrganisationUnitStore organisationUnitStore =
+                new OrganisationUnitStoreImpl(d2.databaseAdapter());
 
-        IdentifiableObjectStore<TrackedEntityAttribute> trackedEntityAttributeStore =
-                TrackedEntityAttributeStore.create(d2.databaseAdapter());
+        TrackedEntityAttributeStore trackedEntityAttributeStore =
+                new TrackedEntityAttributeStoreImpl(d2.databaseAdapter());
 
         manager = d2.trackedEntityModule().reservedValueManager();
 
-        Handler<TrackedEntityAttributeReservedValue> handler = new ObjectWithoutUidHandlerImpl<>(store);
+        TrackedEntityAttributeReservedValueHandler handler = new TrackedEntityAttributeReservedValueHandler(store);
 
         List<TrackedEntityAttributeReservedValue> trackedEntityAttributeReservedValues = new ArrayList<>();
 
@@ -137,7 +137,7 @@ public void setUp() {
 
         Program program = Program.builder().uid(programUid).categoryCombo(ObjectWithUid.create(categoryCombo.uid()))
                 .access(Access.create(null, null, DataAccess.create(true, true))).build();
-        ProgramStore.create(d2.databaseAdapter()).insert(program);
+        new ProgramStoreImpl(d2.databaseAdapter()).insert(program);
 
         ProgramTrackedEntityAttribute programTrackedEntityAttribute =
                 ProgramTrackedEntityAttribute.builder()
@@ -145,11 +145,11 @@ public void setUp() {
                         .trackedEntityAttribute(ObjectWithUid.create(ownerUid))
                         .program(ObjectWithUid.create(programUid))
                         .build();
-        ProgramTrackedEntityAttributeStore.create(d2.databaseAdapter()).insert(programTrackedEntityAttribute);
+        new ProgramTrackedEntityAttributeStoreImpl(d2.databaseAdapter()).insert(programTrackedEntityAttribute);
 
         OrganisationUnitProgramLink organisationUnitProgramLink =
                 OrganisationUnitProgramLink.builder().organisationUnit(organisationUnitUid).program(programUid).build();
-        OrganisationUnitProgramLinkStore.create(d2.databaseAdapter()).insert(organisationUnitProgramLink);
+        new OrganisationUnitProgramLinkStoreImpl(d2.databaseAdapter()).insert(organisationUnitProgramLink);
 
 
         when(trackedEntityAttributeReservedValueQueryCallFactory.create(
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt
index f3187a916f..e07ef5b48b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.data.database.ObjectStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.trackedentity.AttributeValueFilterSamples
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
-import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class AttributeValueFilterStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AttributeValueFilter>(
-    create(TestDatabaseAdapterFactory.get()),
+    AttributeValueFilterStoreImpl(TestDatabaseAdapterFactory.get()),
     ItemFilterTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
index 1b9eacb248..26e5912ea9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
@@ -43,16 +43,16 @@ import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore.create
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStageStoreImpl
 import org.hisp.dhis.android.core.program.internal.ProgramStore
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemStoreImpl
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStoreImpl
-import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
@@ -78,10 +78,10 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
     }
 
     protected fun storeTrackerData() {
-        val orgUnit = create(databaseAdapter).selectFirst()
-        val teiType = TrackedEntityTypeStore.create(databaseAdapter).selectFirst()
+        val orgUnit = OrganisationUnitStoreImpl(databaseAdapter).selectFirst()
+        val teiType = TrackedEntityTypeStoreImpl(databaseAdapter).selectFirst()
         val program = d2.programModule().programs().one().blockingGet()
-        val programStage = ProgramStageStore.create(databaseAdapter).selectFirst()
+        val programStage = ProgramStageStoreImpl(databaseAdapter).selectFirst()
 
         val dataValue1 = TrackedEntityDataValueSamples.get().toBuilder().event(event1Id).build()
 
@@ -185,9 +185,9 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
     }
 
     protected fun storeSimpleTrackedEntityInstance(teiUid: String, state: State) {
-        val orgUnit = create(databaseAdapter).selectFirst()
-        val teiType = TrackedEntityTypeStore.create(databaseAdapter).selectFirst()
-        TrackedEntityInstanceStoreImpl.create(databaseAdapter).insert(
+        val orgUnit = OrganisationUnitStoreImpl(databaseAdapter).selectFirst()
+        val teiType = TrackedEntityTypeStoreImpl(databaseAdapter).selectFirst()
+        TrackedEntityInstanceStoreImpl(databaseAdapter).insert(
             TrackedEntityInstanceSamples.get().toBuilder()
                 .uid(teiUid)
                 .trackedEntityType(teiType!!.uid())
@@ -213,22 +213,22 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
         from: RelationshipItem,
         to: RelationshipItem
     ) {
-        val relationshipType = RelationshipTypeStore.create(databaseAdapter).selectFirst()
+        val relationshipType = RelationshipTypeStoreImpl(databaseAdapter).selectFirst()
         val executor = D2CallExecutor.create(databaseAdapter)
         executor.executeD2CallTransactionally<Any?> {
-            RelationshipStoreImpl.create(databaseAdapter).insert(
+            RelationshipStoreImpl(databaseAdapter).insert(
                 RelationshipSamples.get230(relationshipUid, from, to).toBuilder()
                     .relationshipType(relationshipType!!.uid())
                     .syncState(State.TO_POST)
                     .build()
             )
-            RelationshipItemStoreImpl.create(databaseAdapter).insert(
+            RelationshipItemStoreImpl(databaseAdapter).insert(
                 from.toBuilder()
                     .relationship(ObjectWithUid.create(relationshipUid))
                     .relationshipItemType(RelationshipConstraintType.FROM)
                     .build()
             )
-            RelationshipItemStoreImpl.create(databaseAdapter).insert(
+            RelationshipItemStoreImpl(databaseAdapter).insert(
                 to.toBuilder()
                     .relationship(ObjectWithUid.create(relationshipUid))
                     .relationshipItemType(RelationshipConstraintType.TO)
@@ -254,7 +254,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
         internal lateinit var eventStore: EventStore
         internal lateinit var enrollmentStore: EnrollmentStore
         internal lateinit var trackedEntityTypeStore: IdentifiableObjectStore<TrackedEntityType>
-        internal lateinit var programStore: ProgramStoreInterface
+        internal lateinit var programStore: ProgramStore
 
         @BeforeClass
         @JvmStatic
@@ -262,12 +262,12 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
         fun setUp() {
             setUpClass()
             oldTrackerPayloadGenerator = objects.d2DIComponent.oldTrackerImporterPayloadGenerator()
-            teiStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
-            teiDataValueStore = TrackedEntityDataValueStoreImpl.create(databaseAdapter)
-            eventStore = EventStoreImpl.create(databaseAdapter)
-            enrollmentStore = EnrollmentStoreImpl.create(databaseAdapter)
-            trackedEntityTypeStore = TrackedEntityTypeStore.create(databaseAdapter)
-            programStore = ProgramStore.create(databaseAdapter)
+            teiStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
+            teiDataValueStore = TrackedEntityDataValueStoreImpl(databaseAdapter)
+            eventStore = EventStoreImpl(databaseAdapter)
+            enrollmentStore = EnrollmentStoreImpl(databaseAdapter)
+            trackedEntityTypeStore = TrackedEntityTypeStoreImpl(databaseAdapter)
+            programStore = ProgramStoreImpl(databaseAdapter)
         }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreIntegrationShould.java
index 0954104f8a..39c14b4641 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class ReservedValueSettingStoreIntegrationShould extends
         IdentifiableObjectStoreAbstractIntegrationShould<ReservedValueSetting> {
 
     public ReservedValueSettingStoreIntegrationShould() {
-        super(ReservedValueSettingStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ReservedValueSettingStoreImpl(TestDatabaseAdapterFactory.get()),
                 ReservedValueSettingTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallRealIntegrationShould.java
index 231aff2280..9dd9140df1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallRealIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallRealIntegrationShould.java
@@ -67,7 +67,7 @@ public void download_and_persist_reserved_values() {
         syncMetadata();
         reserveValues();
 
-        List<TrackedEntityAttributeReservedValue> reservedValues = TrackedEntityAttributeReservedValueStore.create(
+        List<TrackedEntityAttributeReservedValue> reservedValues = new TrackedEntityAttributeReservedValueStoreImpl(
                 d2.databaseAdapter()).selectAll();
 
         assertThat(reservedValues.size()).isEqualTo(numberToReserve);
@@ -79,7 +79,7 @@ public void download_and_persist_all_reserved_values() {
         syncMetadata();
         d2.trackedEntityModule().reservedValueManager().blockingDownloadAllReservedValues(20);
 
-        List<TrackedEntityAttributeReservedValue> reservedValues = TrackedEntityAttributeReservedValueStore.create(
+        List<TrackedEntityAttributeReservedValue> reservedValues = new TrackedEntityAttributeReservedValueStoreImpl(
                 d2.databaseAdapter()).selectAll();
 
         String value = d2.trackedEntityModule().reservedValueManager().blockingGetValue("xs8A6tQJY0s", orgunitUid);
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreIntegrationShould.java
index 39ccce7416..30e1814238 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreIntegrationShould.java
@@ -28,10 +28,13 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.parseDate;
+
 import org.hisp.dhis.android.core.BaseIntegrationTestWithDatabase;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
 import org.junit.After;
 import org.junit.Before;
@@ -43,9 +46,6 @@
 import java.util.Date;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.parseDate;
-
 @RunWith(JUnit4.class)
 public class TrackedEntityAttributeReservedValueStoreIntegrationShould extends BaseIntegrationTestWithDatabase {
 
@@ -59,20 +59,20 @@ public class TrackedEntityAttributeReservedValueStoreIntegrationShould extends B
     private final String ownerUid = "owUid";
 
     // object to test
-    private TrackedEntityAttributeReservedValueStoreInterface store;
-    private IdentifiableObjectStore<OrganisationUnit> organisationUnitStore;
+    private TrackedEntityAttributeReservedValueStore store;
+    private OrganisationUnitStore organisationUnitStore;
 
     @Before
     public void setUp() throws IOException {
         super.setUp();
-        store = TrackedEntityAttributeReservedValueStore.create(databaseAdapter());
+        store = new TrackedEntityAttributeReservedValueStoreImpl(databaseAdapter());
 
         serverDate = parseDate("2018-05-13T12:35:36.743");
         Date expiredDate = parseDate("2018-05-12T12:35:36.743");
         Date notExpiredDate = parseDate("2018-05-17T12:35:36.743");
 
         OrganisationUnit organisationUnit = OrganisationUnit.builder().uid(orgUnitUid).build();
-        organisationUnitStore = OrganisationUnitStore.create(databaseAdapter());
+        organisationUnitStore = new OrganisationUnitStoreImpl(databaseAdapter());
         organisationUnitStore.insert(organisationUnit);
 
         TrackedEntityAttributeReservedValue.Builder builder = TrackedEntityAttributeReservedValue.builder()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreIntegrationShould.java
index b5aa5f45d9..cf62e1f184 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class TrackedEntityAttributeStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<TrackedEntityAttribute> {
 
     public TrackedEntityAttributeStoreIntegrationShould() {
-        super(TrackedEntityAttributeStore.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityAttributeStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityAttributeTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreIntegrationShould.java
index 4778d45693..89254df101 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class TrackedEntityAttributeValueStoreIntegrationShould
         extends ObjectWithoutUidStoreAbstractIntegrationShould<TrackedEntityAttributeValue> {
 
     public TrackedEntityAttributeValueStoreIntegrationShould() {
-        super(TrackedEntityAttributeValueStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityAttributeValueStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityAttributeValueTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreIntegrationShould.java
index 10967c7776..d5a0df12ad 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreIntegrationShould.java
@@ -61,9 +61,9 @@ public class TrackedEntityDataValueStoreIntegrationShould
     protected TrackedEntityDataValueStore store;
 
     public TrackedEntityDataValueStoreIntegrationShould() {
-        super(TrackedEntityDataValueStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityDataValueStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityDataValueTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
-        this.store = TrackedEntityDataValueStoreImpl.create(TestDatabaseAdapterFactory.get());
+        this.store = new TrackedEntityDataValueStoreImpl(TestDatabaseAdapterFactory.get());
     }
 
     @Override
@@ -73,7 +73,7 @@ protected TrackedEntityDataValue buildObject() {
 
     @After
     public void tearDown() {
-        EventStoreImpl.create(TestDatabaseAdapterFactory.get()).delete();
+        new EventStoreImpl(TestDatabaseAdapterFactory.get()).delete();
     }
 
     @Override
@@ -124,7 +124,7 @@ public void select_data_values_by_event_uid() {
 
     @Test
     public void select_single_events_data_values() {
-        EventStore eventStore = EventStoreImpl.create(TestDatabaseAdapterFactory.get());
+        EventStore eventStore = new EventStoreImpl(TestDatabaseAdapterFactory.get());
         eventStore.insert(EventSamples.get().toBuilder().uid("event_1").enrollment(null).syncState(State.TO_POST).build());
         eventStore.insert(EventSamples.get().toBuilder().uid("event_2").syncState(State.TO_POST).build());
         assertThat(eventStore.count()).isEqualTo(2);
@@ -147,19 +147,19 @@ public void select_single_events_data_values() {
 
     @Test
     public void select_tracker_data_values() {
-        TrackedEntityInstanceStore trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl
-                .create(TestDatabaseAdapterFactory.get());
+        TrackedEntityInstanceStore trackedEntityInstanceStore =
+                new TrackedEntityInstanceStoreImpl(TestDatabaseAdapterFactory.get());
         TrackedEntityInstance trackedEntityInstance = TrackedEntityInstance.builder().uid("tei_uid")
                 .organisationUnit("organisation_unit_uid").trackedEntityType("tei_type").syncState(State.TO_POST).build();
         trackedEntityInstanceStore.insert(trackedEntityInstance);
 
-        EnrollmentStore enrollmentStore = EnrollmentStoreImpl.create(TestDatabaseAdapterFactory.get());
+        EnrollmentStore enrollmentStore = new EnrollmentStoreImpl(TestDatabaseAdapterFactory.get());
         Enrollment enrollment = Enrollment.builder().uid("enrollment").organisationUnit("organisation_unit")
                 .program("program").trackedEntityInstance("tei_uid")
                 .aggregatedSyncState(State.TO_POST).syncState(State.TO_POST).build();
         enrollmentStore.insert(enrollment);
 
-        EventStore eventStore = EventStoreImpl.create(TestDatabaseAdapterFactory.get());
+        EventStore eventStore = new EventStoreImpl(TestDatabaseAdapterFactory.get());
         eventStore.insert(EventSamples.get().toBuilder().uid("event_1").syncState(State.TO_POST).build());
         eventStore.insert(EventSamples.get().toBuilder().uid("event_2").enrollment(null).syncState(State.TO_POST).build());
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
index 2f53c79ce9..85922c620b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
@@ -41,7 +41,7 @@ import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -64,7 +64,7 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
     abstract val teiWithRelationshipFile: String
 
     private lateinit var initSyncParams: SynchronizationSettings
-    private val syncStore = SynchronizationSettingStore.create(databaseAdapter)
+    private val syncStore = SynchronizationSettingStoreImpl(databaseAdapter)
 
     @Before
     fun setUp() {
@@ -215,15 +215,15 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
     }
 
     private fun getDownloadedTei(teiUid: String): TrackedEntityInstance? {
-        val teiAttributeValuesStore = TrackedEntityAttributeValueStoreImpl.create(databaseAdapter)
+        val teiAttributeValuesStore = TrackedEntityAttributeValueStoreImpl(databaseAdapter)
         val attValues = teiAttributeValuesStore.queryByTrackedEntityInstance(teiUid)
         val attValuesWithoutIdAndTEI = attValues.map {
             it.toBuilder().id(null).trackedEntityInstance(null).build()
         }
 
-        val teiStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
+        val teiStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
         val downloadedTei = teiStore.selectByUid(teiUid)
-        val enrollmentStore = EnrollmentStoreImpl.create(databaseAdapter)
+        val enrollmentStore = EnrollmentStoreImpl(databaseAdapter)
         val downloadedEnrollments = enrollmentStore.selectWhere(
             WhereClauseBuilder()
                 .appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, teiUid).build()
@@ -232,13 +232,13 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
             it.toBuilder().id(null).deleted(false).notes(ArrayList()).build()
         }
 
-        val eventStore = EventStoreImpl.create(databaseAdapter)
+        val eventStore = EventStoreImpl(databaseAdapter)
         val downloadedEventsWithoutValues = eventStore.selectAll()
         val downloadedEventsWithoutValuesAndDeleteFalse = downloadedEventsWithoutValues.map {
             it.toBuilder().id(null).deleted(false).build()
         }
 
-        val dataValueList = TrackedEntityDataValueStoreImpl.create(databaseAdapter).selectAll()
+        val dataValueList = TrackedEntityDataValueStoreImpl(databaseAdapter).selectAll()
         val downloadedValues = dataValueList.groupBy { it.event() }
 
         return createTei(
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreIntegrationShould.java
index 1e0d5b5b72..3c8486748e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class TrackedEntityInstanceEventFilterStoreIntegrationShould
         extends ObjectStoreAbstractIntegrationShould<TrackedEntityInstanceEventFilter> {
 
     public TrackedEntityInstanceEventFilterStoreIntegrationShould() {
-        super(TrackedEntityInstanceEventFilterStore.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityInstanceEventFilterStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
index 381805bb5a..9948bbacb0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
@@ -31,7 +31,6 @@ import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractI
 import org.hisp.dhis.android.core.data.trackedentity.TrackedEntityInstanceFilterSamples
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTableInfo
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
@@ -39,7 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class TrackedEntityInstanceFilterStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<TrackedEntityInstanceFilter>(
-        create(TestDatabaseAdapterFactory.get()),
+        TrackedEntityInstanceFilterStoreImpl(TestDatabaseAdapterFactory.get()),
         TrackedEntityInstanceFilterTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
     ) {
     override fun buildObject(): TrackedEntityInstanceFilter {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostCallRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostCallRealIntegrationShould.java
index d193d594ef..61d6ea228c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostCallRealIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostCallRealIntegrationShould.java
@@ -107,11 +107,11 @@ public class TrackedEntityInstancePostCallRealIntegrationShould extends BaseReal
     public void setUp() {
         super.setUp();
 
-        trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl.create(d2.databaseAdapter());
-        enrollmentStore = EnrollmentStoreImpl.create(d2.databaseAdapter());
-        eventStore = EventStoreImpl.create(d2.databaseAdapter());
-        trackedEntityAttributeValueStore = TrackedEntityAttributeValueStoreImpl.create(d2.databaseAdapter());
-        trackedEntityDataValueStore = TrackedEntityDataValueStoreImpl.create(d2.databaseAdapter());
+        trackedEntityInstanceStore = new TrackedEntityInstanceStoreImpl(d2.databaseAdapter());
+        enrollmentStore = new EnrollmentStoreImpl(d2.databaseAdapter());
+        eventStore = new EventStoreImpl(d2.databaseAdapter());
+        trackedEntityAttributeValueStore = new TrackedEntityAttributeValueStoreImpl(d2.databaseAdapter());
+        trackedEntityDataValueStore = new TrackedEntityDataValueStoreImpl(d2.databaseAdapter());
 
         uidGenerator = new UidGeneratorImpl();
         orgUnitUid = "DiszpKrYNg8";
@@ -135,9 +135,9 @@ public void setUp() {
     }
 
     /*
-    * If you want run this test you need config the correct uids in the server side.
-    * At this moment is necessary add into the "child programme" program the category combo : Implementing Partner
-    * */
+     * If you want run this test you need config the correct uids in the server side.
+     * At this moment is necessary add into the "child programme" program the category combo : Implementing Partner
+     * */
     //@Test
     public void response_true_when_data_sync() throws Exception {
         downloadMetadata();
@@ -207,9 +207,9 @@ public void add_and_post_tei_using_repositories() throws Exception {
 
 
     /*
-    * If you want run this test you need config the correct uids in the server side.
-    * At this moment is necessary add into the "child programme" program the category combo : Implementing Partner
-    * */
+     * If you want run this test you need config the correct uids in the server side.
+     * At this moment is necessary add into the "child programme" program the category combo : Implementing Partner
+     * */
 
     //@Test
     public void pull_event_after_push_tracked_entity_instance_with_that_event() throws Exception {
@@ -290,7 +290,7 @@ public void post_more_than_one_tei() throws Exception {
 
         d2.trackedEntityModule().trackedEntityInstanceDownloader().byUid().eq(newUid1).blockingDownload();
 
-        List<TrackedEntityInstance> teiList =  d2.trackedEntityModule().trackedEntityInstances().byUid().eq(newUid1).blockingGet();
+        List<TrackedEntityInstance> teiList = d2.trackedEntityModule().trackedEntityInstances().byUid().eq(newUid1).blockingGet();
 
         assertThat(teiList.size() == 1).isTrue();
     }
@@ -315,7 +315,7 @@ public void post_teis_filtering_what_to_post() throws Exception {
 
         d2.trackedEntityModule().trackedEntityInstanceDownloader().byUid().eq(newUid1).blockingDownload();
 
-        List<TrackedEntityInstance> teiList =  d2.trackedEntityModule().trackedEntityInstances().byUid().eq(newUid1).blockingGet();
+        List<TrackedEntityInstance> teiList = d2.trackedEntityModule().trackedEntityInstances().byUid().eq(newUid1).blockingGet();
 
         assertThat(teiList.size() == 1).isTrue();
 
@@ -345,7 +345,7 @@ public void post_one_tei_and_delete_it() throws Exception {
         d2.trackedEntityModule().trackedEntityInstances().blockingUpload();
         d2.trackedEntityModule().trackedEntityInstanceDownloader().byUid().eq(newUid).blockingDownload();
 
-        List<TrackedEntityInstance> response =  d2.trackedEntityModule().trackedEntityInstances().byUid().eq(newUid).blockingGet();
+        List<TrackedEntityInstance> response = d2.trackedEntityModule().trackedEntityInstances().byUid().eq(newUid).blockingGet();
 
         assertThat(response.size()).isEqualTo(1);
 
@@ -504,7 +504,7 @@ private void createDummyDataToPost(String orgUnitUid, String programUid, String
                                        String trackedEntityUid, String coordinates, Geometry geometry,
                                        String eventUid, String enrollmentUid, String trackedEntityInstanceUid,
                                        String trackedEntityAttributeUid, String dataElementUid) {
-        
+
         Date refDate = getCurrentDateMinusTwoHoursTenMinutes();
 
         TrackedEntityInstance trackedEntityInstance = TrackedEntityInstance.builder()
@@ -573,19 +573,19 @@ private void assertPushAndDownloadTrackedEntityInstances(
     private TrackedEntityInstance getTrackedEntityInstanceFromDB(String trackedEntityInstanceUid) {
         TrackedEntityInstance trackedEntityInstance = null;
         TrackedEntityInstance storedTrackedEntityInstance = trackedEntityInstanceStore.selectByUid(trackedEntityInstanceUid);
-        if(storedTrackedEntityInstance.uid().equals(trackedEntityInstanceUid)) {
+        if (storedTrackedEntityInstance.uid().equals(trackedEntityInstanceUid)) {
             trackedEntityInstance = storedTrackedEntityInstance;
         }
         return trackedEntityInstance;
     }
 
     private Enrollment getEnrollmentsByTrackedEntityInstanceFromDb(String trackedEntityInstanceUid) {
-        EnrollmentStore enrollmentStore = EnrollmentStoreImpl.create(d2.databaseAdapter());
+        EnrollmentStore enrollmentStore = new EnrollmentStoreImpl(d2.databaseAdapter());
         Enrollment enrollment = null;
         List<Enrollment> storedEnrollments = enrollmentStore.selectWhere(new WhereClauseBuilder()
                 .appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, trackedEntityInstanceUid).build());
         for (Enrollment storedEnrollment : storedEnrollments) {
-            if(storedEnrollment.uid().equals(enrollmentUid)) {
+            if (storedEnrollment.uid().equals(enrollmentUid)) {
                 enrollment = storedEnrollment;
             }
         }
@@ -595,8 +595,8 @@ private Enrollment getEnrollmentsByTrackedEntityInstanceFromDb(String trackedEnt
     private Event getEventsFromDb(String eventUid) {
         Event event = null;
         List<Event> storedEvents = eventStore.selectAll();
-        for(Event storedEvent : storedEvents) {
-            if(storedEvent.uid().equals(eventUid)) {
+        for (Event storedEvent : storedEvents) {
+            if (storedEvent.uid().equals(eventUid)) {
                 event = storedEvent;
             }
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreIntegrationShould.java
index 9e290f2159..46d50d610f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class TrackedEntityInstanceStoreIntegrationShould extends
         IdentifiableDataObjectStoreAbstractIntegrationShould<TrackedEntityInstance> {
 
     public TrackedEntityInstanceStoreIntegrationShould() {
-        super(TrackedEntityInstanceStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityInstanceStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityInstanceTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreIntegrationShould.java
index 02ecdd57ed..5aca186e22 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreIntegrationShould.java
@@ -37,7 +37,7 @@
 public class TrackedEntityInstanceSyncStoreIntegrationShould extends ObjectWithoutUidStoreAbstractIntegrationShould<TrackedEntityInstanceSync> {
 
     public TrackedEntityInstanceSyncStoreIntegrationShould() {
-        super(TrackedEntityInstanceSyncStore.create(TestDatabaseAdapterFactory.get()), TrackedEntityInstanceSyncTableInfo.TABLE_INFO,
+        super(new TrackedEntityInstanceSyncStoreImpl(TestDatabaseAdapterFactory.get()), TrackedEntityInstanceSyncTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreIntegrationShould.java
index 511ed35eb9..fa6bb8b033 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreIntegrationShould.java
@@ -42,7 +42,7 @@ public class TrackedEntityTypeAttributeStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<TrackedEntityTypeAttribute> {
 
     public TrackedEntityTypeAttributeStoreIntegrationShould() {
-        super(TrackedEntityTypeAttributeStore.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityTypeAttributeStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityTypeAttributeTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreIntegrationShould.java
index d54dae51e7..6bce9bec4b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class TrackedEntityTypeStoreIntegrationShould
         extends IdentifiableObjectStoreAbstractIntegrationShould<TrackedEntityType> {
 
     public TrackedEntityTypeStoreIntegrationShould() {
-        super(TrackedEntityTypeStore.create(TestDatabaseAdapterFactory.get()),
+        super(new TrackedEntityTypeStoreImpl(TestDatabaseAdapterFactory.get()),
                 TrackedEntityTypeTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt
index 3e1d1e61d1..b3b4d26835 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt
@@ -29,14 +29,13 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.trackedentity.ownership.ProgramOwnerSamples
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class ProgramOwnerStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<ProgramOwner>(
-    create(TestDatabaseAdapterFactory.get()),
+    ProgramOwnerStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramOwnerTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt
index 16c3a6de4d..b710d09498 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt
@@ -29,14 +29,13 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.trackedentity.ownership.ProgramTempOwnerSamples
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class ProgramTempOwnerStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<ProgramTempOwner>(
-    create(TestDatabaseAdapterFactory.get()),
+    ProgramTempOwnerStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramTempOwnerTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
index b16e072dd9..3f6f3d3f48 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
@@ -46,7 +46,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
-    private val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl.create(databaseAdapter)
+    private val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
 
     private val calendarProvider = CalendarProviderFactory.calendarProvider
     private val periodHelper = DateFilterPeriodHelper(calendarProvider, create(calendarProvider))
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt
index d23e904e57..c34261a45f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt
@@ -29,14 +29,13 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 
 import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
 import org.hisp.dhis.android.core.data.tracker.importer.internal.TrackerJobObjectSamples
-import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObjectStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class TrackerJobObjectStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<TrackerJobObject>(
-    create(TestDatabaseAdapterFactory.get()),
+    TrackerJobObjectStoreImpl(TestDatabaseAdapterFactory.get()),
     TrackerJobObjectTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
index 88e1e9c11a..b8c1db00c9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.data.database.IdentifiableObjectStoreAbstractI
 import org.hisp.dhis.android.core.data.usecase.stock.InternalStockUseCaseSamples.get
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class StockUseCaseStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<InternalStockUseCase>(
-    create(TestDatabaseAdapterFactory.get()), StockUseCaseTableInfo.TABLE_INFO,
+    StockUseCaseStoreImpl(TestDatabaseAdapterFactory.get()), StockUseCaseTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): InternalStockUseCase {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
index 78a8e82d66..476e5cec2a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
@@ -32,7 +32,6 @@ import org.hisp.dhis.android.core.data.database.LinkStoreAbstractIntegrationShou
 import org.hisp.dhis.android.core.data.usecase.stock.InternalStockUseCaseTransactionSamples
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransactionLinkStore.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -41,7 +40,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class StockUseCaseTransactionLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<InternalStockUseCaseTransaction>(
-        create(TestDatabaseAdapterFactory.get()),
+        StockUseCaseTransactionLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         StockUseCaseTransactionTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
     ) {
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreIntegrationShould.java
index 06e3d0b6c6..14414407f2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class AuthenticatedUserStoreIntegrationShould
         extends ObjectWithoutUidStoreAbstractIntegrationShould<AuthenticatedUser> {
 
     public AuthenticatedUserStoreIntegrationShould() {
-        super(AuthenticatedUserStore.create(TestDatabaseAdapterFactory.get()), AuthenticatedUserTableInfo.TABLE_INFO,
+        super(new AuthenticatedUserStoreImpl(TestDatabaseAdapterFactory.get()), AuthenticatedUserTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreIntegrationShould.java
index 9c62bb9f23..0977f307d2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreIntegrationShould.java
@@ -40,7 +40,7 @@
 public class AuthorityStoreIntegrationShould extends ObjectStoreAbstractIntegrationShould<Authority> {
 
     public AuthorityStoreIntegrationShould() {
-        super(AuthorityStore.create(TestDatabaseAdapterFactory.get()), AuthorityTableInfo.TABLE_INFO,
+        super(new AuthorityStoreImpl(TestDatabaseAdapterFactory.get()), AuthorityTableInfo.TABLE_INFO,
                 TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
index 6199cf6628..557757f949 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
@@ -42,7 +42,7 @@ class LogoutCallRealIntegrationShould : BaseRealIntegrationTest() {
     @Before
     override fun setUp() {
         super.setUp()
-        authenticatedUserStore = AuthenticatedUserStore.create(d2.databaseAdapter())
+        authenticatedUserStore = AuthenticatedUserStoreImpl(d2.databaseAdapter())
     }
 
     // @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
index 7734da6840..6db67b4beb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
@@ -50,7 +50,7 @@ class UserCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
         internal fun setUpClass() {
             BaseMockIntegrationTestEmptyEnqueable.setUpClass()
             val userCall: Callable<User> = objects.d2DIComponent.internalModules().user.userCall
-            userStore = UserStore.create(databaseAdapter)
+            userStore = UserStoreImpl(databaseAdapter)
             dhis2MockServer.enqueueMockResponse("user/user38.json")
             userCall.call()
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
index c0ad9c3eb6..46566f3286 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.data.user.UserOrganisationUnitLinkSamples
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
-import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStoreImpl.Companion.create
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -41,7 +40,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class UserOrganisationUnitLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<UserOrganisationUnitLink>(
-    create(TestDatabaseAdapterFactory.get()),
+    UserOrganisationUnitLinkStoreImpl(TestDatabaseAdapterFactory.get()),
     UserOrganisationUnitLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     private var linkStore: UserOrganisationUnitLinkStore = store as UserOrganisationUnitLinkStore
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
index 742f2fe4ac..850e70ae6b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class UserRoleStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<UserRole>(
-    UserRoleStore.create(TestDatabaseAdapterFactory.get()),
+    UserRoleStoreImpl(TestDatabaseAdapterFactory.get()),
     UserRoleTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): UserRole {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
index 4aa6bfd69e..7346f79a21 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class UserStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<User>(
-    UserStore.create(TestDatabaseAdapterFactory.get()),
+    UserStoreImpl(TestDatabaseAdapterFactory.get()),
     UserTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): User {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
index f536fa1088..6acb8c3d9d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
@@ -31,14 +31,14 @@ import org.hisp.dhis.android.core.data.datavalue.DataValueConflictSamples
 import org.hisp.dhis.android.core.data.imports.TrackerImportConflictSamples
 import org.hisp.dhis.android.core.data.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.datastore.KeyValuePair
-import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore.create
-import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStore
+import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStoreImpl
+import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStoreImpl
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStoreImpl
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.AfterClass
 import org.junit.BeforeClass
@@ -107,7 +107,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
         }
 
         private fun storeSomeD2Errors() {
-            val d2ErrorStore = D2ErrorStore.create(databaseAdapter)
+            val d2ErrorStore = D2ErrorStoreImpl(databaseAdapter)
             d2ErrorStore.insert(D2ErrorSamples.get())
             d2ErrorStore.insert(
                 D2Error.builder()
@@ -121,7 +121,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
         }
 
         private fun storeSomeConflicts() {
-            val trackerImportConflictStore = TrackerImportConflictStoreImpl.create(databaseAdapter)
+            val trackerImportConflictStore = TrackerImportConflictStoreImpl(databaseAdapter)
             trackerImportConflictStore.insert(
                 TrackerImportConflictSamples.get().toBuilder()
                     .trackedEntityInstance(null)
@@ -142,7 +142,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                     .build()
             )
 
-            val dataValueConflictStore = DataValueConflictStore.create(databaseAdapter)
+            val dataValueConflictStore = DataValueConflictStoreImpl(databaseAdapter)
 
             dataValueConflictStore.insert(DataValueConflictSamples.get())
             dataValueConflictStore.insert(
@@ -166,9 +166,8 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
         }
 
         private fun storeSomeKeyValuesInLocalDataStore() {
-            val dataStore = create(
-                databaseAdapter
-            )
+            val dataStore = LocalDataStoreStoreImpl(databaseAdapter)
+
             dataStore.insert(
                 KeyValuePair.builder()
                     .key("key1")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreIntegrationShould.java
index 3f3fba20ae..d7891c471f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreIntegrationShould.java
@@ -41,7 +41,7 @@
 public class ValidationRuleStoreIntegrationShould extends IdentifiableObjectStoreAbstractIntegrationShould<ValidationRule> {
 
     public ValidationRuleStoreIntegrationShould() {
-        super(ValidationRuleStore.create(TestDatabaseAdapterFactory.get()),
+        super(new ValidationRuleStoreImpl(TestDatabaseAdapterFactory.get()),
                 ValidationRuleTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt
index 7bbddea0f1..4de739467d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class VisualizationDimensionItemStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<VisualizationDimensionItem>(
-        VisualizationDimensionItemStore.create(TestDatabaseAdapterFactory.get()),
+        VisualizationDimensionItemStoreImpl(TestDatabaseAdapterFactory.get()),
         VisualizationDimensionItemTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt
index 5a6254f496..dd245e8b0f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class VisualizationStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Visualization>(
-    VisualizationStore.create(TestDatabaseAdapterFactory.get()),
+    VisualizationStoreImpl(TestDatabaseAdapterFactory.get()),
     VisualizationTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
index 4a5b4257c8..b1930727c3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
@@ -37,24 +37,24 @@ import org.hisp.dhis.android.core.data.tracker.importer.internal.TrackerJobObjec
 import org.hisp.dhis.android.core.data.usecase.stock.InternalStockUseCaseSamples
 import org.hisp.dhis.android.core.data.usecase.stock.InternalStockUseCaseTransactionSamples
 import org.hisp.dhis.android.core.datastore.KeyValuePair
-import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore
+import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStoreImpl
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
-import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStore
+import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStoreImpl
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceStoreImpl
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
-import org.hisp.dhis.android.core.map.layer.internal.MapLayerImageryProviderStore
-import org.hisp.dhis.android.core.map.layer.internal.MapLayerStore
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStoreImpl
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerImageryProviderStoreImpl
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerStoreImpl
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStoreImpl
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStore
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStore
-import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObjectStore
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransactionLinkStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStoreImpl
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStoreImpl
+import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObjectStoreImpl
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStoreImpl
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransactionLinkStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -105,43 +105,43 @@ class WipeDBCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
     }
 
     private fun givenOthersInDatabase() {
-        D2ErrorStore.create(databaseAdapter).insert(
+        D2ErrorStoreImpl(databaseAdapter).insert(
             D2Error.builder()
                 .errorCode(D2ErrorCode.API_RESPONSE_PROCESS_ERROR)
                 .errorDescription("Sample error")
                 .build()
         )
-        TrackerImportConflictStoreImpl.create(databaseAdapter).insert(TrackerImportConflict.builder().build())
-        FileResourceStoreImpl.create(databaseAdapter).insert(FileResource.builder().uid("uid").build())
-        TrackerJobObjectStore.create(databaseAdapter).insert(TrackerJobObjectSamples.get1())
-        DataValueConflictStore.create(databaseAdapter).insert(DataValueConflict.builder().build())
-        LocalDataStoreStore.create(databaseAdapter).insert(
+        TrackerImportConflictStoreImpl(databaseAdapter).insert(TrackerImportConflict.builder().build())
+        FileResourceStoreImpl(databaseAdapter).insert(FileResource.builder().uid("uid").build())
+        TrackerJobObjectStoreImpl(databaseAdapter).insert(TrackerJobObjectSamples.get1())
+        DataValueConflictStoreImpl(databaseAdapter).insert(DataValueConflict.builder().build())
+        LocalDataStoreStoreImpl(databaseAdapter).insert(
             KeyValuePair.builder()
                 .key("key1")
                 .value("value1")
                 .build()
         )
-        LocalDataStoreStore.create(databaseAdapter).insert(
+        LocalDataStoreStoreImpl(databaseAdapter).insert(
             KeyValuePair.builder()
                 .key("key2")
                 .value("value2")
                 .build()
         )
-        ProgramTempOwnerStore.create(databaseAdapter).insert(ProgramTempOwnerSamples.programTempOwner)
+        ProgramTempOwnerStoreImpl(databaseAdapter).insert(ProgramTempOwnerSamples.programTempOwner)
 
-        SMSConfigStoreImpl.create(databaseAdapter).insert(KeyValuePairSamples.keyValuePairSample)
-        SMSOngoingSubmissionStore.create(databaseAdapter).insert(SMSOngoingSubmissionSample.get)
+        SMSConfigStoreImpl(databaseAdapter).insert(KeyValuePairSamples.keyValuePairSample)
+        SMSOngoingSubmissionStoreImpl(databaseAdapter).insert(SMSOngoingSubmissionSample.get)
 
-        StockUseCaseStore.create(databaseAdapter).insert(
+        StockUseCaseStoreImpl(databaseAdapter).insert(
             InternalStockUseCaseSamples.get()
                 .toBuilder().uid("lxAQ7Zs9VYR").build()
         )
-        StockUseCaseTransactionLinkStore.create(databaseAdapter).insert(
+        StockUseCaseTransactionLinkStoreImpl(databaseAdapter).insert(
             InternalStockUseCaseTransactionSamples.get()
                 .toBuilder().programUid("lxAQ7Zs9VYR").build()
         )
 
-        MapLayerStore.create(databaseAdapter).insert(MapLayerSamples.get())
-        MapLayerImageryProviderStore.create(databaseAdapter).insert(MapLayerImageryProviderSamples.get())
+        MapLayerStoreImpl(databaseAdapter).insert(MapLayerSamples.get())
+        MapLayerImageryProviderStoreImpl(databaseAdapter).insert(MapLayerImageryProviderSamples.get())
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
index 699494830c..a7466a4d4c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
@@ -75,7 +75,7 @@ class WipeDBCallRealIntegrationShould : BaseRealIntegrationTest() {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
         d2.trackedEntityModule().trackedEntityInstanceDownloader().limit(5).blockingDownload()
-        val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl.create(d2.databaseAdapter())
+        val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl(d2.databaseAdapter())
         var hasTrackedEntities = trackedEntityInstanceStore.count() > 0
         assertThat(hasTrackedEntities).isTrue()
         d2.wipeModule().wipeData()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
index f495eb5ce8..ec2b80f57e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
@@ -31,23 +31,23 @@ import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.D2DIComponentAccessor
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
-import org.hisp.dhis.android.core.category.internal.CategoryComboStore
+import org.hisp.dhis.android.core.category.internal.CategoryComboStoreImpl
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStoreImpl
 import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
-import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStoreImpl
+import org.hisp.dhis.android.core.datavalue.internal.DataValueStoreImpl
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl
 import org.hisp.dhis.android.core.event.internal.EventStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore
-import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.program.internal.ProgramStageStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
@@ -78,29 +78,29 @@ internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
         val generator = LocalAnalyticsMetadataGenerator(metadataParams)
 
         val organisationUnits = generator.getOrganisationUnits()
-        OrganisationUnitStore.create(da).insert(organisationUnits)
+        OrganisationUnitStoreImpl(da).insert(organisationUnits)
 
         val categoryCombos = generator.getCategoryCombos()
-        CategoryComboStore.create(da).insert(categoryCombos)
+        CategoryComboStoreImpl(da).insert(categoryCombos)
 
         val categoryOptionCombos = generator.getCategoryOptionCombos(categoryCombos)
-        CategoryOptionComboStoreImpl.create(da).insert(categoryOptionCombos)
+        CategoryOptionComboStoreImpl(da).insert(categoryOptionCombos)
 
         val defaultCategoryCombo = categoryCombos.first()
         val aggregatedDataElements = generator.getDataElementsAggregated(categoryCombos)
         val trackerDataElements = generator.getDataElementsTracker(defaultCategoryCombo)
-        DataElementStore.create(da).insert(aggregatedDataElements + trackerDataElements)
+        DataElementStoreImpl(da).insert(aggregatedDataElements + trackerDataElements)
 
         d2DIComponent.periodHandler().generateAndPersist()
 
         val programs = generator.getPrograms(defaultCategoryCombo)
-        ProgramStore.create(da).insert(programs)
+        ProgramStoreImpl(da).insert(programs)
 
         val programStages = generator.getProgramStages(programs)
-        ProgramStageStore.create(da).insert(programStages)
+        ProgramStageStoreImpl(da).insert(programStages)
 
         val trackedEntityAttributes = generator.getTrackedEntityAttributes()
-        TrackedEntityAttributeStore.create(da).insert(trackedEntityAttributes)
+        TrackedEntityAttributeStoreImpl(da).insert(trackedEntityAttributes)
 
         val periods = d2.periodModule().periods().byPeriodType().eq(PeriodType.Daily).blockingGet()
 
@@ -114,23 +114,23 @@ internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
         val generator = LocalAnalyticsDataGenerator(dataParams)
 
         val dv = generator.generateDataValues(metadata)
-        DataValueStore.create(da).insert(dv)
+        DataValueStoreImpl(da).insert(dv)
 
         val teis = generator.generateTrackedEntityInstances(metadata.organisationUnits)
-        TrackedEntityInstanceStoreImpl.create(da).insert(teis)
+        TrackedEntityInstanceStoreImpl(da).insert(teis)
 
         val enrollments = generator.generateEnrollments(teis, metadata.programs.first())
-        EnrollmentStoreImpl.create(da).insert(enrollments)
+        EnrollmentStoreImpl(da).insert(enrollments)
 
         val events = generator.generateEventsWithoutRegistration(metadata) +
             generator.generateEventsRegistration(metadata, enrollments)
-        EventStoreImpl.create(da).insert(events)
+        EventStoreImpl(da).insert(events)
 
-        TrackedEntityAttributeValueStoreImpl.create(da).insert(
+        TrackedEntityAttributeValueStoreImpl(da).insert(
             generator.generateTrackedEntityAttributeValues(metadata.trackedEntityAttributes, teis)
         )
 
-        TrackedEntityDataValueStoreImpl.create(da).insert(
+        TrackedEntityDataValueStoreImpl(da).insert(
             generator.generateTrackedEntityDataValues(metadata.trackerDataElements, events)
         )
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
index 02e02416d3..2c9eb94deb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
@@ -79,7 +79,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
             .value("new_namespace", "new_key")
         repository.blockingSet("value")
 
-        DataStoreEntryStoreImpl.create(databaseAdapter)
+        DataStoreEntryStoreImpl(databaseAdapter)
             .updateWhere(repository.blockingGet().toBuilder().syncState(State.ERROR).build())
 
         assertThat(repository.blockingExists()).isTrue()
@@ -90,7 +90,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         assertThat(repository.blockingGet().deleted()).isTrue()
         assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
 
-        DataStoreEntryStoreImpl.create(databaseAdapter)
+        DataStoreEntryStoreImpl(databaseAdapter)
             .deleteWhere(repository.blockingGet())
     }
 
@@ -100,7 +100,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
             .value("new_namespace", "new_key")
         repository.blockingSet("value")
 
-        DataStoreEntryStoreImpl.create(databaseAdapter)
+        DataStoreEntryStoreImpl(databaseAdapter)
             .updateWhere(repository.blockingGet().toBuilder().syncState(State.TO_UPDATE).build())
 
         repository.blockingDelete()
@@ -112,7 +112,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         assertThat(repository.blockingGet().deleted()).isFalse()
         assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
 
-        DataStoreEntryStoreImpl.create(databaseAdapter)
+        DataStoreEntryStoreImpl(databaseAdapter)
             .deleteWhere(repository.blockingGet())
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
index 8407dad71c..229d7a9fd9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.testapp.datavalue
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValueObjectRepository
-import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
+import org.hisp.dhis.android.core.datavalue.internal.DataValueStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -85,7 +85,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
     fun set_state_to_delete_if_state_is_not_to_post() {
         val repository = objectRepository()
         repository.blockingSet("value")
-        DataValueStore.create(databaseAdapter).setState(repository.blockingGet(), State.ERROR)
+        DataValueStoreImpl(databaseAdapter).setState(repository.blockingGet(), State.ERROR)
 
         assertThat(repository.blockingExists()).isTrue()
         assertThat(repository.blockingGet().syncState()).isEqualTo(State.ERROR)
@@ -100,7 +100,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
     fun set_not_deleted_when_updating_deleted_value() {
         val repository = objectRepository()
         repository.blockingSet("value")
-        DataValueStore.create(databaseAdapter).setState(repository.blockingGet(), State.TO_UPDATE)
+        DataValueStoreImpl(databaseAdapter).setState(repository.blockingGet(), State.TO_UPDATE)
         repository.blockingDelete()
 
         assertThat(repository.blockingGet().deleted()).isTrue()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentObjectRepositoryMockIntegrationShould.java
index d52de20de0..5d2109a379 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentObjectRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentObjectRepositoryMockIntegrationShould.java
@@ -36,7 +36,7 @@
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
 import org.junit.Test;
@@ -53,7 +53,7 @@ public class EnrollmentObjectRepositoryMockIntegrationShould extends BaseMockInt
     @Test
     public void update_organisation_unit() throws D2Error {
         String orgUnitUid = "new_org_unit";
-        OrganisationUnitStore.create(databaseAdapter).insert(OrganisationUnit.builder().uid(orgUnitUid).build());
+        new OrganisationUnitStoreImpl(databaseAdapter).insert(OrganisationUnit.builder().uid(orgUnitUid).build());
 
         EnrollmentObjectRepository repository = objectRepository();
 
@@ -61,7 +61,7 @@ public void update_organisation_unit() throws D2Error {
         assertThat(repository.blockingGet().organisationUnit()).isEqualTo(orgUnitUid);
 
         repository.blockingDelete();
-        OrganisationUnitStore.create(databaseAdapter).delete(orgUnitUid);
+        new OrganisationUnitStoreImpl(databaseAdapter).delete(orgUnitUid);
     }
 
     @Test(expected = D2Error.class)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventObjectRepositoryMockIntegrationShould.java
index 40bc9da73d..74aec60100 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventObjectRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventObjectRepositoryMockIntegrationShould.java
@@ -38,7 +38,7 @@
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
 import org.junit.Test;
@@ -55,7 +55,7 @@ public class EventObjectRepositoryMockIntegrationShould extends BaseMockIntegrat
     @Test
     public void update_organisation_unit() throws D2Error {
         String orgUnitUid = "new_org_unit";
-        OrganisationUnitStore.create(databaseAdapter).insert(OrganisationUnit.builder().uid(orgUnitUid).build());
+        new OrganisationUnitStoreImpl(databaseAdapter).insert(OrganisationUnit.builder().uid(orgUnitUid).build());
 
         EventObjectRepository repository = objectRepository();
 
@@ -63,7 +63,7 @@ public void update_organisation_unit() throws D2Error {
         assertThat(repository.blockingGet().organisationUnit()).isEqualTo(orgUnitUid);
 
         repository.blockingDelete();
-        OrganisationUnitStore.create(databaseAdapter).delete(orgUnitUid);
+        new OrganisationUnitStoreImpl(databaseAdapter).delete(orgUnitUid);
     }
 
     @Test(expected = D2Error.class)
@@ -189,7 +189,7 @@ public void update_invalid_geometry() throws D2Error {
     @Test
     public void update_attribute_option_combo() throws D2Error {
         String attributeOptionCombo = "new_att_opt_comb";
-        CategoryOptionComboStoreImpl.create(databaseAdapter)
+        new CategoryOptionComboStoreImpl(databaseAdapter)
                 .insert(CategoryOptionCombo.builder().uid(attributeOptionCombo).build());
 
         EventObjectRepository repository = objectRepository();
@@ -198,7 +198,7 @@ public void update_attribute_option_combo() throws D2Error {
         assertThat(repository.blockingGet().attributeOptionCombo()).isEqualTo(attributeOptionCombo);
 
         repository.delete();
-        CategoryOptionComboStoreImpl.create(databaseAdapter).delete(attributeOptionCombo);
+        new CategoryOptionComboStoreImpl(databaseAdapter).delete(attributeOptionCombo);
     }
 
     @Test(expected = D2Error.class)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
index 201f0fd85b..1afc2f792d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
@@ -66,7 +66,7 @@ class FileResourceAddMockIntegrationShould : BaseMockIntegrationTestEmptyDispatc
         assertThat(savedFile.exists()).isTrue()
 
         savedFile.delete()
-        FileResourceStoreImpl.create(databaseAdapter).delete(fileResource.uid()!!)
+        FileResourceStoreImpl(databaseAdapter).delete(fileResource.uid()!!)
     }
 
     private fun storeFile(): File {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceObjectRepositoryMockIntegrationShould.java
index 352e12365b..9836334b86 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceObjectRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceObjectRepositoryMockIntegrationShould.java
@@ -33,7 +33,7 @@
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceObjectRepository;
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
@@ -50,7 +50,7 @@ public class TrackedEntityInstanceObjectRepositoryMockIntegrationShould extends
     @Test
     public void update_organisation_unit() throws D2Error {
         String orgUnitUid = "new_org_unit";
-        OrganisationUnitStore.create(databaseAdapter).insert(OrganisationUnit.builder().uid(orgUnitUid).build());
+        new OrganisationUnitStoreImpl(databaseAdapter).insert(OrganisationUnit.builder().uid(orgUnitUid).build());
 
         TrackedEntityInstanceObjectRepository repository = objectRepository();
 
@@ -58,7 +58,7 @@ public void update_organisation_unit() throws D2Error {
         assertThat(repository.blockingGet().organisationUnit()).isEqualTo(orgUnitUid);
 
         repository.blockingDelete();
-        OrganisationUnitStore.create(databaseAdapter).delete(orgUnitUid);
+        new OrganisationUnitStoreImpl(databaseAdapter).delete(orgUnitUid);
     }
 
     @Test(expected = D2Error.class)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityOnlineQueryCollectionRepositoryBaseIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityOnlineQueryCollectionRepositoryBaseIntegrationShould.kt
index c6151f630f..4eeebc8996 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityOnlineQueryCollectionRepositoryBaseIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityOnlineQueryCollectionRepositoryBaseIntegrationShould.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.testapp.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStoreImpl
 import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.tracker.TrackerImporterVersion
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestMetadataEnqueable
@@ -50,7 +50,7 @@ abstract class TrackedEntityOnlineQueryCollectionRepositoryBaseIntegrationShould
     abstract val responseFile: String
 
     private lateinit var initSyncParams: SynchronizationSettings
-    private val syncStore = SynchronizationSettingStore.create(databaseAdapter)
+    private val syncStore = SynchronizationSettingStoreImpl(databaseAdapter)
 
     @Before
     fun setUp() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
index 086b64afe8..81726a22cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
@@ -30,18 +30,21 @@ package org.hisp.dhis.android.core.analytics.aggregated.internal
 
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.*
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 
 internal class AnalyticsOrganisationUnitHelper @Inject constructor(
     private val userOrganisationUnitStore: UserOrganisationUnitLinkStore,
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>,
-    private val organisationUnitLevelStore: IdentifiableObjectStore<OrganisationUnitLevel>,
-    private val organisationUnitOrganisationUnitGroupLinkStore: LinkStore<OrganisationUnitOrganisationUnitGroupLink>
+    private val organisationUnitStore: OrganisationUnitStore,
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore,
+    private val organisationUnitOrganisationUnitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore
 ) {
 
     fun getRelativeOrganisationUnitUids(relative: RelativeOrganisationUnit): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
index 170fa7e789..18406ecdeb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
@@ -28,43 +28,42 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
+import org.hisp.dhis.android.core.category.internal.CategoryStore
 import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
-import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
-import org.hisp.dhis.android.core.indicator.Indicator
-import org.hisp.dhis.android.core.legendset.Legend
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
+import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
+import org.hisp.dhis.android.core.legendset.internal.LegendStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import javax.inject.Inject
 
 @Suppress("LongParameterList")
 internal class AnalyticsServiceMetadataHelper @Inject constructor(
-    private val categoryStore: IdentifiableObjectStore<Category>,
-    private val categoryOptionStore: IdentifiableObjectStore<CategoryOption>,
+    private val categoryStore: CategoryStore,
+    private val categoryOptionStore: CategoryOptionStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
-    private val indicatorStore: IdentifiableObjectStore<Indicator>,
-    private val expressionDimensionItemStore: IdentifiableObjectStore<ExpressionDimensionItem>,
-    private val legendStore: IdentifiableObjectStore<Legend>,
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>,
-    private val organisationUnitGroupStore: IdentifiableObjectStore<OrganisationUnitGroup>,
-    private val organisationUnitLevelStore: IdentifiableObjectStore<OrganisationUnitLevel>,
-    private val programStore: ProgramStoreInterface,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    private val dataElementStore: DataElementStore,
+    private val indicatorStore: IndicatorStore,
+    private val expressionDimensionItemStore: ExpressionDimensionItemStore,
+    private val legendStore: LegendStore,
+    private val organisationUnitStore: OrganisationUnitStore,
+    private val organisationUnitGroupStore: OrganisationUnitGroupStore,
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore,
+    private val programStore: ProgramStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     private val analyticsOrganisationUnitHelper: AnalyticsOrganisationUnitHelper,
     private val parentPeriodGenerator: ParentPeriodGenerator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
index 3c05e8b68f..03a17ca4c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
@@ -34,24 +34,22 @@ import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.GridDimension
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
+import org.hisp.dhis.android.core.category.internal.CategoryCategoryOptionLinkStore
+import org.hisp.dhis.android.core.category.internal.CategoryStore
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit.*
 import org.hisp.dhis.android.core.common.RelativePeriod
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
 import org.hisp.dhis.android.core.visualization.DataDimensionItemType
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
 
 internal class AnalyticsVisualizationsServiceDimensionHelper @Inject constructor(
-    private val categoryStore: IdentifiableObjectStore<Category>,
-    private val categoryOptionLinkStore: LinkStore<CategoryCategoryOptionLink>,
-    private val organisationUnitLevelStore: IdentifiableObjectStore<OrganisationUnitLevel>
+    private val categoryStore: CategoryStore,
+    private val categoryOptionLinkStore: CategoryCategoryOptionLinkStore,
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore
 ) {
     private val dataDimension = "dx"
     private val orgUnitDimension = "ou"
@@ -87,27 +85,34 @@ internal class AnalyticsVisualizationsServiceDimensionHelper @Inject constructor
             when (dataType) {
                 DataDimensionItemType.INDICATOR ->
                     item.dimensionItem()?.let { DimensionItem.DataItem.IndicatorItem(it) }
+
                 DataDimensionItemType.DATA_ELEMENT ->
                     item.dimensionItem()?.let { DimensionItem.DataItem.DataElementItem(it) }
+
                 DataDimensionItemType.DATA_ELEMENT_OPERAND ->
                     item.dimensionItem()?.let {
                         val (dataElement, coc) = composedUidOperandRegex.find(it)!!.destructured
                         DimensionItem.DataItem.DataElementOperandItem(dataElement, coc)
                     }
+
                 DataDimensionItemType.PROGRAM_INDICATOR ->
                     item.dimensionItem()?.let { DimensionItem.DataItem.ProgramIndicatorItem(it) }
+
                 DataDimensionItemType.PROGRAM_DATA_ELEMENT ->
                     item.dimensionItem()?.let {
                         val (program, dataElement) = composedUidOperandRegex.find(it)!!.destructured
                         DimensionItem.DataItem.EventDataItem.DataElement(program, dataElement)
                     }
+
                 DataDimensionItemType.PROGRAM_ATTRIBUTE ->
                     item.dimensionItem()?.let {
                         val (program, attribute) = composedUidOperandRegex.find(it)!!.destructured
                         DimensionItem.DataItem.EventDataItem.Attribute(program, attribute)
                     }
+
                 DataDimensionItemType.EXPRESSION_DIMENSION_ITEM ->
                     item.dimensionItem()?.let { DimensionItem.DataItem.ExpressionDimensionItem(it) }
+
                 else ->
                     null
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
index 35f7af6060..b3fb2c3f9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
@@ -34,28 +34,28 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.DataEl
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.EventDataItemSQLEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ProgramIndicatorSQLEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine.IndicatorContext
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.constant.internal.ConstantStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitorScope
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItemMethod
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 
 internal class AnalyticExpressionEngineFactory @Inject constructor(
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    private val dataElementStore: DataElementStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
-    private val programStore: ProgramStoreInterface,
+    private val programStore: ProgramStore,
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     private val dataElementEvaluator: DataElementSQLEvaluator,
     private val programIndicatorEvaluator: ProgramIndicatorSQLEvaluator,
     private val eventDataItemEvaluator: EventDataItemSQLEvaluator,
-    private val constantStore: IdentifiableObjectStore<Constant>
+    private val constantStore: ConstantStore
 ) {
 
     fun getEngine(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
index 34ff3619f4..0332659a91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
@@ -35,14 +35,14 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 
 internal data class IndicatorContext(
     val dataElementStore: IdentifiableObjectStore<DataElement>,
     val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
     val categoryOptionComboStore: CategoryOptionComboStore,
-    val programStore: ProgramStoreInterface,
+    val programStore: ProgramStore,
     val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     val dataElementEvaluator: AnalyticsEvaluator,
     val programIndicatorEvaluator: AnalyticsEvaluator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
index 2d5dc7a02f..e50f3a15fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
@@ -27,19 +27,18 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionParserUtils
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.indicator.Indicator
-import org.hisp.dhis.android.core.indicator.IndicatorType
+import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
+import javax.inject.Inject
 
 internal class IndicatorEngine @Inject constructor(
-    private val indicatorTypeStore: IdentifiableObjectStore<IndicatorType>,
+    private val indicatorTypeStore: IndicatorTypeStore,
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
     private val expressionService: ExpressionService
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
index be9595469c..2768160fbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
@@ -27,19 +27,18 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionParserUtils
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.indicator.Indicator
-import org.hisp.dhis.android.core.indicator.IndicatorType
+import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
+import javax.inject.Inject
 
 internal class IndicatorSQLEngine @Inject constructor(
-    private val indicatorTypeStore: IdentifiableObjectStore<IndicatorType>,
+    private val indicatorTypeStore: IndicatorTypeStore,
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
     private val databaseAdapter: DatabaseAdapter
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
index 5a58f84ec5..5aa9e93fd2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
@@ -30,11 +30,11 @@
 
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStoreImpl;
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher;
 
 import java.io.IOException;
@@ -50,12 +50,12 @@
 @Reusable
 public final class APICallExecutorImpl implements APICallExecutor {
 
-    private final ObjectStore<D2Error> errorStore;
+    private final D2ErrorStore errorStore;
     private final UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher;
     private final APIErrorMapper errorMapper = new APIErrorMapper();
 
     @Inject
-    public APICallExecutorImpl(ObjectStore<D2Error> errorStore,
+    public APICallExecutorImpl(D2ErrorStore errorStore,
                                UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher) {
         this.errorStore = errorStore;
         this.userAccountDisabledErrorCatcher = userAccountDisabledErrorCatcher;
@@ -145,6 +145,6 @@ private <P> D2Error.Builder errorBuilder(Call<P> call) {
 
     public static APICallExecutor create(DatabaseAdapter databaseAdapter,
                                          UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher) {
-        return new APICallExecutorImpl(D2ErrorStore.create(databaseAdapter), userAccountDisabledErrorCatcher);
+        return new APICallExecutorImpl(new D2ErrorStoreImpl(databaseAdapter), userAccountDisabledErrorCatcher);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
index 280fc55c20..7b3aa25500 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
@@ -32,10 +32,10 @@ import javax.inject.Inject
 import kotlinx.coroutines.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
 import retrofit2.HttpException
@@ -45,7 +45,7 @@ import retrofit2.Response
 internal class CoroutineAPICallExecutorImpl @Inject constructor(
     private val errorMapper: APIErrorMapper,
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher,
-    private val errorStore: ObjectStore<D2Error>,
+    private val errorStore: D2ErrorStore,
     private val databaseAdapter: DatabaseAdapter,
     private val foreignKeyCleaner: ForeignKeyCleaner,
 ) : CoroutineAPICallExecutor {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
index 2b0ad70ff9..025c50b609 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
@@ -34,15 +34,15 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
 
 @Reusable
 internal class RxAPICallExecutorImpl @Inject constructor(
     private val databaseAdapter: DatabaseAdapter,
-    private val errorStore: ObjectStore<D2Error>,
+    private val errorStore: D2ErrorStore,
     private val errorMapper: APIErrorMapper,
     private val foreignKeyCleaner: ForeignKeyCleaner,
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java
index 96180e75b6..d2812ee404 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java
@@ -32,11 +32,11 @@
 
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
 import org.hisp.dhis.android.core.arch.db.access.Transaction;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStoreImpl;
 
 import java.util.concurrent.Callable;
 
@@ -53,10 +53,10 @@ public final class D2CallExecutor {
             .errorComponent(D2ErrorComponent.SDK);
 
     private final DatabaseAdapter databaseAdapter;
-    private final ObjectStore<D2Error> errorStore;
+    private final D2ErrorStore errorStore;
 
     @Inject
-    public D2CallExecutor(DatabaseAdapter databaseAdapter, ObjectStore<D2Error> errorStore) {
+    public D2CallExecutor(DatabaseAdapter databaseAdapter, D2ErrorStore errorStore) {
         this.databaseAdapter = databaseAdapter;
         this.errorStore = errorStore;
     }
@@ -103,6 +103,6 @@ private <C> C innerExecuteD2CallTransactionally(Callable<C> call) throws D2Error
     }
 
     public static D2CallExecutor create(DatabaseAdapter databaseAdapter) {
-        return new D2CallExecutor(databaseAdapter, D2ErrorStore.create(databaseAdapter));
+        return new D2CallExecutor(databaseAdapter, new D2ErrorStoreImpl(databaseAdapter));
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.kt
index 8e176a5d68..dde48b3280 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleaner.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.cleaners.internal
 
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal interface CollectionCleaner<P : ObjectWithUidInterface> {
+interface CollectionCleaner<P : ObjectWithUidInterface> {
     fun deleteNotPresent(objects: Collection<P>?): Boolean
     fun deleteNotPresentByUid(uids: Collection<String>): Boolean
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleaner.kt
index cebfaa0a23..a21d109ca1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleaner.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.cleaners.internal
 
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal interface LinkCleaner<P : ObjectWithUidInterface> {
+interface LinkCleaner<P : ObjectWithUidInterface> {
     fun deleteNotPresent(objects: Collection<P>?): Boolean
     fun deleteNotPresentInDb(): Boolean
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.kt
index b0ba93c8a8..d560fb7767 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleaner.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.cleaners.internal
 
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal interface OrphanCleaner<P : ObjectWithUidInterface, C : ObjectWithUidInterface> {
+interface OrphanCleaner<P : ObjectWithUidInterface, C : ObjectWithUidInterface> {
 
     @JvmSuppressWildcards
     fun deleteOrphan(parent: P?, children: Collection<C>?): Boolean
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.kt
index 53afd99fdb..dbbe4e3570 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/ParentOrphanCleaner.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.cleaners.internal
 
 import org.hisp.dhis.android.core.common.IdentifiableObject
 
-internal interface ParentOrphanCleaner<P : IdentifiableObject> {
+interface ParentOrphanCleaner<P : IdentifiableObject> {
     fun deleteOrphan(parent: P?)
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleaner.kt
index 276d2dd3ff..c24f294f40 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleaner.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.cleaners.internal
 
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal interface SubCollectionCleaner<P : ObjectWithUidInterface> {
+interface SubCollectionCleaner<P : ObjectWithUidInterface> {
 
     @JvmSuppressWildcards
     fun deleteNotPresent(objects: Collection<P>?): Boolean
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index aa72263fdf..08c8afbffe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -38,13 +38,11 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseDIModule
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.json.internal.JSONSerializationDIModule
 import org.hisp.dhis.android.core.arch.repositories.di.internal.RepositoriesDIModule
 import org.hisp.dhis.android.core.arch.storage.internal.*
 import org.hisp.dhis.android.core.attribute.internal.AttributePackageDIModule
-import org.hisp.dhis.android.core.category.CategoryOption
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.category.internal.CategoryPackageDIModule
 import org.hisp.dhis.android.core.common.internal.CommonPackageDIModule
 import org.hisp.dhis.android.core.configuration.internal.ConfigurationPackageDIModule
@@ -56,7 +54,7 @@ import org.hisp.dhis.android.core.dataelement.internal.DataElementPackageDIModul
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.internal.DataSetPackageDIModule
 import org.hisp.dhis.android.core.datastore.internal.DataStorePackageDIModule
-import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictDIModule
+import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictEntityDIModule
 import org.hisp.dhis.android.core.datavalue.internal.DataValuePackageDIModule
 import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataPackageDIModule
 import org.hisp.dhis.android.core.domain.aggregated.internal.AggregatedModuleImpl
@@ -80,16 +78,16 @@ import org.hisp.dhis.android.core.period.internal.PeriodPackageDIModule
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.internal.ProgramPackageDIModule
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListPackageDIModule
-import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.relationship.internal.RelationshipPackageDIModule
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeHandler
 import org.hisp.dhis.android.core.resource.internal.ResourcePackageDIModule
 import org.hisp.dhis.android.core.settings.internal.SettingPackageDIModule
 import org.hisp.dhis.android.core.sms.internal.SmsDIModule
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoPackageDIModule
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityPackageDIModule
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.internal.OldTrackerImporterPayloadGenerator
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeLegendSetDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeHandler
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterPackageDIModule
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterPackageDIModule
 import org.hisp.dhis.android.core.tracker.importer.internal.interpreters.InterpreterSelector
@@ -150,7 +148,7 @@ import retrofit2.Retrofit
         UserPackageDIModule::class,
         ValidationPackageDIModule::class,
         VisualizationPackageDIModule::class,
-        DataValueConflictDIModule::class,
+        DataValueConflictEntityDIModule::class,
         MapPackageDIModule::class,
         ProgramStageWorkingListPackageDIModule::class
     ]
@@ -189,16 +187,16 @@ internal interface D2DIComponent {
     fun dataSetCallFactory(): UidsCallFactory<DataSet>
 
     @VisibleForTesting
-    fun relationshipTypeHandler(): Handler<RelationshipType>
+    fun relationshipTypeHandler(): RelationshipTypeHandler
 
     @VisibleForTesting
-    fun trackedEntityTypeHandler(): Handler<TrackedEntityType>
+    fun trackedEntityTypeHandler(): TrackedEntityTypeHandler
 
     @VisibleForTesting
     fun oldTrackerImporterPayloadGenerator(): OldTrackerImporterPayloadGenerator
 
     @VisibleForTesting
-    fun categoryOptionStore(): IdentifiableObjectStore<CategoryOption>
+    fun categoryOptionStore(): CategoryOptionStore
 
     @VisibleForTesting
     fun periodHandler(): PeriodHandler
@@ -243,7 +241,7 @@ internal interface D2DIComponent {
         fun userPackageDIModule(userPackageDIModule: UserPackageDIModule): Builder
         fun validationPackageDIModule(validationPackageDIModule: ValidationPackageDIModule): Builder
         fun visualizationPackageDIModule(visualizationPackageDIModule: VisualizationPackageDIModule): Builder
-        fun dataValueConflictDIModule(dataValueConflictDIModule: DataValueConflictDIModule): Builder
+        fun dataValueConflictDIModule(dataValueConflictDIModule: DataValueConflictEntityDIModule): Builder
         fun build(): D2DIComponent
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
index 3cf2e6e9aa..1549e8d462 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
@@ -34,14 +34,18 @@ import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.DatabaseImportExport
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
-import org.hisp.dhis.android.core.configuration.internal.*
+import org.hisp.dhis.android.core.configuration.internal.DatabaseConfigurationHelper
+import org.hisp.dhis.android.core.configuration.internal.DatabaseConfigurationInsecureStore
+import org.hisp.dhis.android.core.configuration.internal.DatabaseNameGenerator
+import org.hisp.dhis.android.core.configuration.internal.DatabaseRenamer
+import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
+import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
-import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStore
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStoreImpl
 import org.hisp.dhis.android.core.user.UserModule
-import org.hisp.dhis.android.core.user.internal.UserStore
+import org.hisp.dhis.android.core.user.internal.UserStoreImpl
 
 @Reusable
 internal class DatabaseImportExportImpl @Inject constructor(
@@ -50,7 +54,7 @@ internal class DatabaseImportExportImpl @Inject constructor(
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
     private val userModule: UserModule,
     private val credentialsStore: CredentialsSecureStore,
-    private val databaseConfigurationSecureStore: ObjectKeyValueStore<DatabasesConfiguration>,
+    private val databaseConfigurationSecureStore: DatabaseConfigurationInsecureStore,
     private val databaseRenamer: DatabaseRenamer,
     private val databaseAdapter: DatabaseAdapter
 ) : DatabaseImportExport {
@@ -88,10 +92,10 @@ internal class DatabaseImportExportImpl @Inject constructor(
                     .build()
             }
 
-            val userStore = UserStore.create(databaseAdapter)
+            val userStore = UserStoreImpl(databaseAdapter)
             val username = userStore.selectFirst()!!.username()
 
-            val systemInfoStore = SystemInfoStore.create(databaseAdapter)
+            val systemInfoStore = SystemInfoStoreImpl(databaseAdapter)
             val contextPath = systemInfoStore.selectFirst()!!.contextPath()!!
             val serverUrl = ServerUrlParser.parse(contextPath).toString()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderImpl.java
index bc1a2d1cbd..5e3f6e9c59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/querybuilders/internal/SQLStatementBuilderImpl.java
@@ -64,10 +64,6 @@ public SQLStatementBuilderImpl(String tableName, String[] columns, String[] upda
         this(tableName, columns, updateWhereColumns, false);
     }
 
-    public SQLStatementBuilderImpl(String tableName, CoreColumns columns) {
-        this(tableName, columns.all().clone(), columns.whereUpdate().clone(), false);
-    }
-
     public SQLStatementBuilderImpl(TableInfo tableInfo) {
         this(tableInfo.name(), tableInfo.columns().all().clone(), tableInfo.columns().whereUpdate().clone(),
                 tableInfo.hasSortOrder());
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt
index d6191d2703..1d50daa6bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt
@@ -31,11 +31,17 @@ import android.content.ContentValues
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper
-import org.hisp.dhis.android.core.common.*
+import org.hisp.dhis.android.core.common.DataColumns
+import org.hisp.dhis.android.core.common.DataObject
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.State
 
 internal open class IdentifiableDataObjectStoreImpl<O>(
     databaseAdapter: DatabaseAdapter,
@@ -45,6 +51,18 @@ internal open class IdentifiableDataObjectStoreImpl<O>(
 ) : IdentifiableObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory),
     IdentifiableDataObjectStore<O> where O : ObjectWithUidInterface, O : DataObject {
 
+    constructor(
+        databaseAdapter: DatabaseAdapter,
+        tableInfo: TableInfo,
+        binder: StatementBinder<O>,
+        objectFactory: (Cursor) -> O
+    ) : this(
+        databaseAdapter,
+        SQLStatementBuilderImpl(tableInfo),
+        binder,
+        objectFactory
+    )
+
     private var selectStateQuery: String? = null
     private var existsQuery: String? = null
     private var setStateStatement: StatementWrapper? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt
index 1d2a4f6853..1e68f737ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt
@@ -30,11 +30,18 @@ package org.hisp.dhis.android.core.arch.db.stores.internal
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.common.*
+import org.hisp.dhis.android.core.common.DataColumns
+import org.hisp.dhis.android.core.common.DeletableDataColumns
+import org.hisp.dhis.android.core.common.DeletableDataObject
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.State
 
 internal open class IdentifiableDeletableDataObjectStoreImpl<O>(
     databaseAdapter: DatabaseAdapter,
@@ -44,6 +51,18 @@ internal open class IdentifiableDeletableDataObjectStoreImpl<O>(
 ) : IdentifiableDataObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory),
     IdentifiableDeletableDataObjectStore<O> where O : ObjectWithUidInterface, O : DeletableDataObject {
 
+    constructor(
+        databaseAdapter: DatabaseAdapter,
+        tableInfo: TableInfo,
+        binder: StatementBinder<O>,
+        objectFactory: (Cursor) -> O
+    ) : this(
+        databaseAdapter,
+        SQLStatementBuilderImpl(tableInfo),
+        binder,
+        objectFactory
+    )
+
     private var setDeletedStatement: StatementWrapper? = null
     private var adapterHashCode: Int? = null
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt
index 18424d05c2..261b547832 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt
@@ -30,8 +30,10 @@ package org.hisp.dhis.android.core.arch.db.stores.internal
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.CoreObject
@@ -47,6 +49,18 @@ internal open class IdentifiableObjectStoreImpl<O>(
 ) : ObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory),
     IdentifiableObjectStore<O> where O : CoreObject, O : ObjectWithUidInterface {
 
+    constructor(
+        databaseAdapter: DatabaseAdapter,
+        tableInfo: TableInfo,
+        binder: StatementBinder<O>,
+        objectFactory: (Cursor) -> O
+    ) : this(
+        databaseAdapter,
+        SQLStatementBuilderImpl(tableInfo.name(), tableInfo.columns().all(), arrayOf()),
+        binder,
+        objectFactory
+    )
+
     private var updateStatement: StatementWrapper? = null
     private var deleteStatement: StatementWrapper? = null
     private var adapterHashCode: Int? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt
index d579d0a12b..0083d81f4d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt
@@ -31,7 +31,9 @@ import android.database.Cursor
 import android.database.sqlite.SQLiteConstraintException
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.CoreObject
 
@@ -42,6 +44,25 @@ internal open class LinkStoreImpl<O : CoreObject>(
     binder: StatementBinder<O>,
     objectFactory: (Cursor) -> O
 ) : ObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory), LinkStore<O> {
+
+    constructor(
+        databaseAdapter: DatabaseAdapter,
+        tableInfo: TableInfo,
+        masterColumn: String,
+        binder: StatementBinder<O>,
+        objectFactory: (Cursor) -> O
+    ) : this(
+        databaseAdapter,
+        SQLStatementBuilderImpl(
+            tableInfo.name(),
+            tableInfo.columns().all(),
+            tableInfo.columns().whereUpdate()
+        ),
+        masterColumn,
+        binder,
+        objectFactory
+    )
+
     override fun insertIfNotExists(o: O): HandleAction {
         return try {
             insert(o)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt
index 9fb69b63f5..f1a6b164c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt
@@ -31,8 +31,10 @@ import android.content.ContentValues
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.CoreColumns
 import org.hisp.dhis.android.core.common.CoreObject
@@ -45,6 +47,18 @@ internal open class ObjectStoreImpl<O : CoreObject> internal constructor(
     objectFactory: (Cursor) -> O
 ) : ReadableStoreImpl<O>(databaseAdapter, builder, objectFactory), ObjectStore<O> {
 
+    constructor(
+        databaseAdapter: DatabaseAdapter,
+        tableInfo: TableInfo,
+        binder: StatementBinder<O>,
+        objectFactory: (Cursor) -> O
+    ) : this(
+        databaseAdapter,
+        SQLStatementBuilderImpl(tableInfo),
+        binder,
+        objectFactory
+    )
+
     private var insertStatement: StatementWrapper? = null
     private var adapterHashCode: Int? = null
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
index 9cba31dc88..e6b70d8eb9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
@@ -30,9 +30,11 @@ package org.hisp.dhis.android.core.arch.db.stores.internal
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.CoreObject
@@ -45,6 +47,26 @@ internal open class ObjectWithoutUidStoreImpl<O : CoreObject>(
     private val whereDeleteBinder: WhereStatementBinder<O>,
     objectFactory: (Cursor) -> O
 ) : ObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory), ObjectWithoutUidStore<O> {
+
+    constructor(
+        databaseAdapter: DatabaseAdapter,
+        tableInfo: TableInfo,
+        binder: StatementBinder<O>,
+        whereUpdateBinder: WhereStatementBinder<O>,
+        whereDeleteBinder: WhereStatementBinder<O>,
+        objectFactory: (Cursor) -> O
+    ) : this(
+        databaseAdapter,
+        SQLStatementBuilderImpl(
+            tableInfo.name(), tableInfo.columns().all(),
+            tableInfo.columns().whereUpdate()
+        ),
+        binder,
+        whereUpdateBinder,
+        whereDeleteBinder,
+        objectFactory
+    )
+
     private var updateWhereStatement: StatementWrapper? = null
     private var deleteWhereStatement: StatementWrapper? = null
     private var adapterHashCode: Int? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt
index 2d9ad2a1de..66db8ff838 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt
@@ -30,77 +30,14 @@ package org.hisp.dhis.android.core.arch.db.stores.internal
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.cursors.internal.CursorExecutorImpl
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
-import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
 internal object StoreFactory {
 
-    @JvmStatic
-    fun <O> objectWithUidStore(
-        databaseAdapter: DatabaseAdapter,
-        tableInfo: TableInfo,
-        binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
-    ): IdentifiableObjectStore<O> where O : CoreObject, O : ObjectWithUidInterface {
-        val statementBuilder: SQLStatementBuilder =
-            SQLStatementBuilderImpl(tableInfo.name(), tableInfo.columns().all(), arrayOf())
-        return IdentifiableObjectStoreImpl(databaseAdapter, statementBuilder, binder, objectFactory)
-    }
-
-    @JvmStatic
-    fun <O : CoreObject> objectStore(
-        databaseAdapter: DatabaseAdapter,
-        tableInfo: TableInfo,
-        binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
-    ): ObjectStore<O> {
-        val statementBuilder: SQLStatementBuilder =
-            SQLStatementBuilderImpl(tableInfo.name(), tableInfo.columns().all(), arrayOf())
-        return ObjectStoreImpl(databaseAdapter, statementBuilder, binder, objectFactory)
-    }
-
-    @Suppress("LongParameterList")
-    @JvmStatic
-    fun <O : CoreObject> objectWithoutUidStore(
-        databaseAdapter: DatabaseAdapter,
-        tableInfo: TableInfo,
-        binder: StatementBinder<O>,
-        whereUpdateBinder: WhereStatementBinder<O>,
-        whereDeleteBinder: WhereStatementBinder<O>,
-        objectFactory: (Cursor) -> O
-    ): ObjectWithoutUidStore<O> {
-        val statementBuilder: SQLStatementBuilder = SQLStatementBuilderImpl(
-            tableInfo.name(), tableInfo.columns().all(),
-            tableInfo.columns().whereUpdate()
-        )
-        return ObjectWithoutUidStoreImpl(
-            databaseAdapter, statementBuilder, binder, whereUpdateBinder,
-            whereDeleteBinder, objectFactory
-        )
-    }
-
-    @JvmStatic
-    fun <O : CoreObject> linkStore(
-        databaseAdapter: DatabaseAdapter,
-        tableInfo: TableInfo,
-        masterColumn: String,
-        binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
-    ): LinkStore<O> {
-        val statementBuilder: SQLStatementBuilder = SQLStatementBuilderImpl(
-            tableInfo.name(), tableInfo.columns().all(),
-            tableInfo.columns().whereUpdate()
-        )
-        return LinkStoreImpl(databaseAdapter, statementBuilder, masterColumn, binder, objectFactory)
-    }
-
     @JvmStatic
     fun <P : ObjectWithUidInterface, C : ObjectWithUidInterface> linkChildStore(
         databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.kt
index 1e85be7324..4770cc7137 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/Handler.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.arch.handlers.internal
 
 interface Handler<O> {
-    fun handle(o: O)
+    fun handle(o: O?)
 
     @JvmSuppressWildcards
     fun handleMany(oCollection: Collection<O>?)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt
index 8a7f90721f..e4ae3de56f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt
@@ -31,7 +31,7 @@ import java.util.ArrayList
 
 @Suppress("TooManyFunctions")
 internal abstract class HandlerBaseImpl<O> : HandlerWithTransformer<O> {
-    override fun handle(o: O) {
+    override fun handle(o: O?) {
         if (o == null) {
             return
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.kt
index a08fd5964a..25ed1ab31d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerWithTransformer.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.arch.handlers.internal
 
-internal interface HandlerWithTransformer<O> : Handler<O> {
+interface HandlerWithTransformer<O> : Handler<O> {
     fun handle(o: O?, transformer: (O) -> O)
 
     @JvmSuppressWildcards
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt
index 9c0fa9e932..dfaa092403 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.common.DeletableDataObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 
-internal interface IdentifiableDataHandler<O> where O : DeletableDataObject, O : ObjectWithUidInterface {
+interface IdentifiableDataHandler<O> where O : DeletableDataObject, O : ObjectWithUidInterface {
     @JvmSuppressWildcards
     fun handleMany(
         oCollection: Collection<O>?,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.kt
index 0f886a6cd9..6f0e4b7d8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/LinkHandler.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.handlers.internal
 
 import org.hisp.dhis.android.core.common.CoreObject
 
-internal interface LinkHandler<S, O : CoreObject> {
+interface LinkHandler<S, O : CoreObject> {
     @JvmSuppressWildcards
     fun handleMany(masterUid: String, slaves: Collection<S>?, transformer: (S) -> O)
     fun resetAllLinks()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt
index 81959a3dd5..01f682acfb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.arch.handlers.internal
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.common.CoreObject
 
-internal class OrderedLinkHandlerImpl<S, M : CoreObject>(private val store: LinkStore<M>) : OrderedLinkHandler<S, M> {
+internal open class OrderedLinkHandlerImpl<S, M : CoreObject>(
+    private val store: LinkStore<M>
+) : OrderedLinkHandler<S, M> {
 
     override fun handleMany(masterUid: String, slaves: List<S>?, transformer: Function2<S, Int, M>) {
         store.deleteLinksForMasterUid(masterUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.kt
index b1486067e0..102e659842 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.kt
@@ -25,28 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.attribute.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Module
-public final class DataSetInstanceEntityDIModule {
-
+internal class AttributeEntityDIModule {
     @Provides
     @Reusable
-    DataSetInstanceStore store(DatabaseAdapter databaseAdapter) {
-        return DataSetInstanceStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): AttributeStore {
+        return AttributeStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    DataSetInstanceSummaryStore summaryStore(DatabaseAdapter databaseAdapter) {
-        return DataSetInstanceSummaryStore.create(databaseAdapter);
+    fun handler(store: AttributeStore): AttributeHandler {
+        return AttributeHandler(store)
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
index 9670049231..d41cf0928f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableStoreProvider.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
@@ -26,12 +26,12 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.arch.di.internal;
+package org.hisp.dhis.android.core.attribute.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.attribute.Attribute
 
-public interface IdentifiableStoreProvider<O extends ObjectWithUidInterface> {
-    IdentifiableObjectStore<O> store(DatabaseAdapter databaseAdapter);
-}
\ No newline at end of file
+internal class AttributeHandler(
+    store: IdentifiableObjectStore<Attribute>
+) : IdentifiableHandlerImpl<Attribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.kt
similarity index 90%
rename from core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.kt
index 21e00ef4bb..8cb81c7639 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.kt
@@ -25,11 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.attribute.internal
 
-package org.hisp.dhis.android.core.resource.internal;
+import dagger.Module
 
-import dagger.Module;
-
-@Module(includes = {ResourceEntityDIModule.class})
-public final class ResourcePackageDIModule {
-}
\ No newline at end of file
+@Module(includes = [AttributeEntityDIModule::class])
+class AttributePackageDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.java
deleted file mode 100644
index 913ee0c3f2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.attribute.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.AttributeTableInfo;
-
-public final class AttributeStore {
-
-    private AttributeStore() {
-    }
-
-    private static StatementBinder<Attribute> BINDER =
-            new NameableStatementBinder<Attribute>() {
-
-                @Override
-                public void bindToStatement(@NonNull Attribute o, @NonNull StatementWrapper w) {
-                    super.bindToStatement(o, w);
-                    w.bind(11, o.valueType());
-                    w.bind(12, o.unique());
-                    w.bind(13, o.mandatory());
-                    w.bind(14, o.indicatorAttribute());
-                    w.bind(15, o.indicatorGroupAttribute());
-                    w.bind(16, o.userGroupAttribute());
-                    w.bind(17, o.dataElementAttribute());
-                    w.bind(18, o.constantAttribute());
-                    w.bind(19, o.categoryOptionAttribute());
-                    w.bind(20, o.optionSetAttribute());
-                    w.bind(21, o.sqlViewAttribute());
-                    w.bind(22, o.legendSetAttribute());
-                    w.bind(23, o.trackedEntityAttributeAttribute());
-                    w.bind(24, o.organisationUnitAttribute());
-                    w.bind(25, o.dataSetAttribute());
-                    w.bind(26, o.documentAttribute());
-                    w.bind(27, o.validationRuleGroupAttribute());
-                    w.bind(28, o.dataElementGroupAttribute());
-                    w.bind(29, o.sectionAttribute());
-                    w.bind(30, o.trackedEntityTypeAttribute());
-                    w.bind(31, o.userAttribute());
-                    w.bind(32, o.categoryOptionGroupAttribute());
-                    w.bind(33, o.programStageAttribute());
-                    w.bind(34, o.programAttribute());
-                    w.bind(35, o.categoryAttribute());
-                    w.bind(36, o.categoryOptionComboAttribute());
-                    w.bind(37, o.categoryOptionGroupSetAttribute());
-                    w.bind(38, o.validationRuleAttribute());
-                    w.bind(39, o.programIndicatorAttribute());
-                    w.bind(40, o.organisationUnitGroupAttribute());
-                    w.bind(41, o.dataElementGroupSetAttribute());
-                    w.bind(42, o.organisationUnitGroupSetAttribute());
-                    w.bind(43, o.optionAttribute());
-                }
-            };
-
-    public static IdentifiableObjectStore<Attribute> create(
-            DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter,
-                AttributeTableInfo.TABLE_INFO, BINDER, Attribute::create);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.kt
new file mode 100644
index 0000000000..b586a04d9d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.attribute.Attribute
+
+internal interface AttributeStore : IdentifiableObjectStore<Attribute>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
new file mode 100644
index 0000000000..0045ff9e65
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
@@ -0,0 +1,88 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.attribute.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.AttributeTableInfo
+
+@Suppress("MagicNumber")
+internal class AttributeStoreImpl(databaseAdapter: DatabaseAdapter) : AttributeStore,
+    IdentifiableObjectStoreImpl<Attribute>(
+        databaseAdapter,
+        AttributeTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Attribute.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<Attribute> = object : NameableStatementBinder<Attribute>() {
+            override fun bindToStatement(o: Attribute, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(11, o.valueType())
+                w.bind(12, o.unique())
+                w.bind(13, o.mandatory())
+                w.bind(14, o.indicatorAttribute())
+                w.bind(15, o.indicatorGroupAttribute())
+                w.bind(16, o.userGroupAttribute())
+                w.bind(17, o.dataElementAttribute())
+                w.bind(18, o.constantAttribute())
+                w.bind(19, o.categoryOptionAttribute())
+                w.bind(20, o.optionSetAttribute())
+                w.bind(21, o.sqlViewAttribute())
+                w.bind(22, o.legendSetAttribute())
+                w.bind(23, o.trackedEntityAttributeAttribute())
+                w.bind(24, o.organisationUnitAttribute())
+                w.bind(25, o.dataSetAttribute())
+                w.bind(26, o.documentAttribute())
+                w.bind(27, o.validationRuleGroupAttribute())
+                w.bind(28, o.dataElementGroupAttribute())
+                w.bind(29, o.sectionAttribute())
+                w.bind(30, o.trackedEntityTypeAttribute())
+                w.bind(31, o.userAttribute())
+                w.bind(32, o.categoryOptionGroupAttribute())
+                w.bind(33, o.programStageAttribute())
+                w.bind(34, o.programAttribute())
+                w.bind(35, o.categoryAttribute())
+                w.bind(36, o.categoryOptionComboAttribute())
+                w.bind(37, o.categoryOptionGroupSetAttribute())
+                w.bind(38, o.validationRuleAttribute())
+                w.bind(39, o.programIndicatorAttribute())
+                w.bind(40, o.organisationUnitGroupAttribute())
+                w.bind(41, o.dataElementGroupSetAttribute())
+                w.bind(42, o.organisationUnitGroupSetAttribute())
+                w.bind(43, o.optionAttribute())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
new file mode 100644
index 0000000000..9eccba8b2a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
+
+internal class DataElementAttributeValueLinkHandler(
+    store: DataElementAttributeValueLinkStore
+) : LinkHandlerImpl<Attribute, DataElementAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.kt
new file mode 100644
index 0000000000..f1c71b774b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
+
+internal interface DataElementAttributeValueLinkStore : LinkStore<DataElementAttributeValueLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
similarity index 67%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
index 2c7c2bdd65..f21ba83814 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
@@ -25,29 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.attribute.internal
 
-package org.hisp.dhis.android.core.attribute.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
+import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink;
-import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLinkTableInfo;
-
-public final class DataElementAttributeValueLinkStore {
-
-    private static final StatementBinder<DataElementAttributeValueLink> BINDER = (o, w) -> {
-        w.bind(1, o.dataElement());
-        w.bind(2, o.attribute());
-        w.bind(3, o.value());
-    };
-
-    private DataElementAttributeValueLinkStore() {}
-
-    public static LinkStore<DataElementAttributeValueLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, DataElementAttributeValueLinkTableInfo.TABLE_INFO,
-                DataElementAttributeValueLinkTableInfo.Columns.DATA_ELEMENT,
-                BINDER, DataElementAttributeValueLink::create);
+internal class DataElementAttributeValueLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataElementAttributeValueLinkStore,
+    LinkStoreImpl<DataElementAttributeValueLink>(
+        databaseAdapter,
+        DataElementAttributeValueLinkTableInfo.TABLE_INFO,
+        DataElementAttributeValueLinkTableInfo.Columns.DATA_ELEMENT,
+        BINDER,
+        { cursor: Cursor -> DataElementAttributeValueLink.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: DataElementAttributeValueLink, w: StatementWrapper ->
+            w.bind(1, o.dataElement())
+            w.bind(2, o.attribute())
+            w.bind(3, o.value())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
new file mode 100644
index 0000000000..62d9f6cdd9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
+
+internal class ProgramAttributeValueLinkHandler(
+    store: ProgramAttributeValueLinkStore
+) : LinkHandlerImpl<Attribute, ProgramAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.kt
new file mode 100644
index 0000000000..fcc96b93cf
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
+
+internal interface ProgramAttributeValueLinkStore : LinkStore<ProgramAttributeValueLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
index 640bc38763..a25a57aae0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
@@ -25,29 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.attribute.internal
 
-package org.hisp.dhis.android.core.attribute.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
+import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink;
-import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLinkTableInfo;
+internal class ProgramAttributeValueLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramAttributeValueLinkStore,
+    LinkStoreImpl<ProgramAttributeValueLink>(
+        databaseAdapter,
+        ProgramAttributeValueLinkTableInfo.TABLE_INFO,
+        ProgramAttributeValueLinkTableInfo.Columns.PROGRAM,
+        BINDER,
+        { cursor: Cursor -> ProgramAttributeValueLink.create(cursor) }
+    ) {
 
-public final class ProgramAttributeValueLinkStore {
-
-    private static final StatementBinder<ProgramAttributeValueLink> BINDER = (o, w) -> {
-        w.bind(1, o.program());
-        w.bind(2, o.attribute());
-        w.bind(3, o.value());
-    };
-
-    private ProgramAttributeValueLinkStore() {}
-
-    public static LinkStore<ProgramAttributeValueLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, ProgramAttributeValueLinkTableInfo.TABLE_INFO,
-                ProgramAttributeValueLinkTableInfo.Columns.PROGRAM,
-                BINDER, ProgramAttributeValueLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramAttributeValueLink, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.attribute())
+            w.bind(3, o.value())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
new file mode 100644
index 0000000000..996ad6bf6f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
+
+internal class ProgramStageAttributeValueLinkHandler(
+    store: ProgramStageAttributeValueLinkStore
+) : LinkHandlerImpl<Attribute, ProgramStageAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.kt
new file mode 100644
index 0000000000..aebca8b523
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.attribute.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
+
+internal interface ProgramStageAttributeValueLinkStore : LinkStore<ProgramStageAttributeValueLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
similarity index 67%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
index aa30578e6b..72846b3240 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
@@ -25,29 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.attribute.internal
 
-package org.hisp.dhis.android.core.attribute.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
+import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink;
-import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLinkTableInfo;
+internal class ProgramStageAttributeValueLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageAttributeValueLinkStore,
+    LinkStoreImpl<ProgramStageAttributeValueLink>(
+        databaseAdapter,
+        ProgramStageAttributeValueLinkTableInfo.TABLE_INFO,
+        ProgramStageAttributeValueLinkTableInfo.Columns.PROGRAM_STAGE,
+        BINDER,
+        { cursor: Cursor -> ProgramStageAttributeValueLink.create(cursor) }
+    ) {
 
-public final class ProgramStageAttributeValueLinkStore {
-
-    private static final StatementBinder<ProgramStageAttributeValueLink> BINDER = (o, w) -> {
-        w.bind(1, o.programStage());
-        w.bind(2, o.attribute());
-        w.bind(3, o.value());
-    };
-
-    private ProgramStageAttributeValueLinkStore() {}
-
-    public static LinkStore<ProgramStageAttributeValueLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, ProgramStageAttributeValueLinkTableInfo.TABLE_INFO,
-                ProgramStageAttributeValueLinkTableInfo.Columns.PROGRAM_STAGE,
-                BINDER, ProgramStageAttributeValueLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramStageAttributeValueLink, w: StatementWrapper ->
+            w.bind(1, o.programStage())
+            w.bind(2, o.attribute())
+            w.bind(3, o.value())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java
index e0b7c0ee29..b80e281cbf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java
@@ -27,13 +27,13 @@
  */
 package org.hisp.dhis.android.core.category;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.category.internal.CategoryFields;
+import org.hisp.dhis.android.core.category.internal.CategoryStore;
 
 import java.util.Map;
 
@@ -46,7 +46,7 @@ public final class CategoryCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<Category, CategoryCollectionRepository> {
 
     @Inject
-    CategoryCollectionRepository(final IdentifiableObjectStore<Category> store,
+    CategoryCollectionRepository(final CategoryStore store,
                                  final Map<String, ChildrenAppender<Category>> childrenAppenders,
                                  final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java
index e661ccc362..b0c9ab3b63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java
@@ -29,13 +29,13 @@
 
 import static org.hisp.dhis.android.core.category.CategoryComboTableInfo.Columns;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.category.internal.CategoryComboFields;
+import org.hisp.dhis.android.core.category.internal.CategoryComboStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class CategoryComboCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryCombo, CategoryComboCollectionRepository> {
 
     @Inject
-    CategoryComboCollectionRepository(final IdentifiableObjectStore<CategoryCombo> store,
+    CategoryComboCollectionRepository(final CategoryComboStore store,
                                       final Map<String, ChildrenAppender<CategoryCombo>> childrenAppenders,
                                       final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java
index e3c7e6391d..b2493cdb66 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.category.internal.CategoryOptionFields;
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStore;
 import org.hisp.dhis.android.core.common.IdentifiableColumns;
 
 import java.util.Collections;
@@ -49,7 +49,7 @@ public final class CategoryOptionCollectionRepository
         extends ReadOnlyNameableCollectionRepositoryImpl<CategoryOption, CategoryOptionCollectionRepository> {
 
     @Inject
-    CategoryOptionCollectionRepository(final IdentifiableObjectStore<CategoryOption> store,
+    CategoryOptionCollectionRepository(final CategoryOptionStore store,
                                        final Map<String, ChildrenAppender<CategoryOption>> childrenAppenders,
                                        final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
index 44be63964d..12dc99ecc1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
@@ -32,12 +32,11 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.category.Category
 
 @Reusable
 internal class CategoryCall @Inject constructor(
-    private val handler: Handler<Category>,
+    private val handler: CategoryHandler,
     private val service: CategoryService,
     private val apiDownloader: APIDownloader
 ) : UidsCall<Category> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
index bb6bbd19e2..b60787b933 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
@@ -31,26 +31,20 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
-import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
-import org.hisp.dhis.android.core.category.internal.CategoryCategoryComboLinkStore.create
 
 @Module
 internal class CategoryCategoryComboEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<CategoryCategoryComboLink> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryCategoryComboLinkStore {
+        return CategoryCategoryComboLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
     fun handler(
-        store: LinkStore<CategoryCategoryComboLink>
-    ): OrderedLinkHandler<Category, CategoryCategoryComboLink> {
-        return OrderedLinkHandlerImpl(store)
+        store: CategoryCategoryComboLinkStore
+    ): CategoryCategoryComboLinkHandler {
+        return CategoryCategoryComboLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
new file mode 100644
index 0000000000..6105b29264
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.category.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.category.Category
+import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
+
+internal class CategoryCategoryComboLinkHandler(
+    store: LinkStore<CategoryCategoryComboLink>
+) : OrderedLinkHandlerImpl<Category, CategoryCategoryComboLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStore.kt
index 4d5fb07a2f..0ad100dcda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStore.kt
@@ -25,31 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
-import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryCategoryComboLinkStore {
-
-    private val BINDER = StatementBinder { o: CategoryCategoryComboLink, w: StatementWrapper ->
-        w.bind(1, o.category())
-        w.bind(2, o.categoryCombo())
-        w.bind(3, o.sortOrder())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<CategoryCategoryComboLink> {
-        return linkStore(
-            databaseAdapter, CategoryCategoryComboLinkTableInfo.TABLE_INFO,
-            CategoryCategoryComboLinkTableInfo.Columns.CATEGORY_COMBO, BINDER
-        ) { cursor: Cursor -> CategoryCategoryComboLink.create(cursor) }
-    }
-}
+internal interface CategoryCategoryComboLinkStore : LinkStore<CategoryCategoryComboLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
new file mode 100644
index 0000000000..6bcf05206f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
+import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo
+
+@Suppress("MagicNumber")
+internal class CategoryCategoryComboLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryCategoryComboLinkStore,
+    LinkStoreImpl<CategoryCategoryComboLink>(
+        databaseAdapter,
+        CategoryCategoryComboLinkTableInfo.TABLE_INFO,
+        CategoryCategoryComboLinkTableInfo.Columns.CATEGORY_COMBO,
+        BINDER,
+        { cursor: Cursor -> CategoryCategoryComboLink.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: CategoryCategoryComboLink, w: StatementWrapper ->
+            w.bind(1, o.category())
+            w.bind(2, o.categoryCombo())
+            w.bind(3, o.sortOrder())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
index 8309eea1d3..a899628c3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
@@ -31,26 +31,20 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
-import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
-import org.hisp.dhis.android.core.category.CategoryOption
-import org.hisp.dhis.android.core.category.internal.CategoryCategoryOptionLinkStore.create
 
 @Module
 internal class CategoryCategoryOptionEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<CategoryCategoryOptionLink> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryCategoryOptionLinkStore {
+        return CategoryCategoryOptionLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
     fun handler(
-        store: LinkStore<CategoryCategoryOptionLink>
-    ): OrderedLinkHandler<CategoryOption, CategoryCategoryOptionLink> {
-        return OrderedLinkHandlerImpl(store)
+        store: CategoryCategoryOptionLinkStore
+    ): CategoryCategoryOptionLinkHandler {
+        return CategoryCategoryOptionLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
new file mode 100644
index 0000000000..056f21528c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.category.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
+import org.hisp.dhis.android.core.category.CategoryOption
+
+internal class CategoryCategoryOptionLinkHandler(
+    store: CategoryCategoryOptionLinkStore
+) : OrderedLinkHandlerImpl<CategoryOption, CategoryCategoryOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
index 17ff8772e2..2e5043767b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
@@ -29,14 +29,13 @@ package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
 import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOption
 
 @Reusable
 internal class CategoryCategoryOptionLinkPersistor @Inject constructor(
-    private val categoryCategoryOptionLinkHandler: OrderedLinkHandler<CategoryOption, CategoryCategoryOptionLink>
+    private val categoryCategoryOptionLinkHandler: CategoryCategoryOptionLinkHandler
 ) {
 
     fun handleMany(categories: List<Category>, categoryOptions: List<CategoryOption>) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStore.kt
index f8760af62e..93b774f489 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStore.kt
@@ -25,33 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
-import org.hisp.dhis.android.core.category.CategoryCategoryOptionLinkTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryCategoryOptionLinkStore {
-
-    private val BINDER = StatementBinder { o: CategoryCategoryOptionLink, w: StatementWrapper ->
-        w.bind(1, o.category())
-        w.bind(2, o.categoryOption())
-        w.bind(3, o.sortOrder())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<CategoryCategoryOptionLink> {
-        return linkStore(
-            databaseAdapter,
-            CategoryCategoryOptionLinkTableInfo.TABLE_INFO,
-            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY,
-            BINDER
-        ) { cursor: Cursor -> CategoryCategoryOptionLink.create(cursor) }
-    }
-}
+internal interface CategoryCategoryOptionLinkStore : LinkStore<CategoryCategoryOptionLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
new file mode 100644
index 0000000000..1a9d5ccd3e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
+import org.hisp.dhis.android.core.category.CategoryCategoryOptionLinkTableInfo
+
+@Suppress("MagicNumber")
+internal class CategoryCategoryOptionLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryCategoryOptionLinkStore,
+    LinkStoreImpl<CategoryCategoryOptionLink>(
+        databaseAdapter,
+        CategoryCategoryOptionLinkTableInfo.TABLE_INFO,
+        CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY,
+        BINDER,
+        { cursor: Cursor -> CategoryCategoryOptionLink.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: CategoryCategoryOptionLink, w: StatementWrapper ->
+            w.bind(1, o.category())
+            w.bind(2, o.categoryOption())
+            w.bind(3, o.sortOrder())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
index b754f59497..892134b318 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
@@ -32,13 +32,12 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.category.CategoryCombo
 
 @Reusable
 internal class CategoryComboCall @Inject constructor(
     private val service: CategoryComboService,
-    private val handler: Handler<CategoryCombo>,
+    private val handler: CategoryComboHandler,
     private val apiDownloader: APIDownloader
 ) : UidsCall<CategoryCombo> {
     override fun download(uids: Set<String>): Single<List<CategoryCombo>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
index 8123cfc7cd..07cbcaeb57 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
@@ -33,27 +33,28 @@ import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
-import org.hisp.dhis.android.core.category.internal.CategoryComboStore.create
 
 @Module
-internal class CategoryComboEntityDIModule : IdentifiableStoreProvider<CategoryCombo> {
+internal class CategoryComboEntityDIModule {
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<CategoryCombo> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryComboStore {
+        return CategoryComboStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(impl: CategoryComboHandler): Handler<CategoryCombo> {
-        return impl
+    fun handler(
+        store: CategoryComboStore,
+        optionComboHandler: CategoryOptionComboHandler,
+        categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
+        categoryOptionCleaner: OrphanCleaner<CategoryCombo, CategoryOptionCombo>
+    ): CategoryComboHandler {
+        return CategoryComboHandler(store, optionComboHandler, categoryCategoryComboLinkHandler, categoryOptionCleaner)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
index 7c497a63ce..5eef18956c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
@@ -25,24 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
-import org.hisp.dhis.android.core.category.*
+import org.hisp.dhis.android.core.category.Category
+import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
+import org.hisp.dhis.android.core.category.CategoryCombo
+import org.hisp.dhis.android.core.category.CategoryComboInternalAccessor
+import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.common.ObjectWithUid
 
-@Reusable
-internal class CategoryComboHandler @Inject constructor(
-    store: IdentifiableObjectStore<CategoryCombo>,
-    private val optionComboHandler: HandlerWithTransformer<CategoryOptionCombo>,
-    private val categoryCategoryComboLinkHandler: OrderedLinkHandler<Category, CategoryCategoryComboLink>,
+internal class CategoryComboHandler constructor(
+    store: CategoryComboStore,
+    private val optionComboHandler: CategoryOptionComboHandler,
+    private val categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
     private val categoryOptionCleaner: OrphanCleaner<CategoryCombo, CategoryOptionCombo>
 ) : IdentifiableHandlerImpl<CategoryCombo>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStore.kt
index 4c331d8a7f..502eebb4cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStore.kt
@@ -25,34 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.category.CategoryCombo
-import org.hisp.dhis.android.core.category.CategoryComboTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryComboStore {
-
-    private val BINDER: StatementBinder<CategoryCombo> = object : IdentifiableStatementBinder<CategoryCombo>() {
-        override fun bindToStatement(o: CategoryCombo, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(7, o.isDefault)
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<CategoryCombo> {
-        return objectWithUidStore(
-            databaseAdapter,
-            CategoryComboTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> CategoryCombo.create(cursor) }
-    }
-}
+internal interface CategoryComboStore : IdentifiableObjectStore<CategoryCombo>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
new file mode 100644
index 0000000000..d0372355e0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.category.CategoryCombo
+import org.hisp.dhis.android.core.category.CategoryComboTableInfo
+
+@Suppress("MagicNumber")
+internal class CategoryComboStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryComboStore,
+    IdentifiableObjectStoreImpl<CategoryCombo>(
+        databaseAdapter,
+        CategoryComboTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> CategoryCombo.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<CategoryCombo> = object : IdentifiableStatementBinder<CategoryCombo>() {
+            override fun bindToStatement(o: CategoryCombo, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.isDefault)
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
index 516b6bc971..56a801335a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
@@ -31,26 +31,21 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.internal.CategoryStore.create
 
 @Module
-internal class CategoryEntityDIModule : IdentifiableStoreProvider<Category> {
+internal class CategoryEntityDIModule {
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<Category> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryStore {
+        return CategoryStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: IdentifiableObjectStore<Category>): Handler<Category> {
-        return IdentifiableHandlerImpl(store)
+    fun handler(store: CategoryStore): CategoryHandler {
+        return CategoryHandler(store)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
new file mode 100644
index 0000000000..9b89e062aa
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.category.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.category.Category
+
+internal class CategoryHandler(
+    store: CategoryStore
+) : IdentifiableHandlerImpl<Category>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
index eface3294d..3110194baf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
@@ -32,7 +32,6 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -40,7 +39,7 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 
 @Reusable
 internal class CategoryOptionCall @Inject constructor(
-    private val handler: Handler<CategoryOption>,
+    private val handler: CategoryOptionHandler,
     private val service: CategoryOptionService,
     private val apiDownloader: APIDownloader
 ) : UidsCall<CategoryOption> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
index df80cbcdd6..7ea79926bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
@@ -31,26 +31,20 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.category.CategoryOption
-import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
-import org.hisp.dhis.android.core.category.internal.CategoryOptionComboCategoryOptionLinkStore.create
 
 @Module
 internal class CategoryOptionComboCategoryOptionEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<CategoryOptionComboCategoryOptionLink> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionComboCategoryOptionLinkStore {
+        return CategoryOptionComboCategoryOptionLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
     fun categoryOptionComboCategoryOptionLinkHandler(
-        store: LinkStore<CategoryOptionComboCategoryOptionLink>
-    ): LinkHandler<CategoryOption, CategoryOptionComboCategoryOptionLink> {
-        return LinkHandlerImpl(store)
+        store: CategoryOptionComboCategoryOptionLinkStore
+    ): CategoryOptionComboCategoryOptionHandler {
+        return CategoryOptionComboCategoryOptionHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
new file mode 100644
index 0000000000..9abd84db93
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.category.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.category.CategoryOption
+import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
+
+internal class CategoryOptionComboCategoryOptionHandler(
+    store: CategoryOptionComboCategoryOptionLinkStore
+) : LinkHandlerImpl<CategoryOption, CategoryOptionComboCategoryOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStore.kt
index 9ddf28d18b..0db72ef5b7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStore.kt
@@ -25,30 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
-import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryOptionComboCategoryOptionLinkStore {
-
-    private val BINDER = StatementBinder { o: CategoryOptionComboCategoryOptionLink, w: StatementWrapper ->
-        w.bind(1, o.categoryOptionCombo())
-        w.bind(2, o.categoryOption())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<CategoryOptionComboCategoryOptionLink> {
-        return linkStore(
-            databaseAdapter, CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO,
-            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO, BINDER
-        ) { cursor: Cursor -> CategoryOptionComboCategoryOptionLink.create(cursor) }
-    }
-}
+internal interface CategoryOptionComboCategoryOptionLinkStore : LinkStore<CategoryOptionComboCategoryOptionLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
new file mode 100644
index 0000000000..3ef78e8cfc
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
+import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo
+
+@Suppress("MagicNumber")
+internal class CategoryOptionComboCategoryOptionLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryOptionComboCategoryOptionLinkStore,
+    LinkStoreImpl<CategoryOptionComboCategoryOptionLink>(
+        databaseAdapter,
+        CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO,
+        CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
+        BINDER,
+        { cursor: Cursor -> CategoryOptionComboCategoryOptionLink.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: CategoryOptionComboCategoryOptionLink, w: StatementWrapper ->
+            w.bind(1, o.categoryOptionCombo())
+            w.bind(2, o.categoryOption())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
index 080468a0a1..2105fbce6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
@@ -31,23 +31,24 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
-import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStoreImpl.Companion.create
 
 @Module
 internal class CategoryOptionComboEntityDIModule {
     @Provides
     @Reusable
     fun store(databaseAdapter: DatabaseAdapter): CategoryOptionComboStore {
-        return create(databaseAdapter)
+        return CategoryOptionComboStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(impl: CategoryOptionComboHandler): HandlerWithTransformer<CategoryOptionCombo> {
-        return impl
+    fun handler(
+        store: CategoryOptionComboStore,
+        categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler
+    ): CategoryOptionComboHandler {
+        return CategoryOptionComboHandler(store, categoryOptionComboCategoryOptionLinkHandler)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
index d9b40a5a15..fe67234ee9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
@@ -27,20 +27,15 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
 
-@Reusable
-internal class CategoryOptionComboHandler @Inject constructor(
+internal class CategoryOptionComboHandler constructor(
     store: CategoryOptionComboStore,
-    private val categoryOptionComboCategoryOptionLinkHandler:
-        LinkHandler<CategoryOption, CategoryOptionComboCategoryOptionLink>
+    private val categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler
 ) : IdentifiableHandlerImpl<CategoryOptionCombo>(store) {
     override fun afterObjectHandled(o: CategoryOptionCombo, action: HandleAction) {
         categoryOptionComboCategoryOptionLinkHandler.handleMany(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
index 2e0184c6fc..86ead7e2d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.category.internal
 
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
@@ -40,16 +39,15 @@ import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 
 @Suppress("MagicNumber")
-internal class CategoryOptionComboStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    statementBuilder: SQLStatementBuilderImpl
-) : IdentifiableObjectStoreImpl<CategoryOptionCombo>(
-    databaseAdapter,
-    statementBuilder,
-    BINDER,
-    { cursor: Cursor -> CategoryOptionCombo.create(cursor) }
-),
-    CategoryOptionComboStore {
+internal class CategoryOptionComboStoreImpl constructor(
+    databaseAdapter: DatabaseAdapter
+) : CategoryOptionComboStore,
+    IdentifiableObjectStoreImpl<CategoryOptionCombo>(
+        databaseAdapter,
+        CategoryOptionComboTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> CategoryOptionCombo.create(cursor) }
+    ) {
 
     override fun getForCategoryCombo(categoryComboUid: String): List<CategoryOptionCombo> {
         val whereClause = WhereClauseBuilder()
@@ -66,11 +64,5 @@ internal class CategoryOptionComboStoreImpl private constructor(
                     w.bind(7, getUidOrNull(o.categoryCombo()))
                 }
             }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): CategoryOptionComboStore {
-            val statementBuilder = SQLStatementBuilderImpl(CategoryOptionComboTableInfo.TABLE_INFO)
-            return CategoryOptionComboStoreImpl(databaseAdapter, statementBuilder)
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
index db4181be0d..dc55a6cff9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
@@ -32,25 +32,22 @@ import dagger.Provides
 import dagger.Reusable
 import java.util.Collections
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.category.CategoryOption
 
 @Module
-internal class CategoryOptionEntityDIModule : IdentifiableStoreProvider<CategoryOption> {
+internal class CategoryOptionEntityDIModule {
 
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<CategoryOption> {
-        return CategoryOptionStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionStore {
+        return CategoryOptionStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(impl: CategoryOptionHandler): Handler<CategoryOption> {
-        return impl
+    fun handler(store: CategoryOptionStore): CategoryOptionHandler {
+        return CategoryOptionHandler(store)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
index dcb45b0cc9..7d31550b8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
@@ -27,13 +27,10 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOption
 
-@Reusable
-internal class CategoryOptionHandler @Inject constructor(
+internal class CategoryOptionHandler constructor(
     categoryOptionStore: IdentifiableObjectStore<CategoryOption>
 ) : IdentifiableHandlerImpl<CategoryOption>(categoryOptionStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
index 5b90d777b8..63584afcee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
@@ -64,7 +64,7 @@ internal class CategoryOptionOrganisationUnitChildrenAppender private constructo
     companion object {
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<CategoryOption> {
             return CategoryOptionOrganisationUnitChildrenAppender(
-                CategoryOptionOrganisationUnitLinkStore.create(databaseAdapter)
+                CategoryOptionOrganisationUnitLinkStoreImpl(databaseAdapter)
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt
index 9c7dbc9724..5d11b3eff5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt
@@ -31,24 +31,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
 
 @Module
 internal class CategoryOptionOrganisationUnitEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<CategoryOptionOrganisationUnitLink> {
-        return CategoryOptionOrganisationUnitLinkStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionOrganisationUnitLinkStore {
+        return CategoryOptionOrganisationUnitLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: LinkStore<CategoryOptionOrganisationUnitLink>):
-        LinkHandler<CategoryOptionOrganisationUnitsCall.CategoryOptionRestriction, CategoryOptionOrganisationUnitLink> {
-        return LinkHandlerImpl(store)
+    fun handler(store: CategoryOptionOrganisationUnitLinkStore): CategoryOptionOrganisationUnitLinkHandler {
+        return CategoryOptionOrganisationUnitLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
new file mode 100644
index 0000000000..2dbbede2a1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.category.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
+
+internal class CategoryOptionOrganisationUnitLinkHandler(
+    store: CategoryOptionOrganisationUnitLinkStore
+) : LinkHandlerImpl<CategoryOptionOrganisationUnitsCall.CategoryOptionRestriction, CategoryOptionOrganisationUnitLink>(
+    store
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStore.kt
index ae623dc15e..c11e52a6d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStore.kt
@@ -25,30 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
-import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLinkTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryOptionOrganisationUnitLinkStore {
-    private val BINDER = StatementBinder { o: CategoryOptionOrganisationUnitLink, w: StatementWrapper ->
-        w.bind(1, o.categoryOption())
-        w.bind(2, o.organisationUnit())
-        w.bind(3, o.restriction())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<CategoryOptionOrganisationUnitLink> {
-        return StoreFactory.linkStore(
-            databaseAdapter,
-            CategoryOptionOrganisationUnitLinkTableInfo.TABLE_INFO,
-            CategoryOptionOrganisationUnitLinkTableInfo.Columns.CATEGORY_OPTION,
-            BINDER
-        ) { CategoryOptionOrganisationUnitLink.create(it) }
-    }
-}
+internal interface CategoryOptionOrganisationUnitLinkStore : LinkStore<CategoryOptionOrganisationUnitLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
new file mode 100644
index 0000000000..af164b01ed
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
+import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLinkTableInfo
+
+@Suppress("MagicNumber")
+internal class CategoryOptionOrganisationUnitLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryOptionOrganisationUnitLinkStore,
+    LinkStoreImpl<CategoryOptionOrganisationUnitLink>(
+        databaseAdapter,
+        CategoryOptionOrganisationUnitLinkTableInfo.TABLE_INFO,
+        CategoryOptionOrganisationUnitLinkTableInfo.Columns.CATEGORY_OPTION,
+        BINDER,
+        { cursor: Cursor -> CategoryOptionOrganisationUnitLink.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: CategoryOptionOrganisationUnitLink, w: StatementWrapper ->
+            w.bind(1, o.categoryOption())
+            w.bind(2, o.organisationUnit())
+            w.bind(3, o.restriction())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
index 9eda78f89b..dc0de40542 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
@@ -31,7 +31,6 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -39,7 +38,7 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 
 @Reusable
 internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
-    private val handler: LinkHandler<CategoryOptionRestriction, CategoryOptionOrganisationUnitLink>,
+    private val handler: CategoryOptionOrganisationUnitLinkHandler,
     private val service: CategoryOptionService,
     private val dhisVersionManager: DHISVersionManager,
     private val apiDownloader: APIDownloader
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStore.kt
index 9f0e76d04f..d8c5af8995 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStore.kt
@@ -25,35 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.category.CategoryOption
-import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryOptionStore {
-
-    private val BINDER: StatementBinder<CategoryOption> = object : NameableStatementBinder<CategoryOption>() {
-        override fun bindToStatement(o: CategoryOption, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(11, o.startDate())
-            w.bind(12, o.endDate())
-            w.bind(13, o.access().data().write())
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<CategoryOption> {
-        return objectWithUidStore(
-            databaseAdapter,
-            CategoryOptionTableInfo.TABLE_INFO, BINDER
-        ) { cursor: Cursor -> CategoryOption.create(cursor) }
-    }
-}
+internal interface CategoryOptionStore : IdentifiableObjectStore<CategoryOption>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
new file mode 100644
index 0000000000..985cbfd6da
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.category.CategoryOption
+import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
+
+@Suppress("MagicNumber")
+internal class CategoryOptionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryOptionStore,
+    IdentifiableObjectStoreImpl<CategoryOption>(
+        databaseAdapter,
+        CategoryOptionTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> CategoryOption.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<CategoryOption> = object : NameableStatementBinder<CategoryOption>() {
+            override fun bindToStatement(o: CategoryOption, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(11, o.startDate())
+                w.bind(12, o.endDate())
+                w.bind(13, o.access().data().write())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStore.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStore.kt
index 50cbbc40d1..77572229c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStore.kt
@@ -25,34 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.category.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryTableInfo
-
-@Suppress("MagicNumber")
-internal object CategoryStore {
-
-    private val BINDER: StatementBinder<Category> = object : IdentifiableStatementBinder<Category>() {
-        override fun bindToStatement(o: Category, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(7, o.dataDimensionType())
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<Category> {
-        return objectWithUidStore(
-            databaseAdapter,
-            CategoryTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> Category.create(cursor) }
-    }
-}
+internal interface CategoryStore : IdentifiableObjectStore<Category>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
index d20bce3aee..210c948916 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
@@ -25,34 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.category.internal
 
-package org.hisp.dhis.android.core.legendset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.category.Category
+import org.hisp.dhis.android.core.category.CategoryTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.legendset.LegendSet;
-import org.hisp.dhis.android.core.legendset.LegendSetTableInfo;
+@Suppress("MagicNumber")
+internal class CategoryStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : CategoryStore,
+    IdentifiableObjectStoreImpl<Category>(
+        databaseAdapter,
+        CategoryTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Category.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class LegendSetStore {
-
-    private LegendSetStore() {}
-
-    private static StatementBinder<LegendSet> BINDER = new IdentifiableStatementBinder<LegendSet>() {
-        @Override
-        public void bindToStatement(@NonNull LegendSet o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.symbolizer());
+    companion object {
+        private val BINDER: StatementBinder<Category> = object : IdentifiableStatementBinder<Category>() {
+            override fun bindToStatement(o: Category, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.dataDimensionType())
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<LegendSet> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, LegendSetTableInfo.TABLE_INFO, BINDER,
-                LegendSet::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java
index 56d0c661c4..e6320b67c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java
@@ -44,7 +44,7 @@
         ValueTypeDeviceRenderingEntityDIModule.class,
         ValueTypeRenderingEntityDIModule.class
 })
-public class CommonPackageDIModule {
+class CommonPackageDIModule {
 
     @Provides
     @Reusable
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
index ec61327801..1b8840c454 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
@@ -31,8 +31,6 @@ import dagger.Reusable
 import java.util.*
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
@@ -44,11 +42,13 @@ import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.relationship.*
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 
 @Reusable
@@ -59,8 +59,8 @@ internal class DataStatePropagatorImpl @Inject internal constructor(
     private val eventStore: EventStore,
     private val relationshipStore: RelationshipStore,
     private val relationshipItemStore: RelationshipItemStore,
-    private val relationshipTypeStore: IdentifiableObjectStore<RelationshipType>,
-    private val programOwner: ObjectWithoutUidStore<ProgramOwner>
+    private val relationshipTypeStore: RelationshipTypeStore,
+    private val programOwner: ProgramOwnerStore
 ) : DataStatePropagator {
 
     override fun propagateTrackedEntityInstanceUpdate(tei: TrackedEntityInstance?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
index e91ca787c0..5953a7b68c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
@@ -31,7 +31,6 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DeletableDataObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
@@ -49,6 +48,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 
 @Reusable
@@ -60,7 +60,7 @@ internal class TrackerDataManagerImpl @Inject constructor(
     private val relationshipStore: RelationshipStore,
     private val relationshipChildrenAppender: RelationshipItemChildrenAppender,
     private val dataStatePropagator: DataStatePropagator,
-    private val programOwner: ObjectWithoutUidStore<ProgramOwner>
+    private val programOwner: ProgramOwnerStore
 ) : TrackerDataManager {
 
     override fun deleteTrackedEntity(tei: TrackedEntityInstance?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.java
deleted file mode 100644
index 561db164df..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ValueTypeDeviceRenderingEntityDIModule {
-
-    @Provides
-    @Reusable
-    ObjectWithoutUidStore<ValueTypeDeviceRendering> store(DatabaseAdapter databaseAdapter) {
-        return ValueTypeDeviceRenderingStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    HandlerWithTransformer<ValueTypeDeviceRendering> handler(
-            ObjectWithoutUidStore<ValueTypeDeviceRendering> store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt
new file mode 100644
index 0000000000..32a20a31b4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class ValueTypeDeviceRenderingEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ValueTypeDeviceRenderingStore {
+        return ValueTypeDeviceRenderingStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: ValueTypeDeviceRenderingStore): ValueTypeDeviceRenderingHandler {
+        return ValueTypeDeviceRenderingHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
new file mode 100644
index 0000000000..2c166a8eb2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
+
+internal class ValueTypeDeviceRenderingHandler(
+    store: ValueTypeDeviceRenderingStore
+) : ObjectWithoutUidHandlerImpl<ValueTypeDeviceRendering>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.kt
similarity index 86%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java
rename to core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.kt
index 973bf90145..6399c688b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidStoreProvider.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.kt
@@ -26,11 +26,9 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.arch.di.internal;
+package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
 
-public interface ObjectWithoutUidStoreProvider<O> {
-    ObjectWithoutUidStore<O> store(DatabaseAdapter databaseAdapter);
-}
\ No newline at end of file
+internal interface ValueTypeDeviceRenderingStore : ObjectWithoutUidStore<ValueTypeDeviceRendering>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.java b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
similarity index 59%
rename from core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
index 25f0bce67b..3e7477e316 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
@@ -25,45 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal
 
-package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo;
-
-public final class ValueTypeDeviceRenderingStore {
-
-    private static final StatementBinder<ValueTypeDeviceRendering> BINDER = (o, w) -> {
-        w.bind(1, o.uid());
-        w.bind(2, o.objectTable());
-        w.bind(3, o.deviceType());
-        w.bind(4, o.type());
-        w.bind(5, o.min());
-        w.bind(6, o.max());
-        w.bind(7, o.step());
-        w.bind(8, o.decimalPoints());
-    };
-
-    private static final WhereStatementBinder<ValueTypeDeviceRendering> WHERE_UPDATE_BINDER = (o, w) -> {
-        w.bind(9, o.uid());
-        w.bind(10, o.deviceType());
-    };
-
-
-    private static final WhereStatementBinder<ValueTypeDeviceRendering> WHERE_DELETE_BINDER = (o, w) -> {
-        w.bind(1, o.uid());
-        w.bind(2, o.deviceType());
-    };
-
-    private ValueTypeDeviceRenderingStore() {}
-
-    public static ObjectWithoutUidStore<ValueTypeDeviceRendering> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, ValueTypeDeviceRenderingTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, ValueTypeDeviceRendering::create);
+internal class ValueTypeDeviceRenderingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ValueTypeDeviceRenderingStore,
+    ObjectWithoutUidStoreImpl<ValueTypeDeviceRendering>(
+        databaseAdapter,
+        ValueTypeDeviceRenderingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> ValueTypeDeviceRendering.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: ValueTypeDeviceRendering, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.objectTable())
+            w.bind(3, o.deviceType())
+            w.bind(4, o.type())
+            w.bind(5, o.min())
+            w.bind(6, o.max())
+            w.bind(7, o.step())
+            w.bind(8, o.decimalPoints())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: ValueTypeDeviceRendering, w: StatementWrapper ->
+            w.bind(9, o.uid())
+            w.bind(10, o.deviceType())
+        }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { o: ValueTypeDeviceRendering, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.deviceType())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt
similarity index 80%
rename from core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt
index b823af451c..615b79e545 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt
@@ -25,22 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.common.valuetype.rendering.internal
 
-package org.hisp.dhis.android.core.common.valuetype.rendering.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingHandler
 
 @Module
-public final class ValueTypeRenderingEntityDIModule {
-
+internal class ValueTypeRenderingEntityDIModule {
     @Provides
     @Reusable
-    DictionaryTableHandler<ValueTypeRendering> handler(ValueTypeRenderingHandler impl) {
-        return impl;
+    fun handler(deviceRenderingHandler: ValueTypeDeviceRenderingHandler): ValueTypeRenderingHandler {
+        return ValueTypeRenderingHandler(deviceRenderingHandler)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.java b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
index e97249f603..743394e265 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
@@ -25,38 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.common.valuetype.rendering.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ValueTypeRenderingHandler implements DictionaryTableHandler<ValueTypeRendering> {
-
-    private final HandlerWithTransformer<ValueTypeDeviceRendering> valueTypeDeviceRenderingHandler;
-
-    @Inject
-    ValueTypeRenderingHandler(HandlerWithTransformer<ValueTypeDeviceRendering> valueTypeDeviceRenderingHandler) {
-        this.valueTypeDeviceRenderingHandler = valueTypeDeviceRenderingHandler;
-    }
-
-    @Override
-    public void handle(ValueTypeRendering renderType, final String uid, final String objectTable) {
-        if (renderType != null) {
-
-            valueTypeDeviceRenderingHandler.handle(renderType.desktop(),
-                    value -> value.toBuilder().uid(uid).objectTable(objectTable)
-                            .deviceType(ValueTypeRendering.DESKTOP).build());
-
-            valueTypeDeviceRenderingHandler.handle(renderType.mobile(),
-                    value -> value.toBuilder().uid(uid).objectTable(objectTable)
-                            .deviceType(ValueTypeRendering.MOBILE).build());
+package org.hisp.dhis.android.core.common.valuetype.rendering.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
+import org.hisp.dhis.android.core.common.ValueTypeRendering
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingHandler
+
+internal class ValueTypeRenderingHandler(
+    private val valueTypeDeviceRenderingHandler: ValueTypeDeviceRenderingHandler
+) : DictionaryTableHandler<ValueTypeRendering> {
+    override fun handle(o: ValueTypeRendering?, uid: String, objectTable: String) {
+        if (o != null) {
+            valueTypeDeviceRenderingHandler.handle(
+                o.desktop()
+            ) { value: ValueTypeDeviceRendering ->
+                value.toBuilder()
+                    .uid(uid)
+                    .objectTable(objectTable)
+                    .deviceType(ValueTypeRendering.DESKTOP)
+                    .build()
+            }
+
+            valueTypeDeviceRenderingHandler.handle(
+                o.mobile()
+            ) { value: ValueTypeDeviceRendering ->
+                value.toBuilder()
+                    .uid(uid)
+                    .objectTable(objectTable)
+                    .deviceType(ValueTypeRendering.MOBILE)
+                    .build()
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
index 1af7ff811e..ddc1ad028e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
@@ -30,18 +30,17 @@ package org.hisp.dhis.android.core.configuration.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.*
+import java.util.Date
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 import org.hisp.dhis.android.core.arch.storage.internal.SecureStore
 
 @Module
 internal class ConfigurationPackageDIModule {
     @Provides
     @Reusable
-    fun configurationSecureStore(secureStore: InsecureStore): ObjectKeyValueStore<DatabasesConfiguration> {
-        return DatabaseConfigurationInsecureStore.get(secureStore)
+    fun configurationSecureStore(secureStore: InsecureStore): DatabaseConfigurationInsecureStore {
+        return DatabaseConfigurationInsecureStoreImpl(secureStore)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStore.kt
similarity index 87%
rename from core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStore.kt
index 1262fc8fdc..5f1d2956da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStore.kt
@@ -25,13 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.resource.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
+package org.hisp.dhis.android.core.configuration.internal
 
-interface ResourceStore extends ObjectWithoutUidStore<Resource> {
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 
-    String getLastUpdated(Resource.Type type);
-
-    boolean deleteResource(Resource.Type type);
-}
\ No newline at end of file
+internal interface ConfigurationStore : ObjectStore<Configuration>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStore.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt
index 6be84b16a0..9f4e89cb07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt
@@ -25,23 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.configuration.internal;
+package org.hisp.dhis.android.core.configuration.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
 
-final class ConfigurationStore {
-
-    private static final StatementBinder<Configuration> BINDER = (o, w) ->
-            w.bind(1, o.serverUrl());
-
-    private ConfigurationStore() {
-    }
-
-    static ObjectStore<Configuration> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectStore(databaseAdapter, ConfigurationTableInfo.TABLE_INFO, BINDER,
-                Configuration::create);
+internal class ConfigurationStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ConfigurationStore,
+    ObjectStoreImpl<Configuration>(
+        databaseAdapter,
+        ConfigurationTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Configuration.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: Configuration, w: StatementWrapper ->
+            w.bind(1, o.serverUrl())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStore.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStore.kt
index c5caa96282..1e93b93048 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStore.kt
@@ -25,14 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.configuration.internal
 
-import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
-import org.hisp.dhis.android.core.arch.storage.internal.JsonKeyValueStoreImpl
 import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 
-internal object DatabaseConfigurationInsecureStore {
-    operator fun get(insecureStore: InsecureStore): ObjectKeyValueStore<DatabasesConfiguration> {
-        return JsonKeyValueStoreImpl(insecureStore, "DB_CONFIGS", DatabasesConfiguration::class.java)
-    }
-}
+interface DatabaseConfigurationInsecureStore : ObjectKeyValueStore<DatabasesConfiguration>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
new file mode 100644
index 0000000000..41872a5862
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.configuration.internal
+
+import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
+import org.hisp.dhis.android.core.arch.storage.internal.JsonKeyValueStoreImpl
+
+internal class DatabaseConfigurationInsecureStoreImpl(
+    insecureStore: InsecureStore
+) : DatabaseConfigurationInsecureStore,
+    JsonKeyValueStoreImpl<DatabasesConfiguration>(insecureStore, "DB_CONFIGS", DatabasesConfiguration::class.java)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
index 4504e754f6..6de96c61f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
@@ -36,14 +36,13 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 import org.hisp.dhis.android.core.configuration.internal.migration.DatabaseConfigurationInsecureStoreOld
 import org.hisp.dhis.android.core.configuration.internal.migration.Migration260
 
 @Reusable
 internal class DatabaseConfigurationMigration @Inject constructor(
     private val context: Context,
-    private val databaseConfigurationStore: ObjectKeyValueStore<DatabasesConfiguration>,
+    private val databaseConfigurationStore: DatabaseConfigurationInsecureStore,
     private val credentialsStore: CredentialsSecureStore,
     private val insecureStore: InsecureStore,
     private val nameGenerator: DatabaseNameGenerator,
@@ -149,7 +148,7 @@ internal class DatabaseConfigurationMigration @Inject constructor(
     }
 
     private fun getServerUrl(databaseAdapter: DatabaseAdapter): String? {
-        val store = ConfigurationStore.create(databaseAdapter)
+        val store = ConfigurationStoreImpl(databaseAdapter)
         return store.selectFirst()?.serverUrl()
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt
index 9dc63eacf0..7a9259d26b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt
@@ -27,11 +27,9 @@
  */
 package org.hisp.dhis.android.core.configuration.internal
 
-import dagger.Reusable
-import java.util.*
+import java.util.Date
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 
-@Reusable
 internal object DatabaseConfigurationTransformer {
     fun transform(serverUrl: String, databaseName: String, username: String): DatabasesConfiguration {
         return DatabasesConfiguration.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java
index d67b04a769..62749e5cd7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java
@@ -30,17 +30,11 @@
 
 import org.hisp.dhis.android.core.arch.storage.internal.SecureStore;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
 public final class DatabaseEncryptionPasswordManager {
 
     private final SecureStore secureStore;
     private final DatabaseEncryptionPasswordGenerator passwordGenerator;
 
-    @Inject
     DatabaseEncryptionPasswordManager(SecureStore secureStore,
                                       DatabaseEncryptionPasswordGenerator passwordGenerator) {
         this.secureStore = secureStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
index 9f45911132..273efa1eb9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
@@ -36,13 +36,12 @@ import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseExport
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 
 @Reusable
 internal class MultiUserDatabaseManager @Inject internal constructor(
     private val context: Context,
     private val databaseAdapter: DatabaseAdapter,
-    private val databaseConfigurationSecureStore: ObjectKeyValueStore<DatabasesConfiguration>,
+    private val databaseConfigurationSecureStore: DatabaseConfigurationInsecureStore,
     private val configurationHelper: DatabaseConfigurationHelper,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
     private val databaseExport: DatabaseExport
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
index 452eecaa27..9961b3a1da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
@@ -28,21 +28,20 @@
 package org.hisp.dhis.android.core.configuration.internal
 
 import dagger.Reusable
-import java.util.*
+import java.util.Date
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 
 @Reusable
 internal class MultiUserDatabaseManagerForD2Manager @Inject constructor(
     private val databaseAdapter: DatabaseAdapter,
     private val migration: DatabaseConfigurationMigration,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
-    private val databaseConfigurationStore: ObjectKeyValueStore<DatabasesConfiguration>
+    private val databaseConfigurationStore: DatabaseConfigurationInsecureStore
 ) {
     fun loadIfLogged(credentials: Credentials?) {
         val databaseConfiguration = databaseConfigurationStore.get()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt
index 9346b94e4e..9c64f28888 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt
@@ -71,7 +71,7 @@ internal class Migration260(
             ?.filter { it.isFile }
             ?.forEach { file -> file.renameTo(File(dstResources, file.name)) }
 
-        val fileResourcesStore = FileResourceStoreImpl.create(databaseAdapter)
+        val fileResourcesStore = FileResourceStoreImpl(databaseAdapter)
         val fileResources = fileResourcesStore.selectAll()
         fileResources.forEach {
             val newPath = it.path()?.replace(
@@ -95,7 +95,7 @@ internal class Migration260(
         val keyWaitForResult = "wait_for_result"
 
         val smsPrefs = context.getSharedPreferences(configFile, Context.MODE_PRIVATE)
-        val smsConfigStore = SMSConfigStoreImpl.create(databaseAdapter)
+        val smsConfigStore = SMSConfigStoreImpl(databaseAdapter)
 
         smsPrefs.getBoolean(keyModuleEnabled, false).let {
             smsConfigStore.set(SMSConfigKey.MODULE_ENABLED, it.toString())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java
index bb44c2a8e9..ad8d2fc2d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java
@@ -27,12 +27,12 @@
  */
 package org.hisp.dhis.android.core.constant;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.constant.internal.ConstantStore;
 
 import java.util.Map;
 
@@ -46,7 +46,7 @@ public final class ConstantCollectionRepository extends ReadOnlyIdentifiableColl
 
     @Inject
     ConstantCollectionRepository(
-            final IdentifiableObjectStore<Constant> store,
+            final ConstantStore store,
             final Map<String, ChildrenAppender<Constant>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java
index 30e8e8cedd..5c032a9413 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java
@@ -36,7 +36,6 @@
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.constant.Constant;
 
 import javax.inject.Inject;
@@ -47,13 +46,13 @@
 final class ConstantCallFactory extends ListCallFactoryImpl<Constant> {
 
     private final ConstantService service;
-    private final Handler<Constant> handler;
+    private final ConstantHandler handler;
 
     @Inject
     ConstantCallFactory(GenericCallData data,
                         APICallExecutor apiCallExecutor,
                         ConstantService service,
-                        Handler<Constant> handler) {
+                        ConstantHandler handler) {
         super(data, apiCallExecutor);
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
new file mode 100644
index 0000000000..d02cf3abce
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.constant.internal
+
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.constant.Constant
+
+@Suppress("MagicNumber")
+internal class ConstantHandler constructor(
+    optionStore: ConstantStore,
+    private val collectionCleaner: CollectionCleaner<Constant>
+) : IdentifiableHandlerImpl<Constant>(optionStore) {
+    override fun afterCollectionHandled(oCollection: Collection<Constant>?) {
+        collectionCleaner.deleteNotPresent(oCollection)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
index 4e6a6e0194..aa9643d9ea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
@@ -25,70 +25,65 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.constant.internal
 
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.constant.Constant;
-import org.hisp.dhis.android.core.constant.ConstantModule;
-import org.hisp.dhis.android.core.constant.ConstantTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module()
-public final class ConstantPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.constant.Constant
+import org.hisp.dhis.android.core.constant.ConstantModule
+import org.hisp.dhis.android.core.constant.ConstantTableInfo
+import retrofit2.Retrofit
 
+@Module
+internal class ConstantPackageDIModule {
     @Provides
     @Reusable
-    IdentifiableObjectStore<Constant> store(DatabaseAdapter databaseAdapter) {
-        return ConstantStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): ConstantStore {
+        return ConstantStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Handler<Constant> handler(ConstantHandler impl) {
-        return impl;
+    fun handler(
+        optionStore: ConstantStore,
+        collectionCleaner: CollectionCleaner<Constant>
+    ): ConstantHandler {
+        return ConstantHandler(optionStore, collectionCleaner)
     }
 
     @Provides
     @Reusable
-    ListCallFactory<Constant> constantCallFactory(ConstantCallFactory impl) {
-        return impl;
+    fun constantCallFactory(impl: ConstantCallFactory): ListCallFactory<Constant> {
+        return impl
     }
 
     @Provides
     @Reusable
-    ConstantService service(Retrofit retrofit) {
-        return retrofit.create(ConstantService.class);
+    fun service(retrofit: Retrofit): ConstantService {
+        return retrofit.create(ConstantService::class.java)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<Constant>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<Constant>> {
+        return emptyMap()
     }
 
     @Provides
     @Reusable
-    CollectionCleaner<Constant> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(ConstantTableInfo.TABLE_INFO.name(), databaseAdapter);
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter?): CollectionCleaner<Constant> {
+        return CollectionCleanerImpl(ConstantTableInfo.TABLE_INFO.name(), databaseAdapter!!)
     }
 
     @Provides
     @Reusable
-    ConstantModule module(ConstantModuleImpl impl) {
-        return impl;
+    fun module(impl: ConstantModuleImpl): ConstantModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStore.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStore.kt
index d1302e1708..06d27c8090 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStore.kt
@@ -25,33 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.constant.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.constant.ConstantTableInfo
-
-@Suppress("MagicNumber")
-internal object ConstantStore {
-    private val BINDER: StatementBinder<Constant> = object : IdentifiableStatementBinder<Constant>() {
-        override fun bindToStatement(o: Constant, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(7, o.value())
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<Constant> {
-        return objectWithUidStore(
-            databaseAdapter,
-            ConstantTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> Constant.create(cursor) }
-    }
-}
+internal interface ConstantStore : IdentifiableObjectStore<Constant>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
index 6975c19181..b326bc6785 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
@@ -25,32 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.constant.internal
 
-package org.hisp.dhis.android.core.user.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.constant.Constant
+import org.hisp.dhis.android.core.constant.ConstantTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.user.UserRole;
-import org.hisp.dhis.android.core.user.UserRoleTableInfo;
-
-import androidx.annotation.NonNull;
-
-public final class UserRoleStore {
-
-    private UserRoleStore() {}
-
-    private static StatementBinder<UserRole> BINDER = new IdentifiableStatementBinder<UserRole>() {
-        @Override
-        public void bindToStatement(@NonNull UserRole o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
+@Suppress("MagicNumber")
+internal class ConstantStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ConstantStore,
+    IdentifiableObjectStoreImpl<Constant>(
+        databaseAdapter,
+        ConstantTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Constant.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<Constant> = object : IdentifiableStatementBinder<Constant>() {
+            override fun bindToStatement(o: Constant, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.value())
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<UserRole> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, UserRoleTableInfo.TABLE_INFO, BINDER, UserRole::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.java
index f36970d07e..c93e6d74ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.java
@@ -28,13 +28,13 @@
 
 package org.hisp.dhis.android.core.dataapproval;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public class DataApprovalCollectionRepository extends ReadOnlyCollectionReposito
 
 
     @Inject
-    DataApprovalCollectionRepository(final ObjectWithoutUidStore<DataApproval> dataApprovalStore,
+    DataApprovalCollectionRepository(final DataApprovalStore dataApprovalStore,
                                      final Map<String, ChildrenAppender<DataApproval>> childrenAppenders,
                                      final RepositoryScope repositoryScope) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
index fcb9d1ab92..93ecbc2ea3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
@@ -31,7 +31,6 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.internal.MultiDimensionalPartitioner
 import org.hisp.dhis.android.core.dataapproval.DataApproval
@@ -39,7 +38,7 @@ import org.hisp.dhis.android.core.dataapproval.DataApproval
 @Reusable
 internal class DataApprovalCall @Inject constructor(
     private val service: DataApprovalService,
-    private val handler: Handler<DataApproval>,
+    private val handler: DataApprovalHandler,
     private val apiDownloader: APIDownloader,
     private val multiDimensionalPartitioner: MultiDimensionalPartitioner
 ) : QueryCall<DataApproval, DataApprovalQuery> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
new file mode 100644
index 0000000000..8c84a0e27c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataapproval.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataapproval.DataApproval
+
+@Module
+internal class DataApprovalEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataApprovalStore {
+        return DataApprovalStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(dataApprovalStore: DataApprovalStore): DataApprovalHandler {
+        return DataApprovalHandler(dataApprovalStore)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<DataApproval>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
new file mode 100644
index 0000000000..84c15ffc52
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataapproval.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.dataapproval.DataApproval
+
+internal class DataApprovalHandler(
+    dataApprovalStore: DataApprovalStore
+) : ObjectWithoutUidHandlerImpl<DataApproval>(dataApprovalStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.kt
new file mode 100644
index 0000000000..1c6e30234b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataapproval.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.dataapproval.DataApproval
+
+internal interface DataApprovalStore : ObjectWithoutUidStore<DataApproval>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
similarity index 52%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
index f203e4ed4b..f457e004c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
@@ -25,52 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataapproval.internal
 
-package org.hisp.dhis.android.core.dataapproval.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.dataapproval.DataApproval
+import org.hisp.dhis.android.core.dataapproval.DataApprovalTableInfo
 
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.dataapproval.DataApproval;
-import org.hisp.dhis.android.core.dataapproval.DataApprovalTableInfo;
-
-final class DataApprovalStore {
-
-    private static final StatementBinder<DataApproval> BINDER
-            = (dataApproval, w) -> {
-        w.bind(1, dataApproval.workflow());
-        w.bind(2, dataApproval.organisationUnit());
-        w.bind(3, dataApproval.period());
-        w.bind(4, dataApproval.attributeOptionCombo());
-        w.bind(5, dataApproval.state());
-    };
-
-    private static final WhereStatementBinder<DataApproval> WHERE_UPDATE_BINDER
-            = (dataApproval, w) -> {
-
-        w.bind(6, dataApproval.workflow());
-        w.bind(7, dataApproval.organisationUnit());
-        w.bind(8, dataApproval.period());
-        w.bind(9, dataApproval.attributeOptionCombo());
-    };
-
-    private static final WhereStatementBinder<DataApproval> WHERE_DELETE_BINDER
-            = (dataApproval, w) -> {
-
-        w.bind(1, dataApproval.workflow());
-        w.bind(2, dataApproval.organisationUnit());
-        w.bind(3, dataApproval.period());
-        w.bind(4, dataApproval.attributeOptionCombo());
-    };
-
-    public static ObjectWithoutUidStore<DataApproval> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, DataApprovalTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, DataApproval::create);
+internal class DataApprovalStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataApprovalStore,
+    ObjectWithoutUidStoreImpl<DataApproval>(
+        databaseAdapter,
+        DataApprovalTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> DataApproval.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { dataApproval: DataApproval, w: StatementWrapper ->
+            w.bind(1, dataApproval.workflow())
+            w.bind(2, dataApproval.organisationUnit())
+            w.bind(3, dataApproval.period())
+            w.bind(4, dataApproval.attributeOptionCombo())
+            w.bind(5, dataApproval.state())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { dataApproval: DataApproval, w: StatementWrapper ->
+            w.bind(6, dataApproval.workflow())
+            w.bind(7, dataApproval.organisationUnit())
+            w.bind(8, dataApproval.period())
+            w.bind(9, dataApproval.attributeOptionCombo())
+        }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { dataApproval: DataApproval, w: StatementWrapper ->
+            w.bind(1, dataApproval.workflow())
+            w.bind(2, dataApproval.organisationUnit())
+            w.bind(3, dataApproval.period())
+            w.bind(4, dataApproval.attributeOptionCombo())
+        }
     }
-
-    private DataApprovalStore() {}
-
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java
index 557a718034..43620d6c1c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataelement;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -37,6 +36,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.common.ValueType;
 import org.hisp.dhis.android.core.dataelement.internal.DataElementFields;
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore;
 
 import java.util.Map;
 
@@ -49,7 +49,7 @@ public final class DataElementCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<DataElement, DataElementCollectionRepository> {
 
     @Inject
-    DataElementCollectionRepository(final IdentifiableObjectStore<DataElement> store,
+    DataElementCollectionRepository(final DataElementStore store,
                                     final Map<String, ChildrenAppender<DataElement>> childrenAppenders,
                                     final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.java
deleted file mode 100644
index 3630ebc609..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink;
-import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataElementAttributeValueEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<DataElementAttributeValueLink> store(DatabaseAdapter databaseAdapter) {
-        return DataElementAttributeValueLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkHandler<Attribute, DataElementAttributeValueLink> handler(
-            LinkStore<DataElementAttributeValueLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
new file mode 100644
index 0000000000..bda03d9d0d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataelement.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
+import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkStore
+import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkStoreImpl
+
+@Module
+internal class DataElementAttributeValueEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataElementAttributeValueLinkStore {
+        return DataElementAttributeValueLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(
+        store: DataElementAttributeValueLinkStore
+    ): DataElementAttributeValueLinkHandler {
+        return DataElementAttributeValueLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java
index 8aa1e546f1..2797a0dc7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java
@@ -37,7 +37,6 @@
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.internal.AccessFields;
 import org.hisp.dhis.android.core.dataelement.DataElement;
 
@@ -53,13 +52,13 @@ final class DataElementEndpointCallFactory extends UidsCallFactoryImpl<DataEleme
     private static final int MAX_UID_LIST_SIZE = 100;
 
     private final DataElementService service;
-    private final Handler<DataElement> handler;
+    private final DataElementHandler handler;
 
     @Inject
     DataElementEndpointCallFactory(GenericCallData data,
                                    APICallExecutor apiCallExecutor,
                                    DataElementService service,
-                                   Handler<DataElement> handler) {
+                                   DataElementHandler handler) {
         super(data, apiCallExecutor);
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.java
deleted file mode 100644
index 453755ae66..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataElementEntityDIModule {
-
-    @Provides
-    @Reusable
-    IdentifiableObjectStore<DataElement> store(DatabaseAdapter databaseAdapter) {
-        return DataElementStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<DataElement> handler(DataElementHandler handler) {
-        return handler;
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<DataElement>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return Collections.singletonMap(DataElementFields.LEGEND_SETS,
-                DataElementLegendSetChildrenAppender.create(databaseAdapter));
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
index f0b0bb0586..b915f3b69c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
@@ -25,44 +25,49 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.dataapproval.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataapproval.DataApproval;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import java.util.Collections
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
+import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
 
 @Module
-public class DataApprovalEntityDIModule implements ObjectWithoutUidStoreProvider<DataApproval> {
-
-    @Override
+internal class DataElementEntityDIModule {
     @Provides
     @Reusable
-    public ObjectWithoutUidStore<DataApproval> store(DatabaseAdapter databaseAdapter) {
-        return DataApprovalStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): DataElementStore {
+        return DataElementStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    public Handler<DataApproval> handler(ObjectWithoutUidStore<DataApproval> dataApprovalStore) {
-        return new ObjectWithoutUidHandlerImpl<>(dataApprovalStore);
+    fun handler(
+        dataElementStore: DataElementStore,
+        attributeHandler: AttributeHandler,
+        dataElementAttributeLinkHandler: DataElementAttributeValueLinkHandler,
+        dataElementLegendSetLinkHandler: DataElementLegendSetLinkHandler
+    ): DataElementHandler {
+        return DataElementHandler(
+            dataElementStore,
+            attributeHandler,
+            dataElementAttributeLinkHandler,
+            dataElementLegendSetLinkHandler
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<DataApproval>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter?): Map<String, ChildrenAppender<DataElement>> {
+        return Collections.singletonMap(
+            DataElementFields.LEGEND_SETS,
+            DataElementLegendSetChildrenAppender.create(databaseAdapter)
+        )
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.java
deleted file mode 100644
index 54c89f56f9..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.AttributeValueUtils;
-import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink;
-
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class DataElementHandler extends IdentifiableHandlerImpl<DataElement> {
-    private final Handler<Attribute> attributeHandler;
-    private final LinkHandler<Attribute, DataElementAttributeValueLink>
-            dataElementAttributeLinkHandler;
-    private final OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink> dataElementLegendSetLinkHandler;
-
-    @Inject
-    DataElementHandler(
-            IdentifiableObjectStore<DataElement> programStageDataElementStore,
-            Handler<Attribute> attributeHandler,
-            LinkHandler<Attribute, DataElementAttributeValueLink> dataElementAttributeLinkHandler,
-            OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink> dataElementLegendSetLinkHandler
-    ) {
-        super(programStageDataElementStore);
-        this.attributeHandler = attributeHandler;
-        this.dataElementAttributeLinkHandler = dataElementAttributeLinkHandler;
-        this.dataElementLegendSetLinkHandler = dataElementLegendSetLinkHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(DataElement dataElement, HandleAction action) {
-        if (dataElement.attributeValues() != null) {
-            final List<Attribute> attributes = AttributeValueUtils.extractAttributes(dataElement.attributeValues());
-
-            attributeHandler.handleMany(attributes);
-
-            dataElementAttributeLinkHandler.handleMany(dataElement.uid(), attributes,
-                    attribute -> DataElementAttributeValueLink.builder()
-                            .dataElement(dataElement.uid())
-                            .attribute(attribute.uid())
-                            .value(AttributeValueUtils.extractValue(dataElement.attributeValues(), attribute.uid()))
-                            .build());
-        }
-
-        if (dataElement.legendSets() != null) {
-            dataElementLegendSetLinkHandler.handleMany(dataElement.uid(), dataElement.legendSets(),
-                    (legendSet, sortOrder) -> DataElementLegendSetLink.builder()
-                            .dataElement(dataElement.uid())
-                            .legendSet(legendSet.uid())
-                            .sortOrder(sortOrder)
-                            .build());
-        }
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
new file mode 100644
index 0000000000..c990b21c10
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataelement.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.AttributeValueUtils
+import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
+
+internal class DataElementHandler constructor(
+    dataElementStore: DataElementStore,
+    private val attributeHandler: AttributeHandler,
+    private val dataElementAttributeLinkHandler: LinkHandler<Attribute, DataElementAttributeValueLink>,
+    private val dataElementLegendSetLinkHandler: OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink>
+) : IdentifiableHandlerImpl<DataElement>(dataElementStore) {
+
+    override fun afterObjectHandled(o: DataElement, action: HandleAction) {
+        if (o.attributeValues() != null) {
+            val attributes = AttributeValueUtils.extractAttributes(o.attributeValues())
+            attributeHandler.handleMany(attributes)
+            dataElementAttributeLinkHandler.handleMany(
+                o.uid(), attributes
+            ) { attribute: Attribute ->
+                DataElementAttributeValueLink.builder()
+                    .dataElement(o.uid())
+                    .attribute(attribute.uid())
+                    .value(AttributeValueUtils.extractValue(o.attributeValues(), attribute.uid()))
+                    .build()
+            }
+        }
+        if (o.legendSets() != null) {
+            dataElementLegendSetLinkHandler.handleMany(
+                o.uid(), o.legendSets()
+            ) { legendSet: ObjectWithUid, sortOrder: Int? ->
+                DataElementLegendSetLink.builder()
+                    .dataElement(o.uid())
+                    .legendSet(legendSet.uid())
+                    .sortOrder(sortOrder)
+                    .build()
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.java
deleted file mode 100644
index 7e7347282e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink;
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataElementLegendSetEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<DataElementLegendSetLink> store(DatabaseAdapter databaseAdapter) {
-        return DataElementLegendSetLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink> handler(
-            LinkStore<DataElementLegendSetLink> store) {
-        return new OrderedLinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
index 47203d05ab..4c3faa8968 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
@@ -25,31 +25,29 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.dataset.DataInputPeriod;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStore
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStoreImpl
 
 @Module
-public final class DataInputPeriodEntityDIModule {
-
+internal class DataElementLegendSetEntityDIModule {
     @Provides
     @Reusable
-    LinkStore<DataInputPeriod> store(DatabaseAdapter databaseAdapter) {
-        return DataInputPeriodLinkStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): DataElementLegendSetLinkStore {
+        return DataElementLegendSetLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    LinkHandler<DataInputPeriod, DataInputPeriod> handler(LinkStore<DataInputPeriod> store) {
-        return new LinkHandlerImpl<>(store);
+    fun handler(
+        store: DataElementLegendSetLinkStore
+    ): DataElementLegendSetLinkHandler {
+        return DataElementLegendSetLinkHandler(store)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt
new file mode 100644
index 0000000000..8c78c780b5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataelement.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class DataElementOperandEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataElementOperandStore {
+        return DataElementOperandStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: DataElementOperandStore): DataElementOperandHandler {
+        return DataElementOperandHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
index 3ee91968c4..d3bd0785c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/IdentifiableEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
@@ -25,13 +25,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.arch.di.internal;
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-
-public interface IdentifiableEntityDIModule<O extends ObjectWithUidInterface> extends IdentifiableStoreProvider<O> {
-    Handler<O> handler(IdentifiableObjectStore<O> store);
-}
\ No newline at end of file
+internal class DataElementOperandHandler constructor(
+    store: IdentifiableObjectStore<DataElementOperand>
+) : IdentifiableHandlerImpl<DataElementOperand>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStore.kt
similarity index 84%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStore.kt
index 0999e2bc19..d6a01473a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStore.kt
@@ -26,18 +26,9 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.attribute.internal;
+package org.hisp.dhis.android.core.dataelement.internal
 
-import dagger.Module;
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
 
-@Module(includes = {
-        AttributeEntityDIModule.class
-})
-public final class AttributePackageDIModule {
-
-/*    @Provides
-    @Reusable
-    AttributeModule module(AttributeModuleImpl impl) {
-        return impl;
-    }*/
-}
\ No newline at end of file
+internal interface DataElementOperandStore : IdentifiableObjectStore<DataElementOperand>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
index c25e35b8a6..2c5dd81461 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
@@ -25,29 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.dataelement.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
-import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo;
+internal class DataElementOperandStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataElementOperandStore,
+    IdentifiableObjectStoreImpl<DataElementOperand>(
+        databaseAdapter,
+        DataElementOperandTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> DataElementOperand.create(cursor) }
+    ) {
 
-public final class DataElementOperandStore {
-
-    private static final StatementBinder<DataElementOperand> BINDER = (o, w) -> {
-        w.bind(1, o.uid());
-        w.bind(2, UidsHelper.getUidOrNull(o.dataElement()));
-        w.bind(3, UidsHelper.getUidOrNull(o.categoryOptionCombo()));
-    };
-
-    private DataElementOperandStore() {}
-
-    public static IdentifiableObjectStore<DataElementOperand> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, DataElementOperandTableInfo.TABLE_INFO,
-                BINDER, DataElementOperand::create);
+    companion object {
+        private val BINDER = StatementBinder { o: DataElementOperand, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, getUidOrNull(o.dataElement()))
+            w.bind(3, getUidOrNull(o.categoryOptionCombo()))
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.kt
new file mode 100644
index 0000000000..ddd56a9397
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataelement.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.dataelement.DataElement
+
+internal interface DataElementStore : IdentifiableObjectStore<DataElement>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
index 7f42696bf5..15893e3700 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
@@ -25,42 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.dataelement.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.dataelement.DataElementTableInfo;
+@Suppress("MagicNumber")
+internal class DataElementStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataElementStore,
+    IdentifiableObjectStoreImpl<DataElement>(
+        databaseAdapter,
+        DataElementTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> DataElement.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class DataElementStore {
-
-    private DataElementStore() {}
-
-    private static StatementBinder<DataElement> BINDER = new NameableWithStyleStatementBinder<DataElement>() {
-        @Override
-        public void bindToStatement(@NonNull DataElement o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(13, o.valueType());
-            w.bind(14, o.zeroIsSignificant());
-            w.bind(15, o.aggregationType());
-            w.bind(16, o.formName());
-            w.bind(17, o.domainType());
-            w.bind(18, o.displayFormName());
-            w.bind(19, o.optionSetUid());
-            w.bind(20, o.categoryComboUid());
-            w.bind(21, o.fieldMask());
+    companion object {
+        private val BINDER: StatementBinder<DataElement> = object : NameableWithStyleStatementBinder<DataElement>() {
+            override fun bindToStatement(o: DataElement, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(13, o.valueType())
+                w.bind(14, o.zeroIsSignificant())
+                w.bind(15, o.aggregationType())
+                w.bind(16, o.formName())
+                w.bind(17, o.domainType())
+                w.bind(18, o.displayFormName())
+                w.bind(19, o.optionSetUid())
+                w.bind(20, o.categoryComboUid())
+                w.bind(21, o.fieldMask())
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<DataElement> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter,
-                DataElementTableInfo.TABLE_INFO, BINDER, DataElement::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java
index 889cb7286b..18998292db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java
@@ -28,7 +28,8 @@
 
 package org.hisp.dhis.android.core.dataset;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
+import static org.hisp.dhis.android.core.dataset.DataSetTableInfo.Columns;
+
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -39,6 +40,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.common.IdentifiableColumns;
 import org.hisp.dhis.android.core.dataset.internal.DataSetFields;
+import org.hisp.dhis.android.core.dataset.internal.DataSetStore;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 import org.hisp.dhis.android.core.period.PeriodType;
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
@@ -51,14 +53,12 @@
 
 import dagger.Reusable;
 
-import static org.hisp.dhis.android.core.dataset.DataSetTableInfo.Columns;
-
 @Reusable
 public class DataSetCollectionRepository
-            extends ReadOnlyIdentifiableCollectionRepositoryImpl<DataSet, DataSetCollectionRepository> {
+        extends ReadOnlyIdentifiableCollectionRepositoryImpl<DataSet, DataSetCollectionRepository> {
 
     @Inject
-    DataSetCollectionRepository(final IdentifiableObjectStore<DataSet> store,
+    DataSetCollectionRepository(final DataSetStore store,
                                 final Map<String, ChildrenAppender<DataSet>> childrenAppenders,
                                 final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
index 2b488aad4a..e9457b7f63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -34,7 +34,6 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -46,6 +45,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationHandler
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationPostCall
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore
 import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository
@@ -56,7 +56,7 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataSetCompleteRegistration>>,
     scope: RepositoryScope,
-    handler: Handler<DataSetCompleteRegistration>,
+    handler: DataSetCompleteRegistrationHandler,
     private val postCall: DataSetCompleteRegistrationPostCall,
     private val credentialsRepository: UserCredentialsObjectRepository
 ) : ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationCollectionRepository>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java
index 6b12a54217..0660260494 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.dataset.internal.SectionFields;
+import org.hisp.dhis.android.core.dataset.internal.SectionStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class SectionCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<Section, SectionCollectionRepository> {
 
     @Inject
-    SectionCollectionRepository(final IdentifiableObjectStore<Section> store,
+    SectionCollectionRepository(final SectionStore store,
                                 final Map<String, ChildrenAppender<Section>> childrenAppenders,
                                 final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java
index 0af5fb7768..933ef51b92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java
@@ -54,7 +54,7 @@ static ChildrenAppender<DataSet> create(DatabaseAdapter databaseAdapter) {
         return new DataInputPeriodChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        DataInputPeriodLinkStore.CHILD_PROJECTION,
+                        DataInputPeriodStoreImpl.Companion.getCHILD_PROJECTION(),
                         DataInputPeriod::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt
index 10aa85bba7..b934b30e5a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt
@@ -25,22 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Module
-public final class TrackedEntityInstanceSyncEntityDIModule {
+internal class DataInputPeriodEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataInputPeriodStore {
+        return DataInputPeriodStoreImpl(databaseAdapter)
+    }
 
     @Provides
     @Reusable
-    public ObjectWithoutUidStore<TrackedEntityInstanceSync> store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityInstanceSyncStore.create(databaseAdapter);
+    fun handler(store: DataInputPeriodStore): DataInputPeriodHandler {
+        return DataInputPeriodHandler(store)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
new file mode 100644
index 0000000000..f29e3e421c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.dataset.DataInputPeriod
+
+internal class DataInputPeriodHandler(
+    store: DataInputPeriodStore
+) : LinkHandlerImpl<DataInputPeriod, DataInputPeriod>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStore.kt
new file mode 100644
index 0000000000..908f3a5c7e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.dataset.DataInputPeriod
+
+internal interface DataInputPeriodStore : LinkStore<DataInputPeriod>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
index c7b046fa8d..80814a776a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
@@ -25,40 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.dataset.DataInputPeriod;
-import org.hisp.dhis.android.core.dataset.DataInputPeriodTableInfo;
-
-final class DataInputPeriodLinkStore {
-
-    private static final StatementBinder<DataInputPeriod> BINDER =
-            (dataInputPeriod, w) -> {
-                w.bind(1, UidsHelper.getUidOrNull(dataInputPeriod.dataSet()));
-                w.bind(2, UidsHelper.getUidOrNull(dataInputPeriod.period()));
-                w.bind(3, dataInputPeriod.openingDate());
-                w.bind(4, dataInputPeriod.closingDate());
-            };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            DataInputPeriodTableInfo.TABLE_INFO, DataInputPeriodTableInfo.Columns.DATA_SET);
-
-    private DataInputPeriodLinkStore() {}
-
-    public static LinkStore<DataInputPeriod> create(DatabaseAdapter databaseAdapter) {
-
-        return StoreFactory.linkStore(
-                databaseAdapter,
-                DataInputPeriodTableInfo.TABLE_INFO,
-                DataInputPeriodTableInfo.Columns.DATA_SET,
-                BINDER,
-                DataInputPeriod::create);
+package org.hisp.dhis.android.core.dataset.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.dataset.DataInputPeriod
+import org.hisp.dhis.android.core.dataset.DataInputPeriodTableInfo
+
+internal class DataInputPeriodStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataInputPeriodStore,
+    LinkStoreImpl<DataInputPeriod>(
+        databaseAdapter,
+        DataInputPeriodTableInfo.TABLE_INFO,
+        DataInputPeriodTableInfo.Columns.DATA_SET,
+        BINDER,
+        { cursor: Cursor -> DataInputPeriod.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { dataInputPeriod: DataInputPeriod, w: StatementWrapper ->
+            w.bind(1, getUidOrNull(dataInputPeriod.dataSet()))
+            w.bind(2, getUidOrNull(dataInputPeriod.period()))
+            w.bind(3, dataInputPeriod.openingDate())
+            w.bind(4, dataInputPeriod.closingDate())
+        }
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            DataInputPeriodTableInfo.TABLE_INFO, DataInputPeriodTableInfo.Columns.DATA_SET
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
index 8dd97129e4..6171390482 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
@@ -29,14 +29,13 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 
 @Reusable
 internal class DataSetCompleteRegistrationCallProcessor @Inject internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
-    private val handler: Handler<DataSetCompleteRegistration>
+    private val handler: DataSetCompleteRegistrationHandler
 ) {
 
     internal fun process(objectList: List<DataSetCompleteRegistration>, query: DataSetCompleteRegistrationQuery) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.java
deleted file mode 100644
index 48256f5c5a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataSetCompleteRegistrationEntityDIModule
-        implements ObjectWithoutUidStoreProvider<DataSetCompleteRegistration> {
-
-    @Override
-    @Provides
-    @Reusable
-    public DataSetCompleteRegistrationStore store(DatabaseAdapter databaseAdapter) {
-        return DataSetCompleteRegistrationStoreImpl.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<DataSetCompleteRegistration> handler(DataSetCompleteRegistrationStore store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<DataSetCompleteRegistration>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
similarity index 71%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
index d8be47d693..f0bda1c7b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
@@ -25,39 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.datavalue.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.datavalue.DataValue;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 
 @Module
-public final class DataValueEntityDIModule {
-
+internal class DataSetCompleteRegistrationEntityDIModule {
     @Provides
     @Reusable
-    DataValueStore store(DatabaseAdapter databaseAdapter) {
-        return DataValueStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): DataSetCompleteRegistrationStore {
+        return DataSetCompleteRegistrationStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Handler<DataValue> handler(DataValueStore dataValueStore) {
-        return new DataValueHandler(dataValueStore);
+    fun handler(store: DataSetCompleteRegistrationStore): DataSetCompleteRegistrationHandler {
+        return DataSetCompleteRegistrationHandler(store)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<DataValue>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<DataSetCompleteRegistration>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
new file mode 100644
index 0000000000..2755b585a0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+
+internal class DataSetCompleteRegistrationHandler(
+    store: DataSetCompleteRegistrationStore
+) : ObjectWithoutUidHandlerImpl<DataSetCompleteRegistration>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt
index 740064a1b4..1a2b1f2b02 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt
@@ -25,24 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration;
-
-import java.util.Collection;
-
-public interface DataSetCompleteRegistrationStore extends ObjectWithoutUidStore<DataSetCompleteRegistration> {
-
-    void setState(DataSetCompleteRegistration dataSetCompleteRegistration, State newState);
-
-    void setDeleted(DataSetCompleteRegistration dataSetCompleteRegistration);
-
-    boolean removeNotPresentAndSynced(Collection<String> dataSetUids,
-                                      Collection<String> periodIds,
-                                      String rootOrgunitUid);
-
-    boolean isBeingUpload(DataSetCompleteRegistration dscr);
-}
\ No newline at end of file
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+
+internal interface DataSetCompleteRegistrationStore : ObjectWithoutUidStore<DataSetCompleteRegistration> {
+    fun setState(dataSetCompleteRegistration: DataSetCompleteRegistration, newState: State?)
+    fun setDeleted(dataSetCompleteRegistration: DataSetCompleteRegistration)
+    fun removeNotPresentAndSynced(
+        dataSetUids: Collection<String>,
+        periodIds: Collection<String>,
+        rootOrgunitUid: String
+    ): Boolean
+
+    fun isBeingUpload(dscr: DataSetCompleteRegistration): Boolean
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.java
deleted file mode 100644
index 16b71206ac..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo;
-
-import java.util.Collection;
-
-final class DataSetCompleteRegistrationStoreImpl extends
-        ObjectWithoutUidStoreImpl<DataSetCompleteRegistration> implements DataSetCompleteRegistrationStore {
-
-    private static final StatementBinder<DataSetCompleteRegistration> BINDER =
-            (dataSetCompleteRegistration, w) -> {
-                w.bind(1, dataSetCompleteRegistration.period());
-                w.bind(2, dataSetCompleteRegistration.dataSet());
-                w.bind(3, dataSetCompleteRegistration.organisationUnit());
-                w.bind(4, dataSetCompleteRegistration.attributeOptionCombo());
-                w.bind(5, dataSetCompleteRegistration.date());
-                w.bind(6, dataSetCompleteRegistration.storedBy());
-                w.bind(7, dataSetCompleteRegistration.syncState());
-                w.bind(8, dataSetCompleteRegistration.deleted());
-            };
-
-    private static final WhereStatementBinder<DataSetCompleteRegistration> WHERE_UPDATE_BINDER =
-            (dataSetCompleteRegistration, w) -> {
-                w.bind(9, dataSetCompleteRegistration.period());
-                w.bind(10, dataSetCompleteRegistration.dataSet());
-                w.bind(11, dataSetCompleteRegistration.organisationUnit());
-                w.bind(12, dataSetCompleteRegistration.attributeOptionCombo());
-            };
-
-    private static final WhereStatementBinder<DataSetCompleteRegistration> WHERE_DELETE_BINDER =
-            (dataSetCompleteRegistration, w) -> {
-                w.bind(1, dataSetCompleteRegistration.period());
-                w.bind(2, dataSetCompleteRegistration.dataSet());
-                w.bind(3, dataSetCompleteRegistration.organisationUnit());
-                w.bind(4, dataSetCompleteRegistration.attributeOptionCombo());
-            };
-
-    private DataSetCompleteRegistrationStoreImpl(DatabaseAdapter databaseAdapter,
-                                                 SQLStatementBuilderImpl builder) {
-        super(databaseAdapter, builder, BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER,
-                DataSetCompleteRegistration::create);
-    }
-
-    public static DataSetCompleteRegistrationStoreImpl create(DatabaseAdapter databaseAdapter) {
-
-        SQLStatementBuilderImpl sqlStatementBuilder =
-                new SQLStatementBuilderImpl(DataSetCompleteRegistrationTableInfo.TABLE_INFO.name(),
-                        DataSetCompleteRegistrationTableInfo.TABLE_INFO.columns());
-
-        return new DataSetCompleteRegistrationStoreImpl(databaseAdapter, sqlStatementBuilder);
-    }
-
-    /**
-     * @param dataSetCompleteRegistration DataSetCompleteRegistration element you want to update
-     * @param newState                    The new state to be set for the DataValue
-     */
-    @Override
-    public void setState(DataSetCompleteRegistration dataSetCompleteRegistration, State newState) {
-        DataSetCompleteRegistration updatedDataSetCompleteRegistration
-                = dataSetCompleteRegistration.toBuilder().syncState(newState).build();
-
-        updateWhere(updatedDataSetCompleteRegistration);
-    }
-
-    @Override
-    public void setDeleted(DataSetCompleteRegistration dataSetCompleteRegistration) {
-        DataSetCompleteRegistration updatedDataSetCompleteRegistration
-                = dataSetCompleteRegistration.toBuilder().deleted(true).build();
-
-        updateWhere(updatedDataSetCompleteRegistration);
-    }
-
-    @Override
-    public boolean removeNotPresentAndSynced(Collection<String> dataSetUids,
-                                             Collection<String> periodIds,
-                                             String rootOrgunitUid) {
-        WhereClauseBuilder whereClause = new WhereClauseBuilder();
-
-        whereClause.appendInKeyStringValues(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dataSetUids);
-        whereClause.appendInKeyStringValues(DataSetCompleteRegistrationTableInfo.Columns.PERIOD, periodIds);
-
-        String subQuery = String.format("SELECT %s FROM %s WHERE %s LIKE '%s'",
-                OrganisationUnitTableInfo.Columns.UID,
-                OrganisationUnitTableInfo.TABLE_INFO.name(),
-                OrganisationUnitTableInfo.Columns.PATH,
-                "%" + rootOrgunitUid + "%");
-        whereClause.appendInSubQuery(DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT, subQuery);
-
-        whereClause.appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE, State.SYNCED);
-
-        return deleteWhere(whereClause.build());
-    }
-
-    @Override
-    public boolean isBeingUpload(DataSetCompleteRegistration dscr) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.PERIOD, dscr.period())
-                .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dscr.dataSet())
-                .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT,
-                        dscr.organisationUnit())
-                .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
-                        dscr.attributeOptionCombo())
-                .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE, State.UPLOADING)
-                .build();
-        return selectWhere(whereClause).size() > 0;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
new file mode 100644
index 0000000000..ce9941f465
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
@@ -0,0 +1,133 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+
+internal class DataSetCompleteRegistrationStoreImpl constructor(
+    databaseAdapter: DatabaseAdapter
+) : DataSetCompleteRegistrationStore,
+    ObjectWithoutUidStoreImpl<DataSetCompleteRegistration>(
+        databaseAdapter,
+        DataSetCompleteRegistrationTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> DataSetCompleteRegistration.create(cursor) }
+    ) {
+
+    /**
+     * @param dataSetCompleteRegistration DataSetCompleteRegistration element you want to update
+     * @param newState                    The new state to be set for the DataValue
+     */
+    override fun setState(dataSetCompleteRegistration: DataSetCompleteRegistration, newState: State?) {
+        val updatedDataSetCompleteRegistration = dataSetCompleteRegistration.toBuilder().syncState(newState).build()
+        updateWhere(updatedDataSetCompleteRegistration)
+    }
+
+    override fun setDeleted(dataSetCompleteRegistration: DataSetCompleteRegistration) {
+        val updatedDataSetCompleteRegistration = dataSetCompleteRegistration.toBuilder().deleted(true).build()
+        updateWhere(updatedDataSetCompleteRegistration)
+    }
+
+    override fun removeNotPresentAndSynced(
+        dataSetUids: Collection<String>,
+        periodIds: Collection<String>,
+        rootOrgunitUid: String
+    ): Boolean {
+        val whereClause = WhereClauseBuilder()
+        whereClause.appendInKeyStringValues(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dataSetUids)
+        whereClause.appendInKeyStringValues(DataSetCompleteRegistrationTableInfo.Columns.PERIOD, periodIds)
+        val subQuery = String.format(
+            "SELECT %s FROM %s WHERE %s LIKE '%s'",
+            OrganisationUnitTableInfo.Columns.UID,
+            OrganisationUnitTableInfo.TABLE_INFO.name(),
+            OrganisationUnitTableInfo.Columns.PATH,
+            "%$rootOrgunitUid%"
+        )
+        whereClause.appendInSubQuery(DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT, subQuery)
+        whereClause.appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE, State.SYNCED)
+        return deleteWhere(whereClause.build())
+    }
+
+    override fun isBeingUpload(dscr: DataSetCompleteRegistration): Boolean {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.PERIOD, dscr.period())
+            .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dscr.dataSet())
+            .appendKeyStringValue(
+                DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT,
+                dscr.organisationUnit()
+            )
+            .appendKeyStringValue(
+                DataSetCompleteRegistrationTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
+                dscr.attributeOptionCombo()
+            )
+            .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE, State.UPLOADING)
+            .build()
+
+        return selectWhere(whereClause).isNotEmpty()
+    }
+
+    companion object {
+        private val BINDER =
+            StatementBinder { dataSetCompleteRegistration: DataSetCompleteRegistration, w: StatementWrapper ->
+                w.bind(1, dataSetCompleteRegistration.period())
+                w.bind(2, dataSetCompleteRegistration.dataSet())
+                w.bind(3, dataSetCompleteRegistration.organisationUnit())
+                w.bind(4, dataSetCompleteRegistration.attributeOptionCombo())
+                w.bind(5, dataSetCompleteRegistration.date())
+                w.bind(6, dataSetCompleteRegistration.storedBy())
+                w.bind(7, dataSetCompleteRegistration.syncState())
+                w.bind(8, dataSetCompleteRegistration.deleted())
+            }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { dataSetCompleteRegistration: DataSetCompleteRegistration, w: StatementWrapper ->
+                w.bind(9, dataSetCompleteRegistration.period())
+                w.bind(10, dataSetCompleteRegistration.dataSet())
+                w.bind(11, dataSetCompleteRegistration.organisationUnit())
+                w.bind(12, dataSetCompleteRegistration.attributeOptionCombo())
+            }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { dataSetCompleteRegistration: DataSetCompleteRegistration, w: StatementWrapper ->
+                w.bind(1, dataSetCompleteRegistration.period())
+                w.bind(2, dataSetCompleteRegistration.dataSet())
+                w.bind(3, dataSetCompleteRegistration.organisationUnit())
+                w.bind(4, dataSetCompleteRegistration.attributeOptionCombo())
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.java
deleted file mode 100644
index ea18ba0f8d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataSetCompulsoryDataElementOperandEntityDIModule {
-
-    @Provides
-    @Reusable
-    LinkStore<DataSetCompulsoryDataElementOperandLink> store(DatabaseAdapter databaseAdapter) {
-        return DataSetCompulsoryDataElementOperandLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    LinkHandler<DataElementOperand, DataSetCompulsoryDataElementOperandLink> handler(
-            LinkStore<DataSetCompulsoryDataElementOperandLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
new file mode 100644
index 0000000000..8fa194a64e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class DataSetCompulsoryDataElementOperandEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataSetCompulsoryDataElementOperandLinkStore {
+        return DataSetCompulsoryDataElementOperandLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(
+        store: DataSetCompulsoryDataElementOperandLinkStore
+    ): DataSetCompulsoryDataElementOperandHandler {
+        return DataSetCompulsoryDataElementOperandHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
new file mode 100644
index 0000000000..70d3e9d8db
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
+
+internal class DataSetCompulsoryDataElementOperandHandler(
+    store: DataSetCompulsoryDataElementOperandLinkStore
+) : LinkHandlerImpl<DataElementOperand, DataSetCompulsoryDataElementOperandLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.kt
new file mode 100644
index 0000000000..3b23fe9a94
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
+
+internal interface DataSetCompulsoryDataElementOperandLinkStore : LinkStore<DataSetCompulsoryDataElementOperandLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
index 6dfba00ee4..0c6a709b98 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
@@ -25,32 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo;
-
-final class DataSetCompulsoryDataElementOperandLinkStore {
-
-    private static final StatementBinder<DataSetCompulsoryDataElementOperandLink> BINDER = (o, w) -> {
-        w.bind(1, o.dataSet());
-        w.bind(2, o.dataElementOperand());
-    };
-
-    private DataSetCompulsoryDataElementOperandLinkStore() {
-    }
-
-    public static LinkStore<DataSetCompulsoryDataElementOperandLink> create(DatabaseAdapter databaseAdapter) {
-
-        return StoreFactory.linkStore(databaseAdapter,
-                DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
-                DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_SET,
-                BINDER,
-                DataSetCompulsoryDataElementOperandLink::create);
+internal class DataSetCompulsoryDataElementOperandLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetCompulsoryDataElementOperandLinkStore,
+    LinkStoreImpl<DataSetCompulsoryDataElementOperandLink>(
+        databaseAdapter,
+        DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
+        DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_SET,
+        BINDER,
+        { cursor: Cursor -> DataSetCompulsoryDataElementOperandLink.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: DataSetCompulsoryDataElementOperandLink, w: StatementWrapper ->
+            w.bind(1, o.dataSet())
+            w.bind(2, o.dataElementOperand())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt
new file mode 100644
index 0000000000..6d52ada78e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class DataSetElementEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataSetElementStore {
+        return DataSetElementStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: DataSetElementStore): DataSetElementHandler {
+        return DataSetElementHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
new file mode 100644
index 0000000000..3a3c4e65ec
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.dataset.DataSetElement
+
+internal class DataSetElementHandler(
+    store: DataSetElementStore
+) : LinkHandlerImpl<DataSetElement, DataSetElement>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStore.kt
new file mode 100644
index 0000000000..e3011b1edd
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.dataset.DataSetElement
+
+internal interface DataSetElementStore : LinkStore<DataSetElement>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
index 181dfcad08..564f84f6ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetDataElementLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
@@ -25,32 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.dataset.DataSetElement
+import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.dataset.DataSetElement;
-import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo;
+internal class DataSetElementStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetElementStore,
+    LinkStoreImpl<DataSetElement>(
+        databaseAdapter, DataSetElementLinkTableInfo.TABLE_INFO,
+        DataSetElementLinkTableInfo.Columns.DATA_SET,
+        BINDER,
+        { cursor: Cursor -> DataSetElement.create(cursor) }
+    ) {
 
-final class DataSetDataElementLinkStore {
-
-    private static final StatementBinder<DataSetElement> BINDER = (o, w) -> {
-        w.bind(1, UidsHelper.getUidOrNull(o.dataSet()));
-        w.bind(2, UidsHelper.getUidOrNull(o.dataElement()));
-        w.bind(3, UidsHelper.getUidOrNull(o.categoryCombo()));
-    };
-
-    private DataSetDataElementLinkStore() {}
-
-    public static LinkStore<DataSetElement> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                DataSetElementLinkTableInfo.TABLE_INFO,
-                DataSetElementLinkTableInfo.Columns.DATA_SET,
-                BINDER,
-                DataSetElement::create);
+    companion object {
+        private val BINDER = StatementBinder { o: DataSetElement, w: StatementWrapper ->
+            w.bind(1, getUidOrNull(o.dataSet()))
+            w.bind(2, getUidOrNull(o.dataElement()))
+            w.bind(3, getUidOrNull(o.categoryCombo()))
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java
index 0f52743027..87164f41b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java
@@ -37,7 +37,6 @@
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor;
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.internal.DataAccessFields;
 import org.hisp.dhis.android.core.dataset.DataSet;
 import org.hisp.dhis.android.core.resource.internal.Resource;
@@ -54,14 +53,14 @@ final class DataSetEndpointCallFactory extends UidsCallFactoryImpl<DataSet> {
     private static final int MAX_UID_LIST_SIZE = 50;
 
     private final DataSetService dataSetService;
-    private final Handler<DataSet> dataSetHandler;
+    private final DataSetHandler dataSetHandler;
     private final Resource.Type resourceType = Resource.Type.DATA_SET;
 
     @Inject
     DataSetEndpointCallFactory(GenericCallData data,
                                APICallExecutor apiCallExecutor,
                                DataSetService dataSetService,
-                               Handler<DataSet> dataSetHandler) {
+                               DataSetHandler dataSetHandler) {
         super(data, apiCallExecutor);
         this.dataSetService = dataSetService;
         this.dataSetHandler = dataSetHandler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.java
deleted file mode 100644
index 90fc8a4431..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetTableInfo;
-import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.dataset.SectionTableInfo;
-import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataSetEntityDIModule {
-
-    @Provides
-    @Reusable
-    IdentifiableObjectStore<DataSet> store(DatabaseAdapter databaseAdapter) {
-        return DataSetStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<DataSet> handler(DataSetHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    OrphanCleaner<DataSet, Section> sectionOrphanCleaner(DatabaseAdapter databaseAdapter) {
-        return new OrphanCleanerImpl<>(SectionTableInfo.TABLE_INFO.name(), SectionTableInfo.Columns.DATA_SET,
-                databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public CollectionCleaner<DataSet> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(DataSetTableInfo.TABLE_INFO.name(), databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkCleaner<DataSet> linkCleaner(IdentifiableObjectStore<DataSet> dataSetStore,
-                                            DatabaseAdapter databaseAdapter) {
-        return new LinkCleanerImpl<>(DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
-                dataSetStore,
-                databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<DataSet>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-
-        return new HashMap<String, ChildrenAppender<DataSet>>() {{
-            put(DataSetFields.COMPULSORY_DATA_ELEMENT_OPERANDS,
-                    DataSetCompulsoryDataElementOperandChildrenAppender.create(databaseAdapter));
-            put(DataSetFields.DATA_INPUT_PERIODS, DataInputPeriodChildrenAppender.create(databaseAdapter));
-            put(DataSetFields.DATA_SET_ELEMENTS, DataSetElementChildrenAppender.create(databaseAdapter));
-            put(DataSetFields.INDICATORS, DataSetIndicatorChildrenAppender.create(databaseAdapter));
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
new file mode 100644
index 0000000000..6497b30362
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
@@ -0,0 +1,128 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetTableInfo
+import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.dataset.SectionTableInfo
+import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender
+import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
+
+@Module
+internal class DataSetEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataSetStore {
+        return DataSetStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    @Suppress("LongParameterList")
+    fun handler(
+        dataSetStore: DataSetStore,
+        sectionHandler: SectionHandler,
+        sectionOrphanCleaner: OrphanCleaner<DataSet, Section>,
+        compulsoryDataElementOperandHandler: DataElementOperandHandler,
+        dataSetCompulsoryDataElementOperandLinkHandler: DataSetCompulsoryDataElementOperandHandler,
+        dataInputPeriodHandler: DataInputPeriodHandler,
+        dataSetElementLinkHandler: DataSetElementHandler,
+        dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
+        collectionCleaner: CollectionCleaner<DataSet>,
+        linkCleaner: LinkCleaner<DataSet>
+    ): DataSetHandler {
+        return DataSetHandler(
+            dataSetStore,
+            sectionHandler,
+            sectionOrphanCleaner,
+            compulsoryDataElementOperandHandler,
+            dataSetCompulsoryDataElementOperandLinkHandler,
+            dataInputPeriodHandler,
+            dataSetElementLinkHandler,
+            dataSetIndicatorLinkHandler,
+            collectionCleaner,
+            linkCleaner
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun sectionOrphanCleaner(databaseAdapter: DatabaseAdapter?): OrphanCleaner<DataSet, Section> {
+        return OrphanCleanerImpl(
+            SectionTableInfo.TABLE_INFO.name(), SectionTableInfo.Columns.DATA_SET,
+            databaseAdapter!!
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<DataSet> {
+        return CollectionCleanerImpl(DataSetTableInfo.TABLE_INFO.name(), databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun linkCleaner(
+        dataSetStore: DataSetStore,
+        databaseAdapter: DatabaseAdapter
+    ): LinkCleaner<DataSet> {
+        return LinkCleanerImpl(
+            DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
+            dataSetStore,
+            databaseAdapter
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataSet>> {
+        return mapOf(
+            DataSetFields.COMPULSORY_DATA_ELEMENT_OPERANDS to
+                DataSetCompulsoryDataElementOperandChildrenAppender.create(databaseAdapter),
+
+            DataSetFields.DATA_INPUT_PERIODS to DataInputPeriodChildrenAppender.create(databaseAdapter),
+            DataSetFields.DATA_SET_ELEMENTS to DataSetElementChildrenAppender.create(databaseAdapter),
+            DataSetFields.INDICATORS to DataSetIndicatorChildrenAppender.create(databaseAdapter)
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.java
deleted file mode 100644
index 0632f77ec6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
-import org.hisp.dhis.android.core.dataset.DataInputPeriod;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink;
-import org.hisp.dhis.android.core.dataset.DataSetElement;
-import org.hisp.dhis.android.core.dataset.DataSetInternalAccessor;
-import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink;
-import org.hisp.dhis.android.core.indicator.Indicator;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class DataSetHandler extends IdentifiableHandlerImpl<DataSet> {
-
-    private final Handler<Section> sectionHandler;
-    private final OrphanCleaner<DataSet, Section> sectionOrphanCleaner;
-
-    private final Handler<DataElementOperand> compulsoryDataElementOperandHandler;
-    private final LinkHandler<DataElementOperand, DataSetCompulsoryDataElementOperandLink>
-            dataSetCompulsoryDataElementOperandLinkHandler;
-
-    private final LinkHandler<DataInputPeriod, DataInputPeriod> dataInputPeriodHandler;
-    private final LinkHandler<DataSetElement, DataSetElement> dataSetElementLinkHandler;
-    private final LinkHandler<Indicator, DataSetIndicatorLink> dataSetIndicatorLinkHandler;
-    private final CollectionCleaner<DataSet> collectionCleaner;
-    private final LinkCleaner<DataSet> linkCleaner;
-
-    @Inject
-    DataSetHandler(IdentifiableObjectStore<DataSet> dataSetStore,
-                   Handler<Section> sectionHandler,
-                   OrphanCleaner<DataSet, Section> sectionOrphanCleaner,
-                   Handler<DataElementOperand> compulsoryDataElementOperandHandler,
-                   LinkHandler<DataElementOperand, DataSetCompulsoryDataElementOperandLink>
-                           dataSetCompulsoryDataElementOperandLinkHandler,
-                   LinkHandler<DataInputPeriod, DataInputPeriod> dataInputPeriodHandler,
-                   LinkHandler<DataSetElement, DataSetElement> dataSetElementLinkHandler,
-                   LinkHandler<Indicator, DataSetIndicatorLink> dataSetIndicatorLinkHandler,
-                   CollectionCleaner<DataSet> collectionCleaner, LinkCleaner<DataSet> linkCleaner) {
-
-        super(dataSetStore);
-        this.sectionHandler = sectionHandler;
-        this.sectionOrphanCleaner = sectionOrphanCleaner;
-        this.compulsoryDataElementOperandHandler = compulsoryDataElementOperandHandler;
-        this.dataSetCompulsoryDataElementOperandLinkHandler = dataSetCompulsoryDataElementOperandLinkHandler;
-        this.dataInputPeriodHandler = dataInputPeriodHandler;
-        this.dataSetElementLinkHandler = dataSetElementLinkHandler;
-        this.dataSetIndicatorLinkHandler = dataSetIndicatorLinkHandler;
-        this.collectionCleaner = collectionCleaner;
-        this.linkCleaner = linkCleaner;
-    }
-
-    @Override
-    protected void afterObjectHandled(final DataSet dataSet, HandleAction action) {
-
-        List<Section> sections = DataSetInternalAccessor.accessSections(dataSet);
-
-        sectionHandler.handleMany(sections);
-
-        compulsoryDataElementOperandHandler.handleMany(dataSet.compulsoryDataElementOperands());
-
-        dataSetCompulsoryDataElementOperandLinkHandler.handleMany(dataSet.uid(),
-                dataSet.compulsoryDataElementOperands(),
-                dataElementOperand -> DataSetCompulsoryDataElementOperandLink.builder()
-                        .dataSet(dataSet.uid()).dataElementOperand(dataElementOperand.uid()).build());
-
-        dataInputPeriodHandler.handleMany(dataSet.uid(),
-                dataSet.dataInputPeriods(),
-                dataInputPeriod -> dataInputPeriod.toBuilder().dataSet(ObjectWithUid.create(dataSet.uid())).build());
-
-        dataSetElementLinkHandler.handleMany(dataSet.uid(), dataSet.dataSetElements(),
-                dataSetElement -> dataSetElement.toBuilder().dataSet(ObjectWithUid.create(dataSet.uid())).build());
-
-        dataSetIndicatorLinkHandler.handleMany(dataSet.uid(), dataSet.indicators(),
-                indicator -> DataSetIndicatorLink.builder().dataSet(dataSet.uid()).indicator(indicator.uid()).build());
-
-        if (action == HandleAction.Update) {
-            sectionOrphanCleaner.deleteOrphan(dataSet, sections);
-        }
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<DataSet> dataSets) {
-        collectionCleaner.deleteNotPresent(dataSets);
-        linkCleaner.deleteNotPresent(dataSets);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
new file mode 100644
index 0000000000..b3053fcffb
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
+import org.hisp.dhis.android.core.dataset.DataInputPeriod
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
+import org.hisp.dhis.android.core.dataset.DataSetElement
+import org.hisp.dhis.android.core.dataset.DataSetInternalAccessor
+import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
+import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
+
+@Suppress("LongParameterList")
+internal class DataSetHandler constructor(
+    dataSetStore: IdentifiableObjectStore<DataSet>,
+    private val sectionHandler: SectionHandler,
+    private val sectionOrphanCleaner: OrphanCleaner<DataSet, Section>,
+    private val compulsoryDataElementOperandHandler: DataElementOperandHandler,
+    private val dataSetCompulsoryDataElementOperandLinkHandler: DataSetCompulsoryDataElementOperandHandler,
+    private val dataInputPeriodHandler: DataInputPeriodHandler,
+    private val dataSetElementLinkHandler: DataSetElementHandler,
+    private val dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
+    private val collectionCleaner: CollectionCleaner<DataSet>,
+    private val linkCleaner: LinkCleaner<DataSet>
+) : IdentifiableHandlerImpl<DataSet>(dataSetStore) {
+
+    override fun afterObjectHandled(o: DataSet, action: HandleAction) {
+        val sections = DataSetInternalAccessor.accessSections(o)
+        sectionHandler.handleMany(sections)
+        compulsoryDataElementOperandHandler.handleMany(o.compulsoryDataElementOperands())
+        dataSetCompulsoryDataElementOperandLinkHandler.handleMany(
+            o.uid(),
+            o.compulsoryDataElementOperands()
+        ) { dataElementOperand: DataElementOperand ->
+            DataSetCompulsoryDataElementOperandLink.builder()
+                .dataSet(o.uid())
+                .dataElementOperand(dataElementOperand.uid())
+                .build()
+        }
+        dataInputPeriodHandler.handleMany(
+            o.uid(),
+            o.dataInputPeriods()
+        ) { dataInputPeriod: DataInputPeriod ->
+            dataInputPeriod.toBuilder().dataSet(ObjectWithUid.create(o.uid())).build()
+        }
+        dataSetElementLinkHandler.handleMany(
+            o.uid(), o.dataSetElements()
+        ) { dataSetElement: DataSetElement ->
+            dataSetElement.toBuilder().dataSet(ObjectWithUid.create(o.uid())).build()
+        }
+        dataSetIndicatorLinkHandler.handleMany(
+            o.uid(), o.indicators()
+        ) { indicator: Indicator ->
+            DataSetIndicatorLink.builder().dataSet(o.uid()).indicator(indicator.uid()).build()
+        }
+
+        if (action === HandleAction.Update) {
+            sectionOrphanCleaner.deleteOrphan(o, sections)
+        }
+    }
+
+    override fun afterCollectionHandled(oCollection: Collection<DataSet>?) {
+        collectionCleaner.deleteNotPresent(oCollection)
+        linkCleaner.deleteNotPresent(oCollection)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt
new file mode 100644
index 0000000000..40cd03a2c1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class DataSetInstanceEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataSetInstanceStore {
+        return DataSetInstanceStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun summaryStore(databaseAdapter: DatabaseAdapter): DataSetInstanceSummaryStore {
+        return DataSetInstanceSummaryStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.java
deleted file mode 100644
index 2f78a4b741..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import android.database.Cursor;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.ReadOnlySQLStatementBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl;
-import org.hisp.dhis.android.core.dataset.DataSetInstance;
-
-import kotlin.jvm.functions.Function1;
-
-public final class DataSetInstanceStore extends ReadableStoreImpl<DataSetInstance> {
-
-    private DataSetInstanceStore(DatabaseAdapter databaseAdapter,
-                                 ReadOnlySQLStatementBuilder builder,
-                                 Function1<Cursor, DataSetInstance> objectFactory) {
-        super(databaseAdapter, builder, objectFactory);
-    }
-
-    static DataSetInstanceStore create(DatabaseAdapter databaseAdapter) {
-        return new DataSetInstanceStore(
-                databaseAdapter,
-                new DataSetInstanceSQLStatementBuilder(),
-                DataSetInstance::create);
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.kt
new file mode 100644
index 0000000000..1247e740b3
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.dataset.DataSetInstance
+
+internal interface DataSetInstanceStore : ReadableStore<DataSetInstance>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
new file mode 100644
index 0000000000..69dc503591
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl
+import org.hisp.dhis.android.core.dataset.DataSetInstance
+
+internal class DataSetInstanceStoreImpl constructor(
+    databaseAdapter: DatabaseAdapter
+) : DataSetInstanceStore,
+    ReadableStoreImpl<DataSetInstance>(
+        databaseAdapter,
+        DataSetInstanceSQLStatementBuilder(),
+        { cursor: Cursor -> DataSetInstance.create(cursor) }
+    )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.java
deleted file mode 100644
index bac619a654..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import android.database.Cursor;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.ReadOnlySQLStatementBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl;
-import org.hisp.dhis.android.core.dataset.DataSetInstanceSummary;
-
-import kotlin.jvm.functions.Function1;
-
-public final class DataSetInstanceSummaryStore extends ReadableStoreImpl<DataSetInstanceSummary> {
-
-    private DataSetInstanceSummaryStore(DatabaseAdapter databaseAdapter,
-                                        ReadOnlySQLStatementBuilder builder,
-                                        Function1<Cursor, DataSetInstanceSummary> objectFactory) {
-        super(databaseAdapter, builder, objectFactory);
-    }
-
-    static DataSetInstanceSummaryStore create(DatabaseAdapter databaseAdapter) {
-        return new DataSetInstanceSummaryStore(
-                databaseAdapter,
-                new DataSetInstanceSummarySQLStatementBuilder(),
-                DataSetInstanceSummary::create);
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.kt
new file mode 100644
index 0000000000..19c1b21baa
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.dataset.DataSetInstanceSummary
+
+internal interface DataSetInstanceSummaryStore : ReadableStore<DataSetInstanceSummary>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
new file mode 100644
index 0000000000..ad2e714183
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl
+import org.hisp.dhis.android.core.dataset.DataSetInstanceSummary
+
+internal class DataSetInstanceSummaryStoreImpl constructor(
+    databaseAdapter: DatabaseAdapter
+) : DataSetInstanceSummaryStore,
+    ReadableStoreImpl<DataSetInstanceSummary>(
+        databaseAdapter,
+        DataSetInstanceSummarySQLStatementBuilder(),
+        { cursor: Cursor -> DataSetInstanceSummary.create(cursor) }
+    )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index accf9639e7..d76cb0488c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -32,12 +32,10 @@ import io.reactivex.Completable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionSet
@@ -54,7 +52,7 @@ internal class DataSetModuleDownloader @Inject internal constructor(
     private val validationRuleCall: UidsCall<ValidationRule>,
     private val validationRuleUidsCall: ValidationRuleUidsCall,
     private val periodHandler: PeriodHandler,
-    private val dataSetOrganisationUnitLinkStore: LinkStore<DataSetOrganisationUnitLink>
+    private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt
index 9faf9400b9..4bc5db2b8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt
@@ -31,25 +31,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
 
 @Module
 internal class DataSetOrganisationUnitLinkEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<DataSetOrganisationUnitLink> {
-        return DataSetOrganisationUnitLinkStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): DataSetOrganisationUnitLinkStore {
+        return DataSetOrganisationUnitLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: LinkStore<DataSetOrganisationUnitLink>):
-        LinkHandler<ObjectWithUid, DataSetOrganisationUnitLink> {
-        return LinkHandlerImpl(store)
+    fun handler(store: DataSetOrganisationUnitLinkStore): DataSetOrganisationUnitLinkHandler {
+        return DataSetOrganisationUnitLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
new file mode 100644
index 0000000000..53cc1dbdd0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
+
+internal class DataSetOrganisationUnitLinkHandler(
+    store: DataSetOrganisationUnitLinkStore
+) : LinkHandlerImpl<ObjectWithUid, DataSetOrganisationUnitLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.kt
new file mode 100644
index 0000000000..d147127c05
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
+
+internal interface DataSetOrganisationUnitLinkStore : LinkStore<DataSetOrganisationUnitLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
index b022987f83..9f8709f4f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
@@ -25,30 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink;
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo;
+internal class DataSetOrganisationUnitLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetOrganisationUnitLinkStore,
+    LinkStoreImpl<DataSetOrganisationUnitLink>(
+        databaseAdapter, DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
+        DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+        BINDER,
+        { cursor: Cursor -> DataSetOrganisationUnitLink.create(cursor) }
+    ) {
 
-public final class DataSetOrganisationUnitLinkStore {
-
-    private static final StatementBinder<DataSetOrganisationUnitLink> BINDER = (o, w) -> {
-        w.bind(1, o.dataSet());
-        w.bind(2, o.organisationUnit());
-    };
-
-    private DataSetOrganisationUnitLinkStore() {}
-
-    public static LinkStore<DataSetOrganisationUnitLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
-                DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                BINDER,
-                DataSetOrganisationUnitLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: DataSetOrganisationUnitLink, w: StatementWrapper ->
+            w.bind(1, o.dataSet())
+            w.bind(2, o.organisationUnit())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.kt
new file mode 100644
index 0000000000..dbb7fdfe3a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.dataset.DataSet
+
+internal interface DataSetStore : IdentifiableObjectStore<DataSet>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
similarity index 52%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
index dbf7ee93fa..ed198eac98 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
@@ -25,44 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 
-import androidx.annotation.NonNull;
+@Suppress("MagicNumber")
+internal class DataSetStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetStore,
+    IdentifiableObjectStoreImpl<DataSet>(
+        databaseAdapter,
+        DataSetTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> DataSet.create(cursor) }
+    ) {
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.indicator.Indicator;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo;
-
-
-public final class IndicatorStore {
-
-    private IndicatorStore() {
-    }
-
-    private static StatementBinder<Indicator> BINDER = new NameableWithStyleStatementBinder<Indicator>() {
-        @Override
-        public void bindToStatement(@NonNull Indicator o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(13, o.annualized());
-            w.bind(14, UidsHelper.getUidOrNull(o.indicatorType()));
-            w.bind(15, o.numerator());
-            w.bind(16, o.numeratorDescription());
-            w.bind(17, o.denominator());
-            w.bind(18, o.denominatorDescription());
-            w.bind(19, o.url());
-            w.bind(20, o.decimals());
+    companion object {
+        private val BINDER: StatementBinder<DataSet> = object : NameableWithStyleStatementBinder<DataSet>() {
+            override fun bindToStatement(o: DataSet, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(13, o.periodType())
+                w.bind(14, getUidOrNull(o.categoryCombo()))
+                w.bind(15, o.mobile())
+                w.bind(16, o.version())
+                w.bind(17, o.expiryDays())
+                w.bind(18, o.timelyDays())
+                w.bind(19, o.notifyCompletingUser())
+                w.bind(20, o.openFuturePeriods())
+                w.bind(21, o.fieldCombinationRequired())
+                w.bind(22, o.validCompleteOnly())
+                w.bind(23, o.noValueRequiresComment())
+                w.bind(24, o.skipOffline())
+                w.bind(25, o.dataElementDecoration())
+                w.bind(26, o.renderAsTabs())
+                w.bind(27, o.renderHorizontally())
+                w.bind(28, o.access().data().write())
+                w.bind(29, getUidOrNull(o.workflow()))
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<Indicator> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, IndicatorTableInfo.INSTANCE.getTABLE_INFO(), BINDER,
-                Indicator::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.java
deleted file mode 100644
index d8645941f9..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.dataset.SectionDataElementLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class SectionDataElementEntityDIModule {
-
-    @Provides
-    @Reusable
-    LinkStore<SectionDataElementLink> store(DatabaseAdapter databaseAdapter) {
-        return SectionDataElementLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    OrderedLinkHandler<DataElement, SectionDataElementLink> handler(LinkStore<SectionDataElementLink> store) {
-        return new OrderedLinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt
new file mode 100644
index 0000000000..81e46677c5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class SectionDataElementEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): SectionDataElementLinkStore {
+        return SectionDataElementLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: SectionDataElementLinkStore): SectionDataElementLinkHandler {
+        return SectionDataElementLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
new file mode 100644
index 0000000000..8d7037a4de
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataset.SectionDataElementLink
+
+internal class SectionDataElementLinkHandler(
+    store: SectionDataElementLinkStore
+) : OrderedLinkHandlerImpl<DataElement, SectionDataElementLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.kt
new file mode 100644
index 0000000000..e9ad346829
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.dataset.SectionDataElementLink
+
+internal interface SectionDataElementLinkStore : LinkStore<SectionDataElementLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
index 6b4643ce39..c3a0b4be17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
@@ -25,31 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.dataset.SectionDataElementLink
+import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.dataset.SectionDataElementLink;
-import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo;
+internal class SectionDataElementLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SectionDataElementLinkStore,
+    LinkStoreImpl<SectionDataElementLink>(
+        databaseAdapter, SectionDataElementLinkTableInfo.TABLE_INFO,
+        SectionDataElementLinkTableInfo.Columns.SECTION,
+        BINDER,
+        { cursor: Cursor -> SectionDataElementLink.create(cursor) }
+    ) {
 
-final class SectionDataElementLinkStore {
-
-    private static final StatementBinder<SectionDataElementLink> BINDER = (o, w) -> {
-        w.bind(1, o.section());
-        w.bind(2, o.dataElement());
-        w.bind(3, o.sortOrder());
-    };
-
-    private SectionDataElementLinkStore() {}
-
-    public static LinkStore<SectionDataElementLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                SectionDataElementLinkTableInfo.TABLE_INFO,
-                SectionDataElementLinkTableInfo.Columns.SECTION,
-                BINDER,
-                SectionDataElementLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: SectionDataElementLink, w: StatementWrapper ->
+            w.bind(1, o.section())
+            w.bind(2, o.dataElement())
+            w.bind(3, o.sortOrder())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
index 6d51f6be5f..9d9bf0d170 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataset.Section
 
@@ -40,14 +38,8 @@ import org.hisp.dhis.android.core.dataset.Section
 internal class SectionEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter?): IdentifiableObjectStore<Section> {
-        return SectionStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(impl: SectionHandler): Handler<Section> {
-        return impl
+    fun store(databaseAdapter: DatabaseAdapter): SectionStore {
+        return SectionStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.java
deleted file mode 100644
index bd9c359942..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
-import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class SectionGreyedFieldsEntityDIModule {
-
-    @Provides
-    @Reusable
-    LinkStore<SectionGreyedFieldsLink> store(DatabaseAdapter databaseAdapter) {
-        return SectionGreyedFieldsLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    LinkHandler<DataElementOperand, SectionGreyedFieldsLink> handler(
-            LinkStore<SectionGreyedFieldsLink> store) {
-        return  new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt
new file mode 100644
index 0000000000..8035307bd1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class SectionGreyedFieldsEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): SectionGreyedFieldsLinkStore {
+        return SectionGreyedFieldsLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: SectionGreyedFieldsLinkStore): SectionGreyedFieldsLinkHandler {
+        return SectionGreyedFieldsLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
new file mode 100644
index 0000000000..141c52a642
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
+
+internal class SectionGreyedFieldsLinkHandler(
+    store: SectionGreyedFieldsLinkStore
+) : LinkHandlerImpl<DataElementOperand, SectionGreyedFieldsLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.kt
new file mode 100644
index 0000000000..f62f690740
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
+
+internal interface SectionGreyedFieldsLinkStore : LinkStore<SectionGreyedFieldsLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
index a608a60a23..10664a4b13 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
@@ -25,32 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
+import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink;
-import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo;
-
-final class SectionGreyedFieldsLinkStore {
-
-    private static final StatementBinder<SectionGreyedFieldsLink> BINDER = (o, w) -> {
-        w.bind(1, o.section());
-        w.bind(2, o.dataElementOperand());
-        w.bind(3, o.categoryOptionCombo());
-    };
-
-    private SectionGreyedFieldsLinkStore() {}
-
-    public static LinkStore<SectionGreyedFieldsLink> create(DatabaseAdapter databaseAdapter) {
-
-        return StoreFactory.linkStore(databaseAdapter,
-                SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
-                SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
-                BINDER,
-                SectionGreyedFieldsLink::create);
+internal class SectionGreyedFieldsLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SectionGreyedFieldsLinkStore,
+    LinkStoreImpl<SectionGreyedFieldsLink>(
+        databaseAdapter, SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
+        SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
+        BINDER,
+        { cursor: Cursor -> SectionGreyedFieldsLink.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: SectionGreyedFieldsLink, w: StatementWrapper ->
+            w.bind(1, o.section())
+            w.bind(2, o.dataElementOperand())
+            w.bind(3, o.categoryOptionCombo())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
index 64a4232edd..bef9c9db9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
@@ -30,25 +30,25 @@ package org.hisp.dhis.android.core.dataset.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.*
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
 import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionDataElementLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
-import org.hisp.dhis.android.core.indicator.Indicator
 
-@Reusable internal class SectionHandler @Inject constructor(
-    sectionStore: IdentifiableObjectStore<Section>,
-    private val sectionDataElementLinkHandler: OrderedLinkHandler<DataElement, SectionDataElementLink>,
-    private val greyedFieldsHandler: Handler<DataElementOperand>,
-    private val sectionGreyedFieldsLinkHandler: LinkHandler<DataElementOperand, SectionGreyedFieldsLink>,
-    private val sectionIndicatorLinkHandler: LinkHandler<Indicator, SectionIndicatorLink>,
-    private val sectionGreyedFieldsStore: LinkStore<SectionGreyedFieldsLink>
+@Reusable
+internal class SectionHandler @Inject constructor(
+    sectionStore: SectionStore,
+    private val sectionDataElementLinkHandler: SectionDataElementLinkHandler,
+    private val greyedFieldsHandler: DataElementOperandHandler,
+    private val sectionGreyedFieldsLinkHandler: SectionGreyedFieldsLinkHandler,
+    private val sectionIndicatorLinkHandler: SectionIndicatorLinkHandler,
+    private val sectionGreyedFieldsStore: SectionGreyedFieldsLinkStore
 ) : IdentifiableHandlerImpl<Section>(sectionStore) {
 
     override fun afterObjectHandled(o: Section, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt
index 392eeb45bc..8457cee740 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt
@@ -31,24 +31,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.dataset.internal.SectionIndicatorLinkStore.create
-import org.hisp.dhis.android.core.indicator.Indicator
 
 @Module
 internal class SectionIndicatorEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<SectionIndicatorLink> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): SectionIndicatorLinkStore {
+        return SectionIndicatorLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: LinkStore<SectionIndicatorLink>): LinkHandler<Indicator, SectionIndicatorLink> {
-        return LinkHandlerImpl(store)
+    fun handler(store: SectionIndicatorLinkStore): SectionIndicatorLinkHandler {
+        return SectionIndicatorLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
new file mode 100644
index 0000000000..97c44e0415
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.indicator.Indicator
+
+internal class SectionIndicatorLinkHandler(
+    store: SectionIndicatorLinkStore
+) : LinkHandlerImpl<Indicator, SectionIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStore.kt
index f7d7f5739e..811209e984 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStore.kt
@@ -25,27 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
-import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
-
-internal object SectionIndicatorLinkStore {
-    private val BINDER = StatementBinder { o: SectionIndicatorLink, w: StatementWrapper ->
-        w.bind(1, o.section())
-        w.bind(2, o.indicator())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<SectionIndicatorLink> {
-        return linkStore(
-            databaseAdapter,
-            SectionIndicatorLinkTableInfo.TABLE_INFO,
-            SectionIndicatorLinkTableInfo.Columns.SECTION,
-            BINDER
-        ) { SectionIndicatorLink.create(it) }
-    }
-}
+internal interface SectionIndicatorLinkStore : LinkStore<SectionIndicatorLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
index 5a67ee0c37..ba2cfcb35f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
@@ -25,31 +25,29 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
 
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+internal class SectionIndicatorLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SectionIndicatorLinkStore,
+    LinkStoreImpl<SectionIndicatorLink>(
+        databaseAdapter,
+        SectionIndicatorLinkTableInfo.TABLE_INFO,
+        SectionIndicatorLinkTableInfo.Columns.SECTION,
+        BINDER,
+        { SectionIndicatorLink.create(it) }
+    ) {
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary;
-
-@Module
-public final class AnalyticsPeriodBoundaryEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<AnalyticsPeriodBoundary> store(DatabaseAdapter databaseAdapter) {
-        return AnalyticsPeriodBoundaryStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    LinkHandler<AnalyticsPeriodBoundary, AnalyticsPeriodBoundary> handler(LinkStore<AnalyticsPeriodBoundary> store) {
-        return new LinkHandlerImpl<>(store);
+    companion object {
+        private val BINDER = StatementBinder { o: SectionIndicatorLink, w: StatementWrapper ->
+            w.bind(1, o.section())
+            w.bind(2, o.indicator())
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.kt
new file mode 100644
index 0000000000..cbf6ed928b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.dataset.Section
+
+internal interface SectionStore : IdentifiableObjectStore<Section>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
new file mode 100644
index 0000000000..c0c3cc0664
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.dataset.SectionTableInfo
+
+@Suppress("MagicNumber")
+internal class SectionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SectionStore,
+    IdentifiableObjectStoreImpl<Section>(
+        databaseAdapter,
+        SectionTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Section.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<Section> = object : IdentifiableStatementBinder<Section>() {
+            override fun bindToStatement(o: Section, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.description())
+                w.bind(8, o.sortOrder())
+                w.bind(9, getUidOrNull(o.dataSet()))
+                w.bind(10, o.showRowTotals())
+                w.bind(11, o.showColumnTotals())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.java
index 09f825384a..cb65d3207b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.java
@@ -34,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore;
 
 import java.util.Map;
 
@@ -48,7 +49,7 @@ public final class LocalDataStoreCollectionRepository
     private final ObjectWithoutUidStore<KeyValuePair> store;
 
     @Inject
-    LocalDataStoreCollectionRepository(final ObjectWithoutUidStore<KeyValuePair> store,
+    LocalDataStoreCollectionRepository(final LocalDataStoreStore store,
                                        final Map<String, ChildrenAppender<KeyValuePair>> childrenAppenders,
                                        final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
index f753ffeb6f..2874d65e08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
@@ -35,7 +35,6 @@ import kotlinx.coroutines.rx2.rxObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory
 import org.hisp.dhis.android.core.common.State
@@ -48,7 +47,7 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 internal class DataStoreDownloadCall @Inject constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataStoreEntryService: DataStoreService,
-    private val dataStoreEntryHandler: LinkHandler<DataStoreEntry, DataStoreEntry>,
+    private val dataStoreEntryHandler: DataStoreHandler,
     private val versionManager: DHISVersionManager
 ) {
     fun download(params: DataStoreDownloadParams): Observable<D2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
index c5d9e50134..eb09c03002 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
@@ -31,7 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 
@@ -41,13 +40,13 @@ internal class DataStoreEntityDIModule {
     @Provides
     @Reusable
     fun store(databaseAdapter: DatabaseAdapter): DataStoreEntryStore {
-        return DataStoreEntryStoreImpl.create(databaseAdapter)
+        return DataStoreEntryStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(impl: DataStoreHandler): LinkHandler<DataStoreEntry, DataStoreEntry> {
-        return impl
+    fun handler(store: DataStoreEntryStore): DataStoreHandler {
+        return DataStoreHandler(store)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
index 6c1030ff10..8c63917aed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.datastore.internal
 import android.content.ContentValues
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -44,19 +42,14 @@ import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
 
 @Suppress("MagicNumber")
 internal class DataStoreEntryStoreImpl(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilder,
-    binder: StatementBinder<DataStoreEntry>,
-    whereUpdateBinder: WhereStatementBinder<DataStoreEntry>,
-    whereDeleteBinder: WhereStatementBinder<DataStoreEntry>,
-    objectFactory: (Cursor) -> DataStoreEntry
+    databaseAdapter: DatabaseAdapter
 ) : ObjectWithoutUidStoreImpl<DataStoreEntry>(
     databaseAdapter,
-    builder,
-    binder,
-    whereUpdateBinder,
-    whereDeleteBinder,
-    objectFactory
+    DataStoreEntryTableInfo.TABLE_INFO,
+    BINDER,
+    WHERE_UPDATE_BINDER,
+    WHERE_DELETE_BINDER,
+    { cursor: Cursor -> DataStoreEntry.create(cursor) }
 ),
     DataStoreEntryStore {
 
@@ -101,21 +94,5 @@ internal class DataStoreEntryStoreImpl(
             w.bind(1, o.namespace())
             w.bind(2, o.key())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): DataStoreEntryStore {
-            val tableInfo = DataStoreEntryTableInfo.TABLE_INFO
-            val statementBuilder: SQLStatementBuilder = SQLStatementBuilderImpl(
-                tableInfo.name(), tableInfo.columns().all(),
-                tableInfo.columns().whereUpdate()
-            )
-            return DataStoreEntryStoreImpl(
-                databaseAdapter,
-                statementBuilder,
-                BINDER,
-                WHERE_UPDATE_BINDER,
-                WHERE_DELETE_BINDER
-            ) { cursor: Cursor -> DataStoreEntry.create(cursor) }
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
index c63f1f7201..cbd51a55db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
@@ -28,8 +28,6 @@
 
 package org.hisp.dhis.android.core.datastore.internal
 
-import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.HandlerBaseImpl
@@ -39,8 +37,7 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
 
-@Reusable
-internal class DataStoreHandler @Inject constructor(
+internal class DataStoreHandler constructor(
     private val store: DataStoreEntryStore
 ) : LinkHandler<DataStoreEntry, DataStoreEntry>, HandlerBaseImpl<DataStoreEntry>() {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
index 24ea317009..f2c5a885ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
@@ -31,7 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.datastore.KeyValuePair
 import retrofit2.Retrofit
@@ -47,8 +46,8 @@ internal class LocalDataStoreEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<KeyValuePair> {
-        return LocalDataStoreStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): LocalDataStoreStore {
+        return LocalDataStoreStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStore.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStore.kt
index f246079daa..f57d3acf10 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStore.kt
@@ -25,42 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.datastore.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
 import org.hisp.dhis.android.core.datastore.KeyValuePair
-import org.hisp.dhis.android.core.datastore.LocalDataStoreTableInfo
-
-@Suppress("MagicNumber")
-internal object LocalDataStoreStore {
-
-    private val BINDER: StatementBinder<KeyValuePair> = StatementBinder { o, w ->
-        w.bind(1, o.key())
-        w.bind(2, o.value())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder<KeyValuePair> { o: KeyValuePair, w: StatementWrapper ->
-        w.bind(3, o.key())
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder<KeyValuePair> { o: KeyValuePair, w: StatementWrapper ->
-        w.bind(1, o.key())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<KeyValuePair> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            LocalDataStoreTableInfo.TABLE_INFO,
-            BINDER,
-            WHERE_UPDATE_BINDER,
-            WHERE_DELETE_BINDER
-        ) { cursor: Cursor -> KeyValuePair.create(cursor) }
-    }
-}
+internal interface LocalDataStoreStore : ObjectWithoutUidStore<KeyValuePair>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
new file mode 100644
index 0000000000..836fe2eac2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.datastore.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.datastore.KeyValuePair
+import org.hisp.dhis.android.core.datastore.LocalDataStoreTableInfo
+
+@Suppress("MagicNumber")
+internal class LocalDataStoreStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : LocalDataStoreStore,
+    ObjectWithoutUidStoreImpl<KeyValuePair>(
+        databaseAdapter,
+        LocalDataStoreTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> KeyValuePair.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<KeyValuePair> = StatementBinder { o, w ->
+            w.bind(1, o.key())
+            w.bind(2, o.value())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder<KeyValuePair> { o: KeyValuePair, w: StatementWrapper ->
+            w.bind(3, o.key())
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder<KeyValuePair> { o: KeyValuePair, w: StatementWrapper ->
+            w.bind(1, o.key())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java
index 19e1e2764f..96c30f67e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java
@@ -39,6 +39,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStore;
 import org.hisp.dhis.android.core.imports.ImportStatus;
 
 import java.util.Map;
@@ -55,7 +56,7 @@ public final class DataValueConflictCollectionRepository
     ObjectStore<DataValueConflict> store;
 
     @Inject
-    DataValueConflictCollectionRepository(final ObjectStore<DataValueConflict> store,
+    DataValueConflictCollectionRepository(final DataValueConflictStore store,
                                           final Map<String, ChildrenAppender<DataValueConflict>> childrenAppenders,
                                           final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
index 6b5e8a1254..d7416932b1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
@@ -31,7 +31,6 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedUids
 import org.hisp.dhis.android.core.datavalue.DataValue
@@ -39,7 +38,7 @@ import org.hisp.dhis.android.core.datavalue.DataValue
 @Reusable
 internal class DataValueCall @Inject constructor(
     private val service: DataValueService,
-    private val handler: Handler<DataValue>,
+    private val handler: DataValueHandler,
     private val apiDownloader: APIDownloader
 ) : QueryCall<DataValue, DataValueQuery> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
similarity index 89%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
index 0576f8a10c..b353f62061 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
@@ -32,17 +32,16 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 
 @Module
-internal class DataValueConflictDIModule {
+internal class DataValueConflictEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectStore<DataValueConflict> {
-        return DataValueConflictStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): DataValueConflictStore {
+        return DataValueConflictStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
index 840b77d85d..48fcb359fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
@@ -30,9 +30,8 @@ package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.dataset.internal.DataSetStore
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.datavalue.internal.conflicts.IndexedDataValueConflict
@@ -46,9 +45,9 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 
 @Reusable
 internal class DataValueConflictParser @Inject constructor(
-    dataElementStore: IdentifiableObjectStore<DataElement>,
+    dataElementStore: DataElementStore,
     dataValueStore: DataValueStore,
-    dataSetStore: IdentifiableObjectStore<DataSet>,
+    dataSetStore: DataSetStore,
     val versionManager: DHISVersionManager
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStore.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStore.kt
index 56fda0a4bd..2574b484ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStore.kt
@@ -28,33 +28,7 @@
 
 package org.hisp.dhis.android.core.datavalue.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
-import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 
-@Suppress("MagicNumber")
-internal object DataValueConflictStore {
-    private val BINDER = StatementBinder<DataValueConflict> { o, w ->
-        w.bind(1, o.conflict())
-        w.bind(2, o.value())
-        w.bind(3, o.attributeOptionCombo())
-        w.bind(4, o.categoryOptionCombo())
-        w.bind(5, o.dataElement())
-        w.bind(6, o.period())
-        w.bind(7, o.orgUnit())
-        w.bind(8, o.errorCode())
-        w.bind(9, o.displayDescription())
-        w.bind(10, o.status())
-        w.bind(11, o.created())
-    }
-
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectStore<DataValueConflict> {
-        return StoreFactory.objectStore(databaseAdapter, DataValueConflictTableInfo.TABLE_INFO, BINDER) {
-            DataValueConflict.create(it)
-        }
-    }
-}
+internal interface DataValueConflictStore : ObjectStore<DataValueConflict>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
index 93bc3f7683..2d3e48a50f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
@@ -26,30 +26,38 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.maintenance.internal;
+package org.hisp.dhis.android.core.datavalue.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
+import org.hisp.dhis.android.core.datavalue.DataValueConflict
+import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 
-public final class D2ErrorStore {
-
-    private static final StatementBinder<D2Error> BINDER = (o, w) -> {
-        w.bind(1, o.url());
-        w.bind(2, o.errorComponent());
-        w.bind(3, o.errorCode());
-        w.bind(4, o.errorDescription());
-        w.bind(5, o.httpErrorCode());
-        w.bind(6, o.created());
-    };
-
-    private D2ErrorStore() {
-    }
-
-    public static ObjectStore<D2Error> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectStore(databaseAdapter, D2ErrorTableInfo.TABLE_INFO, BINDER, D2Error::create);
+@Suppress("MagicNumber")
+internal class DataValueConflictStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataValueConflictStore,
+    ObjectStoreImpl<DataValueConflict>(
+        databaseAdapter,
+        DataValueConflictTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> DataValueConflict.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder<DataValueConflict> { o, w ->
+            w.bind(1, o.conflict())
+            w.bind(2, o.value())
+            w.bind(3, o.attributeOptionCombo())
+            w.bind(4, o.categoryOptionCombo())
+            w.bind(5, o.dataElement())
+            w.bind(6, o.period())
+            w.bind(7, o.orgUnit())
+            w.bind(8, o.errorCode())
+            w.bind(9, o.displayDescription())
+            w.bind(10, o.status())
+            w.bind(11, o.created())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
similarity index 74%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
index 3b0aa3d3f4..d98d39f6c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
@@ -25,33 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.datavalue.internal
 
-package org.hisp.dhis.android.core.maintenance.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.datavalue.DataValue
 
 @Module
-public final class D2ErrorEntityDIModule {
+internal class DataValueEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataValueStore {
+        return DataValueStoreImpl(databaseAdapter)
+    }
 
     @Provides
     @Reusable
-    public ObjectStore<D2Error> store(DatabaseAdapter databaseAdapter) {
-        return D2ErrorStore.create(databaseAdapter);
+    fun handler(dataValueStore: DataValueStore): DataValueHandler {
+        return DataValueHandler(dataValueStore)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<D2Error>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<DataValue>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
index 04abcddc99..e29c1830bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import java.util.ArrayList
 import java.util.Arrays
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
@@ -38,9 +37,9 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 
-internal class DataValueHandler(store: ObjectWithoutUidStore<DataValue>) : ObjectWithoutUidHandlerImpl<DataValue>(
-    store
-) {
+internal class DataValueHandler(
+    store: ObjectWithoutUidStore<DataValue>
+) : ObjectWithoutUidHandlerImpl<DataValue>(store) {
     override fun deleteOrPersist(o: DataValue): HandleAction {
         return if (CollectionsHelper.isDeleted(o)) {
             store.deleteWhereIfExists(o)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
index 3299494558..6aa97dbf9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.datavalue.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.State.ERROR
 import org.hisp.dhis.android.core.common.State.SYNCED
@@ -46,7 +45,7 @@ import org.hisp.dhis.android.core.imports.internal.ImportConflict
 internal class DataValueImportHandler @Inject constructor(
     private val dataValueStore: DataValueStore,
     private val dataValueConflictParser: DataValueConflictParser,
-    private val dataValueConflictStore: ObjectStore<DataValueConflict>
+    private val dataValueConflictStore: DataValueConflictStore
 ) {
 
     fun handleImportSummary(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index 918fa84578..d9ed78367c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -99,9 +99,9 @@ internal class DataValuePostCall @Inject constructor(
         }
     }
 
-    private fun markObjectsAs(dataValues: Collection<DataValue?>, forcedState: State?) {
+    private fun markObjectsAs(dataValues: Collection<DataValue>, forcedState: State?) {
         for (dataValue in dataValues) {
-            dataValueStore.setState(dataValue, forcedOrOwn(dataValue!!, forcedState))
+            dataValueStore.setState(dataValue, forcedOrOwn(dataValue, forcedState))
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.java
deleted file mode 100644
index e3cb051cd2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.datavalue.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.datavalue.DataValue;
-import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper;
-import org.hisp.dhis.android.core.datavalue.DataValueTableInfo;
-
-import java.util.Collection;
-
-import static org.hisp.dhis.android.core.datavalue.DataValueTableInfo.Columns;
-
-@SuppressWarnings("PMD.ClassWithOnlyPrivateConstructorsShouldBeFinal")
-public class DataValueStore extends ObjectWithoutUidStoreImpl<DataValue> {
-
-    private static final StatementBinder<DataValue> BINDER = (dataValue, w) -> {
-        w.bind(1, dataValue.dataElement());
-        w.bind(2, dataValue.period());
-        w.bind(3, dataValue.organisationUnit());
-        w.bind(4, dataValue.categoryOptionCombo());
-        w.bind(5, dataValue.attributeOptionCombo());
-        w.bind(6, dataValue.value());
-        w.bind(7, dataValue.storedBy());
-        w.bind(8, dataValue.created());
-        w.bind(9, dataValue.lastUpdated());
-        w.bind(10, dataValue.comment());
-        w.bind(11, dataValue.followUp());
-        w.bind(12, dataValue.syncState());
-        w.bind(13, dataValue.deleted());
-    };
-
-    private static final WhereStatementBinder<DataValue> WHERE_UPDATE_BINDER
-            = (dataValue, w) -> {
-        w.bind(14, dataValue.dataElement());
-        w.bind(15, dataValue.period());
-        w.bind(16, dataValue.organisationUnit());
-        w.bind(17, dataValue.categoryOptionCombo());
-        w.bind(18, dataValue.attributeOptionCombo());
-    };
-
-    private static final WhereStatementBinder<DataValue> WHERE_DELETE_BINDER
-            = (dataValue, w) -> {
-        w.bind(1, dataValue.dataElement());
-        w.bind(2, dataValue.period());
-        w.bind(3, dataValue.organisationUnit());
-        w.bind(4, dataValue.categoryOptionCombo());
-        w.bind(5, dataValue.attributeOptionCombo());
-    };
-
-    private DataValueStore(DatabaseAdapter databaseAdapter, SQLStatementBuilderImpl builder) {
-        super(databaseAdapter, builder, BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, DataValue::create);
-    }
-
-    public static DataValueStore create(DatabaseAdapter databaseAdapter) {
-
-        SQLStatementBuilderImpl sqlStatementBuilder =
-                new SQLStatementBuilderImpl(DataValueTableInfo.TABLE_INFO.name(),
-                        DataValueTableInfo.TABLE_INFO.columns());
-
-        return new DataValueStore(databaseAdapter, sqlStatementBuilder);
-    }
-
-    Collection<DataValue> getDataValuesWithState(State state) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(Columns.SYNC_STATE, state.name()).build();
-        return selectWhere(whereClause);
-    }
-
-    /**
-     * @param dataValue DataValue element you want to update
-     * @param newState  The new state to be set for the DataValue
-     */
-    public void setState(DataValue dataValue, State newState) {
-
-        DataValue updatedDataValue = dataValue.toBuilder().syncState(newState).build();
-
-        updateWhere(updatedDataValue);
-    }
-
-    public boolean exists(DataValue dataValue) {
-        return selectWhere(uniqueWhereClauseBuilder(dataValue).build()).size() > 0;
-    }
-
-    boolean isDataValueBeingUpload(DataValue dataValue) {
-        String whereClause = uniqueWhereClauseBuilder(dataValue)
-                .appendKeyStringValue(Columns.SYNC_STATE, State.UPLOADING)
-                .build();
-        return selectWhere(whereClause).size() > 0;
-    }
-
-    boolean isDeleted(DataValue dataValue) {
-        String whereClause = uniqueWhereClauseBuilder(dataValue)
-                .appendKeyNumberValue(Columns.DELETED, 1)
-                .build();
-        return selectWhere(whereClause).size() > 0;
-    }
-
-    private WhereClauseBuilder uniqueWhereClauseBuilder(DataValue dataValue) {
-        return new WhereClauseBuilder()
-                .appendKeyStringValue(Columns.DATA_ELEMENT, dataValue.dataElement())
-                .appendKeyStringValue(Columns.PERIOD, dataValue.period())
-                .appendKeyStringValue(Columns.ORGANISATION_UNIT, dataValue.organisationUnit())
-                .appendKeyStringValue(Columns.CATEGORY_OPTION_COMBO, dataValue.categoryOptionCombo())
-                .appendKeyStringValue(Columns.ATTRIBUTE_OPTION_COMBO, dataValue.attributeOptionCombo());
-    }
-
-    public Boolean existsInDataSet(DataValue dataValue, String dataSetUid) {
-        WhereClauseBuilder whereClauseBuilder = uniqueWhereClauseBuilder(dataValue)
-                .appendInSubQuery(
-                        DataValueByDataSetQueryHelper.getDataValueKey(),
-                        DataValueByDataSetQueryHelper.whereClause(dataSetUid)
-                );
-        return selectWhere(whereClauseBuilder.build()).size() > 0;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.kt
new file mode 100644
index 0000000000..5c7efee494
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStore.kt
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.datavalue.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.datavalue.DataValue
+
+internal interface DataValueStore : ObjectWithoutUidStore<DataValue> {
+
+    fun getDataValuesWithState(state: State): Collection<DataValue>
+
+    /**
+     * @param dataValue DataValue element you want to update
+     * @param newState  The new state to be set for the DataValue
+     */
+    fun setState(dataValue: DataValue, newState: State)
+
+    fun exists(dataValue: DataValue): Boolean
+
+    fun isDataValueBeingUpload(dataValue: DataValue): Boolean
+
+    fun isDeleted(dataValue: DataValue): Boolean
+
+    fun existsInDataSet(dataValue: DataValue, dataSetUid: String): Boolean
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
new file mode 100644
index 0000000000..d380c058c2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
@@ -0,0 +1,137 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.datavalue.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.datavalue.DataValue
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.dataValueKey
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
+import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
+
+internal class DataValueStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataValueStore,
+    ObjectWithoutUidStoreImpl<DataValue>(
+        databaseAdapter,
+        DataValueTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor? -> DataValue.create(cursor) }
+    ) {
+
+    override fun getDataValuesWithState(state: State): Collection<DataValue> {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(DataValueTableInfo.Columns.SYNC_STATE, state.name).build()
+        return selectWhere(whereClause)
+    }
+
+    /**
+     * @param dataValue DataValue element you want to update
+     * @param newState  The new state to be set for the DataValue
+     */
+    override fun setState(dataValue: DataValue, newState: State) {
+        val updatedDataValue = dataValue.toBuilder().syncState(newState).build()
+        updateWhere(updatedDataValue)
+    }
+
+    override fun exists(dataValue: DataValue): Boolean {
+        return selectWhere(uniqueWhereClauseBuilder(dataValue).build()).isNotEmpty()
+    }
+
+    override fun isDataValueBeingUpload(dataValue: DataValue): Boolean {
+        val whereClause = uniqueWhereClauseBuilder(dataValue)
+            .appendKeyStringValue(DataValueTableInfo.Columns.SYNC_STATE, State.UPLOADING)
+            .build()
+        return selectWhere(whereClause).isNotEmpty()
+    }
+
+    override fun isDeleted(dataValue: DataValue): Boolean {
+        val whereClause = uniqueWhereClauseBuilder(dataValue)
+            .appendKeyNumberValue(DataValueTableInfo.Columns.DELETED, 1)
+            .build()
+        return selectWhere(whereClause).isNotEmpty()
+    }
+
+    private fun uniqueWhereClauseBuilder(dataValue: DataValue): WhereClauseBuilder {
+        return WhereClauseBuilder()
+            .appendKeyStringValue(DataValueTableInfo.Columns.DATA_ELEMENT, dataValue.dataElement())
+            .appendKeyStringValue(DataValueTableInfo.Columns.PERIOD, dataValue.period())
+            .appendKeyStringValue(DataValueTableInfo.Columns.ORGANISATION_UNIT, dataValue.organisationUnit())
+            .appendKeyStringValue(DataValueTableInfo.Columns.CATEGORY_OPTION_COMBO, dataValue.categoryOptionCombo())
+            .appendKeyStringValue(DataValueTableInfo.Columns.ATTRIBUTE_OPTION_COMBO, dataValue.attributeOptionCombo())
+    }
+
+    override fun existsInDataSet(dataValue: DataValue, dataSetUid: String): Boolean {
+        val whereClauseBuilder = uniqueWhereClauseBuilder(dataValue)
+            .appendInSubQuery(
+                dataValueKey,
+                whereClause(dataSetUid)
+            )
+        return selectWhere(whereClauseBuilder.build()).isNotEmpty()
+    }
+
+    companion object {
+        private val BINDER = StatementBinder { dataValue: DataValue, w: StatementWrapper ->
+            w.bind(1, dataValue.dataElement())
+            w.bind(2, dataValue.period())
+            w.bind(3, dataValue.organisationUnit())
+            w.bind(4, dataValue.categoryOptionCombo())
+            w.bind(5, dataValue.attributeOptionCombo())
+            w.bind(6, dataValue.value())
+            w.bind(7, dataValue.storedBy())
+            w.bind(8, dataValue.created())
+            w.bind(9, dataValue.lastUpdated())
+            w.bind(10, dataValue.comment())
+            w.bind(11, dataValue.followUp())
+            w.bind(12, dataValue.syncState())
+            w.bind(13, dataValue.deleted())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { dataValue: DataValue, w: StatementWrapper ->
+            w.bind(14, dataValue.dataElement())
+            w.bind(15, dataValue.period())
+            w.bind(16, dataValue.organisationUnit())
+            w.bind(17, dataValue.categoryOptionCombo())
+            w.bind(18, dataValue.attributeOptionCombo())
+        }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { dataValue: DataValue, w: StatementWrapper ->
+            w.bind(1, dataValue.dataElement())
+            w.bind(2, dataValue.period())
+            w.bind(3, dataValue.organisationUnit())
+            w.bind(4, dataValue.categoryOptionCombo())
+            w.bind(5, dataValue.attributeOptionCombo())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt
index 120dd2b321..8b96886a92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt
@@ -49,12 +49,14 @@ internal class PastExpiryDateConflict(
         val period = conflict.`object`()
         val dataSetUid = regex.find(conflict.value())?.groupValues?.get(2)
         dataValues.forEach { dataValue ->
-            if (dataValue.period() == period && dataValueStore.existsInDataSet(dataValue, dataSetUid)) {
+            if (dataValue.period() == period &&
+                dataSetUid?.let { dataValueStore.existsInDataSet(dataValue, it) } == true
+            ) {
                 foundDataValuesConflicts.add(
                     getConflictBuilder(
                         dataValue = dataValue,
                         conflict = conflict,
-                        displayDescription = getDisplayDescription(conflict, dataValue, dataSetUid!!)
+                        displayDescription = getDisplayDescription(conflict, dataValue, dataSetUid)
                     ).build()
                 )
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index b2b2ce96c6..0da0c7024f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -38,7 +38,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallEx
 import org.hisp.dhis.android.core.arch.call.D2ProgressSyncStatus
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
@@ -63,7 +62,7 @@ internal class AggregatedDataCall @Inject constructor(
     private val dataApprovalCall: QueryCall<DataApproval, DataApprovalQuery>,
     private val categoryOptionComboStore: CategoryOptionComboStore,
     private val coroutineCallExecutor: CoroutineAPICallExecutor,
-    private val aggregatedDataSyncStore: ObjectWithoutUidStore<AggregatedDataSync>,
+    private val aggregatedDataSyncStore: AggregatedDataSyncStore,
     private val aggregatedDataCallBundleFactory: AggregatedDataCallBundleFactory,
     private val resourceHandler: ResourceHandler,
     private val hashHelper: AggregatedDataSyncHashHelper
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
index 8223077453..40bba6d127 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -46,7 +45,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
     private val dataSetSettingsObjectRepository: DataSetSettingsObjectRepository,
     private val periodManager: PeriodForDataSetManager,
-    private val aggregatedDataSyncStore: ObjectWithoutUidStore<AggregatedDataSync>,
+    private val aggregatedDataSyncStore: AggregatedDataSyncStore,
     private val lastUpdatedCalculator: AggregatedDataSyncLastUpdatedCalculator
 ) {
     val bundles: List<AggregatedDataCallBundle>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt
index d1a1308106..004be750dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt
@@ -31,7 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
 
 @Module
@@ -45,7 +44,7 @@ internal class AggregatedDataPackageDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AggregatedDataSync> {
-        return AggregatedDataSyncStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): AggregatedDataSyncStore {
+        return AggregatedDataSyncStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStore.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStore.kt
index 001fb8ac14..9d7e3d43c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStore.kt
@@ -25,36 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-
-@Suppress("MagicNumber")
-internal object AggregatedDataSyncStore {
-    private val BINDER = StatementBinder { o: AggregatedDataSync, w: StatementWrapper ->
-        w.bind(1, o.dataSet())
-        w.bind(2, o.periodType())
-        w.bind(3, o.pastPeriods())
-        w.bind(4, o.futurePeriods())
-        w.bind(5, o.dataElementsHash())
-        w.bind(6, o.organisationUnitsHash())
-        w.bind(7, o.lastUpdated())
-    }
-    private val WHERE_UPDATE_BINDER =
-        WhereStatementBinder { o: AggregatedDataSync, w: StatementWrapper -> w.bind(8, o.dataSet()) }
-    private val DELETE_UPDATE_BINDER =
-        WhereStatementBinder { o: AggregatedDataSync, w: StatementWrapper -> w.bind(1, o.dataSet()) }
 
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AggregatedDataSync> {
-        return objectWithoutUidStore(
-            databaseAdapter, AggregatedDataSyncTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, DELETE_UPDATE_BINDER
-        ) { cursor: Cursor -> AggregatedDataSync.create(cursor) }
-    }
-}
+internal interface AggregatedDataSyncStore : ObjectWithoutUidStore<AggregatedDataSync>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
new file mode 100644
index 0000000000..a13985792b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.domain.aggregated.data.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+@Suppress("MagicNumber")
+internal class AggregatedDataSyncStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AggregatedDataSyncStore,
+    ObjectWithoutUidStoreImpl<AggregatedDataSync>(
+        databaseAdapter,
+        AggregatedDataSyncTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        DELETE_UPDATE_BINDER,
+        { cursor: Cursor -> AggregatedDataSync.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: AggregatedDataSync, w: StatementWrapper ->
+            w.bind(1, o.dataSet())
+            w.bind(2, o.periodType())
+            w.bind(3, o.pastPeriods())
+            w.bind(4, o.futurePeriods())
+            w.bind(5, o.dataElementsHash())
+            w.bind(6, o.organisationUnitsHash())
+            w.bind(7, o.lastUpdated())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: AggregatedDataSync, w: StatementWrapper -> w.bind(8, o.dataSet()) }
+        private val DELETE_UPDATE_BINDER =
+            WhereStatementBinder { o: AggregatedDataSync, w: StatementWrapper -> w.bind(1, o.dataSet()) }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.java
deleted file mode 100644
index 7ca43e12df..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.enrollment.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.common.DataColumns;
-import org.hisp.dhis.android.core.enrollment.Enrollment;
-import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.event.EventTableInfo;
-import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender;
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleanerImpl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class EnrollmentEntityDIModule {
-
-    @Provides
-    @Reusable
-    public EnrollmentStore store(DatabaseAdapter databaseAdapter) {
-        return EnrollmentStoreImpl.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public IdentifiableDataHandler<Enrollment> handler(EnrollmentHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    Transformer<EnrollmentCreateProjection, Enrollment> transformer() {
-        return new EnrollmentProjectionTransformer();
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<Enrollment>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return new HashMap<String, ChildrenAppender<Enrollment>>() {{
-            put(EnrollmentFields.NOTES, NoteForEnrollmentChildrenAppender.create(databaseAdapter));
-        }};
-    }
-
-    @Provides
-    @Reusable
-    OrphanCleaner<Enrollment, Relationship> relationshipOrphanCleaner(EnrollmentRelationshipOrphanCleanerImpl impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    OrphanCleaner<Enrollment, Event> eventOrphanCleaner(DatabaseAdapter databaseAdapter) {
-        return new DataOrphanCleanerImpl<>(EventTableInfo.TABLE_INFO.name(), EventTableInfo.Columns.ENROLLMENT,
-                DataColumns.SYNC_STATE, databaseAdapter);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
new file mode 100644
index 0000000000..58b6244f29
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
@@ -0,0 +1,120 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.enrollment.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.common.DataColumns
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.EventTableInfo
+import org.hisp.dhis.android.core.event.internal.EventHandler
+import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
+import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender
+import org.hisp.dhis.android.core.note.internal.NoteHandler
+import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleanerImpl
+import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
+import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
+
+@Module
+internal class EnrollmentEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): EnrollmentStore {
+        return EnrollmentStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    @Suppress("LongParameterList")
+    fun handler(
+        relationshipVersionManager: RelationshipDHISVersionManager,
+        relationshipHandler: RelationshipHandler,
+        noteVersionManager: NoteDHISVersionManager,
+        enrollmentStore: EnrollmentStore,
+        eventHandler: EventHandler,
+        eventOrphanCleaner: OrphanCleaner<Enrollment, Event>,
+        noteHandler: NoteHandler,
+        noteUniquenessManager: NoteUniquenessManager,
+        relationshipOrphanCleaner: OrphanCleaner<Enrollment, Relationship>
+    ): EnrollmentHandler {
+        return EnrollmentHandler(
+            relationshipVersionManager,
+            relationshipHandler,
+            noteVersionManager,
+            enrollmentStore,
+            eventHandler,
+            eventOrphanCleaner,
+            noteHandler,
+            noteUniquenessManager,
+            relationshipOrphanCleaner
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun transformer(): Transformer<EnrollmentCreateProjection, Enrollment> {
+        return EnrollmentProjectionTransformer()
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Enrollment>> {
+        return mapOf(
+            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender.create(databaseAdapter)
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun relationshipOrphanCleaner(
+        impl: EnrollmentRelationshipOrphanCleanerImpl
+    ): OrphanCleaner<Enrollment, Relationship> {
+        return impl
+    }
+
+    @Provides
+    @Reusable
+    fun eventOrphanCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<Enrollment, Event> {
+        return DataOrphanCleanerImpl(
+            EventTableInfo.TABLE_INFO.name(),
+            EventTableInfo.Columns.ENROLLMENT,
+            DataColumns.SYNC_STATE,
+            databaseAdapter
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
index 2a2169cecc..92d891191c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import android.util.Log
-import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.*
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
@@ -49,8 +47,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionM
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 
-@Reusable
-internal class EnrollmentHandler @Inject constructor(
+internal class EnrollmentHandler constructor(
     relationshipVersionManager: RelationshipDHISVersionManager,
     relationshipHandler: RelationshipHandler,
     private val noteVersionManager: NoteDHISVersionManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
index 463fc45cc6..3fe73a93da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
@@ -30,13 +30,12 @@ package org.hisp.dhis.android.core.enrollment.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.enrollment.Enrollment
 
 @Reusable
 internal class EnrollmentPersistenceCallFactory @Inject constructor(
-    private val enrollmentHandler: IdentifiableDataHandler<Enrollment>
+    private val enrollmentHandler: EnrollmentHandler
 ) {
     fun persistAsRelationships(enrollments: List<Enrollment>): Completable {
         return persistEnrollmentsInternal(enrollments, asRelationship = true, overwrite = false)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index 92fccafcd1..c52a2c3730 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -29,10 +29,9 @@ package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import java.util.*
+import java.util.Date
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.enrollment.EnrollmentAccess
 import org.hisp.dhis.android.core.enrollment.EnrollmentCollectionRepository
@@ -47,7 +46,7 @@ import org.hisp.dhis.android.core.program.ProgramCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
 
 @Reusable
@@ -58,7 +57,7 @@ internal class EnrollmentServiceImpl @Inject constructor(
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
     private val eventCollectionRepository: EventCollectionRepository,
     private val programStagesCollectionRepository: ProgramStageCollectionRepository,
-    private val programTempOwnerStore: ObjectWithoutUidStore<ProgramTempOwner>
+    private val programTempOwnerStore: ProgramTempOwnerStore
 ) : EnrollmentService {
 
     override fun blockingIsOpen(enrollmentUid: String): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
index 904acbb12c..0b9a8b51e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.enrollment.internal
 import android.content.ContentValues
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -44,13 +43,15 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 
-internal class EnrollmentStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilderImpl,
-    binder: StatementBinder<Enrollment>,
-    objectFactory: Function1<Cursor, Enrollment>
-) : IdentifiableDeletableDataObjectStoreImpl<Enrollment>(databaseAdapter, builder, binder, objectFactory),
-    EnrollmentStore {
+internal class EnrollmentStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : EnrollmentStore,
+    IdentifiableDeletableDataObjectStoreImpl<Enrollment>(
+        databaseAdapter,
+        EnrollmentTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Enrollment.create(cursor) }
+    ) {
 
     override fun queryEnrollmentsToPost(): Map<String, List<Enrollment>> {
         val enrollmentsToPostQuery = WhereClauseBuilder()
@@ -126,18 +127,5 @@ internal class EnrollmentStoreImpl private constructor(
             w.bind(17, o.aggregatedSyncState())
             w.bind(18, o.deleted())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): EnrollmentStore {
-            val statementBuilder = SQLStatementBuilderImpl(
-                EnrollmentTableInfo.TABLE_INFO.name(),
-                EnrollmentTableInfo.TABLE_INFO.columns()
-            )
-            return EnrollmentStoreImpl(
-                databaseAdapter,
-                statementBuilder,
-                BINDER
-            ) { cursor: Cursor? -> Enrollment.create(cursor) }
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
index 73c9392b61..bd0812ddd5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
@@ -27,8 +27,9 @@
  */
 package org.hisp.dhis.android.core.event;
 
+import static org.hisp.dhis.android.core.event.EventTableInfo.Columns;
+
 import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
@@ -53,7 +54,7 @@
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo;
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall;
-import org.hisp.dhis.android.core.user.User;
+import org.hisp.dhis.android.core.user.internal.UserStore;
 
 import java.util.Collections;
 import java.util.List;
@@ -64,8 +65,6 @@
 import dagger.Reusable;
 import io.reactivex.Observable;
 
-import static org.hisp.dhis.android.core.event.EventTableInfo.Columns;
-
 @SuppressWarnings("PMD.ExcessiveImports")
 @Reusable
 public final class EventCollectionRepository
@@ -75,13 +74,13 @@ public final class EventCollectionRepository
     private final EventPostParentCall postCall;
 
     private final EventStore store;
-    private final IdentifiableObjectStore<User> userStore;
+    private final UserStore userStore;
     private final TrackerDataManager trackerDataManager;
     private final JobQueryCall jobQueryCall;
 
     @Inject
     EventCollectionRepository(final EventStore store,
-                              final IdentifiableObjectStore<User> userStore,
+                              final UserStore userStore,
                               final Map<String, ChildrenAppender<Event>> childrenAppenders,
                               final RepositoryScope scope,
                               final EventPostParentCall postCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.java
index 825426198e..12835898f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.event;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -38,6 +37,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.common.AssignedUserMode;
 import org.hisp.dhis.android.core.event.EventFilterTableInfo.Columns;
+import org.hisp.dhis.android.core.event.internal.EventFilterStore;
 import org.hisp.dhis.android.core.event.internal.EventQueryCriteriaFields;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
 
@@ -53,7 +53,7 @@ public final class EventFilterCollectionRepository
 
     @Inject
     EventFilterCollectionRepository(
-            final IdentifiableObjectStore<EventFilter> store,
+            final EventFilterStore store,
             final Map<String, ChildrenAppender<EventFilter>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt
index 10874e0119..95f3b6ee84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt
@@ -31,23 +31,18 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.event.EventDataFilter
-import org.hisp.dhis.android.core.event.internal.EventDataFilterStore.create
 
 @Module
 internal class EventDataFilterEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<EventDataFilter> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): EventDataFilterStore {
+        return EventDataFilterStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: ObjectWithoutUidStore<EventDataFilter>): HandlerWithTransformer<EventDataFilter> {
-        return ObjectWithoutUidHandlerImpl(store)
+    fun handler(store: EventDataFilterStore): EventDataFilterHandler {
+        return EventDataFilterHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
new file mode 100644
index 0000000000..bc2066f32f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.event.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.event.EventDataFilter
+
+internal class EventDataFilterHandler(
+    store: EventDataFilterStore
+) : ObjectWithoutUidHandlerImpl<EventDataFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStore.kt
index 89df91f383..e5b4ea9e00 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStore.kt
@@ -25,55 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.event.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
-import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.event.EventDataFilter
 
-@Suppress("MagicNumber")
-internal object EventDataFilterStore {
-    private val BINDER = StatementBinder { o: EventDataFilter, w: StatementWrapper ->
-        w.bind(1, o.eventFilter())
-        w.bind(2, o.dataItem())
-        w.bindNull(3)
-        w.bindNull(4)
-        w.bindNull(5)
-        w.bindNull(6)
-        w.bindNull(7)
-        w.bind(8, o.le())
-        w.bind(9, o.ge())
-        w.bind(10, o.gt())
-        w.bind(11, o.lt())
-        w.bind(12, o.eq())
-        w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
-        w.bind(14, o.like())
-        w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: EventDataFilter, _ -> }
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: EventDataFilter, _ -> }
-
-    @JvmField
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        ItemFilterTableInfo.TABLE_INFO,
-        ItemFilterTableInfo.Columns.EVENT_FILTER
-    )
-
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<EventDataFilter> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            ItemFilterTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { EventDataFilter.create(it) }
-    }
-}
+internal interface EventDataFilterStore : ObjectWithoutUidStore<EventDataFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
new file mode 100644
index 0000000000..c35a42194f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
+import org.hisp.dhis.android.core.event.EventDataFilter
+
+@Suppress("MagicNumber")
+internal class EventDataFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : EventDataFilterStore,
+    ObjectWithoutUidStoreImpl<EventDataFilter>(
+        databaseAdapter,
+        ItemFilterTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { EventDataFilter.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: EventDataFilter, w: StatementWrapper ->
+            w.bind(1, o.eventFilter())
+            w.bind(2, o.dataItem())
+            w.bindNull(3)
+            w.bindNull(4)
+            w.bindNull(5)
+            w.bindNull(6)
+            w.bindNull(7)
+            w.bind(8, o.le())
+            w.bind(9, o.ge())
+            w.bind(10, o.gt())
+            w.bind(11, o.lt())
+            w.bind(12, o.eq())
+            w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
+            w.bind(14, o.like())
+            w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: EventDataFilter, _ -> }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: EventDataFilter, _ -> }
+
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ItemFilterTableInfo.TABLE_INFO,
+            ItemFilterTableInfo.Columns.EVENT_FILTER
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.java
deleted file mode 100644
index 548c0c9f32..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.event.EventCreateProjection;
-import org.hisp.dhis.android.core.note.internal.NoteForEventChildrenAppender;
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleanerImpl;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueChildrenAppender;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class EventEntityDIModule {
-
-    @Provides
-    @Reusable
-    public EventStore store(DatabaseAdapter databaseAdapter) {
-        return EventStoreImpl.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public IdentifiableDataHandler<Event> handler(EventHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    Transformer<EventCreateProjection, Event> transformer() {
-        return new EventProjectionTransformer();
-    }
-
-    @Provides
-    @Reusable
-    OrphanCleaner<Event, Relationship> relationshipOrphanCleaner(EventRelationshipOrphanCleanerImpl impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<Event>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return new HashMap<String, ChildrenAppender<Event>>() {{
-            put(EventFields.TRACKED_ENTITY_DATA_VALUES,
-                    TrackedEntityDataValueChildrenAppender.create(databaseAdapter));
-            put(EventFields.NOTES, NoteForEventChildrenAppender.create(databaseAdapter));
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
new file mode 100644
index 0000000000..debfb70206
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
@@ -0,0 +1,103 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.EventCreateProjection
+import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
+import org.hisp.dhis.android.core.note.internal.NoteForEventChildrenAppender
+import org.hisp.dhis.android.core.note.internal.NoteHandler
+import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleanerImpl
+import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
+import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
+
+@Module
+internal class EventEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): EventStore {
+        return EventStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    @Suppress("LongParameterList")
+    fun handler(
+        relationshipVersionManager: RelationshipDHISVersionManager,
+        relationshipHandler: RelationshipHandler,
+        eventStore: EventStore,
+        trackedEntityDataValueHandler: TrackedEntityDataValueHandler,
+        noteHandler: NoteHandler,
+        noteVersionManager: NoteDHISVersionManager,
+        noteUniquenessManager: NoteUniquenessManager,
+        relationshipOrphanCleaner: OrphanCleaner<Event, Relationship>
+    ): EventHandler {
+        return EventHandler(
+            relationshipVersionManager,
+            relationshipHandler,
+            eventStore,
+            trackedEntityDataValueHandler,
+            noteHandler,
+            noteVersionManager,
+            noteUniquenessManager,
+            relationshipOrphanCleaner
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun transformer(): Transformer<EventCreateProjection, Event> {
+        return EventProjectionTransformer()
+    }
+
+    @Provides
+    @Reusable
+    fun relationshipOrphanCleaner(impl: EventRelationshipOrphanCleanerImpl): OrphanCleaner<Event, Relationship> {
+        return impl
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Event>> {
+        return mapOf(
+            EventFields.TRACKED_ENTITY_DATA_VALUES to TrackedEntityDataValueChildrenAppender.create(databaseAdapter),
+            EventFields.NOTES to NoteForEventChildrenAppender.create(databaseAdapter)
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java
index f47f78e756..0eb8ee767e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java
@@ -58,7 +58,7 @@ public final class EventFilterCall implements UidsCall<EventFilter> {
 
     @Inject
     EventFilterCall(EventFilterService service,
-                    Handler<EventFilter> handler,
+                    EventFilterHandler handler,
                     APIDownloader apiDownloader,
                     DHISVersionManager versionManager) {
         this.service = service;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.java
deleted file mode 100644
index d1a86fb968..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.event.EventFilter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class EventFilterEntityDIModule implements IdentifiableStoreProvider<EventFilter> {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<EventFilter> store(DatabaseAdapter databaseAdapter) {
-        return EventFilterStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<EventFilter> handler(EventFilterHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<EventFilter>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return new HashMap<String, ChildrenAppender<EventFilter>>() {{
-            put(EventQueryCriteriaFields.DATA_FILTERS,
-                    EventFilterEventDataFilterChildrenAppender.create(databaseAdapter));
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
new file mode 100644
index 0000000000..393134e1e7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.event.EventFilter
+
+@Module
+internal class EventFilterEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): EventFilterStore {
+        return EventFilterStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(
+        eventFilterStore: EventFilterStore,
+        eventDataFilterHandler: EventDataFilterHandler
+    ): EventFilterHandler {
+        return EventFilterHandler(
+            eventFilterStore,
+            eventDataFilterHandler
+        )
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<EventFilter>> {
+        return mapOf(
+            EventQueryCriteriaFields.DATA_FILTERS to EventFilterEventDataFilterChildrenAppender.create(databaseAdapter)
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java
index 4774bd83df..e7ec839f84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java
@@ -58,7 +58,7 @@ public static ChildrenAppender<EventFilter> create(DatabaseAdapter databaseAdapt
         return new EventFilterEventDataFilterChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        EventDataFilterStore.CHILD_PROJECTION,
+                        EventDataFilterStoreImpl.Companion.getCHILD_PROJECTION(),
                         EventDataFilter::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
index a135fc6654..837cd1f449 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
@@ -27,19 +27,14 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.event.EventDataFilter
 import org.hisp.dhis.android.core.event.EventFilter
 
-@Reusable
-internal class EventFilterHandler @Inject constructor(
-    eventFilterStore: IdentifiableObjectStore<EventFilter>,
-    private val eventDataFilterHandler: HandlerWithTransformer<EventDataFilter>
+internal class EventFilterHandler constructor(
+    eventFilterStore: EventFilterStore,
+    private val eventDataFilterHandler: EventDataFilterHandler
 ) : IdentifiableHandlerImpl<EventFilter>(eventFilterStore) {
 
     override fun beforeCollectionHandled(oCollection: Collection<EventFilter>): Collection<EventFilter> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStore.kt
index 41813ce95f..f98b1a26be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStore.kt
@@ -25,45 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.event.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.event.EventFilter
-import org.hisp.dhis.android.core.event.EventFilterTableInfo
-
-@Suppress("MagicNumber")
-internal object EventFilterStore {
-    private val BINDER = object : IdentifiableStatementBinder<EventFilter>() {
-        override fun bindToStatement(o: EventFilter, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(7, o.program())
-            w.bind(8, o.programStage())
-            w.bind(9, o.description())
-            w.bind(10, o.eventQueryCriteria()?.followUp())
-            w.bind(11, o.eventQueryCriteria()?.organisationUnit())
-            w.bind(12, o.eventQueryCriteria()?.ouMode())
-            w.bind(13, o.eventQueryCriteria()?.assignedUserMode())
-            w.bind(14, o.eventQueryCriteria()?.order())
-            w.bind(15, StringListColumnAdapter.serialize(o.eventQueryCriteria()?.displayColumnOrder()))
-            w.bind(16, StringListColumnAdapter.serialize(o.eventQueryCriteria()?.events()))
-            w.bind(17, o.eventQueryCriteria()?.eventStatus())
-            w.bind(18, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.eventDate()))
-            w.bind(19, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.dueDate()))
-            w.bind(20, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.lastUpdatedDate()))
-            w.bind(21, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.completedDate()))
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<EventFilter> {
-        return objectWithUidStore(
-            databaseAdapter, EventFilterTableInfo.TABLE_INFO, BINDER
-        ) { EventFilter.create(it) }
-    }
-}
+internal interface EventFilterStore : IdentifiableObjectStore<EventFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
new file mode 100644
index 0000000000..dd7cda6d16
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.event.EventFilter
+import org.hisp.dhis.android.core.event.EventFilterTableInfo
+
+@Suppress("MagicNumber")
+internal class EventFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : EventFilterStore,
+    IdentifiableObjectStoreImpl<EventFilter>(
+        databaseAdapter,
+        EventFilterTableInfo.TABLE_INFO,
+        BINDER,
+        { EventFilter.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = object : IdentifiableStatementBinder<EventFilter>() {
+            override fun bindToStatement(o: EventFilter, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.program())
+                w.bind(8, o.programStage())
+                w.bind(9, o.description())
+                w.bind(10, o.eventQueryCriteria()?.followUp())
+                w.bind(11, o.eventQueryCriteria()?.organisationUnit())
+                w.bind(12, o.eventQueryCriteria()?.ouMode())
+                w.bind(13, o.eventQueryCriteria()?.assignedUserMode())
+                w.bind(14, o.eventQueryCriteria()?.order())
+                w.bind(15, StringListColumnAdapter.serialize(o.eventQueryCriteria()?.displayColumnOrder()))
+                w.bind(16, StringListColumnAdapter.serialize(o.eventQueryCriteria()?.events()))
+                w.bind(17, o.eventQueryCriteria()?.eventStatus())
+                w.bind(18, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.eventDate()))
+                w.bind(19, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.dueDate()))
+                w.bind(20, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.lastUpdatedDate()))
+                w.bind(21, DateFilterPeriodColumnAdapter.serialize(o.eventQueryCriteria()?.completedDate()))
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
index 7f114ec5f4..01859c4dfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
@@ -32,7 +32,6 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
@@ -42,6 +41,7 @@ import org.hisp.dhis.android.core.event.EventInternalAccessor
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
+import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
@@ -56,7 +56,7 @@ internal class EventHandler @Inject constructor(
     relationshipHandler: RelationshipHandler,
     eventStore: EventStore,
     private val trackedEntityDataValueHandler: TrackedEntityDataValueHandler,
-    private val noteHandler: Handler<Note>,
+    private val noteHandler: NoteHandler,
     private val noteVersionManager: NoteDHISVersionManager,
     private val noteUniquenessManager: NoteUniquenessManager,
     private val relationshipOrphanCleaner: OrphanCleaner<Event, Relationship>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
index ff17a43fb2..e967467561 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
@@ -29,13 +29,12 @@ package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerSyncLastUpdatedManager
 
 @Reusable
 internal class EventLastUpdatedManager @Inject constructor(
-    store: ObjectWithoutUidStore<EventSync>,
+    store: EventSyncStore,
     private val resourceHandler: ResourceHandler
 ) : TrackerSyncLastUpdatedManager<EventSync>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
index 968003172f..e4fa3d8d85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
@@ -30,18 +30,16 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.event.Event
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 
 @Reusable
 internal class EventPersistenceCallFactory @Inject constructor(
-    private val eventHandler: IdentifiableDataHandler<Event>,
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>,
+    private val eventHandler: EventHandler,
+    private val organisationUnitStore: OrganisationUnitStore,
     private val organisationUnitDownloader: OrganisationUnitModuleDownloader
 ) {
     fun persistEvents(events: Collection<Event>, relatives: RelationshipItemRelatives?): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
index aca2f6d1b9..337b5e33f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
@@ -31,7 +31,7 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactory
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactoryComm
 
 @Reusable
 internal class EventQueryBundleFactory @Inject constructor(
-    programStore: ProgramStoreInterface,
+    programStore: ProgramStore,
     programSettingsObjectRepository: ProgramSettingsObjectRepository,
     lastUpdatedManager: EventLastUpdatedManager,
     commonHelper: TrackerQueryFactoryCommonHelper
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
index f51b564743..34254225e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
@@ -31,7 +31,6 @@ import android.content.ContentValues
 import android.database.Cursor
 import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -47,12 +46,15 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventTableInfo
 
 @Suppress("TooManyFunctions")
-internal class EventStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilderImpl,
-    binder: StatementBinder<Event>,
-    objectFactory: Function1<Cursor, Event>
-) : IdentifiableDeletableDataObjectStoreImpl<Event>(databaseAdapter, builder, binder, objectFactory), EventStore {
+internal class EventStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : EventStore,
+    IdentifiableDeletableDataObjectStoreImpl<Event>(
+        databaseAdapter,
+        EventTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Event.create(cursor) }
+    ) {
 
     override fun queryEventsAttachedToEnrollmentToPost(): Map<String, List<Event>> {
         val eventsAttachedToEnrollmentsQuery = WhereClauseBuilder()
@@ -173,18 +175,5 @@ internal class EventStoreImpl private constructor(
             w.bind(20, o.assignedUser())
             w.bind(21, o.completedBy())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): EventStore {
-            val statementBuilder = SQLStatementBuilderImpl(
-                EventTableInfo.TABLE_INFO.name(),
-                EventTableInfo.TABLE_INFO.columns()
-            )
-            return EventStoreImpl(
-                databaseAdapter,
-                statementBuilder,
-                BINDER
-            ) { cursor: Cursor? -> Event.create(cursor) }
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt
new file mode 100644
index 0000000000..9c70a5ae6f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class EventSyncEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): EventSyncStore {
+        return EventSyncStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/EnrollmentWebResponseHandlerSummary.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStore.kt
similarity index 86%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/EnrollmentWebResponseHandlerSummary.kt
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStore.kt
index 40cf72b499..bc186e8005 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/EnrollmentWebResponseHandlerSummary.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStore.kt
@@ -25,10 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.imports.internal
 
-import org.hisp.dhis.android.core.enrollment.Enrollment
+package org.hisp.dhis.android.core.event.internal
 
-internal data class EnrollmentWebResponseHandlerSummary(
-    val ignoredEnrollments: MutableList<Enrollment> = mutableListOf()
-)
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+
+internal interface EventSyncStore : ObjectWithoutUidStore<EventSync>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
new file mode 100644
index 0000000000..7670387447
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+internal class EventSyncStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : EventSyncStore,
+    ObjectWithoutUidStoreImpl<EventSync>(
+        databaseAdapter,
+        EventSyncTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        DELETE_UPDATE_BINDER,
+        { cursor: Cursor -> EventSync.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: EventSync, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.organisationUnitIdsHash())
+            w.bind(3, o.downloadLimit())
+            w.bind(4, o.lastUpdated())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: EventSync, w: StatementWrapper ->
+            w.bind(5, o.program())
+            w.bind(6, o.organisationUnitIdsHash())
+        }
+        private val DELETE_UPDATE_BINDER = WhereStatementBinder { o: EventSync, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.organisationUnitIdsHash())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.java
index 45b1bdcae5..bca392df2c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.java
@@ -28,13 +28,13 @@
 
 package org.hisp.dhis.android.core.expressiondimensionitem;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo.Columns;
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore;
 
 import java.util.Map;
 
@@ -49,7 +49,7 @@ public final class ExpressionDimensionItemCollectionRepository
 
     @Inject
     ExpressionDimensionItemCollectionRepository(
-            final IdentifiableObjectStore<ExpressionDimensionItem> store,
+            final ExpressionDimensionItemStore store,
             final Map<String, ChildrenAppender<ExpressionDimensionItem>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
index 26b579b63b..185966038e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
@@ -32,13 +32,12 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 
 @Reusable
 internal class ExpressionDimensionItemCall @Inject constructor(
     private val service: ExpressionDimensionItemService,
-    private val handler: Handler<ExpressionDimensionItem>,
+    private val handler: ExpressionDimensionItemHandler,
     private val apiDownloader: APIDownloader
 ) : UidsCall<ExpressionDimensionItem> {
     override fun download(uids: Set<String>): Single<List<ExpressionDimensionItem>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
index 47db4cab44..676c0ab0d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import retrofit2.Retrofit
@@ -42,14 +40,14 @@ internal class ExpressionDimensionItemEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ExpressionDimensionItem> {
-        return ExpressionDimensionItemStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): ExpressionDimensionItemStore {
+        return ExpressionDimensionItemStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(handler: ExpressionDimensionItemHandler): Handler<ExpressionDimensionItem> {
-        return handler
+    fun handler(store: ExpressionDimensionItemStore): ExpressionDimensionItemHandler {
+        return ExpressionDimensionItemHandler(store)
     }
 
     @Reusable
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
index fa1672312f..4565090f9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
@@ -27,13 +27,9 @@
  */
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 
-@Reusable
-internal class ExpressionDimensionItemHandler @Inject constructor(
-    store: IdentifiableObjectStore<ExpressionDimensionItem>
+internal class ExpressionDimensionItemHandler constructor(
+    store: ExpressionDimensionItemStore
 ) : IdentifiableHandlerImpl<ExpressionDimensionItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStore.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStore.kt
index 5e1dfd6b71..0b2224a479 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStore.kt
@@ -25,33 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
-import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo
-
-@Suppress("MagicNumber")
-internal object ExpressionDimensionItemStore {
-    private val BINDER: StatementBinder<ExpressionDimensionItem> =
-        object : IdentifiableStatementBinder<ExpressionDimensionItem>() {
-            override fun bindToStatement(o: ExpressionDimensionItem, w: StatementWrapper) {
-                super.bindToStatement(o, w)
-                w.bind(7, o.expression())
-            }
-        }
 
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ExpressionDimensionItem> {
-        return objectWithUidStore(
-            databaseAdapter,
-            ExpressionDimensionItemTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> ExpressionDimensionItem.create(cursor) }
-    }
-}
+internal interface ExpressionDimensionItemStore : IdentifiableObjectStore<ExpressionDimensionItem>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.java b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
index ee4dbde1c0..705d03f030 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
@@ -25,35 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-package org.hisp.dhis.android.core.option.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
+import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.option.OptionGroup;
-import org.hisp.dhis.android.core.option.OptionGroupTableInfo;
+@Suppress("MagicNumber")
+internal class ExpressionDimensionItemStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ExpressionDimensionItemStore,
+    IdentifiableObjectStoreImpl<ExpressionDimensionItem>(
+        databaseAdapter,
+        ExpressionDimensionItemTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ExpressionDimensionItem.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-final class OptionGroupStore {
-
-    private OptionGroupStore() {}
-
-    private static StatementBinder<OptionGroup> BINDER = new IdentifiableStatementBinder<OptionGroup>() {
-        @Override
-        public void bindToStatement(@NonNull OptionGroup o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, UidsHelper.getUidOrNull(o.optionSet()));
-        }
-    };
-
-    public static IdentifiableObjectStore<OptionGroup> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, OptionGroupTableInfo.TABLE_INFO, BINDER,
-                OptionGroup::create);
+    companion object {
+        private val BINDER: StatementBinder<ExpressionDimensionItem> =
+            object : IdentifiableStatementBinder<ExpressionDimensionItem>() {
+                override fun bindToStatement(o: ExpressionDimensionItem, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(7, o.expression())
+                }
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
index 6dfbbae81e..d1d8392129 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
@@ -28,6 +28,8 @@
 
 package org.hisp.dhis.android.core.fileresource;
 
+import static org.hisp.dhis.android.core.fileresource.FileResourceTableInfo.Columns;
+
 import android.content.Context;
 
 import org.hisp.dhis.android.core.arch.call.D2Progress;
@@ -46,6 +48,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore;
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
@@ -60,8 +63,6 @@
 import io.reactivex.Observable;
 import io.reactivex.Single;
 
-import static org.hisp.dhis.android.core.fileresource.FileResourceTableInfo.Columns;
-
 @Reusable
 public final class FileResourceCollectionRepository
         extends ReadWriteWithUidCollectionRepositoryImpl<FileResource, File, FileResourceCollectionRepository>
@@ -71,7 +72,7 @@ public final class FileResourceCollectionRepository
     private final Context context;
 
     @Inject
-    FileResourceCollectionRepository(final IdentifiableDataObjectStore<FileResource> store,
+    FileResourceCollectionRepository(final FileResourceStore store,
                                      final Map<String, ChildrenAppender<FileResource>> childrenAppenders,
                                      final RepositoryScope scope,
                                      final Transformer<File, FileResource> transformer,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
index 4ddadbd838..c925f6b477 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
@@ -34,12 +34,12 @@ import java.io.File
 import java.util.Calendar
 import java.util.Date
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementCollectionRepository
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueCollectionRepository
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
@@ -54,7 +54,7 @@ internal class FileResourceRoutine @Inject constructor(
     private val fileResourceCollectionRepository: FileResourceCollectionRepository,
     private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository,
     private val trackedEntityDataValueCollectionRepository: TrackedEntityDataValueCollectionRepository,
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
+    private val fileResourceStore: FileResourceStore,
     private val trackedEntityAttributeValueCollectionRepository: TrackedEntityAttributeValueCollectionRepository
 ) {
     fun deleteOutdatedFileResources(after: Date? = null): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index 32410bf79d..c0edbfc9f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -38,27 +38,28 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.ValueType
-import org.hisp.dhis.android.core.fileresource.*
+import org.hisp.dhis.android.core.fileresource.FileResource
+import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
+import org.hisp.dhis.android.core.fileresource.FileResourceElementType
+import org.hisp.dhis.android.core.fileresource.FileResourceInternalAccessor
+import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
 import retrofit2.Call
 
 @Reusable
 internal class FileResourceDownloadCall @Inject constructor(
     private val rxCallExecutor: RxAPICallExecutor,
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
+    private val fileResourceStore: FileResourceStore,
     private val helper: FileResourceDownloadCallHelper,
     private val fileResourceService: FileResourceService,
-    private val handler: HandlerWithTransformer<FileResource>,
+    private val handler: FileResourceHandler,
     private val fileResourceRoutine: FileResourceRoutine,
     private val apiCallExecutor: APICallExecutor,
-    private val synchronizationSettingsStore: ObjectWithoutUidStore<SynchronizationSettings>,
+    private val synchronizationSettingsStore: SynchronizationSettingStore,
     private val context: Context
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
index 209b093426..21d8183ef4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
@@ -30,24 +30,27 @@ package org.hisp.dhis.android.core.fileresource.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
 import org.hisp.dhis.android.core.fileresource.FileResourceValueType
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.trackedentity.*
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
 
 @Reusable
 internal class FileResourceDownloadCallHelper @Inject constructor(
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
+    private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
     private val dataValueStore: DataValueStore,
     private val dhisVersionManager: DHISVersionManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
index 4dde0947b3..56cc10ab19 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
@@ -32,27 +32,23 @@ import dagger.Provides
 import dagger.Reusable
 import java.io.File
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.fileresource.FileResource
-import org.hisp.dhis.android.core.fileresource.internal.FileResourceStoreImpl.Companion.create
 
 @Module
 internal class FileResourceEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableDataObjectStore<FileResource> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): FileResourceStore {
+        return FileResourceStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: IdentifiableDataObjectStore<FileResource>): HandlerWithTransformer<FileResource> {
-        return IdentifiableWithoutDeleteInterfaceHandlerImpl(store)
+    fun handler(store: FileResourceStore): FileResourceHandler {
+        return FileResourceHandler(store)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
new file mode 100644
index 0000000000..0ca96cfece
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.fileresource.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
+import org.hisp.dhis.android.core.fileresource.FileResource
+
+internal class FileResourceHandler(
+    store: FileResourceStore
+) : IdentifiableWithoutDeleteInterfaceHandlerImpl<FileResource>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
index 0574c19b60..06aa2cab23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
@@ -29,10 +29,8 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.common.State
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
@@ -41,20 +39,21 @@ import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
 import org.hisp.dhis.android.core.trackedentity.*
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 
 @Suppress("TooManyFunctions")
 internal class FileResourceHelper @Inject constructor(
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
-    private val attributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    private val dataElementStore: DataElementStore,
+    private val attributeStore: TrackedEntityAttributeStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
     private val eventStore: EventStore,
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val dataValueStore: DataValueStore,
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>
+    private val fileResourceStore: FileResourceStore
 ) {
 
     fun getUploadableFileResources(): List<FileResource> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
index 4da9925de4..9b7e67ad13 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
@@ -39,8 +39,6 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
@@ -60,8 +58,8 @@ internal class FileResourcePostCall @Inject constructor(
     private val dataValueStore: DataValueStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
-    private val fileResourceHandler: HandlerWithTransformer<FileResource>,
+    private val fileResourceStore: FileResourceStore,
+    private val fileResourceHandler: FileResourceHandler,
     private val pingCall: PingCall,
     private val context: Context
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStore.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStore.kt
new file mode 100644
index 0000000000..29b179dd35
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.fileresource.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
+import org.hisp.dhis.android.core.fileresource.FileResource
+
+internal interface FileResourceStore : IdentifiableDataObjectStore<FileResource>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
index 7b4de9ad1b..4dba0f91c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
@@ -29,19 +29,21 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStoreImpl
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceTableInfo
 
-internal class FileResourceStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilderImpl,
-    binder: StatementBinder<FileResource>,
-    objectFactory: Function1<Cursor, FileResource>
-) : IdentifiableDataObjectStoreImpl<FileResource>(databaseAdapter, builder, binder, objectFactory) {
+internal class FileResourceStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : FileResourceStore,
+    IdentifiableDataObjectStoreImpl<FileResource>(
+        databaseAdapter,
+        FileResourceTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> FileResource.create(cursor) }
+    ) {
 
     companion object {
         private val BINDER = StatementBinder { o: FileResource, w: StatementWrapper ->
@@ -55,18 +57,5 @@ internal class FileResourceStoreImpl private constructor(
             w.bind(8, o.syncState())
             w.bind(9, o.domain())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): IdentifiableDataObjectStoreImpl<FileResource> {
-            val statementBuilder = SQLStatementBuilderImpl(
-                FileResourceTableInfo.TABLE_INFO.name(),
-                FileResourceTableInfo.TABLE_INFO.columns()
-            )
-            return FileResourceStoreImpl(
-                databaseAdapter,
-                statementBuilder,
-                BINDER
-            ) { cursor: Cursor -> FileResource.create(cursor) }
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
index 409317513b..271495f55e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
@@ -25,32 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.imports.internal
 
-package org.hisp.dhis.android.core.imports.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.imports.TrackerImportConflict;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.imports.TrackerImportConflict
 
 @Module
-public final class TrackerImportConflictEntityDIModule {
-
+internal class TrackerImportConflictEntityDIModule {
     @Provides
     @Reusable
-    public TrackerImportConflictStore store(DatabaseAdapter databaseAdapter) {
-        return TrackerImportConflictStoreImpl.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): TrackerImportConflictStore {
+        return TrackerImportConflictStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<TrackerImportConflict>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<TrackerImportConflict>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
index d871f3da7a..0b25b927bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
@@ -29,18 +29,35 @@ package org.hisp.dhis.android.core.imports.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
-import org.hisp.dhis.android.core.imports.internal.conflicts.*
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.imports.internal.conflicts.BadAttributePatternConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.EnrollmentHasInvalidProgramConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.EnrollmentNotFoundConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.EventHasInvalidProgramConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.EventHasInvalidProgramStageConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.EventNotFoundConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.FileResourceAlreadyAssignedConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.FileResourceReferenceNotFoundConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.InvalidAttributeValueTypeConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.InvalidDataValueConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.InvalidTrackedEntityTypeConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.LackingEnrollmentCascadeDeleteAuthorityConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.LackingTEICascadeDeleteAuthorityConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.MissingAttributeConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.MissingDataElementConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.NonUniqueAttributeConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.TrackedEntityInstanceNotFoundConflict
+import org.hisp.dhis.android.core.imports.internal.conflicts.TrackerImportConflictItem
+import org.hisp.dhis.android.core.imports.internal.conflicts.TrackerImportConflictItemContext
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 
 @Reusable
 internal class TrackerImportConflictParser @Inject constructor(
-    attributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
-    dataElementStore: IdentifiableObjectStore<DataElement>,
+    attributeStore: TrackedEntityAttributeStore,
+    dataElementStore: DataElementStore,
     private val trackedEntityAttributeValueRepository: TrackedEntityAttributeValueCollectionRepository,
     private val trackedEntityInstanceDataValueRepository: TrackedEntityDataValueCollectionRepository
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.java
deleted file mode 100644
index a1d8b25948..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.imports.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl;
-import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo;
-import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo;
-import org.hisp.dhis.android.core.event.EventTableInfo;
-import org.hisp.dhis.android.core.imports.TrackerImportConflict;
-import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo;
-import org.jetbrains.annotations.NotNull;
-
-public final class TrackerImportConflictStoreImpl extends ObjectStoreImpl<TrackerImportConflict>
-    implements TrackerImportConflictStore {
-
-    private static final StatementBinder<TrackerImportConflict> BINDER = (o, w) -> {
-        w.bind(1, o.conflict());
-        w.bind(2, o.value());
-        w.bind(3, o.trackedEntityInstance());
-        w.bind(4, o.enrollment());
-        w.bind(5, o.event());
-        w.bind(6, o.trackedEntityAttribute());
-        w.bind(7, o.dataElement());
-        w.bind(8, o.tableReference());
-        w.bind(9, o.errorCode());
-        w.bind(10, o.status());
-        w.bind(11, o.created());
-        w.bind(12, o.displayDescription());
-    };
-
-    private TrackerImportConflictStoreImpl(DatabaseAdapter databaseAdapter,
-                                           SQLStatementBuilderImpl builder) {
-        super(databaseAdapter, builder, BINDER, TrackerImportConflict::create);
-    }
-
-    public static TrackerImportConflictStore create(DatabaseAdapter databaseAdapter) {
-        SQLStatementBuilderImpl statementBuilder = new SQLStatementBuilderImpl(
-                TrackerImportConflictTableInfo.TABLE_INFO.name(),
-                TrackerImportConflictTableInfo.TABLE_INFO.columns());
-
-        return new TrackerImportConflictStoreImpl(databaseAdapter, statementBuilder);
-    }
-
-    @Override
-    public void deleteEventConflicts(@NotNull String eventUid) {
-        deleteTypeConflicts(TrackerImportConflictTableInfo.Columns.EVENT,
-                EventTableInfo.TABLE_INFO,
-                eventUid);
-    }
-
-    @Override
-    public void deleteEnrollmentConflicts(@NotNull String enrollmentUid) {
-        deleteTypeConflicts(TrackerImportConflictTableInfo.Columns.ENROLLMENT,
-                EnrollmentTableInfo.TABLE_INFO,
-                enrollmentUid);
-    }
-
-    @Override
-    public void deleteTrackedEntityConflicts(@NonNull String teiUid) {
-        deleteTypeConflicts(TrackerImportConflictTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                TrackedEntityInstanceTableInfo.TABLE_INFO,
-                teiUid);
-    }
-
-    private void deleteTypeConflicts(String column, TableInfo tableInfo, String uid) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(column, uid)
-                .appendKeyStringValue(
-                        TrackerImportConflictTableInfo.Columns.TABLE_REFERENCE,
-                        tableInfo.name())
-                .build();
-        deleteWhereIfExists(whereClause);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
new file mode 100644
index 0000000000..a8d6283576
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
@@ -0,0 +1,104 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.imports.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
+import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
+import org.hisp.dhis.android.core.event.EventTableInfo
+import org.hisp.dhis.android.core.imports.TrackerImportConflict
+import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
+
+internal class TrackerImportConflictStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackerImportConflictStore,
+    ObjectStoreImpl<TrackerImportConflict>(
+        databaseAdapter,
+        TrackerImportConflictTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> TrackerImportConflict.create(cursor) }
+    ) {
+
+    override fun deleteEventConflicts(eventUid: String) {
+        deleteTypeConflicts(
+            TrackerImportConflictTableInfo.Columns.EVENT,
+            EventTableInfo.TABLE_INFO,
+            eventUid
+        )
+    }
+
+    override fun deleteEnrollmentConflicts(enrollmentUid: String) {
+        deleteTypeConflicts(
+            TrackerImportConflictTableInfo.Columns.ENROLLMENT,
+            EnrollmentTableInfo.TABLE_INFO,
+            enrollmentUid
+        )
+    }
+
+    override fun deleteTrackedEntityConflicts(tackedEntityUid: String) {
+        deleteTypeConflicts(
+            TrackerImportConflictTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
+            TrackedEntityInstanceTableInfo.TABLE_INFO,
+            tackedEntityUid
+        )
+    }
+
+    private fun deleteTypeConflicts(column: String, tableInfo: TableInfo, uid: String) {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(column, uid)
+            .appendKeyStringValue(
+                TrackerImportConflictTableInfo.Columns.TABLE_REFERENCE,
+                tableInfo.name()
+            )
+            .build()
+        deleteWhereIfExists(whereClause)
+    }
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackerImportConflict, w: StatementWrapper ->
+            w.bind(1, o.conflict())
+            w.bind(2, o.value())
+            w.bind(3, o.trackedEntityInstance())
+            w.bind(4, o.enrollment())
+            w.bind(5, o.event())
+            w.bind(6, o.trackedEntityAttribute())
+            w.bind(7, o.dataElement())
+            w.bind(8, o.tableReference())
+            w.bind(9, o.errorCode())
+            w.bind(10, o.status())
+            w.bind(11, o.created())
+            w.bind(12, o.displayDescription())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
index eb5302780d..3d41e68807 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -35,9 +34,9 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo;
-import org.hisp.dhis.android.core.indicator.internal.IndicatorFields;
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
-
+import org.hisp.dhis.android.core.indicator.internal.IndicatorFields;
+import org.hisp.dhis.android.core.indicator.internal.IndicatorStore;
 
 import java.util.Collections;
 import java.util.Map;
@@ -51,7 +50,7 @@ public final class IndicatorCollectionRepository
         extends ReadOnlyNameableCollectionRepositoryImpl<Indicator, IndicatorCollectionRepository> {
 
     @Inject
-    IndicatorCollectionRepository(final IdentifiableObjectStore<Indicator> store,
+    IndicatorCollectionRepository(final IndicatorStore store,
                                   final Map<String, ChildrenAppender<Indicator>> childrenAppenders,
                                   final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
index d5a37f72ef..407f078811 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -35,7 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.Columns;
-
+import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore;
 
 import java.util.Map;
 
@@ -48,7 +47,7 @@ public final class IndicatorTypeCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<IndicatorType, IndicatorTypeCollectionRepository> {
 
     @Inject
-    IndicatorTypeCollectionRepository(final IdentifiableObjectStore<IndicatorType> store,
+    IndicatorTypeCollectionRepository(final IndicatorTypeStore store,
                                       final Map<String, ChildrenAppender<IndicatorType>> childrenAppenders,
                                       final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
index 98a6013571..3206839b26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.indicator.datasetindicatorengine
 import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantCollectionRepository
@@ -38,8 +37,8 @@ import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueCollectionRepository
 import org.hisp.dhis.android.core.indicator.IndicatorCollectionRepository
 import org.hisp.dhis.android.core.indicator.IndicatorTypeCollectionRepository
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DimensionalItemObject
 import org.hisp.dhis.android.core.parser.internal.service.utils.ExpressionHelper
@@ -52,7 +51,7 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
     private val indicatorTypeRepository: IndicatorTypeCollectionRepository,
     private val dataValueRepository: DataValueCollectionRepository,
     private val constantRepository: ConstantCollectionRepository,
-    private val orgunitGroupLinkStore: LinkStore<OrganisationUnitOrganisationUnitGroupLink>,
+    private val orgunitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore,
     private val periodHelper: PeriodHelper,
     private val dataSetIndicatorEvaluator: DataSetIndicatorEvaluator
 ) : DataSetIndicatorEngine {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.java
deleted file mode 100644
index 6f7cfa78f0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink;
-import org.hisp.dhis.android.core.indicator.Indicator;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataSetIndicatorEntityDIModule {
-
-    @Provides
-    @Reusable
-    LinkStore<DataSetIndicatorLink> store(DatabaseAdapter databaseAdapter) {
-        return DataSetIndicatorLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    LinkHandler<Indicator, DataSetIndicatorLink> handler(LinkStore<DataSetIndicatorLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.kt
index 9ca67eeafe..40aaea0bd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.kt
@@ -25,22 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.indicator.internal
 
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Module
-public final class EventSyncEntityDIModule {
-
+internal class DataSetIndicatorEntityDIModule {
     @Provides
     @Reusable
-    public ObjectWithoutUidStore<EventSync> store(DatabaseAdapter databaseAdapter) {
-        return EventSyncStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): DataSetIndicatorLinkStore {
+        return DataSetIndicatorLinkStoreImpl(databaseAdapter)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
new file mode 100644
index 0000000000..ddeefcb6d6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
+import org.hisp.dhis.android.core.indicator.Indicator
+import javax.inject.Inject
+
+@Reusable
+internal class DataSetIndicatorLinkHandler @Inject constructor(
+    store: DataSetIndicatorLinkStore
+) : LinkHandlerImpl<Indicator, DataSetIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.kt
new file mode 100644
index 0000000000..cd7fe304e6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
+
+internal interface DataSetIndicatorLinkStore : LinkStore<DataSetIndicatorLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
index fa0c82fd22..f4648aabfd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
@@ -25,27 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.indicator.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink;
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo;
-
-public final class DataSetIndicatorLinkStore {
-
-    private static final StatementBinder<DataSetIndicatorLink> BINDER = (o, w) -> {
-        w.bind(1, o.dataSet());
-        w.bind(2, o.indicator());
-    };
-
-    private DataSetIndicatorLinkStore() {}
-
-    public static LinkStore<DataSetIndicatorLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, DataSetIndicatorLinkTableInfo.TABLE_INFO,
-                DataSetIndicatorLinkTableInfo.Columns.DATA_SET, BINDER, DataSetIndicatorLink::create);
+internal class DataSetIndicatorLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetIndicatorLinkStore,
+    LinkStoreImpl<DataSetIndicatorLink>(
+        databaseAdapter,
+        DataSetIndicatorLinkTableInfo.TABLE_INFO,
+        DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
+        BINDER,
+        { cursor: Cursor -> DataSetIndicatorLink.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: DataSetIndicatorLink, w: StatementWrapper ->
+            w.bind(1, o.dataSet())
+            w.bind(2, o.indicator())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java
index 10c8cf43da..f89c4705ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java
@@ -37,7 +37,6 @@
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.indicator.Indicator;
 
 import java.util.Set;
@@ -50,15 +49,15 @@
 final class IndicatorEndpointCallFactory extends UidsCallFactoryImpl<Indicator> {
 
     private final IndicatorService service;
-    private final Handler<Indicator> handler;
+    private final IndicatorHandler handler;
 
     private static final int MAX_UID_LIST_SIZE = 100;
 
     @Inject
     IndicatorEndpointCallFactory(GenericCallData data,
-                                        APICallExecutor apiCallExecutor,
-                                        IndicatorService service,
-                                        Handler<Indicator> handler) {
+                                 APICallExecutor apiCallExecutor,
+                                 IndicatorService service,
+                                 IndicatorHandler handler) {
         super(data, apiCallExecutor);
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
new file mode 100644
index 0000000000..70a48cc9fe
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.indicator.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.indicator.Indicator
+
+@Module
+internal class IndicatorEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): IndicatorStore {
+        return IndicatorStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Indicator>> {
+        return mapOf(
+            IndicatorFields.LEGEND_SETS to IndicatorLegendSetChildrenAppender.create(databaseAdapter)
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
index ab935948fa..b054acd1bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
@@ -29,19 +29,17 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
-import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
+import org.hisp.dhis.android.core.legendset.internal.IndicatorLegendSetLinkHandler
+import javax.inject.Inject
 
 @Reusable
 internal class IndicatorHandler @Inject constructor(
-    indicatorStore: IdentifiableObjectStore<Indicator>,
-    private val indicatorLegendSetLinkHandler: OrderedLinkHandler<ObjectWithUid, IndicatorLegendSetLink>
+    indicatorStore: IndicatorStore,
+    private val indicatorLegendSetLinkHandler: IndicatorLegendSetLinkHandler
 ) : IdentifiableHandlerImpl<Indicator>(indicatorStore) {
 
     override fun afterObjectHandled(o: Indicator, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.kt
new file mode 100644
index 0000000000..a118f307d8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.indicator.Indicator
+
+internal interface IndicatorStore : IdentifiableObjectStore<Indicator>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
new file mode 100644
index 0000000000..a3c0e9c5fc
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.indicator.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.TABLE_INFO
+
+internal class IndicatorStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : IndicatorStore,
+    IdentifiableObjectStoreImpl<Indicator>(
+        databaseAdapter,
+        TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Indicator.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<Indicator> = object : NameableWithStyleStatementBinder<Indicator>() {
+            override fun bindToStatement(o: Indicator, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(13, o.annualized())
+                w.bind(14, getUidOrNull(o.indicatorType()))
+                w.bind(15, o.numerator())
+                w.bind(16, o.numeratorDescription())
+                w.bind(17, o.denominator())
+                w.bind(18, o.denominatorDescription())
+                w.bind(19, o.url())
+                w.bind(20, o.decimals())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java
index 2aa179b6d4..9a0e8fc734 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java
@@ -37,7 +37,6 @@
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.indicator.IndicatorType;
 
 import java.util.Set;
@@ -52,13 +51,13 @@ final class IndicatorTypeEndpointCallFactory extends UidsCallFactoryImpl<Indicat
     private static final int MAX_UID_LIST_SIZE = 140;
 
     private final IndicatorTypeService service;
-    private final Handler<IndicatorType> handler;
+    private final IndicatorTypeHandler handler;
 
     @Inject
     IndicatorTypeEndpointCallFactory(GenericCallData data,
-                                            APICallExecutor apiCallExecutor,
-                                            IndicatorTypeService service,
-                                            Handler<IndicatorType> handler) {
+                                     APICallExecutor apiCallExecutor,
+                                     IndicatorTypeService service,
+                                     IndicatorTypeHandler handler) {
         super(data, apiCallExecutor);
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
new file mode 100644
index 0000000000..fc619620f8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.indicator.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.indicator.IndicatorType
+
+@Module
+internal class IndicatorTypeEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): IndicatorTypeStore {
+        return IndicatorTypeStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<IndicatorType>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
new file mode 100644
index 0000000000..ef02ceeb64
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.indicator.IndicatorType
+import javax.inject.Inject
+
+@Reusable
+internal class IndicatorTypeHandler @Inject constructor(
+    store: IndicatorTypeStore
+) : IdentifiableHandlerImpl<IndicatorType>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.kt
new file mode 100644
index 0000000000..91dcdf688c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.indicator.IndicatorType
+
+internal interface IndicatorTypeStore : IdentifiableObjectStore<IndicatorType>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
index b800db76ef..1cc8af4a0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
@@ -25,35 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.indicator.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.indicator.IndicatorType
+import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.TABLE_INFO
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.indicator.IndicatorType;
-import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo;
-
-import androidx.annotation.NonNull;
-
-public final class IndicatorTypeStore {
-
-    private IndicatorTypeStore() {}
-
-    private static StatementBinder<IndicatorType> BINDER = new IdentifiableStatementBinder<IndicatorType>() {
-        @Override
-        public void bindToStatement(@NonNull IndicatorType o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.number());
-            w.bind(8, o.factor());
+internal class IndicatorTypeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : IndicatorTypeStore,
+    IdentifiableObjectStoreImpl<IndicatorType>(
+        databaseAdapter,
+        TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> IndicatorType.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<IndicatorType> = object : IdentifiableStatementBinder<IndicatorType>() {
+            override fun bindToStatement(o: IndicatorType, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.number())
+                w.bind(8, o.factor())
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<IndicatorType> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, IndicatorTypeTableInfo.INSTANCE.getTABLE_INFO(), BINDER,
-                IndicatorType::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.java
index c8f7479a0d..5799709227 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.legendset;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.legendset.LegendTableInfo.Columns;
+import org.hisp.dhis.android.core.legendset.internal.LegendStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class LegendCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<Legend, LegendCollectionRepository> {
 
     @Inject
-    LegendCollectionRepository(final IdentifiableObjectStore<Legend> store,
+    LegendCollectionRepository(final LegendStore store,
                                final Map<String, ChildrenAppender<Legend>> childrenAppenders,
                                final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java
index 46d7515a5c..f259005610 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.legendset;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.legendset.LegendSetTableInfo.Columns;
 import org.hisp.dhis.android.core.legendset.internal.LegendSetFields;
+import org.hisp.dhis.android.core.legendset.internal.LegendSetStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class LegendSetCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<LegendSet, LegendSetCollectionRepository> {
 
     @Inject
-    LegendSetCollectionRepository(final IdentifiableObjectStore<LegendSet> store,
+    LegendSetCollectionRepository(final LegendSetStore store,
                                   final Map<String, ChildrenAppender<LegendSet>> childrenAppenders,
                                   final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
new file mode 100644
index 0000000000..48de4d7f68
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
+
+internal class DataElementLegendSetLinkHandler(
+    store: DataElementLegendSetLinkStore
+) : OrderedLinkHandlerImpl<ObjectWithUid, DataElementLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.kt
new file mode 100644
index 0000000000..28fa972df2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
+
+internal interface DataElementLegendSetLinkStore : LinkStore<DataElementLegendSetLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
index 6dd255da6e..d9b6a524e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
@@ -25,29 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.legendset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
+import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink;
-import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo;
+internal class DataElementLegendSetLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataElementLegendSetLinkStore,
+    LinkStoreImpl<DataElementLegendSetLink>(
+        databaseAdapter,
+        DataElementLegendSetLinkTableInfo.TABLE_INFO,
+        DataElementLegendSetLinkTableInfo.Columns.DATA_ELEMENT,
+        BINDER,
+        { cursor: Cursor -> DataElementLegendSetLink.create(cursor) }
+    ) {
 
-public final class DataElementLegendSetLinkStore {
-
-    private static final StatementBinder<DataElementLegendSetLink> BINDER = (o, w) -> {
-        w.bind(1, o.dataElement());
-        w.bind(2, o.legendSet());
-        w.bind(3, o.sortOrder());
-    };
-
-    private DataElementLegendSetLinkStore() {}
-
-    public static LinkStore<DataElementLegendSetLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, DataElementLegendSetLinkTableInfo.TABLE_INFO,
-                DataElementLegendSetLinkTableInfo.Columns.DATA_ELEMENT,
-                BINDER, DataElementLegendSetLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: DataElementLegendSetLink, w: StatementWrapper ->
+            w.bind(1, o.dataElement())
+            w.bind(2, o.legendSet())
+            w.bind(3, o.sortOrder())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt
index 2f2074a681..aca90da0ab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt
@@ -32,26 +32,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
-import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 
 @Module
 internal class IndicatorLegendSetEntityDIModule {
 
     @Provides
     @Reusable
-    internal fun store(databaseAdapter: DatabaseAdapter): LinkStore<IndicatorLegendSetLink> {
-        return IndicatorLegendSetLinkStore.create(databaseAdapter)
+    internal fun store(databaseAdapter: DatabaseAdapter): IndicatorLegendSetLinkStore {
+        return IndicatorLegendSetLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    internal fun handler(
-        store: LinkStore<IndicatorLegendSetLink>
-    ): OrderedLinkHandler<ObjectWithUid, IndicatorLegendSetLink> {
-        return OrderedLinkHandlerImpl(store)
+    internal fun handler(store: IndicatorLegendSetLinkStore): IndicatorLegendSetLinkHandler {
+        return IndicatorLegendSetLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
new file mode 100644
index 0000000000..533d09dede
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
+
+internal class IndicatorLegendSetLinkHandler(
+    store: IndicatorLegendSetLinkStore
+) : OrderedLinkHandlerImpl<ObjectWithUid, IndicatorLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStore.kt
index 59665da0d8..339e684688 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStore.kt
@@ -28,32 +28,7 @@
 
 package org.hisp.dhis.android.core.legendset.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
-import org.hisp.dhis.android.core.indicator.IndicatorLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 
-internal class IndicatorLegendSetLinkStore private constructor() {
-
-    companion object {
-        private val BINDER = StatementBinder { o: IndicatorLegendSetLink, w: StatementWrapper ->
-            w.bind(1, o.indicator())
-            w.bind(2, o.legendSet())
-            w.bind(3, o.sortOrder())
-        }
-
-        fun create(databaseAdapter: DatabaseAdapter?): LinkStore<IndicatorLegendSetLink> {
-            return linkStore(
-                databaseAdapter!!, IndicatorLegendSetLinkTableInfo.TABLE_INFO,
-                IndicatorLegendSetLinkTableInfo.Columns.INDICATOR,
-                BINDER
-            ) { cursor: Cursor? ->
-                IndicatorLegendSetLink.create(cursor)
-            }
-        }
-    }
-}
+internal interface IndicatorLegendSetLinkStore : LinkStore<IndicatorLegendSetLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
new file mode 100644
index 0000000000..4fe879185d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.indicator.IndicatorLegendSetLinkTableInfo
+import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
+
+internal class IndicatorLegendSetLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : IndicatorLegendSetLinkStore,
+    LinkStoreImpl<IndicatorLegendSetLink>(
+        databaseAdapter,
+        IndicatorLegendSetLinkTableInfo.TABLE_INFO,
+        IndicatorLegendSetLinkTableInfo.Columns.INDICATOR,
+        BINDER,
+        { cursor: Cursor -> IndicatorLegendSetLink.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: IndicatorLegendSetLink, w: StatementWrapper ->
+            w.bind(1, o.indicator())
+            w.bind(2, o.legendSet())
+            w.bind(3, o.sortOrder())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java
index aab6822358..e47abf0951 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java
@@ -53,7 +53,7 @@ static ChildrenAppender<LegendSet> create(DatabaseAdapter databaseAdapter) {
         return new LegendChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        LegendStore.CHILD_PROJECTION,
+                        LegendStoreImpl.Companion.getCHILD_PROJECTION(),
                         Legend::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
index 74d136da07..3d0bbdc09b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
@@ -25,34 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.period;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.period.internal.PeriodStore;
-import org.hisp.dhis.android.core.period.internal.PeriodStoreImpl;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.legendset.Legend
 
 @Module
-public final class PeriodEntityDIModule {
-
+internal class LegendEntityDIModule {
     @Provides
     @Reusable
-    PeriodStore store(DatabaseAdapter databaseAdapter) {
-        return PeriodStoreImpl.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): LegendStore {
+        return LegendStoreImpl(databaseAdapter)
     }
 
+    @Provides
+    @Reusable
+    fun handler(store: LegendStore): LegendHandler {
+        return LegendHandler(store)
+    }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<Period>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<Legend>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
new file mode 100644
index 0000000000..ffc4127408
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.legendset.Legend
+
+internal class LegendHandler(
+    store: LegendStore
+) : IdentifiableHandlerImpl<Legend>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
index 4d1cc2b3cd..2de206b22c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
@@ -31,16 +31,14 @@ package org.hisp.dhis.android.core.legendset.internal
 import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
-import kotlin.String
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.legendset.LegendSet
 
 @Reusable
 internal class LegendSetCall @Inject constructor(
     private val service: LegendSetService,
-    private val handler: Handler<LegendSet>,
+    private val handler: LegendSetHandler,
     private val apiDownloader: APIDownloader,
 ) : UidsCall<LegendSet> {
     override fun download(uids: Set<String>): Single<List<LegendSet>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.java
deleted file mode 100644
index b8b23b89fc..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.legendset.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.legendset.Legend;
-import org.hisp.dhis.android.core.legendset.LegendSet;
-import org.hisp.dhis.android.core.legendset.LegendTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class LegendSetEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<LegendSet> store(DatabaseAdapter databaseAdapter) {
-        return LegendSetStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<LegendSet> handler(LegendSetHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    OrphanCleaner<LegendSet, Legend> legendCleaner(DatabaseAdapter databaseAdapter) {
-        return new OrphanCleanerImpl<>(LegendTableInfo.TABLE_INFO.name(), LegendTableInfo.Columns.LEGEND_SET,
-                databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<LegendSet>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return Collections.singletonMap(LegendSetFields.LEGENDS, LegendChildrenAppender.create(databaseAdapter));
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
index a0e54676d1..df0364f070 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
@@ -25,52 +25,56 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.option.Option;
-import org.hisp.dhis.android.core.option.OptionSet;
-import org.hisp.dhis.android.core.option.OptionTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.legendset.Legend
+import org.hisp.dhis.android.core.legendset.LegendSet
+import org.hisp.dhis.android.core.legendset.LegendTableInfo
 
 @Module
-public final class OptionSetEntityDIModule {
-
+internal class LegendSetEntityDIModule {
     @Provides
     @Reusable
-    IdentifiableObjectStore<OptionSet> store(DatabaseAdapter databaseAdapter) {
-        return OptionSetStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): LegendSetStore {
+        return LegendSetStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    public Handler<OptionSet> handler(IdentifiableObjectStore<OptionSet> store) {
-        return new IdentifiableHandlerImpl<>(store);
+    fun handler(
+        legendSetStore: LegendSetStore,
+        legendHandler: LegendHandler,
+        legendCleaner: OrphanCleaner<LegendSet, Legend>
+    ): LegendSetHandler {
+        return LegendSetHandler(
+            legendSetStore,
+            legendHandler,
+            legendCleaner
+        )
     }
 
     @Provides
     @Reusable
-    OrphanCleaner<OptionSet, Option> optionCleaner(DatabaseAdapter databaseAdapter) {
-        return new OrphanCleanerImpl<>(OptionTableInfo.TABLE_INFO.name(), OptionTableInfo.Columns.OPTION_SET,
-                databaseAdapter);
+    fun legendCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<LegendSet, Legend> {
+        return OrphanCleanerImpl(
+            LegendTableInfo.TABLE_INFO.name(),
+            LegendTableInfo.Columns.LEGEND_SET,
+            databaseAdapter
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<OptionSet>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<LegendSet>> {
+        return mapOf(
+            LegendSetFields.LEGENDS to LegendChildrenAppender.create(databaseAdapter)
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
index 4dfdbb0a82..eb3fdd4046 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
@@ -25,33 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.option.Option;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class OptionHandler extends IdentifiableHandlerImpl<Option> {
-    private final SubCollectionCleaner<Option> optionCleaner;
-
-    @Inject
-    OptionHandler(IdentifiableObjectStore<Option> optionStore,
-                  SubCollectionCleaner<Option> optionCleaner) {
-        super(optionStore);
-        this.optionCleaner = optionCleaner;
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<Option> options) {
-        optionCleaner.deleteNotPresent(options);
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.legendset.Legend
+import org.hisp.dhis.android.core.legendset.LegendSet
+
+internal class LegendSetHandler constructor(
+    legendSetStore: LegendSetStore,
+    private val legendHandler: LegendHandler,
+    private val legendCleaner: OrphanCleaner<LegendSet, Legend>
+) : IdentifiableHandlerImpl<LegendSet>(legendSetStore) {
+
+    override fun afterObjectHandled(o: LegendSet, action: HandleAction) {
+        legendHandler.handleMany(
+            o.legends()
+        ) { legend: Legend ->
+            legend.toBuilder()
+                .legendSet(ObjectWithUid.create(o.uid()))
+                .build()
+        }
+
+        if (action === HandleAction.Update) {
+            legendCleaner.deleteOrphan(o, o.legends())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.kt
new file mode 100644
index 0000000000..a3054a3bb0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.legendset.LegendSet
+
+internal interface LegendSetStore : IdentifiableObjectStore<LegendSet>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
index b7594d8458..87a0baf023 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
@@ -25,35 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.option.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.legendset.LegendSet
+import org.hisp.dhis.android.core.legendset.LegendSetTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.option.OptionSet;
-import org.hisp.dhis.android.core.option.OptionSetTableInfo;
+@Suppress("MagicNumber")
+internal class LegendSetStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : LegendSetStore,
+    IdentifiableObjectStoreImpl<LegendSet>(
+        databaseAdapter,
+        LegendSetTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> LegendSet.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class OptionSetStore {
-
-    private OptionSetStore() {}
-
-    private static StatementBinder<OptionSet> BINDER = new IdentifiableStatementBinder<OptionSet>() {
-        @Override
-        public void bindToStatement(@NonNull OptionSet o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.version());
-            w.bind(8, o.valueType());
+    companion object {
+        private val BINDER: StatementBinder<LegendSet> = object : IdentifiableStatementBinder<LegendSet>() {
+            override fun bindToStatement(o: LegendSet, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.symbolizer())
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<OptionSet> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, OptionSetTableInfo.TABLE_INFO, BINDER,
-                OptionSet::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.kt
new file mode 100644
index 0000000000..52195b281b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.legendset.Legend
+
+internal interface LegendStore : IdentifiableObjectStore<Legend>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
index 362f226d8f..8ba51b83c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
@@ -25,41 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.legendset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.legendset.Legend
+import org.hisp.dhis.android.core.legendset.LegendTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.legendset.Legend;
-import org.hisp.dhis.android.core.legendset.LegendTableInfo;
+@Suppress("MagicNumber")
+internal class LegendStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : LegendStore,
+    IdentifiableObjectStoreImpl<Legend>(
+        databaseAdapter, LegendTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Legend.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class LegendStore {
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            LegendTableInfo.TABLE_INFO, LegendTableInfo.Columns.LEGEND_SET);
-
-    private LegendStore() {}
-
-    private static StatementBinder<Legend> BINDER = new IdentifiableStatementBinder<Legend>() {
-        @Override
-        public void bindToStatement(@NonNull Legend o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.startValue());
-            w.bind(8, o.endValue());
-            w.bind(9, o.color());
-            w.bind(10, UidsHelper.getUidOrNull(o.legendSet()));
+    companion object {
+        private val BINDER: StatementBinder<Legend> = object : IdentifiableStatementBinder<Legend>() {
+            override fun bindToStatement(o: Legend, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.startValue())
+                w.bind(8, o.endValue())
+                w.bind(9, o.color())
+                w.bind(10, getUidOrNull(o.legendSet()))
+            }
         }
-    };
 
-    public static IdentifiableObjectStore<Legend> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, LegendTableInfo.TABLE_INFO, BINDER, Legend::create);
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            LegendTableInfo.TABLE_INFO, LegendTableInfo.Columns.LEGEND_SET
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
new file mode 100644
index 0000000000..6654da96cd
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
+
+internal class ProgramIndicatorLegendSetLinkHandler(
+    store: ProgramIndicatorLegendSetLinkStore
+) : OrderedLinkHandlerImpl<ObjectWithUid, ProgramIndicatorLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.kt
new file mode 100644
index 0000000000..8de6a6f7b7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
+
+internal interface ProgramIndicatorLegendSetLinkStore : LinkStore<ProgramIndicatorLegendSetLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
similarity index 67%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
index 9011a884e5..1b8d5885c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
@@ -25,29 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.legendset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
+import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink;
-import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo;
+internal class ProgramIndicatorLegendSetLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramIndicatorLegendSetLinkStore,
+    LinkStoreImpl<ProgramIndicatorLegendSetLink>(
+        databaseAdapter,
+        ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
+        ProgramIndicatorLegendSetLinkTableInfo.Columns.PROGRAM_INDICATOR,
+        BINDER,
+        { cursor: Cursor -> ProgramIndicatorLegendSetLink.create(cursor) }
+    ) {
 
-public final class ProgramIndicatorLegendSetLinkStore {
-
-    private static final StatementBinder<ProgramIndicatorLegendSetLink> BINDER = (o, w) -> {
-        w.bind(1, o.programIndicator());
-        w.bind(2, o.legendSet());
-        w.bind(3, o.sortOrder());
-    };
-
-    private ProgramIndicatorLegendSetLinkStore() {}
-
-    public static LinkStore<ProgramIndicatorLegendSetLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
-                ProgramIndicatorLegendSetLinkTableInfo.Columns.PROGRAM_INDICATOR,
-                BINDER, ProgramIndicatorLegendSetLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramIndicatorLegendSetLink, w: StatementWrapper ->
+            w.bind(1, o.programIndicator())
+            w.bind(2, o.legendSet())
+            w.bind(3, o.sortOrder())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java
index 42e756d120..1d188269a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.maintenance;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
@@ -37,6 +36,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
 
 import java.util.Map;
 
@@ -49,7 +49,7 @@ public final class D2ErrorCollectionRepository
         extends ReadOnlyCollectionRepositoryImpl<D2Error, D2ErrorCollectionRepository> {
 
     @Inject
-    D2ErrorCollectionRepository(final ObjectStore<D2Error> store,
+    D2ErrorCollectionRepository(final D2ErrorStore store,
                                 final Map<String, ChildrenAppender<D2Error>> childrenAppenders,
                                 final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java
index 2ce570b8ba..e6187b1a20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java
@@ -28,13 +28,13 @@
 
 package org.hisp.dhis.android.core.maintenance;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyViolationStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class ForeignKeyViolationCollectionRepository
         extends ReadOnlyCollectionRepositoryImpl<ForeignKeyViolation, ForeignKeyViolationCollectionRepository> {
 
     @Inject
-    ForeignKeyViolationCollectionRepository(final ObjectStore<ForeignKeyViolation> store,
+    ForeignKeyViolationCollectionRepository(final ForeignKeyViolationStore store,
                                             final Map<String, ChildrenAppender<ForeignKeyViolation>> childrenAppenders,
                                             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java
index 5194e2bc45..a3ec1b3312 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/PerformanceHintsService.java
@@ -32,11 +32,11 @@
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
 import org.hisp.dhis.android.core.program.Program;
 import org.hisp.dhis.android.core.program.ProgramRule;
-import org.hisp.dhis.android.core.program.internal.ProgramRuleStore;
-import org.hisp.dhis.android.core.program.internal.ProgramStore;
+import org.hisp.dhis.android.core.program.internal.ProgramRuleStoreImpl;
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -98,9 +98,9 @@ public static PerformanceHintsService create(DatabaseAdapter databaseAdapter,
                                                  int organisationUnitThreshold,
                                                  int programRulesPerProgramThreshold) {
         return new PerformanceHintsService(
-                OrganisationUnitStore.create(databaseAdapter),
-                ProgramStore.create(databaseAdapter),
-                ProgramRuleStore.create(databaseAdapter),
+                new OrganisationUnitStoreImpl(databaseAdapter),
+                new ProgramStoreImpl(databaseAdapter),
+                new ProgramRuleStoreImpl(databaseAdapter),
                 organisationUnitThreshold,
                 programRulesPerProgramThreshold);
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
new file mode 100644
index 0000000000..118bc998ec
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.maintenance.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.maintenance.D2Error
+
+@Module
+internal class D2ErrorEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): D2ErrorStore {
+        return D2ErrorStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<D2Error>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.kt
new file mode 100644
index 0000000000..c5086fd8bd
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.maintenance.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
+import org.hisp.dhis.android.core.maintenance.D2Error
+
+internal interface D2ErrorStore : ObjectStore<D2Error>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
index 9b29759063..fc09dc6fc2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
@@ -25,29 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.maintenance.internal
 
-package org.hisp.dhis.android.core.user.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.user.Authority;
-import org.hisp.dhis.android.core.user.AuthorityTableInfo;
+internal class D2ErrorStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : D2ErrorStore,
+    ObjectStoreImpl<D2Error>(
+        databaseAdapter,
+        D2ErrorTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> D2Error.create(cursor) }
+    ) {
 
-final class AuthorityStore {
-
-    private static final StatementBinder<Authority> BINDER
-            = (o, w) -> w.bind(1, o.name());
-
-    private static final WhereStatementBinder<Authority> WHERE_BINDER
-            = (o, w) -> w.bind(1, o.name());
-
-    private AuthorityStore() {}
-
-    public static ObjectWithoutUidStore<Authority> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, AuthorityTableInfo.TABLE_INFO,
-                BINDER, WHERE_BINDER, WHERE_BINDER, Authority::create);
+    companion object {
+        private val BINDER = StatementBinder { o: D2Error, w: StatementWrapper ->
+            w.bind(1, o.url())
+            w.bind(2, o.errorComponent())
+            w.bind(3, o.errorCode())
+            w.bind(4, o.errorDescription())
+            w.bind(5, o.httpErrorCode())
+            w.bind(6, o.created())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java
index 5ff1e81d75..046d54ae83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java
@@ -32,7 +32,6 @@
 import android.util.Log;
 
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
 import org.hisp.dhis.android.core.common.IdentifiableColumns;
 import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation;
@@ -44,10 +43,10 @@
 public final class ForeignKeyCleanerImpl implements ForeignKeyCleaner {
 
     private final DatabaseAdapter databaseAdapter;
-    private final ObjectStore<ForeignKeyViolation> foreignKeyViolationStore;
+    private final ForeignKeyViolationStore foreignKeyViolationStore;
 
     ForeignKeyCleanerImpl(DatabaseAdapter databaseAdapter,
-                          ObjectStore<ForeignKeyViolation> foreignKeyViolationStore) {
+                          ForeignKeyViolationStore foreignKeyViolationStore) {
         this.databaseAdapter = databaseAdapter;
         this.foreignKeyViolationStore = foreignKeyViolationStore;
     }
@@ -214,7 +213,7 @@ private Cursor getForeignKeyErrorsCursor() {
     public static ForeignKeyCleaner create(DatabaseAdapter databaseAdapter) {
         return new ForeignKeyCleanerImpl(
                 databaseAdapter,
-                ForeignKeyViolationStore.create(databaseAdapter)
+                new ForeignKeyViolationStoreImpl(databaseAdapter)
         );
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
index 8b037e9860..23d0016e35 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
@@ -25,33 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.maintenance.internal
 
-package org.hisp.dhis.android.core.maintenance.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation
 
 @Module
-public final class ForeignKeyViolationEntityDIModule {
-
+internal class ForeignKeyViolationEntityDIModule {
     @Provides
     @Reusable
-    public ObjectStore<ForeignKeyViolation> store(DatabaseAdapter databaseAdapter) {
-        return ForeignKeyViolationStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): ForeignKeyViolationStore {
+        return ForeignKeyViolationStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<ForeignKeyViolation>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<ForeignKeyViolation>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.kt
new file mode 100644
index 0000000000..379cb8e7e0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.maintenance.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
+import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation
+
+internal interface ForeignKeyViolationStore : ObjectStore<ForeignKeyViolation>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
index a53e79839c..87f8a5eaab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
@@ -25,34 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.maintenance.internal
 
-package org.hisp.dhis.android.core.maintenance.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
+import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation
+import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation;
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo;
-
-final class ForeignKeyViolationStore {
-
-    private static final StatementBinder<ForeignKeyViolation> BINDER = (o, w) -> {
-        w.bind(1, o.fromTable());
-        w.bind(2, o.fromColumn());
-        w.bind(3, o.toTable());
-        w.bind(4, o.toColumn());
-        w.bind(5, o.notFoundValue());
-        w.bind(6, o.fromObjectUid());
-        w.bind(7, o.fromObjectRow());
-        w.bind(8, o.created());
-    };
-
-    private ForeignKeyViolationStore() {
-    }
-
-    static ObjectStore<ForeignKeyViolation> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectStore(databaseAdapter, ForeignKeyViolationTableInfo.TABLE_INFO, BINDER,
-                ForeignKeyViolation::create);
+internal class ForeignKeyViolationStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ForeignKeyViolationStore,
+    ObjectStoreImpl<ForeignKeyViolation>(
+        databaseAdapter,
+        ForeignKeyViolationTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ForeignKeyViolation.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: ForeignKeyViolation, w: StatementWrapper ->
+            w.bind(1, o.fromTable())
+            w.bind(2, o.fromColumn())
+            w.bind(3, o.toTable())
+            w.bind(4, o.toColumn())
+            w.bind(5, o.notFoundValue())
+            w.bind(6, o.fromObjectUid())
+            w.bind(7, o.fromObjectRow())
+            w.bind(8, o.created())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java
index 0e76c9218e..e4b5f1d35f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java
@@ -29,8 +29,6 @@
 package org.hisp.dhis.android.core.maintenance.internal;
 
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation;
 import org.hisp.dhis.android.core.maintenance.MaintenanceModule;
 
 import dagger.Module;
@@ -46,7 +44,7 @@ public final class MaintenancePackageDIModule {
     @Provides
     @Reusable
     ForeignKeyCleaner cleaner(DatabaseAdapter databaseAdapter,
-                              ObjectStore<ForeignKeyViolation> foreignKeyViolationStore) {
+                              ForeignKeyViolationStore foreignKeyViolationStore) {
         return new ForeignKeyCleanerImpl(databaseAdapter, foreignKeyViolationStore);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
index c4b17a9e52..d73bf60542 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.map.layer
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -37,10 +36,11 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterC
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerStore
 
 @Reusable
 class MapLayerCollectionRepository @Inject internal constructor(
-    store: IdentifiableObjectStore<MapLayer>,
+    store: MapLayerStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<MapLayer>>,
     scope: RepositoryScope
 ) : ReadOnlyWithUidCollectionRepositoryImpl<MapLayer, MapLayerCollectionRepository>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
index 49fc83374b..6d5de18afb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
@@ -31,36 +31,31 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.map.layer.MapLayer
-import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 
 @Module
 internal class MapLayerEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<MapLayer> {
-        return MapLayerStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): MapLayerStore {
+        return MapLayerStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
     fun handler(
-        store: IdentifiableObjectStore<MapLayer>,
-        imageryProviderHandler: LinkHandler<MapLayerImageryProvider, MapLayerImageryProvider>
-    ): Handler<MapLayer> {
+        store: MapLayerStore,
+        imageryProviderHandler: MapLayerImageryProviderHandler
+    ): MapLayerHandler {
         return MapLayerHandler(store, imageryProviderHandler)
     }
 
     @Provides
     @Reusable
     fun childrenAppenders(
-        store: LinkStore<MapLayerImageryProvider>
+        store: MapLayerImageryProviderStore
     ): Map<String, ChildrenAppender<MapLayer>> {
         return mapOf(
             MapLayer.IMAGERY_PROVIDERS to MapLayerImagerProviderChildrenAppender(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
index 0e2909f5d2..305e47d5d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
@@ -28,19 +28,13 @@
 
 package org.hisp.dhis.android.core.map.layer.internal
 
-import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.map.layer.MapLayer
-import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 
-@Reusable
-internal class MapLayerHandler @Inject constructor(
-    store: IdentifiableObjectStore<MapLayer>,
-    private val imagerProviderHandler: LinkHandler<MapLayerImageryProvider, MapLayerImageryProvider>
+internal class MapLayerHandler constructor(
+    store: MapLayerStore,
+    private val imagerProviderHandler: MapLayerImageryProviderHandler
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<MapLayer>(store) {
 
     override fun afterObjectHandled(o: MapLayer, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
index eeafa76f72..528abc72fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
@@ -27,13 +27,11 @@
  */
 package org.hisp.dhis.android.core.map.layer.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.map.layer.MapLayer
-import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 
 internal class MapLayerImagerProviderChildrenAppender(
-    private val mapLayerImageryProviderStore: LinkStore<MapLayerImageryProvider>
+    private val mapLayerImageryProviderStore: MapLayerImageryProviderStore
 ) : ChildrenAppender<MapLayer>() {
 
     override fun appendChildren(mapLayer: MapLayer): MapLayer {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt
index 388a361791..fd06e1546d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt
@@ -31,25 +31,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 
 @Module
 internal class MapLayerImageryProviderEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<MapLayerImageryProvider> {
-        return MapLayerImageryProviderStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): MapLayerImageryProviderStore {
+        return MapLayerImageryProviderStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(
-        store: LinkStore<MapLayerImageryProvider>
-    ): LinkHandler<MapLayerImageryProvider, MapLayerImageryProvider> {
-        return LinkHandlerImpl(store)
+    fun handler(store: MapLayerImageryProviderStore): MapLayerImageryProviderHandler {
+        return MapLayerImageryProviderHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
new file mode 100644
index 0000000000..a8942d138d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.map.layer.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
+
+internal class MapLayerImageryProviderHandler(
+    store: MapLayerImageryProviderStore
+) : LinkHandlerImpl<MapLayerImageryProvider, MapLayerImageryProvider>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStore.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStore.kt
index d8873f0e66..7eb3419c43 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStore.kt
@@ -25,31 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.map.layer.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.MapLayerImagerProviderAreaListColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
-import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
-
-@Suppress("MagicNumber")
-internal object MapLayerImageryProviderStore {
-    private val BINDER = StatementBinder { o: MapLayerImageryProvider, w: StatementWrapper ->
-        w.bind(1, o.mapLayer())
-        w.bind(2, o.attribution())
-        w.bind(3, MapLayerImagerProviderAreaListColumnAdapter.serialize(o.coverageAreas()))
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<MapLayerImageryProvider> {
-        return StoreFactory.linkStore(
-            databaseAdapter,
-            MapLayerImageryProviderTableInfo.TABLE_INFO,
-            MapLayerImageryProviderTableInfo.Columns.MAP_LAYER,
-            BINDER
-        ) { cursor -> MapLayerImageryProvider.create(cursor) }
-    }
-}
+internal interface MapLayerImageryProviderStore : LinkStore<MapLayerImageryProvider>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
new file mode 100644
index 0000000000..e234272b00
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.map.layer.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.MapLayerImagerProviderAreaListColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
+import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
+
+@Suppress("MagicNumber")
+internal class MapLayerImageryProviderStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : MapLayerImageryProviderStore,
+    LinkStoreImpl<MapLayerImageryProvider>(
+        databaseAdapter,
+        MapLayerImageryProviderTableInfo.TABLE_INFO,
+        MapLayerImageryProviderTableInfo.Columns.MAP_LAYER,
+        BINDER,
+        { cursor -> MapLayerImageryProvider.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: MapLayerImageryProvider, w: StatementWrapper ->
+            w.bind(1, o.mapLayer())
+            w.bind(2, o.attribution())
+            w.bind(3, MapLayerImagerProviderAreaListColumnAdapter.serialize(o.coverageAreas()))
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStore.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStore.kt
index b8137d1f9a..dc0187578b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStore.kt
@@ -25,36 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.map.layer.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.map.layer.MapLayer
-import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
-
-@Suppress("MagicNumber")
-internal object MapLayerStore {
-    private val BINDER = StatementBinder { o: MapLayer, w: StatementWrapper ->
-        w.bind(1, o.uid())
-        w.bind(2, o.name())
-        w.bind(3, o.displayName())
-        w.bind(4, o.external())
-        w.bind(5, o.mapLayerPosition())
-        w.bind(6, o.style())
-        w.bind(7, o.imageUrl())
-        w.bind(8, StringListColumnAdapter.serialize(o.subdomains()))
-        w.bind(9, o.subdomainPlaceholder())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<MapLayer> {
-        return objectWithUidStore(
-            databaseAdapter, MapLayerTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> MapLayer.create(cursor) }
-    }
-}
+internal interface MapLayerStore : IdentifiableObjectStore<MapLayer>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
new file mode 100644
index 0000000000..69b29f294d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.map.layer.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.map.layer.MapLayer
+import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
+
+@Suppress("MagicNumber")
+internal class MapLayerStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : MapLayerStore,
+    IdentifiableObjectStoreImpl<MapLayer>(
+        databaseAdapter,
+        MapLayerTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> MapLayer.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: MapLayer, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.name())
+            w.bind(3, o.displayName())
+            w.bind(4, o.external())
+            w.bind(5, o.mapLayerPosition())
+            w.bind(6, o.style())
+            w.bind(7, o.imageUrl())
+            w.bind(8, StringListColumnAdapter.serialize(o.subdomains()))
+            w.bind(9, o.subdomainPlaceholder())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
index f7f14339d1..710d7b3916 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
@@ -37,11 +37,11 @@ import kotlinx.coroutines.rx2.rxSingle
 import kotlinx.coroutines.withTimeout
 import org.hisp.dhis.android.core.D2Manager
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderArea
 import org.hisp.dhis.android.core.map.layer.MapLayerPosition
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerHandler
 import org.hisp.dhis.android.core.settings.internal.SettingService
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -50,7 +50,7 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 @Reusable
 internal class BingCallFactory @Inject constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
-    private val mapLayerHandler: Handler<MapLayer>,
+    private val mapLayerHandler: MapLayerHandler,
     private val versionManager: DHISVersionManager,
     private val settingsService: SettingService,
     private val bingService: BingService
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
index e1bab44fad..4414c20aea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
@@ -31,14 +31,14 @@ package org.hisp.dhis.android.core.map.layer.internal.osm
 import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.hisp.dhis.android.core.map.layer.MapLayerPosition
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerHandler
 
 @Reusable
 internal class OSMCallFactory @Inject constructor(
-    private val mapLayerHandler: Handler<MapLayer>
+    private val mapLayerHandler: MapLayerHandler
 ) {
 
     fun download(): Single<List<MapLayer>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
index 7aed2ac6e0..ff9091e392 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.note;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
@@ -44,6 +43,7 @@
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
 import org.hisp.dhis.android.core.note.NoteTableInfo.Columns;
+import org.hisp.dhis.android.core.note.internal.NoteStore;
 
 import java.util.Map;
 
@@ -58,7 +58,7 @@ public final class NoteCollectionRepository
     private final DataStatePropagator dataStatePropagator;
 
     @Inject
-    NoteCollectionRepository(final IdentifiableObjectStore<Note> store,
+    NoteCollectionRepository(final NoteStore store,
                              final Map<String, ChildrenAppender<Note>> childrenAppenders,
                              final RepositoryScope scope,
                              final Transformer<NoteCreateProjection, Note> transformer,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
index 05dc10a0c2..f416e5b368 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
@@ -25,38 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.note.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.note.Note
+import org.hisp.dhis.android.core.note.NoteCreateProjection
 
 @Module
-public final class TrackedEntityDataValueEntityDIModule {
+internal class NoteEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): NoteStore {
+        return NoteStoreImpl(databaseAdapter)
+    }
 
     @Provides
     @Reusable
-    public TrackedEntityDataValueStore store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityDataValueStoreImpl.create(databaseAdapter);
+    fun handler(store: NoteStore): NoteHandler {
+        return NoteHandler(store)
     }
 
     @Provides
     @Reusable
-    public TrackedEntityDataValueHandler handler(TrackedEntityDataValueStore store) {
-        return new TrackedEntityDataValueHandler(store);
+    fun childrenAppenders(): Map<String, ChildrenAppender<Note>> {
+        return emptyMap()
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<TrackedEntityDataValue>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun transformer(impl: NoteProjectionTransformer): Transformer<NoteCreateProjection, Note> {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java
index 1d24ac4339..49f43b91cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java
@@ -53,7 +53,7 @@ public static ChildrenAppender<Enrollment> create(DatabaseAdapter databaseAdapte
         return new NoteForEnrollmentChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        NoteStore.ENROLLMENT_CHILD_PROJECTION,
+                        NoteStoreImpl.Companion.getENROLLMENT_CHILD_PROJECTION(),
                         Note::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java
index ed045ba0b2..6aeb9a2c10 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java
@@ -53,7 +53,7 @@ public static ChildrenAppender<Event> create(DatabaseAdapter databaseAdapter) {
         return new NoteForEventChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        NoteStore.EVENT_CHILD_PROJECTION,
+                        NoteStoreImpl.Companion.getEVENT_CHILD_PROJECTION(),
                         Note::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
new file mode 100644
index 0000000000..b858d0b339
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.note.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.note.Note
+
+internal class NoteHandler(
+    store: NoteStore
+) : IdentifiableHandlerImpl<Note>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.kt
new file mode 100644
index 0000000000..65882af4c8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.note.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.note.Note
+
+internal interface NoteStore : IdentifiableObjectStore<Note>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
index 3207d349fd..72be1a48a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
@@ -25,41 +25,44 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.note.internal
 
-package org.hisp.dhis.android.core.note.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.note.Note
+import org.hisp.dhis.android.core.note.NoteTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.note.Note;
-import org.hisp.dhis.android.core.note.NoteTableInfo;
+internal class NoteStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : NoteStore,
+    IdentifiableObjectStoreImpl<Note>(
+        databaseAdapter,
+        NoteTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Note.create(cursor) }
+    ) {
 
-public final class NoteStore {
-
-    private static final StatementBinder<Note> BINDER = (o, w) -> {
-        w.bind(1, o.noteType());
-        w.bind(2, o.event());
-        w.bind(3, o.enrollment());
-        w.bind(4, o.value());
-        w.bind(5, o.storedBy());
-        w.bind(6, o.storedDate());
-        w.bind(7, o.uid());
-        w.bind(8, o.syncState());
-        w.bind(9, o.deleted());
-    };
-
-    static final SingleParentChildProjection ENROLLMENT_CHILD_PROJECTION = new SingleParentChildProjection(
-            NoteTableInfo.TABLE_INFO, NoteTableInfo.Columns.ENROLLMENT);
-
-    static final SingleParentChildProjection EVENT_CHILD_PROJECTION = new SingleParentChildProjection(
-            NoteTableInfo.TABLE_INFO, NoteTableInfo.Columns.EVENT);
-
-    private NoteStore() {}
-
-    public static IdentifiableObjectStore<Note> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, NoteTableInfo.TABLE_INFO,
-                BINDER, Note::create);
+    companion object {
+        private val BINDER = StatementBinder { o: Note, w: StatementWrapper ->
+            w.bind(1, o.noteType())
+            w.bind(2, o.event())
+            w.bind(3, o.enrollment())
+            w.bind(4, o.value())
+            w.bind(5, o.storedBy())
+            w.bind(6, o.storedDate())
+            w.bind(7, o.uid())
+            w.bind(8, o.syncState())
+            w.bind(9, o.deleted())
+        }
+        val ENROLLMENT_CHILD_PROJECTION = SingleParentChildProjection(
+            NoteTableInfo.TABLE_INFO, NoteTableInfo.Columns.ENROLLMENT
+        )
+        val EVENT_CHILD_PROJECTION = SingleParentChildProjection(
+            NoteTableInfo.TABLE_INFO, NoteTableInfo.Columns.EVENT
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java
index 14d7d3b71f..220720547d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.note.internal;
 
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.common.DataColumns;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.note.Note;
@@ -47,10 +46,10 @@
 @Reusable
 public class NoteUniquenessManager {
 
-    private final IdentifiableObjectStore<Note> noteStore;
+    private final NoteStore noteStore;
 
     @Inject
-    NoteUniquenessManager(IdentifiableObjectStore<Note> noteStore) {
+    NoteUniquenessManager(NoteStore noteStore) {
         this.noteStore = noteStore;
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java
index 37346522c3..ea6344b958 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.option.OptionTableInfo.Columns;
+import org.hisp.dhis.android.core.option.internal.OptionStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class OptionCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<Option, OptionCollectionRepository> {
 
     @Inject
-    OptionCollectionRepository(final IdentifiableObjectStore<Option> store,
+    OptionCollectionRepository(final OptionStore store,
                                final Map<String, ChildrenAppender<Option>> childrenAppenders,
                                final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java
index c6dc45009b..12d1ec1340 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.option.OptionGroupTableInfo.Columns;
 import org.hisp.dhis.android.core.option.internal.OptionGroupFields;
+import org.hisp.dhis.android.core.option.internal.OptionGroupStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class OptionGroupCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<OptionGroup, OptionGroupCollectionRepository> {
 
     @Inject
-    OptionGroupCollectionRepository(final IdentifiableObjectStore<OptionGroup> store,
+    OptionGroupCollectionRepository(final OptionGroupStore store,
                                     final Map<String, ChildrenAppender<OptionGroup>> childrenAppenders,
                                     final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java
index 1939ce5d00..83619ed80f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.common.ValueType;
 import org.hisp.dhis.android.core.option.OptionSetTableInfo.Columns;
+import org.hisp.dhis.android.core.option.internal.OptionSetStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class OptionSetCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<OptionSet, OptionSetCollectionRepository> {
 
     @Inject
-    OptionSetCollectionRepository(final IdentifiableObjectStore<OptionSet> store,
+    OptionSetCollectionRepository(final OptionSetStore store,
                                   final Map<String, ChildrenAppender<OptionSet>> childrenAppenders,
                                   final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
index ef35f20f73..d6f5dab410 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
@@ -32,14 +32,13 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.Option
 
 @Reusable
 class OptionCall @Inject internal constructor(
     private val service: OptionService,
-    private val handler: Handler<Option>,
+    private val handler: OptionHandler,
     private val apiDownloader: APIDownloader
 ) : UidsCall<Option> {
     override fun download(uids: Set<String>): Single<List<Option>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
index 01382cedb7..e332168c66 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
@@ -25,51 +25,58 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.option.Option;
-import org.hisp.dhis.android.core.option.OptionTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.OptionTableInfo
 
 @Module
-public final class OptionEntityDIModule {
-
+internal class OptionEntityDIModule {
     @Provides
     @Reusable
-    public IdentifiableObjectStore<Option> store(DatabaseAdapter databaseAdapter) {
-        return OptionStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): OptionStore {
+        return OptionStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Handler<Option> handler(OptionHandler impl) {
-        return impl;
+    fun handler(
+        optionStore: OptionStore,
+        optionCleaner: SubCollectionCleaner<Option>
+    ): OptionHandler {
+        return OptionHandler(
+            optionStore,
+            optionCleaner
+        )
     }
 
     @Provides
     @Reusable
-    SubCollectionCleaner<Option> optionCleaner(DatabaseAdapter databaseAdapter) {
-        return new SubCollectionCleanerImpl<>(OptionTableInfo.TABLE_INFO.name(),
-                OptionTableInfo.Columns.OPTION_SET, databaseAdapter,
-                option -> option.optionSet().uid());
+    fun optionCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<Option> {
+        return SubCollectionCleanerImpl(
+            OptionTableInfo.TABLE_INFO.name(),
+            OptionTableInfo.Columns.OPTION_SET,
+            databaseAdapter,
+            object : Transformer<Option, String> {
+                override fun transform(o: Option): String {
+                    return o.optionSet()!!
+                        .uid()
+                }
+            }
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<Option>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<Option>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
index 2fb7e17c50..ee0545ebdf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.option.OptionGroup;
 
 import java.util.List;
@@ -47,12 +46,12 @@ final class OptionGroupCall implements UidsCall<OptionGroup> {
     private static final int MAX_UID_LIST_SIZE = 130;
 
     private final OptionGroupService service;
-    private final Handler<OptionGroup> handler;
+    private final OptionGroupHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
     OptionGroupCall(OptionGroupService service,
-                    Handler<OptionGroup> handler,
+                    OptionGroupHandler handler,
                     APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
index 7beb1e63af..d36b0ae28f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
@@ -25,50 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.option.OptionGroup;
-import org.hisp.dhis.android.core.option.OptionGroupTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.OptionGroupTableInfo
 
 @Module
-public final class OptionGroupEntityDIModule {
-
+internal class OptionGroupEntityDIModule {
     @Provides
     @Reusable
-    IdentifiableObjectStore<OptionGroup> store(DatabaseAdapter databaseAdapter) {
-        return OptionGroupStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): OptionGroupStore {
+        return OptionGroupStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Handler<OptionGroup> handler(OptionGroupHandler impl) {
-        return impl;
+    fun handler(
+        optionStore: OptionGroupStore,
+        optionGroupOptionLinkHandler: OptionGroupOptionLinkHandler,
+        collectionCleaner: CollectionCleaner<OptionGroup>
+    ): OptionGroupHandler {
+        return OptionGroupHandler(
+            optionStore,
+            optionGroupOptionLinkHandler,
+            collectionCleaner
+        )
     }
 
     @Provides
     @Reusable
-    CollectionCleaner<OptionGroup> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(OptionGroupTableInfo.TABLE_INFO.name(), databaseAdapter);
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<OptionGroup> {
+        return CollectionCleanerImpl(OptionGroupTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<OptionGroup>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return Collections.singletonMap(OptionGroupFields.OPTIONS,
-                OptionGroupOptionChildrenAppender.create(databaseAdapter));
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<OptionGroup>> {
+        return mapOf(
+            OptionGroupFields.OPTIONS to OptionGroupOptionChildrenAppender.create(databaseAdapter)
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.java
deleted file mode 100644
index 25feaf2ec5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.option.OptionGroup;
-import org.hisp.dhis.android.core.option.OptionGroupOptionLink;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class OptionGroupHandler extends IdentifiableHandlerImpl<OptionGroup> {
-
-    private final LinkHandler<ObjectWithUid, OptionGroupOptionLink> optionGroupOptionLinkHandler;
-    private final CollectionCleaner<OptionGroup> collectionCleaner;
-
-    @Inject
-    OptionGroupHandler(IdentifiableObjectStore<OptionGroup> optionStore,
-                       LinkHandler<ObjectWithUid, OptionGroupOptionLink> optionGroupOptionLinkHandler,
-                       CollectionCleaner<OptionGroup> collectionCleaner) {
-        super(optionStore);
-        this.optionGroupOptionLinkHandler = optionGroupOptionLinkHandler;
-        this.collectionCleaner = collectionCleaner;
-    }
-
-    @Override
-    protected void afterObjectHandled(OptionGroup optionGroup, HandleAction action) {
-        optionGroupOptionLinkHandler.handleMany(optionGroup.uid(), optionGroup.options(),
-                option -> OptionGroupOptionLink.builder().optionGroup(optionGroup.uid()).option(option.uid()).build());
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<OptionGroup> optionGroups) {
-        collectionCleaner.deleteNotPresent(optionGroups);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
index 1ae947bb0a..de8bdf6fa7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
@@ -25,33 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.validation.ValidationRule;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ValidationRuleHandler extends IdentifiableHandlerImpl<ValidationRule> {
-
-    private final CollectionCleaner<ValidationRule> collectionCleaner;
-
-    @Inject
-    ValidationRuleHandler(IdentifiableObjectStore<ValidationRule> store,
-                          CollectionCleaner<ValidationRule> collectionCleaner) {
-        super(store);
-        this.collectionCleaner = collectionCleaner;
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.OptionGroupOptionLink
+
+internal class OptionGroupHandler(
+    optionStore: OptionGroupStore,
+    private val optionGroupOptionLinkHandler: LinkHandler<ObjectWithUid, OptionGroupOptionLink>,
+    private val collectionCleaner: CollectionCleaner<OptionGroup>
+) : IdentifiableHandlerImpl<OptionGroup>(optionStore) {
+
+    override fun afterObjectHandled(o: OptionGroup, action: HandleAction) {
+        optionGroupOptionLinkHandler.handleMany(
+            o.uid(), o.options()
+        ) { option: ObjectWithUid ->
+            OptionGroupOptionLink.builder().optionGroup(o.uid()).option(option.uid()).build()
+        }
     }
 
-    @Override
-    protected void afterCollectionHandled(Collection<ValidationRule> validationRules) {
-        collectionCleaner.deleteNotPresent(validationRules);
+    override fun afterCollectionHandled(oCollection: Collection<OptionGroup>?) {
+        collectionCleaner.deleteNotPresent(oCollection)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.java
deleted file mode 100644
index f9744c5b51..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.option.OptionGroupOptionLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class OptionGroupOptionEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<OptionGroupOptionLink> store(DatabaseAdapter databaseAdapter) {
-        return OptionGroupOptionLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkHandler<ObjectWithUid, OptionGroupOptionLink> handler(LinkStore<OptionGroupOptionLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt
new file mode 100644
index 0000000000..73472d98f5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class OptionGroupOptionEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): OptionGroupOptionLinkStore {
+        return OptionGroupOptionLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: OptionGroupOptionLinkStore): OptionGroupOptionLinkHandler {
+        return OptionGroupOptionLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
new file mode 100644
index 0000000000..568e6a3d3e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.option.OptionGroupOptionLink
+
+internal class OptionGroupOptionLinkHandler(
+    store: OptionGroupOptionLinkStore
+) : LinkHandlerImpl<ObjectWithUid, OptionGroupOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.kt
new file mode 100644
index 0000000000..e37f563161
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.option.OptionGroupOptionLink
+
+internal interface OptionGroupOptionLinkStore : LinkStore<OptionGroupOptionLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
index c95139b654..82c436b3ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
@@ -25,27 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.option.OptionGroupOptionLink
+import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.option.OptionGroupOptionLink;
-import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo;
+internal class OptionGroupOptionLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OptionGroupOptionLinkStore,
+    LinkStoreImpl<OptionGroupOptionLink>(
+        databaseAdapter,
+        OptionGroupOptionLinkTableInfo.TABLE_INFO,
+        OptionGroupOptionLinkTableInfo.Columns.OPTION_GROUP,
+        BINDER,
+        { cursor: Cursor -> OptionGroupOptionLink.create(cursor) }
+    ) {
 
-public final class OptionGroupOptionLinkStore {
-
-    private static final StatementBinder<OptionGroupOptionLink> BINDER = (o, w) -> {
-        w.bind(1, o.optionGroup());
-        w.bind(2, o.option());
-    };
-
-    private OptionGroupOptionLinkStore() {}
-
-    public static LinkStore<OptionGroupOptionLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, OptionGroupOptionLinkTableInfo.TABLE_INFO,
-                OptionGroupOptionLinkTableInfo.Columns.OPTION_GROUP, BINDER, OptionGroupOptionLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: OptionGroupOptionLink, w: StatementWrapper ->
+            w.bind(1, o.optionGroup())
+            w.bind(2, o.option())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.kt
new file mode 100644
index 0000000000..62f9bab10c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.option.OptionGroup
+
+internal interface OptionGroupStore : IdentifiableObjectStore<OptionGroup>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
new file mode 100644
index 0000000000..4a2f93c1c2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.OptionGroupTableInfo
+
+@Suppress("MagicNumber")
+internal class OptionGroupStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OptionGroupStore,
+    IdentifiableObjectStoreImpl<OptionGroup>(
+        databaseAdapter,
+        OptionGroupTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> OptionGroup.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<OptionGroup> = object : IdentifiableStatementBinder<OptionGroup>() {
+            override fun bindToStatement(o: OptionGroup, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, getUidOrNull(o.optionSet()))
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
new file mode 100644
index 0000000000..3d0e7bbd98
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.option.Option
+
+internal class OptionHandler constructor(
+    optionStore: OptionStore,
+    private val optionCleaner: SubCollectionCleaner<Option>
+) : IdentifiableHandlerImpl<Option>(optionStore) {
+
+    override fun afterCollectionHandled(oCollection: Collection<Option>?) {
+        optionCleaner.deleteNotPresent(oCollection)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
index 15aa8ded6b..590bc4ada6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
@@ -32,13 +32,12 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.option.OptionSet
 
 @Reusable
 internal class OptionSetCall @Inject constructor(
     private val service: OptionSetService,
-    private val handler: Handler<OptionSet>,
+    private val handler: OptionSetHandler,
     private val apiDownloader: APIDownloader
 ) : UidsCall<OptionSet> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
index c2a3bd32a7..a77fa3aa8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
@@ -25,43 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.indicator.Indicator;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.OptionSet
+import org.hisp.dhis.android.core.option.OptionTableInfo
 
 @Module
-public final class IndicatorEntityDIModule {
+internal class OptionSetEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): OptionSetStore {
+        return OptionSetStoreImpl(databaseAdapter)
+    }
 
     @Provides
     @Reusable
-    public IdentifiableObjectStore<Indicator> store(DatabaseAdapter databaseAdapter) {
-        return IndicatorStore.create(databaseAdapter);
+    fun handler(store: OptionSetStore): OptionSetHandler {
+        return OptionSetHandler(store)
     }
 
     @Provides
     @Reusable
-    public Handler<Indicator> handler(IndicatorHandler handler) {
-        return handler;
+    fun optionCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<OptionSet, Option> {
+        return OrphanCleanerImpl(
+            OptionTableInfo.TABLE_INFO.name(),
+            OptionTableInfo.Columns.OPTION_SET,
+            databaseAdapter
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<Indicator>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return Collections.singletonMap(
-                IndicatorFields.LEGEND_SETS,
-                IndicatorLegendSetChildrenAppender.Companion.create(databaseAdapter)
-        );
+    fun childrenAppenders(): Map<String, ChildrenAppender<OptionSet>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
new file mode 100644
index 0000000000..980cdd5b71
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.option.OptionSet
+
+internal class OptionSetHandler(
+    store: OptionSetStore
+) : IdentifiableHandlerImpl<OptionSet>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.kt
new file mode 100644
index 0000000000..f55ed7ae14
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.option.OptionSet
+
+internal interface OptionSetStore : IdentifiableObjectStore<OptionSet>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
new file mode 100644
index 0000000000..5d75c50912
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.option.OptionSet
+import org.hisp.dhis.android.core.option.OptionSetTableInfo
+
+@Suppress("MagicNumber")
+internal class OptionSetStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OptionSetStore,
+    IdentifiableObjectStoreImpl<OptionSet>(
+        databaseAdapter,
+        OptionSetTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> OptionSet.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<OptionSet> = object : IdentifiableStatementBinder<OptionSet>() {
+            override fun bindToStatement(o: OptionSet, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.version())
+                w.bind(8, o.valueType())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.kt
new file mode 100644
index 0000000000..007b5b33b7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.option.Option
+
+internal interface OptionStore : IdentifiableObjectStore<Option>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
new file mode 100644
index 0000000000..13795c7d6a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.OptionTableInfo
+
+@Suppress("MagicNumber")
+internal class OptionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OptionStore,
+    IdentifiableObjectStoreImpl<Option>(
+        databaseAdapter,
+        OptionTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Option.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<Option> = object : IdentifiableWithStyleStatementBinder<Option>() {
+            override fun bindToStatement(o: Option, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(9, o.sortOrder())
+                w.bind(10, getUidOrNull(o.optionSet()))
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java
index 38d969f419..1a9c90dfd3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
@@ -41,6 +40,7 @@
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo.Columns;
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitFields;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
 
 import java.util.Collections;
@@ -56,7 +56,7 @@ public class OrganisationUnitCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnit, OrganisationUnitCollectionRepository> {
 
     @Inject
-    OrganisationUnitCollectionRepository(final IdentifiableObjectStore<OrganisationUnit> store,
+    OrganisationUnitCollectionRepository(final OrganisationUnitStore store,
                                          final Map<String, ChildrenAppender<OrganisationUnit>> childrenAppenders,
                                          final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java
index 1dafbc8da7..735dcbd456 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java
@@ -27,13 +27,13 @@
  */
 package org.hisp.dhis.android.core.organisationunit;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo.Columns;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class OrganisationUnitGroupCollectionRepository extends ReadOnlyIde
 
     @Inject
     OrganisationUnitGroupCollectionRepository(
-            final IdentifiableObjectStore<OrganisationUnitGroup> store,
+            final OrganisationUnitGroupStore store,
             final Map<String, ChildrenAppender<OrganisationUnitGroup>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java
index 81cb8a0622..01f27b0d9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java
@@ -27,13 +27,13 @@
  */
 package org.hisp.dhis.android.core.organisationunit;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo.Columns;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class OrganisationUnitLevelCollectionRepository extends ReadOnlyIde
 
     @Inject
     OrganisationUnitLevelCollectionRepository(
-            final IdentifiableObjectStore<OrganisationUnitLevel> store,
+            final OrganisationUnitLevelStore store,
             final Map<String, ChildrenAppender<OrganisationUnitLevel>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index e92ae74f18..599d4b17ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -34,7 +34,6 @@ import io.reactivex.Single
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTree
@@ -49,7 +48,7 @@ internal class OrganisationUnitCall @Inject constructor(
     private val handler: OrganisationUnitHandler,
     private val pathTransformer: OrganisationUnitDisplayPathTransformer,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>,
+    private val organisationUnitStore: OrganisationUnitStore,
     private val collectionCleaner: CollectionCleaner<OrganisationUnit>
 ) {
     fun download(user: User): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
index 0a4de9e148..1e7c0be577 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
@@ -33,24 +33,39 @@ import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
 
 @Module
-internal class OrganisationUnitEntityDIModule : IdentifiableStoreProvider<OrganisationUnit> {
+internal class OrganisationUnitEntityDIModule {
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<OrganisationUnit> {
-        return OrganisationUnitStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitStore {
+        return OrganisationUnitStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(impl: OrganisationUnitHandlerImpl): OrganisationUnitHandler {
-        return impl
+    @Suppress("LongParameterList")
+    fun handler(
+        organisationUnitStore: OrganisationUnitStore,
+        userOrganisationUnitLinkHandler: UserOrganisationUnitLinkHandler,
+        organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler,
+        dataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler,
+        organisationUnitGroupHandler: OrganisationUnitGroupHandler,
+        organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler
+    ): OrganisationUnitHandler {
+        return OrganisationUnitHandler(
+            organisationUnitStore,
+            userOrganisationUnitLinkHandler,
+            organisationUnitProgramLinkHandler,
+            dataSetOrganisationUnitLinkHandler,
+            organisationUnitGroupHandler,
+            organisationUnitGroupLinkHandler
+        )
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
index 80eaa8c279..0f8ba1fba1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
@@ -25,49 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.validation.ValidationRule;
-import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
 
 @Module
-public final class ValidationRuleEntityDIModule {
-
+internal class OrganisationUnitGroupEntityDIModule {
     @Provides
     @Reusable
-    public IdentifiableObjectStore<ValidationRule> store(DatabaseAdapter databaseAdapter) {
-        return ValidationRuleStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitGroupStore {
+        return OrganisationUnitGroupStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    public Handler<ValidationRule> handler(ValidationRuleHandler impl) {
-        return impl;
+    fun handler(store: OrganisationUnitGroupStore): OrganisationUnitGroupHandler {
+        return OrganisationUnitGroupHandler(store)
     }
 
     @Provides
     @Reusable
-    CollectionCleaner<ValidationRule> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(ValidationRuleTableInfo.TABLE_INFO.name(), databaseAdapter);
+    fun organisationUnitGroupCollectionCleaner(
+        databaseAdapter: DatabaseAdapter
+    ): CollectionCleaner<OrganisationUnitGroup> {
+        return CollectionCleanerImpl(OrganisationUnitGroupTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<ValidationRule>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<OrganisationUnitGroup>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
new file mode 100644
index 0000000000..1c011892c7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+
+internal class OrganisationUnitGroupHandler(
+    store: OrganisationUnitGroupStore
+) : IdentifiableHandlerImpl<OrganisationUnitGroup>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStore.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStore.kt
index 8641d73fcd..87d0c5284a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStore.kt
@@ -25,34 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
-
-@Suppress("MagicNumber")
-internal object OrganisationUnitGroupStore {
-
-    private val BINDER: StatementBinder<OrganisationUnitGroup> =
-        object : IdentifiableStatementBinder<OrganisationUnitGroup>() {
-            override fun bindToStatement(organisationUnitGroup: OrganisationUnitGroup, w: StatementWrapper) {
-                super.bindToStatement(organisationUnitGroup, w)
-                w.bind(7, organisationUnitGroup.shortName())
-                w.bind(8, organisationUnitGroup.displayShortName())
-            }
-        }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<OrganisationUnitGroup> {
-        return objectWithUidStore(
-            databaseAdapter, OrganisationUnitGroupTableInfo.TABLE_INFO, BINDER
-        ) { cursor: Cursor -> OrganisationUnitGroup.create(cursor) }
-    }
-}
+internal interface OrganisationUnitGroupStore : IdentifiableObjectStore<OrganisationUnitGroup>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
new file mode 100644
index 0000000000..4d13c46de4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
+
+@Suppress("MagicNumber")
+internal class OrganisationUnitGroupStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OrganisationUnitGroupStore,
+    IdentifiableObjectStoreImpl<OrganisationUnitGroup>(
+        databaseAdapter,
+        OrganisationUnitGroupTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> OrganisationUnitGroup.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<OrganisationUnitGroup> =
+            object : IdentifiableStatementBinder<OrganisationUnitGroup>() {
+                override fun bindToStatement(organisationUnitGroup: OrganisationUnitGroup, w: StatementWrapper) {
+                    super.bindToStatement(organisationUnitGroup, w)
+                    w.bind(7, organisationUnitGroup.shortName())
+                    w.bind(8, organisationUnitGroup.displayShortName())
+                }
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
index 34de8bcbbb..d241efecd8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
@@ -27,12 +27,126 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
+import android.util.Log
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
+import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
+import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.user.User
+import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHelper
 
-internal interface OrganisationUnitHandler : HandlerWithTransformer<OrganisationUnit> {
-    fun resetLinks()
-    fun setData(user: User, scope: OrganisationUnit.Scope)
-    fun addUserOrganisationUnitLinks(organisationUnits: Collection<OrganisationUnit>)
+internal class OrganisationUnitHandler constructor(
+    organisationUnitStore: OrganisationUnitStore,
+    private val userOrganisationUnitLinkHandler: LinkHandler<OrganisationUnit, UserOrganisationUnitLink>,
+    private val organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler,
+    private val dataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler,
+    private val organisationUnitGroupHandler: OrganisationUnitGroupHandler,
+    private val organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler
+) : IdentifiableHandlerImpl<OrganisationUnit>(organisationUnitStore) {
+    private var user: User? = null
+    private var scope: OrganisationUnit.Scope? = null
+
+    fun resetLinks() {
+        userOrganisationUnitLinkHandler.resetAllLinks()
+        organisationUnitProgramLinkHandler.resetAllLinks()
+        dataSetOrganisationUnitLinkHandler.resetAllLinks()
+        organisationUnitGroupLinkHandler.resetAllLinks()
+    }
+
+    fun setData(user: User, scope: OrganisationUnit.Scope) {
+        this.user = user
+        this.scope = scope
+    }
+
+    override fun beforeCollectionHandled(oCollection: Collection<OrganisationUnit>): Collection<OrganisationUnit> {
+        return oCollection
+    }
+
+    override fun beforeObjectHandled(o: OrganisationUnit): OrganisationUnit {
+        return if (GeometryHelper.isValid(o.geometry())) {
+            o
+        } else {
+            Log.i(
+                this.javaClass.simpleName,
+                "OrganisationUnit " + o.uid() + " has invalid geometryValue"
+            )
+            o.toBuilder().geometry(null).build()
+        }
+    }
+
+    override fun afterObjectHandled(o: OrganisationUnit, action: HandleAction) {
+        addOrganisationUnitProgramLink(o)
+        addOrganisationUnitDataSetLink(o)
+        organisationUnitGroupHandler.handleMany(o.organisationUnitGroups())
+        addOrganisationUnitOrganisationUnitGroupLink(o)
+    }
+
+    override fun afterCollectionHandled(oCollection: Collection<OrganisationUnit>?) {
+        oCollection?.let { addUserOrganisationUnitLinks(it) }
+    }
+
+    private fun addOrganisationUnitProgramLink(organisationUnit: OrganisationUnit) {
+        val orgUnitPrograms = organisationUnit.programs()
+        if (orgUnitPrograms != null) {
+            organisationUnitProgramLinkHandler.handleMany(
+                organisationUnit.uid(), orgUnitPrograms
+            ) { program ->
+                OrganisationUnitProgramLink.builder()
+                    .organisationUnit(organisationUnit.uid())
+                    .program(program.uid())
+                    .build()
+            }
+        }
+    }
+
+    private fun addOrganisationUnitDataSetLink(organisationUnit: OrganisationUnit) {
+        val orgUnitDataSets = organisationUnit.dataSets()
+        if (orgUnitDataSets != null) {
+            dataSetOrganisationUnitLinkHandler.handleMany(
+                organisationUnit.uid(), orgUnitDataSets
+            ) { dataSet ->
+                DataSetOrganisationUnitLink.builder()
+                    .dataSet(dataSet.uid())
+                    .organisationUnit(organisationUnit.uid())
+                    .build()
+            }
+        }
+    }
+
+    private fun addOrganisationUnitOrganisationUnitGroupLink(organisationUnit: OrganisationUnit) {
+        organisationUnit.organisationUnitGroups()?.let { orgunitGroups ->
+            organisationUnitGroupLinkHandler.handleMany(
+                organisationUnit.uid(), orgunitGroups
+            ) { organisationUnitGroup ->
+                OrganisationUnitOrganisationUnitGroupLink.builder()
+                    .organisationUnit(organisationUnit.uid())
+                    .organisationUnitGroup(organisationUnitGroup.uid())
+                    .build()
+            }
+        }
+    }
+
+    fun addUserOrganisationUnitLinks(organisationUnits: Collection<OrganisationUnit>) {
+        val builder = UserOrganisationUnitLink.builder()
+            .organisationUnitScope(scope!!.name)
+            .user(user!!.uid())
+
+        // TODO MasterUid set to "" to avoid cleaning link table. Orgunits are paged, so the whole orguntit list is
+        //  not available in the handler. Maybe the store should not be a linkStore.
+        userOrganisationUnitLinkHandler.handleMany(
+            "", organisationUnits
+        ) { orgUnit: OrganisationUnit ->
+            builder
+                .organisationUnit(orgUnit.uid())
+                .root(UserOrganisationUnitLinkHelper.isRoot(scope!!, user!!, orgUnit))
+                .userAssigned(UserOrganisationUnitLinkHelper.userIsAssigned(scope, user, orgUnit))
+                .build()
+        }
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerImpl.kt
deleted file mode 100644
index 3b471b1018..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerImpl.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.organisationunit.internal
-
-import android.util.Log
-import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
-import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
-import org.hisp.dhis.android.core.user.User
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
-import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHelper
-
-@Reusable
-internal class OrganisationUnitHandlerImpl @Inject constructor(
-    organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>,
-    private val userOrganisationUnitLinkHandler: LinkHandler<OrganisationUnit, UserOrganisationUnitLink>,
-    private val organisationUnitProgramLinkHandler: LinkHandler<ObjectWithUid, OrganisationUnitProgramLink>,
-    private val dataSetOrganisationUnitLinkHandler: LinkHandler<ObjectWithUid, DataSetOrganisationUnitLink>,
-    private val organisationUnitGroupHandler: Handler<OrganisationUnitGroup>,
-    private val organisationUnitGroupLinkHandler:
-        LinkHandler<OrganisationUnitGroup, OrganisationUnitOrganisationUnitGroupLink>
-) : IdentifiableHandlerImpl<OrganisationUnit>(organisationUnitStore), OrganisationUnitHandler {
-    private var user: User? = null
-    private var scope: OrganisationUnit.Scope? = null
-
-    override fun resetLinks() {
-        userOrganisationUnitLinkHandler.resetAllLinks()
-        organisationUnitProgramLinkHandler.resetAllLinks()
-        dataSetOrganisationUnitLinkHandler.resetAllLinks()
-        organisationUnitGroupLinkHandler.resetAllLinks()
-    }
-
-    override fun setData(user: User, scope: OrganisationUnit.Scope) {
-        this.user = user
-        this.scope = scope
-    }
-
-    override fun beforeCollectionHandled(oCollection: Collection<OrganisationUnit>): Collection<OrganisationUnit> {
-        return oCollection
-    }
-
-    override fun beforeObjectHandled(o: OrganisationUnit): OrganisationUnit {
-        return if (GeometryHelper.isValid(o.geometry())) {
-            o
-        } else {
-            Log.i(
-                this.javaClass.simpleName,
-                "OrganisationUnit " + o.uid() + " has invalid geometryValue"
-            )
-            o.toBuilder().geometry(null).build()
-        }
-    }
-
-    override fun afterObjectHandled(o: OrganisationUnit, action: HandleAction) {
-        addOrganisationUnitProgramLink(o)
-        addOrganisationUnitDataSetLink(o)
-        organisationUnitGroupHandler.handleMany(o.organisationUnitGroups())
-        addOrganisationUnitOrganisationUnitGroupLink(o)
-    }
-
-    override fun afterCollectionHandled(oCollection: Collection<OrganisationUnit>?) {
-        oCollection?.let { addUserOrganisationUnitLinks(it) }
-    }
-
-    private fun addOrganisationUnitProgramLink(organisationUnit: OrganisationUnit) {
-        val orgUnitPrograms = organisationUnit.programs()
-        if (orgUnitPrograms != null) {
-            organisationUnitProgramLinkHandler.handleMany(
-                organisationUnit.uid(), orgUnitPrograms
-            ) { program ->
-                OrganisationUnitProgramLink.builder()
-                    .organisationUnit(organisationUnit.uid())
-                    .program(program.uid())
-                    .build()
-            }
-        }
-    }
-
-    private fun addOrganisationUnitDataSetLink(organisationUnit: OrganisationUnit) {
-        val orgUnitDataSets = organisationUnit.dataSets()
-        if (orgUnitDataSets != null) {
-            dataSetOrganisationUnitLinkHandler.handleMany(
-                organisationUnit.uid(), orgUnitDataSets
-            ) { dataSet ->
-                DataSetOrganisationUnitLink.builder()
-                    .dataSet(dataSet.uid())
-                    .organisationUnit(organisationUnit.uid())
-                    .build()
-            }
-        }
-    }
-
-    private fun addOrganisationUnitOrganisationUnitGroupLink(organisationUnit: OrganisationUnit) {
-        organisationUnit.organisationUnitGroups()?.let { orgunitGroups ->
-            organisationUnitGroupLinkHandler.handleMany(
-                organisationUnit.uid(), orgunitGroups
-            ) { organisationUnitGroup ->
-                OrganisationUnitOrganisationUnitGroupLink.builder()
-                    .organisationUnit(organisationUnit.uid())
-                    .organisationUnitGroup(organisationUnitGroup.uid())
-                    .build()
-            }
-        }
-    }
-
-    override fun addUserOrganisationUnitLinks(organisationUnits: Collection<OrganisationUnit>) {
-        val builder = UserOrganisationUnitLink.builder()
-            .organisationUnitScope(scope!!.name)
-            .user(user!!.uid())
-
-        // TODO MasterUid set to "" to avoid cleaning link table. Orgunits are paged, so the whole orguntit list is
-        //  not available in the handler. Maybe the store should not be a linkStore.
-        userOrganisationUnitLinkHandler.handleMany(
-            "", organisationUnits
-        ) { orgUnit: OrganisationUnit ->
-            builder
-                .organisationUnit(orgUnit.uid())
-                .root(UserOrganisationUnitLinkHelper.isRoot(scope!!, user!!, orgUnit))
-                .userAssigned(UserOrganisationUnitLinkHelper.userIsAssigned(scope, user, orgUnit))
-                .build()
-        }
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java
index dc87175d69..6201b81870 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel;
 
 import java.util.List;
@@ -44,12 +43,12 @@
 final class OrganisationUnitLevelEndpointCall implements ListCall<OrganisationUnitLevel> {
 
     private final OrganisationUnitLevelService service;
-    private final Handler<OrganisationUnitLevel> handler;
+    private final OrganisationUnitLevelHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
     OrganisationUnitLevelEndpointCall(OrganisationUnitLevelService service,
-                                      Handler<OrganisationUnitLevel> handler,
+                                      OrganisationUnitLevelHandler handler,
                                       APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.java
deleted file mode 100644
index 14778fbb7a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module
-public final class OrganisationUnitLevelEntityDIModule implements IdentifiableEntityDIModule<OrganisationUnitLevel> {
-
-    @Override
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<OrganisationUnitLevel> store(DatabaseAdapter databaseAdapter) {
-        return OrganisationUnitLevelStore.create(databaseAdapter);
-    }
-
-    @Override
-    @Provides
-    @Reusable
-    public Handler<OrganisationUnitLevel> handler(IdentifiableObjectStore<OrganisationUnitLevel> store) {
-        return new IdentifiableHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    OrganisationUnitLevelService organisationUnitLevelService(Retrofit retrofit) {
-        return retrofit.create(OrganisationUnitLevelService.class);
-    }
-
-    @Provides
-    @Reusable
-    ListCall<OrganisationUnitLevel> organisationUnitLevelCallFactory(OrganisationUnitLevelEndpointCall impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<OrganisationUnitLevel>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
index 26b1bd7055..ba83c3e25c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
@@ -25,49 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.note.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.note.Note;
-import org.hisp.dhis.android.core.note.NoteCreateProjection;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import retrofit2.Retrofit
 
 @Module
-public final class NoteEntityDIModule {
+internal class OrganisationUnitLevelEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitLevelStore {
+        return OrganisationUnitLevelStoreImpl(databaseAdapter)
+    }
 
     @Provides
     @Reusable
-    public IdentifiableObjectStore<Note> store(DatabaseAdapter databaseAdapter) {
-        return NoteStore.create(databaseAdapter);
+    fun handler(store: OrganisationUnitLevelStore): OrganisationUnitLevelHandler {
+        return OrganisationUnitLevelHandler(store)
     }
 
     @Provides
     @Reusable
-    public Handler<Note> handler(IdentifiableObjectStore<Note> store) {
-        return new IdentifiableHandlerImpl<>(store);
+    fun organisationUnitLevelService(retrofit: Retrofit): OrganisationUnitLevelService {
+        return retrofit.create(OrganisationUnitLevelService::class.java)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<Note>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun organisationUnitLevelCallFactory(impl: OrganisationUnitLevelEndpointCall): ListCall<OrganisationUnitLevel> {
+        return impl
     }
 
     @Provides
     @Reusable
-    Transformer<NoteCreateProjection, Note> transformer(NoteProjectionTransformer impl) {
-        return impl;
+    fun childrenAppenders(): Map<String, ChildrenAppender<OrganisationUnitLevel>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
new file mode 100644
index 0000000000..754b742a42
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+
+internal class OrganisationUnitLevelHandler(
+    store: OrganisationUnitLevelStore
+) : IdentifiableHandlerImpl<OrganisationUnitLevel>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStore.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStore.kt
index a7bc82e7ce..885cd60c0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStore.kt
@@ -25,36 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo
-
-@Suppress("MagicNumber")
-internal object OrganisationUnitLevelStore {
-
-    private val BINDER: StatementBinder<OrganisationUnitLevel> =
-        object : IdentifiableStatementBinder<OrganisationUnitLevel>() {
-            override fun bindToStatement(
-                organisationUnitLevel: OrganisationUnitLevel,
-                w: StatementWrapper
-            ) {
-                super.bindToStatement(organisationUnitLevel, w)
-                w.bind(7, organisationUnitLevel.level())
-            }
-        }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<OrganisationUnitLevel> {
-        return objectWithUidStore(
-            databaseAdapter, OrganisationUnitLevelTableInfo.TABLE_INFO, BINDER
-        ) { cursor: Cursor -> OrganisationUnitLevel.create(cursor) }
-    }
-}
+internal interface OrganisationUnitLevelStore : IdentifiableObjectStore<OrganisationUnitLevel>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
index d588c366f9..7c4656cb3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
@@ -25,38 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.dataset.SectionTableInfo;
+@Suppress("MagicNumber")
+internal class OrganisationUnitLevelStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OrganisationUnitLevelStore,
+    IdentifiableObjectStoreImpl<OrganisationUnitLevel>(
+        databaseAdapter,
+        OrganisationUnitLevelTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> OrganisationUnitLevel.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-final class SectionStore {
-
-    private static StatementBinder<Section> BINDER = new IdentifiableStatementBinder<Section>() {
-        @Override
-        public void bindToStatement(@NonNull Section o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.description());
-            w.bind(8, o.sortOrder());
-            w.bind(9, UidsHelper.getUidOrNull(o.dataSet()));
-            w.bind(10, o.showRowTotals());
-            w.bind(11, o.showColumnTotals());
-        }
-    };
-
-    private SectionStore() {}
-
-    public static IdentifiableObjectStore<Section> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, SectionTableInfo.TABLE_INFO, BINDER, Section::create);
+    companion object {
+        private val BINDER: StatementBinder<OrganisationUnitLevel> =
+            object : IdentifiableStatementBinder<OrganisationUnitLevel>() {
+                override fun bindToStatement(
+                    organisationUnitLevel: OrganisationUnitLevel,
+                    w: StatementWrapper
+                ) {
+                    super.bindToStatement(organisationUnitLevel, w)
+                    w.bind(7, organisationUnitLevel.level())
+                }
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
index 7230b29027..258e6b0639 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
@@ -31,26 +31,21 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore.create
 
 @Module
 internal class OrganisationUnitOrganisationUnitGroupLinkEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<OrganisationUnitOrganisationUnitGroupLink> {
-        return create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitOrganisationUnitGroupLinkStore {
+        return OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: LinkStore<OrganisationUnitOrganisationUnitGroupLink>):
-        LinkHandler<OrganisationUnitGroup, OrganisationUnitOrganisationUnitGroupLink> {
-        return LinkHandlerImpl(store)
+    fun handler(
+        store: OrganisationUnitOrganisationUnitGroupLinkStore
+    ): OrganisationUnitOrganisationUnitGroupLinkHandler {
+        return OrganisationUnitOrganisationUnitGroupLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
new file mode 100644
index 0000000000..bd3fb03b2f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
+
+internal class OrganisationUnitOrganisationUnitGroupLinkHandler(
+    store: OrganisationUnitOrganisationUnitGroupLinkStore
+) : LinkHandlerImpl<OrganisationUnitGroup, OrganisationUnitOrganisationUnitGroupLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStore.kt
index 5a72e65f10..144391bc7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStore.kt
@@ -25,32 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
-
-@Suppress("MagicNumber")
-internal object OrganisationUnitOrganisationUnitGroupLinkStore {
-
-    private val BINDER = StatementBinder { o: OrganisationUnitOrganisationUnitGroupLink, w: StatementWrapper ->
-        w.bind(1, o.organisationUnit())
-        w.bind(2, o.organisationUnitGroup())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<OrganisationUnitOrganisationUnitGroupLink> {
-        return linkStore(
-            databaseAdapter,
-            OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
-            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT,
-            BINDER
-        ) { cursor: Cursor -> OrganisationUnitOrganisationUnitGroupLink.create(cursor) }
-    }
-}
+internal interface OrganisationUnitOrganisationUnitGroupLinkStore : LinkStore<OrganisationUnitOrganisationUnitGroupLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
new file mode 100644
index 0000000000..4737ebbdd3
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
+
+@Suppress("MagicNumber")
+internal class OrganisationUnitOrganisationUnitGroupLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OrganisationUnitOrganisationUnitGroupLinkStore,
+    LinkStoreImpl<OrganisationUnitOrganisationUnitGroupLink>(
+        databaseAdapter,
+        OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
+        OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT,
+        BINDER,
+        { cursor: Cursor -> OrganisationUnitOrganisationUnitGroupLink.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: OrganisationUnitOrganisationUnitGroupLink, w: StatementWrapper ->
+            w.bind(1, o.organisationUnit())
+            w.bind(2, o.organisationUnitGroup())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt
index a9766c6bbd..dc2e0d1079 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt
@@ -31,25 +31,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 
 @Module
 internal class OrganisationUnitProgramLinkEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<OrganisationUnitProgramLink> {
-        return OrganisationUnitProgramLinkStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitProgramLinkStore {
+        return OrganisationUnitProgramLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(store: LinkStore<OrganisationUnitProgramLink>):
-        LinkHandler<ObjectWithUid, OrganisationUnitProgramLink> {
-        return LinkHandlerImpl(store)
+    fun handler(store: OrganisationUnitProgramLinkStore): OrganisationUnitProgramLinkHandler {
+        return OrganisationUnitProgramLinkHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
new file mode 100644
index 0000000000..7c4dd32077
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+
+internal class OrganisationUnitProgramLinkHandler(
+    store: OrganisationUnitProgramLinkStore
+) : LinkHandlerImpl<ObjectWithUid, OrganisationUnitProgramLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.kt
new file mode 100644
index 0000000000..51579d51ca
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+
+internal interface OrganisationUnitProgramLinkStore : LinkStore<OrganisationUnitProgramLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
index 44e2788466..d25d548312 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
@@ -25,29 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.organisationunit.internal;
+package org.hisp.dhis.android.core.organisationunit.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 
-public final class OrganisationUnitProgramLinkStore {
+internal class OrganisationUnitProgramLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OrganisationUnitProgramLinkStore,
+    LinkStoreImpl<OrganisationUnitProgramLink>(
+        databaseAdapter,
+        OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
+        OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
+        BINDER,
+        { cursor: Cursor -> OrganisationUnitProgramLink.create(cursor) }
+    ) {
 
-    private static final StatementBinder<OrganisationUnitProgramLink> BINDER = (o, w) -> {
-        w.bind(1, o.program());
-        w.bind(2, o.organisationUnit());
-    };
-
-    private OrganisationUnitProgramLinkStore() {}
-
-    public static LinkStore<OrganisationUnitProgramLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
-                OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-                BINDER,
-                OrganisationUnitProgramLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: OrganisationUnitProgramLink, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.organisationUnit())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStore.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStore.kt
index 2b0fa75691..064ede00af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStore.kt
@@ -25,39 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringArrayColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
-
-@Suppress("MagicNumber")
-internal object OrganisationUnitStore {
-    private val BINDER = object : NameableStatementBinder<OrganisationUnit>() {
-        override fun bindToStatement(o: OrganisationUnit, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(11, o.path())
-            w.bind(12, o.openingDate())
-            w.bind(13, o.closedDate())
-            w.bind(14, o.level())
-            w.bind(15, o.geometry()?.type())
-            w.bind(16, o.geometry()?.coordinates())
-            w.bind(17, getUidOrNull(o.parent()))
-            w.bind(18, StringArrayColumnAdapter.serialize(o.displayNamePath()))
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<OrganisationUnit> {
-        return StoreFactory.objectWithUidStore(
-            databaseAdapter, OrganisationUnitTableInfo.TABLE_INFO, BINDER
-        ) { cursor: Cursor -> OrganisationUnit.create(cursor) }
-    }
-}
+internal interface OrganisationUnitStore : IdentifiableObjectStore<OrganisationUnit>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
new file mode 100644
index 0000000000..b2412c3d34
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringArrayColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+
+@Suppress("MagicNumber")
+internal class OrganisationUnitStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : OrganisationUnitStore,
+    IdentifiableObjectStoreImpl<OrganisationUnit>(
+        databaseAdapter,
+        OrganisationUnitTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> OrganisationUnit.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = object : NameableStatementBinder<OrganisationUnit>() {
+            override fun bindToStatement(o: OrganisationUnit, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(11, o.path())
+                w.bind(12, o.openingDate())
+                w.bind(13, o.closedDate())
+                w.bind(14, o.level())
+                w.bind(15, o.geometry()?.type())
+                w.bind(16, o.geometry()?.coordinates())
+                w.bind(17, getUidOrNull(o.parent()))
+                w.bind(18, StringArrayColumnAdapter.serialize(o.displayNamePath()))
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
index b573192cfb..e992f7c386 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
@@ -28,13 +28,12 @@
 package org.hisp.dhis.android.core.parser.internal.service
 
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitorScope
 import org.hisp.dhis.android.core.parser.internal.expression.CommonParser.visit
@@ -48,16 +47,16 @@ import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils.ITEM_RE
 import org.hisp.dhis.android.core.parser.internal.expression.literal.RegenerateLiteral
 import org.hisp.dhis.android.core.parser.internal.service.dataitem.DimItemDataElementAndOperand
 import org.hisp.dhis.android.core.parser.internal.service.dataitem.DimensionalItemId
-import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import org.hisp.dhis.android.core.validation.MissingValueStrategy
 import org.hisp.dhis.antlr.ParserException
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser
 
 internal class ExpressionService @Inject constructor(
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
+    private val dataElementStore: DataElementStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
-    private val organisationUnitGroupStore: IdentifiableObjectStore<OrganisationUnitGroup>,
-    private val programStageStore: IdentifiableObjectStore<ProgramStage>
+    private val organisationUnitGroupStore: OrganisationUnitGroupStore,
+    private val programStageStore: ProgramStageStore
 ) {
     private val validationRuleExpressionItems: Map<Int, ExpressionItem> = getValidationRuleExpressionItems()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/CalendarProvider.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/CalendarProvider.kt
index f6a158e777..3ac5ebfc45 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/CalendarProvider.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/CalendarProvider.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.period.internal
 
 import java.util.*
 
-internal interface CalendarProvider {
+interface CalendarProvider {
     val calendar: Calendar
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt
index 37cab42a99..a98bf4e349 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 
-internal interface ParentPeriodGenerator {
+interface ParentPeriodGenerator {
     fun generatePeriods(): List<Period>
     fun generatePeriods(periodType: PeriodType, endPeriods: Int): List<Period>
     fun generatePeriods(periodType: PeriodType, startPeriods: Int, endPeriods: Int): List<Period>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
new file mode 100644
index 0000000000..81ebf5e477
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.period.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.period.Period
+
+@Module
+internal class PeriodEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): PeriodStore {
+        return PeriodStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<Period>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.kt
similarity index 74%
rename from core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.kt
index 69817c9aa6..e472dd3865 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.kt
@@ -25,34 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.period.internal
 
-package org.hisp.dhis.android.core.period.internal;
-
-import org.hisp.dhis.android.core.period.PeriodEntityDIModule;
-import org.hisp.dhis.android.core.period.PeriodModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module(includes = {PeriodEntityDIModule.class})
-public final class PeriodPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.period.PeriodModule
 
+@Module(includes = [PeriodEntityDIModule::class])
+internal class PeriodPackageDIModule {
     @Provides
     @Reusable
-    ParentPeriodGenerator parentPeriodGenerator(CalendarProvider calendarProvider) {
-        return ParentPeriodGeneratorImpl.create(calendarProvider);
+    fun parentPeriodGenerator(calendarProvider: CalendarProvider): ParentPeriodGenerator {
+        return ParentPeriodGeneratorImpl.create(calendarProvider)
     }
 
     @Provides
     @Reusable
-    PeriodModule periodModule(PeriodModuleImpl impl) {
-        return impl;
+    fun periodModule(impl: PeriodModuleImpl): PeriodModule {
+        return impl
     }
 
     @Provides
     @Reusable
-    CalendarProvider calendarProvider() {
-        return CalendarProviderFactory.getCalendarProvider();
+    fun calendarProvider(): CalendarProvider {
+        return CalendarProviderFactory.calendarProvider
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt
new file mode 100644
index 0000000000..7df12d98b7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.period.internal
+
+import java.util.Date
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.period.Period
+import org.hisp.dhis.android.core.period.PeriodType
+
+internal interface PeriodStore : ObjectWithoutUidStore<Period> {
+    fun selectByPeriodId(periodId: String?): Period?
+    fun selectPeriodByTypeAndDate(periodType: PeriodType, date: Date): Period?
+    val oldestPeriodStartDate: Date?
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.java
deleted file mode 100644
index 3e613e5a08..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.period.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.sqlorder.internal.SQLOrderType;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.period.Period;
-import org.hisp.dhis.android.core.period.PeriodTableInfo;
-import org.hisp.dhis.android.core.period.PeriodType;
-
-import java.util.Date;
-
-public final class PeriodStoreImpl extends ObjectWithoutUidStoreImpl<Period> implements PeriodStore {
-
-    private static final StatementBinder<Period> BINDER = (o, w) -> {
-        w.bind(1, o.periodId());
-        w.bind(2, o.periodType());
-        w.bind(3, o.startDate());
-        w.bind(4, o.endDate());
-    };
-
-    private static final WhereStatementBinder<Period> WHERE_UPDATE_BINDER
-            = (o, w) -> w.bind(5, o.periodId());
-
-    private static final WhereStatementBinder<Period> WHERE_DELETE_BINDER
-            = (o, w) -> w.bind(1, o.periodId());
-
-    private PeriodStoreImpl(DatabaseAdapter databaseAdapter,
-                            SQLStatementBuilderImpl builder) {
-        super(databaseAdapter, builder, BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, Period::create);
-    }
-
-    @Override
-    public Period selectByPeriodId(String periodId) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(PeriodTableInfo.Columns.PERIOD_ID, periodId)
-                .build();
-
-        return selectOneWhere(whereClause);
-    }
-
-    @Override
-    public Period selectPeriodByTypeAndDate(PeriodType periodType, Date date) {
-
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(PeriodTableInfo.Columns.PERIOD_TYPE, periodType)
-                .appendKeyLessThanOrEqStringValue(PeriodTableInfo.Columns.START_DATE,
-                        BaseIdentifiableObject.DATE_FORMAT.format(date))
-                .appendKeyGreaterOrEqStringValue(PeriodTableInfo.Columns.END_DATE,
-                        BaseIdentifiableObject.DATE_FORMAT.format(date))
-                .build();
-
-        return selectOneWhere(whereClause);
-    }
-
-    @Override
-    public Date getOldestPeriodStartDate() {
-
-        Period period = selectOneOrderedBy(PeriodTableInfo.Columns.START_DATE, SQLOrderType.ASC);
-
-        return period.startDate();
-    }
-
-    public static PeriodStore create(DatabaseAdapter databaseAdapter) {
-        SQLStatementBuilderImpl statementBuilder = new SQLStatementBuilderImpl(
-                PeriodTableInfo.TABLE_INFO.name(), PeriodTableInfo.TABLE_INFO.columns());
-
-        return new PeriodStoreImpl(databaseAdapter, statementBuilder);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
new file mode 100644
index 0000000000..935abf0fc8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
@@ -0,0 +1,95 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.period.internal
+
+import android.database.Cursor
+import java.util.Date
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.sqlorder.internal.SQLOrderType
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.period.Period
+import org.hisp.dhis.android.core.period.PeriodTableInfo
+import org.hisp.dhis.android.core.period.PeriodType
+
+internal class PeriodStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : PeriodStore,
+    ObjectWithoutUidStoreImpl<Period>(
+        databaseAdapter,
+        PeriodTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> Period.create(cursor) }
+    ) {
+    override fun selectByPeriodId(periodId: String?): Period? {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(PeriodTableInfo.Columns.PERIOD_ID, periodId)
+            .build()
+        return selectOneWhere(whereClause)
+    }
+
+    override fun selectPeriodByTypeAndDate(periodType: PeriodType, date: Date): Period? {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(PeriodTableInfo.Columns.PERIOD_TYPE, periodType)
+            .appendKeyLessThanOrEqStringValue(
+                PeriodTableInfo.Columns.START_DATE,
+                BaseIdentifiableObject.DATE_FORMAT.format(date)
+            )
+            .appendKeyGreaterOrEqStringValue(
+                PeriodTableInfo.Columns.END_DATE,
+                BaseIdentifiableObject.DATE_FORMAT.format(date)
+            )
+            .build()
+        return selectOneWhere(whereClause)
+    }
+
+    override val oldestPeriodStartDate: Date?
+        get() {
+            val period = selectOneOrderedBy(PeriodTableInfo.Columns.START_DATE, SQLOrderType.ASC)
+            return period?.startDate()
+        }
+
+    companion object {
+        private val BINDER = StatementBinder { o: Period, w: StatementWrapper ->
+            w.bind(1, o.periodId())
+            w.bind(2, o.periodType())
+            w.bind(3, o.startDate())
+            w.bind(4, o.endDate())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: Period, w: StatementWrapper -> w.bind(5, o.periodId()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: Period, w: StatementWrapper -> w.bind(1, o.periodId()) }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java
index a971b66488..76b4273862 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java
@@ -41,7 +41,7 @@
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
 import org.hisp.dhis.android.core.period.PeriodType;
 import org.hisp.dhis.android.core.program.ProgramTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface;
+import org.hisp.dhis.android.core.program.internal.ProgramStore;
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
 
 import java.util.Collections;
@@ -57,7 +57,7 @@ public final class ProgramCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<Program, ProgramCollectionRepository> {
 
     @Inject
-    ProgramCollectionRepository(final ProgramStoreInterface store,
+    ProgramCollectionRepository(final ProgramStore store,
                                 final Map<String, ChildrenAppender<Program>> childrenAppenders,
                                 final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java
index e8713d480b..696cc74139 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -39,6 +38,7 @@
 import org.hisp.dhis.android.core.common.AnalyticsType;
 import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo.Columns;
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorFields;
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore;
 
 import java.util.Map;
 
@@ -52,7 +52,7 @@ public final class ProgramIndicatorCollectionRepository
 
     @Inject
     ProgramIndicatorCollectionRepository(
-        final IdentifiableObjectStore<ProgramIndicator> store,
+        final ProgramIndicatorStore store,
         final Map<String, ChildrenAppender<ProgramIndicator>> childrenAppenders,
         final RepositoryScope scope
     ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java
index b85cfb7bd6..881bc011d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo.Columns;
+import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class ProgramRuleActionCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRuleAction, ProgramRuleActionCollectionRepository> {
 
     @Inject
-    ProgramRuleActionCollectionRepository(final IdentifiableObjectStore<ProgramRuleAction> store,
+    ProgramRuleActionCollectionRepository(final ProgramRuleActionStore store,
                                           final Map<String, ChildrenAppender<ProgramRuleAction>> childrenAppenders,
                                           final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java
index 6ea8eb1bd1..fd1944baff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.ProgramRuleTableInfo.Columns;
 import org.hisp.dhis.android.core.program.internal.ProgramRuleFields;
+import org.hisp.dhis.android.core.program.internal.ProgramRuleStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class ProgramRuleCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRule, ProgramRuleCollectionRepository> {
 
     @Inject
-    ProgramRuleCollectionRepository(final IdentifiableObjectStore<ProgramRule> store,
+    ProgramRuleCollectionRepository(final ProgramRuleStore store,
                                     final Map<String, ChildrenAppender<ProgramRule>> childrenAppenders,
                                     final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java
index ee5e8169a9..4fc83645e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo.Columns;
+import org.hisp.dhis.android.core.program.internal.ProgramRuleVariableStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class ProgramRuleVariableCollectionRepository extends ReadOnlyIdent
         <ProgramRuleVariable, ProgramRuleVariableCollectionRepository> {
 
     @Inject
-    ProgramRuleVariableCollectionRepository(final IdentifiableObjectStore<ProgramRuleVariable> store,
+    ProgramRuleVariableCollectionRepository(final ProgramRuleVariableStore store,
                                             final Map<String, ChildrenAppender<ProgramRuleVariable>> childrenAppenders,
                                             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java
index 515195d747..dbf40d063b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.ProgramSectionTableInfo.Columns;
 import org.hisp.dhis.android.core.program.internal.ProgramSectionFields;
+import org.hisp.dhis.android.core.program.internal.ProgramSectionStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class ProgramSectionCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramSection, ProgramSectionCollectionRepository> {
 
     @Inject
-    ProgramSectionCollectionRepository(final IdentifiableObjectStore<ProgramSection> store,
+    ProgramSectionCollectionRepository(final ProgramSectionStore store,
                                        final Map<String, ChildrenAppender<ProgramSection>> childrenAppenders,
                                        final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java
index 5fafaca668..37d1956d16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -42,6 +41,7 @@
 import org.hisp.dhis.android.core.common.ValidationStrategy;
 import org.hisp.dhis.android.core.period.PeriodType;
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo.Columns;
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore;
 
 import java.util.Map;
 
@@ -54,7 +54,7 @@ public final class ProgramStageCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStage, ProgramStageCollectionRepository> {
 
     @Inject
-    ProgramStageCollectionRepository(final IdentifiableObjectStore<ProgramStage> store,
+    ProgramStageCollectionRepository(final ProgramStageStore store,
                                      final Map<String, ChildrenAppender<ProgramStage>> childrenAppenders,
                                      final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.java
index 48b4929a78..431fb432f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -38,6 +37,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo.Columns;
 import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementFields;
+import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementStore;
 
 import java.util.Map;
 
@@ -50,7 +50,7 @@ public final class ProgramStageDataElementCollectionRepository extends ReadOnlyI
         <ProgramStageDataElement, ProgramStageDataElementCollectionRepository> {
 
     @Inject
-    ProgramStageDataElementCollectionRepository(final IdentifiableObjectStore<ProgramStageDataElement> store,
+    ProgramStageDataElementCollectionRepository(final ProgramStageDataElementStore store,
                                                 final Map<String, ChildrenAppender<ProgramStageDataElement>>
                                                         childrenAppenders,
                                                 final RepositoryScope scope) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
index 2797cb7a19..e9063efcef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
@@ -35,6 +34,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.internal.ProgramStageSectionFields;
+import org.hisp.dhis.android.core.program.internal.ProgramStageSectionStore;
 
 import java.util.Map;
 
@@ -47,7 +47,7 @@ public final class ProgramStageSectionsCollectionRepository extends ReadOnlyIden
         <ProgramStageSection, ProgramStageSectionsCollectionRepository> {
 
     @Inject
-    ProgramStageSectionsCollectionRepository(final IdentifiableObjectStore<ProgramStageSection> store,
+    ProgramStageSectionsCollectionRepository(final ProgramStageSectionStore store,
                                              final Map<String, ChildrenAppender<ProgramStageSection>> childrenAppenders,
                                              final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.java
index 07827b1b23..e24a2fdaac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.program;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -38,6 +37,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo.Columns;
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeFields;
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore;
 
 import java.util.Map;
 
@@ -52,7 +52,7 @@ public final class ProgramTrackedEntityAttributeCollectionRepository
 
     @Inject
     ProgramTrackedEntityAttributeCollectionRepository(
-            final IdentifiableObjectStore<ProgramTrackedEntityAttribute> store,
+            final ProgramTrackedEntityAttributeStore store,
             final Map<String, ChildrenAppender<ProgramTrackedEntityAttribute>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt
new file mode 100644
index 0000000000..e745ce4605
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class AnalyticsPeriodBoundaryEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter?): AnalyticsPeriodBoundaryStore {
+        return AnalyticsPeriodBoundaryStoreImpl(databaseAdapter!!)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: AnalyticsPeriodBoundaryStore): AnalyticsPeriodBoundaryHandler {
+        return AnalyticsPeriodBoundaryHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
new file mode 100644
index 0000000000..ab757407e6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
+
+internal class AnalyticsPeriodBoundaryHandler(
+    store: AnalyticsPeriodBoundaryStore
+) : LinkHandlerImpl<AnalyticsPeriodBoundary, AnalyticsPeriodBoundary>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStore.kt
index 15c0cf88c4..4e5d9e95cc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStore.kt
@@ -25,35 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.program.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
-import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
-
-@Suppress("MagicNumber")
-internal object AnalyticsPeriodBoundaryStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsPeriodBoundary, w: StatementWrapper ->
-        w.bind(1, o.programIndicator())
-        w.bind(2, o.boundaryTarget())
-        w.bind(3, o.analyticsPeriodBoundaryType())
-        w.bind(4, o.offsetPeriods())
-        w.bind(5, o.offsetPeriodType())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsPeriodBoundary> {
-        return StoreFactory.linkStore(
-            databaseAdapter,
-            AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
-            AnalyticsPeriodBoundaryTableInfo.Columns.PROGRAM_INDICATOR,
-            BINDER
-        ) { cursor: Cursor -> AnalyticsPeriodBoundary.create(cursor) }
-    }
-}
+internal interface AnalyticsPeriodBoundaryStore : LinkStore<AnalyticsPeriodBoundary>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
new file mode 100644
index 0000000000..ad18215a78
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
+import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
+
+@Suppress("MagicNumber")
+internal class AnalyticsPeriodBoundaryStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsPeriodBoundaryStore,
+    LinkStoreImpl<AnalyticsPeriodBoundary>(
+        databaseAdapter,
+        AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
+        AnalyticsPeriodBoundaryTableInfo.Columns.PROGRAM_INDICATOR,
+        BINDER,
+        { cursor: Cursor -> AnalyticsPeriodBoundary.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsPeriodBoundary, w: StatementWrapper ->
+            w.bind(1, o.programIndicator())
+            w.bind(2, o.boundaryTarget())
+            w.bind(3, o.analyticsPeriodBoundaryType())
+            w.bind(4, o.offsetPeriods())
+            w.bind(5, o.offsetPeriodType())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java
index 8b4e854726..494add3f84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java
@@ -27,9 +27,8 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
 import org.hisp.dhis.android.core.common.ValueTypeRendering;
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore;
 import org.hisp.dhis.android.core.program.ProgramStageDataElement;
 
 import javax.inject.Inject;
@@ -41,7 +40,7 @@ final class DataElementValueTypeRenderingChildrenAppender
         extends ValueTypeRenderingChildrenAppender<ProgramStageDataElement> {
 
     @Inject
-    DataElementValueTypeRenderingChildrenAppender(ObjectWithoutUidStore<ValueTypeDeviceRendering> store) {
+    DataElementValueTypeRenderingChildrenAppender(ValueTypeDeviceRenderingStore store) {
         super(store);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.java
deleted file mode 100644
index a061077bc8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink;
-import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramAttributeValueEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<ProgramAttributeValueLink> store(DatabaseAdapter databaseAdapter) {
-        return ProgramAttributeValueLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkHandler<Attribute, ProgramAttributeValueLink> handler(
-            LinkStore<ProgramAttributeValueLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt
index 0cd8aef627..474b8c5a72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt
@@ -25,31 +25,27 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.dataset.DataSetElement;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHandler
+import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkStore
+import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkStoreImpl
 
 @Module
-public final class DataSetElementEntityDIModule {
-
+internal class ProgramAttributeValueEntityDIModule {
     @Provides
     @Reusable
-    LinkStore<DataSetElement> store(DatabaseAdapter databaseAdapter) {
-        return DataSetDataElementLinkStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): ProgramAttributeValueLinkStore {
+        return ProgramAttributeValueLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    LinkHandler<DataSetElement, DataSetElement> handler(LinkStore<DataSetElement> store) {
-        return new LinkHandlerImpl<>(store);
+    fun handler(store: ProgramAttributeValueLinkStore): ProgramAttributeValueLinkHandler {
+        return ProgramAttributeValueLinkHandler(store)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
index 0b8e46d105..c2c842da42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
@@ -53,7 +53,7 @@ final class ProgramCall implements UidsCall<Program> {
 
     @Inject
     ProgramCall(ProgramService service,
-                Handler<Program> handler,
+                ProgramHandler handler,
                 APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.java
deleted file mode 100644
index 5f9406fb50..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramTableInfo;
-import org.hisp.dhis.android.core.program.ProgramTableInfo.Columns;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramEntityDIModule {
-
-    @Provides
-    @Reusable
-    public ProgramStoreInterface store(DatabaseAdapter databaseAdapter) {
-        return ProgramStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<Program> handler(ProgramHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<Program>> childrenAppenders(
-            DatabaseAdapter databaseAdapter,
-            ProgramTrackedEntityTypeChildrenAppender trackedEntityTypeChildrenAppender) {
-
-        return new HashMap<String, ChildrenAppender<Program>>() {{
-            put(Columns.TRACKED_ENTITY_TYPE, trackedEntityTypeChildrenAppender);
-        }};
-    }
-
-    @Provides
-    @Reusable
-    public CollectionCleaner<Program> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(ProgramTableInfo.TABLE_INFO.name(), databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkCleaner<Program> linkCleaner(ProgramStoreInterface programStore,
-                                            DatabaseAdapter databaseAdapter) {
-        return new LinkCleanerImpl<>(OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
-                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM, programStore, databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    ParentOrphanCleaner<Program> parentOrphanCleaner(DatabaseAdapter databaseAdapter) {
-        return ProgramOrphanCleaner.create(databaseAdapter);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
index 47c3deb5ea..d860b04262 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
@@ -25,53 +25,61 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramTableInfo
 
 @Module
-public final class OrganisationUnitGroupEntityDIModule implements IdentifiableEntityDIModule<OrganisationUnitGroup> {
+internal class ProgramEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStore {
+        return ProgramStoreImpl(databaseAdapter)
+    }
 
-    @Override
     @Provides
     @Reusable
-    public IdentifiableObjectStore<OrganisationUnitGroup> store(DatabaseAdapter databaseAdapter) {
-        return OrganisationUnitGroupStore.create(databaseAdapter);
+    fun childrenAppenders(
+        trackedEntityTypeChildrenAppender: ProgramTrackedEntityTypeChildrenAppender
+    ): Map<String, ChildrenAppender<Program>> {
+        return mapOf(
+            ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE to trackedEntityTypeChildrenAppender
+        )
     }
 
-    @Override
     @Provides
     @Reusable
-    public Handler<OrganisationUnitGroup> handler(IdentifiableObjectStore<OrganisationUnitGroup> store) {
-        return new IdentifiableHandlerImpl<>(store);
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<Program> {
+        return CollectionCleanerImpl(ProgramTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
 
     @Provides
     @Reusable
-    CollectionCleaner<OrganisationUnitGroup> organisationUnitGroupCollectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(OrganisationUnitGroupTableInfo.TABLE_INFO.name(), databaseAdapter);
+    fun linkCleaner(
+        programStore: ProgramStore,
+        databaseAdapter: DatabaseAdapter
+    ): LinkCleaner<Program> {
+        return LinkCleanerImpl(
+            OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
+            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM, programStore, databaseAdapter
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<OrganisationUnitGroup>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun parentOrphanCleaner(databaseAdapter: DatabaseAdapter): ParentOrphanCleaner<Program> {
+        return ProgramOrphanCleaner.create(databaseAdapter)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.java
deleted file mode 100644
index 4288fc7f43..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.AttributeValueUtils;
-import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramInternalAccessor;
-import org.hisp.dhis.android.core.program.ProgramRuleVariable;
-import org.hisp.dhis.android.core.program.ProgramSection;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-import org.hisp.dhis.android.core.program.ProgramType;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ProgramHandler extends IdentifiableHandlerImpl<Program> {
-
-    private final Handler<ProgramRuleVariable> programRuleVariableHandler;
-    private final Handler<ProgramTrackedEntityAttribute> programTrackedEntityAttributeHandler;
-    private final Handler<ProgramSection> programSectionHandler;
-    private final ParentOrphanCleaner<Program> orphanCleaner;
-    private final CollectionCleaner<Program> collectionCleaner;
-    private final LinkCleaner<Program> linkCleaner;
-
-    private final Handler<Attribute> attributeHandler;
-    private final LinkHandler<Attribute, ProgramAttributeValueLink>
-            programAttributeLinkHandler;
-
-
-    @Inject
-    ProgramHandler(ProgramStoreInterface programStore,
-                   Handler<ProgramRuleVariable> programRuleVariableHandler,
-                   Handler<ProgramTrackedEntityAttribute> programTrackedEntityAttributeHandler,
-                   Handler<ProgramSection> programSectionHandler,
-                   ParentOrphanCleaner<Program> orphanCleaner,
-                   CollectionCleaner<Program> collectionCleaner,
-                   LinkCleaner<Program> linkCleaner,
-                   Handler<Attribute> attributeHandler,
-                   LinkHandler<Attribute, ProgramAttributeValueLink> programAttributeLinkHandler) {
-        super(programStore);
-        this.programRuleVariableHandler = programRuleVariableHandler;
-        this.programTrackedEntityAttributeHandler = programTrackedEntityAttributeHandler;
-        this.programSectionHandler = programSectionHandler;
-        this.orphanCleaner = orphanCleaner;
-        this.collectionCleaner = collectionCleaner;
-        this.linkCleaner = linkCleaner;
-        this.attributeHandler = attributeHandler;
-        this.programAttributeLinkHandler = programAttributeLinkHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(Program program, HandleAction action) {
-        programTrackedEntityAttributeHandler.handleMany(ProgramInternalAccessor
-                .accessProgramTrackedEntityAttributes(program));
-        programRuleVariableHandler.handleMany(ProgramInternalAccessor.accessProgramRuleVariables(program));
-        programSectionHandler.handleMany(ProgramInternalAccessor.accessProgramSections(program));
-
-        if (action == HandleAction.Update) {
-            orphanCleaner.deleteOrphan(program);
-        }
-
-        if (program.attributeValues() != null) {
-            final List<Attribute> attributes = AttributeValueUtils.extractAttributes(program.attributeValues());
-
-            attributeHandler.handleMany(attributes);
-
-            programAttributeLinkHandler.handleMany(program.uid(), attributes,
-                    attribute -> ProgramAttributeValueLink.builder()
-                            .program(program.uid())
-                            .attribute(attribute.uid())
-                            .value(AttributeValueUtils.extractValue(program.attributeValues(), attribute.uid()))
-                            .build());
-        }
-
-    }
-
-    @Override
-    protected Collection<Program> beforeCollectionHandled(Collection<Program> programs) {
-        List<Program> filteredPrograms = new ArrayList<>(programs.size());
-        for (Program p: programs) {
-            if (!(p.programType() == ProgramType.WITH_REGISTRATION && p.trackedEntityType() == null)) {
-                filteredPrograms.add(p);
-            }
-        }
-        return filteredPrograms;
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<Program> programs) {
-        collectionCleaner.deleteNotPresent(programs);
-        linkCleaner.deleteNotPresent(programs);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
new file mode 100644
index 0000000000..9c61682296
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.AttributeValueUtils
+import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
+import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHandler
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramInternalAccessor
+import org.hisp.dhis.android.core.program.ProgramType
+
+@Reusable
+internal class ProgramHandler @Inject constructor(
+    programStore: ProgramStore,
+    private val programRuleVariableHandler: ProgramRuleVariableHandler,
+    private val programTrackedEntityAttributeHandler: ProgramTrackedEntityAttributeHandler,
+    private val programSectionHandler: ProgramSectionHandler,
+    private val orphanCleaner: ParentOrphanCleaner<Program>,
+    private val collectionCleaner: CollectionCleaner<Program>,
+    private val linkCleaner: LinkCleaner<Program>,
+    private val attributeHandler: AttributeHandler,
+    private val programAttributeLinkHandler: ProgramAttributeValueLinkHandler
+) : IdentifiableHandlerImpl<Program>(programStore) {
+
+    override fun afterObjectHandled(o: Program, action: HandleAction) {
+        programTrackedEntityAttributeHandler.handleMany(
+            ProgramInternalAccessor
+                .accessProgramTrackedEntityAttributes(o)
+        )
+        programRuleVariableHandler.handleMany(ProgramInternalAccessor.accessProgramRuleVariables(o))
+        programSectionHandler.handleMany(ProgramInternalAccessor.accessProgramSections(o))
+
+        if (action === HandleAction.Update) {
+            orphanCleaner.deleteOrphan(o)
+        }
+        if (o.attributeValues() != null) {
+            val attributes = AttributeValueUtils.extractAttributes(o.attributeValues())
+            attributeHandler.handleMany(attributes)
+            programAttributeLinkHandler.handleMany(
+                o.uid(), attributes
+            ) { attribute: Attribute ->
+                ProgramAttributeValueLink.builder()
+                    .program(o.uid())
+                    .attribute(attribute.uid())
+                    .value(AttributeValueUtils.extractValue(o.attributeValues(), attribute.uid()))
+                    .build()
+            }
+        }
+    }
+
+    override fun beforeCollectionHandled(oCollection: Collection<Program>): Collection<Program> {
+        val filteredPrograms: MutableList<Program> = ArrayList(oCollection.size)
+        for (p in oCollection) {
+            if (!(p.programType() == ProgramType.WITH_REGISTRATION && p.trackedEntityType() == null)) {
+                filteredPrograms.add(p)
+            }
+        }
+        return filteredPrograms
+    }
+
+    override fun afterCollectionHandled(oCollection: Collection<Program>?) {
+        collectionCleaner.deleteNotPresent(oCollection)
+        linkCleaner.deleteNotPresent(oCollection)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt
index 01c006c016..db98ffb7d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt
@@ -52,7 +52,7 @@ constructor(private val childStore: LinkStore<AnalyticsPeriodBoundary>) :
     companion object {
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramIndicator> {
             return ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender(
-                AnalyticsPeriodBoundaryStore.create(databaseAdapter)
+                AnalyticsPeriodBoundaryStoreImpl(databaseAdapter)
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
index c440407e3c..7d3f8979e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
@@ -33,16 +33,15 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramIndicator
 
 @Reusable
 internal class ProgramIndicatorCall @Inject constructor(
     private val service: ProgramIndicatorService,
-    private val handler: Handler<ProgramIndicator>,
+    private val handler: ProgramIndicatorHandler,
     private val apiDownloader: APIDownloader,
-    private val programStore: ProgramStoreInterface
+    private val programStore: ProgramStore
 ) : UidsCall<ProgramIndicator> {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
index 19540d6c10..4359a0c7d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
@@ -31,24 +31,15 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore.create
 
 @Module
 internal class ProgramIndicatorEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ProgramIndicator> {
-        return create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(impl: ProgramIndicatorHandler): Handler<ProgramIndicator> {
-        return impl
+    fun store(databaseAdapter: DatabaseAdapter): ProgramIndicatorStore {
+        return ProgramIndicatorStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
index 16423a2838..697bed5baf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
@@ -30,22 +30,18 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
 import org.hisp.dhis.android.core.common.IdentifiableColumns
-import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
-import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkHandler
 import org.hisp.dhis.android.core.program.ProgramIndicator
 
 @Reusable
 internal class ProgramIndicatorHandler @Inject constructor(
-    private val programIndicatorStore: IdentifiableObjectStore<ProgramIndicator>,
-    private val programIndicatorLegendSetLinkHandler: OrderedLinkHandler<ObjectWithUid, ProgramIndicatorLegendSetLink>,
-    private val analyticsPeriodBoundaryHandler: LinkHandler<AnalyticsPeriodBoundary, AnalyticsPeriodBoundary>
+    private val programIndicatorStore: ProgramIndicatorStore,
+    private val programIndicatorLegendSetLinkHandler: ProgramIndicatorLegendSetLinkHandler,
+    private val analyticsPeriodBoundaryHandler: AnalyticsPeriodBoundaryHandler
 ) : IdentifiableHandlerImpl<ProgramIndicator>(programIndicatorStore) {
 
     override fun afterCollectionHandled(oCollection: Collection<ProgramIndicator>?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.java
deleted file mode 100644
index 582f818288..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink;
-import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramIndicatorLegendSetEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<ProgramIndicatorLegendSetLink> store(DatabaseAdapter databaseAdapter) {
-        return ProgramIndicatorLegendSetLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public OrderedLinkHandler<ObjectWithUid, ProgramIndicatorLegendSetLink> handler(
-            LinkStore<ProgramIndicatorLegendSetLink> store) {
-        return new OrderedLinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt
index 441e74feac..12d0da9bf6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt
@@ -25,31 +25,27 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.attribute.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.attribute.Attribute;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkHandler
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStore
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStoreImpl
 
 @Module
-public final class AttributeEntityDIModule {
-
+internal class ProgramIndicatorLegendSetEntityDIModule {
     @Provides
     @Reusable
-    IdentifiableObjectStore<Attribute> store(DatabaseAdapter databaseAdapter) {
-        return AttributeStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): ProgramIndicatorLegendSetLinkStore {
+        return ProgramIndicatorLegendSetLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Handler<Attribute> handler(IdentifiableObjectStore<Attribute> store) {
-        return new IdentifiableHandlerImpl<>(store);
+    fun handler(store: ProgramIndicatorLegendSetLinkStore): ProgramIndicatorLegendSetLinkHandler {
+        return ProgramIndicatorLegendSetLinkHandler(store)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStore.kt
index 3f6f64c8e4..fdd086a928 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStore.kt
@@ -25,47 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.program.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo
-
-@Suppress("MagicNumber")
-internal object ProgramIndicatorStore {
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        ProgramIndicatorTableInfo.TABLE_INFO, ProgramIndicatorTableInfo.Columns.PROGRAM
-    )
-    private val BINDER: StatementBinder<ProgramIndicator> = object : NameableStatementBinder<ProgramIndicator>() {
-        override fun bindToStatement(
-            o: ProgramIndicator,
-            w: StatementWrapper
-        ) {
-            super.bindToStatement(o, w)
-            w.bind(11, o.displayInForm())
-            w.bind(12, o.expression())
-            w.bind(13, o.dimensionItem())
-            w.bind(14, o.filter())
-            w.bind(15, o.decimals())
-            w.bind(16, o.aggregationType())
-            w.bind(17, getUidOrNull(o.program()))
-            w.bind(18, o.analyticsType())
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ProgramIndicator> {
-        return objectWithUidStore(
-            databaseAdapter,
-            ProgramIndicatorTableInfo.TABLE_INFO, BINDER
-        ) { cursor: Cursor -> ProgramIndicator.create(cursor) }
-    }
-}
+internal interface ProgramIndicatorStore : IdentifiableObjectStore<ProgramIndicator>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
similarity index 54%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
index d83ae8bc2c..81438dea85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
@@ -25,35 +25,49 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.option.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.option.Option;
-import org.hisp.dhis.android.core.option.OptionTableInfo;
+@Suppress("MagicNumber")
+internal class ProgramIndicatorStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramIndicatorStore,
+    IdentifiableObjectStoreImpl<ProgramIndicator>(
+        databaseAdapter,
+        ProgramIndicatorTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramIndicator.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class OptionStore {
-
-    private OptionStore() {}
-
-    private static StatementBinder<Option> BINDER = new IdentifiableWithStyleStatementBinder<Option>() {
-        @Override
-        public void bindToStatement(@NonNull Option o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(9, o.sortOrder());
-            w.bind(10, UidsHelper.getUidOrNull(o.optionSet()));
+    companion object {
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramIndicatorTableInfo.TABLE_INFO, ProgramIndicatorTableInfo.Columns.PROGRAM
+        )
+        private val BINDER: StatementBinder<ProgramIndicator> = object : NameableStatementBinder<ProgramIndicator>() {
+            override fun bindToStatement(
+                o: ProgramIndicator,
+                w: StatementWrapper
+            ) {
+                super.bindToStatement(o, w)
+                w.bind(11, o.displayInForm())
+                w.bind(12, o.expression())
+                w.bind(13, o.dimensionItem())
+                w.bind(14, o.filter())
+                w.bind(15, o.decimals())
+                w.bind(16, o.aggregationType())
+                w.bind(17, getUidOrNull(o.program()))
+                w.bind(18, o.analyticsType())
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<Option> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, OptionTableInfo.TABLE_INFO, BINDER, Option::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 90756c872f..2024e97e1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -33,15 +33,14 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionSet
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramStage
@@ -66,7 +65,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val optionSetCall: UidsCall<OptionSet>,
     private val optionCall: UidsCall<Option>,
     private val optionGroupCall: UidsCall<OptionGroup>,
-    private val programOrganisationUnitLinkStore: LinkStore<OrganisationUnitProgramLink>
+    private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java
index 132771960f..cc367439c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java
@@ -53,7 +53,7 @@ static ChildrenAppender<ProgramRule> create(DatabaseAdapter databaseAdapter) {
         return new ProgramRuleActionChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        ProgramRuleActionStore.CHILD_PROJECTION,
+                        ProgramRuleActionStoreImpl.Companion.getCHILD_PROJECTION(),
                         ProgramRuleAction::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.java
deleted file mode 100644
index bda6e9c02a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramRuleAction;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramRuleActionEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramRuleAction> store(DatabaseAdapter databaseAdapter) {
-        return ProgramRuleActionStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    HandlerWithTransformer<ProgramRuleAction> handler(IdentifiableObjectStore<ProgramRuleAction> store) {
-        return new IdentifiableHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<ProgramRuleAction>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
new file mode 100644
index 0000000000..4b09693b57
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+
+@Module
+internal class ProgramRuleActionEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramRuleActionStore {
+        return ProgramRuleActionStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: ProgramRuleActionStore): ProgramRuleActionHandler {
+        return ProgramRuleActionHandler(store)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<ProgramRuleAction>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
new file mode 100644
index 0000000000..313bde9d9b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+
+internal class ProgramRuleActionHandler(
+    store: ProgramRuleActionStore
+) : IdentifiableHandlerImpl<ProgramRuleAction>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.kt
new file mode 100644
index 0000000000..bf46855638
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+
+internal interface ProgramRuleActionStore : IdentifiableObjectStore<ProgramRuleAction>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
similarity index 52%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
index bd33722442..43e45d809c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
@@ -25,50 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.program.ProgramRuleAction;
-import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo;
+@Suppress("MagicNumber")
+internal class ProgramRuleActionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramRuleActionStore,
+    IdentifiableObjectStoreImpl<ProgramRuleAction>(
+        databaseAdapter,
+        ProgramRuleActionTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor? -> ProgramRuleAction.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<ProgramRuleAction> =
+            object : IdentifiableStatementBinder<ProgramRuleAction>() {
+                override fun bindToStatement(o: ProgramRuleAction, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(7, o.data())
+                    w.bind(8, o.content())
+                    w.bind(9, o.location())
+                    w.bind(10, getUidOrNull(o.trackedEntityAttribute()))
+                    w.bind(11, getUidOrNull(o.programIndicator()))
+                    w.bind(12, getUidOrNull(o.programStageSection()))
+                    w.bind(13, o.programRuleActionType())
+                    w.bind(14, getUidOrNull(o.programStage()))
+                    w.bind(15, getUidOrNull(o.dataElement()))
+                    w.bind(16, getUidOrNull(o.programRule()))
+                    w.bind(17, getUidOrNull(o.option()))
+                    w.bind(18, getUidOrNull(o.optionGroup()))
+                }
+            }
 
-import androidx.annotation.NonNull;
-
-public final class ProgramRuleActionStore {
-
-    private static StatementBinder<ProgramRuleAction> BINDER = new IdentifiableStatementBinder<ProgramRuleAction>() {
-        @Override
-        public void bindToStatement(@NonNull ProgramRuleAction o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.data());
-            w.bind(8, o.content());
-            w.bind(9, o.location());
-            w.bind(10, UidsHelper.getUidOrNull(o.trackedEntityAttribute()));
-            w.bind(11, UidsHelper.getUidOrNull(o.programIndicator()));
-            w.bind(12, UidsHelper.getUidOrNull(o.programStageSection()));
-            w.bind(13, o.programRuleActionType());
-            w.bind(14, UidsHelper.getUidOrNull(o.programStage()));
-            w.bind(15, UidsHelper.getUidOrNull(o.dataElement()));
-            w.bind(16, UidsHelper.getUidOrNull(o.programRule()));
-            w.bind(17, UidsHelper.getUidOrNull(o.option()));
-            w.bind(18, UidsHelper.getUidOrNull(o.optionGroup()));
-        }
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            ProgramRuleActionTableInfo.TABLE_INFO, ProgramRuleActionTableInfo.Columns.PROGRAM_RULE);
-
-    private ProgramRuleActionStore() {}
-
-    public static IdentifiableObjectStore<ProgramRuleAction> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, ProgramRuleActionTableInfo.TABLE_INFO, BINDER,
-                ProgramRuleAction::create);
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramRuleActionTableInfo.TABLE_INFO, ProgramRuleActionTableInfo.Columns.PROGRAM_RULE
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java
index 125127f76f..9f1b899d30 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.program.ProgramRule;
 
@@ -48,11 +47,11 @@ final class ProgramRuleCall implements UidsCall<ProgramRule> {
     private static final int MAX_UID_LIST_SIZE = 64;
 
     private final ProgramRuleService service;
-    private final Handler<ProgramRule> handler;
+    private final ProgramRuleHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
-    ProgramRuleCall(ProgramRuleService service, Handler<ProgramRule> handler, APIDownloader apiDownloader) {
+    ProgramRuleCall(ProgramRuleService service, ProgramRuleHandler handler, APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
         this.apiDownloader = apiDownloader;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
index 2ebdc804fd..e4fd5c719b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
@@ -25,63 +25,59 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramRule;
-import org.hisp.dhis.android.core.program.ProgramRuleAction;
-import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo;
-import org.hisp.dhis.android.core.program.ProgramRuleTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
+import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
 
 @Module
-public final class ProgramRuleEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramRule> store(DatabaseAdapter databaseAdapter) {
-        return ProgramRuleStore.create(databaseAdapter);
-    }
-
+internal class ProgramRuleEntityDIModule {
     @Provides
     @Reusable
-    public Handler<ProgramRule> handler(ProgramRuleHandler impl) {
-        return impl;
+    fun store(databaseAdapter: DatabaseAdapter): ProgramRuleStore {
+        return ProgramRuleStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    OrphanCleaner<ProgramRule, ProgramRuleAction> actionCleaner(DatabaseAdapter databaseAdapter) {
-        return new OrphanCleanerImpl<>(ProgramRuleActionTableInfo.TABLE_INFO.name(),
-                ProgramRuleActionTableInfo.Columns.PROGRAM_RULE, databaseAdapter);
+    fun actionCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<ProgramRule, ProgramRuleAction> {
+        return OrphanCleanerImpl(
+            ProgramRuleActionTableInfo.TABLE_INFO.name(),
+            ProgramRuleActionTableInfo.Columns.PROGRAM_RULE, databaseAdapter
+        )
     }
 
     @Provides
     @Reusable
-    SubCollectionCleaner<ProgramRule> ruleCleaner(DatabaseAdapter databaseAdapter) {
-        return new SubCollectionCleanerImpl<>(ProgramRuleTableInfo.TABLE_INFO.name(),
-                ProgramRuleTableInfo.Columns.PROGRAM, databaseAdapter,
-                programRule -> programRule.program().uid());
+    fun ruleCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<ProgramRule> {
+        return SubCollectionCleanerImpl(
+            ProgramRuleTableInfo.TABLE_INFO.name(),
+            ProgramRuleTableInfo.Columns.PROGRAM, databaseAdapter,
+            object : Transformer<ProgramRule, String> {
+                override fun transform(o: ProgramRule): String {
+                    return o.program()!!.uid()
+                }
+            }
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<ProgramRule>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return Collections.singletonMap(ProgramRuleFields.PROGRAM_RULE_ACTIONS,
-                ProgramRuleActionChildrenAppender.create(databaseAdapter));
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramRule>> {
+        return mapOf(
+            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender.create(databaseAdapter)
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.java
deleted file mode 100644
index 38e586e55e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.program.ProgramRule;
-import org.hisp.dhis.android.core.program.ProgramRuleAction;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ProgramRuleHandler extends IdentifiableHandlerImpl<ProgramRule> {
-    private final HandlerWithTransformer<ProgramRuleAction> programRuleActionHandler;
-    private final SubCollectionCleaner<ProgramRule> programRuleCleaner;
-    private final OrphanCleaner<ProgramRule, ProgramRuleAction> programRuleActionCleaner;
-
-    @Inject
-    ProgramRuleHandler(IdentifiableObjectStore<ProgramRule> programRuleStore,
-                       HandlerWithTransformer<ProgramRuleAction> programRuleActionHandler,
-                       SubCollectionCleaner<ProgramRule> programRuleCleaner,
-                       OrphanCleaner<ProgramRule, ProgramRuleAction> programRuleActionCleaner) {
-        super(programRuleStore);
-        this.programRuleActionHandler = programRuleActionHandler;
-        this.programRuleCleaner = programRuleCleaner;
-        this.programRuleActionCleaner = programRuleActionCleaner;
-    }
-
-    @Override
-    protected void afterObjectHandled(ProgramRule programRule, HandleAction handleAction) {
-        programRuleActionHandler.handleMany(programRule.programRuleActions(),
-                pra -> pra.toBuilder().programRule(ObjectWithUid.create(programRule.uid())).build());
-        if (handleAction == HandleAction.Update) {
-            programRuleActionCleaner.deleteOrphan(programRule, programRule.programRuleActions());
-        }
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<ProgramRule> programRules) {
-        this.programRuleCleaner.deleteNotPresent(programRules);
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
index 094a16be32..a76bd630d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
@@ -25,43 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.legendset.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.legendset.Legend;
-import org.hisp.dhis.android.core.legendset.LegendSet;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramRuleAction
 
 @Reusable
-final class LegendSetHandler extends IdentifiableHandlerImpl<LegendSet> {
-
-    private final HandlerWithTransformer<Legend> legendHandler;
-    private final OrphanCleaner<LegendSet, Legend> legendCleaner;
+internal class ProgramRuleHandler @Inject constructor(
+    programRuleStore: ProgramRuleStore,
+    private val programRuleActionHandler: ProgramRuleActionHandler,
+    private val programRuleCleaner: SubCollectionCleaner<ProgramRule>,
+    private val programRuleActionCleaner: OrphanCleaner<ProgramRule, ProgramRuleAction>
+) : IdentifiableHandlerImpl<ProgramRule>(programRuleStore) {
+
+    override fun afterObjectHandled(o: ProgramRule, action: HandleAction) {
+        programRuleActionHandler.handleMany(
+            o.programRuleActions()
+        ) { pra: ProgramRuleAction ->
+            pra.toBuilder().programRule(ObjectWithUid.create(o.uid())).build()
+        }
 
-    @Inject
-    LegendSetHandler(IdentifiableObjectStore<LegendSet> legendSetStore,
-                     HandlerWithTransformer<Legend> legendHandler,
-                     OrphanCleaner<LegendSet, Legend> legendCleaner) {
-        super(legendSetStore);
-        this.legendHandler = legendHandler;
-        this.legendCleaner = legendCleaner;
+        if (action === HandleAction.Update) {
+            programRuleActionCleaner.deleteOrphan(o, o.programRuleActions())
+        }
     }
 
-    @Override
-    protected void afterObjectHandled(final LegendSet legendSet, HandleAction action) {
-        legendHandler.handleMany(legendSet.legends(),
-                legend -> legend.toBuilder().legendSet(ObjectWithUid.create(legendSet.uid())).build());
-
-        if (action == HandleAction.Update) {
-            legendCleaner.deleteOrphan(legendSet, legendSet.legends());
-        }
+    override fun afterCollectionHandled(oCollection: Collection<ProgramRule>?) {
+        programRuleCleaner.deleteNotPresent(oCollection)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.kt
new file mode 100644
index 0000000000..f52aea4569
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.ProgramRule
+
+internal interface ProgramRuleStore : IdentifiableObjectStore<ProgramRule>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
similarity index 59%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
index 813823c975..0367a463ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
@@ -25,43 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.program.ProgramRule;
-import org.hisp.dhis.android.core.program.ProgramRuleTableInfo;
+@Suppress("MagicNumber")
+internal class ProgramRuleStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramRuleStore,
+    IdentifiableObjectStoreImpl<ProgramRule>(
+        databaseAdapter,
+        ProgramRuleTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramRule.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class ProgramRuleStore {
-
-    private static StatementBinder<ProgramRule> BINDER = new IdentifiableStatementBinder<ProgramRule>() {
-
-        @Override
-        public void bindToStatement(@NonNull ProgramRule o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.priority());
-            w.bind(8, o.condition());
-            w.bind(9, UidsHelper.getUidOrNull(o.program()));
-            w.bind(10, UidsHelper.getUidOrNull(o.programStage()));
+    companion object {
+        private val BINDER: StatementBinder<ProgramRule> = object : IdentifiableStatementBinder<ProgramRule>() {
+            override fun bindToStatement(o: ProgramRule, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.priority())
+                w.bind(8, o.condition())
+                w.bind(9, getUidOrNull(o.program()))
+                w.bind(10, getUidOrNull(o.programStage()))
+            }
         }
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            ProgramRuleTableInfo.TABLE_INFO, ProgramRuleTableInfo.Columns.PROGRAM);
-
-    private ProgramRuleStore() {}
-
-    public static IdentifiableObjectStore<ProgramRule> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, ProgramRuleTableInfo.TABLE_INFO, BINDER,
-                ProgramRule::create);
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramRuleTableInfo.TABLE_INFO, ProgramRuleTableInfo.Columns.PROGRAM
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.java
deleted file mode 100644
index 39429c9b05..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramRuleVariable;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramRuleVariableEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramRuleVariable> store(DatabaseAdapter databaseAdapter) {
-        return ProgramRuleVariableStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<ProgramRuleVariable> handler(IdentifiableObjectStore<ProgramRuleVariable> store) {
-        return new IdentifiableHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<ProgramRuleVariable>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
new file mode 100644
index 0000000000..34a52adb83
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramRuleVariable
+
+@Module
+internal class ProgramRuleVariableEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramRuleVariableStore {
+        return ProgramRuleVariableStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: ProgramRuleVariableStore): ProgramRuleVariableHandler {
+        return ProgramRuleVariableHandler(store)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<ProgramRuleVariable>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
new file mode 100644
index 0000000000..33dc9cc139
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.program.ProgramRuleVariable
+
+internal class ProgramRuleVariableHandler(
+    store: ProgramRuleVariableStore
+) : IdentifiableHandlerImpl<ProgramRuleVariable>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.kt
new file mode 100644
index 0000000000..3f7aa0cf6b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.ProgramRuleVariable
+
+internal interface ProgramRuleVariableStore : IdentifiableObjectStore<ProgramRuleVariable>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
similarity index 57%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
index fba38c197c..d57ce2b44f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
@@ -25,46 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramRuleVariable
+import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.program.ProgramRuleVariable;
-import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo;
+@Suppress("MagicNumber")
+internal class ProgramRuleVariableStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramRuleVariableStore,
+    IdentifiableObjectStoreImpl<ProgramRuleVariable>(
+        databaseAdapter,
+        ProgramRuleVariableTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramRuleVariable.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
+    companion object {
+        private val BINDER: StatementBinder<ProgramRuleVariable> =
+            object : IdentifiableStatementBinder<ProgramRuleVariable>() {
+                override fun bindToStatement(o: ProgramRuleVariable, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(7, o.useCodeForOptionSet())
+                    w.bind(8, getUidOrNull(o.program()))
+                    w.bind(9, getUidOrNull(o.programStage()))
+                    w.bind(10, getUidOrNull(o.dataElement()))
+                    w.bind(11, getUidOrNull(o.trackedEntityAttribute()))
+                    w.bind(12, o.programRuleVariableSourceType())
+                }
+            }
 
-final class ProgramRuleVariableStore {
-
-    private static StatementBinder<ProgramRuleVariable> BINDER =
-            new IdentifiableStatementBinder<ProgramRuleVariable>() {
-
-        @Override
-        public void bindToStatement(@NonNull ProgramRuleVariable o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.useCodeForOptionSet());
-            w.bind(8, UidsHelper.getUidOrNull(o.program()));
-            w.bind(9, UidsHelper.getUidOrNull(o.programStage()));
-            w.bind(10, UidsHelper.getUidOrNull(o.dataElement()));
-            w.bind(11, UidsHelper.getUidOrNull(o.trackedEntityAttribute()));
-            w.bind(12, o.programRuleVariableSourceType());
-        }
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            ProgramRuleVariableTableInfo.TABLE_INFO, ProgramRuleVariableTableInfo.Columns.PROGRAM);
-
-    private ProgramRuleVariableStore() {}
-
-    static IdentifiableObjectStore<ProgramRuleVariable> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(
-                databaseAdapter, ProgramRuleVariableTableInfo.TABLE_INFO, BINDER, ProgramRuleVariable::create);
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramRuleVariableTableInfo.TABLE_INFO, ProgramRuleVariableTableInfo.Columns.PROGRAM
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt
new file mode 100644
index 0000000000..6109671464
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class ProgramSectionAttributeEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramSectionAttributeLinkStore {
+        return ProgramSectionAttributeLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: ProgramSectionAttributeLinkStore): ProgramSectionAttributeLinkHandler {
+        return ProgramSectionAttributeLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
new file mode 100644
index 0000000000..18e70d24e4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+
+internal class ProgramSectionAttributeLinkHandler(
+    store: ProgramSectionAttributeLinkStore
+) : OrderedLinkHandlerImpl<TrackedEntityAttribute, ProgramSectionAttributeLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.kt
new file mode 100644
index 0000000000..4fa407fea7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
+
+internal interface ProgramSectionAttributeLinkStore : LinkStore<ProgramSectionAttributeLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
index 64f7c5029b..5d90eb6a18 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
@@ -25,31 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo;
+internal class ProgramSectionAttributeLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramSectionAttributeLinkStore,
+    LinkStoreImpl<ProgramSectionAttributeLink>(
+        databaseAdapter,
+        ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
+        ProgramSectionAttributeLinkTableInfo.Columns.PROGRAM_SECTION,
+        BINDER,
+        { cursor: Cursor -> ProgramSectionAttributeLink.create(cursor) }
+    ) {
 
-public final class ProgramSectionAttributeLinkStore {
-
-    private static final StatementBinder<ProgramSectionAttributeLink> BINDER = (o, w) -> {
-        w.bind(1, o.programSection());
-        w.bind(2, o.attribute());
-        w.bind(3, o.sortOrder());
-    };
-
-    private ProgramSectionAttributeLinkStore() {}
-
-    public static LinkStore<ProgramSectionAttributeLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
-                ProgramSectionAttributeLinkTableInfo.Columns.PROGRAM_SECTION,
-                BINDER,
-                ProgramSectionAttributeLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramSectionAttributeLink, w: StatementWrapper ->
+            w.bind(1, o.programSection())
+            w.bind(2, o.attribute())
+            w.bind(3, o.sortOrder())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.java
deleted file mode 100644
index 8208ed30f4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramSection;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramSectionEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramSection> store(DatabaseAdapter databaseAdapter) {
-        return ProgramSectionStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<ProgramSection> handler(ProgramSectionHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<ProgramSection>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-
-        return new HashMap<String, ChildrenAppender<ProgramSection>>() {{
-            put(ProgramSectionFields.ATTRIBUTES, ProgramSectionAttributeChildrenAppender.create(databaseAdapter));
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
new file mode 100644
index 0000000000..a539ad688e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramSection
+
+@Module
+internal class ProgramSectionEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramSectionStore {
+        return ProgramSectionStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramSection>> {
+        return mapOf(
+            ProgramSectionFields.ATTRIBUTES to ProgramSectionAttributeChildrenAppender.create(databaseAdapter)
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.java
deleted file mode 100644
index 2dc10ac198..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.program.ProgramSection;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ProgramSectionHandler extends IdentifiableHandlerImpl<ProgramSection> {
-    private final OrderedLinkHandler<TrackedEntityAttribute, ProgramSectionAttributeLink>
-            programSectionAttributeLinkHandler;
-
-    @Inject
-    ProgramSectionHandler(IdentifiableObjectStore<ProgramSection> programSectionStore,
-                          OrderedLinkHandler<TrackedEntityAttribute, ProgramSectionAttributeLink>
-                                  programSectionAttributeLinkHandler) {
-        super(programSectionStore);
-        this.programSectionAttributeLinkHandler = programSectionAttributeLinkHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(ProgramSection programSection, HandleAction action) {
-        programSectionAttributeLinkHandler.handleMany(programSection.uid(), programSection.attributes(),
-                (trackedEntityAttribute, sortOrder) -> ProgramSectionAttributeLink.builder()
-                        .programSection(programSection.uid())
-                        .attribute(trackedEntityAttribute.uid())
-                        .sortOrder(sortOrder)
-                        .build());
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
index d1c211264e..a532d0c49e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
@@ -25,33 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.program.ProgramSection
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
+@Reusable
+internal class ProgramSectionHandler @Inject constructor(
+    programSectionStore: ProgramSectionStore,
+    private val programSectionAttributeLinkHandler: ProgramSectionAttributeLinkHandler
+) : IdentifiableHandlerImpl<ProgramSection>(programSectionStore) {
 
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramSectionAttributeEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<ProgramSectionAttributeLink> store(DatabaseAdapter databaseAdapter) {
-        return ProgramSectionAttributeLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public OrderedLinkHandler<TrackedEntityAttribute, ProgramSectionAttributeLink> handler(
-            LinkStore<ProgramSectionAttributeLink> store) {
-        return new OrderedLinkHandlerImpl<>(store);
+    override fun afterObjectHandled(o: ProgramSection, action: HandleAction) {
+        programSectionAttributeLinkHandler.handleMany(
+            o.uid(), o.attributes()
+        ) { trackedEntityAttribute: TrackedEntityAttribute, sortOrder: Int ->
+            ProgramSectionAttributeLink.builder()
+                .programSection(o.uid())
+                .attribute(trackedEntityAttribute.uid())
+                .sortOrder(sortOrder)
+                .build()
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStore.kt
index 6f700da612..b4a72760fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStore.kt
@@ -25,46 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.program.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramSection
-import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
-
-@Suppress("MagicNumber")
-internal object ProgramSectionStore {
-
-    private val BINDER: StatementBinder<ProgramSection> =
-        object : IdentifiableWithStyleStatementBinder<ProgramSection>() {
-            override fun bindToStatement(o: ProgramSection, w: StatementWrapper) {
-                super.bindToStatement(o, w)
-                w.bind(9, o.description())
-                w.bind(10, getUidOrNull(o.program()))
-                w.bind(11, o.sortOrder())
-                w.bind(12, o.formName())
-                w.bind(13, o.renderType()?.desktop()?.type())
-                w.bind(14, o.renderType()?.mobile()?.type())
-            }
-        }
-
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        ProgramSectionTableInfo.TABLE_INFO, ProgramSectionTableInfo.Columns.PROGRAM
-    )
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ProgramSection> {
-        return objectWithUidStore(
-            databaseAdapter,
-            ProgramSectionTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> ProgramSection.create(cursor) }
-    }
-}
+internal interface ProgramSectionStore : IdentifiableObjectStore<ProgramSection>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
new file mode 100644
index 0000000000..2f6859fb68
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramSection
+import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
+
+@Suppress("MagicNumber")
+internal class ProgramSectionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramSectionStore,
+    IdentifiableObjectStoreImpl<ProgramSection>(
+        databaseAdapter,
+        ProgramSectionTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramSection.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<ProgramSection> =
+            object : IdentifiableWithStyleStatementBinder<ProgramSection>() {
+                override fun bindToStatement(o: ProgramSection, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(9, o.description())
+                    w.bind(10, getUidOrNull(o.program()))
+                    w.bind(11, o.sortOrder())
+                    w.bind(12, o.formName())
+                    w.bind(13, o.renderType()?.desktop()?.type())
+                    w.bind(14, o.renderType()?.mobile()?.type())
+                }
+            }
+
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramSectionTableInfo.TABLE_INFO, ProgramSectionTableInfo.Columns.PROGRAM
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.java
deleted file mode 100644
index 520fe6a447..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink;
-import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkStore;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramStageAttributeValueEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<ProgramStageAttributeValueLink> store(DatabaseAdapter databaseAdapter) {
-        return ProgramStageAttributeValueLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkHandler<Attribute, ProgramStageAttributeValueLink> handler(
-            LinkStore<ProgramStageAttributeValueLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt
new file mode 100644
index 0000000000..66691b7728
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler
+import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkStore
+import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkStoreImpl
+
+@Module
+internal class ProgramStageAttributeValueEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageAttributeValueLinkStore {
+        return ProgramStageAttributeValueLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: ProgramStageAttributeValueLinkStore): ProgramStageAttributeValueLinkHandler {
+        return ProgramStageAttributeValueLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java
index 389c122356..94122e3b73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.common.internal.DataAccessFields;
 import org.hisp.dhis.android.core.program.ProgramStage;
@@ -52,12 +51,12 @@ public final class ProgramStageCall implements UidsCall<ProgramStage> {
     private static final int MAX_UID_LIST_SIZE = 64;
 
     private final ProgramStageService service;
-    private final Handler<ProgramStage> handler;
+    private final ProgramStageHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
     ProgramStageCall(ProgramStageService service,
-                     Handler<ProgramStage> handler,
+                     ProgramStageHandler handler,
                      APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.java
deleted file mode 100644
index 86830a523a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramStageDataElementEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramStageDataElement> store(DatabaseAdapter databaseAdapter) {
-        return ProgramStageDataElementStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<ProgramStageDataElement> handler(ProgramStageDataElementHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<ProgramStageDataElement>> childrenAppenders(
-            DataElementValueTypeRenderingChildrenAppender valueTypeRenderingChildrenAppender) {
-
-        return new HashMap<String, ChildrenAppender<ProgramStageDataElement>>() {{
-            put(ProgramStageDataElementFields.RENDER_TYPE, valueTypeRenderingChildrenAppender);
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
new file mode 100644
index 0000000000..2afa3ab834
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+
+@Module
+internal class ProgramStageDataElementEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageDataElementStore {
+        return ProgramStageDataElementStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(
+        valueTypeRenderingChildrenAppender: DataElementValueTypeRenderingChildrenAppender
+    ): Map<String, ChildrenAppender<ProgramStageDataElement>> {
+        return mapOf(
+            ProgramStageDataElementFields.RENDER_TYPE to valueTypeRenderingChildrenAppender
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
new file mode 100644
index 0000000000..e56319809b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler
+import org.hisp.dhis.android.core.dataelement.internal.DataElementHandler
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+
+@Reusable
+internal class ProgramStageDataElementHandler @Inject constructor(
+    programStageDataElementStore: ProgramStageDataElementStore,
+    private val dataElementHandler: DataElementHandler,
+    private val valueTypeRenderingHandler: ValueTypeRenderingHandler
+) : IdentifiableHandlerImpl<ProgramStageDataElement>(programStageDataElementStore) {
+
+    override fun afterObjectHandled(o: ProgramStageDataElement, action: HandleAction) {
+        if (o.dataElement() != null) {
+            dataElementHandler.handle(o.dataElement()!!)
+        }
+        valueTypeRenderingHandler.handle(
+            o.renderType(), o.uid(),
+            ProgramStageDataElementTableInfo.TABLE_INFO.name()
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.kt
new file mode 100644
index 0000000000..fb253032f2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+
+internal interface ProgramStageDataElementStore : IdentifiableObjectStore<ProgramStageDataElement>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
index 96dd7e42ef..d13ee36bb4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
@@ -25,45 +25,45 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo;
+@Suppress("MagicNumber")
+internal class ProgramStageDataElementStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageDataElementStore,
+    IdentifiableObjectStoreImpl<ProgramStageDataElement>(
+        databaseAdapter,
+        ProgramStageDataElementTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramStageDataElement.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-final class ProgramStageDataElementStore {
-
-    private ProgramStageDataElementStore() {}
-
-    private static StatementBinder<ProgramStageDataElement> BINDER =
-            new IdentifiableStatementBinder<ProgramStageDataElement>() {
-
-        @Override
-        public void bindToStatement(@NonNull ProgramStageDataElement programStageDataElement,
-                                    @NonNull StatementWrapper w) {
-            super.bindToStatement(programStageDataElement, w);
-            w.bind(7, programStageDataElement.displayInReports());
-            w.bind(8, UidsHelper.getUidOrNull(programStageDataElement.dataElement()));
-            w.bind(9, programStageDataElement.compulsory());
-            w.bind(10, programStageDataElement.allowProvidedElsewhere());
-            w.bind(11, programStageDataElement.sortOrder());
-            w.bind(12, programStageDataElement.allowFutureDate());
-            w.bind(13, UidsHelper.getUidOrNull(programStageDataElement.programStage()));
-
-        }
-    };
-
-    static IdentifiableObjectStore<ProgramStageDataElement> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter,
-                ProgramStageDataElementTableInfo.TABLE_INFO, BINDER, ProgramStageDataElement::create);
+    companion object {
+        private val BINDER: StatementBinder<ProgramStageDataElement> =
+            object : IdentifiableStatementBinder<ProgramStageDataElement>() {
+                override fun bindToStatement(
+                    programStageDataElement: ProgramStageDataElement,
+                    w: StatementWrapper
+                ) {
+                    super.bindToStatement(programStageDataElement, w)
+                    w.bind(7, programStageDataElement.displayInReports())
+                    w.bind(8, getUidOrNull(programStageDataElement.dataElement()))
+                    w.bind(9, programStageDataElement.compulsory())
+                    w.bind(10, programStageDataElement.allowProvidedElsewhere())
+                    w.bind(11, programStageDataElement.sortOrder())
+                    w.bind(12, programStageDataElement.allowFutureDate())
+                    w.bind(13, getUidOrNull(programStageDataElement.programStage()))
+                }
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
similarity index 52%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
index f55e0a3542..b2588f65c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
@@ -25,74 +25,70 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageSection;
-import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageSection
+import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageTableInfo
 
 @Module
-public final class ProgramStageEntityDIModule implements IdentifiableStoreProvider<ProgramStage> {
-
-    @Override
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramStage> store(DatabaseAdapter databaseAdapter) {
-        return ProgramStageStore.create(databaseAdapter);
-    }
-
+internal class ProgramStageEntityDIModule {
     @Provides
     @Reusable
-    public Handler<ProgramStage> handler(ProgramStageHandler impl) {
-        return impl;
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageStore {
+        return ProgramStageStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    OrphanCleaner<ProgramStage, ProgramStageDataElement> dataElementOrphanCleaner(
-            DatabaseAdapter databaseAdapter) {
-        return new OrphanCleanerImpl<>(ProgramStageDataElementTableInfo.TABLE_INFO.name(),
-                ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE, databaseAdapter);
+    fun dataElementOrphanCleaner(
+        databaseAdapter: DatabaseAdapter
+    ): OrphanCleaner<ProgramStage, ProgramStageDataElement> {
+        return OrphanCleanerImpl(
+            ProgramStageDataElementTableInfo.TABLE_INFO.name(),
+            ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE, databaseAdapter
+        )
     }
 
     @Provides
     @Reusable
-    OrphanCleaner<ProgramStage, ProgramStageSection> sectionOrphanCleaner(DatabaseAdapter databaseAdapter) {
-        return new OrphanCleanerImpl<>(ProgramStageSectionTableInfo.TABLE_INFO.name(),
-                        ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE, databaseAdapter);
+    fun sectionOrphanCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<ProgramStage, ProgramStageSection> {
+        return OrphanCleanerImpl(
+            ProgramStageSectionTableInfo.TABLE_INFO.name(),
+            ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE, databaseAdapter
+        )
     }
 
     @Provides
     @Reusable
-    SubCollectionCleaner<ProgramStage> stageCleaner(DatabaseAdapter databaseAdapter) {
-        return new SubCollectionCleanerImpl<>(ProgramStageTableInfo.TABLE_INFO.name(),
-                ProgramStageTableInfo.Columns.PROGRAM, databaseAdapter,
-                programStage -> programStage.program().uid());
+    fun stageCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<ProgramStage> {
+        return SubCollectionCleanerImpl(
+            ProgramStageTableInfo.TABLE_INFO.name(),
+            ProgramStageTableInfo.Columns.PROGRAM, databaseAdapter,
+            object : Transformer<ProgramStage, String> {
+                override fun transform(o: ProgramStage): String {
+                    return o.program()!!.uid()
+                }
+            }
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<ProgramStage>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<ProgramStage>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.java
deleted file mode 100644
index 05702c63d5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.AttributeValueUtils;
-import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor;
-import org.hisp.dhis.android.core.program.ProgramStageSection;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ProgramStageHandler extends IdentifiableHandlerImpl<ProgramStage> {
-    private final HandlerWithTransformer<ProgramStageSection> programStageSectionHandler;
-    private final Handler<ProgramStageDataElement> programStageDataElementHandler;
-    private final OrphanCleaner<ProgramStage, ProgramStageDataElement> programStageDataElementCleaner;
-    private final OrphanCleaner<ProgramStage, ProgramStageSection> programStageSectionCleaner;
-    private final SubCollectionCleaner<ProgramStage> programStageCleaner;
-    private final Handler<Attribute> attributeHandler;
-    private final LinkHandler<Attribute, ProgramStageAttributeValueLink>
-            programStageAttributeValueLinkHandler;
-
-    @Inject
-    ProgramStageHandler(IdentifiableObjectStore<ProgramStage> programStageStore,
-                        HandlerWithTransformer<ProgramStageSection> programStageSectionHandler,
-                        Handler<ProgramStageDataElement> programStageDataElementHandler,
-                        OrphanCleaner<ProgramStage, ProgramStageDataElement> programStageDataElementCleaner,
-                        OrphanCleaner<ProgramStage, ProgramStageSection> programStageSectionCleaner,
-                        SubCollectionCleaner<ProgramStage> programStageCleaner,
-                        Handler<Attribute> attributeHandler,
-                        LinkHandler<Attribute, ProgramStageAttributeValueLink> programStageAttributeValueLinkHandler) {
-        super(programStageStore);
-        this.programStageSectionHandler = programStageSectionHandler;
-        this.programStageDataElementHandler = programStageDataElementHandler;
-        this.programStageDataElementCleaner = programStageDataElementCleaner;
-        this.programStageSectionCleaner = programStageSectionCleaner;
-        this.programStageCleaner = programStageCleaner;
-        this.attributeHandler = attributeHandler;
-        this.programStageAttributeValueLinkHandler = programStageAttributeValueLinkHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(final ProgramStage programStage, HandleAction action) {
-        programStageDataElementHandler.handleMany(
-                ProgramStageInternalAccessor.accessProgramStageDataElements(programStage));
-
-        programStageSectionHandler.handleMany(ProgramStageInternalAccessor.accessProgramStageSections(programStage),
-                programStageSection -> programStageSection.toBuilder()
-                        .programStage(ObjectWithUid.create(programStage.uid()))
-                        .build());
-
-        if (action == HandleAction.Update) {
-            programStageDataElementCleaner.deleteOrphan(programStage,
-                    ProgramStageInternalAccessor.accessProgramStageDataElements(programStage));
-            programStageSectionCleaner.deleteOrphan(programStage,
-                    ProgramStageInternalAccessor.accessProgramStageSections(programStage));
-        }
-
-        if (programStage.attributeValues() != null){
-            final List<Attribute> attributes = AttributeValueUtils.extractAttributes(programStage.attributeValues());
-
-            attributeHandler.handleMany(attributes);
-
-            programStageAttributeValueLinkHandler.handleMany(programStage.uid(), attributes,
-                    attribute -> ProgramStageAttributeValueLink.builder()
-                            .programStage(programStage.uid())
-                            .attribute(attribute.uid())
-                            .value(AttributeValueUtils.extractValue(programStage.attributeValues(), attribute.uid()))
-                            .build());
-        }
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<ProgramStage> programStages) {
-        programStageCleaner.deleteNotPresent(programStages);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
new file mode 100644
index 0000000000..efd057191b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.AttributeValueUtils
+import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
+import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
+import org.hisp.dhis.android.core.program.ProgramStageSection
+
+@Reusable
+internal class ProgramStageHandler @Inject constructor(
+    programStageStore: ProgramStageStore,
+    private val programStageSectionHandler: ProgramStageSectionHandler,
+    private val programStageDataElementHandler: ProgramStageDataElementHandler,
+    private val programStageDataElementCleaner: OrphanCleaner<ProgramStage, ProgramStageDataElement>,
+    private val programStageSectionCleaner: OrphanCleaner<ProgramStage, ProgramStageSection>,
+    private val programStageCleaner: SubCollectionCleaner<ProgramStage>,
+    private val attributeHandler: AttributeHandler,
+    private val programStageAttributeValueLinkHandler: ProgramStageAttributeValueLinkHandler
+) : IdentifiableHandlerImpl<ProgramStage>(programStageStore) {
+
+    override fun afterObjectHandled(o: ProgramStage, action: HandleAction) {
+        programStageDataElementHandler.handleMany(
+            ProgramStageInternalAccessor.accessProgramStageDataElements(o)
+        )
+        programStageSectionHandler.handleMany(
+            ProgramStageInternalAccessor.accessProgramStageSections(o)
+        ) { programStageSection: ProgramStageSection ->
+            programStageSection.toBuilder()
+                .programStage(ObjectWithUid.create(o.uid()))
+                .build()
+        }
+
+        if (action === HandleAction.Update) {
+            programStageDataElementCleaner.deleteOrphan(
+                o,
+                ProgramStageInternalAccessor.accessProgramStageDataElements(o)
+            )
+            programStageSectionCleaner.deleteOrphan(
+                o,
+                ProgramStageInternalAccessor.accessProgramStageSections(o)
+            )
+        }
+
+        if (o.attributeValues() != null) {
+            val attributes = AttributeValueUtils.extractAttributes(o.attributeValues())
+            attributeHandler.handleMany(attributes)
+            programStageAttributeValueLinkHandler.handleMany(
+                o.uid(), attributes
+            ) { attribute: Attribute ->
+                ProgramStageAttributeValueLink.builder()
+                    .programStage(o.uid())
+                    .attribute(attribute.uid())
+                    .value(AttributeValueUtils.extractValue(o.attributeValues(), attribute.uid()))
+                    .build()
+            }
+        }
+    }
+
+    override fun afterCollectionHandled(oCollection: Collection<ProgramStage>?) {
+        programStageCleaner.deleteNotPresent(oCollection)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.java
deleted file mode 100644
index 6649c3c07d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramStageSectionDataElementEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<ProgramStageSectionDataElementLink> store(DatabaseAdapter databaseAdapter) {
-        return ProgramStageSectionDataElementLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public OrderedLinkHandler<DataElement, ProgramStageSectionDataElementLink> handler(
-            LinkStore<ProgramStageSectionDataElementLink> store) {
-        return new OrderedLinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt
new file mode 100644
index 0000000000..a4a1d7ac4d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class ProgramStageSectionDataElementEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionDataElementLinkStore {
+        return ProgramStageSectionDataElementLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(store: ProgramStageSectionDataElementLinkStore): ProgramStageSectionDataElementLinkHandler {
+        return ProgramStageSectionDataElementLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
new file mode 100644
index 0000000000..f16e546258
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
+
+internal class ProgramStageSectionDataElementLinkHandler(
+    store: ProgramStageSectionDataElementLinkStore
+) : OrderedLinkHandlerImpl<DataElement, ProgramStageSectionDataElementLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.kt
new file mode 100644
index 0000000000..0cf3e1e7dd
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
+
+internal interface ProgramStageSectionDataElementLinkStore : LinkStore<ProgramStageSectionDataElementLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
index 060f409b49..2f02fee439 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
@@ -25,31 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo;
+internal class ProgramStageSectionDataElementLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageSectionDataElementLinkStore,
+    LinkStoreImpl<ProgramStageSectionDataElementLink>(
+        databaseAdapter,
+        ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
+        ProgramStageSectionDataElementLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
+        BINDER,
+        { cursor: Cursor -> ProgramStageSectionDataElementLink.create(cursor) }
+    ) {
 
-final class ProgramStageSectionDataElementLinkStore {
-
-    private static final StatementBinder<ProgramStageSectionDataElementLink> BINDER = (o, w) -> {
-        w.bind(1, o.programStageSection());
-        w.bind(2, o.dataElement());
-        w.bind(3, o.sortOrder());
-    };
-
-    private ProgramStageSectionDataElementLinkStore() {}
-
-    static LinkStore<ProgramStageSectionDataElementLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
-                ProgramStageSectionDataElementLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
-                BINDER,
-                ProgramStageSectionDataElementLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramStageSectionDataElementLink, w: StatementWrapper ->
+            w.bind(1, o.programStageSection())
+            w.bind(2, o.dataElement())
+            w.bind(3, o.sortOrder())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.java
deleted file mode 100644
index 601ae911a0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramStageSection;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramStageSectionEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramStageSection> store(DatabaseAdapter databaseAdapter) {
-        return ProgramStageSectionStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public HandlerWithTransformer<ProgramStageSection> handler(ProgramStageSectionHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<ProgramStageSection>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-        return new HashMap<String, ChildrenAppender<ProgramStageSection>>() {{
-            put(ProgramStageSectionFields.PROGRAM_INDICATORS,
-                    ProgramStageSectionProgramIndicatorChildrenAppender.create(databaseAdapter));
-            put(ProgramStageSectionFields.DATA_ELEMENTS,
-                    ProgramStageSectionDataElementChildrenAppender.create(databaseAdapter));
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
new file mode 100644
index 0000000000..0d67200d42
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramStageSection
+
+@Module
+internal class ProgramStageSectionEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionStore {
+        return ProgramStageSectionStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramStageSection>> {
+        return mapOf(
+            ProgramStageSectionFields.PROGRAM_INDICATORS to
+                ProgramStageSectionProgramIndicatorChildrenAppender.create(databaseAdapter),
+            ProgramStageSectionFields.DATA_ELEMENTS to
+                ProgramStageSectionDataElementChildrenAppender.create(databaseAdapter)
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.java
deleted file mode 100644
index df3ffca79f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.program.ProgramIndicator;
-import org.hisp.dhis.android.core.program.ProgramStageSection;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ProgramStageSectionHandler extends IdentifiableHandlerImpl<ProgramStageSection> {
-    private final LinkHandler<ProgramIndicator, ProgramStageSectionProgramIndicatorLink>
-            programStageSectionProgramIndicatorLinkHandler;
-    private final OrderedLinkHandler<DataElement, ProgramStageSectionDataElementLink>
-            programStageSectionDataElementLinkHandler;
-
-    @Inject
-    ProgramStageSectionHandler(IdentifiableObjectStore<ProgramStageSection> programStageSectionStore,
-                               LinkHandler<ProgramIndicator, ProgramStageSectionProgramIndicatorLink>
-                                       programStageSectionProgramIndicatorLinkHandler,
-                               OrderedLinkHandler<DataElement, ProgramStageSectionDataElementLink>
-                                       programStageSectionDataElementLinkHandler) {
-        super(programStageSectionStore);
-        this.programStageSectionProgramIndicatorLinkHandler = programStageSectionProgramIndicatorLinkHandler;
-        this.programStageSectionDataElementLinkHandler = programStageSectionDataElementLinkHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(ProgramStageSection programStageSection, HandleAction action) {
-        programStageSectionDataElementLinkHandler.handleMany(
-                programStageSection.uid(),
-                programStageSection.dataElements(),
-                (dataElement, sortOrder) -> ProgramStageSectionDataElementLink.builder()
-                        .programStageSection(programStageSection.uid())
-                        .dataElement(dataElement.uid())
-                        .sortOrder(sortOrder)
-                        .build());
-
-        programStageSectionProgramIndicatorLinkHandler.handleMany(programStageSection.uid(),
-                programStageSection.programIndicators(),
-                programIndicator -> ProgramStageSectionProgramIndicatorLink.builder()
-                        .programStageSection(programStageSection.uid())
-                        .programIndicator(programIndicator.uid())
-                        .build());
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
similarity index 50%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
index 4b672abe34..a10268183f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
@@ -25,48 +25,45 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.program.ProgramStageSection
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
 
 @Reusable
-final class ProgramStageDataElementHandler extends IdentifiableHandlerImpl<ProgramStageDataElement> {
-
-    private final Handler<DataElement> dataElementHandler;
-
-    private final DictionaryTableHandler<ValueTypeRendering> valueTypeRenderingHandler;
-
-    @Inject
-    ProgramStageDataElementHandler(
-            IdentifiableObjectStore<ProgramStageDataElement> programStageDataElementStore,
-            Handler<DataElement> dataElementHandler,
-            DictionaryTableHandler<ValueTypeRendering> valueTypeRenderingHandler) {
+internal class ProgramStageSectionHandler @Inject constructor(
+    programStageSectionStore: ProgramStageSectionStore,
+    private val programStageSectionProgramIndicatorLinkHandler: ProgramStageSectionProgramIndicatorLinkHandler,
+    private val programStageSectionDataElementLinkHandler: ProgramStageSectionDataElementLinkHandler
+) : IdentifiableHandlerImpl<ProgramStageSection>(programStageSectionStore) {
 
-        super(programStageDataElementStore);
-        this.dataElementHandler = dataElementHandler;
-        this.valueTypeRenderingHandler = valueTypeRenderingHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(ProgramStageDataElement programStageDataElement, HandleAction action) {
-
-        if (programStageDataElement.dataElement() != null) {
-            dataElementHandler.handle(programStageDataElement.dataElement());
+    override fun afterObjectHandled(o: ProgramStageSection, action: HandleAction) {
+        programStageSectionDataElementLinkHandler.handleMany(
+            o.uid(),
+            o.dataElements()
+        ) { dataElement: DataElement, sortOrder: Int ->
+            ProgramStageSectionDataElementLink.builder()
+                .programStageSection(o.uid())
+                .dataElement(dataElement.uid())
+                .sortOrder(sortOrder)
+                .build()
         }
 
-        valueTypeRenderingHandler.handle(programStageDataElement.renderType(), programStageDataElement.uid(),
-                ProgramStageDataElementTableInfo.TABLE_INFO.name());
+        programStageSectionProgramIndicatorLinkHandler.handleMany(
+            o.uid(),
+            o.programIndicators()
+        ) { programIndicator: ProgramIndicator ->
+            ProgramStageSectionProgramIndicatorLink.builder()
+                .programStageSection(o.uid())
+                .programIndicator(programIndicator.uid())
+                .build()
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.java
deleted file mode 100644
index 3d5de8eb51..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.program.ProgramIndicator;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramStageSectionProgramIndicatorEntityDIModule {
-
-    @Provides
-    @Reusable
-    public LinkStore<ProgramStageSectionProgramIndicatorLink> store(DatabaseAdapter databaseAdapter) {
-        return ProgramStageSectionProgramIndicatorLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public LinkHandler<ProgramIndicator, ProgramStageSectionProgramIndicatorLink> handler(
-            LinkStore<ProgramStageSectionProgramIndicatorLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
new file mode 100644
index 0000000000..5ff4025f0a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class ProgramStageSectionProgramIndicatorEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionProgramIndicatorLinkStore {
+        return ProgramStageSectionProgramIndicatorLinkStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun handler(
+        store: ProgramStageSectionProgramIndicatorLinkStore
+    ): ProgramStageSectionProgramIndicatorLinkHandler {
+        return ProgramStageSectionProgramIndicatorLinkHandler(store)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
new file mode 100644
index 0000000000..68dda0d9ee
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
+
+internal class ProgramStageSectionProgramIndicatorLinkHandler(
+    store: ProgramStageSectionProgramIndicatorLinkStore
+) : LinkHandlerImpl<ProgramIndicator, ProgramStageSectionProgramIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.kt
new file mode 100644
index 0000000000..988b08b7cd
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
+
+internal interface ProgramStageSectionProgramIndicatorLinkStore : LinkStore<ProgramStageSectionProgramIndicatorLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
index 2eab526ad4..980cf623aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
@@ -25,30 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo;
-
-final class ProgramStageSectionProgramIndicatorLinkStore {
-
-    private static final StatementBinder<ProgramStageSectionProgramIndicatorLink> BINDER = (o, w) -> {
-        w.bind(1, o.programStageSection());
-        w.bind(2, o.programIndicator());
-    };
-
-    private ProgramStageSectionProgramIndicatorLinkStore() {}
-
-    public static LinkStore<ProgramStageSectionProgramIndicatorLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter,
-                ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
-                ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
-                BINDER,
-                ProgramStageSectionProgramIndicatorLink::create);
+internal class ProgramStageSectionProgramIndicatorLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageSectionProgramIndicatorLinkStore,
+    LinkStoreImpl<ProgramStageSectionProgramIndicatorLink>(
+        databaseAdapter,
+        ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
+        ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
+        BINDER,
+        { cursor: Cursor -> ProgramStageSectionProgramIndicatorLink.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramStageSectionProgramIndicatorLink, w: StatementWrapper ->
+            w.bind(1, o.programStageSection())
+            w.bind(2, o.programIndicator())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStore.kt
index 23315dc55c..0530e32eec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStore.kt
@@ -25,38 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.program.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramStageSection
-import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
-
-@Suppress("MagicNumber")
-internal object ProgramStageSectionStore {
-
-    private val BINDER: StatementBinder<ProgramStageSection> =
-        object : IdentifiableStatementBinder<ProgramStageSection>() {
-            override fun bindToStatement(o: ProgramStageSection, w: StatementWrapper) {
-                super.bindToStatement(o, w)
-                w.bind(7, o.sortOrder())
-                w.bind(8, getUidOrNull(o.programStage()))
-                w.bind(9, o.renderType()?.desktop()?.type())
-                w.bind(10, o.renderType()?.mobile()?.type())
-            }
-        }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ProgramStageSection> {
-        return objectWithUidStore(
-            databaseAdapter, ProgramStageSectionTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> ProgramStageSection.create(cursor) }
-    }
-}
+internal interface ProgramStageSectionStore : IdentifiableObjectStore<ProgramStageSection>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
new file mode 100644
index 0000000000..d7427b954c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramStageSection
+import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
+
+@Suppress("MagicNumber")
+internal class ProgramStageSectionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageSectionStore,
+    IdentifiableObjectStoreImpl<ProgramStageSection>(
+        databaseAdapter,
+        ProgramStageSectionTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramStageSection.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<ProgramStageSection> =
+            object : IdentifiableStatementBinder<ProgramStageSection>() {
+                override fun bindToStatement(o: ProgramStageSection, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(7, o.sortOrder())
+                    w.bind(8, getUidOrNull(o.programStage()))
+                    w.bind(9, o.renderType()?.desktop()?.type())
+                    w.bind(10, o.renderType()?.mobile()?.type())
+                }
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.java
deleted file mode 100644
index feafc509d2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.ProgramStageTableInfo;
-
-public final class ProgramStageStore {
-
-    private static StatementBinder<ProgramStage> BINDER = new IdentifiableWithStyleStatementBinder<ProgramStage>() {
-
-        @Override
-        public void bindToStatement(@NonNull ProgramStage o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(9, o.description());
-            w.bind(10, o.displayDescription());
-            w.bind(11, o.executionDateLabel());
-            w.bind(12, o.dueDateLabel());
-            w.bind(13, o.allowGenerateNextVisit());
-            w.bind(14, o.validCompleteOnly());
-            w.bind(15, o.reportDateToUse());
-            w.bind(16, o.openAfterEnrollment());
-            w.bind(17, o.repeatable());
-            w.bind(18, o.formType().name());
-            w.bind(19, o.displayGenerateEventBox());
-            w.bind(20, o.generatedByEnrollmentDate());
-            w.bind(21, o.autoGenerateEvent());
-            w.bind(22, o.sortOrder());
-            w.bind(23, o.hideDueDate());
-            w.bind(24, o.blockEntryForm());
-            w.bind(25, o.minDaysFromStart());
-            w.bind(26, o.standardInterval());
-            w.bind(27, UidsHelper.getUidOrNull(o.program()));
-            w.bind(28, o.periodType());
-            w.bind(29, o.access().data().write());
-            w.bind(30, o.remindCompleted());
-            w.bind(31, o.featureType());
-            w.bind(32, o.enableUserAssignment());
-            w.bind(33, o.validationStrategy());
-        }
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            ProgramStageTableInfo.TABLE_INFO, ProgramStageTableInfo.Columns.PROGRAM);
-
-    private ProgramStageStore() {}
-
-    public static IdentifiableObjectStore<ProgramStage> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, ProgramStageTableInfo.TABLE_INFO,
-                BINDER, ProgramStage::create);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.kt
new file mode 100644
index 0000000000..4eedd0ffc9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.ProgramStage
+
+internal interface ProgramStageStore : IdentifiableObjectStore<ProgramStage>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
new file mode 100644
index 0000000000..eaa2affebf
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
@@ -0,0 +1,87 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageTableInfo
+
+@Suppress("MagicNumber")
+internal class ProgramStageStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageStore,
+    IdentifiableObjectStoreImpl<ProgramStage>(
+        databaseAdapter,
+        ProgramStageTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramStage.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<ProgramStage> =
+            object : IdentifiableWithStyleStatementBinder<ProgramStage>() {
+                override fun bindToStatement(o: ProgramStage, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(9, o.description())
+                    w.bind(10, o.displayDescription())
+                    w.bind(11, o.executionDateLabel())
+                    w.bind(12, o.dueDateLabel())
+                    w.bind(13, o.allowGenerateNextVisit())
+                    w.bind(14, o.validCompleteOnly())
+                    w.bind(15, o.reportDateToUse())
+                    w.bind(16, o.openAfterEnrollment())
+                    w.bind(17, o.repeatable())
+                    w.bind(18, o.formType()!!.name)
+                    w.bind(19, o.displayGenerateEventBox())
+                    w.bind(20, o.generatedByEnrollmentDate())
+                    w.bind(21, o.autoGenerateEvent())
+                    w.bind(22, o.sortOrder())
+                    w.bind(23, o.hideDueDate())
+                    w.bind(24, o.blockEntryForm())
+                    w.bind(25, o.minDaysFromStart())
+                    w.bind(26, o.standardInterval())
+                    w.bind(27, getUidOrNull(o.program()))
+                    w.bind(28, o.periodType())
+                    w.bind(29, o.access().data().write())
+                    w.bind(30, o.remindCompleted())
+                    w.bind(31, o.featureType())
+                    w.bind(32, o.enableUserAssignment())
+                    w.bind(33, o.validationStrategy())
+                }
+            }
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramStageTableInfo.TABLE_INFO, ProgramStageTableInfo.Columns.PROGRAM
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.java
deleted file mode 100644
index ed32805864..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramTableInfo;
-import org.hisp.dhis.android.core.program.ProgramType;
-
-import java.util.List;
-
-import androidx.annotation.NonNull;
-
-public final class ProgramStore extends IdentifiableObjectStoreImpl<Program> implements ProgramStoreInterface {
-
-    private ProgramStore(DatabaseAdapter databaseAdapter,
-                         SQLStatementBuilderImpl statementBuilder) {
-        super(databaseAdapter, statementBuilder, BINDER, Program::create);
-    }
-    
-    private static StatementBinder<Program> BINDER = new NameableWithStyleStatementBinder<Program>() {
-        
-        @Override
-        public void bindToStatement(@NonNull Program o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(13, o.version());
-            w.bind(14, o.onlyEnrollOnce());
-            w.bind(15, o.enrollmentDateLabel());
-            w.bind(16, o.displayIncidentDate());
-            w.bind(17, o.incidentDateLabel());
-            w.bind(18, o.registration());
-            w.bind(19, o.selectEnrollmentDatesInFuture());
-            w.bind(20, o.dataEntryMethod());
-            w.bind(21, o.ignoreOverdueEvents());
-            w.bind(22, o.selectIncidentDatesInFuture());
-            w.bind(23, o.useFirstStageDuringRegistration());
-            w.bind(24, o.displayFrontPageList());
-            w.bind(25, o.programType());
-            w.bind(26, UidsHelper.getUidOrNull(o.relatedProgram()));
-            w.bind(27, UidsHelper.getUidOrNull(o.trackedEntityType()));
-            w.bind(28, o.categoryComboUid());
-            w.bind(29, o.access().data().write());
-            w.bind(30, o.expiryDays());
-            w.bind(31, o.completeEventsExpiryDays());
-            w.bind(32, o.expiryPeriodType());
-            w.bind(33, o.minAttributesRequiredToSearch());
-            w.bind(34, o.maxTeiCountToReturn());
-            w.bind(35, o.featureType());
-            w.bind(36, o.accessLevel());
-        }
-    };
-
-    public static ProgramStoreInterface create(DatabaseAdapter databaseAdapter) {
-        SQLStatementBuilderImpl statementBuilder = new SQLStatementBuilderImpl(ProgramTableInfo.TABLE_INFO.name(),
-                ProgramTableInfo.TABLE_INFO.columns());
-
-        return new ProgramStore(databaseAdapter, statementBuilder);
-    }
-
-    @Override
-    public List<String> getUidsByProgramType(ProgramType programType) throws RuntimeException {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(ProgramTableInfo.Columns.PROGRAM_TYPE, programType.toString()).build();
-        return selectStringColumnsWhereClause(IdentifiableColumns.UID, whereClause);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreInterface.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreInterface.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.kt
index 93942c8d11..c8616d60f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreInterface.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStore.kt
@@ -25,16 +25,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramType
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramType;
-
-import java.util.List;
-
-public interface ProgramStoreInterface extends IdentifiableObjectStore<Program> {
-
-    List<String> getUidsByProgramType(ProgramType programType) throws RuntimeException;
-}
\ No newline at end of file
+internal interface ProgramStore : IdentifiableObjectStore<Program> {
+    fun getUidsByProgramType(programType: ProgramType): List<String>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
new file mode 100644
index 0000000000..f789ee0e98
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramTableInfo
+import org.hisp.dhis.android.core.program.ProgramType
+
+@Suppress("MagicNumber")
+internal class ProgramStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStore,
+    IdentifiableObjectStoreImpl<Program>(
+        databaseAdapter,
+        ProgramTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Program.create(cursor) }
+    ) {
+
+    override fun getUidsByProgramType(programType: ProgramType): List<String> {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(ProgramTableInfo.Columns.PROGRAM_TYPE, programType.toString()).build()
+        return selectStringColumnsWhereClause(IdentifiableColumns.UID, whereClause)
+    }
+
+    companion object {
+        private val BINDER: StatementBinder<Program> = object : NameableWithStyleStatementBinder<Program>() {
+            override fun bindToStatement(o: Program, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(13, o.version())
+                w.bind(14, o.onlyEnrollOnce())
+                w.bind(15, o.enrollmentDateLabel())
+                w.bind(16, o.displayIncidentDate())
+                w.bind(17, o.incidentDateLabel())
+                w.bind(18, o.registration())
+                w.bind(19, o.selectEnrollmentDatesInFuture())
+                w.bind(20, o.dataEntryMethod())
+                w.bind(21, o.ignoreOverdueEvents())
+                w.bind(22, o.selectIncidentDatesInFuture())
+                w.bind(23, o.useFirstStageDuringRegistration())
+                w.bind(24, o.displayFrontPageList())
+                w.bind(25, o.programType())
+                w.bind(26, getUidOrNull(o.relatedProgram()))
+                w.bind(27, getUidOrNull(o.trackedEntityType()))
+                w.bind(28, o.categoryComboUid())
+                w.bind(29, o.access().data().write())
+                w.bind(30, o.expiryDays())
+                w.bind(31, o.completeEventsExpiryDays())
+                w.bind(32, o.expiryPeriodType())
+                w.bind(33, o.minAttributesRequiredToSearch())
+                w.bind(34, o.maxTeiCountToReturn())
+                w.bind(35, o.featureType())
+                w.bind(36, o.accessLevel())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.java
deleted file mode 100644
index ed4af387bb..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramTrackedEntityAttributeEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<ProgramTrackedEntityAttribute> store(DatabaseAdapter databaseAdapter) {
-        return ProgramTrackedEntityAttributeStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<ProgramTrackedEntityAttribute> handler(ProgramTrackedEntityAttributeHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<ProgramTrackedEntityAttribute>> childrenAppenders(
-            ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender valueTypeRenderingChildrenAppender) {
-
-        return new HashMap<String, ChildrenAppender<ProgramTrackedEntityAttribute>>() {{
-            put(ProgramTrackedEntityAttributeFields.RENDER_TYPE, valueTypeRenderingChildrenAppender);
-        }};
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
new file mode 100644
index 0000000000..ccf931bbf8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+
+@Module
+internal class ProgramTrackedEntityAttributeEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ProgramTrackedEntityAttributeStore {
+        return ProgramTrackedEntityAttributeStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(
+        valueTypeRenderingChildrenAppender: ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender
+    ): Map<String, ChildrenAppender<ProgramTrackedEntityAttribute>> {
+        return mapOf(
+            ProgramTrackedEntityAttributeFields.RENDER_TYPE to valueTypeRenderingChildrenAppender
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostNoteStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostNoteStore.kt
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
index de7d7ce8b9..f9fe504062 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostNoteStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
@@ -25,29 +25,27 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event.internal
+package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.common.DataColumns
-import org.hisp.dhis.android.core.common.State
-import org.hisp.dhis.android.core.note.Note
-import org.hisp.dhis.android.core.note.NoteTableInfo
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 
 @Reusable
-internal class EventPostNoteStore @Inject internal constructor(
-    private val noteStore: IdentifiableObjectStore<Note>
-) {
-
-    fun queryNotes(): List<Note> {
-        val whereNotesClause = WhereClauseBuilder()
-            .appendInKeyStringValues(
-                DataColumns.SYNC_STATE, State.uploadableStatesIncludingError().map { it.name }
+internal class ProgramTrackedEntityAttributeHandler @Inject constructor(
+    store: ProgramTrackedEntityAttributeStore,
+    private val renderTypeHandler: ValueTypeRenderingHandler
+) : IdentifiableHandlerImpl<ProgramTrackedEntityAttribute>(store) {
+    override fun afterObjectHandled(o: ProgramTrackedEntityAttribute, action: HandleAction) {
+        if (action !== HandleAction.Delete) {
+            renderTypeHandler.handle(
+                o.renderType(), o.uid(),
+                ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name()
             )
-            .appendKeyStringValue(NoteTableInfo.Columns.NOTE_TYPE, Note.NoteType.EVENT_NOTE)
-            .build()
-        return noteStore.selectWhere(whereNotesClause)
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.kt
new file mode 100644
index 0000000000..7db96b9ce7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+
+internal interface ProgramTrackedEntityAttributeStore : IdentifiableObjectStore<ProgramTrackedEntityAttribute>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
index 3b831aed5c..8279353fbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
@@ -25,48 +25,49 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
+@Suppress("MagicNumber")
+internal class ProgramTrackedEntityAttributeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramTrackedEntityAttributeStore,
+    IdentifiableObjectStoreImpl<ProgramTrackedEntityAttribute>(
+        databaseAdapter,
+        ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramTrackedEntityAttribute.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<ProgramTrackedEntityAttribute> =
+            object : NameableStatementBinder<ProgramTrackedEntityAttribute>() {
+                override fun bindToStatement(
+                    o: ProgramTrackedEntityAttribute,
+                    w: StatementWrapper
+                ) {
+                    super.bindToStatement(o, w)
+                    w.bind(11, o.mandatory())
+                    w.bind(12, getUidOrNull(o.trackedEntityAttribute()))
+                    w.bind(13, o.allowFutureDate())
+                    w.bind(14, o.displayInList())
+                    w.bind(15, getUidOrNull(o.program()))
+                    w.bind(16, o.sortOrder())
+                    w.bind(17, o.searchable())
+                }
+            }
 
-import androidx.annotation.NonNull;
-
-public final class ProgramTrackedEntityAttributeStore {
-
-    private static StatementBinder<ProgramTrackedEntityAttribute> BINDER
-            = new NameableStatementBinder<ProgramTrackedEntityAttribute>() {
-
-        @Override
-        public void bindToStatement(@NonNull ProgramTrackedEntityAttribute o,
-                                    @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(11, o.mandatory());
-            w.bind(12, UidsHelper.getUidOrNull(o.trackedEntityAttribute()));
-            w.bind(13, o.allowFutureDate());
-            w.bind(14, o.displayInList());
-            w.bind(15, UidsHelper.getUidOrNull(o.program()));
-            w.bind(16, o.sortOrder());
-            w.bind(17, o.searchable());
-        }
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            ProgramTrackedEntityAttributeTableInfo.TABLE_INFO, ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM);
-
-    private ProgramTrackedEntityAttributeStore() {}
-
-    public static IdentifiableObjectStore<ProgramTrackedEntityAttribute> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
-                BINDER, ProgramTrackedEntityAttribute::create);
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ProgramTrackedEntityAttributeTableInfo.TABLE_INFO, ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java
index 3b2b37da52..3b56de905a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java
@@ -27,9 +27,8 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
 import org.hisp.dhis.android.core.common.ValueTypeRendering;
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
 
 import javax.inject.Inject;
@@ -42,7 +41,7 @@ final class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender
 
     @Inject
     ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender(
-            ObjectWithoutUidStore<ValueTypeDeviceRendering> store) {
+            ValueTypeDeviceRenderingStore store) {
         super(store);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java
index 2a8e0a9171..fe0f9d583a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.program.Program;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore;
 
 import javax.inject.Inject;
 
@@ -39,10 +39,10 @@
 @Reusable
 final class ProgramTrackedEntityTypeChildrenAppender extends ChildrenAppender<Program> {
 
-    private final IdentifiableObjectStore<TrackedEntityType> store;
+    private final TrackedEntityTypeStore store;
 
     @Inject
-    ProgramTrackedEntityTypeChildrenAppender(IdentifiableObjectStore<TrackedEntityType> store) {
+    ProgramTrackedEntityTypeChildrenAppender(TrackedEntityTypeStore store) {
         this.store = store;
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
index 689dcbfc13..bb83843808 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
@@ -29,33 +29,33 @@ package org.hisp.dhis.android.core.program.programindicatorengine.internal
 
 import java.util.*
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.constant.internal.ConstantStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventCollectionRepository
-import org.hisp.dhis.android.core.program.ProgramIndicator
-import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 
 internal class ProgramIndicatorEngineImpl @Inject constructor(
-    private val programIndicatorStore: IdentifiableObjectStore<ProgramIndicator>,
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    private val programIndicatorStore: ProgramIndicatorStore,
+    private val dataElementStore: DataElementStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventRepository: EventCollectionRepository,
     private val programRepository: ProgramStageCollectionRepository,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
-    private val constantStore: IdentifiableObjectStore<Constant>,
-    private val programStageStore: IdentifiableObjectStore<ProgramStage>
+    private val constantStore: ConstantStore,
+    private val programStageStore: ProgramStageStore
 ) : ProgramIndicatorEngine {
 
     @Deprecated("Deprecated in Java")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
index 09d14874c1..2d430916ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
@@ -35,25 +35,30 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsService
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.AnalyticsEvaluatorHelper
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ProgramIndicatorEvaluatorHelper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.common.AnalyticsType
 import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.constant.internal.ConstantStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.event.EventTableInfo
-import org.hisp.dhis.android.core.parser.internal.expression.*
+import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
+import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitorScope
+import org.hisp.dhis.android.core.parser.internal.expression.CommonParser
+import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItemMethod
+import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
+import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.enrollment
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.event
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.literal.ProgramIndicatorSQLLiteral
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.antlr.Parser
 
 @Reusable
 internal class ProgramIndicatorSQLExecutor @Inject constructor(
-    private val constantStore: IdentifiableObjectStore<Constant>,
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    private val constantStore: ConstantStore,
+    private val dataElementStore: DataElementStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val databaseAdapter: DatabaseAdapter
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.java
index c059dfb13e..1ec960fcc0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.programstageworkinglist;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -40,6 +39,7 @@
 import org.hisp.dhis.android.core.event.EventStatus;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageQueryCriteriaFields;
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStore;
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListTableInfo.Columns;
 
 import java.util.Map;
@@ -55,7 +55,7 @@ public final class ProgramStageWorkingListCollectionRepository
 
     @Inject
     ProgramStageWorkingListCollectionRepository(
-            final IdentifiableObjectStore<ProgramStageWorkingList> store,
+            final ProgramStageWorkingListStore store,
             final Map<String, ChildrenAppender<ProgramStageWorkingList>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt
index 1ab7ffda58..a132bbe847 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt
@@ -53,7 +53,7 @@ internal class ProgramStageWorkingListAttributeValueFilterChildrenAppender priva
             return ProgramStageWorkingListAttributeValueFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    ProgramStageWorkingListAttributeValueFilterStore.CHILD_PROJECTION
+                    ProgramStageWorkingListAttributeValueFilterStoreImpl.CHILD_PROJECTION
                 ) { cursor: Cursor -> ProgramStageWorkingListAttributeValueFilter.create(cursor) }
             )
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
index 7077ce9480..87c608b345 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
@@ -31,25 +31,21 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
 
 @Module
 internal class ProgramStageWorkingListAttributeValueFilterEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramStageWorkingListAttributeValueFilter> {
-        return ProgramStageWorkingListAttributeValueFilterStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageWorkingListAttributeValueFilterStore {
+        return ProgramStageWorkingListAttributeValueFilterStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
     fun handler(
-        store: ObjectWithoutUidStore<ProgramStageWorkingListAttributeValueFilter>
-    ): HandlerWithTransformer<ProgramStageWorkingListAttributeValueFilter> {
-        return ObjectWithoutUidHandlerImpl(store)
+        store: ProgramStageWorkingListAttributeValueFilterStore
+    ): ProgramStageWorkingListAttributeValueFilterHandler {
+        return ProgramStageWorkingListAttributeValueFilterHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
new file mode 100644
index 0000000000..c34f54b3eb
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.programstageworkinglist.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
+
+internal class ProgramStageWorkingListAttributeValueFilterHandler(
+    store: ProgramStageWorkingListAttributeValueFilterStore
+) : ObjectWithoutUidHandlerImpl<ProgramStageWorkingListAttributeValueFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStore.kt
index b8918a842c..044a352f09 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStore.kt
@@ -25,55 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
-import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
 
-@Suppress("MagicNumber")
-internal object ProgramStageWorkingListAttributeValueFilterStore {
-    private val BINDER = StatementBinder { o: ProgramStageWorkingListAttributeValueFilter, w: StatementWrapper ->
-        w.bindNull(1)
-        w.bindNull(2)
-        w.bindNull(3)
-        w.bind(4, o.attribute())
-        w.bind(5, o.programStageWorkingList())
-        w.bind(6, o.sw())
-        w.bind(7, o.ew())
-        w.bind(8, o.le())
-        w.bind(9, o.ge())
-        w.bind(10, o.gt())
-        w.bind(11, o.lt())
-        w.bind(12, o.eq())
-        w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
-        w.bind(14, o.like())
-        w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListAttributeValueFilter, _ -> }
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListAttributeValueFilter, _ -> }
-
-    @JvmField
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        ItemFilterTableInfo.TABLE_INFO,
-        ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST
-    )
-
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramStageWorkingListAttributeValueFilter> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            ItemFilterTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { ProgramStageWorkingListAttributeValueFilter.create(it) }
-    }
-}
+internal interface ProgramStageWorkingListAttributeValueFilterStore :
+    ObjectWithoutUidStore<ProgramStageWorkingListAttributeValueFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
new file mode 100644
index 0000000000..4a0b78a50f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.programstageworkinglist.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
+
+@Suppress("MagicNumber")
+internal class ProgramStageWorkingListAttributeValueFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageWorkingListAttributeValueFilterStore,
+    ObjectWithoutUidStoreImpl<ProgramStageWorkingListAttributeValueFilter>(
+        databaseAdapter,
+        ItemFilterTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { ProgramStageWorkingListAttributeValueFilter.create(it) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramStageWorkingListAttributeValueFilter, w: StatementWrapper ->
+            w.bindNull(1)
+            w.bindNull(2)
+            w.bindNull(3)
+            w.bind(4, o.attribute())
+            w.bind(5, o.programStageWorkingList())
+            w.bind(6, o.sw())
+            w.bind(7, o.ew())
+            w.bind(8, o.le())
+            w.bind(9, o.ge())
+            w.bind(10, o.gt())
+            w.bind(11, o.lt())
+            w.bind(12, o.eq())
+            w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
+            w.bind(14, o.like())
+            w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListAttributeValueFilter, _ -> }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListAttributeValueFilter, _ -> }
+
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ItemFilterTableInfo.TABLE_INFO,
+            ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
index 1e9f2b00b5..3079441a56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
@@ -32,7 +32,6 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -41,7 +40,7 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 @Reusable
 internal class ProgramStageWorkingListCall @Inject internal constructor(
     private val service: ProgramStageWorkingListService,
-    private val handler: Handler<ProgramStageWorkingList>,
+    private val handler: ProgramStageWorkingListHandler,
     private val apiDownloader: APIDownloader,
     private val versionManager: DHISVersionManager
 ) : UidsCall<ProgramStageWorkingList> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt
index 867ecc1668..957edd76a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt
@@ -51,7 +51,7 @@ internal class ProgramStageWorkingListDataFilterChildrenAppender private constru
             return ProgramStageWorkingListDataFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    ProgramStageWorkingListEventDataFilterStore.CHILD_PROJECTION
+                    ProgramStageWorkingListEventDataFilterStoreImpl.CHILD_PROJECTION
                 ) { cursor: Cursor -> ProgramStageWorkingListEventDataFilter.create(cursor) }
             )
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
index 59c2f64661..599a069f2c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import retrofit2.Retrofit
@@ -42,14 +40,8 @@ internal class ProgramStageWorkingListEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ProgramStageWorkingList> {
-        return ProgramStageWorkingListStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(impl: ProgramStageWorkingListHandler): Handler<ProgramStageWorkingList> {
-        return impl
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageWorkingListStore {
+        return ProgramStageWorkingListStoreImpl(databaseAdapter)
     }
 
     @Reusable
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt
index d33d84d34e..ffc0529db5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt
@@ -31,25 +31,19 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
 
 @Module
 internal class ProgramStageWorkingListEventDataFilterEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramStageWorkingListEventDataFilter> {
-        return ProgramStageWorkingListEventDataFilterStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): ProgramStageWorkingListEventDataFilterStore {
+        return ProgramStageWorkingListEventDataFilterStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(
-        store: ObjectWithoutUidStore<ProgramStageWorkingListEventDataFilter>
-    ): HandlerWithTransformer<ProgramStageWorkingListEventDataFilter> {
-        return ObjectWithoutUidHandlerImpl(store)
+    fun handler(store: ProgramStageWorkingListEventDataFilterStore): ProgramStageWorkingListEventDataFilterHandler {
+        return ProgramStageWorkingListEventDataFilterHandler(store)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
new file mode 100644
index 0000000000..e84abf6871
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.programstageworkinglist.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
+
+internal class ProgramStageWorkingListEventDataFilterHandler(
+    store: ProgramStageWorkingListEventDataFilterStore
+) : ObjectWithoutUidHandlerImpl<ProgramStageWorkingListEventDataFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStore.kt
index ae03656048..070ecb7856 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStore.kt
@@ -25,55 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
-import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
 
-@Suppress("MagicNumber")
-internal object ProgramStageWorkingListEventDataFilterStore {
-    private val BINDER = StatementBinder { o: ProgramStageWorkingListEventDataFilter, w: StatementWrapper ->
-        w.bindNull(1)
-        w.bind(2, o.dataItem())
-        w.bindNull(3)
-        w.bindNull(4)
-        w.bind(5, o.programStageWorkingList())
-        w.bindNull(6)
-        w.bindNull(7)
-        w.bind(8, o.le())
-        w.bind(9, o.ge())
-        w.bind(10, o.gt())
-        w.bind(11, o.lt())
-        w.bind(12, o.eq())
-        w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
-        w.bind(14, o.like())
-        w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListEventDataFilter, _ -> }
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListEventDataFilter, _ -> }
-
-    @JvmField
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        ItemFilterTableInfo.TABLE_INFO,
-        ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST
-    )
-
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramStageWorkingListEventDataFilter> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            ItemFilterTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { ProgramStageWorkingListEventDataFilter.create(it) }
-    }
-}
+internal interface ProgramStageWorkingListEventDataFilterStore :
+    ObjectWithoutUidStore<ProgramStageWorkingListEventDataFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
new file mode 100644
index 0000000000..eb3b00ea61
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.programstageworkinglist.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
+
+@Suppress("MagicNumber")
+internal class ProgramStageWorkingListEventDataFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageWorkingListEventDataFilterStore,
+    ObjectWithoutUidStoreImpl<ProgramStageWorkingListEventDataFilter>(
+        databaseAdapter,
+        ItemFilterTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { ProgramStageWorkingListEventDataFilter.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramStageWorkingListEventDataFilter, w: StatementWrapper ->
+            w.bindNull(1)
+            w.bind(2, o.dataItem())
+            w.bindNull(3)
+            w.bindNull(4)
+            w.bind(5, o.programStageWorkingList())
+            w.bindNull(6)
+            w.bindNull(7)
+            w.bind(8, o.le())
+            w.bind(9, o.ge())
+            w.bind(10, o.gt())
+            w.bind(11, o.lt())
+            w.bind(12, o.eq())
+            w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
+            w.bind(14, o.like())
+            w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListEventDataFilter, _ -> }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: ProgramStageWorkingListEventDataFilter, _ -> }
+
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ItemFilterTableInfo.TABLE_INFO,
+            ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
index 89e5630e48..de920fc3e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
@@ -29,19 +29,15 @@ package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
 
 @Reusable
 internal class ProgramStageWorkingListHandler @Inject constructor(
-    store: IdentifiableObjectStore<ProgramStageWorkingList>,
-    private val eventDataFilterHandler: HandlerWithTransformer<ProgramStageWorkingListEventDataFilter>,
-    private val attributeValueFilterHandler: HandlerWithTransformer<ProgramStageWorkingListAttributeValueFilter>
+    store: ProgramStageWorkingListStore,
+    private val eventDataFilterHandler: ProgramStageWorkingListEventDataFilterHandler,
+    private val attributeValueFilterHandler: ProgramStageWorkingListAttributeValueFilterHandler
 ) : IdentifiableHandlerImpl<ProgramStageWorkingList>(store) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStore.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStore.kt
index 0009669d75..19dadcb8e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStore.kt
@@ -25,55 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 
-@Suppress("MagicNumber")
-internal object ProgramStageWorkingListStore {
-    private val BINDER: StatementBinder<ProgramStageWorkingList> =
-        object : IdentifiableStatementBinder<ProgramStageWorkingList>() {
-            override fun bindToStatement(o: ProgramStageWorkingList, w: StatementWrapper) {
-                super.bindToStatement(o, w)
-                w.bind(7, o.description())
-                w.bind(8, o.program()?.uid())
-                w.bind(9, o.programStage()?.uid())
-                w.bind(10, o.programStageQueryCriteria()?.eventStatus())
-                w.bind(
-                    11,
-                    DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventCreatedAt())
-                )
-                w.bind(12, DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventOccurredAt()))
-                w.bind(13, DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventScheduledAt()))
-                w.bind(14, o.programStageQueryCriteria()?.enrollmentStatus())
-                w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrolledAt()))
-                w.bind(
-                    16,
-                    DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrollmentOccurredAt())
-                )
-                w.bind(17, o.programStageQueryCriteria()?.order())
-                w.bind(18, StringListColumnAdapter.serialize(o.programStageQueryCriteria()?.displayColumnOrder()))
-                w.bind(19, o.programStageQueryCriteria()?.orgUnit())
-                w.bind(20, o.programStageQueryCriteria()?.ouMode())
-                w.bind(21, o.programStageQueryCriteria()?.assignedUserMode())
-            }
-        }
-
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ProgramStageWorkingList> {
-        return objectWithUidStore(
-            databaseAdapter,
-            ProgramStageWorkingListTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> ProgramStageWorkingList.create(cursor) }
-    }
-}
+internal interface ProgramStageWorkingListStore : IdentifiableObjectStore<ProgramStageWorkingList>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
new file mode 100644
index 0000000000..c4de42429e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.programstageworkinglist.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+
+@Suppress("MagicNumber")
+internal class ProgramStageWorkingListStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramStageWorkingListStore,
+    IdentifiableObjectStoreImpl<ProgramStageWorkingList>(
+        databaseAdapter,
+        ProgramStageWorkingListTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ProgramStageWorkingList.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<ProgramStageWorkingList> =
+            object : IdentifiableStatementBinder<ProgramStageWorkingList>() {
+                override fun bindToStatement(o: ProgramStageWorkingList, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(7, o.description())
+                    w.bind(8, o.program()?.uid())
+                    w.bind(9, o.programStage()?.uid())
+                    w.bind(10, o.programStageQueryCriteria()?.eventStatus())
+                    w.bind(
+                        11,
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventCreatedAt())
+                    )
+                    w.bind(
+                        12,
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventOccurredAt())
+                    )
+                    w.bind(
+                        13,
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventScheduledAt())
+                    )
+                    w.bind(14, o.programStageQueryCriteria()?.enrollmentStatus())
+                    w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrolledAt()))
+                    w.bind(
+                        16,
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrollmentOccurredAt())
+                    )
+                    w.bind(17, o.programStageQueryCriteria()?.order())
+                    w.bind(18, StringListColumnAdapter.serialize(o.programStageQueryCriteria()?.displayColumnOrder()))
+                    w.bind(19, o.programStageQueryCriteria()?.orgUnit())
+                    w.bind(20, o.programStageQueryCriteria()?.ouMode())
+                    w.bind(21, o.programStageQueryCriteria()?.assignedUserMode())
+                }
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
index e56ece99b5..70373a4ee8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.relationship
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -44,11 +43,12 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollecti
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollectionRepositoryHelper.availableForEventRawQuery
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollectionRepositoryHelper.availableForTrackedEntityInstanceRawQuery
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeFields
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 
 @Reusable
 class RelationshipTypeCollectionRepository @Inject internal constructor(
-    store: IdentifiableObjectStore<RelationshipType>,
+    store: RelationshipTypeStore,
     private val teiStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
@@ -58,7 +58,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
     store,
     childrenAppenders,
     scope,
-    FilterConnectorFactory<RelationshipTypeCollectionRepository>(scope) { s: RepositoryScope ->
+    FilterConnectorFactory(scope) { s: RepositoryScope ->
         RelationshipTypeCollectionRepository(
             store, teiStore, enrollmentStore, eventStore,
             childrenAppenders, s
@@ -147,8 +147,10 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
         return when (relationshipEntityType) {
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE ->
                 RelationshipConstraintTableInfo.Columns.TRACKED_ENTITY_TYPE
+
             RelationshipEntityType.PROGRAM_INSTANCE ->
                 RelationshipConstraintTableInfo.Columns.PROGRAM
+
             RelationshipEntityType.PROGRAM_STAGE_INSTANCE ->
                 RelationshipConstraintTableInfo.Columns.PROGRAM_STAGE
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java
index e87f125572..4db9cdc984 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.relationship.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.relationship.RelationshipConstraint;
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType;
@@ -38,11 +37,11 @@
 
 final class RelationshipConstraintChildrenAppender extends ChildrenAppender<RelationshipType> {
 
-    private final ObjectWithoutUidStore<RelationshipConstraint> constraintStore;
+    private final RelationshipConstraintStore constraintStore;
     private List<RelationshipConstraint> constraints;
 
 
-    RelationshipConstraintChildrenAppender(ObjectWithoutUidStore<RelationshipConstraint> constraintStore) {
+    RelationshipConstraintChildrenAppender(RelationshipConstraintStore constraintStore) {
         this.constraintStore = constraintStore;
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.java
deleted file mode 100644
index 8755f9304f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraint;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class RelationshipConstraintEntityDIModule {
-
-    @Provides
-    @Reusable
-    ObjectWithoutUidStore<RelationshipConstraint> store(DatabaseAdapter databaseAdapter) {
-        return RelationshipConstraintStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<RelationshipConstraint> handler(ObjectWithoutUidStore<RelationshipConstraint> store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt
index 08a0323ae3..597d5d3b16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt
@@ -25,23 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.trackedentity.ReservedValueSetting;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Module
-public final class ReservedValueSettingDIModule {
+internal class RelationshipConstraintEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): RelationshipConstraintStore {
+        return RelationshipConstraintStoreImpl(databaseAdapter)
+    }
 
     @Provides
     @Reusable
-    IdentifiableObjectStore<ReservedValueSetting> store(DatabaseAdapter databaseAdapter) {
-        return ReservedValueSettingStore.create(databaseAdapter);
+    fun handler(store: RelationshipConstraintStore): RelationshipConstraintHandler {
+        return RelationshipConstraintHandler(store)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
new file mode 100644
index 0000000000..bec5ff2c6e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.relationship.RelationshipConstraint
+
+internal class RelationshipConstraintHandler(
+    store: RelationshipConstraintStore
+) : ObjectWithoutUidHandlerImpl<RelationshipConstraint>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStore.kt
similarity index 85%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStore.kt
index 9cc93acdb0..d9176cd857 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/di/internal/ObjectWithoutUidEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStore.kt
@@ -26,11 +26,9 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.arch.di.internal;
+package org.hisp.dhis.android.core.relationship.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.relationship.RelationshipConstraint
 
-public interface ObjectWithoutUidEntityDIModule<O> extends ObjectWithoutUidStoreProvider<O> {
-    Handler<O> handler(ObjectWithoutUidStore<O> store);
-}
\ No newline at end of file
+internal interface RelationshipConstraintStore : ObjectWithoutUidStore<RelationshipConstraint>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
index eaa01e6bae..8dcd25e176 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
@@ -25,43 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.relationship.RelationshipConstraint
+import org.hisp.dhis.android.core.relationship.RelationshipConstraintTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraint;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraintTableInfo;
+internal class RelationshipConstraintStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : RelationshipConstraintStore,
+    ObjectWithoutUidStoreImpl<RelationshipConstraint>(
+        databaseAdapter,
+        RelationshipConstraintTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> RelationshipConstraint.create(cursor) }
+    ) {
 
-public final class RelationshipConstraintStore {
-
-    private static final StatementBinder<RelationshipConstraint> BINDER = (o, w) -> {
-        w.bind(1, UidsHelper.getUidOrNull(o.relationshipType()));
-        w.bind(2, o.constraintType());
-        w.bind(3, o.relationshipEntity());
-        w.bind(4, UidsHelper.getUidOrNull(o.trackedEntityType()));
-        w.bind(5, UidsHelper.getUidOrNull(o.program()));
-        w.bind(6, UidsHelper.getUidOrNull(o.programStage()));
-    };
-
-    private static final WhereStatementBinder<RelationshipConstraint> WHERE_UPDATE_BINDER = (o, w) -> {
-        w.bind(7, UidsHelper.getUidOrNull(o.relationshipType()));
-        w.bind(8, o.constraintType());
-    };
-
-    private static final WhereStatementBinder<RelationshipConstraint> WHERE_DELETE_BINDER = (o, w) -> {
-        w.bind(1, UidsHelper.getUidOrNull(o.relationshipType()));
-        w.bind(2, o.constraintType());
-    };
-
-    private RelationshipConstraintStore() {}
-
-    public static ObjectWithoutUidStore<RelationshipConstraint> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, RelationshipConstraintTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, RelationshipConstraint::create);
+    companion object {
+        private val BINDER = StatementBinder { o: RelationshipConstraint, w: StatementWrapper ->
+            w.bind(1, getUidOrNull(o.relationshipType()))
+            w.bind(2, o.constraintType())
+            w.bind(3, o.relationshipEntity())
+            w.bind(4, getUidOrNull(o.trackedEntityType()))
+            w.bind(5, getUidOrNull(o.program()))
+            w.bind(6, getUidOrNull(o.programStage()))
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: RelationshipConstraint, w: StatementWrapper ->
+            w.bind(7, getUidOrNull(o.relationshipType()))
+            w.bind(8, o.constraintType())
+        }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { o: RelationshipConstraint, w: StatementWrapper ->
+            w.bind(1, getUidOrNull(o.relationshipType()))
+            w.bind(2, o.constraintType())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java
index 30797805f2..2a41447430 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.relationship.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.relationship.BaseRelationship;
 import org.hisp.dhis.android.core.relationship.Relationship;
 import org.hisp.dhis.android.core.relationship.RelationshipHelper;
@@ -50,10 +49,10 @@
 @Reusable
 public class RelationshipDHISVersionManager {
 
-    private final IdentifiableObjectStore<RelationshipType> relationshipTypeStore;
+    private final RelationshipTypeStore relationshipTypeStore;
 
     @Inject
-    public RelationshipDHISVersionManager(IdentifiableObjectStore<RelationshipType> relationshipTypeStore) {
+    public RelationshipDHISVersionManager(RelationshipTypeStore relationshipTypeStore) {
         this.relationshipTypeStore = relationshipTypeStore;
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
new file mode 100644
index 0000000000..8831d0096a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.relationship.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.RelationshipFields
+
+@Module
+internal class RelationshipEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): RelationshipStore {
+        return RelationshipStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(
+        itemChildrenAppender: RelationshipItemChildrenAppender
+    ): Map<String, ChildrenAppender<Relationship>> {
+        return mapOf(
+            RelationshipFields.ITEMS to itemChildrenAppender
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
index 884004d47a..560a5e3641 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
@@ -27,12 +27,63 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 
-internal interface RelationshipHandler : HandlerWithTransformer<Relationship> {
-    fun doesRelationshipExist(relationship: Relationship): Boolean
-    fun doesRelationshipItemExist(item: RelationshipItem): Boolean
-    fun deleteLinkedRelationships(entityUid: String)
+@Reusable
+internal class RelationshipHandler @Inject constructor(
+    relationshipStore: RelationshipStore,
+    private val relationshipItemStore: RelationshipItemStore,
+    private val relationshipItemHandler: RelationshipItemHandler,
+    private val storeSelector: RelationshipItemElementStoreSelector
+) : IdentifiableHandlerImpl<Relationship>(relationshipStore) {
+
+    override fun afterObjectHandled(o: Relationship, action: HandleAction) {
+        relationshipItemHandler.handle(
+            o.from()!!.toBuilder()
+                .relationship(ObjectWithUid.create(o.uid()))
+                .relationshipItemType(RelationshipConstraintType.FROM).build()
+        )
+        relationshipItemHandler.handle(
+            o.to()!!.toBuilder()
+                .relationship(ObjectWithUid.create(o.uid()))
+                .relationshipItemType(RelationshipConstraintType.TO).build()
+        )
+    }
+
+    fun doesRelationshipExist(relationship: Relationship): Boolean {
+        return getExistingRelationshipUid(relationship) != null
+    }
+
+    fun doesRelationshipItemExist(item: RelationshipItem): Boolean {
+        return storeSelector.getElementStore(item).exists(item.elementUid())
+    }
+
+    fun deleteLinkedRelationships(entityUid: String) {
+        relationshipItemStore.getByEntityUid(entityUid)
+            .mapNotNull { it.relationship()?.uid() }
+            .distinct()
+            .forEach { store.deleteIfExists(it) }
+    }
+
+    private fun getExistingRelationshipUid(relationship: Relationship): String? {
+        val existingRelationshipUidsForPair = relationshipItemStore.getRelationshipUidsForItems(
+            relationship.from()!!, relationship.to()!!
+        )
+        for (existingRelationshipUid in existingRelationshipUidsForPair) {
+            val existingRelationship = store.selectByUid(existingRelationshipUid)
+            if (existingRelationship != null && relationship.relationshipType()
+                == existingRelationship.relationshipType()
+            ) {
+                return existingRelationship.uid()
+            }
+        }
+        return null
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerImpl.kt
deleted file mode 100644
index 4cc30ec580..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerImpl.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal
-
-import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.relationship.Relationship
-import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
-import org.hisp.dhis.android.core.relationship.RelationshipItem
-
-@Reusable
-internal class RelationshipHandlerImpl @Inject constructor(
-    relationshipStore: RelationshipStore,
-    private val relationshipItemStore: RelationshipItemStore,
-    private val relationshipItemHandler: Handler<RelationshipItem>,
-    private val storeSelector: RelationshipItemElementStoreSelector
-) : IdentifiableHandlerImpl<Relationship>(relationshipStore), RelationshipHandler {
-
-    override fun afterObjectHandled(o: Relationship, action: HandleAction) {
-        relationshipItemHandler.handle(
-            o.from()!!.toBuilder()
-                .relationship(ObjectWithUid.create(o.uid()))
-                .relationshipItemType(RelationshipConstraintType.FROM).build()
-        )
-        relationshipItemHandler.handle(
-            o.to()!!.toBuilder()
-                .relationship(ObjectWithUid.create(o.uid()))
-                .relationshipItemType(RelationshipConstraintType.TO).build()
-        )
-    }
-
-    override fun doesRelationshipExist(relationship: Relationship): Boolean {
-        return getExistingRelationshipUid(relationship) != null
-    }
-
-    override fun doesRelationshipItemExist(item: RelationshipItem): Boolean {
-        return storeSelector.getElementStore(item).exists(item.elementUid())
-    }
-
-    override fun deleteLinkedRelationships(entityUid: String) {
-        relationshipItemStore.getByEntityUid(entityUid)
-            .mapNotNull { it.relationship()?.uid() }
-            .distinct()
-            .forEach { store.deleteIfExists(it) }
-    }
-
-    private fun getExistingRelationshipUid(relationship: Relationship): String? {
-        val existingRelationshipUidsForPair = relationshipItemStore.getRelationshipUidsForItems(
-            relationship.from()!!, relationship.to()!!
-        )
-        for (existingRelationshipUid in existingRelationshipUidsForPair) {
-            val existingRelationship = store.selectByUid(existingRelationshipUid)
-            if (existingRelationship != null && relationship.relationshipType()
-                == existingRelationship.relationshipType()
-            ) {
-                return existingRelationship.uid()
-            }
-        }
-        return null
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelector.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelector.kt
similarity index 86%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelector.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelector.kt
index 429c3b1370..2e1ddcf668 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelector.kt
@@ -25,11 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.relationship.internal;
+package org.hisp.dhis.android.core.relationship.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreWithState;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreWithState
+import org.hisp.dhis.android.core.relationship.RelationshipItem
 
-public interface RelationshipItemElementStoreSelector {
-    StoreWithState getElementStore(RelationshipItem item);
+internal interface RelationshipItemElementStoreSelector {
+    fun getElementStore(item: RelationshipItem?): StoreWithState<*>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.java
deleted file mode 100644
index 1802715007..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreWithState;
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore;
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStoreImpl;
-import org.hisp.dhis.android.core.event.internal.EventStore;
-import org.hisp.dhis.android.core.event.internal.EventStoreImpl;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class RelationshipItemElementStoreSelectorImpl implements RelationshipItemElementStoreSelector {
-
-    private final TrackedEntityInstanceStore trackedEntityInstanceStore;
-    private final EnrollmentStore enrollmentStore;
-    private final EventStore eventStore;
-
-    @Inject
-    RelationshipItemElementStoreSelectorImpl(
-            TrackedEntityInstanceStore trackedEntityInstanceStore,
-            EnrollmentStore enrollmentStore,
-            EventStore eventStore) {
-
-        this.trackedEntityInstanceStore = trackedEntityInstanceStore;
-        this.enrollmentStore = enrollmentStore;
-        this.eventStore = eventStore;
-    }
-
-    @Override
-    public StoreWithState getElementStore(RelationshipItem item) {
-        if (item.hasTrackedEntityInstance()) {
-            return trackedEntityInstanceStore;
-        } else if (item.hasEnrollment()) {
-            return enrollmentStore;
-        } else {
-            return eventStore;
-        }
-    }
-
-    public static RelationshipItemElementStoreSelectorImpl create(DatabaseAdapter databaseAdapter) {
-        return new RelationshipItemElementStoreSelectorImpl(
-                TrackedEntityInstanceStoreImpl.create(databaseAdapter),
-                EnrollmentStoreImpl.create(databaseAdapter),
-                EventStoreImpl.create(databaseAdapter)
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
index 3b0557ddf8..434e34cf21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
@@ -25,33 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class ConstantHandler extends IdentifiableHandlerImpl<Constant> {
-
-    private final CollectionCleaner<Constant> collectionCleaner;
-
-    @Inject
-    ConstantHandler(IdentifiableObjectStore<Constant> optionStore,
-                    CollectionCleaner<Constant> collectionCleaner) {
-        super(optionStore);
-        this.collectionCleaner = collectionCleaner;
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<Constant> constants) {
-        collectionCleaner.deleteNotPresent(constants);
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreWithState
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
+import org.hisp.dhis.android.core.event.internal.EventStore
+import org.hisp.dhis.android.core.relationship.RelationshipItem
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+
+internal class RelationshipItemElementStoreSelectorImpl(
+    private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
+    private val enrollmentStore: EnrollmentStore,
+    private val eventStore: EventStore
+) : RelationshipItemElementStoreSelector {
+    override fun getElementStore(item: RelationshipItem?): StoreWithState<*> {
+        return if (item!!.hasTrackedEntityInstance()) {
+            trackedEntityInstanceStore
+        } else if (item.hasEnrollment()) {
+            enrollmentStore
+        } else {
+            eventStore
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
index 8dd9a2a152..95fe92080e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
@@ -25,41 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.legendset.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.legendset.Legend;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
+import org.hisp.dhis.android.core.event.internal.EventStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 
 @Module
-public final class LegendEntityDIModule {
-
+internal class RelationshipItemEntityDIModule {
     @Provides
     @Reusable
-    public IdentifiableObjectStore<Legend> store(DatabaseAdapter databaseAdapter) {
-        return LegendStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): RelationshipItemStore {
+        return RelationshipItemStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    public HandlerWithTransformer<Legend> handler(IdentifiableObjectStore<Legend> store) {
-        return new IdentifiableHandlerImpl<>(store);
+    fun handler(store: RelationshipItemStore): RelationshipItemHandler {
+        return RelationshipItemHandler(store)
     }
 
     @Provides
     @Reusable
-    public Map<String, ChildrenAppender<Legend>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun storeSelector(
+        trackedEntityInstanceStore: TrackedEntityInstanceStore,
+        enrollmentStore: EnrollmentStore,
+        eventStore: EventStore
+    ): RelationshipItemElementStoreSelector {
+        return RelationshipItemElementStoreSelectorImpl(
+            trackedEntityInstanceStore,
+            enrollmentStore,
+            eventStore
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
new file mode 100644
index 0000000000..a2b39dcfe9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.relationship.RelationshipItem
+
+internal class RelationshipItemHandler(
+    store: RelationshipItemStore
+) : ObjectWithoutUidHandlerImpl<RelationshipItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
index e67d29e212..8838b5534d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.relationship.internal
 import android.database.Cursor
 import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -41,18 +40,17 @@ import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
 
-internal class RelationshipItemStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilderImpl
-) : ObjectWithoutUidStoreImpl<RelationshipItem>(
-    databaseAdapter,
-    builder,
-    BINDER,
-    WHERE_UPDATE_BINDER,
-    WHERE_DELETE_BINDER,
-    { cursor: Cursor -> RelationshipItem.create(cursor) }
-),
-    RelationshipItemStore {
+internal class RelationshipItemStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : RelationshipItemStore,
+    ObjectWithoutUidStoreImpl<RelationshipItem>(
+        databaseAdapter,
+        RelationshipItemTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> RelationshipItem.create(cursor) }
+    ) {
 
     @Suppress("NestedBlockDepth")
     override fun getRelationshipUidsForItems(from: RelationshipItem, to: RelationshipItem): List<String> {
@@ -178,16 +176,5 @@ internal class RelationshipItemStoreImpl private constructor(
             w.bind(1, getUidOrNull(o.relationship()))
             w.bind(2, o.relationshipItemType())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): RelationshipItemStore {
-            val statementBuilder = SQLStatementBuilderImpl(
-                RelationshipItemTableInfo.TABLE_INFO.name(), RelationshipItemTableInfo.Columns()
-            )
-            return RelationshipItemStoreImpl(
-                databaseAdapter,
-                statementBuilder
-            )
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
index 71372a2da7..44ec0c7360 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
@@ -28,25 +28,26 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import android.database.Cursor
-import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStoreImpl
-import org.hisp.dhis.android.core.relationship.*
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
+import org.hisp.dhis.android.core.relationship.RelationshipItem
+import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
+import org.hisp.dhis.android.core.relationship.RelationshipTableInfo
 
-internal class RelationshipStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    statementBuilder: SQLStatementBuilderImpl
-) : IdentifiableDeletableDataObjectStoreImpl<Relationship>(
-    databaseAdapter,
-    statementBuilder,
-    BINDER,
-    { cursor: Cursor -> Relationship.create(cursor) }
-),
-    RelationshipStore {
+internal class RelationshipStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : RelationshipStore,
+    IdentifiableDeletableDataObjectStoreImpl<Relationship>(
+        databaseAdapter,
+        RelationshipTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Relationship.create(cursor) }
+    ) {
 
     override fun getRelationshipsByItem(relationshipItem: RelationshipItem): List<Relationship> {
         val whereClause = WhereClauseBuilder()
@@ -110,11 +111,5 @@ internal class RelationshipStoreImpl private constructor(
             w.bind(6, o.syncState())
             w.bind(7, o.deleted())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): RelationshipStore {
-            val statementBuilder = SQLStatementBuilderImpl(RelationshipTableInfo.TABLE_INFO)
-            return RelationshipStoreImpl(databaseAdapter, statementBuilder)
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
index 13d7733c0f..755001f419 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.internal.DataAccessFields;
 import org.hisp.dhis.android.core.relationship.RelationshipType;
 import org.hisp.dhis.android.core.resource.internal.Resource;
@@ -48,12 +47,12 @@ final class RelationshipTypeCall implements ListCall<RelationshipType> {
     private final Resource.Type resourceType = Resource.Type.RELATIONSHIP_TYPE;
 
     private final RelationshipTypeService service;
-    private final Handler<RelationshipType> handler;
+    private final RelationshipTypeHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
     RelationshipTypeCall(RelationshipTypeService service,
-                         Handler<RelationshipType> handler,
+                         RelationshipTypeHandler handler,
                          APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
index e106c1f0f3..47bec06187 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
@@ -30,10 +30,7 @@ package org.hisp.dhis.android.core.relationship.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.relationship.RelationshipType
 
@@ -42,22 +39,29 @@ internal class RelationshipTypeEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<RelationshipType> {
-        return RelationshipTypeStore.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): RelationshipTypeStore {
+        return RelationshipTypeStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun handler(impl: RelationshipTypeHandler): Handler<RelationshipType> {
-        return impl
+    fun handler(
+        relationshipTypeStore: RelationshipTypeStore,
+        relationshipConstraintHandler: RelationshipConstraintHandler
+    ): RelationshipTypeHandler {
+        return RelationshipTypeHandler(
+            relationshipTypeStore,
+            relationshipConstraintHandler
+        )
     }
 
     @Provides
     @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): MutableMap<String, ChildrenAppender<RelationshipType>> {
-        val childrenAppender: ChildrenAppender<RelationshipType> = RelationshipConstraintChildrenAppender(
-            RelationshipConstraintStore.create(databaseAdapter)
+    fun childrenAppenders(
+        constraintStore: RelationshipConstraintStore
+    ): Map<String, ChildrenAppender<RelationshipType>> {
+        return mapOf(
+            RelationshipTypeFields.CONSTRAINTS to RelationshipConstraintChildrenAppender(constraintStore)
         )
-        return Collections.singletonMap(RelationshipTypeFields.CONSTRAINTS, childrenAppender)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.java
deleted file mode 100644
index 1082a6270d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraint;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraintType;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-
-import javax.inject.Inject;
-
-final class RelationshipTypeHandler extends IdentifiableHandlerImpl<RelationshipType> {
-
-    private final Handler<RelationshipConstraint> relationshipConstraintHandler;
-
-    @Inject
-    RelationshipTypeHandler(
-            IdentifiableObjectStore<RelationshipType> relationshipTypeStore,
-            Handler<RelationshipConstraint> relationshipConstraintHandler) {
-        super(relationshipTypeStore);
-        this.relationshipConstraintHandler = relationshipConstraintHandler;
-    }
-
-    @Override
-    protected void afterObjectHandled(RelationshipType relationshipType, HandleAction handleAction) {
-        handleConstraint(relationshipType, relationshipType.fromConstraint(), RelationshipConstraintType.FROM);
-        handleConstraint(relationshipType, relationshipType.toConstraint(), RelationshipConstraintType.TO);
-    }
-
-    private void handleConstraint(RelationshipType relationshipType, RelationshipConstraint downloadedConstraint,
-                             RelationshipConstraintType type) {
-        if (downloadedConstraint != null) {
-            RelationshipConstraint fromConstraintToHanldle = downloadedConstraint.toBuilder()
-                    .relationshipType(ObjectWithUid.fromIdentifiable(relationshipType))
-                    .constraintType(type)
-                    .build();
-
-            this.relationshipConstraintHandler.handle(fromConstraintToHanldle);
-        }
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
similarity index 53%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
index c742e49ba8..70ec3dd2a2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
@@ -25,44 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.indicator.IndicatorType;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class IndicatorTypeEntityDIModule implements IdentifiableEntityDIModule<IndicatorType> {
-
-    @Override
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<IndicatorType> store(DatabaseAdapter databaseAdapter) {
-        return IndicatorTypeStore.create(databaseAdapter);
-    }
-
-    @Override
-    @Provides
-    @Reusable
-    public Handler<IndicatorType> handler(IdentifiableObjectStore<IndicatorType> store) {
-        return new IdentifiableHandlerImpl<>(store);
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.relationship.RelationshipConstraint
+import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
+import org.hisp.dhis.android.core.relationship.RelationshipType
+
+internal class RelationshipTypeHandler constructor(
+    relationshipTypeStore: RelationshipTypeStore,
+    private val relationshipConstraintHandler: RelationshipConstraintHandler
+) : IdentifiableHandlerImpl<RelationshipType>(relationshipTypeStore) {
+
+    override fun afterObjectHandled(o: RelationshipType, action: HandleAction) {
+        handleConstraint(o, o.fromConstraint(), RelationshipConstraintType.FROM)
+        handleConstraint(o, o.toConstraint(), RelationshipConstraintType.TO)
     }
 
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<IndicatorType>> childrenAppenders() {
-        return Collections.emptyMap();
+    private fun handleConstraint(
+        relationshipType: RelationshipType,
+        downloadedConstraint: RelationshipConstraint?,
+        type: RelationshipConstraintType
+    ) {
+        if (downloadedConstraint != null) {
+            val fromConstraintToHanldle = downloadedConstraint.toBuilder()
+                .relationshipType(ObjectWithUid.fromIdentifiable(relationshipType))
+                .constraintType(type)
+                .build()
+            relationshipConstraintHandler.handle(fromConstraintToHanldle)
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.kt
new file mode 100644
index 0000000000..a9b429b716
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.relationship.RelationshipType
+
+internal interface RelationshipTypeStore : IdentifiableObjectStore<RelationshipType>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
index ed583a4ddd..b13bb8e811 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
@@ -25,38 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-import org.hisp.dhis.android.core.relationship.RelationshipTypeTableInfo;
-
-import androidx.annotation.NonNull;
-
-public final class RelationshipTypeStore {
-
-    private RelationshipTypeStore() {}
-
-    private static StatementBinder<RelationshipType> BINDER = new IdentifiableStatementBinder<RelationshipType>() {
-
-        @Override
-        public void bindToStatement(@NonNull RelationshipType o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.fromToName());
-            w.bind(8, o.toFromName());
-            w.bind(9, o.bidirectional());
-            w.bind(10, o.access().data().write());
-        }
-    };
-
-    public static IdentifiableObjectStore<RelationshipType> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, RelationshipTypeTableInfo.TABLE_INFO, BINDER,
-                RelationshipType::create);
+package org.hisp.dhis.android.core.relationship.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.hisp.dhis.android.core.relationship.RelationshipTypeTableInfo
+
+@Suppress("MagicNumber")
+internal class RelationshipTypeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : RelationshipTypeStore,
+    IdentifiableObjectStoreImpl<RelationshipType>(
+        databaseAdapter,
+        RelationshipTypeTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> RelationshipType.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<RelationshipType> =
+            object : IdentifiableStatementBinder<RelationshipType>() {
+                override fun bindToStatement(o: RelationshipType, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(7, o.fromToName())
+                    w.bind(8, o.toFromName())
+                    w.bind(9, o.bidirectional())
+                    w.bind(10, o.access().data().write())
+                }
+            }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.kt
similarity index 85%
rename from core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.kt
index 77657de22a..734a30aea0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.kt
@@ -25,21 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.resource.internal
 
-package org.hisp.dhis.android.core.resource.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Module
-public final class ResourceEntityDIModule {
-
+internal class ResourceEntityDIModule {
     @Provides
     @Reusable
-    ResourceStore store(DatabaseAdapter databaseAdapter) {
-        return ResourceStoreImpl.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): ResourceStore {
+        return ResourceStoreImpl(databaseAdapter)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.java b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
index 09ff3108ab..9758bdfb20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
@@ -25,46 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.resource.internal;
+package org.hisp.dhis.android.core.resource.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-
-import java.util.Date;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import androidx.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Singleton
-public class ResourceHandler {
-    private final ResourceStore resourceStore;
-    private Date serverDate;
+internal class ResourceHandler @Inject constructor(private val resourceStore: ResourceStore) {
+    internal var serverDate: Date? = null
 
-    @Inject
-    public ResourceHandler(ResourceStore resourceStore) {
-        this.resourceStore = resourceStore;
+    fun setServerDate(serverDate: Date) {
+        this.serverDate = Date(serverDate.time)
     }
 
-    public void setServerDate(Date serverDate) {
-        this.serverDate = new Date(serverDate.getTime());
+    fun getServerDate(): Date {
+        return Date(serverDate!!.time)
     }
 
-    public Date getServerDate() {
-        return new Date(this.serverDate.getTime());
-    }
-
-    public void handleResource(Resource.Type resourceType) {
+    fun handleResource(resourceType: Resource.Type?) {
         if (resourceType == null || serverDate == null) {
-            return;
+            return
         }
+        val resource = Resource.builder()
+            .resourceType(resourceType)
+            .lastSynced(serverDate)
+            .build()
 
-        Resource resource = Resource.builder()
-                .resourceType(resourceType)
-                .lastSynced(serverDate)
-                .build();
-
-        resourceStore.updateOrInsertWhere(resource);
+        resourceStore.updateOrInsertWhere(resource)
     }
 
     /**
@@ -73,12 +63,14 @@ public void handleResource(Resource.Type resourceType) {
      * @param type Type of the resource.
      * @return a string representing the last synched date
      */
-    public String getLastUpdated(Resource.Type type) {
-        return resourceStore.getLastUpdated(type);
+    fun getLastUpdated(type: Resource.Type?): String? {
+        return resourceStore.getLastUpdated(type!!)
     }
 
-    @VisibleForTesting
-    public static ResourceHandler create(DatabaseAdapter databaseAdapter) {
-        return new ResourceHandler(ResourceStoreImpl.create(databaseAdapter));
+    companion object {
+        @VisibleForTesting
+        fun create(databaseAdapter: DatabaseAdapter): ResourceHandler {
+            return ResourceHandler(ResourceStoreImpl(databaseAdapter))
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt
new file mode 100644
index 0000000000..4cb10dc692
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.resource.internal
+
+import dagger.Module
+
+@Module(includes = [ResourceEntityDIModule::class])
+internal class ResourcePackageDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.kt
new file mode 100644
index 0000000000..fd0e0f46fb
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStore.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.resource.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+
+internal interface ResourceStore : ObjectWithoutUidStore<Resource> {
+    fun getLastUpdated(type: Resource.Type): String?
+    fun deleteResource(type: Resource.Type): Boolean
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.java
deleted file mode 100644
index ca4d4bb35c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.resource.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-
-import java.util.List;
-
-final class ResourceStoreImpl extends ObjectWithoutUidStoreImpl<Resource> implements ResourceStore {
-
-    private static final StatementBinder<Resource> BINDER = (resource, w) -> {
-        w.bind(1, resource.resourceType());
-        w.bind(2, resource.lastSynced());
-    };
-
-    private static final WhereStatementBinder<Resource> WHERE_UPDATE_BINDER
-            = (resource, w) -> w.bind(3, resource.resourceType());
-
-    private static final WhereStatementBinder<Resource> WHERE_DELETE_BINDER
-            = (resource, w) -> w.bind(1, resource.resourceType());
-
-    private ResourceStoreImpl(DatabaseAdapter databaseAdapter,
-                             SQLStatementBuilderImpl builder) {
-        super(databaseAdapter, builder, BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, Resource::create);
-    }
-
-    @Override
-    public String getLastUpdated(Resource.Type type) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(ResourceTableInfo.Columns.RESOURCE_TYPE, type.name()).build();
-
-        List<Resource> resourceList = selectWhere(whereClause);
-        return resourceList.isEmpty() ?
-                null : BaseIdentifiableObject.DATE_FORMAT.format(resourceList.get(0).lastSynced());
-    }
-
-    @Override
-    public boolean deleteResource(Resource.Type type) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(ResourceTableInfo.Columns.RESOURCE_TYPE, type.name()).build();
-
-        return deleteWhere(whereClause);
-    }
-
-    static ResourceStore create(DatabaseAdapter databaseAdapter) {
-
-        SQLStatementBuilderImpl statementBuilder = new SQLStatementBuilderImpl(ResourceTableInfo.TABLE_INFO.name(),
-                ResourceTableInfo.TABLE_INFO.columns());
-
-        return new ResourceStoreImpl(databaseAdapter, statementBuilder);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.java b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
similarity index 50%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
index ed2b349e8c..d152ddf32b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
@@ -25,50 +25,53 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.resource.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.DateUtils
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetTableInfo;
+internal class ResourceStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ResourceStore,
+    ObjectWithoutUidStoreImpl<Resource>(
+        databaseAdapter,
+        ResourceTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> Resource.create(cursor) }
+    ) {
+    override fun getLastUpdated(type: Resource.Type): String? {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(ResourceTableInfo.Columns.RESOURCE_TYPE, type.name).build()
+        val resourceList = selectWhere(whereClause)
 
-import androidx.annotation.NonNull;
+        return resourceList.firstOrNull()?.lastSynced()?.let {
+            DateUtils.DATE_FORMAT.format(it)
+        }
+    }
 
-public final class DataSetStore {
+    override fun deleteResource(type: Resource.Type): Boolean {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(ResourceTableInfo.Columns.RESOURCE_TYPE, type.name).build()
 
-    private DataSetStore() {}
+        return deleteWhere(whereClause)
+    }
 
-    private static StatementBinder<DataSet> BINDER = new NameableWithStyleStatementBinder<DataSet>() {
-        @Override
-        public void bindToStatement(@NonNull DataSet o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(13, o.periodType());
-            w.bind(14, UidsHelper.getUidOrNull(o.categoryCombo()));
-            w.bind(15, o.mobile());
-            w.bind(16, o.version());
-            w.bind(17, o.expiryDays());
-            w.bind(18, o.timelyDays());
-            w.bind(19, o.notifyCompletingUser());
-            w.bind(20, o.openFuturePeriods());
-            w.bind(21, o.fieldCombinationRequired());
-            w.bind(22, o.validCompleteOnly());
-            w.bind(23, o.noValueRequiresComment());
-            w.bind(24, o.skipOffline());
-            w.bind(25, o.dataElementDecoration());
-            w.bind(26, o.renderAsTabs());
-            w.bind(27, o.renderHorizontally());
-            w.bind(28, o.access().data().write());
-            w.bind(29, UidsHelper.getUidOrNull(o.workflow()));
+    companion object {
+        private val BINDER = StatementBinder { resource: Resource, w: StatementWrapper ->
+            w.bind(1, resource.resourceType())
+            w.bind(2, resource.lastSynced())
         }
-    };
-
-    public static IdentifiableObjectStore<DataSet> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, DataSetTableInfo.TABLE_INFO, BINDER, DataSet::create);
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { resource: Resource, w: StatementWrapper -> w.bind(3, resource.resourceType()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { resource: Resource, w: StatementWrapper -> w.bind(1, resource.resourceType()) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java
index 7f2813d360..bbb61f1f17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java
@@ -30,9 +30,9 @@
 
 import static org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationsHelperKt.generateGroups;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
+import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore;
 import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall;
 
 import java.util.List;
@@ -47,11 +47,11 @@ public class AnalyticsDhisVisualizationsSettingObjectRepository
         extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsDhisVisualizationsSetting>
         implements ReadOnlyWithDownloadObjectRepository<AnalyticsDhisVisualizationsSetting> {
 
-    private final ObjectWithoutUidStore<AnalyticsDhisVisualization> analyticsDhisVisualizationStore;
+    private final AnalyticsDhisVisualizationStore analyticsDhisVisualizationStore;
 
     @Inject
     public AnalyticsDhisVisualizationsSettingObjectRepository(
-            ObjectWithoutUidStore<AnalyticsDhisVisualization> analyticsDhisVisualizationStore,
+            AnalyticsDhisVisualizationStore analyticsDhisVisualizationStore,
             AnalyticsSettingCall analyticsSettingCall) {
         super(analyticsSettingCall);
         this.analyticsDhisVisualizationStore = analyticsDhisVisualizationStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.java
index 53647a6384..abc8c0de99 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.java
@@ -28,7 +28,8 @@
  */
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
+import static org.hisp.dhis.android.core.settings.internal.AnalyticsTeiDataChildrenAppender.KEY;
+
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -36,6 +37,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.period.PeriodType;
+import org.hisp.dhis.android.core.settings.internal.AnalyticsTeiSettingStore;
 
 import java.util.Map;
 
@@ -43,14 +45,12 @@
 
 import dagger.Reusable;
 
-import static org.hisp.dhis.android.core.settings.internal.AnalyticsTeiDataChildrenAppender.KEY;
-
 @Reusable
 public class AnalyticsTeiSettingCollectionRepository
         extends ReadOnlyCollectionRepositoryImpl<AnalyticsTeiSetting, AnalyticsTeiSettingCollectionRepository> {
 
     @Inject
-    AnalyticsTeiSettingCollectionRepository(ObjectWithoutUidStore<AnalyticsTeiSetting> store,
+    AnalyticsTeiSettingCollectionRepository(AnalyticsTeiSettingStore store,
                                             RepositoryScope scope,
                                             Map<String, ChildrenAppender<AnalyticsTeiSetting>> childrenAppenders) {
         super(store,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java
index 3eb62731fa..38e25241ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java
@@ -28,10 +28,11 @@
 
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.settings.internal.AppearanceSettingCall;
+import org.hisp.dhis.android.core.settings.internal.FilterSettingStore;
+import org.hisp.dhis.android.core.settings.internal.ProgramConfigurationSettingStore;
 
 import java.util.HashMap;
 import java.util.List;
@@ -47,13 +48,12 @@ public class AppearanceSettingsObjectRepository
         extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<AppearanceSettings>
         implements ReadOnlyWithDownloadObjectRepository<AppearanceSettings> {
 
-    private final ObjectWithoutUidStore<FilterSetting> filterSettingStore;
-    private final ObjectWithoutUidStore<ProgramConfigurationSetting> programConfigurationSettingStore;
+    private final FilterSettingStore filterSettingStore;
+    private final ProgramConfigurationSettingStore programConfigurationSettingStore;
 
     @Inject
-    AppearanceSettingsObjectRepository(ObjectWithoutUidStore<FilterSetting> filterSettingStore,
-                                       ObjectWithoutUidStore<ProgramConfigurationSetting>
-                                               programConfigurationSettingStore,
+    AppearanceSettingsObjectRepository(FilterSettingStore filterSettingStore,
+                                       ProgramConfigurationSettingStore programConfigurationSettingStore,
                                        AppearanceSettingCall appearanceSettingCall) {
         super(appearanceSettingCall);
         this.filterSettingStore = filterSettingStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java
index f84e04dde3..6da38d9ba4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.settings.internal.DataSetSettingCall;
+import org.hisp.dhis.android.core.settings.internal.DataSetSettingStore;
 
 import java.util.HashMap;
 import java.util.List;
@@ -45,10 +45,10 @@ public class DataSetSettingsObjectRepository
         extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<DataSetSettings>
         implements ReadOnlyWithDownloadObjectRepository<DataSetSettings> {
 
-    private final ObjectWithoutUidStore<DataSetSetting> store;
+    private final DataSetSettingStore store;
 
     @Inject
-    DataSetSettingsObjectRepository(ObjectWithoutUidStore<DataSetSetting> store,
+    DataSetSettingsObjectRepository(DataSetSettingStore store,
                                     DataSetSettingCall dataSetSettingCall) {
         super(dataSetSettingCall);
         this.store = store;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java
index 9f31c74777..0537126954 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java
@@ -27,10 +27,11 @@
  */
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall;
+import org.hisp.dhis.android.core.settings.internal.GeneralSettingStore;
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore;
 
 import java.util.List;
 
@@ -43,12 +44,12 @@ public class GeneralSettingObjectRepository
         extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<GeneralSettings>
         implements ReadOnlyWithDownloadObjectRepository<GeneralSettings> {
 
-    private final ObjectWithoutUidStore<GeneralSettings> store;
-    private final ObjectWithoutUidStore<SynchronizationSettings> syncStore;
+    private final GeneralSettingStore store;
+    private final SynchronizationSettingStore syncStore;
 
     @Inject
-    GeneralSettingObjectRepository(ObjectWithoutUidStore<GeneralSettings> store,
-                                   ObjectWithoutUidStore<SynchronizationSettings> syncStore,
+    GeneralSettingObjectRepository(GeneralSettingStore store,
+                                   SynchronizationSettingStore syncStore,
                                    GeneralSettingCall generalSettingCall) {
         super(generalSettingCall);
         this.store = store;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
index 59a1ad4855..910aa88a90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
@@ -29,14 +29,14 @@ package org.hisp.dhis.android.core.settings
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.LatestAppVersionCall
+import org.hisp.dhis.android.core.settings.internal.LatestAppVersionStore
 
 @Reusable
 class LatestAppVersionObjectRepository @Inject internal constructor(
-    private val store: ObjectWithoutUidStore<LatestAppVersion>,
+    private val store: LatestAppVersionStore,
     latestAppVersionCall: LatestAppVersionCall
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<LatestAppVersion>(latestAppVersionCall),
     ReadOnlyWithDownloadObjectRepository<LatestAppVersion> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java
index 23346cb19f..4efb9e5226 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.settings.internal.ProgramSettingCall;
+import org.hisp.dhis.android.core.settings.internal.ProgramSettingStore;
 
 import java.util.HashMap;
 import java.util.List;
@@ -45,10 +45,10 @@ public class ProgramSettingsObjectRepository
         extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<ProgramSettings>
         implements ReadOnlyWithDownloadObjectRepository<ProgramSettings> {
 
-    private final ObjectWithoutUidStore<ProgramSetting> store;
+    private final ProgramSettingStore store;
 
     @Inject
-    ProgramSettingsObjectRepository(ObjectWithoutUidStore<ProgramSetting> store,
+    ProgramSettingsObjectRepository(ProgramSettingStore store,
                                     ProgramSettingCall programSettingCall) {
         super(programSettingCall);
         this.store = store;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java
index 129eb2e1e2..b37235dc2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingCall;
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore;
 
 import java.util.List;
 
@@ -43,12 +43,12 @@ public class SynchronizationSettingObjectRepository
         extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<SynchronizationSettings>
         implements ReadOnlyWithDownloadObjectRepository<SynchronizationSettings> {
 
-    private final ObjectWithoutUidStore<SynchronizationSettings> syncStore;
+    private final SynchronizationSettingStore syncStore;
     private final DataSetSettingsObjectRepository dataSetSettingsRepository;
     private final ProgramSettingsObjectRepository programSettingsRepository;
 
     @Inject
-    SynchronizationSettingObjectRepository(ObjectWithoutUidStore<SynchronizationSettings> syncStore,
+    SynchronizationSettingObjectRepository(SynchronizationSettingStore syncStore,
                                            DataSetSettingsObjectRepository dataSetSettingsRepository,
                                            ProgramSettingsObjectRepository programSettingsRepository,
                                            SynchronizationSettingCall synchronizationSettingCall) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java
index cbdc3a12e2..c6dcea5514 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.settings.internal.SystemSettingStore;
 
 import java.util.Map;
 
@@ -48,7 +48,7 @@ public final class SystemSettingCollectionRepository
         extends ReadOnlyCollectionRepositoryImpl<SystemSetting, SystemSettingCollectionRepository> {
 
     @Inject
-    SystemSettingCollectionRepository(final ObjectWithoutUidStore<SystemSetting> store,
+    SystemSettingCollectionRepository(final SystemSettingStore store,
                                       final Map<String, ChildrenAppender<SystemSetting>> childrenAppenders,
                                       final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java
index 86b006df1d..76aade9ad2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.settings;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall;
+import org.hisp.dhis.android.core.settings.internal.UserSettingsStore;
 
 import java.util.List;
 
@@ -42,10 +42,10 @@
 public class UserSettingsObjectRepository extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<UserSettings>
         implements ReadOnlyWithDownloadObjectRepository<UserSettings> {
 
-    private final ObjectWithoutUidStore<UserSettings> store;
+    private final UserSettingsStore store;
 
     @Inject
-    UserSettingsObjectRepository(ObjectWithoutUidStore<UserSettings> store,
+    UserSettingsObjectRepository(UserSettingsStore store,
                                  GeneralSettingCall generalSettingCall) {
         super(generalSettingCall);
         this.store = store;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
index c09b67eee9..24ffe5b463 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
@@ -30,13 +30,12 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
 
 @Reusable
 internal class AnalyticsDhisVisualizationSettingHandler @Inject constructor(
-    store: ObjectWithoutUidStore<AnalyticsDhisVisualization>
+    store: AnalyticsDhisVisualizationStore
 ) : ObjectWithoutUidHandlerImpl<AnalyticsDhisVisualization>(store) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStore.kt
index 2369ef2725..7839b645b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStore.kt
@@ -28,38 +28,7 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
-import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationTableInfo
 
-@Suppress("MagicNumber")
-internal object AnalyticsDhisVisualizationStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsDhisVisualization, w: StatementWrapper ->
-        w.bind(1, o.uid())
-        w.bind(2, o.scopeUid())
-        w.bind(3, o.scope())
-        w.bind(4, o.groupUid())
-        w.bind(5, o.groupName())
-        w.bind(6, o.name())
-        w.bind(7, o.timestamp())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: AnalyticsDhisVisualization, _: StatementWrapper ->
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: AnalyticsDhisVisualization, _: StatementWrapper -> }
-
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AnalyticsDhisVisualization> {
-        return objectWithoutUidStore(
-            databaseAdapter, AnalyticsDhisVisualizationTableInfo.TABLE_INFO, BINDER,
-            WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { cursor: Cursor -> AnalyticsDhisVisualization.create(cursor) }
-    }
-}
+internal interface AnalyticsDhisVisualizationStore : ObjectWithoutUidStore<AnalyticsDhisVisualization>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
new file mode 100644
index 0000000000..5081e0e34f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
+import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationTableInfo
+
+@Suppress("MagicNumber")
+internal class AnalyticsDhisVisualizationStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsDhisVisualizationStore,
+    ObjectWithoutUidStoreImpl<AnalyticsDhisVisualization>(
+        databaseAdapter,
+        AnalyticsDhisVisualizationTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> AnalyticsDhisVisualization.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsDhisVisualization, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.scopeUid())
+            w.bind(3, o.scope())
+            w.bind(4, o.groupUid())
+            w.bind(5, o.groupName())
+            w.bind(6, o.name())
+            w.bind(7, o.timestamp())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: AnalyticsDhisVisualization, _: StatementWrapper ->
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: AnalyticsDhisVisualization, _: StatementWrapper ->
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index ed828cf11a..235e937071 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -32,17 +32,15 @@ import io.reactivex.Single
 import java.net.HttpURLConnection
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
 import org.hisp.dhis.android.core.settings.AnalyticsSettings
-import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 
 @Reusable
 internal class AnalyticsSettingCall @Inject constructor(
-    private val analyticsTeiSettingHandler: Handler<AnalyticsTeiSetting>,
-    private val analyticsDhisVisualizationsSettingHandler: Handler<AnalyticsDhisVisualization>,
+    private val analyticsTeiSettingHandler: AnalyticsTeiSettingHandler,
+    private val analyticsDhisVisualizationsSettingHandler: AnalyticsDhisVisualizationSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
index b5a80716dd..05200998f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
@@ -31,105 +31,46 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
-import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
-import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
-import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
-import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 
 @Module
-@Suppress("TooManyFunctions")
 internal class AnalyticsSettingEntityDIModule {
 
     @Provides
     @Reusable
-    fun analyticsSettingStore(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AnalyticsTeiSetting> {
-        return AnalyticsTeiSettingStore.create(databaseAdapter)
+    fun analyticsSettingStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiSettingStore {
+        return AnalyticsTeiSettingStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun analyticsDhisVisualizationStore(
-        databaseAdapter: DatabaseAdapter
-    ): ObjectWithoutUidStore<AnalyticsDhisVisualization> {
-        return AnalyticsDhisVisualizationStore.create(databaseAdapter)
+    fun analyticsDhisVisualizationStore(databaseAdapter: DatabaseAdapter): AnalyticsDhisVisualizationStore {
+        return AnalyticsDhisVisualizationStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun analyticsTeiDataElementStore(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiDataElement> {
-        return AnalyticsTeiDataElementStore.create(databaseAdapter)
+    fun analyticsTeiDataElementStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiDataElementStore {
+        return AnalyticsTeiDataElementStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun analyticsTeiIndicatorStore(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiIndicator> {
-        return AnalyticsTeiIndicatorStore.create(databaseAdapter)
+    fun analyticsTeiIndicatorStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiIndicatorStore {
+        return AnalyticsTeiIndicatorStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun analyticsTeiAttributeStore(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiAttribute> {
-        return AnalyticsTeiAttributeStore.create(databaseAdapter)
+    fun analyticsTeiAttributeStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiAttributeStore {
+        return AnalyticsTeiAttributeStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun analyticsTeiWHONutritionDataStore(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiWHONutritionData> {
-        return AnalyticsTeiWHONutritionDataStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiSettingHandler(impl: AnalyticsTeiSettingHandler): Handler<AnalyticsTeiSetting> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsDhisVisualizationsHandler(
-        impl: AnalyticsDhisVisualizationSettingHandler
-    ): Handler<AnalyticsDhisVisualization> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiDataElementHandler(
-        store: LinkStore<AnalyticsTeiDataElement>
-    ): LinkHandler<AnalyticsTeiDataElement, AnalyticsTeiDataElement> {
-        return LinkHandlerImpl(store)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiIndicatorHandler(
-        store: LinkStore<AnalyticsTeiIndicator>
-    ): LinkHandler<AnalyticsTeiIndicator, AnalyticsTeiIndicator> {
-        return LinkHandlerImpl(store)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiAttributeHandler(
-        store: LinkStore<AnalyticsTeiAttribute>
-    ): LinkHandler<AnalyticsTeiAttribute, AnalyticsTeiAttribute> {
-        return LinkHandlerImpl(store)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiWhoNutritionDataHandler(
-        impl: AnalyticsTeiWHONutritionDataHandler
-    ): LinkHandler<AnalyticsTeiWHONutritionData, AnalyticsTeiWHONutritionData> {
-        return impl
+    fun analyticsTeiWHONutritionDataStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiWHONutritionDataStore {
+        return AnalyticsTeiWHONutritionDataStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
new file mode 100644
index 0000000000..520e2fee0a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
+
+@Reusable
+internal class AnalyticsTeiAttributeHandler @Inject constructor(
+    store: AnalyticsTeiAttributeStore
+) : LinkHandlerImpl<AnalyticsTeiAttribute, AnalyticsTeiAttribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStore.kt
index 86eda83874..8475709df7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStore.kt
@@ -25,30 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
-import org.hisp.dhis.android.core.settings.AnalyticsTeiAttributeTableInfo
-
-@Suppress("MagicNumber")
-internal object AnalyticsTeiAttributeStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsTeiAttribute, w: StatementWrapper ->
-        w.bind(1, o.teiSetting())
-        w.bind(2, o.whoComponent())
-        w.bind(3, o.attribute())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiAttribute> {
-        return linkStore(
-            databaseAdapter, AnalyticsTeiAttributeTableInfo.TABLE_INFO,
-            AnalyticsTeiAttributeTableInfo.Columns.TEI_SETTING, BINDER
-        ) { cursor: Cursor -> AnalyticsTeiAttribute.create(cursor) }
-    }
-}
+internal interface AnalyticsTeiAttributeStore : LinkStore<AnalyticsTeiAttribute>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkStore.kt
rename to core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
index 40306e0057..8c593a4637 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
@@ -25,29 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity
+package org.hisp.dhis.android.core.settings.internal
 
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
+import org.hisp.dhis.android.core.settings.AnalyticsTeiAttributeTableInfo
 
 @Suppress("MagicNumber")
-internal object TrackedEntityAttributeLegendSetLinkStore {
-    private val BINDER = StatementBinder { o: TrackedEntityAttributeLegendSetLink, w: StatementWrapper ->
-        w.bind(1, o.trackedEntityAttribute())
-        w.bind(2, o.legendSet())
-        w.bind(3, o.sortOrder())
-    }
+internal class AnalyticsTeiAttributeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsTeiAttributeStore,
+    LinkStoreImpl<AnalyticsTeiAttribute>(
+        databaseAdapter,
+        AnalyticsTeiAttributeTableInfo.TABLE_INFO,
+        AnalyticsTeiAttributeTableInfo.Columns.TEI_SETTING,
+        BINDER,
+        { cursor: Cursor -> AnalyticsTeiAttribute.create(cursor) }
+    ) {
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<TrackedEntityAttributeLegendSetLink> {
-        return linkStore(
-            databaseAdapter, TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO,
-            TrackedEntityAttributeLegendSetLinkTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-            BINDER
-        ) { cursor: Cursor? -> TrackedEntityAttributeLegendSetLink.create(cursor) }
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsTeiAttribute, w: StatementWrapper ->
+            w.bind(1, o.teiSetting())
+            w.bind(2, o.whoComponent())
+            w.bind(3, o.attribute())
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
index 99e261e149..a9e10c551d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
@@ -29,17 +29,20 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.settings.*
+import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
+import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
+import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
+import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
+import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.hisp.dhis.android.core.settings.internal.SettingsAppHelper.buildAnalyticsTeiSetting
 
 @Reusable
 internal class AnalyticsTeiDataChildrenAppender @Inject constructor(
-    private val analyticsTeiDataElementStore: LinkStore<AnalyticsTeiDataElement>,
-    private val analyticsTeiIndicatorStore: LinkStore<AnalyticsTeiIndicator>,
-    private val analyticsTeiAttributeStore: LinkStore<AnalyticsTeiAttribute>,
-    private val analyticsTeiWHONutritionDataStore: LinkStore<AnalyticsTeiWHONutritionData>
+    private val analyticsTeiDataElementStore: AnalyticsTeiDataElementStore,
+    private val analyticsTeiIndicatorStore: AnalyticsTeiIndicatorStore,
+    private val analyticsTeiAttributeStore: AnalyticsTeiAttributeStore,
+    private val analyticsTeiWHONutritionDataStore: AnalyticsTeiWHONutritionDataStore
 ) : ChildrenAppender<AnalyticsTeiSetting>() {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
new file mode 100644
index 0000000000..a03d44ebc4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
+
+@Reusable
+internal class AnalyticsTeiDataElementHandler @Inject constructor(
+    store: AnalyticsTeiDataElementStore
+) : LinkHandlerImpl<AnalyticsTeiDataElement, AnalyticsTeiDataElement>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStore.kt
index 241b9d2a81..559fdef6de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStore.kt
@@ -25,31 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
-import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElementTableInfo
-
-@Suppress("MagicNumber")
-internal object AnalyticsTeiDataElementStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsTeiDataElement, w: StatementWrapper ->
-        w.bind(1, o.teiSetting())
-        w.bind(2, o.whoComponent())
-        w.bind(3, o.programStage())
-        w.bind(4, o.dataElement())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiDataElement> {
-        return linkStore(
-            databaseAdapter, AnalyticsTeiDataElementTableInfo.TABLE_INFO,
-            AnalyticsTeiDataElementTableInfo.Columns.TEI_SETTING, BINDER
-        ) { cursor: Cursor -> AnalyticsTeiDataElement.create(cursor) }
-    }
-}
+internal interface AnalyticsTeiDataElementStore : LinkStore<AnalyticsTeiDataElement>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
new file mode 100644
index 0000000000..1b8aa24297
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
+import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElementTableInfo
+
+@Suppress("MagicNumber")
+internal class AnalyticsTeiDataElementStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsTeiDataElementStore,
+    LinkStoreImpl<AnalyticsTeiDataElement>(
+        databaseAdapter,
+        AnalyticsTeiDataElementTableInfo.TABLE_INFO,
+        AnalyticsTeiDataElementTableInfo.Columns.TEI_SETTING,
+        BINDER,
+        { cursor: Cursor -> AnalyticsTeiDataElement.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsTeiDataElement, w: StatementWrapper ->
+            w.bind(1, o.teiSetting())
+            w.bind(2, o.whoComponent())
+            w.bind(3, o.programStage())
+            w.bind(4, o.dataElement())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
new file mode 100644
index 0000000000..6676def00a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
+
+@Reusable
+internal class AnalyticsTeiIndicatorHandler @Inject constructor(
+    store: AnalyticsTeiIndicatorStore
+) : LinkHandlerImpl<AnalyticsTeiIndicator, AnalyticsTeiIndicator>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStore.kt
index ccecac36a5..f7da049f6e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStore.kt
@@ -25,31 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
-import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicatorTableInfo
-
-@Suppress("MagicNumber")
-internal object AnalyticsTeiIndicatorStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsTeiIndicator, w: StatementWrapper ->
-        w.bind(1, o.teiSetting())
-        w.bind(2, o.whoComponent())
-        w.bind(3, o.programStage())
-        w.bind(4, o.indicator())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiIndicator> {
-        return linkStore(
-            databaseAdapter, AnalyticsTeiIndicatorTableInfo.TABLE_INFO,
-            AnalyticsTeiIndicatorTableInfo.Columns.TEI_SETTING, BINDER
-        ) { cursor: Cursor -> AnalyticsTeiIndicator.create(cursor) }
-    }
-}
+internal interface AnalyticsTeiIndicatorStore : LinkStore<AnalyticsTeiIndicator>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
new file mode 100644
index 0000000000..ca3686ff1d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
+import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicatorTableInfo
+
+@Suppress("MagicNumber")
+internal class AnalyticsTeiIndicatorStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsTeiIndicatorStore,
+    LinkStoreImpl<AnalyticsTeiIndicator>(
+        databaseAdapter,
+        AnalyticsTeiIndicatorTableInfo.TABLE_INFO,
+        AnalyticsTeiIndicatorTableInfo.Columns.TEI_SETTING,
+        BINDER,
+        { cursor: Cursor -> AnalyticsTeiIndicator.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsTeiIndicator, w: StatementWrapper ->
+            w.bind(1, o.teiSetting())
+            w.bind(2, o.whoComponent())
+            w.bind(3, o.programStage())
+            w.bind(4, o.indicator())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
index e6f69ea6b3..4e0f923a97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
@@ -29,19 +29,17 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.settings.*
+import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 
 @Reusable
 internal class AnalyticsTeiSettingHandler @Inject constructor(
-    store: ObjectWithoutUidStore<AnalyticsTeiSetting>,
-    private val teiDataElementHandler: LinkHandler<AnalyticsTeiDataElement, AnalyticsTeiDataElement>,
-    private val teiIndicatorHandler: LinkHandler<AnalyticsTeiIndicator, AnalyticsTeiIndicator>,
-    private val teiAttributeHandler: LinkHandler<AnalyticsTeiAttribute, AnalyticsTeiAttribute>,
-    private val whoNutritionDataHandler: LinkHandler<AnalyticsTeiWHONutritionData, AnalyticsTeiWHONutritionData>
+    store: AnalyticsTeiSettingStore,
+    private val teiDataElementHandler: AnalyticsTeiDataElementHandler,
+    private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler,
+    private val teiAttributeHandler: AnalyticsTeiAttributeHandler,
+    private val whoNutritionDataHandler: AnalyticsTeiWHONutritionDataHandler
 ) : ObjectWithoutUidHandlerImpl<AnalyticsTeiSetting>(store) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStore.kt
index 6015f14559..8ad650bd8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStore.kt
@@ -25,43 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
-import org.hisp.dhis.android.core.settings.AnalyticsTeiSettingTableInfo
-
-@Suppress("MagicNumber")
-internal object AnalyticsTeiSettingStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsTeiSetting, w: StatementWrapper ->
-        w.bind(1, o.uid())
-        w.bind(2, o.name())
-        w.bind(3, o.shortName())
-        w.bind(4, o.program())
-        w.bind(5, o.programStage())
-        w.bind(6, o.period())
-        w.bind(7, o.type())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder {
-            _: AnalyticsTeiSetting, _: StatementWrapper ->
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder {
-            _: AnalyticsTeiSetting, _: StatementWrapper ->
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AnalyticsTeiSetting> {
-        return objectWithoutUidStore(
-            databaseAdapter, AnalyticsTeiSettingTableInfo.TABLE_INFO, BINDER,
-            WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { cursor: Cursor -> AnalyticsTeiSetting.create(cursor) }
-    }
-}
+internal interface AnalyticsTeiSettingStore : ObjectWithoutUidStore<AnalyticsTeiSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
new file mode 100644
index 0000000000..2946df1f80
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
+import org.hisp.dhis.android.core.settings.AnalyticsTeiSettingTableInfo
+
+@Suppress("MagicNumber")
+internal class AnalyticsTeiSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsTeiSettingStore,
+    ObjectWithoutUidStoreImpl<AnalyticsTeiSetting>(
+        databaseAdapter,
+        AnalyticsTeiSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> AnalyticsTeiSetting.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsTeiSetting, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.name())
+            w.bind(3, o.shortName())
+            w.bind(4, o.program())
+            w.bind(5, o.programStage())
+            w.bind(6, o.period())
+            w.bind(7, o.type())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: AnalyticsTeiSetting, _: StatementWrapper ->
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: AnalyticsTeiSetting, _: StatementWrapper ->
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
index af1f688831..3df816d388 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
@@ -29,16 +29,18 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.settings.*
+import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
+import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
+import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
+import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionItem
+import org.hisp.dhis.android.core.settings.WHONutritionComponent
 
 @Reusable
 internal class AnalyticsTeiWHONutritionDataHandler @Inject constructor(
-    store: LinkStore<AnalyticsTeiWHONutritionData>,
-    private val teiDataElementHandler: LinkHandler<AnalyticsTeiDataElement, AnalyticsTeiDataElement>,
-    private val teiIndicatorHandler: LinkHandler<AnalyticsTeiIndicator, AnalyticsTeiIndicator>
+    store: AnalyticsTeiWHONutritionDataStore,
+    private val teiDataElementHandler: AnalyticsTeiDataElementHandler,
+    private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler
 ) : LinkHandlerImpl<AnalyticsTeiWHONutritionData, AnalyticsTeiWHONutritionData>(store) {
 
     override fun afterObjectHandled(o: AnalyticsTeiWHONutritionData) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStore.kt
index 8310da9cae..cb71968208 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStore.kt
@@ -25,32 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkStore
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
-import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionDataTableInfo
-
-@Suppress("MagicNumber")
-internal object AnalyticsTeiWHONutritionDataStore {
-
-    private val BINDER = StatementBinder { o: AnalyticsTeiWHONutritionData, w: StatementWrapper ->
-        w.bind(1, o.teiSetting())
-        w.bind(2, o.chartType())
-        w.bind(3, o.gender().attribute())
-        w.bind(4, o.gender().values().female())
-        w.bind(5, o.gender().values().male())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<AnalyticsTeiWHONutritionData> {
-        return linkStore(
-            databaseAdapter, AnalyticsTeiWHONutritionDataTableInfo.TABLE_INFO,
-            AnalyticsTeiWHONutritionDataTableInfo.Columns.TEI_SETTING, BINDER
-        ) { cursor: Cursor -> AnalyticsTeiWHONutritionData.create(cursor) }
-    }
-}
+internal interface AnalyticsTeiWHONutritionDataStore : LinkStore<AnalyticsTeiWHONutritionData>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
new file mode 100644
index 0000000000..2097a1f073
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
+import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionDataTableInfo
+
+@Suppress("MagicNumber")
+internal class AnalyticsTeiWHONutritionDataStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AnalyticsTeiWHONutritionDataStore,
+    LinkStoreImpl<AnalyticsTeiWHONutritionData>(
+        databaseAdapter,
+        AnalyticsTeiWHONutritionDataTableInfo.TABLE_INFO,
+        AnalyticsTeiWHONutritionDataTableInfo.Columns.TEI_SETTING,
+        BINDER,
+        { cursor: Cursor -> AnalyticsTeiWHONutritionData.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AnalyticsTeiWHONutritionData, w: StatementWrapper ->
+            w.bind(1, o.teiSetting())
+            w.bind(2, o.chartType())
+            w.bind(3, o.gender().attribute())
+            w.bind(4, o.gender().values().female())
+            w.bind(5, o.gender().values().male())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index 54c5ea09e8..1a54de20fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -33,17 +33,14 @@ import io.reactivex.Single
 import java.net.HttpURLConnection
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AppearanceSettings
-import org.hisp.dhis.android.core.settings.FilterSetting
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 
 @Reusable
 internal class AppearanceSettingCall @Inject constructor(
-    private val filterSettingHandler: Handler<FilterSetting>,
-    private val programConfigurationSettingHandler: Handler<ProgramConfigurationSetting>,
+    private val filterSettingHandler: FilterSettingHandler,
+    private val programConfigurationSettingHandler: ProgramConfigurationSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index fc78351721..19ea64e7f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -31,13 +31,11 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.DataSetSetting
 import org.hisp.dhis.android.core.settings.DataSetSettings
 
 @Reusable
 internal class DataSetSettingCall @Inject constructor(
-    private val dataSetSettingHandler: Handler<DataSetSetting>,
+    private val dataSetSettingHandler: DataSetSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.java
deleted file mode 100644
index 28df5d1b95..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.settings.DataSetSetting;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataSetSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    ObjectWithoutUidStore<DataSetSetting> dataSetSettingStore(DatabaseAdapter databaseAdapter) {
-        return DataSetSettingStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<DataSetSetting> dataSetSettingHandler(ObjectWithoutUidStore<DataSetSetting> store) {
-        return new DataSetSettingHandler(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt
new file mode 100644
index 0000000000..665841f0e1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class DataSetSettingEntityDIModule {
+    @Provides
+    @Reusable
+    fun dataSetSettingStore(databaseAdapter: DatabaseAdapter): DataSetSettingStore {
+        return DataSetSettingStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
index cb0cf7e78f..6a0ec7dc62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
@@ -27,12 +27,15 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.DataSetSetting
 
-internal class DataSetSettingHandler(store: ObjectWithoutUidStore<DataSetSetting>) :
-    ObjectWithoutUidHandlerImpl<DataSetSetting>(store) {
+@Reusable
+internal class DataSetSettingHandler @Inject constructor(
+    store: DataSetSettingStore
+) : ObjectWithoutUidHandlerImpl<DataSetSetting>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<DataSetSetting>): Collection<DataSetSetting> {
         store.delete()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.kt
new file mode 100644
index 0000000000..6cc93b999a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.settings.DataSetSetting
+
+internal interface DataSetSettingStore : ObjectWithoutUidStore<DataSetSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
index bf2fb9794c..8b6138e97d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
@@ -25,37 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.settings.internal
 
-package org.hisp.dhis.android.core.settings.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.DataSetSetting
+import org.hisp.dhis.android.core.settings.DataSetSettingTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.settings.DataSetSetting;
-import org.hisp.dhis.android.core.settings.DataSetSettingTableInfo;
+internal class DataSetSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetSettingStore,
+    ObjectWithoutUidStoreImpl<DataSetSetting>(
+        databaseAdapter,
+        DataSetSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> DataSetSetting.create(cursor) }
+    ) {
 
-final class DataSetSettingStore {
-
-    private static final StatementBinder<DataSetSetting> BINDER = (o, w) -> {
-        w.bind(1, o.uid());
-        w.bind(2, o.name());
-        w.bind(3, o.lastUpdated());
-        w.bind(4, o.periodDSDownload());
-        w.bind(5, o.periodDSDBTrimming());
-    };
-
-    private static final WhereStatementBinder<DataSetSetting> WHERE_UPDATE_BINDER =
-            (o, w) -> w.bind(6, o.uid());
-
-    private static final WhereStatementBinder<DataSetSetting> WHERE_DELETE_BINDER =
-            (o, w) -> w.bind(1, o.uid());
-
-    private DataSetSettingStore() {}
-
-    public static ObjectWithoutUidStore<DataSetSetting> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, DataSetSettingTableInfo.TABLE_INFO, BINDER,
-                WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, DataSetSetting::create);
+    companion object {
+        private val BINDER = StatementBinder { o: DataSetSetting, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.name())
+            w.bind(3, o.lastUpdated())
+            w.bind(4, o.periodDSDownload())
+            w.bind(5, o.periodDSDBTrimming())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: DataSetSetting, w: StatementWrapper -> w.bind(6, o.uid()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: DataSetSetting, w: StatementWrapper -> w.bind(1, o.uid()) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt
index ef6d6e5062..c5e876d331 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt
@@ -32,22 +32,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.FilterSetting
 
 @Module
 internal class FilterSettingEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<FilterSetting> {
-        return FilterSettingStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ObjectWithoutUidStore<FilterSetting>): Handler<FilterSetting> {
-        return FilterSettingHandler(store)
+    fun store(databaseAdapter: DatabaseAdapter): FilterSettingStore {
+        return FilterSettingStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
index 430bc3a2a7..0ed8d09b88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
@@ -28,12 +28,15 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.FilterSetting
 
-internal class FilterSettingHandler(store: ObjectWithoutUidStore<FilterSetting>) :
-    ObjectWithoutUidHandlerImpl<FilterSetting>(store) {
+@Reusable
+internal class FilterSettingHandler @Inject constructor(
+    store: FilterSettingStore
+) : ObjectWithoutUidHandlerImpl<FilterSetting>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<FilterSetting>): Collection<FilterSetting> {
         store.delete()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStore.kt
index 3be20deca5..4a84b7a5c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStore.kt
@@ -28,39 +28,7 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
 import org.hisp.dhis.android.core.settings.FilterSetting
-import org.hisp.dhis.android.core.settings.FilterSettingTableInfo
 
-@Suppress("MagicNumber")
-internal object FilterSettingStore {
-
-    private val BINDER = StatementBinder { o: FilterSetting, w: StatementWrapper ->
-        w.bind(1, o.scope())
-        w.bind(2, o.filterType())
-        w.bind(3, o.uid())
-        w.bind(4, o.filter())
-        w.bind(5, o.sort())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: FilterSetting, _: StatementWrapper ->
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: FilterSetting, _: StatementWrapper ->
-    }
-
-    fun create(databaseAdapter: DatabaseAdapter?): ObjectWithoutUidStore<FilterSetting> {
-        return objectWithoutUidStore(
-            databaseAdapter!!, FilterSettingTableInfo.TABLE_INFO,
-            BINDER,
-            WHERE_UPDATE_BINDER,
-            WHERE_DELETE_BINDER
-        ) { cursor: Cursor? -> FilterSetting.create(cursor) }
-    }
-}
+internal interface FilterSettingStore : ObjectWithoutUidStore<FilterSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
new file mode 100644
index 0000000000..f7d4eae25c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.FilterSetting
+import org.hisp.dhis.android.core.settings.FilterSettingTableInfo
+
+@Suppress("MagicNumber")
+internal class FilterSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : FilterSettingStore,
+    ObjectWithoutUidStoreImpl<FilterSetting>(
+        databaseAdapter,
+        FilterSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> FilterSetting.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: FilterSetting, w: StatementWrapper ->
+            w.bind(1, o.scope())
+            w.bind(2, o.filterType())
+            w.bind(3, o.uid())
+            w.bind(4, o.filter())
+            w.bind(5, o.sort())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: FilterSetting, _: StatementWrapper ->
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: FilterSetting, _: StatementWrapper ->
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 5d63f2bb07..072c25d08d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -31,12 +31,11 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.settings.GeneralSettings
 
 @Reusable
 internal class GeneralSettingCall @Inject constructor(
-    private val generalSettingHandler: Handler<GeneralSettings>,
+    private val generalSettingHandler: GeneralSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt
index e2d6911ce8..cbc1363fa0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt
@@ -31,22 +31,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.GeneralSettings
 
 @Module
 internal class GeneralSettingEntityDIModule {
 
     @Provides
     @Reusable
-    fun generalSettingStore(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<GeneralSettings> {
-        return GeneralSettingStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun dataSetSettingHandler(store: ObjectWithoutUidStore<GeneralSettings>): Handler<GeneralSettings> {
-        return GeneralSettingHandler(store)
+    fun generalSettingStore(databaseAdapter: DatabaseAdapter): GeneralSettingStore {
+        return GeneralSettingStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
index eb0afcd538..ecd50c7a87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
@@ -27,11 +27,13 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.GeneralSettings
 
-internal class GeneralSettingHandler(store: ObjectWithoutUidStore<GeneralSettings>) :
+@Reusable
+internal class GeneralSettingHandler @Inject constructor(store: GeneralSettingStore) :
     ObjectWithoutUidHandlerImpl<GeneralSettings>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<GeneralSettings>): Collection<GeneralSettings> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStore.kt
index 6f45685650..a5f42be8d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStore.kt
@@ -25,44 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.settings.GeneralSettingTableInfo
 import org.hisp.dhis.android.core.settings.GeneralSettings
 
-@Suppress("MagicNumber")
-internal object GeneralSettingStore {
-    private val BINDER = StatementBinder<GeneralSettings> { o: GeneralSettings, w: StatementWrapper ->
-        w.bind(1, o.encryptDB())
-        w.bind(2, o.lastUpdated())
-        w.bind(3, o.reservedValues())
-        w.bind(4, o.smsGateway())
-        w.bind(5, o.smsResultSender())
-        w.bind(6, o.matomoID())
-        w.bind(7, o.matomoURL())
-        w.bind(8, o.allowScreenCapture())
-        w.bind(9, o.messageOfTheDay())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder<GeneralSettings> {
-            _: GeneralSettings, _: StatementWrapper ->
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder<GeneralSettings> {
-            _: GeneralSettings, _: StatementWrapper ->
-    }
-
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<GeneralSettings> {
-        return objectWithoutUidStore(
-            databaseAdapter, GeneralSettingTableInfo.TABLE_INFO, BINDER,
-            WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { cursor: Cursor -> GeneralSettings.create(cursor) }
-    }
-}
+internal interface GeneralSettingStore : ObjectWithoutUidStore<GeneralSettings>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
new file mode 100644
index 0000000000..5cdfe7b69f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
@@ -0,0 +1,73 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.GeneralSettingTableInfo
+import org.hisp.dhis.android.core.settings.GeneralSettings
+
+@Suppress("MagicNumber")
+internal class GeneralSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : GeneralSettingStore,
+    ObjectWithoutUidStoreImpl<GeneralSettings>(
+        databaseAdapter,
+        GeneralSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> GeneralSettings.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder<GeneralSettings> { o: GeneralSettings, w: StatementWrapper ->
+            w.bind(1, o.encryptDB())
+            w.bind(2, o.lastUpdated())
+            w.bind(3, o.reservedValues())
+            w.bind(4, o.smsGateway())
+            w.bind(5, o.smsResultSender())
+            w.bind(6, o.matomoID())
+            w.bind(7, o.matomoURL())
+            w.bind(8, o.allowScreenCapture())
+            w.bind(9, o.messageOfTheDay())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder<GeneralSettings> {
+                _: GeneralSettings, _: StatementWrapper ->
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder<GeneralSettings> {
+                _: GeneralSettings, _: StatementWrapper ->
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index 75a6f694eb..59bbfdb603 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -32,12 +32,11 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.LatestAppVersion
 
 @Reusable
 internal class LatestAppVersionCall @Inject constructor(
-    private val latestAppVersionHandler: ObjectWithoutUidHandlerImpl<LatestAppVersion>,
+    private val latestAppVersionHandler: LatestAppVersionHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor
 ) : BaseSettingCall<LatestAppVersion>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt
index 5e8cdcc69a..db61bd54aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt
@@ -32,22 +32,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.settings.LatestAppVersion
 
 @Module
 internal class LatestAppVersionDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<LatestAppVersion> {
-        return LatestAppVersionStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ObjectWithoutUidStore<LatestAppVersion>): ObjectWithoutUidHandlerImpl<LatestAppVersion> {
-        return LatestAppVersionHandler(store)
+    fun store(databaseAdapter: DatabaseAdapter): LatestAppVersionStore {
+        return LatestAppVersionStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
index 6fac5f9221..4bc80b611f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
@@ -28,11 +28,13 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.LatestAppVersion
 
-internal class LatestAppVersionHandler(store: ObjectWithoutUidStore<LatestAppVersion>) :
+@Reusable
+internal class LatestAppVersionHandler @Inject constructor(store: LatestAppVersionStore) :
     ObjectWithoutUidHandlerImpl<LatestAppVersion>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<LatestAppVersion>): Collection<LatestAppVersion> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStore.kt
index bcf0e3d60a..d7a28b3663 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStore.kt
@@ -25,37 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
 import org.hisp.dhis.android.core.settings.LatestAppVersion
-import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo
-
-@Suppress("MagicNumber")
-internal object LatestAppVersionStore {
-    private val BINDER = StatementBinder { o: LatestAppVersion, w: StatementWrapper ->
-        w.bind(1, o.version())
-        w.bind(2, o.downloadURL())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder {
-            _: LatestAppVersion, _: StatementWrapper ->
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder {
-            _: LatestAppVersion, _: StatementWrapper ->
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<LatestAppVersion> {
-        return objectWithoutUidStore(
-            databaseAdapter, LatestAppVersionTableInfo.TABLE_INFO, BINDER,
-            WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { cursor: Cursor? -> LatestAppVersion.create(cursor) }
-    }
-}
+internal interface LatestAppVersionStore : ObjectWithoutUidStore<LatestAppVersion>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
new file mode 100644
index 0000000000..1ac3c89b11
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.LatestAppVersion
+import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo
+
+@Suppress("MagicNumber")
+internal class LatestAppVersionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : LatestAppVersionStore,
+    ObjectWithoutUidStoreImpl<LatestAppVersion>(
+        databaseAdapter,
+        LatestAppVersionTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> LatestAppVersion.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: LatestAppVersion, w: StatementWrapper ->
+            w.bind(1, o.version())
+            w.bind(2, o.downloadURL())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder {
+                _: LatestAppVersion, _: StatementWrapper ->
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder {
+                _: LatestAppVersion, _: StatementWrapper ->
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt
index 3345a48cd8..51b9d1b270 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt
@@ -32,22 +32,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 
 @Module
 internal class ProgramConfigurationSettingEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramConfigurationSetting> {
-        return ProgramConfigurationSettingStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ObjectWithoutUidStore<ProgramConfigurationSetting>): Handler<ProgramConfigurationSetting> {
-        return ProgramConfigurationSettingHandler(store)
+    fun store(databaseAdapter: DatabaseAdapter): ProgramConfigurationSettingStore {
+        return ProgramConfigurationSettingStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
index f14abb07e3..a58bc9deaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
@@ -28,12 +28,15 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 
-internal class ProgramConfigurationSettingHandler(store: ObjectWithoutUidStore<ProgramConfigurationSetting>) :
-    ObjectWithoutUidHandlerImpl<ProgramConfigurationSetting>(store) {
+@Reusable
+internal class ProgramConfigurationSettingHandler @Inject constructor(
+    store: ProgramConfigurationSettingStore
+) : ObjectWithoutUidHandlerImpl<ProgramConfigurationSetting>(store) {
 
     override fun beforeCollectionHandled(
         oCollection: Collection<ProgramConfigurationSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStore.kt
index a76e3e1240..fc1c17e980 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStore.kt
@@ -28,40 +28,7 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
 
-@Suppress("MagicNumber")
-internal object ProgramConfigurationSettingStore {
-
-    private val BINDER =
-        StatementBinder<ProgramConfigurationSetting> { o: ProgramConfigurationSetting, w: StatementWrapper ->
-            w.bind(1, o.uid())
-            w.bind(2, o.completionSpinner())
-            w.bind(3, o.optionalSearch())
-        }
-
-    private val WHERE_UPDATE_BINDER =
-        WhereStatementBinder<ProgramConfigurationSetting> { _: ProgramConfigurationSetting, _: StatementWrapper ->
-        }
-
-    private val WHERE_DELETE_BINDER =
-        WhereStatementBinder<ProgramConfigurationSetting> { _: ProgramConfigurationSetting, _: StatementWrapper ->
-        }
-
-    fun create(databaseAdapter: DatabaseAdapter?): ObjectWithoutUidStore<ProgramConfigurationSetting> {
-        return StoreFactory.objectWithoutUidStore(
-            databaseAdapter!!, ProgramConfigurationSettingTableInfo.TABLE_INFO,
-            BINDER,
-            WHERE_UPDATE_BINDER,
-            WHERE_DELETE_BINDER
-        ) { cursor: Cursor -> ProgramConfigurationSetting.create(cursor) }
-    }
-}
+internal interface ProgramConfigurationSettingStore : ObjectWithoutUidStore<ProgramConfigurationSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
new file mode 100644
index 0000000000..54043d1f61
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
+import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
+
+@Suppress("MagicNumber")
+internal class ProgramConfigurationSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramConfigurationSettingStore,
+    ObjectWithoutUidStoreImpl<ProgramConfigurationSetting>(
+        databaseAdapter,
+        ProgramConfigurationSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> ProgramConfigurationSetting.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER =
+            StatementBinder<ProgramConfigurationSetting> { o: ProgramConfigurationSetting, w: StatementWrapper ->
+                w.bind(1, o.uid())
+                w.bind(2, o.completionSpinner())
+                w.bind(3, o.optionalSearch())
+            }
+
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder<ProgramConfigurationSetting> { _: ProgramConfigurationSetting, _: StatementWrapper ->
+            }
+
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder<ProgramConfigurationSetting> { _: ProgramConfigurationSetting, _: StatementWrapper ->
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index 170c7f05c5..f3335812e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -31,13 +31,11 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettings
 
 @Reusable
 internal class ProgramSettingCall @Inject constructor(
-    private val programSettingHandler: Handler<ProgramSetting>,
+    private val programSettingHandler: ProgramSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.java
deleted file mode 100644
index 1de98fab97..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.settings.ProgramSetting;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class ProgramSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    ObjectWithoutUidStore<ProgramSetting> programSettingStore(DatabaseAdapter databaseAdapter) {
-        return ProgramSettingStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<ProgramSetting> programSettingHandler(ObjectWithoutUidStore<ProgramSetting> store) {
-        return new ProgramSettingHandler(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt
new file mode 100644
index 0000000000..9d6203d715
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class ProgramSettingEntityDIModule {
+    @Provides
+    @Reusable
+    fun programSettingStore(databaseAdapter: DatabaseAdapter): ProgramSettingStore {
+        return ProgramSettingStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
index 14427c576e..2ae091ce37 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
@@ -27,11 +27,13 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.ProgramSetting
 
-internal class ProgramSettingHandler(store: ObjectWithoutUidStore<ProgramSetting>) :
+@Reusable
+internal class ProgramSettingHandler @Inject constructor(store: ProgramSettingStore) :
     ObjectWithoutUidHandlerImpl<ProgramSetting>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<ProgramSetting>): Collection<ProgramSetting> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.kt
new file mode 100644
index 0000000000..7e26577f9a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.settings.ProgramSetting
+
+internal interface ProgramSettingStore : ObjectWithoutUidStore<ProgramSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
similarity index 51%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
index d34fd6065a..c118679227 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
@@ -25,51 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.settings.internal
 
-package org.hisp.dhis.android.core.settings.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.ProgramSetting
+import org.hisp.dhis.android.core.settings.ProgramSettingTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.settings.ProgramSetting;
-import org.hisp.dhis.android.core.settings.ProgramSettingTableInfo;
+internal class ProgramSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramSettingStore,
+    ObjectWithoutUidStoreImpl<ProgramSetting>(
+        databaseAdapter,
+        ProgramSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> ProgramSetting.create(cursor) }
+    ) {
 
-final class ProgramSettingStore {
-
-    private static final StatementBinder<ProgramSetting> BINDER = (o, w) -> {
-        w.bind(1, o.uid());
-        w.bind(2, o.name());
-        w.bind(3, o.lastUpdated());
-        w.bind(4, o.teiDownload());
-        w.bind(5, o.teiDBTrimming());
-        w.bind(6, o.eventsDownload());
-        w.bind(7, o.eventsDBTrimming());
-        w.bind(8, o.updateDownload());
-        w.bind(9, o.updateDBTrimming());
-        w.bind(10, o.settingDownload());
-        w.bind(11, o.settingDBTrimming());
-        w.bind(12, o.enrollmentDownload());
-        w.bind(13, o.enrollmentDBTrimming());
-        w.bind(14, o.eventDateDownload());
-        w.bind(15, o.eventDateDBTrimming());
-        w.bind(16, o.enrollmentDateDownload());
-        w.bind(17, o.enrollmentDateDBTrimming());
-    };
-
-
-    private static final WhereStatementBinder<ProgramSetting> WHERE_UPDATE_BINDER =
-            (o, w) -> w.bind(18, o.uid());
-
-    private static final WhereStatementBinder<ProgramSetting> WHERE_DELETE_BINDER =
-            (o, w) -> w.bind(1, o.uid());
-
-
-    private ProgramSettingStore() {}
-
-    public static ObjectWithoutUidStore<ProgramSetting> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, ProgramSettingTableInfo.TABLE_INFO, BINDER,
-                WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, ProgramSetting::create);
+    companion object {
+        private val BINDER = StatementBinder { o: ProgramSetting, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.name())
+            w.bind(3, o.lastUpdated())
+            w.bind(4, o.teiDownload())
+            w.bind(5, o.teiDBTrimming())
+            w.bind(6, o.eventsDownload())
+            w.bind(7, o.eventsDBTrimming())
+            w.bind(8, o.updateDownload())
+            w.bind(9, o.updateDBTrimming())
+            w.bind(10, o.settingDownload())
+            w.bind(11, o.settingDBTrimming())
+            w.bind(12, o.enrollmentDownload())
+            w.bind(13, o.enrollmentDBTrimming())
+            w.bind(14, o.eventDateDownload())
+            w.bind(15, o.eventDateDBTrimming())
+            w.bind(16, o.enrollmentDateDownload())
+            w.bind(17, o.enrollmentDateDBTrimming())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: ProgramSetting, w: StatementWrapper -> w.bind(18, o.uid()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: ProgramSetting, w: StatementWrapper -> w.bind(1, o.uid()) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index f1fc84b454..173961ed21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -32,14 +32,13 @@ import io.reactivex.Single
 import java.net.HttpURLConnection
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
 
 @Reusable
 internal class SynchronizationSettingCall @Inject constructor(
-    private val synchronizationSettingHandler: Handler<SynchronizationSettings>,
+    private val synchronizationSettingHandler: SynchronizationSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
     private val generalSettingCall: GeneralSettingCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt
index db31efa0b7..aa0d8c7ff3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt
@@ -31,28 +31,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.DataSetSetting
-import org.hisp.dhis.android.core.settings.ProgramSetting
-import org.hisp.dhis.android.core.settings.SynchronizationSettings
 
 @Module
 internal class SynchronizationSettingEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<SynchronizationSettings> {
-        return SynchronizationSettingStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: ObjectWithoutUidStore<SynchronizationSettings>,
-        dataSetSettingHandler: Handler<DataSetSetting>,
-        programSettingHandler: Handler<ProgramSetting>
-    ): Handler<SynchronizationSettings> {
-        return SynchronizationSettingHandler(store, dataSetSettingHandler, programSettingHandler)
+    fun store(databaseAdapter: DatabaseAdapter): SynchronizationSettingStore {
+        return SynchronizationSettingStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
index 6285d3d876..4bf58139fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.settings.DataSetSetting
-import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
 
-internal class SynchronizationSettingHandler(
-    store: ObjectWithoutUidStore<SynchronizationSettings>,
-    private val dataSetSettingHandler: Handler<DataSetSetting>,
-    private val programSettingHandler: Handler<ProgramSetting>
+@Reusable
+internal class SynchronizationSettingHandler @Inject constructor(
+    store: SynchronizationSettingStore,
+    private val dataSetSettingHandler: DataSetSettingHandler,
+    private val programSettingHandler: ProgramSettingHandler
 ) : ObjectWithoutUidHandlerImpl<SynchronizationSettings>(store) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStore.kt
index b07d170b8d..a6f4bee0f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStore.kt
@@ -25,40 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.settings.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.settings.SynchronizationSettingTableInfo
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
 
-@Suppress("MagicNumber")
-internal object SynchronizationSettingStore {
-    private val BINDER = StatementBinder { o: SynchronizationSettings, w: StatementWrapper ->
-        w.bind(1, o.dataSync())
-        w.bind(2, o.metadataSync())
-        w.bind(3, o.trackerImporterVersion())
-        w.bind(4, o.trackerExporterVersion())
-        w.bind(5, o.fileMaxLengthBytes())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder {
-            _: SynchronizationSettings, _: StatementWrapper ->
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder {
-            _: SynchronizationSettings, _: StatementWrapper ->
-    }
-
-    fun create(databaseAdapter: DatabaseAdapter?): ObjectWithoutUidStore<SynchronizationSettings> {
-        return objectWithoutUidStore(
-            databaseAdapter!!, SynchronizationSettingTableInfo.TABLE_INFO, BINDER,
-            WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { cursor: Cursor? -> SynchronizationSettings.create(cursor) }
-    }
-}
+internal interface SynchronizationSettingStore : ObjectWithoutUidStore<SynchronizationSettings>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
new file mode 100644
index 0000000000..fafd999267
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.SynchronizationSettingTableInfo
+import org.hisp.dhis.android.core.settings.SynchronizationSettings
+
+@Suppress("MagicNumber")
+internal class SynchronizationSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SynchronizationSettingStore,
+    ObjectWithoutUidStoreImpl<SynchronizationSettings>(
+        databaseAdapter,
+        SynchronizationSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> SynchronizationSettings.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: SynchronizationSettings, w: StatementWrapper ->
+            w.bind(1, o.dataSync())
+            w.bind(2, o.metadataSync())
+            w.bind(3, o.trackerImporterVersion())
+            w.bind(4, o.trackerExporterVersion())
+            w.bind(5, o.fileMaxLengthBytes())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder {
+                _: SynchronizationSettings, _: StatementWrapper ->
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder {
+                _: SynchronizationSettings, _: StatementWrapper ->
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
index ab7dc5ddec..45498d27f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
@@ -32,14 +32,13 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields.allFields
 
 @Reusable
 internal class SystemSettingCall @Inject constructor(
     private val apiDownloader: APIDownloader,
-    private val handler: Handler<SystemSetting>,
+    private val handler: SystemSettingHandler,
     private val service: SettingService,
     private val settingsSplitter: SystemSettingsSplitter
 ) : ListCall<SystemSetting> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.java
deleted file mode 100644
index 2bfd799dae..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.settings.SystemSetting;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class SystemSettingEntityDIModule implements ObjectWithoutUidStoreProvider<SystemSetting> {
-
-    @Override
-    @Provides
-    @Reusable
-    public ObjectWithoutUidStore<SystemSetting> store(DatabaseAdapter databaseAdapter) {
-        return SystemSettingStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<SystemSetting> handler(ObjectWithoutUidStore<SystemSetting> store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<SystemSetting>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
new file mode 100644
index 0000000000..0f43f8138e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.settings.SystemSetting
+
+@Module
+internal class SystemSettingEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): SystemSettingStore {
+        return SystemSettingStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<SystemSetting>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
new file mode 100644
index 0000000000..a70203c54d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.settings.SystemSetting
+
+@Reusable
+internal class SystemSettingHandler @Inject constructor(
+    store: SystemSettingStore
+) : ObjectWithoutUidHandlerImpl<SystemSetting>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.kt
new file mode 100644
index 0000000000..2785f989ff
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.settings.SystemSetting
+
+internal interface SystemSettingStore : ObjectWithoutUidStore<SystemSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
index df677a7682..e9a3ec23c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
@@ -25,34 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.settings.SystemSetting;
-import org.hisp.dhis.android.core.settings.SystemSettingTableInfo;
-
-final class SystemSettingStore {
-
-    private static final StatementBinder<SystemSetting> BINDER = (o, w) -> {
-        w.bind(1, o.key());
-        w.bind(2, o.value());
-    };
-
-    private static final WhereStatementBinder<SystemSetting> WHERE_UPDATE_BINDER
-            = (o, w) -> w.bind(3, o.key());
-
-    private static final WhereStatementBinder<SystemSetting> WHERE_DELETE_BINDER
-            = (o, w) -> w.bind(1, o.key());
-
-    private SystemSettingStore() {}
-
-    public static ObjectWithoutUidStore<SystemSetting> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, SystemSettingTableInfo.TABLE_INFO, BINDER,
-                WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, SystemSetting::create);
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.SystemSetting
+import org.hisp.dhis.android.core.settings.SystemSettingTableInfo
+
+internal class SystemSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SystemSettingStore,
+    ObjectWithoutUidStoreImpl<SystemSetting>(
+        databaseAdapter,
+        SystemSettingTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> SystemSetting.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: SystemSetting, w: StatementWrapper ->
+            w.bind(1, o.key())
+            w.bind(2, o.value())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: SystemSetting, w: StatementWrapper -> w.bind(3, o.key()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: SystemSetting, w: StatementWrapper -> w.bind(1, o.key()) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
index 4e4d0b92a1..b21639e2df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
@@ -32,12 +32,11 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ObjectCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.settings.UserSettings
 
 @Reusable
 class UserSettingsCall @Inject internal constructor(
-    private val handler: Handler<UserSettings>,
+    private val handler: UserSettingsHandler,
     private val service: SettingService,
     private val apiDownloader: APIDownloader
 ) : ObjectCall<UserSettings> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.java
deleted file mode 100644
index a8e1815ef4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.settings.UserSettings;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class UserSettingsEntityDIModule implements ObjectWithoutUidStoreProvider<UserSettings> {
-
-    @Override
-    @Provides
-    @Reusable
-    public ObjectWithoutUidStore<UserSettings> store(DatabaseAdapter databaseAdapter) {
-        return UserSettingsStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<UserSettings> handler(ObjectWithoutUidStore<UserSettings> store) {
-        return new UserSettingsHandler(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<UserSettings>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
new file mode 100644
index 0000000000..00be5e6dea
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.settings.UserSettings
+
+@Module
+internal class UserSettingsEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): UserSettingsStore {
+        return UserSettingsStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<UserSettings>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
index 7a73a60d0b..829eb99080 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
@@ -27,12 +27,15 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.UserSettings
 
-internal class UserSettingsHandler(store: ObjectWithoutUidStore<UserSettings>) :
-    ObjectWithoutUidHandlerImpl<UserSettings>(store) {
+@Reusable
+internal class UserSettingsHandler @Inject constructor(
+    store: UserSettingsStore
+) : ObjectWithoutUidHandlerImpl<UserSettings>(store) {
 
     override fun beforeObjectHandled(o: UserSettings): UserSettings {
         store.delete()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.kt
new file mode 100644
index 0000000000..8d0fafbc6a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.settings.UserSettings
+
+internal interface UserSettingsStore : ObjectWithoutUidStore<UserSettings>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
index 047007f7ca..c748a0f68a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
@@ -25,32 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.settings.UserSettings;
-import org.hisp.dhis.android.core.settings.UserSettingsTableInfo;
-
-final class UserSettingsStore {
-
-    private static final StatementBinder<UserSettings> BINDER = (o, w) -> {
-        w.bind(1, o.keyUiLocale());
-        w.bind(2, o.keyDbLocale());
-    };
-
-    private static final WhereStatementBinder<UserSettings> WHERE_UPDATE_BINDER = (o, w) -> {};
-
-    private static final WhereStatementBinder<UserSettings> WHERE_DELETE_BINDER = (o, w) -> {};
-
-    private UserSettingsStore() {}
-
-    public static ObjectWithoutUidStore<UserSettings> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, UserSettingsTableInfo.TABLE_INFO, BINDER,
-                WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, UserSettings::create);
+package org.hisp.dhis.android.core.settings.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.settings.UserSettings
+import org.hisp.dhis.android.core.settings.UserSettingsTableInfo
+
+internal class UserSettingsStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : UserSettingsStore,
+    ObjectWithoutUidStoreImpl<UserSettings>(
+        databaseAdapter,
+        UserSettingsTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> UserSettings.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: UserSettings, w: StatementWrapper ->
+            w.bind(1, o.keyUiLocale())
+            w.bind(2, o.keyDbLocale())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: UserSettings, _: StatementWrapper -> }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: UserSettings, _: StatementWrapper -> }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
index 6a430b828a..6ad80e6dc5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
@@ -31,14 +31,13 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.smscompression.SMSConsts
 import org.hisp.dhis.smscompression.models.SMSMetadata
 
 @Reusable
 internal class MetadataIdsStore @Inject constructor(
-    private val smsMetadataIdsStore: ObjectWithoutUidStore<SMSMetadataId>,
+    private val smsMetadataIdsStore: SMSMetadataIdStore,
     private val smsConfigStore: SMSConfigStore
 ) {
     fun getMetadataIds(): Single<SMSMetadata> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
index b1cab824bc..69e3754977 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
@@ -34,13 +34,12 @@ import io.reactivex.Completable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository.TooManySubmissionsException
 import org.hisp.dhis.android.core.sms.domain.repository.internal.SubmissionType
 
 @Reusable
 internal class OngoingSubmissionsStore @Inject constructor(
-    private val smsOngoingSubmissionStore: ObjectWithoutUidStore<SMSOngoingSubmission>,
+    private val smsOngoingSubmissionStore: SMSOngoingSubmissionStore,
     private val smsConfigStore: SMSConfigStore
 ) {
     private var ongoingSubmissions: Map<Int, SubmissionType>? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt
index f422e2ab82..9486f79c40 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt
@@ -27,10 +27,7 @@
  */
 package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 
-import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilder
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -40,22 +37,17 @@ import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.datastore.KeyValuePair
 
 @Suppress("MagicNumber")
-internal class SMSConfigStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilder,
-    binder: StatementBinder<KeyValuePair>,
-    whereUpdateBinder: WhereStatementBinder<KeyValuePair>,
-    whereDeleteBinder: WhereStatementBinder<KeyValuePair>,
-    objectFactory: (Cursor) -> KeyValuePair
-) : ObjectWithoutUidStoreImpl<KeyValuePair>(
-    databaseAdapter,
-    builder,
-    binder,
-    whereUpdateBinder,
-    whereDeleteBinder,
-    objectFactory
-),
-    SMSConfigStore {
+internal class SMSConfigStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SMSConfigStore,
+    ObjectWithoutUidStoreImpl<KeyValuePair>(
+        databaseAdapter,
+        SMSConfigTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor -> KeyValuePair.create(cursor) }
+    ) {
 
     override fun get(key: SMSConfigKey): String? {
         val whereClause = WhereClauseBuilder()
@@ -95,17 +87,5 @@ internal class SMSConfigStoreImpl private constructor(
         private val WHERE_DELETE_BINDER = WhereStatementBinder<KeyValuePair> { o: KeyValuePair, w: StatementWrapper ->
             w.bind(1, o.key())
         }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): SMSConfigStore {
-            val statementBuilder: SQLStatementBuilder = SQLStatementBuilderImpl(
-                SMSConfigTableInfo.TABLE_INFO.name(), SMSConfigTableInfo.TABLE_INFO.columns().all(),
-                SMSConfigTableInfo.TABLE_INFO.columns().whereUpdate()
-            )
-            return SMSConfigStoreImpl(
-                databaseAdapter, statementBuilder, BINDER, WHERE_UPDATE_BINDER,
-                WHERE_DELETE_BINDER
-            ) { cursor -> KeyValuePair.create(cursor) }
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStore.kt
index 9a20c20d6a..aa040e5c91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStore.kt
@@ -25,42 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-
-@Suppress("MagicNumber")
-internal object SMSMetadataIdStore {
-
-    private val BINDER: StatementBinder<SMSMetadataId> = StatementBinder { o, w ->
-        w.bind(1, o.type())
-        w.bind(2, o.uid())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder<SMSMetadataId> { o: SMSMetadataId, w: StatementWrapper ->
-        w.bind(3, o.type())
-        w.bind(4, o.uid())
-    }
-
-    private val WHERE_DELETE_BINDER = WhereStatementBinder<SMSMetadataId> { o: SMSMetadataId, w: StatementWrapper ->
-        w.bind(1, o.type())
-        w.bind(2, o.uid())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<SMSMetadataId> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            SMSMetadataIdTableInfo.TABLE_INFO,
-            BINDER,
-            WHERE_UPDATE_BINDER,
-            WHERE_DELETE_BINDER
-        ) { cursor: Cursor -> SMSMetadataId.create(cursor) }
-    }
-}
+internal interface SMSMetadataIdStore : ObjectWithoutUidStore<SMSMetadataId>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt
new file mode 100644
index 0000000000..3fe8526454
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+@Suppress("MagicNumber")
+internal class SMSMetadataIdStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SMSMetadataIdStore,
+    ObjectWithoutUidStoreImpl<SMSMetadataId>(
+        databaseAdapter,
+        SMSMetadataIdTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> SMSMetadataId.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<SMSMetadataId> = StatementBinder { o, w ->
+            w.bind(1, o.type())
+            w.bind(2, o.uid())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder<SMSMetadataId> { o: SMSMetadataId, w: StatementWrapper ->
+            w.bind(3, o.type())
+            w.bind(4, o.uid())
+        }
+
+        private val WHERE_DELETE_BINDER = WhereStatementBinder<SMSMetadataId> { o: SMSMetadataId, w: StatementWrapper ->
+            w.bind(1, o.type())
+            w.bind(2, o.uid())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStore.kt
index 5da6c82e90..1b58e7e081 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStore.kt
@@ -25,41 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
-
-@Suppress("MagicNumber")
-internal object SMSOngoingSubmissionStore {
-
-    private val BINDER: StatementBinder<SMSOngoingSubmission> = StatementBinder { o, w ->
-        w.bind(1, o.submissionId())
-        w.bind(2, o.type())
-    }
-
-    private val WHERE_UPDATE_BINDER =
-        WhereStatementBinder<SMSOngoingSubmission> { o: SMSOngoingSubmission, w: StatementWrapper ->
-            w.bind(3, o.submissionId())
-        }
-
-    private val WHERE_DELETE_BINDER =
-        WhereStatementBinder<SMSOngoingSubmission> { o: SMSOngoingSubmission, w: StatementWrapper ->
-            w.bind(1, o.submissionId())
-        }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<SMSOngoingSubmission> {
-        return StoreFactory.objectWithoutUidStore(
-            databaseAdapter,
-            SMSOngoingSubmissionTableInfo.TABLE_INFO,
-            BINDER,
-            WHERE_UPDATE_BINDER,
-            WHERE_DELETE_BINDER
-        ) { cursor -> SMSOngoingSubmission.create(cursor) }
-    }
-}
+internal interface SMSOngoingSubmissionStore : ObjectWithoutUidStore<SMSOngoingSubmission>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt
new file mode 100644
index 0000000000..ea96deaf33
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+@Suppress("MagicNumber")
+internal class SMSOngoingSubmissionStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SMSOngoingSubmissionStore,
+    ObjectWithoutUidStoreImpl<SMSOngoingSubmission>(
+        databaseAdapter,
+        SMSOngoingSubmissionTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor -> SMSOngoingSubmission.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<SMSOngoingSubmission> = StatementBinder { o, w ->
+            w.bind(1, o.submissionId())
+            w.bind(2, o.type())
+        }
+
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder<SMSOngoingSubmission> { o: SMSOngoingSubmission, w: StatementWrapper ->
+                w.bind(3, o.submissionId())
+            }
+
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder<SMSOngoingSubmission> { o: SMSOngoingSubmission, w: StatementWrapper ->
+                w.bind(1, o.submissionId())
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.kt
index 849cf02b5c..d834dc492c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.kt
@@ -25,85 +25,80 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.sms.internal
 
-package org.hisp.dhis.android.core.sms.internal;
-
-import android.content.Context;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.sms.SmsModule;
-import org.hisp.dhis.android.core.sms.data.internal.DeviceStateRepositoryImpl;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.LocalDbRepositoryImpl;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStore;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStoreImpl;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataId;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdStore;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmission;
-import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStore;
-import org.hisp.dhis.android.core.sms.data.smsrepository.internal.SmsRepositoryImpl;
-import org.hisp.dhis.android.core.sms.data.webapirepository.internal.ApiService;
-import org.hisp.dhis.android.core.sms.data.webapirepository.internal.WebApiRepositoryImpl;
-import org.hisp.dhis.android.core.sms.domain.repository.SmsRepository;
-import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository;
-import org.hisp.dhis.android.core.sms.domain.repository.internal.DeviceStateRepository;
-import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository;
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.sms.SmsModule
+import org.hisp.dhis.android.core.sms.data.internal.DeviceStateRepositoryImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.LocalDbRepositoryImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStoreImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdStoreImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStoreImpl
+import org.hisp.dhis.android.core.sms.data.smsrepository.internal.SmsRepositoryImpl
+import org.hisp.dhis.android.core.sms.data.webapirepository.internal.ApiService
+import org.hisp.dhis.android.core.sms.data.webapirepository.internal.WebApiRepositoryImpl
+import org.hisp.dhis.android.core.sms.domain.repository.SmsRepository
+import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository
+import org.hisp.dhis.android.core.sms.domain.repository.internal.DeviceStateRepository
+import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import retrofit2.Retrofit
 
 @Module
-public class SmsDIModule {
-
+internal class SmsDIModule {
     @Provides
-    DeviceStateRepository deviceStateRepository(Context context) {
-        return new DeviceStateRepositoryImpl(context);
+    fun deviceStateRepository(context: Context): DeviceStateRepository {
+        return DeviceStateRepositoryImpl(context)
     }
 
     @Provides
-    LocalDbRepository localDbRepository(LocalDbRepositoryImpl impl) {
-        return impl;
+    fun localDbRepository(impl: LocalDbRepositoryImpl): LocalDbRepository {
+        return impl
     }
 
     @Provides
-    SmsRepository smsRepository(Context context) {
-        return new SmsRepositoryImpl(context);
+    fun smsRepository(context: Context): SmsRepository {
+        return SmsRepositoryImpl(context)
     }
 
     @Provides
-    WebApiRepository webApiRepository(ApiService apiService, DHISVersionManager dhisVersionManager) {
-        return new WebApiRepositoryImpl(apiService, dhisVersionManager);
+    fun webApiRepository(apiService: ApiService, dhisVersionManager: DHISVersionManager): WebApiRepository {
+        return WebApiRepositoryImpl(apiService, dhisVersionManager)
     }
 
     @Provides
     @Reusable
-    ObjectWithoutUidStore<SMSMetadataId> smsMetadataIdStore(DatabaseAdapter databaseAdapter) {
-        return SMSMetadataIdStore.create(databaseAdapter);
+    fun smsMetadataIdStore(databaseAdapter: DatabaseAdapter): SMSMetadataIdStore {
+        return SMSMetadataIdStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    SMSConfigStore smsConfigStore(DatabaseAdapter databaseAdapter) {
-        return SMSConfigStoreImpl.create(databaseAdapter);
+    fun smsConfigStore(databaseAdapter: DatabaseAdapter): SMSConfigStore {
+        return SMSConfigStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    ObjectWithoutUidStore<SMSOngoingSubmission> smsOngoingSubmissionStore(DatabaseAdapter databaseAdapter) {
-        return SMSOngoingSubmissionStore.create(databaseAdapter);
+    fun smsOngoingSubmissionStore(databaseAdapter: DatabaseAdapter): SMSOngoingSubmissionStore {
+        return SMSOngoingSubmissionStoreImpl(databaseAdapter)
     }
 
     @Provides
-    ApiService apiService(Retrofit retrofit) {
-        return retrofit.create(ApiService.class);
+    fun apiService(retrofit: Retrofit): ApiService {
+        return retrofit.create(ApiService::class.java)
     }
 
     @Provides
     @Reusable
-    SmsModule module(SmsModuleImpl impl) {
-        return impl;
+    fun module(impl: SmsModuleImpl): SmsModule {
+        return impl
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.kt
index d995798fd8..e72c1337f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModule.kt
@@ -27,9 +27,7 @@
  */
 package org.hisp.dhis.android.core.systeminfo
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
-
 interface SystemInfoModule {
     fun versionManager(): DHISVersionManager
-    fun systemInfo(): ReadOnlyWithDownloadObjectRepository<SystemInfo>
+    fun systemInfo(): SystemInfoObjectRepository
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java
index 6138135e7f..1564be340a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.systeminfo;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyFirstObjectWithDownloadRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall;
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStore;
 
 import java.util.Map;
 
@@ -44,7 +44,7 @@ public final class SystemInfoObjectRepository
         extends ReadOnlyFirstObjectWithDownloadRepositoryImpl<SystemInfo, SystemInfoObjectRepository> {
 
     @Inject
-    SystemInfoObjectRepository(ObjectWithoutUidStore<SystemInfo> store,
+    SystemInfoObjectRepository(SystemInfoStore store,
                                Map<String, ChildrenAppender<SystemInfo>> childrenAppenders,
                                RepositoryScope scope,
                                SystemInfoCall systemInfoCall) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
index b324794e3a..fde32c2540 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
@@ -29,15 +29,17 @@ package org.hisp.dhis.android.core.systeminfo.internal
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
-import org.hisp.dhis.android.core.systeminfo.*
+import org.hisp.dhis.android.core.systeminfo.DHISPatchVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.hisp.dhis.android.core.systeminfo.SMSVersion
 
 @Singleton
 class DHISVersionManagerImpl @Inject internal constructor(
-    private val systemInfoStore: ObjectWithoutUidStore<SystemInfo>
+    private val systemInfoStore: SystemInfoStore
 ) : DHISVersionManager {
     private var version: DHISVersion? = null
     private var patchVersion: DHISPatchVersion? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
index 71b6e0f36d..356db2961d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
@@ -33,7 +33,6 @@ import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
@@ -47,7 +46,7 @@ import org.hisp.dhis.android.core.systeminfo.SystemInfo
 @Reusable
 class SystemInfoCall @Inject internal constructor(
     private val databaseAdapter: DatabaseAdapter,
-    private val systemInfoHandler: Handler<SystemInfo>,
+    private val systemInfoHandler: SystemInfoHandler,
     private val systemInfoService: SystemInfoService,
     private val resourceHandler: ResourceHandler,
     private val versionManager: DHISVersionManagerImpl,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.java
deleted file mode 100644
index 58146e4d79..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.systeminfo.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidEntityDIModule;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.systeminfo.SystemInfo;
-import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class SystemInfoEntityDIModule implements ObjectWithoutUidEntityDIModule<SystemInfo> {
-
-    @Override
-    @Provides
-    @Reusable
-    public ObjectWithoutUidStore<SystemInfo> store(DatabaseAdapter databaseAdapter) {
-        return SystemInfoStore.create(databaseAdapter);
-    }
-
-    @Override
-    @Provides
-    @Reusable
-    public Handler<SystemInfo> handler(ObjectWithoutUidStore<SystemInfo> store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    ReadOnlyWithDownloadObjectRepository<SystemInfo> systemInfoRepository(SystemInfoObjectRepository impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<SystemInfo>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
new file mode 100644
index 0000000000..657befc1e5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.systeminfo.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
+
+@Module
+internal class SystemInfoEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): SystemInfoStore {
+        return SystemInfoStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<SystemInfo>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
new file mode 100644
index 0000000000..bf39696915
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.systeminfo.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
+
+@Reusable
+internal class SystemInfoHandler @Inject constructor(
+    store: SystemInfoStore
+) : ObjectWithoutUidHandlerImpl<SystemInfo>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
index 4e542dfc0d..e76bdfef4b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
@@ -34,12 +34,12 @@ import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 
 @Reusable
 class SystemInfoModuleDownloader @Inject internal constructor(
-    private val systemInfoRepository: ReadOnlyWithDownloadObjectRepository<SystemInfo>
+    private val systemInfoRepository: SystemInfoObjectRepository
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
index 12e0578f22..dc8cf019a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
@@ -29,21 +29,20 @@ package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.hisp.dhis.android.core.systeminfo.SystemInfoModule
+import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 
 @Reusable
 class SystemInfoModuleImpl @Inject internal constructor(
     private val versionManager: DHISVersionManager,
-    private val systemInfo: ReadOnlyWithDownloadObjectRepository<SystemInfo>
+    private val systemInfo: SystemInfoObjectRepository
 ) : SystemInfoModule {
     override fun versionManager(): DHISVersionManager {
         return versionManager
     }
 
-    override fun systemInfo(): ReadOnlyWithDownloadObjectRepository<SystemInfo> {
+    override fun systemInfo(): SystemInfoObjectRepository {
         return systemInfo
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.kt
new file mode 100644
index 0000000000..cd28d3e657
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.systeminfo.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
+
+internal interface SystemInfoStore : ObjectWithoutUidStore<SystemInfo>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
index 9ff9041ce6..8caa94ab8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
@@ -25,38 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.systeminfo.internal
 
-package org.hisp.dhis.android.core.systeminfo.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import org.hisp.dhis.android.core.systeminfo.SystemInfoTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.systeminfo.SystemInfo;
-import org.hisp.dhis.android.core.systeminfo.SystemInfoTableInfo;
+internal class SystemInfoStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : SystemInfoStore,
+    ObjectWithoutUidStoreImpl<SystemInfo>(
+        databaseAdapter,
+        SystemInfoTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> SystemInfo.create(cursor) }
+    ) {
 
-public final class SystemInfoStore {
-
-    private static final StatementBinder<SystemInfo> BINDER = (o, w) -> {
-        w.bind(1, o.serverDate());
-        w.bind(2, o.dateFormat());
-        w.bind(3, o.version());
-        w.bind(4, o.contextPath());
-        w.bind(5, o.systemName());
-    };
-
-    private static final WhereStatementBinder<SystemInfo> WHERE_UPDATE_BINDER =
-            (o, w) -> w.bind(6, o.contextPath());
-
-    private static final WhereStatementBinder<SystemInfo> WHERE_DELETE_BINDER =
-            (o, w) -> w.bind(1, o.contextPath());
-
-    private SystemInfoStore() {
-    }
-
-    public static ObjectWithoutUidStore<SystemInfo> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, SystemInfoTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, SystemInfo::create);
+    companion object {
+        private val BINDER = StatementBinder { o: SystemInfo, w: StatementWrapper ->
+            w.bind(1, o.serverDate())
+            w.bind(2, o.dateFormat())
+            w.bind(3, o.version())
+            w.bind(4, o.contextPath())
+            w.bind(5, o.systemName())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: SystemInfo, w: StatementWrapper -> w.bind(6, o.contextPath()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: SystemInfo, w: StatementWrapper -> w.bind(1, o.contextPath()) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java
index 380c45ad07..134b4d8cd3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -39,6 +38,7 @@
 import org.hisp.dhis.android.core.common.ValueType;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo.Columns;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeFields;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore;
 
 import java.util.Map;
 
@@ -52,7 +52,7 @@ public final class TrackedEntityAttributeCollectionRepository
         TrackedEntityAttributeCollectionRepository> {
 
     @Inject
-    TrackedEntityAttributeCollectionRepository(final IdentifiableObjectStore<TrackedEntityAttribute> store,
+    TrackedEntityAttributeCollectionRepository(final TrackedEntityAttributeStore store,
                                                final Map<String, ChildrenAppender<TrackedEntityAttribute>>
                                                        childrenAppenders,
                                                final RepositoryScope scope) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java
index ce3e37aef0..a9f03ab17c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java
@@ -36,8 +36,6 @@
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager;
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder;
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem;
@@ -47,14 +45,17 @@
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore;
 import org.hisp.dhis.android.core.settings.GeneralSettingObjectRepository;
 import org.hisp.dhis.android.core.settings.GeneralSettings;
+import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingStore;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStoreInterface;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore;
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore;
 
 import java.util.ArrayList;
@@ -77,14 +78,14 @@ public final class TrackedEntityAttributeReservedValueManager {
     private static final Double FACTOR_TO_REFILL = 0.5;
 
 
-    private final TrackedEntityAttributeReservedValueStoreInterface store;
-    private final IdentifiableObjectStore<OrganisationUnit> organisationUnitStore;
-    private final IdentifiableObjectStore<TrackedEntityAttribute> trackedEntityAttributeStore;
-    private final IdentifiableObjectStore<ProgramTrackedEntityAttribute> programTrackedEntityAttributeStore;
-    private final LinkStore<OrganisationUnitProgramLink> organisationUnitProgramLinkStore;
+    private final TrackedEntityAttributeReservedValueStore store;
+    private final OrganisationUnitStore organisationUnitStore;
+    private final TrackedEntityAttributeStore trackedEntityAttributeStore;
+    private final ProgramTrackedEntityAttributeStore programTrackedEntityAttributeStore;
+    private final OrganisationUnitProgramLinkStore organisationUnitProgramLinkStore;
     private final UserOrganisationUnitLinkStore userOrganisationUnitLinkStore;
     private final GeneralSettingObjectRepository generalSettingObjectRepository;
-    private final IdentifiableObjectStore<ReservedValueSetting> reservedValueSettingStore;
+    private final ReservedValueSettingStore reservedValueSettingStore;
     private final D2CallExecutor executor;
     private final QueryCallFactory<TrackedEntityAttributeReservedValue,
             TrackedEntityAttributeReservedValueQuery> reservedValueQueryCallFactory;
@@ -93,14 +94,14 @@ public final class TrackedEntityAttributeReservedValueManager {
 
     @Inject
     TrackedEntityAttributeReservedValueManager(
-            TrackedEntityAttributeReservedValueStoreInterface store,
-            IdentifiableObjectStore<OrganisationUnit> organisationUnitStore,
-            IdentifiableObjectStore<TrackedEntityAttribute> trackedEntityAttributeStore,
-            IdentifiableObjectStore<ProgramTrackedEntityAttribute> programTrackedEntityAttributeStore,
-            LinkStore<OrganisationUnitProgramLink> organisationUnitProgramLinkStore,
+            TrackedEntityAttributeReservedValueStore store,
+            OrganisationUnitStore organisationUnitStore,
+            TrackedEntityAttributeStore trackedEntityAttributeStore,
+            ProgramTrackedEntityAttributeStore programTrackedEntityAttributeStore,
+            OrganisationUnitProgramLinkStore organisationUnitProgramLinkStore,
             UserOrganisationUnitLinkStore userOrganisationUnitLinkStore,
             GeneralSettingObjectRepository generalSettingObjectRepository,
-            IdentifiableObjectStore<ReservedValueSetting> reservedValueSettingStore,
+            ReservedValueSettingStore reservedValueSettingStore,
             D2CallExecutor executor,
             QueryCallFactory<TrackedEntityAttributeReservedValue,
                     TrackedEntityAttributeReservedValueQuery> reservedValueQueryCallFactory) {
@@ -117,11 +118,10 @@ public final class TrackedEntityAttributeReservedValueManager {
     }
 
     /**
-     * @see #getValue(String, String)
-     *
-     * @param attributeUid          Attribute uid
-     * @param organisationUnitUid   Organisation unit uid
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid Organisation unit uid
      * @return Value of tracked entity attribute
+     * @see #getValue(String, String)
      */
     public String blockingGetValue(@NonNull String attributeUid, @NonNull String organisationUnitUid) {
         return getValue(attributeUid, organisationUnitUid).blockingGet();
@@ -131,8 +131,8 @@ public String blockingGetValue(@NonNull String attributeUid, @NonNull String org
      * Get a reserved value and remove it from database. If the number of available values is below a threshold
      * (default {@link #FILL_UP_TO} * {@link #FACTOR_TO_REFILL}) it tries to download before returning a value.
      *
-     * @param attributeUid          Attribute uid
-     * @param organisationUnitUid   Organisation unit uid
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid Organisation unit uid
      * @return Single with value of tracked entity attribute
      */
     public Single<String> getValue(@NonNull String attributeUid, @NonNull String organisationUnitUid) {
@@ -158,10 +158,9 @@ attributeUid, getOrganisationUnit(organisationUnitUid), null, false
     }
 
     /**
+     * @param attributeUid           Attribute uid
+     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @see #downloadReservedValues(String, Integer)
-     *
-     * @param attributeUid              Attribute uid
-     * @param numberOfValuesToFillUp    An optional maximum number of values to reserve
      */
     public void blockingDownloadReservedValues(@NonNull String attributeUid,
                                                Integer numberOfValuesToFillUp) {
@@ -179,8 +178,8 @@ public void blockingDownloadReservedValues(@NonNull String attributeUid,
      * reserves values for each orgunit assigned to the programs with this attribute. It applies the limit
      * per orgunit. Otherwise the limit is applied per attribute.
      *
-     * @param attributeUid              Attribute uid
-     * @param numberOfValuesToFillUp    An optional maximum number of values to reserve
+     * @param attributeUid           Attribute uid
+     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @return An Observable that notifies about the progress.
      */
     public Observable<D2Progress> downloadReservedValues(@NonNull String attributeUid,
@@ -190,9 +189,8 @@ public Observable<D2Progress> downloadReservedValues(@NonNull String attributeUi
     }
 
     /**
-     * @see #downloadAllReservedValues(Integer)
-     *
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
+     * @see #downloadAllReservedValues(Integer)
      */
     public void blockingDownloadAllReservedValues(Integer numberOfValuesToFillUp) {
         downloadAllReservedValues(numberOfValuesToFillUp).blockingSubscribe();
@@ -221,8 +219,8 @@ public Observable<D2Progress> downloadAllReservedValues(Integer numberOfValuesTo
      * Get the count of the reserved values by attribute. If a organisation unit uid is inserted as parameter the method
      * will return the count of the reserved values by attribute and organisation unit.
      *
-     * @param attributeUid          Attribute uid
-     * @param organisationUnitUid   An optional organisation unit uid
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid An optional organisation unit uid
      * @return Single with the reserved value count by attribute or by attribute and organisation unit.
      */
     public Single<Integer> count(@NonNull String attributeUid, @Nullable String organisationUnitUid) {
@@ -230,11 +228,10 @@ public Single<Integer> count(@NonNull String attributeUid, @Nullable String orga
     }
 
     /**
-     * @see #count(String, String)
-     *
-     * @param attributeUid          Attribute uid
-     * @param organisationUnitUid   An optional organisation unit uid
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid An optional organisation unit uid
      * @return The reserved value count by attribute or by attribute and organisation unit.
+     * @see #count(String, String)
      */
     public int blockingCount(@NonNull String attributeUid, @Nullable String organisationUnitUid) {
         return store.count(attributeUid, organisationUnitUid, null);
@@ -250,9 +247,8 @@ public Single<List<ReservedValueSummary>> getReservedValueSummaries() {
     }
 
     /**
-     * @see #getReservedValueSummaries()
-     *
      * @return List of the reserved value summaries
+     * @see #getReservedValueSummaries()
      */
     public List<ReservedValueSummary> blockingGetReservedValueSummaries() {
         String whereClause = new WhereClauseBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.java
index 863e1114c0..565695342e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.trackedentity;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -44,6 +43,7 @@
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTableInfo.Columns;
 import org.hisp.dhis.android.core.trackedentity.internal.EntityQueryCriteriaFields;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterFields;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore;
 
 import java.util.Map;
 
@@ -58,7 +58,7 @@ public final class TrackedEntityInstanceFilterCollectionRepository
 
     @Inject
     TrackedEntityInstanceFilterCollectionRepository(
-            final IdentifiableObjectStore<TrackedEntityInstanceFilter> store,
+            final TrackedEntityInstanceFilterStore store,
             final Map<String, ChildrenAppender<TrackedEntityInstanceFilter>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java
index bf0629911b..a3eb6e8c05 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -36,6 +35,7 @@
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo.Columns;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeStore;
 
 import java.util.Map;
 
@@ -50,7 +50,7 @@ public final class TrackedEntityTypeAttributeCollectionRepository
 
     @Inject
     TrackedEntityTypeAttributeCollectionRepository(
-            final LinkStore<TrackedEntityTypeAttribute> store,
+            final TrackedEntityTypeAttributeStore store,
             final Map<String, ChildrenAppender<TrackedEntityTypeAttribute>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java
index 5e9d6af89c..a1fb7e4b0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.trackedentity;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -38,6 +37,7 @@
 import org.hisp.dhis.android.core.common.FeatureType;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo.Columns;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeFields;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore;
 
 import java.util.Map;
 
@@ -50,7 +50,7 @@ public final class TrackedEntityTypeCollectionRepository
         extends ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityType, TrackedEntityTypeCollectionRepository> {
 
     @Inject
-    TrackedEntityTypeCollectionRepository(final IdentifiableObjectStore<TrackedEntityType> store,
+    TrackedEntityTypeCollectionRepository(final TrackedEntityTypeStore store,
                                           final Map<String, ChildrenAppender<TrackedEntityType>> childrenAppenders,
                                           final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt
index 21bd1b6a96..fbec9c832b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt
@@ -31,23 +31,12 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
-import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterStore.create
 
 @Module
 internal class AttributeValueFilterEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AttributeValueFilter> {
-        return create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ObjectWithoutUidStore<AttributeValueFilter>): HandlerWithTransformer<AttributeValueFilter> {
-        return ObjectWithoutUidHandlerImpl(store)
+    fun store(databaseAdapter: DatabaseAdapter): AttributeValueFilterStore {
+        return AttributeValueFilterStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
new file mode 100644
index 0000000000..17eda9d87c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
+
+@Reusable
+internal class AttributeValueFilterHandler @Inject constructor(
+    store: AttributeValueFilterStore
+) : ObjectWithoutUidHandlerImpl<AttributeValueFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStore.kt
index 707691f310..7b7d033bb8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStore.kt
@@ -25,55 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
-import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 
-@Suppress("MagicNumber")
-internal object AttributeValueFilterStore {
-    private val BINDER = StatementBinder { o: AttributeValueFilter, w: StatementWrapper ->
-        w.bindNull(1)
-        w.bindNull(2)
-        w.bind(3, o.trackedEntityInstanceFilter())
-        w.bind(4, o.attribute())
-        w.bindNull(5)
-        w.bind(6, o.sw())
-        w.bind(7, o.ew())
-        w.bind(8, o.le())
-        w.bind(9, o.ge())
-        w.bind(10, o.gt())
-        w.bind(11, o.lt())
-        w.bind(12, o.eq())
-        w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
-        w.bind(14, o.like())
-        w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: AttributeValueFilter, _ -> }
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: AttributeValueFilter, _ -> }
-
-    @JvmField
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        ItemFilterTableInfo.TABLE_INFO,
-        ItemFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER
-    )
-
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<AttributeValueFilter> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            ItemFilterTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { AttributeValueFilter.create(it) }
-    }
-}
+internal interface AttributeValueFilterStore : ObjectWithoutUidStore<AttributeValueFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
new file mode 100644
index 0000000000..ec427ebeb4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringSetColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
+import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
+
+@Suppress("MagicNumber")
+internal class AttributeValueFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AttributeValueFilterStore,
+    ObjectWithoutUidStoreImpl<AttributeValueFilter>(
+        databaseAdapter,
+        ItemFilterTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { AttributeValueFilter.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AttributeValueFilter, w: StatementWrapper ->
+            w.bindNull(1)
+            w.bindNull(2)
+            w.bind(3, o.trackedEntityInstanceFilter())
+            w.bind(4, o.attribute())
+            w.bindNull(5)
+            w.bind(6, o.sw())
+            w.bind(7, o.ew())
+            w.bind(8, o.le())
+            w.bind(9, o.ge())
+            w.bind(10, o.gt())
+            w.bind(11, o.lt())
+            w.bind(12, o.eq())
+            w.bind(13, StringSetColumnAdapter.serialize(o.`in`()))
+            w.bind(14, o.like())
+            w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.dateFilter()))
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: AttributeValueFilter, _ -> }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: AttributeValueFilter, _ -> }
+
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            ItemFilterTableInfo.TABLE_INFO,
+            ItemFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
index cddd2b2850..bdd4a41d8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
@@ -29,27 +29,24 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor.accessEvents
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollmentTransformer
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.NewTrackerImporterEventTransformer
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore
 import org.hisp.dhis.android.core.relationship.NewTrackerImporterRelationshipTransformer
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityTransformer
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor.accessEnrollments
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 
 @Reusable
 internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject internal constructor(
-    private val programTrackedEntityAttributeStore: IdentifiableObjectStore<ProgramTrackedEntityAttribute>,
-    private val trackedEntityTypeAttributeStore: LinkStore<TrackedEntityTypeAttribute>,
+    private val programTrackedEntityAttributeStore: ProgramTrackedEntityAttributeStore,
+    private val trackedEntityTypeAttributeStore: TrackedEntityTypeAttributeStore,
     private val oldTrackerImporterPayloadGenerator: OldTrackerImporterPayloadGenerator
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
index a07b986e95..91ce53dd95 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
@@ -29,11 +29,10 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.internal.EventStore
-import org.hisp.dhis.android.core.fileresource.FileResource
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObject
@@ -44,7 +43,7 @@ internal class NewTrackerImporterTrackedEntityPostStateManager @Inject internal
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
     private val relationshipStore: RelationshipStore,
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
+    private val fileResourceStore: FileResourceStore,
     private val h: StatePersistorHelper
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
index 21779cad58..6805adf7fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -41,15 +39,16 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventInternalAccessor
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.note.Note
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.note.internal.NoteStore
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
-import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.*
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 
 @Reusable
@@ -62,11 +61,11 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
     private val eventStore: EventStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
-    private val noteStore: IdentifiableObjectStore<Note>,
-    private val trackedEntityTypeStore: IdentifiableObjectStore<TrackedEntityType>,
-    private val relationshipTypeStore: IdentifiableObjectStore<RelationshipType>,
-    private val programStore: ProgramStoreInterface,
-    private val programOwnerStore: ObjectWithoutUidStore<ProgramOwner>
+    private val noteStore: NoteStore,
+    private val trackedEntityTypeStore: TrackedEntityTypeStore,
+    private val relationshipTypeStore: RelationshipTypeStore,
+    private val programStore: ProgramStore,
+    private val programOwnerStore: ProgramOwnerStore
 ) {
 
     private data class ExtraData(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt
new file mode 100644
index 0000000000..d2420d95ba
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class ReservedValueSettingDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): ReservedValueSettingStore {
+        return ReservedValueSettingStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStore.kt
index 1aabcb5da7..4570b709ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStore.kt
@@ -25,25 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.trackedentity.ReservedValueSetting
-import org.hisp.dhis.android.core.trackedentity.ReservedValueSettingTableInfo
-
-internal object ReservedValueSettingStore {
-    private val BINDER = StatementBinder<ReservedValueSetting> { o, w ->
-        w.bind(1, o.uid())
-        w.bind(2, o.numberOfValuesToReserve())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<ReservedValueSetting> {
-        return StoreFactory.objectWithUidStore(
-            databaseAdapter, ReservedValueSettingTableInfo.TABLE_INFO, BINDER
-        ) { ReservedValueSetting.create(it) }
-    }
-}
+internal interface ReservedValueSettingStore : IdentifiableObjectStore<ReservedValueSetting>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
similarity index 67%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
index da6b6a6ea0..3627cec81f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
@@ -25,31 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.dataelement.internal;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.trackedentity.ReservedValueSetting
+import org.hisp.dhis.android.core.trackedentity.ReservedValueSettingTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
+internal class ReservedValueSettingStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ReservedValueSettingStore,
+    IdentifiableObjectStoreImpl<ReservedValueSetting>(
+        databaseAdapter,
+        ReservedValueSettingTableInfo.TABLE_INFO,
+        BINDER,
+        { ReservedValueSetting.create(it) }
+    ) {
 
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataElementOperandEntityDIModule {
-
-    @Provides
-    @Reusable
-    IdentifiableObjectStore<DataElementOperand> store(DatabaseAdapter databaseAdapter) {
-        return DataElementOperandStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Handler<DataElementOperand> handler(IdentifiableObjectStore<DataElementOperand> store) {
-        return new IdentifiableHandlerImpl<>(store);
+    companion object {
+        private val BINDER = StatementBinder<ReservedValueSetting> { o, w ->
+            w.bind(1, o.uid())
+            w.bind(2, o.numberOfValuesToReserve())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java
index c3ffecae9b..c4802b3211 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java
@@ -29,7 +29,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
 
 import java.util.List;
@@ -46,12 +45,12 @@ public final class TrackedEntityAttributeCall implements UidsCall<TrackedEntityA
     private static final int MAX_UID_LIST_SIZE = 140;
 
     private final TrackedEntityAttributeService service;
-    private final Handler<TrackedEntityAttribute> handler;
+    private final TrackedEntityAttributeHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
     TrackedEntityAttributeCall(TrackedEntityAttributeService service,
-                               Handler<TrackedEntityAttribute> handler,
+                               TrackedEntityAttributeHandler handler,
                                APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.java
deleted file mode 100644
index dedfb9495a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class TrackedEntityAttributeEntityDIModule {
-
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<TrackedEntityAttribute> store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityAttributeStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<TrackedEntityAttribute> handler(TrackedEntityAttributeHandler impl) {
-        return impl;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt
new file mode 100644
index 0000000000..bae74b5ad7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class TrackedEntityAttributeEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeStore {
+        return TrackedEntityAttributeStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
similarity index 54%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
index 98a7dbc440..f822e870b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
@@ -25,68 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
 
 @Reusable
-final class TrackedEntityAttributeHandler extends IdentifiableHandlerImpl<TrackedEntityAttribute> {
-
-    private final OrderedLinkHandler<ObjectWithUid, TrackedEntityAttributeLegendSetLink>
-            trackedEntityAttributeLegendSetLinkHandler;
-
-    @Inject
-    TrackedEntityAttributeHandler(
-            IdentifiableObjectStore<TrackedEntityAttribute> trackedEntityAttributeStore,
-            OrderedLinkHandler<ObjectWithUid, TrackedEntityAttributeLegendSetLink>
-                    trackedEntityAttributeLegendSetLinkHandler
-    ) {
-        super(trackedEntityAttributeStore);
-        this.trackedEntityAttributeLegendSetLinkHandler = trackedEntityAttributeLegendSetLinkHandler;
-    }
-
-    @Override
-    protected TrackedEntityAttribute beforeObjectHandled(TrackedEntityAttribute o) {
-        TrackedEntityAttribute.Builder builder = o.toBuilder();
-
+internal class TrackedEntityAttributeHandler @Inject constructor(
+    trackedEntityAttributeStore: TrackedEntityAttributeStore,
+    private val trackedEntityAttributeLegendSetLinkHandler: TrackedEntityAttributeLegendSetLinkHandler
+) : IdentifiableHandlerImpl<TrackedEntityAttribute>(trackedEntityAttributeStore) {
+    override fun beforeObjectHandled(o: TrackedEntityAttribute): TrackedEntityAttribute {
+        val builder = o.toBuilder()
         if (o.formName() == null) {
-            builder.formName(o.name());
+            builder.formName(o.name())
         }
-
         if (o.displayFormName() == null) {
-            builder.displayFormName(o.displayName());
+            builder.displayFormName(o.displayName())
         }
-
-        return builder.build();
+        return builder.build()
     }
 
-    @Override
-    protected void afterObjectHandled(TrackedEntityAttribute o, @NonNull HandleAction action) {
+    override fun afterObjectHandled(o: TrackedEntityAttribute, action: HandleAction) {
         if (o.legendSets() != null) {
-            trackedEntityAttributeLegendSetLinkHandler.handleMany(o.uid(), o.legendSets(),
-                (legendSet, sortOrder) -> TrackedEntityAttributeLegendSetLink.builder()
+            trackedEntityAttributeLegendSetLinkHandler.handleMany(
+                o.uid(), o.legendSets()
+            ) { legendSet: ObjectWithUid, sortOrder: Int? ->
+                TrackedEntityAttributeLegendSetLink.builder()
                     .legendSet(legendSet.uid())
                     .sortOrder(sortOrder)
                     .trackedEntityAttribute(o.uid())
-                    .build());
+                    .build()
+            }
         }
     }
 
-    @Override
-    protected boolean deleteIfCondition(TrackedEntityAttribute trackedEntityAttribute) {
-        return !trackedEntityAttribute.access().read();
+    override fun deleteIfCondition(o: TrackedEntityAttribute): Boolean {
+        return !o.access().read()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
index 75f5d66d31..a55b07a733 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
@@ -31,39 +31,24 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.Collections
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLinkStore
 
 @Module
 internal class TrackedEntityAttributeLegendSetDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<TrackedEntityAttributeLegendSetLink> {
-        return TrackedEntityAttributeLegendSetLinkStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: LinkStore<TrackedEntityAttributeLegendSetLink>
-    ): OrderedLinkHandler<ObjectWithUid, TrackedEntityAttributeLegendSetLink> {
-        return OrderedLinkHandlerImpl(store)
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeLegendSetLinkStore {
+        return TrackedEntityAttributeLegendSetLinkStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<TrackedEntityAttribute>> {
-        return Collections.singletonMap(
-            TrackedEntityAttributeFields.LEGEND_SETS,
-            TrackedEntityAttributeLegendSetChildrenAppender.create(databaseAdapter)
+        return mapOf(
+            TrackedEntityAttributeFields.LEGEND_SETS to
+                TrackedEntityAttributeLegendSetChildrenAppender.create(databaseAdapter)
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
new file mode 100644
index 0000000000..9ce5e0cebc
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
+
+@Reusable
+internal class TrackedEntityAttributeLegendSetLinkHandler @Inject constructor(
+    store: TrackedEntityAttributeLegendSetLinkStore
+) : OrderedLinkHandlerImpl<ObjectWithUid, TrackedEntityAttributeLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStore.kt
new file mode 100644
index 0000000000..824d91ecf7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
+
+internal interface TrackedEntityAttributeLegendSetLinkStore : LinkStore<TrackedEntityAttributeLegendSetLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
new file mode 100644
index 0000000000..2af8a870c4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLinkTableInfo
+
+@Suppress("MagicNumber")
+internal class TrackedEntityAttributeLegendSetLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityAttributeLegendSetLinkStore,
+    LinkStoreImpl<TrackedEntityAttributeLegendSetLink>(
+        databaseAdapter,
+        TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO,
+        TrackedEntityAttributeLegendSetLinkTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
+        BINDER,
+        { cursor: Cursor -> TrackedEntityAttributeLegendSetLink.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityAttributeLegendSetLink, w: StatementWrapper ->
+            w.bind(1, o.trackedEntityAttribute())
+            w.bind(2, o.legendSet())
+            w.bind(3, o.sortOrder())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java
index f8973c5359..bebddc8d1b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java
@@ -34,7 +34,6 @@
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher;
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
 
 import java.util.List;
@@ -49,14 +48,14 @@ public final class TrackedEntityAttributeReservedValueEndpointCallFactory
         TrackedEntityAttributeReservedValueQuery> {
 
     private final TrackedEntityAttributeReservedValueService service;
-    private final Handler<TrackedEntityAttributeReservedValue> handler;
+    private final TrackedEntityAttributeReservedValueHandler handler;
 
     @Inject
     TrackedEntityAttributeReservedValueEndpointCallFactory(
             GenericCallData data,
             APICallExecutor apiCallExecutor,
             TrackedEntityAttributeReservedValueService service,
-            Handler<TrackedEntityAttributeReservedValue> handler) {
+            TrackedEntityAttributeReservedValueHandler handler) {
         super(data, apiCallExecutor);
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.java
deleted file mode 100644
index 659ebfc9c7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module
-public final class TrackedEntityAttributeReservedValueEntityDIModule {
-
-    @Provides
-    @Reusable
-    public TrackedEntityAttributeReservedValueStoreInterface store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityAttributeReservedValueStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<TrackedEntityAttributeReservedValue> handler(
-            TrackedEntityAttributeReservedValueStoreInterface store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    public TrackedEntityAttributeReservedValueService service(Retrofit retrofit) {
-        return retrofit.create(TrackedEntityAttributeReservedValueService.class);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt
new file mode 100644
index 0000000000..aea807e4fa
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import retrofit2.Retrofit
+
+@Module
+internal class TrackedEntityAttributeReservedValueEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeReservedValueStore {
+        return TrackedEntityAttributeReservedValueStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun service(retrofit: Retrofit): TrackedEntityAttributeReservedValueService {
+        return retrofit.create(TrackedEntityAttributeReservedValueService::class.java)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
new file mode 100644
index 0000000000..a61fd7c81c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+
+@Reusable
+internal class TrackedEntityAttributeReservedValueHandler @Inject constructor(
+    store: TrackedEntityAttributeReservedValueStore
+) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeReservedValue>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.java
deleted file mode 100644
index abafab2e7c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo.Columns;
-
-import java.util.Date;
-
-public final class TrackedEntityAttributeReservedValueStore
-        extends ObjectWithoutUidStoreImpl<TrackedEntityAttributeReservedValue>
-        implements TrackedEntityAttributeReservedValueStoreInterface {
-
-    private static final StatementBinder<TrackedEntityAttributeReservedValue> BINDER = (o, w) -> {
-        w.bind(1, o.ownerObject());
-        w.bind(2, o.ownerUid());
-        w.bind(3, o.key());
-        w.bind(4, o.value());
-        w.bind(5, o.created());
-        w.bind(6, o.expiryDate());
-        w.bind(7, o.organisationUnit());
-        w.bind(8, o.temporalValidityDate());
-        w.bind(9, o.pattern());
-    };
-
-    private static final WhereStatementBinder<TrackedEntityAttributeReservedValue> WHERE_UPDATE_BINDER = (o, w) -> {
-        w.bind(10, o.ownerUid());
-        w.bind(11, o.value());
-        w.bind(12, o.organisationUnit());
-    };
-
-    private static final WhereStatementBinder<TrackedEntityAttributeReservedValue> WHERE_DELETE_BINDER = (o, w) -> {
-        w.bind(1, o.ownerUid());
-        w.bind(2, o.value());
-        w.bind(3, o.organisationUnit());
-    };
-
-    private TrackedEntityAttributeReservedValueStore(
-            DatabaseAdapter databaseAdapter,
-            SQLStatementBuilderImpl builder,
-            StatementBinder<TrackedEntityAttributeReservedValue> binder,
-            WhereStatementBinder<TrackedEntityAttributeReservedValue> whereUpdateBinder,
-            WhereStatementBinder<TrackedEntityAttributeReservedValue> whereDeleteBinder) {
-        super(databaseAdapter, builder, binder, whereUpdateBinder, whereDeleteBinder,
-                TrackedEntityAttributeReservedValue::create);
-    }
-
-    @Override
-    public void deleteExpired(@NonNull Date serverDate) throws RuntimeException {
-        String serverDateStr = "date('" + BaseIdentifiableObject.DATE_FORMAT.format(serverDate) + "')";
-        super.deleteWhere(Columns.EXPIRY_DATE + " < " + serverDateStr + " OR " +
-                "( " + Columns.TEMPORAL_VALIDITY_DATE + " < " + serverDateStr + " AND " +
-                Columns.TEMPORAL_VALIDITY_DATE + " IS NOT NULL );");
-    }
-
-    @Override
-    public void deleteIfOutdatedPattern(@NonNull String ownerUid, @NonNull String pattern) {
-        String deleteWhereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(Columns.OWNER_UID, ownerUid)
-                .appendNotKeyStringValue(Columns.PATTERN, pattern)
-                .build();
-
-        super.deleteWhere(deleteWhereClause);
-    }
-
-    @Override
-    public TrackedEntityAttributeReservedValue popOne(@NonNull String ownerUid, @Nullable String organisationUnitUid) {
-        return popOneWhere(where(ownerUid, organisationUnitUid, null));
-    }
-
-    @Override
-    public int count(@NonNull String ownerUid, @Nullable String organisationUnitUid, @Nullable String pattern) {
-        return countWhere(where(ownerUid, organisationUnitUid, pattern));
-    }
-
-    private String where(@NonNull String ownerUid,
-                         @Nullable String organisationUnit,
-                         @Nullable String pattern) {
-        WhereClauseBuilder builder = new WhereClauseBuilder()
-                .appendKeyStringValue(Columns.OWNER_UID, ownerUid);
-
-        if (organisationUnit != null) {
-            builder.appendKeyStringValue(Columns.ORGANISATION_UNIT, organisationUnit);
-        }
-        if (pattern != null) {
-            builder.appendKeyStringValue(Columns.PATTERN, pattern);
-        }
-
-        return builder.build();
-    }
-
-    public static TrackedEntityAttributeReservedValueStoreInterface create(DatabaseAdapter databaseAdapter) {
-
-        SQLStatementBuilderImpl statementBuilder =
-                new SQLStatementBuilderImpl(TrackedEntityAttributeReservedValueTableInfo.TABLE_INFO);
-
-        return new TrackedEntityAttributeReservedValueStore(databaseAdapter, statementBuilder,
-                BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt
index 6bf49a3939..d5e96c7822 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt
@@ -25,23 +25,16 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.period.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.period.Period;
-import org.hisp.dhis.android.core.period.PeriodType;
-
-import java.util.Date;
-
-import io.reactivex.annotations.NonNull;
-
-public interface PeriodStore extends ObjectWithoutUidStore<Period> {
-
-    Period selectByPeriodId(String periodId);
-
-    Period selectPeriodByTypeAndDate(@NonNull PeriodType periodType, @NonNull Date date);
-
-    Date getOldestPeriodStartDate();
-
-}
\ No newline at end of file
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import java.util.Date
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+
+internal interface TrackedEntityAttributeReservedValueStore :
+    ObjectWithoutUidStore<TrackedEntityAttributeReservedValue> {
+    fun deleteExpired(serverDate: Date)
+    fun deleteIfOutdatedPattern(ownerUid: String, pattern: String)
+    fun popOne(ownerUid: String, organisationUnitUid: String?): TrackedEntityAttributeReservedValue?
+    fun count(ownerUid: String, organisationUnitUid: String?, pattern: String?): Int
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
new file mode 100644
index 0000000000..4b58f647e8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
@@ -0,0 +1,122 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import android.database.Cursor
+import java.util.Date
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo.Columns
+
+@Suppress("MagicNumber")
+internal class TrackedEntityAttributeReservedValueStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityAttributeReservedValueStore,
+    ObjectWithoutUidStoreImpl<TrackedEntityAttributeReservedValue>(
+        databaseAdapter,
+        TrackedEntityAttributeReservedValueTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> TrackedEntityAttributeReservedValue.create(cursor) }
+    ) {
+
+    override fun deleteExpired(serverDate: Date) {
+        val serverDateStr = "date('${DateUtils.DATE_FORMAT.format(serverDate)}')"
+        super.deleteWhere(
+            "${Columns.EXPIRY_DATE} < $serverDateStr OR " +
+                "( ${Columns.TEMPORAL_VALIDITY_DATE} < $serverDateStr AND " +
+                "${Columns.TEMPORAL_VALIDITY_DATE} IS NOT NULL );"
+        )
+    }
+
+    override fun deleteIfOutdatedPattern(ownerUid: String, pattern: String) {
+        val deleteWhereClause = WhereClauseBuilder()
+            .appendKeyStringValue(Columns.OWNER_UID, ownerUid)
+            .appendNotKeyStringValue(Columns.PATTERN, pattern)
+            .build()
+        super.deleteWhere(deleteWhereClause)
+    }
+
+    override fun popOne(ownerUid: String, organisationUnitUid: String?): TrackedEntityAttributeReservedValue? {
+        return popOneWhere(where(ownerUid, organisationUnitUid, null))
+    }
+
+    override fun count(ownerUid: String, organisationUnitUid: String?, pattern: String?): Int {
+        return countWhere(where(ownerUid, organisationUnitUid, pattern))
+    }
+
+    private fun where(
+        ownerUid: String,
+        organisationUnit: String?,
+        pattern: String?
+    ): String {
+        val builder = WhereClauseBuilder()
+            .appendKeyStringValue(Columns.OWNER_UID, ownerUid)
+        if (organisationUnit != null) {
+            builder.appendKeyStringValue(Columns.ORGANISATION_UNIT, organisationUnit)
+        }
+        if (pattern != null) {
+            builder.appendKeyStringValue(Columns.PATTERN, pattern)
+        }
+        return builder.build()
+    }
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityAttributeReservedValue, w: StatementWrapper ->
+            w.bind(1, o.ownerObject())
+            w.bind(2, o.ownerUid())
+            w.bind(3, o.key())
+            w.bind(4, o.value())
+            w.bind(5, o.created())
+            w.bind(6, o.expiryDate())
+            w.bind(7, o.organisationUnit())
+            w.bind(8, o.temporalValidityDate())
+            w.bind(9, o.pattern())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: TrackedEntityAttributeReservedValue, w: StatementWrapper ->
+                w.bind(10, o.ownerUid())
+                w.bind(11, o.value())
+                w.bind(12, o.organisationUnit())
+            }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: TrackedEntityAttributeReservedValue, w: StatementWrapper ->
+                w.bind(1, o.ownerUid())
+                w.bind(2, o.value())
+                w.bind(3, o.organisationUnit())
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreInterface.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreInterface.java
deleted file mode 100644
index 4868a20930..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreInterface.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-
-import java.util.Date;
-
-public interface TrackedEntityAttributeReservedValueStoreInterface
-        extends ObjectWithoutUidStore<TrackedEntityAttributeReservedValue> {
-
-    void deleteExpired(@NonNull Date serverDate);
-
-    void deleteIfOutdatedPattern(@NonNull String ownerUid, @NonNull String pattern);
-
-    TrackedEntityAttributeReservedValue popOne(@NonNull String ownerUid, @Nullable String organisationUnitUid);
-
-    int count(@NonNull String ownerUid, @Nullable String organisationUnitUid, @Nullable String pattern);
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.kt
new file mode 100644
index 0000000000..8cae43fb71
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+
+internal interface TrackedEntityAttributeStore : IdentifiableObjectStore<TrackedEntityAttribute>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
similarity index 52%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
index e1b5d679ae..0dbe7f5cc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
@@ -25,53 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo;
+@Suppress("MagicNumber")
+internal class TrackedEntityAttributeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityAttributeStore,
+    IdentifiableObjectStoreImpl<TrackedEntityAttribute>(
+        databaseAdapter,
+        TrackedEntityAttributeTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> TrackedEntityAttribute.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class TrackedEntityAttributeStore {
-
-    private TrackedEntityAttributeStore() {}
-
-    private static StatementBinder<TrackedEntityAttribute> BINDER =
-            new NameableWithStyleStatementBinder<TrackedEntityAttribute>() {
-
-        @Override
-        public void bindToStatement(@NonNull TrackedEntityAttribute o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(13, o.pattern());
-            w.bind(14, o.sortOrderInListNoProgram());
-            w.bind(15, UidsHelper.getUidOrNull(o.optionSet()));
-            w.bind(16, o.valueType());
-            w.bind(17, o.expression());
-            w.bind(18, o.programScope());
-            w.bind(19, o.displayInListNoProgram());
-            w.bind(20, o.generated());
-            w.bind(21, o.displayOnVisitSchedule());
-            w.bind(22, o.orgUnitScope());
-            w.bind(23, o.unique());
-            w.bind(24, o.inherit());
-            w.bind(25, o.formName());
-            w.bind(26, o.displayFormName());
-            w.bind(27, o.fieldMask());
-            w.bind(28, o.aggregationType());
-            w.bind(29, o.confidential());
-        }
-    };
-
-    public static IdentifiableObjectStore<TrackedEntityAttribute> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter,
-                TrackedEntityAttributeTableInfo.TABLE_INFO, BINDER, TrackedEntityAttribute::create);
+    companion object {
+        private val BINDER: StatementBinder<TrackedEntityAttribute> =
+            object : NameableWithStyleStatementBinder<TrackedEntityAttribute>() {
+                override fun bindToStatement(o: TrackedEntityAttribute, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(13, o.pattern())
+                    w.bind(14, o.sortOrderInListNoProgram())
+                    w.bind(15, getUidOrNull(o.optionSet()))
+                    w.bind(16, o.valueType())
+                    w.bind(17, o.expression())
+                    w.bind(18, o.programScope())
+                    w.bind(19, o.displayInListNoProgram())
+                    w.bind(20, o.generated())
+                    w.bind(21, o.displayOnVisitSchedule())
+                    w.bind(22, o.orgUnitScope())
+                    w.bind(23, o.unique())
+                    w.bind(24, o.inherit())
+                    w.bind(25, o.formName())
+                    w.bind(26, o.displayFormName())
+                    w.bind(27, o.fieldMask())
+                    w.bind(28, o.aggregationType())
+                    w.bind(29, o.confidential())
+                }
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java
index 88d2a0c16c..716eb04df7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java
@@ -55,7 +55,7 @@ public static ChildrenAppender<TrackedEntityInstance> create(DatabaseAdapter dat
         return new TrackedEntityAttributeValueChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        TrackedEntityAttributeValueStoreImpl.CHILD_PROJECTION,
+                        TrackedEntityAttributeValueStoreImpl.Companion.getCHILD_PROJECTION(),
                         TrackedEntityAttributeValue::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
new file mode 100644
index 0000000000..c1a23a36a1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+
+@Module
+internal class TrackedEntityAttributeValueEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeValueStore {
+        return TrackedEntityAttributeValueStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<TrackedEntityAttributeValue>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
index 68b1f0334c..d682cdd1ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
@@ -27,11 +27,12 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 
-internal class TrackedEntityAttributeValueHandler(
-    trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore
-) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeValue>(
-    trackedEntityAttributeValueStore
-)
+@Reusable
+internal class TrackedEntityAttributeValueHandler @Inject constructor(
+    store: TrackedEntityAttributeValueStore
+) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeValue>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
index 0964ed2044..cbb7e2b884 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -41,20 +40,21 @@ import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper.asStringList
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
-import org.hisp.dhis.android.core.trackedentity.*
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo
 
-internal class TrackedEntityAttributeValueStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    builder: SQLStatementBuilderImpl
-) : ObjectWithoutUidStoreImpl<TrackedEntityAttributeValue>(
-    databaseAdapter,
-    builder,
-    BINDER,
-    WHERE_UPDATE_BINDER,
-    WHERE_DELETE_BINDER,
-    { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) }
-),
-    TrackedEntityAttributeValueStore {
+internal class TrackedEntityAttributeValueStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityAttributeValueStore,
+    ObjectWithoutUidStoreImpl<TrackedEntityAttributeValue>(
+        databaseAdapter,
+        TrackedEntityAttributeValueTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) }
+    ) {
 
     override fun queryTrackedEntityAttributeValueToPost(): Map<String, List<TrackedEntityAttributeValue>> {
         val toPostQuery = "SELECT TrackedEntityAttributeValue.* " +
@@ -194,22 +194,9 @@ internal class TrackedEntityAttributeValueStoreImpl private constructor(
                 w.bind(2, o.trackedEntityInstance())
             }
 
-        @JvmField
         val CHILD_PROJECTION = SingleParentChildProjection(
             TrackedEntityAttributeValueTableInfo.TABLE_INFO,
             TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE
         )
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeValueStore {
-            val statementBuilder = SQLStatementBuilderImpl(
-                TrackedEntityAttributeValueTableInfo.TABLE_INFO.name(),
-                TrackedEntityAttributeValueTableInfo.TABLE_INFO.columns()
-            )
-            return TrackedEntityAttributeValueStoreImpl(
-                databaseAdapter,
-                statementBuilder
-            )
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java
index 9648db031f..3978fb4eae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java
@@ -54,7 +54,7 @@ public static ChildrenAppender<Event> create(DatabaseAdapter databaseAdapter) {
         return new TrackedEntityDataValueChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        TrackedEntityDataValueStoreImpl.CHILD_PROJECTION,
+                        TrackedEntityDataValueStoreImpl.Companion.getCHILD_PROJECTION(),
                         TrackedEntityDataValue::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
new file mode 100644
index 0000000000..0c8a3be9ed
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+
+@Module
+internal class TrackedEntityDataValueEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityDataValueStore {
+        return TrackedEntityDataValueStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<TrackedEntityDataValue>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.java
deleted file mode 100644
index 6c33786421..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public final class TrackedEntityDataValueHandler extends ObjectWithoutUidHandlerImpl<TrackedEntityDataValue> {
-    private final TrackedEntityDataValueStore trackedEntityDataValueStore;
-
-    TrackedEntityDataValueHandler(TrackedEntityDataValueStore trackedEntityDataValueStore) {
-        super(trackedEntityDataValueStore);
-        this.trackedEntityDataValueStore = trackedEntityDataValueStore;
-    }
-
-    public void removeEventDataValues(String eventUid) {
-        trackedEntityDataValueStore.deleteByEvent(eventUid);
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<TrackedEntityDataValue> trackedEntityDataValues) {
-        removeNotExistingDataValuesInServer(trackedEntityDataValues);
-    }
-
-    private void removeNotExistingDataValuesInServer(Collection<TrackedEntityDataValue> trackedEntityDataValues) {
-        if (trackedEntityDataValues.isEmpty()) {
-            return;
-        }
-
-        String eventUid = trackedEntityDataValues.iterator().next().event();
-
-        List<String> dataElementUids = new ArrayList<>();
-        for (TrackedEntityDataValue dataValue : trackedEntityDataValues) {
-            dataElementUids.add(dataValue.dataElement());
-        }
-
-        trackedEntityDataValueStore.deleteByEventAndNotInDataElements(eventUid, dataElementUids);
-    }
-
-    public static TrackedEntityDataValueHandler create(DatabaseAdapter databaseAdapter) {
-        return new TrackedEntityDataValueHandler(TrackedEntityDataValueStoreImpl.create(databaseAdapter));
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
index 7f0eea74b0..6435780281 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
@@ -25,36 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class RelationshipItemEntityDIModule {
-
-    @Provides
-    @Reusable
-    RelationshipItemStore store(DatabaseAdapter databaseAdapter) {
-        return RelationshipItemStoreImpl.create(databaseAdapter);
+@Reusable
+internal class TrackedEntityDataValueHandler @Inject constructor(
+    private val trackedEntityDataValueStore: TrackedEntityDataValueStore
+) : ObjectWithoutUidHandlerImpl<TrackedEntityDataValue>(trackedEntityDataValueStore) {
+    fun removeEventDataValues(eventUid: String?) {
+        trackedEntityDataValueStore.deleteByEvent(eventUid!!)
     }
 
-    @Provides
-    @Reusable
-    Handler<RelationshipItem> handler(RelationshipItemStore store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
+    override fun afterCollectionHandled(oCollection: Collection<TrackedEntityDataValue>?) {
+        removeNotExistingDataValuesInServer(oCollection)
     }
 
-    @Provides
-    @Reusable
-    RelationshipItemElementStoreSelector storeSelector(RelationshipItemElementStoreSelectorImpl impl) {
-        return impl;
+    private fun removeNotExistingDataValuesInServer(trackedEntityDataValues: Collection<TrackedEntityDataValue>?) {
+        if (trackedEntityDataValues.isNullOrEmpty()) {
+            return
+        }
+
+        val eventUid = trackedEntityDataValues.iterator().next().event()
+        val dataElementUids = trackedEntityDataValues.mapNotNull { it.dataElement() }
+        trackedEntityDataValueStore.deleteByEventAndNotInDataElements(eventUid!!, dataElementUids)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStore.kt
similarity index 67%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStore.kt
index 61fc96cbd9..533647bec4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStore.kt
@@ -25,30 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue;
-
-import java.util.List;
-import java.util.Map;
-
-import androidx.annotation.NonNull;
-
-public interface TrackedEntityDataValueStore extends ObjectWithoutUidStore<TrackedEntityDataValue> {
-
-    boolean deleteByEventAndNotInDataElements(String eventUid, List<String> dataElementUids);
-
-    boolean deleteByEvent(String eventUid);
-
-    List<TrackedEntityDataValue> queryTrackedEntityDataValuesByEventUid(@NonNull String eventUid);
-
-    Map<String, List<TrackedEntityDataValue>> querySingleEventsTrackedEntityDataValues();
-
-    Map<String, List<TrackedEntityDataValue>> queryTrackerTrackedEntityDataValues();
-
-    Map<String, List<TrackedEntityDataValue>> queryByUploadableEvents();
-
-    void removeDeletedDataValuesByEvent(@NonNull String eventUid);
-}
\ No newline at end of file
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+
+internal interface TrackedEntityDataValueStore : ObjectWithoutUidStore<TrackedEntityDataValue> {
+    fun deleteByEventAndNotInDataElements(eventUid: String, dataElementUids: List<String>): Boolean
+    fun deleteByEvent(eventUid: String): Boolean
+    fun queryTrackedEntityDataValuesByEventUid(eventUid: String): List<TrackedEntityDataValue>
+    fun querySingleEventsTrackedEntityDataValues(): Map<String, List<TrackedEntityDataValue>>
+    fun queryTrackerTrackedEntityDataValues(): Map<String, List<TrackedEntityDataValue>>
+    fun queryByUploadableEvents(): Map<String, List<TrackedEntityDataValue>>
+    fun removeDeletedDataValuesByEvent(eventUid: String)
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.java
deleted file mode 100644
index 1860f5d03a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import android.database.Cursor;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
-import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.event.EventTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import kotlin.jvm.functions.Function1;
-
-public final class TrackedEntityDataValueStoreImpl extends ObjectWithoutUidStoreImpl<TrackedEntityDataValue>
-        implements TrackedEntityDataValueStore {
-
-    private static final StatementBinder<TrackedEntityDataValue> BINDER = (o, w) -> {
-        w.bind(1, o.event());
-        w.bind(2, o.created());
-        w.bind(3, o.lastUpdated());
-        w.bind(4, o.dataElement());
-        w.bind(5, o.storedBy());
-        w.bind(6, o.value());
-        w.bind(7, o.providedElsewhere());
-    };
-
-    private static final WhereStatementBinder<TrackedEntityDataValue> WHERE_UPDATE_BINDER = (o, w) -> {
-        w.bind(8, o.event());
-        w.bind(9, o.dataElement());
-    };
-
-    private static final WhereStatementBinder<TrackedEntityDataValue> WHERE_DELETE_BINDER = (o, w) -> {
-        w.bind(1, o.event());
-        w.bind(2, o.dataElement());
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            TrackedEntityDataValueTableInfo.TABLE_INFO, TrackedEntityDataValueTableInfo.Columns.EVENT);
-
-    private TrackedEntityDataValueStoreImpl(DatabaseAdapter databaseAdapter,
-                                            SQLStatementBuilderImpl builder,
-                                            StatementBinder<TrackedEntityDataValue> binder,
-                                            WhereStatementBinder<TrackedEntityDataValue> whereUpdateBinder,
-                                            WhereStatementBinder<TrackedEntityDataValue> whereDeleteBinder,
-                                            Function1<Cursor, TrackedEntityDataValue> objectFactory) {
-        super(databaseAdapter, builder, binder, whereUpdateBinder, whereDeleteBinder, objectFactory);
-    }
-
-    @Override
-    public boolean deleteByEventAndNotInDataElements(@NonNull String eventUid,
-                                                     @NonNull List<String> dataElementUids) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
-                .appendNotInKeyStringValues(TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT, dataElementUids)
-                .build();
-
-        return deleteWhere(whereClause);
-    }
-
-    @Override
-    public boolean deleteByEvent(@NonNull String eventUid) {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
-                .build();
-
-        return deleteWhere(whereClause);
-    }
-
-    @Override
-    public List<TrackedEntityDataValue> queryTrackedEntityDataValuesByEventUid(@NonNull String eventUid) {
-        WhereClauseBuilder whereClauseBuilder = new WhereClauseBuilder()
-                .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid);
-
-        return selectWhere(whereClauseBuilder.build());
-    }
-
-    @Override
-    public Map<String, List<TrackedEntityDataValue>> querySingleEventsTrackedEntityDataValues() {
-
-        String queryStatement = "SELECT TrackedEntityDataValue.* " +
-                " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid)" +
-                " WHERE Event.enrollment ISNULL " +
-                "AND " + eventInUploadableState() + ";";
-
-        return queryTrackedEntityDataValues(queryStatement);
-    }
-
-    @Override
-    public void removeDeletedDataValuesByEvent(@NonNull String eventUid) {
-        String deleteWhereQuery = new WhereClauseBuilder()
-                .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
-                .appendIsNullValue(TrackedEntityAttributeValueTableInfo.Columns.VALUE)
-                .build();
-
-        deleteWhere(deleteWhereQuery);
-    }
-
-    private String eventInUploadableState() {
-        String states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
-                CollectionsHelper.withSingleQuotationMarksArray(
-                        EnumHelper.asStringList(State.uploadableStatesIncludingError())));
-        return "(Event." + EventTableInfo.Columns.AGGREGATED_SYNC_STATE + " IN (" + states + "))";
-    }
-
-    @Override
-    public Map<String, List<TrackedEntityDataValue>> queryTrackerTrackedEntityDataValues() {
-
-        String queryStatement = "SELECT TrackedEntityDataValue.* " +
-                " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid) " +
-                " WHERE Event.enrollment IS NOT NULL " +
-                "AND " + eventInUploadableState() + ";";
-
-        return queryTrackedEntityDataValues(queryStatement);
-    }
-
-    @Override
-    public Map<String, List<TrackedEntityDataValue>> queryByUploadableEvents() {
-
-        String queryStatement = "SELECT TrackedEntityDataValue.* " +
-                " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid) " +
-                " WHERE " + eventInUploadableState() + ";";
-
-        return queryTrackedEntityDataValues(queryStatement);
-    }
-
-    private Map<String, List<TrackedEntityDataValue>> queryTrackedEntityDataValues(String queryStatement) {
-
-        List<TrackedEntityDataValue> dataValueList = new ArrayList<>();
-        Cursor cursor = getDatabaseAdapter().rawQuery(queryStatement);
-        addObjectsToCollection(cursor, dataValueList);
-
-        Map<String, List<TrackedEntityDataValue>> dataValuesMap = new HashMap<>();
-        for (TrackedEntityDataValue dataValue : dataValueList) {
-            addDataValuesToMap(dataValuesMap, dataValue);
-        }
-
-        return dataValuesMap;
-    }
-
-    private void addDataValuesToMap(Map<String, List<TrackedEntityDataValue>> dataValuesMap,
-                                    TrackedEntityDataValue dataValue) {
-        if (dataValuesMap.get(dataValue.event()) == null) {
-            dataValuesMap.put(dataValue.event(), new ArrayList<>());
-        }
-
-        dataValuesMap.get(dataValue.event()).add(dataValue);
-    }
-
-    public static TrackedEntityDataValueStore create(DatabaseAdapter databaseAdapter) {
-        SQLStatementBuilderImpl statementBuilder = new SQLStatementBuilderImpl(
-                TrackedEntityDataValueTableInfo.TABLE_INFO.name(),
-                TrackedEntityDataValueTableInfo.TABLE_INFO.columns());
-
-        return new TrackedEntityDataValueStoreImpl(databaseAdapter, statementBuilder, BINDER, WHERE_UPDATE_BINDER,
-                WHERE_DELETE_BINDER, TrackedEntityDataValue::create
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
new file mode 100644
index 0000000000..4f5fc5d4f5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
@@ -0,0 +1,164 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
+import org.hisp.dhis.android.core.event.EventTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+
+internal class TrackedEntityDataValueStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityDataValueStore,
+    ObjectWithoutUidStoreImpl<TrackedEntityDataValue>(
+        databaseAdapter,
+        TrackedEntityDataValueTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> TrackedEntityDataValue.create(cursor) }
+    ) {
+
+    override fun deleteByEventAndNotInDataElements(
+        eventUid: String,
+        dataElementUids: List<String>
+    ): Boolean {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
+            .appendNotInKeyStringValues(TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT, dataElementUids)
+            .build()
+        return deleteWhere(whereClause)
+    }
+
+    override fun deleteByEvent(eventUid: String): Boolean {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
+            .build()
+        return deleteWhere(whereClause)
+    }
+
+    override fun queryTrackedEntityDataValuesByEventUid(eventUid: String): List<TrackedEntityDataValue> {
+        val whereClauseBuilder = WhereClauseBuilder()
+            .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
+        return selectWhere(whereClauseBuilder.build())
+    }
+
+    override fun querySingleEventsTrackedEntityDataValues(): Map<String, MutableList<TrackedEntityDataValue>> {
+        val queryStatement = "SELECT TrackedEntityDataValue.* " +
+            " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid)" +
+            " WHERE Event.enrollment ISNULL " +
+            "AND " + eventInUploadableState() + ";"
+        return queryTrackedEntityDataValues(queryStatement)
+    }
+
+    override fun removeDeletedDataValuesByEvent(eventUid: String) {
+        val deleteWhereQuery = WhereClauseBuilder()
+            .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
+            .appendIsNullValue(TrackedEntityAttributeValueTableInfo.Columns.VALUE)
+            .build()
+        deleteWhere(deleteWhereQuery)
+    }
+
+    private fun eventInUploadableState(): String {
+        val states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
+            CollectionsHelper.withSingleQuotationMarksArray(
+                uploadableStatesIncludingError().map { it.name }
+            )
+        )
+        return "(Event." + EventTableInfo.Columns.AGGREGATED_SYNC_STATE + " IN (" + states + "))"
+    }
+
+    override fun queryTrackerTrackedEntityDataValues(): Map<String, MutableList<TrackedEntityDataValue>> {
+        val queryStatement = "SELECT TrackedEntityDataValue.* " +
+            " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid) " +
+            " WHERE Event.enrollment IS NOT NULL " +
+            "AND " + eventInUploadableState() + ";"
+        return queryTrackedEntityDataValues(queryStatement)
+    }
+
+    override fun queryByUploadableEvents(): Map<String, MutableList<TrackedEntityDataValue>> {
+        val queryStatement = "SELECT TrackedEntityDataValue.* " +
+            " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid) " +
+            " WHERE " + eventInUploadableState() + ";"
+        return queryTrackedEntityDataValues(queryStatement)
+    }
+
+    private fun queryTrackedEntityDataValues(queryStatement: String): Map<String, MutableList<TrackedEntityDataValue>> {
+        val dataValueList: MutableList<TrackedEntityDataValue> = ArrayList()
+        val cursor = databaseAdapter.rawQuery(queryStatement)
+        addObjectsToCollection(cursor, dataValueList)
+        val dataValuesMap: MutableMap<String, MutableList<TrackedEntityDataValue>> = HashMap()
+        for (dataValue in dataValueList) {
+            addDataValuesToMap(dataValuesMap, dataValue)
+        }
+        return dataValuesMap
+    }
+
+    private fun addDataValuesToMap(
+        dataValuesMap: MutableMap<String, MutableList<TrackedEntityDataValue>>,
+        dataValue: TrackedEntityDataValue
+    ) {
+        if (dataValuesMap[dataValue.event()] == null) {
+            dataValuesMap[dataValue.event()!!] = ArrayList()
+        }
+        dataValuesMap[dataValue.event()]!!.add(dataValue)
+    }
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityDataValue, w: StatementWrapper ->
+            w.bind(1, o.event())
+            w.bind(2, o.created())
+            w.bind(3, o.lastUpdated())
+            w.bind(4, o.dataElement())
+            w.bind(5, o.storedBy())
+            w.bind(6, o.value())
+            w.bind(7, o.providedElsewhere())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: TrackedEntityDataValue, w: StatementWrapper ->
+            w.bind(8, o.event())
+            w.bind(9, o.dataElement())
+        }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { o: TrackedEntityDataValue, w: StatementWrapper ->
+            w.bind(1, o.event())
+            w.bind(2, o.dataElement())
+        }
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            TrackedEntityDataValueTableInfo.TABLE_INFO, TrackedEntityDataValueTableInfo.Columns.EVENT
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index 468783e7ba..738511676e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -32,14 +32,13 @@ import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.TEIRelationshipOrphanCleanerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import retrofit2.Retrofit
 
 @Module
@@ -47,8 +46,8 @@ internal class TrackedEntityInstanceEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter?): TrackedEntityInstanceStore {
-        return TrackedEntityInstanceStoreImpl.create(databaseAdapter)
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceStore {
+        return TrackedEntityInstanceStoreImpl(databaseAdapter)
     }
 
     @Provides
@@ -87,7 +86,7 @@ internal class TrackedEntityInstanceEntityDIModule {
     @Reusable
     fun childrenAppenders(
         databaseAdapter: DatabaseAdapter,
-        programOwnerStore: ObjectWithoutUidStore<ProgramOwner>
+        programOwnerStore: ProgramOwnerStore
     ): Map<String, ChildrenAppender<TrackedEntityInstance>> {
         return mapOf(
             TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES to
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.java
deleted file mode 100644
index 4c936f38c0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class TrackedEntityInstanceEventFilterEntityDIModule {
-
-    @Provides
-    @Reusable
-    ObjectWithoutUidStore<TrackedEntityInstanceEventFilter> store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityInstanceEventFilterStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    HandlerWithTransformer<TrackedEntityInstanceEventFilter> handler(
-            ObjectWithoutUidStore<TrackedEntityInstanceEventFilter> store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt
new file mode 100644
index 0000000000..bdde177d51
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class TrackedEntityInstanceEventFilterEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceEventFilterStore {
+        return TrackedEntityInstanceEventFilterStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
new file mode 100644
index 0000000000..f05e5acca0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
+
+@Reusable
+internal class TrackedEntityInstanceEventFilterHandler @Inject constructor(
+    store: TrackedEntityInstanceEventFilterStore
+) : ObjectWithoutUidHandlerImpl<TrackedEntityInstanceEventFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStore.kt
index a0231aa301..527e39a0d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStore.kt
@@ -25,44 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilterTableInfo
-
-@Suppress("MagicNumber")
-internal object TrackedEntityInstanceEventFilterStore {
-    private val BINDER = StatementBinder { o: TrackedEntityInstanceEventFilter, w: StatementWrapper ->
-        w.bind(1, o.trackedEntityInstanceFilter())
-        w.bind(2, o.programStage())
-        w.bind(3, o.eventStatus())
-        w.bind(4, o.eventCreatedPeriod()?.periodFrom())
-        w.bind(5, o.eventCreatedPeriod()?.periodTo())
-        w.bind(6, o.assignedUserMode())
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: TrackedEntityInstanceEventFilter, _ -> }
-    private val WHERE_DELETE_BINDER = WhereStatementBinder { _: TrackedEntityInstanceEventFilter, _ -> }
-
-    @JvmField
-    val CHILD_PROJECTION = SingleParentChildProjection(
-        TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
-        TrackedEntityInstanceEventFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER
-    )
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<TrackedEntityInstanceEventFilter> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { TrackedEntityInstanceEventFilter.create(it) }
-    }
-}
+internal interface TrackedEntityInstanceEventFilterStore : ObjectWithoutUidStore<TrackedEntityInstanceEventFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
new file mode 100644
index 0000000000..d06c6d8471
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilterTableInfo
+
+@Suppress("MagicNumber")
+internal class TrackedEntityInstanceEventFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityInstanceEventFilterStore,
+    ObjectWithoutUidStoreImpl<TrackedEntityInstanceEventFilter>(
+        databaseAdapter,
+        TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
+        BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER,
+        { TrackedEntityInstanceEventFilter.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityInstanceEventFilter, w: StatementWrapper ->
+            w.bind(1, o.trackedEntityInstanceFilter())
+            w.bind(2, o.programStage())
+            w.bind(3, o.eventStatus())
+            w.bind(4, o.eventCreatedPeriod()?.periodFrom())
+            w.bind(5, o.eventCreatedPeriod()?.periodTo())
+            w.bind(6, o.assignedUserMode())
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { _: TrackedEntityInstanceEventFilter, _ -> }
+        private val WHERE_DELETE_BINDER = WhereStatementBinder { _: TrackedEntityInstanceEventFilter, _ -> }
+
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
+            TrackedEntityInstanceEventFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt
index 858910e57f..a58ce814a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt
@@ -48,7 +48,7 @@ internal class TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender p
             return TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    AttributeValueFilterStore.CHILD_PROJECTION,
+                    AttributeValueFilterStoreImpl.CHILD_PROJECTION,
                     AttributeValueFilter::create
                 )
             )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
index 34b093c06f..c0845c0072 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
@@ -32,7 +32,6 @@ import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
@@ -41,7 +40,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 @Reusable
 class TrackedEntityInstanceFilterCall @Inject internal constructor(
     private val service: TrackedEntityInstanceFilterService,
-    private val handler: Handler<TrackedEntityInstanceFilter>,
+    private val handler: TrackedEntityInstanceFilterHandler,
     private val apiDownloader: APIDownloader,
     private val versionManager: DHISVersionManager
 ) : UidsCall<TrackedEntityInstanceFilter> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
index 1ec03d36f1..001f2612ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
@@ -31,26 +31,16 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore.create
 
 @Module
-internal class TrackedEntityInstanceFilterEntityDIModule : IdentifiableStoreProvider<TrackedEntityInstanceFilter> {
+internal class TrackedEntityInstanceFilterEntityDIModule {
 
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<TrackedEntityInstanceFilter> {
-        return create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(impl: TrackedEntityInstanceFilterHandler): Handler<TrackedEntityInstanceFilter> {
-        return impl
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceFilterStore {
+        return TrackedEntityInstanceFilterStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt
index 3419c02b1b..f8681e4638 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt
@@ -49,7 +49,7 @@ internal class TrackedEntityInstanceFilterEvenFilterChildrenAppender private con
             return TrackedEntityInstanceFilterEvenFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    TrackedEntityInstanceEventFilterStore.CHILD_PROJECTION
+                    TrackedEntityInstanceEventFilterStoreImpl.CHILD_PROJECTION
                 ) { cursor: Cursor -> TrackedEntityInstanceEventFilter.create(cursor) }
             )
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
index 3b68731127..e4769cf9ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
@@ -39,9 +37,9 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 
 @Reusable
 internal class TrackedEntityInstanceFilterHandler @Inject constructor(
-    trackedEntityInstanceFilterStore: IdentifiableObjectStore<TrackedEntityInstanceFilter>,
-    private val trackedEntityInstanceEventFilterHandler: HandlerWithTransformer<TrackedEntityInstanceEventFilter>,
-    private val attributeValueFilterHandler: HandlerWithTransformer<AttributeValueFilter>
+    trackedEntityInstanceFilterStore: TrackedEntityInstanceFilterStore,
+    private val trackedEntityInstanceEventFilterHandler: TrackedEntityInstanceEventFilterHandler,
+    private val attributeValueFilterHandler: AttributeValueFilterHandler
 ) : IdentifiableHandlerImpl<TrackedEntityInstanceFilter>(trackedEntityInstanceFilterStore) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStore.kt
index 7d5a7ca284..dde145ae92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStore.kt
@@ -25,49 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTableInfo
-
-@Suppress("MagicNumber")
-internal object TrackedEntityInstanceFilterStore {
-    private val BINDER = object : IdentifiableWithStyleStatementBinder<TrackedEntityInstanceFilter>() {
-        override fun bindToStatement(o: TrackedEntityInstanceFilter, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(9, getUidOrNull(o.program()))
-            w.bind(10, o.description())
-            w.bind(11, o.sortOrder())
-            w.bind(12, o.entityQueryCriteria().enrollmentStatus())
-            w.bind(13, o.entityQueryCriteria().followUp())
-            w.bind(14, o.entityQueryCriteria().organisationUnit())
-            w.bind(15, o.entityQueryCriteria().ouMode())
-            w.bind(16, o.entityQueryCriteria().assignedUserMode())
-            w.bind(17, o.entityQueryCriteria().order())
-            w.bind(18, StringListColumnAdapter.serialize(o.entityQueryCriteria().displayColumnOrder()))
-            w.bind(19, o.entityQueryCriteria().eventStatus())
-            w.bind(20, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().eventDate()))
-            w.bind(21, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().lastUpdatedDate()))
-            w.bind(22, o.entityQueryCriteria().programStage())
-            w.bind(23, StringListColumnAdapter.serialize(o.entityQueryCriteria().trackedEntityInstances()))
-            w.bind(24, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().enrollmentIncidentDate()))
-            w.bind(25, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().enrollmentCreatedDate()))
-            w.bind(26, o.entityQueryCriteria().trackedEntityType())
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<TrackedEntityInstanceFilter> {
-        return objectWithUidStore(
-            databaseAdapter, TrackedEntityInstanceFilterTableInfo.TABLE_INFO, BINDER
-        ) { TrackedEntityInstanceFilter.create(it) }
-    }
-}
+internal interface TrackedEntityInstanceFilterStore : IdentifiableObjectStore<TrackedEntityInstanceFilter>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
new file mode 100644
index 0000000000..8473c44ce9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DateFilterPeriodColumnAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTableInfo
+
+@Suppress("MagicNumber")
+internal class TrackedEntityInstanceFilterStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityInstanceFilterStore,
+    IdentifiableObjectStoreImpl<TrackedEntityInstanceFilter>(
+        databaseAdapter,
+        TrackedEntityInstanceFilterTableInfo.TABLE_INFO,
+        BINDER,
+        { TrackedEntityInstanceFilter.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = object : IdentifiableWithStyleStatementBinder<TrackedEntityInstanceFilter>() {
+            override fun bindToStatement(o: TrackedEntityInstanceFilter, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(9, getUidOrNull(o.program()))
+                w.bind(10, o.description())
+                w.bind(11, o.sortOrder())
+                w.bind(12, o.entityQueryCriteria().enrollmentStatus())
+                w.bind(13, o.entityQueryCriteria().followUp())
+                w.bind(14, o.entityQueryCriteria().organisationUnit())
+                w.bind(15, o.entityQueryCriteria().ouMode())
+                w.bind(16, o.entityQueryCriteria().assignedUserMode())
+                w.bind(17, o.entityQueryCriteria().order())
+                w.bind(18, StringListColumnAdapter.serialize(o.entityQueryCriteria().displayColumnOrder()))
+                w.bind(19, o.entityQueryCriteria().eventStatus())
+                w.bind(20, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().eventDate()))
+                w.bind(21, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().lastUpdatedDate()))
+                w.bind(22, o.entityQueryCriteria().programStage())
+                w.bind(23, StringListColumnAdapter.serialize(o.entityQueryCriteria().trackedEntityInstances()))
+                w.bind(24, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().enrollmentIncidentDate()))
+                w.bind(25, DateFilterPeriodColumnAdapter.serialize(o.entityQueryCriteria().enrollmentCreatedDate()))
+                w.bind(26, o.entityQueryCriteria().trackedEntityType())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
index 1df393a139..7865ec68c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
@@ -31,10 +31,12 @@ import android.util.Log
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.handlers.internal.*
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
 import org.hisp.dhis.android.core.common.State
-import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentHandler
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
@@ -42,7 +44,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelative
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerHandler
 
 @Reusable
 internal class TrackedEntityInstanceHandler @Inject constructor(
@@ -50,9 +52,9 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
     relationshipHandler: RelationshipHandler,
     trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
-    private val trackedEntityAttributeValueHandler: HandlerWithTransformer<TrackedEntityAttributeValue>,
-    private val enrollmentHandler: IdentifiableDataHandler<Enrollment>,
-    private val programOwnerHandler: HandlerWithTransformer<ProgramOwner>,
+    private val trackedEntityAttributeValueHandler: TrackedEntityAttributeValueHandler,
+    private val enrollmentHandler: EnrollmentHandler,
+    private val programOwnerHandler: ProgramOwnerHandler,
     private val enrollmentOrphanCleaner: TrackedEntityEnrollmentOrphanCleaner,
     private val relationshipOrphanCleaner: OrphanCleaner<TrackedEntityInstance, Relationship>
 ) : IdentifiableDataHandlerImpl<TrackedEntityInstance>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
index 724114c7cf..5ed8364d09 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
@@ -29,12 +29,11 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 
 @Reusable
 internal class TrackedEntityInstanceLastUpdatedManager @Inject constructor(
-    store: ObjectWithoutUidStore<TrackedEntityInstanceSync>,
+    store: TrackedEntityInstanceSyncStore,
     private val resourceHandler: ResourceHandler
 ) : TrackerSyncLastUpdatedManager<TrackedEntityInstanceSync>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStore.kt
similarity index 74%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStore.kt
index db438db1df..0200065de6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStore.kt
@@ -25,24 +25,16 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
-
-import java.util.List;
-
-public interface TrackedEntityInstanceStore extends IdentifiableDeletableDataObjectStore<TrackedEntityInstance> {
-
-    List<TrackedEntityInstance> queryTrackedEntityInstancesToSync();
-
-    List<TrackedEntityInstance> queryTrackedEntityInstancesToPost();
-
-    List<String> querySyncedTrackedEntityInstanceUids();
-
-    List<String> queryMissingRelationshipsUids();
-
-    int setAggregatedSyncState(String uid, State state);
-}
\ No newline at end of file
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+
+internal interface TrackedEntityInstanceStore : IdentifiableDeletableDataObjectStore<TrackedEntityInstance> {
+    fun queryTrackedEntityInstancesToSync(): List<TrackedEntityInstance>
+    fun queryTrackedEntityInstancesToPost(): List<TrackedEntityInstance>
+    fun querySyncedTrackedEntityInstanceUids(): List<String>
+    fun queryMissingRelationshipsUids(): List<String>
+    fun setAggregatedSyncState(uid: String, state: State): Int
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.java
deleted file mode 100644
index 0b22d9561c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import android.content.ContentValues;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStoreImpl;
-import org.hisp.dhis.android.core.arch.helpers.internal.EnumHelper;
-import org.hisp.dhis.android.core.common.DataColumns;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo;
-
-import java.util.List;
-
-public final class TrackedEntityInstanceStoreImpl
-        extends IdentifiableDeletableDataObjectStoreImpl<TrackedEntityInstance>
-        implements TrackedEntityInstanceStore {
-
-    private static final StatementBinder<TrackedEntityInstance> BINDER = (o, w) -> {
-        w.bind(1, o.uid());
-        w.bind(2, o.created());
-        w.bind(3, o.lastUpdated());
-        w.bind(4, o.createdAtClient());
-        w.bind(5, o.lastUpdatedAtClient());
-        w.bind(6, o.organisationUnit());
-        w.bind(7, o.trackedEntityType());
-        w.bind(8, o.geometry() == null ? null : o.geometry().type());
-        w.bind(9, o.geometry() == null ? null : o.geometry().coordinates());
-        w.bind(10, o.syncState());
-        w.bind(11, o.aggregatedSyncState());
-        w.bind(12, o.deleted());
-    };
-
-    public TrackedEntityInstanceStoreImpl(DatabaseAdapter databaseAdapter,
-                                          SQLStatementBuilderImpl builder) {
-        super(databaseAdapter, builder, BINDER, TrackedEntityInstance::create);
-    }
-
-    @Override
-    public List<TrackedEntityInstance> queryTrackedEntityInstancesToSync() {
-        List<String> uploadableStatesString = EnumHelper.asStringList(State.uploadableStatesIncludingError());
-        String whereToSyncClause = new WhereClauseBuilder()
-                .appendInKeyStringValues(DataColumns.AGGREGATED_SYNC_STATE, uploadableStatesString)
-                .build();
-
-        return selectWhere(whereToSyncClause);
-    }
-
-    @Override
-    public List<TrackedEntityInstance> queryTrackedEntityInstancesToPost() {
-        String whereToPostClause = new WhereClauseBuilder()
-                .appendKeyStringValue(DataColumns.AGGREGATED_SYNC_STATE, State.TO_POST.name())
-                .build();
-
-        return selectWhere(whereToPostClause);
-    }
-
-    @Override
-    public List<String> querySyncedTrackedEntityInstanceUids() {
-        String whereSyncedClause = new WhereClauseBuilder()
-                .appendKeyStringValue(DataColumns.AGGREGATED_SYNC_STATE, State.SYNCED)
-                .build();
-
-        return selectUidsWhere(whereSyncedClause);
-    }
-
-    @Override
-    public List<String> queryMissingRelationshipsUids() {
-        String whereRelationshipsClause = new WhereClauseBuilder()
-                .appendKeyStringValue(DataColumns.AGGREGATED_SYNC_STATE, State.RELATIONSHIP)
-                .appendIsNullValue(TrackedEntityInstanceTableInfo.Columns.ORGANISATION_UNIT)
-                .build();
-
-        return selectUidsWhere(whereRelationshipsClause);
-    }
-
-    @Override
-    public int setAggregatedSyncState(String uid, State state) {
-        ContentValues updates = new ContentValues();
-        updates.put(DataColumns.AGGREGATED_SYNC_STATE, state.toString());
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(IdentifiableColumns.UID, uid)
-                .build();
-
-        return updateWhere(updates, whereClause);
-    }
-
-    public static TrackedEntityInstanceStore create(DatabaseAdapter databaseAdapter) {
-        SQLStatementBuilderImpl statementBuilder = new SQLStatementBuilderImpl(
-                TrackedEntityInstanceTableInfo.TABLE_INFO.name(),
-                TrackedEntityInstanceTableInfo.TABLE_INFO.columns());
-
-        return new TrackedEntityInstanceStoreImpl(
-                databaseAdapter,
-                statementBuilder
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
new file mode 100644
index 0000000000..cbcd6b8a01
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
@@ -0,0 +1,108 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import android.content.ContentValues
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStoreImpl
+import org.hisp.dhis.android.core.common.DataColumns
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
+
+internal class TrackedEntityInstanceStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityInstanceStore,
+    IdentifiableDeletableDataObjectStoreImpl<TrackedEntityInstance>(
+        databaseAdapter,
+        TrackedEntityInstanceTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> TrackedEntityInstance.create(cursor) }
+    ) {
+    override fun queryTrackedEntityInstancesToSync(): List<TrackedEntityInstance> {
+        val uploadableStatesString = uploadableStatesIncludingError().map { it.name }
+        val whereToSyncClause = WhereClauseBuilder()
+            .appendInKeyStringValues(DataColumns.AGGREGATED_SYNC_STATE, uploadableStatesString)
+            .build()
+        return selectWhere(whereToSyncClause)
+    }
+
+    override fun queryTrackedEntityInstancesToPost(): List<TrackedEntityInstance> {
+        val whereToPostClause = WhereClauseBuilder()
+            .appendKeyStringValue(DataColumns.AGGREGATED_SYNC_STATE, State.TO_POST.name)
+            .build()
+        return selectWhere(whereToPostClause)
+    }
+
+    override fun querySyncedTrackedEntityInstanceUids(): List<String> {
+        val whereSyncedClause = WhereClauseBuilder()
+            .appendKeyStringValue(DataColumns.AGGREGATED_SYNC_STATE, State.SYNCED)
+            .build()
+        return selectUidsWhere(whereSyncedClause)
+    }
+
+    override fun queryMissingRelationshipsUids(): List<String> {
+        val whereRelationshipsClause = WhereClauseBuilder()
+            .appendKeyStringValue(DataColumns.AGGREGATED_SYNC_STATE, State.RELATIONSHIP)
+            .appendIsNullValue(TrackedEntityInstanceTableInfo.Columns.ORGANISATION_UNIT)
+            .build()
+        return selectUidsWhere(whereRelationshipsClause)
+    }
+
+    override fun setAggregatedSyncState(uid: String, state: State): Int {
+        val updates = ContentValues()
+        updates.put(DataColumns.AGGREGATED_SYNC_STATE, state.toString())
+        val whereClause = WhereClauseBuilder()
+            .appendKeyStringValue(IdentifiableColumns.UID, uid)
+            .build()
+        return updateWhere(updates, whereClause)
+    }
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityInstance, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.created())
+            w.bind(3, o.lastUpdated())
+            w.bind(4, o.createdAtClient())
+            w.bind(5, o.lastUpdatedAtClient())
+            w.bind(6, o.organisationUnit())
+            w.bind(7, o.trackedEntityType())
+            w.bind(8, if (o.geometry() == null) null else o.geometry()!!.type())
+            w.bind(9, if (o.geometry() == null) null else o.geometry()!!.coordinates())
+            w.bind(10, o.syncState())
+            w.bind(11, o.aggregatedSyncState())
+            w.bind(12, o.deleted())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt
new file mode 100644
index 0000000000..6182c5546d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class TrackedEntityInstanceSyncEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceSyncStore {
+        return TrackedEntityInstanceSyncStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.java
deleted file mode 100644
index d7793e65df..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-
-final class TrackedEntityInstanceSyncStore {
-
-    private static final StatementBinder<TrackedEntityInstanceSync> BINDER = (o, w) -> {
-        w.bind(1, o.program());
-        w.bind(2, o.organisationUnitIdsHash());
-        w.bind(3, o.downloadLimit());
-        w.bind(4, o.lastUpdated());
-    };
-
-    private static final WhereStatementBinder<TrackedEntityInstanceSync> WHERE_UPDATE_BINDER = (o, w) -> {
-        w.bind(5, o.program());
-        w.bind(6, o.organisationUnitIdsHash());
-    };
-
-    private static final WhereStatementBinder<TrackedEntityInstanceSync> DELETE_UPDATE_BINDER = (o, w) -> {
-        w.bind(1, o.program());
-        w.bind(2, o.organisationUnitIdsHash());
-    };
-
-    private TrackedEntityInstanceSyncStore() {
-    }
-
-    static ObjectWithoutUidStore<TrackedEntityInstanceSync> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, TrackedEntityInstanceSyncTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, DELETE_UPDATE_BINDER, TrackedEntityInstanceSync::create);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.kt
new file mode 100644
index 0000000000..2f8f08f9cc
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStore.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+
+internal interface TrackedEntityInstanceSyncStore : ObjectWithoutUidStore<TrackedEntityInstanceSync>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
new file mode 100644
index 0000000000..c6e32373ea
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+internal class TrackedEntityInstanceSyncStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityInstanceSyncStore,
+    ObjectWithoutUidStoreImpl<TrackedEntityInstanceSync>(
+        databaseAdapter,
+        TrackedEntityInstanceSyncTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        DELETE_UPDATE_BINDER,
+        { cursor: Cursor -> TrackedEntityInstanceSync.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityInstanceSync, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.organisationUnitIdsHash())
+            w.bind(3, o.downloadLimit())
+            w.bind(4, o.lastUpdated())
+        }
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: TrackedEntityInstanceSync, w: StatementWrapper ->
+            w.bind(5, o.program())
+            w.bind(6, o.organisationUnitIdsHash())
+        }
+        private val DELETE_UPDATE_BINDER = WhereStatementBinder { o: TrackedEntityInstanceSync, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.organisationUnitIdsHash())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
index 06d0e488e7..92b10c4b13 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
@@ -29,17 +29,16 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.event.Event
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 
 @Reusable
 internal class TrackedEntityInstanceUidHelperImpl @Inject constructor(
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>
+    private val organisationUnitStore: OrganisationUnitStore
 ) : TrackedEntityInstanceUidHelper {
 
     override fun hasMissingOrganisationUnitUids(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java
index 4aced96668..3c8c48d468 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java
@@ -55,7 +55,7 @@ public static ChildrenAppender<TrackedEntityType> create(DatabaseAdapter databas
         return new TrackedEntityTypeAttributeChildrenAppender(
                 StoreFactory.singleParentChildStore(
                         databaseAdapter,
-                        TrackedEntityTypeAttributeStore.CHILD_PROJECTION,
+                        TrackedEntityTypeAttributeStoreImpl.Companion.getCHILD_PROJECTION(),
                         TrackedEntityTypeAttribute::create)
         );
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
new file mode 100644
index 0000000000..d46f931bfe
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+
+@Module
+internal class TrackedEntityTypeAttributeEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityTypeAttributeStore {
+        return TrackedEntityTypeAttributeStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<TrackedEntityTypeAttribute>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
new file mode 100644
index 0000000000..1ccfe8c7b3
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+
+@Reusable
+internal class TrackedEntityTypeAttributeHandler @Inject constructor(
+    store: TrackedEntityTypeAttributeStore
+) : OrderedLinkHandlerImpl<TrackedEntityTypeAttribute, TrackedEntityTypeAttribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.kt
new file mode 100644
index 0000000000..4149887f92
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+
+internal interface TrackedEntityTypeAttributeStore : LinkStore<TrackedEntityTypeAttribute>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
index 097fdb0b5f..c54c38482b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
@@ -25,41 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo.Columns;
-
-final class TrackedEntityTypeAttributeStore {
-
-    private static final StatementBinder<TrackedEntityTypeAttribute> BINDER = (o, w) -> {
-        w.bind(1, o.trackedEntityType().uid());
-        w.bind(2, o.trackedEntityAttribute().uid());
-        w.bind(3, o.displayInList());
-        w.bind(4, o.mandatory());
-        w.bind(5, o.searchable());
-        w.bind(6, o.sortOrder());
-    };
-
-    static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            TrackedEntityTypeAttributeTableInfo.TABLE_INFO, Columns.TRACKED_ENTITY_TYPE);
-
-    private TrackedEntityTypeAttributeStore() {}
-
-    public static LinkStore<TrackedEntityTypeAttribute> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(
-                databaseAdapter,
-                TrackedEntityTypeAttributeTableInfo.TABLE_INFO,
-                Columns.TRACKED_ENTITY_TYPE,
-                BINDER,
-                TrackedEntityTypeAttribute::create);
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo
+
+internal class TrackedEntityTypeAttributeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityTypeAttributeStore,
+    LinkStoreImpl<TrackedEntityTypeAttribute>(
+        databaseAdapter,
+        TrackedEntityTypeAttributeTableInfo.TABLE_INFO,
+        TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE,
+        BINDER,
+        { cursor: Cursor -> TrackedEntityTypeAttribute.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: TrackedEntityTypeAttribute, w: StatementWrapper ->
+            w.bind(1, o.trackedEntityType().uid())
+            w.bind(2, o.trackedEntityAttribute()!!.uid())
+            w.bind(3, o.displayInList())
+            w.bind(4, o.mandatory())
+            w.bind(5, o.searchable())
+            w.bind(6, o.sortOrder())
+        }
+        val CHILD_PROJECTION = SingleParentChildProjection(
+            TrackedEntityTypeAttributeTableInfo.TABLE_INFO,
+            TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java
index b58abbd0cd..fb7927cd9a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java
@@ -29,7 +29,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.internal.DataAccessFields;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
@@ -49,12 +48,12 @@ public final class TrackedEntityTypeCall implements UidsCall<TrackedEntityType>
     private static final int MAX_UID_LIST_SIZE = 140;
 
     private final TrackedEntityTypeService service;
-    private final Handler<TrackedEntityType> handler;
+    private final TrackedEntityTypeHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
     TrackedEntityTypeCall(TrackedEntityTypeService service,
-                          Handler<TrackedEntityType> handler,
+                          TrackedEntityTypeHandler handler,
                           APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.java
deleted file mode 100644
index 705412e72e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class TrackedEntityTypeEntityDIModule implements IdentifiableStoreProvider<TrackedEntityType> {
-
-    @Override
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<TrackedEntityType> store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityTypeStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    public Handler<TrackedEntityType> handler(TrackedEntityTypeHandler impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    @SuppressWarnings("PMD.NonStaticInitializer")
-    Map<String, ChildrenAppender<TrackedEntityType>> childrenAppenders(DatabaseAdapter databaseAdapter) {
-
-        return new HashMap<String, ChildrenAppender<TrackedEntityType>>() {{
-            put(TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES,
-                    TrackedEntityTypeAttributeChildrenAppender.create(databaseAdapter)); 
-        }};
-    }
-
-    @Provides
-    @Reusable
-    CollectionCleaner<TrackedEntityType> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(TrackedEntityTypeTableInfo.TABLE_INFO.name(), databaseAdapter);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
index 261a106e26..f8e0258369 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
@@ -25,42 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
 
 @Module
-public final class TrackedEntityTypeAttributeEntityDIModule {
-
+internal class TrackedEntityTypeEntityDIModule {
     @Provides
     @Reusable
-    public LinkStore<TrackedEntityTypeAttribute> store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityTypeAttributeStore.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityTypeStore {
+        return TrackedEntityTypeStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    public OrderedLinkHandler<TrackedEntityTypeAttribute, TrackedEntityTypeAttribute> handler(
-            LinkStore<TrackedEntityTypeAttribute> store) {
-        return new OrderedLinkHandlerImpl<>(store);
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<TrackedEntityType>> {
+        return mapOf(
+            TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES to
+                TrackedEntityTypeAttributeChildrenAppender.create(databaseAdapter)
+        )
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<TrackedEntityTypeAttribute>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<TrackedEntityType> {
+        return CollectionCleanerImpl(TrackedEntityTypeTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.java
deleted file mode 100644
index bda1d55168..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class TrackedEntityTypeHandler extends IdentifiableHandlerImpl<TrackedEntityType> {
-
-    private final OrderedLinkHandler<TrackedEntityTypeAttribute, TrackedEntityTypeAttribute> attributeHandler;
-    private final CollectionCleaner<TrackedEntityType> collectionCleaner;
-
-    @Inject
-    TrackedEntityTypeHandler(IdentifiableObjectStore<TrackedEntityType> trackedEntityTypeStore,
-                             OrderedLinkHandler<TrackedEntityTypeAttribute, TrackedEntityTypeAttribute>
-                                     attributeHandler,
-                             CollectionCleaner<TrackedEntityType> collectionCleaner) {
-        super(trackedEntityTypeStore);
-        this.attributeHandler = attributeHandler;
-        this.collectionCleaner = collectionCleaner;
-    }
-
-    @Override
-    protected void afterObjectHandled(TrackedEntityType trackedEntityType, HandleAction action) {
-        attributeHandler.handleMany(trackedEntityType.uid(), trackedEntityType.trackedEntityTypeAttributes(),
-                (trackedEntityTypeAttribute, sortOrder) ->
-                        trackedEntityTypeAttribute.toBuilder().sortOrder(sortOrder).build());
-    }
-
-    @Override
-    protected void afterCollectionHandled(Collection<TrackedEntityType> trackedEntityTypes) {
-        collectionCleaner.deleteNotPresent(trackedEntityTypes);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
similarity index 57%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
index 718aeba2d0..a498e4e5f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
@@ -25,39 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 
 @Reusable
-final class ProgramTrackedEntityAttributeHandler extends IdentifiableHandlerImpl<ProgramTrackedEntityAttribute> {
-
-    private final DictionaryTableHandler<ValueTypeRendering> renderTypeHandler;
-
-    @Inject
-    ProgramTrackedEntityAttributeHandler(
-            IdentifiableObjectStore<ProgramTrackedEntityAttribute> store,
-            DictionaryTableHandler<ValueTypeRendering> renderTypeHandler) {
-        super(store);
-        this.renderTypeHandler = renderTypeHandler;
+internal class TrackedEntityTypeHandler @Inject constructor(
+    trackedEntityTypeStore: TrackedEntityTypeStore,
+    private val attributeHandler: TrackedEntityTypeAttributeHandler,
+    private val collectionCleaner: CollectionCleaner<TrackedEntityType>
+) : IdentifiableHandlerImpl<TrackedEntityType>(trackedEntityTypeStore) {
+    override fun afterObjectHandled(o: TrackedEntityType, action: HandleAction) {
+        attributeHandler.handleMany(
+            o.uid(), o.trackedEntityTypeAttributes()
+        ) { trackedEntityTypeAttribute: TrackedEntityTypeAttribute, sortOrder: Int? ->
+            trackedEntityTypeAttribute.toBuilder().sortOrder(sortOrder).build()
+        }
     }
 
-    @Override
-    protected void afterObjectHandled(ProgramTrackedEntityAttribute programTrackedEntityAttribute,
-                                      HandleAction action) {
-        if (action != HandleAction.Delete) {
-            renderTypeHandler.handle(programTrackedEntityAttribute.renderType(), programTrackedEntityAttribute.uid(),
-                    ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name());
-        }
+    override fun afterCollectionHandled(oCollection: Collection<TrackedEntityType>?) {
+        collectionCleaner.deleteNotPresent(oCollection)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.kt
new file mode 100644
index 0000000000..92fab8193b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+
+internal interface TrackedEntityTypeStore : IdentifiableObjectStore<TrackedEntityType>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
index 0c51e0ea90..c9a51782c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
@@ -25,36 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableWithStyleStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo;
+@Suppress("MagicNumber")
+internal class TrackedEntityTypeStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackedEntityTypeStore,
+    IdentifiableObjectStoreImpl<TrackedEntityType>(
+        databaseAdapter,
+        TrackedEntityTypeTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> TrackedEntityType.create(cursor) }
+    ) {
 
-import androidx.annotation.NonNull;
-
-public final class TrackedEntityTypeStore {
-
-    private static StatementBinder<TrackedEntityType> BINDER =
-            new NameableWithStyleStatementBinder<TrackedEntityType>() {
-        @Override
-        public void bindToStatement(@NonNull TrackedEntityType o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(13, o.featureType());
-            w.bind(14, o.access().data().write());
-        }
-    };
-
-    private TrackedEntityTypeStore() {}
-
-    public static IdentifiableObjectStore<TrackedEntityType> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, TrackedEntityTypeTableInfo.TABLE_INFO, BINDER,
-                TrackedEntityType::create);
+    companion object {
+        private val BINDER: StatementBinder<TrackedEntityType> =
+            object : NameableWithStyleStatementBinder<TrackedEntityType>() {
+                override fun bindToStatement(o: TrackedEntityType, w: StatementWrapper) {
+                    super.bindToStatement(o, w)
+                    w.bind(13, o.featureType())
+                    w.bind(14, o.access().data().write())
+                }
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
index ec40f89175..243d0c9176 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
@@ -29,13 +29,12 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.internal.EventStore
-import org.hisp.dhis.android.core.fileresource.FileResource
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -47,7 +46,7 @@ internal class TrackerPostStateManager @Inject internal constructor(
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
     private val relationshipStore: RelationshipStore,
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
+    private val fileResourceStore: FileResourceStore,
     private val h: StatePersistorHelper
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
index 238c77a922..6fc0b32f85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
@@ -31,13 +31,13 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
 
 @Reusable
 internal class TrackerQueryBundleFactory @Inject constructor(
-    programStore: ProgramStoreInterface,
+    programStore: ProgramStore,
     programSettingsObjectRepository: ProgramSettingsObjectRepository,
     lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager,
     commonHelper: TrackerQueryFactoryCommonHelper
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt
index ffdb31070d..e507b182cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
 
 @Suppress("UnnecessaryAbstractClass")
 internal abstract class TrackerQueryFactory<T, S : TrackerBaseSync> constructor(
-    private val programStore: ProgramStoreInterface,
+    private val programStore: ProgramStore,
     private val programSettingsObjectRepository: ProgramSettingsObjectRepository,
     private val lastUpdatedManager: TrackerSyncLastUpdatedManager<S>,
     private val commonHelper: TrackerQueryFactoryCommonHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
index 5de73b56bc..01286654ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
@@ -31,12 +31,11 @@ import dagger.Reusable
 import java.util.*
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.settings.DownloadPeriod
 import org.hisp.dhis.android.core.settings.LimitScope
@@ -48,7 +47,7 @@ import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 @Reusable
 internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
-    private val organisationUnitProgramLinkStore: LinkStore<OrganisationUnitProgramLink>
+    private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore
 ) {
 
     private fun getRootCaptureOrgUnitUids(): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt
index d8ade0e7ce..3f0fa3f362 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import retrofit2.Retrofit
 
 @Module
@@ -52,19 +50,13 @@ internal class OwnershipEntityDIModule {
 
     @Provides
     @Reusable
-    fun programTempOwnerStore(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramTempOwner> {
-        return ProgramTempOwnerStore.create(databaseAdapter)
+    fun programTempOwnerStore(databaseAdapter: DatabaseAdapter): ProgramTempOwnerStore {
+        return ProgramTempOwnerStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    fun programOwnerStore(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramOwner> {
-        return ProgramOwnerStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun programOwnerHandler(store: ObjectWithoutUidStore<ProgramOwner>): HandlerWithTransformer<ProgramOwner> {
-        return ProgramOwnerHandler(store)
+    fun programOwnerStore(databaseAdapter: DatabaseAdapter): ProgramOwnerStore {
+        return ProgramOwnerStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
index 36103f7aab..9a61d50f58 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
@@ -33,7 +33,6 @@ import java.util.*
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
@@ -46,8 +45,8 @@ internal class OwnershipManagerImpl @Inject constructor(
     private val apiCallExecutor: APICallExecutor,
     private val ownershipService: OwnershipService,
     private val dataStatePropagator: DataStatePropagator,
-    private val programTempOwnerStore: ObjectWithoutUidStore<ProgramTempOwner>,
-    private val programOwnerStore: ObjectWithoutUidStore<ProgramOwner>
+    private val programTempOwnerStore: ProgramTempOwnerStore,
+    private val programOwnerStore: ProgramOwnerStore
 ) : OwnershipManager {
 
     override fun breakGlass(trackedEntityInstance: String, program: String, reason: String): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
index c422876482..8d63e2f24b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.trackedentity.ownership
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 
-internal class ProgramOwnerHandler(
-    programOwnerStore: ObjectWithoutUidStore<ProgramOwner>
-) : ObjectWithoutUidHandlerImpl<ProgramOwner>(
-    programOwnerStore
-)
+@Reusable
+internal class ProgramOwnerHandler @Inject constructor(
+    store: ProgramOwnerStore
+) : ObjectWithoutUidHandlerImpl<ProgramOwner>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
index dd3b5983f0..fd329cfa56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -39,7 +38,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 internal class ProgramOwnerPostCall @Inject constructor(
     private val ownershipService: OwnershipService,
     private val apiCallExecutor: APICallExecutor,
-    private val programOwnerStore: ObjectWithoutUidStore<ProgramOwner>,
+    private val programOwnerStore: ProgramOwnerStore,
     private val dataStatePropagator: DataStatePropagator
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStore.kt
index c115a15b83..d99e19800c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStore.kt
@@ -25,41 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.trackedentity.ownership
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-
-@Suppress("MagicNumber")
-internal object ProgramOwnerStore {
-    private val BINDER = StatementBinder<ProgramOwner> { o, w ->
-        w.bind(1, o.program())
-        w.bind(2, o.trackedEntityInstance())
-        w.bind(3, o.ownerOrgUnit())
-        w.bind(4, o.syncState())
-    }
-
-    private val WHERE_UPDATE_BINDER =
-        WhereStatementBinder<ProgramOwner> { o, w ->
-            w.bind(5, o.program())
-            w.bind(6, o.trackedEntityInstance())
-        }
-
-    private val WHERE_DELETE_BINDER =
-        WhereStatementBinder<ProgramOwner> { o, w ->
-            w.bind(1, o.program())
-            w.bind(2, o.trackedEntityInstance())
-        }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramOwner> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            ProgramOwnerTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { ProgramOwner.create(it) }
-    }
-}
+internal interface ProgramOwnerStore : ObjectWithoutUidStore<ProgramOwner>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStore.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
index 11b92891a0..b9ca27d6ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
@@ -25,39 +25,44 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.ownership
 
-package org.hisp.dhis.android.core.event.internal;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
+@Suppress("MagicNumber")
+internal class ProgramOwnerStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramOwnerStore,
+    ObjectWithoutUidStoreImpl<ProgramOwner>(
+        databaseAdapter,
+        ProgramOwnerTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { ProgramOwner.create(it) }
+    ) {
 
-final class EventSyncStore {
+    companion object {
+        private val BINDER = StatementBinder<ProgramOwner> { o, w ->
+            w.bind(1, o.program())
+            w.bind(2, o.trackedEntityInstance())
+            w.bind(3, o.ownerOrgUnit())
+            w.bind(4, o.syncState())
+        }
 
-    private static final StatementBinder<EventSync> BINDER = (o, w) -> {
-        w.bind(1, o.program());
-        w.bind(2, o.organisationUnitIdsHash());
-        w.bind(3, o.downloadLimit());
-        w.bind(4, o.lastUpdated());
-    };
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder<ProgramOwner> { o, w ->
+                w.bind(5, o.program())
+                w.bind(6, o.trackedEntityInstance())
+            }
 
-    private static final WhereStatementBinder<EventSync> WHERE_UPDATE_BINDER = (o, w) -> {
-        w.bind(5, o.program());
-        w.bind(6, o.organisationUnitIdsHash());
-    };
-
-    private static final WhereStatementBinder<EventSync> DELETE_UPDATE_BINDER = (o, w) -> {
-        w.bind(1, o.program());
-        w.bind(2, o.organisationUnitIdsHash());
-    };
-
-    private EventSyncStore() {
-    }
-
-    static ObjectWithoutUidStore<EventSync> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, EventSyncTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, DELETE_UPDATE_BINDER, EventSync::create);
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder<ProgramOwner> { o, w ->
+                w.bind(1, o.program())
+                w.bind(2, o.trackedEntityInstance())
+            }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStore.kt
index aaa9762487..022fec4a52 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStore.kt
@@ -25,45 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.trackedentity.ownership
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-
-@Suppress("MagicNumber")
-internal object ProgramTempOwnerStore {
-    private val BINDER = StatementBinder<ProgramTempOwner> { o: ProgramTempOwner, w: StatementWrapper ->
-        w.bind(1, o.program())
-        w.bind(2, o.trackedEntityInstance())
-        w.bind(3, o.created())
-        w.bind(4, o.validUntil())
-        w.bind(5, o.reason())
-    }
-
-    private val WHERE_UPDATE_BINDER =
-        WhereStatementBinder<ProgramTempOwner> { o: ProgramTempOwner, w: StatementWrapper ->
-            w.bind(6, o.program())
-            w.bind(7, o.trackedEntityInstance())
-            w.bind(8, o.created())
-        }
-
-    private val WHERE_DELETE_BINDER =
-        WhereStatementBinder<ProgramTempOwner> { o: ProgramTempOwner, w: StatementWrapper ->
-            w.bind(1, o.program())
-            w.bind(2, o.trackedEntityInstance())
-            w.bind(3, o.created())
-        }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<ProgramTempOwner> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            ProgramTempOwnerTableInfo.TABLE_INFO,
-            BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER
-        ) { ProgramTempOwner.create(it) }
-    }
-}
+internal interface ProgramTempOwnerStore : ObjectWithoutUidStore<ProgramTempOwner>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
new file mode 100644
index 0000000000..6586af3c48
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.ownership
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+@Suppress("MagicNumber")
+internal class ProgramTempOwnerStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ProgramTempOwnerStore,
+    ObjectWithoutUidStoreImpl<ProgramTempOwner>(
+        databaseAdapter,
+        ProgramTempOwnerTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { ProgramTempOwner.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder<ProgramTempOwner> { o: ProgramTempOwner, w: StatementWrapper ->
+            w.bind(1, o.program())
+            w.bind(2, o.trackedEntityInstance())
+            w.bind(3, o.created())
+            w.bind(4, o.validUntil())
+            w.bind(5, o.reason())
+        }
+
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder<ProgramTempOwner> { o: ProgramTempOwner, w: StatementWrapper ->
+                w.bind(6, o.program())
+                w.bind(7, o.trackedEntityInstance())
+                w.bind(8, o.created())
+            }
+
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder<ProgramTempOwner> { o: ProgramTempOwner, w: StatementWrapper ->
+                w.bind(1, o.program())
+                w.bind(2, o.trackedEntityInstance())
+                w.bind(3, o.created())
+            }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
index 4b91367c18..c8a68457b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
@@ -29,14 +29,13 @@
 package org.hisp.dhis.android.core.tracker
 
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 
 internal class TrackerPostParentCallHelper @Inject constructor(
     private val dhisVersionManager: DHISVersionManager,
-    private val synchronizationSettingStore: ObjectWithoutUidStore<SynchronizationSettings>
+    private val synchronizationSettingStore: SynchronizationSettingStore
 ) {
 
     fun useNewTrackerImporter(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
index d9f54e2ebe..cf3dd8a800 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterTrackedEntityPostStateManager
@@ -49,7 +48,7 @@ internal const val ATTEMPTS_INTERVAL = 2L
 internal class JobQueryCall @Inject internal constructor(
     private val service: TrackerImporterService,
     private val apiCallExecutor: APICallExecutor,
-    private val trackerJobObjectStore: ObjectWithoutUidStore<TrackerJobObject>,
+    private val trackerJobObjectStore: TrackerJobObjectStore,
     private val handler: JobReportHandler,
     private val fileResourceHandler: JobReportFileResourceHandler,
     private val stateManager: NewTrackerImporterTrackedEntityPostStateManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
index 0f114cb960..926b0f1a0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
@@ -30,21 +30,20 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
-import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteTableInfo
+import org.hisp.dhis.android.core.note.internal.NoteStore
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 
 @Reusable
 internal class JobReportEnrollmentHandler @Inject internal constructor(
-    private val noteStore: IdentifiableObjectStore<Note>,
+    private val noteStore: NoteStore,
     private val enrollmentStore: EnrollmentStore,
     private val conflictStore: TrackerImportConflictStore,
     private val conflictHelper: TrackerConflictHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
index 17f912cf71..c367b7cf41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
@@ -38,8 +37,8 @@ import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
-import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteTableInfo
+import org.hisp.dhis.android.core.note.internal.NoteStore
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
@@ -47,7 +46,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueS
 @Reusable
 internal class JobReportEventHandler @Inject internal constructor(
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
-    private val noteStore: IdentifiableObjectStore<Note>,
+    private val noteStore: NoteStore,
     private val conflictStore: TrackerImportConflictStore,
     private val eventStore: EventStore,
     private val enrollmentStore: EnrollmentStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
index 761f32312e..4faaab5c6d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
 import org.hisp.dhis.android.core.imports.internal.TEIWebResponseHandlerSummary
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
 import org.hisp.dhis.android.core.program.AccessLevel
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
@@ -47,7 +47,7 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
     private val conflictStore: TrackerImportConflictStore,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val enrollmentStore: EnrollmentStore,
-    private val programStore: ProgramStoreInterface,
+    private val programStore: ProgramStore,
     private val ownershipManagerImpl: OwnershipManagerImpl
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt
index b623306662..5cffad520b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt
@@ -31,10 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObjectStore.create
 import retrofit2.Retrofit
 
 @Module
@@ -47,13 +43,7 @@ internal class TrackerImporterPackageDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<TrackerJobObject> {
-        return create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ObjectWithoutUidStore<TrackerJobObject>): Handler<TrackerJobObject> {
-        return ObjectWithoutUidHandlerImpl(store)
+    fun store(databaseAdapter: DatabaseAdapter): TrackerJobObjectStore {
+        return TrackerJobObjectStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index 731ecedd55..26c10ea23b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -30,11 +30,10 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
-import java.util.*
+import java.util.Date
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
@@ -57,7 +56,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
     private val programOwnerPostCall: TrackerImporterProgramOwnerPostCall,
     private val apiCallExecutor: APICallExecutor,
     private val jobQueryCall: JobQueryCall,
-    private val jobObjectHandler: Handler<TrackerJobObject>,
+    private val jobObjectHandler: TrackerJobObjectHandler,
     private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
 ) {
     fun uploadTrackedEntityInstances(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
index d941ba8d73..65476baa8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
@@ -32,17 +32,17 @@ import io.reactivex.Observable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerPostCall
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 
 @Reusable
 internal class TrackerImporterProgramOwnerPostCall @Inject constructor(
     private val programOwnerPostCall: ProgramOwnerPostCall,
-    private val programOwnerStore: ObjectWithoutUidStore<ProgramOwner>,
+    private val programOwnerStore: ProgramOwnerStore,
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
new file mode 100644
index 0000000000..961311fba1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.tracker.importer.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+
+@Reusable
+internal class TrackerJobObjectHandler @Inject constructor(
+    store: TrackerJobObjectStore
+) : ObjectWithoutUidHandlerImpl<TrackerJobObject>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStore.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStore.kt
index 747e1bac44..15ddd7c1c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStore.kt
@@ -25,45 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringArrayColumnAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithoutUidStore
-
-@Suppress("MagicNumber")
-internal object TrackerJobObjectStore {
-
-    private val BINDER = StatementBinder { o: TrackerJobObject, w: StatementWrapper ->
-        w.bind(1, o.trackerType())
-        w.bind(2, o.objectUid())
-        w.bind(3, o.jobUid())
-        w.bind(4, o.lastUpdated())
-        w.bind(5, StringArrayColumnAdapter.serialize(o.fileResources()))
-    }
-
-    private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: TrackerJobObject, w: StatementWrapper ->
-        w.bind(6, o.trackerType())
-        w.bind(7, o.objectUid())
-    }
-
-    private val DELETE_UPDATE_BINDER = WhereStatementBinder { o: TrackerJobObject, w: StatementWrapper ->
-        w.bind(1, o.trackerType())
-        w.bind(2, o.objectUid())
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): ObjectWithoutUidStore<TrackerJobObject> {
-        return objectWithoutUidStore(
-            databaseAdapter,
-            TrackerJobObjectTableInfo.TABLE_INFO,
-            BINDER,
-            WHERE_UPDATE_BINDER,
-            DELETE_UPDATE_BINDER
-        ) { TrackerJobObject.create(it) }
-    }
-}
+internal interface TrackerJobObjectStore : ObjectWithoutUidStore<TrackerJobObject>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
new file mode 100644
index 0000000000..8fd4cfdc77
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.tracker.importer.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringArrayColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+
+@Suppress("MagicNumber")
+internal class TrackerJobObjectStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : TrackerJobObjectStore,
+    ObjectWithoutUidStoreImpl<TrackerJobObject>(
+        databaseAdapter,
+        TrackerJobObjectTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        DELETE_UPDATE_BINDER,
+        { TrackerJobObject.create(it) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: TrackerJobObject, w: StatementWrapper ->
+            w.bind(1, o.trackerType())
+            w.bind(2, o.objectUid())
+            w.bind(3, o.jobUid())
+            w.bind(4, o.lastUpdated())
+            w.bind(5, StringArrayColumnAdapter.serialize(o.fileResources()))
+        }
+
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder { o: TrackerJobObject, w: StatementWrapper ->
+            w.bind(6, o.trackerType())
+            w.bind(7, o.objectUid())
+        }
+
+        private val DELETE_UPDATE_BINDER = WhereStatementBinder { o: TrackerJobObject, w: StatementWrapper ->
+            w.bind(1, o.trackerType())
+            w.bind(2, o.objectUid())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
index 3e960a7f9a..2dcd33e1fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
@@ -30,25 +30,24 @@ package org.hisp.dhis.android.core.tracker.importer.internal.interpreters
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.event.internal.EventStore
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
 
 @Reusable
 internal class InterpreterHelper @Inject internal constructor(
     private val teiStore: TrackedEntityInstanceStore,
     private val eventStore: EventStore,
-    private val programStore: ProgramStoreInterface,
-    private val programStageStore: IdentifiableObjectStore<ProgramStage>,
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit>,
-    private val trackedEntityTypeStore: IdentifiableObjectStore<TrackedEntityType>,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>
+    private val programStore: ProgramStore,
+    private val programStageStore: ProgramStageStore,
+    private val organisationUnitStore: OrganisationUnitStore,
+    private val trackedEntityTypeStore: TrackedEntityTypeStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore
 ) {
 
     fun trackedEntityInstance(teiUid: String): TrackedEntityInstance {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index 60e3d31e60..ead407d5fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -29,17 +29,17 @@ package org.hisp.dhis.android.core.usecase.stock
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
 
 @Reusable
 class StockUseCaseCollectionRepository @Inject internal constructor(
-    store: IdentifiableObjectStore<InternalStockUseCase>,
+    store: StockUseCaseStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<InternalStockUseCase>>,
     scope: RepositoryScope,
     transformer: TwoWayTransformer<InternalStockUseCase, StockUseCase>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index b234e31e6f..7a92e91111 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -31,13 +31,12 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.settings.internal.BaseSettingCall
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 
 @Reusable
 internal class StockUseCaseCall @Inject constructor(
-    private val stockUseCaseHandler: HandlerWithTransformer<InternalStockUseCase>,
+    private val stockUseCaseHandler: StockUseCaseHandler,
     private val stockUseCaseService: StockUseCaseService,
     private val apiCallExecutor: RxAPICallExecutor,
 ) : BaseSettingCall<List<InternalStockUseCase>>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
index 307d854536..c33a121e01 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
@@ -31,31 +31,17 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
 import org.hisp.dhis.android.core.usecase.stock.StockUseCase
 
 @Module
 internal class StockUseCaseEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<InternalStockUseCase> {
-        return StockUseCaseStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: IdentifiableObjectStore<InternalStockUseCase>,
-        linkHandler: LinkHandler<InternalStockUseCaseTransaction, InternalStockUseCaseTransaction>
-    ): HandlerWithTransformer<InternalStockUseCase> {
-        return StockUseCaseHandler(store, linkHandler)
+    fun store(databaseAdapter: DatabaseAdapter): StockUseCaseStore {
+        return StockUseCaseStoreImpl(databaseAdapter)
     }
 
     @Provides
@@ -66,7 +52,7 @@ internal class StockUseCaseEntityDIModule {
 
     @Provides
     @Reusable
-    fun childrenAppenders(linkStore: LinkStore<InternalStockUseCaseTransaction>):
+    fun childrenAppenders(linkStore: StockUseCaseTransactionLinkStore):
         Map<String, ChildrenAppender<InternalStockUseCase>> {
         val childrenAppender: ChildrenAppender<InternalStockUseCase> =
             StockUseCaseTransactionChildrenAppender(linkStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
index a46fb69137..f19a3f4e5c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
+import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
 
+@Reusable
 internal class StockUseCaseHandler @Inject constructor(
-    store: IdentifiableObjectStore<InternalStockUseCase>,
-    private val transactionLinkHandler: LinkHandler<InternalStockUseCaseTransaction, InternalStockUseCaseTransaction>,
+    store: StockUseCaseStore,
+    private val transactionLinkHandler: StockUseCaseTransactionLinkHandler,
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<InternalStockUseCase>(store) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStore.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStore.kt
index aabff2fe96..e52604828d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStore.kt
@@ -25,32 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidStore
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
-
-@Suppress("MagicNumber")
-internal object StockUseCaseStore {
-    private val BINDER = StatementBinder { o: InternalStockUseCase, w: StatementWrapper ->
-        w.bind(1, o.uid())
-        w.bind(2, o.itemCode())
-        w.bind(3, o.itemDescription())
-        w.bind(4, o.programType())
-        w.bind(5, o.description())
-        w.bind(6, o.stockOnHand())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<InternalStockUseCase> {
-        return objectWithUidStore(
-            databaseAdapter, StockUseCaseTableInfo.TABLE_INFO,
-            BINDER
-        ) { cursor: Cursor -> InternalStockUseCase.create(cursor) }
-    }
-}
+internal interface StockUseCaseStore : IdentifiableObjectStore<InternalStockUseCase>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
new file mode 100644
index 0000000000..14d27fb989
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.usecase.stock.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
+import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
+
+@Suppress("MagicNumber")
+internal class StockUseCaseStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : StockUseCaseStore,
+    IdentifiableObjectStoreImpl<InternalStockUseCase>(
+        databaseAdapter,
+        StockUseCaseTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> InternalStockUseCase.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: InternalStockUseCase, w: StatementWrapper ->
+            w.bind(1, o.uid())
+            w.bind(2, o.itemCode())
+            w.bind(3, o.itemDescription())
+            w.bind(4, o.programType())
+            w.bind(5, o.description())
+            w.bind(6, o.stockOnHand())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
index bc4bb2c730..5db00d1629 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
@@ -27,13 +27,11 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
 
 internal class StockUseCaseTransactionChildrenAppender(
-    private val transactionLinkStore: LinkStore<InternalStockUseCaseTransaction>
+    private val transactionLinkStore: StockUseCaseTransactionLinkStore
 ) : ChildrenAppender<InternalStockUseCase>() {
 
     override fun appendChildren(internalStockUseCase: InternalStockUseCase): InternalStockUseCase {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt
index a657056940..a0e3af2be9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt
@@ -31,23 +31,12 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
 
 @Module
 internal class StockUseCaseTransactionEntityDIModule {
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<InternalStockUseCaseTransaction> {
-        return StockUseCaseTransactionLinkStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: LinkStore<InternalStockUseCaseTransaction>):
-        LinkHandler<InternalStockUseCaseTransaction, InternalStockUseCaseTransaction> {
-        return LinkHandlerImpl(store)
+    fun store(databaseAdapter: DatabaseAdapter): StockUseCaseTransactionLinkStore {
+        return StockUseCaseTransactionLinkStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
new file mode 100644
index 0000000000..fb31410034
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.usecase.stock.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
+
+@Reusable
+internal class StockUseCaseTransactionLinkHandler @Inject constructor(
+    store: StockUseCaseTransactionLinkStore
+) : LinkHandlerImpl<InternalStockUseCaseTransaction, InternalStockUseCaseTransaction>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStore.kt
index ccad57ffca..66f31b21f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStore.kt
@@ -25,41 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
-import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
-
-@Suppress("MagicNumber")
-internal object StockUseCaseTransactionLinkStore {
-    private val BINDER: StatementBinder<InternalStockUseCaseTransaction> =
-        StatementBinder<InternalStockUseCaseTransaction> { o: InternalStockUseCaseTransaction, w: StatementWrapper ->
-            w.bind(1, o.programUid())
-            w.bind(2, o.sortOrder())
-            w.bind(3, o.transactionType())
-            w.bind(4, o.distributedTo())
-            w.bind(5, o.stockDistributed())
-            w.bind(6, o.stockDiscarded())
-            w.bind(7, o.stockCount())
-        }
-
-    val CHILD_PROJECTION: SingleParentChildProjection = SingleParentChildProjection(
-        StockUseCaseTransactionTableInfo.TABLE_INFO, StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID
-    )
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<InternalStockUseCaseTransaction> {
-        return StoreFactory.linkStore(
-            databaseAdapter,
-            StockUseCaseTransactionTableInfo.TABLE_INFO,
-            StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID,
-            BINDER
-        ) { cursor: Cursor -> InternalStockUseCaseTransaction.create(cursor) }
-    }
-}
+internal interface StockUseCaseTransactionLinkStore : LinkStore<InternalStockUseCaseTransaction>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
new file mode 100644
index 0000000000..96cd373088
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.usecase.stock.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
+import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
+
+@Suppress("MagicNumber")
+internal class StockUseCaseTransactionLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : StockUseCaseTransactionLinkStore,
+    LinkStoreImpl<InternalStockUseCaseTransaction>(
+        databaseAdapter,
+        StockUseCaseTransactionTableInfo.TABLE_INFO,
+        StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID,
+        BINDER,
+        { cursor: Cursor -> InternalStockUseCaseTransaction.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER: StatementBinder<InternalStockUseCaseTransaction> =
+            StatementBinder<InternalStockUseCaseTransaction> { o: InternalStockUseCaseTransaction,
+                w: StatementWrapper ->
+                w.bind(1, o.programUid())
+                w.bind(2, o.sortOrder())
+                w.bind(3, o.transactionType())
+                w.bind(4, o.distributedTo())
+                w.bind(5, o.stockDistributed())
+                w.bind(6, o.stockDiscarded())
+                w.bind(7, o.stockCount())
+            }
+
+        val CHILD_PROJECTION: SingleParentChildProjection = SingleParentChildProjection(
+            StockUseCaseTransactionTableInfo.TABLE_INFO, StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java
index acdef3d02b..a344d3dd08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.user;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.user.internal.AuthenticatedUserStore;
 
 import java.util.Map;
 
@@ -43,7 +43,7 @@ public final class AuthenticatedUserObjectRepository
         extends ReadOnlyOneObjectRepositoryImpl<AuthenticatedUser, AuthenticatedUserObjectRepository> {
 
     @Inject
-    AuthenticatedUserObjectRepository(ObjectWithoutUidStore<AuthenticatedUser> store,
+    AuthenticatedUserObjectRepository(AuthenticatedUserStore store,
                                       Map<String, ChildrenAppender<AuthenticatedUser>> childrenAppenders,
                                       RepositoryScope scope) {
         super(store, childrenAppenders, scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java
index 5041425a99..47df708322 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java
@@ -28,12 +28,12 @@
 
 package org.hisp.dhis.android.core.user;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.user.internal.AuthorityStore;
 
 import java.util.Map;
 
@@ -46,7 +46,7 @@ public final class AuthorityCollectionRepository
         extends ReadOnlyCollectionRepositoryImpl<Authority, AuthorityCollectionRepository> {
 
     @Inject
-    AuthorityCollectionRepository(final ObjectWithoutUidStore<Authority> store,
+    AuthorityCollectionRepository(final AuthorityStore store,
                                   final Map<String, ChildrenAppender<Authority>> childrenAppenders,
                                   final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index a82d6780d9..543cc22384 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -37,10 +36,11 @@ import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepos
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyWithTransformerObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserCredentialsFields
+import org.hisp.dhis.android.core.user.internal.UserStore
 
 @Reusable
 class UserCredentialsObjectRepository @Inject internal constructor(
-    store: IdentifiableObjectStore<User>,
+    store: UserStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
     scope: RepositoryScope,
     transformer: TwoWayTransformer<User, UserCredentials>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java
index 4e0adcb877..452da45626 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java
@@ -28,11 +28,11 @@
 
 package org.hisp.dhis.android.core.user;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.user.internal.UserFields;
+import org.hisp.dhis.android.core.user.internal.UserStore;
 
 import java.util.Map;
 
@@ -44,7 +44,7 @@
 public final class UserObjectRepository extends ReadOnlyOneObjectRepositoryImpl<User, UserObjectRepository> {
 
     @Inject
-    UserObjectRepository(IdentifiableObjectStore<User> store,
+    UserObjectRepository(UserStore store,
                          Map<String, ChildrenAppender<User>> childrenAppenders,
                          RepositoryScope scope) {
         super(store, childrenAppenders, scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java
index be844459a5..3c5f12d9fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.user;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.user.internal.UserRoleStore;
 
 import java.util.Map;
 
@@ -45,7 +45,7 @@ public final class UserRoleCollectionRepository
 
     @Inject
     UserRoleCollectionRepository(
-            final IdentifiableObjectStore<UserRole> store,
+            final UserRoleStore store,
             final Map<String, ChildrenAppender<UserRole>> childrenAppenders,
             final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
index 4e2c691b91..0a0ca3168d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
@@ -37,10 +37,9 @@ import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 import org.hisp.dhis.android.core.configuration.internal.DatabaseAccount
 import org.hisp.dhis.android.core.configuration.internal.DatabaseConfigurationHelper
-import org.hisp.dhis.android.core.configuration.internal.DatabasesConfiguration
+import org.hisp.dhis.android.core.configuration.internal.DatabaseConfigurationInsecureStore
 import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
@@ -51,7 +50,7 @@ import org.hisp.dhis.android.core.user.AccountManager
 @Reusable
 @Suppress("TooManyFunctions")
 internal class AccountManagerImpl @Inject constructor(
-    private val databasesConfigurationStore: ObjectKeyValueStore<DatabasesConfiguration>,
+    private val databasesConfigurationStore: DatabaseConfigurationInsecureStore,
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
     private val credentialsSecureStore: CredentialsSecureStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.java
deleted file mode 100644
index 828a97971e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidStoreProvider;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.user.AuthenticatedUser;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class AuthenticatedUserEntityDIModule implements ObjectWithoutUidStoreProvider<AuthenticatedUser> {
-
-    @Override
-    @Provides
-    @Reusable
-    public ObjectWithoutUidStore<AuthenticatedUser> store(DatabaseAdapter databaseAdapter) {
-        return AuthenticatedUserStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<AuthenticatedUser>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
new file mode 100644
index 0000000000..070f7a8f2c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.user.AuthenticatedUser
+
+@Module
+internal class AuthenticatedUserEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): AuthenticatedUserStore {
+        return AuthenticatedUserStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<AuthenticatedUser>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.kt
new file mode 100644
index 0000000000..41972029ea
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.user.AuthenticatedUser
+
+internal interface AuthenticatedUserStore : ObjectWithoutUidStore<AuthenticatedUser>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
index f79e2cfb27..d377e56068 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
@@ -25,34 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.user.AuthenticatedUser;
-import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo;
-
-public final class AuthenticatedUserStore {
-
-    private static final StatementBinder<AuthenticatedUser> BINDER = (o, w) -> {
-        w.bind(1, o.user());
-        w.bind(2, o.hash());
-    };
-
-    private static final WhereStatementBinder<AuthenticatedUser> WHERE_UPDATE_BINDER
-            = (o, w) -> w.bind(3, o.user());
-
-    private static final WhereStatementBinder<AuthenticatedUser> WHERE_DELETE_BINDER
-            = (o, w) -> w.bind(1, o.user());
-
-    private AuthenticatedUserStore() {}
-
-    public static ObjectWithoutUidStore<AuthenticatedUser> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithoutUidStore(databaseAdapter, AuthenticatedUserTableInfo.TABLE_INFO,
-                BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER, AuthenticatedUser::create);
+package org.hisp.dhis.android.core.user.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.user.AuthenticatedUser
+import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo
+
+internal class AuthenticatedUserStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AuthenticatedUserStore,
+    ObjectWithoutUidStoreImpl<AuthenticatedUser>(
+        databaseAdapter,
+        AuthenticatedUserTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
+        { cursor: Cursor -> AuthenticatedUser.create(cursor) }
+    ) {
+
+    companion object {
+        private val BINDER = StatementBinder { o: AuthenticatedUser, w: StatementWrapper ->
+            w.bind(1, o.user())
+            w.bind(2, o.hash())
+        }
+        private val WHERE_UPDATE_BINDER =
+            WhereStatementBinder { o: AuthenticatedUser, w: StatementWrapper -> w.bind(3, o.user()) }
+        private val WHERE_DELETE_BINDER =
+            WhereStatementBinder { o: AuthenticatedUser, w: StatementWrapper -> w.bind(1, o.user()) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallProcessor.java
index 5d5ec14876..dfa03fedde 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallProcessor.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallProcessor.java
@@ -49,7 +49,7 @@ class AuthorityCallProcessor implements CallProcessor<Authority> {
 
     @Override
     public final void process(final List<Authority> objectList) throws D2Error {
-        AuthorityStore.create(databaseAdapter).delete();
+        new AuthorityStoreImpl(databaseAdapter).delete();
 
         if (objectList != null && !objectList.isEmpty()) {
             D2CallExecutor.create(databaseAdapter).executeD2CallTransactionally(() -> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
index 81afa809ca..133af027dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
@@ -51,7 +51,7 @@ final class AuthorityEndpointCallFactory extends ListCallFactoryImpl<Authority>
     @Inject
     AuthorityEndpointCallFactory(GenericCallData data,
                                  APICallExecutor apiCallExecutor,
-                                 Handler<Authority> handler,
+                                 AuthorityHandler handler,
                                  AuthorityService service) {
         super(data, apiCallExecutor);
         this.handler = handler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.java
deleted file mode 100644
index b157541b04..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.di.internal.ObjectWithoutUidEntityDIModule;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.user.Authority;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class AuthorityEntityDIModule implements ObjectWithoutUidEntityDIModule<Authority> {
-
-    @Override
-    @Provides
-    @Reusable
-    public ObjectWithoutUidStore<Authority> store(DatabaseAdapter databaseAdapter) {
-        return AuthorityStore.create(databaseAdapter);
-    }
-
-    @Override
-    @Provides
-    @Reusable
-    public Handler<Authority> handler(ObjectWithoutUidStore<Authority> store) {
-        return new ObjectWithoutUidHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<Authority>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
new file mode 100644
index 0000000000..48f7dfd669
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.user.Authority
+
+@Module
+internal class AuthorityEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): AuthorityStore {
+        return AuthorityStoreImpl(databaseAdapter)
+    }
+
+    @Provides
+    @Reusable
+    fun childrenAppenders(): Map<String, ChildrenAppender<Authority>> {
+        return emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
new file mode 100644
index 0000000000..2365d99b3c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import org.hisp.dhis.android.core.user.Authority
+
+@Reusable
+internal class AuthorityHandler @Inject constructor(
+    store: AuthorityStore
+) : ObjectWithoutUidHandlerImpl<Authority>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.kt
new file mode 100644
index 0000000000..5d7f18f12a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.user.Authority
+
+internal interface AuthorityStore : ObjectWithoutUidStore<Authority>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
new file mode 100644
index 0000000000..356d03d8ae
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.hisp.dhis.android.core.user.Authority
+import org.hisp.dhis.android.core.user.AuthorityTableInfo
+
+internal class AuthorityStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : AuthorityStore,
+    ObjectWithoutUidStoreImpl<Authority>(
+        databaseAdapter,
+        AuthorityTableInfo.TABLE_INFO,
+        BINDER,
+        WHERE_BINDER,
+        WHERE_BINDER,
+        { cursor: Cursor -> Authority.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: Authority, w: StatementWrapper ->
+            w.bind(1, o.name())
+        }
+        private val WHERE_BINDER = WhereStatementBinder { o: Authority, w: StatementWrapper ->
+            w.bind(1, o.name())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index a095eb7ce1..c0848aaad5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -34,10 +34,6 @@ import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
@@ -45,7 +41,7 @@ import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
@@ -59,10 +55,10 @@ internal class LogInCall @Inject internal constructor(
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val userIdStore: UserIdInMemoryStore,
-    private val userHandler: Handler<User>,
-    private val authenticatedUserStore: ObjectWithoutUidStore<AuthenticatedUser>,
-    private val systemInfoRepository: ReadOnlyWithDownloadObjectRepository<SystemInfo>,
-    private val userStore: IdentifiableObjectStore<User>,
+    private val userHandler: UserHandler,
+    private val authenticatedUserStore: AuthenticatedUserStore,
+    private val systemInfoRepository: SystemInfoObjectRepository,
+    private val userStore: UserStore,
     private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher,
     private val databaseManager: LogInDatabaseManager,
     private val exceptions: LogInExceptions,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index 0f3c655f07..a22a0cf182 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -33,7 +33,6 @@ import java.util.concurrent.Callable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
@@ -43,7 +42,7 @@ internal class UserCall @Inject constructor(
     private val genericCallData: GenericCallData,
     private val apiCallExecutor: APICallExecutor,
     private val userService: UserService,
-    private val userHandler: Handler<User>,
+    private val userHandler: UserHandler,
     private val dhisVersionManager: DHISVersionManager
 ) : Callable<User> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
index 3923230492..4cc293acc7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
@@ -30,28 +30,18 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserCredentials
 
 @Module
-internal class UserEntityDIModule : IdentifiableStoreProvider<User> {
+internal class UserEntityDIModule {
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<User> {
-        return UserStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(userHandler: UserHandler): Handler<User> {
-        return userHandler
+    fun store(databaseAdapter: DatabaseAdapter): UserStore {
+        return UserStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
index ea0f0fbf3a..eeab569d6c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
@@ -40,8 +38,8 @@ import org.hisp.dhis.android.core.user.UserRole
 
 @Reusable
 internal class UserHandler @Inject constructor(
-    userStore: IdentifiableObjectStore<User>,
-    private val userRoleHandler: Handler<UserRole>,
+    userStore: UserStore,
+    private val userRoleHandler: UserRoleHandler,
     private val userRoleCollectionCleaner: CollectionCleaner<UserRole>
 ) : IdentifiableHandlerImpl<User>(userStore) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt
index b38d87c841..278899945d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt
@@ -31,23 +31,12 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
-import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStoreImpl.Companion.create
 
 @Module
 internal class UserOrganisationUnitLinkEntityDIModule {
     @Provides
     @Reusable
     fun store(databaseAdapter: DatabaseAdapter): UserOrganisationUnitLinkStore {
-        return create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: UserOrganisationUnitLinkStore): LinkHandler<OrganisationUnit, UserOrganisationUnitLink> {
-        return LinkHandlerImpl(store)
+        return UserOrganisationUnitLinkStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
new file mode 100644
index 0000000000..c0d0f6af8e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+
+@Reusable
+internal class UserOrganisationUnitLinkHandler @Inject constructor(
+    store: UserOrganisationUnitLinkStore
+) : LinkHandlerImpl<OrganisationUnit, UserOrganisationUnitLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
index a188b9e887..3301466add 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
@@ -28,10 +28,7 @@
 package org.hisp.dhis.android.core.user.internal
 
 import android.database.Cursor
-import java.lang.RuntimeException
-import kotlin.Throws
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.SQLStatementBuilderImpl
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
@@ -40,19 +37,16 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 
-internal class UserOrganisationUnitLinkStoreImpl private constructor(
-    databaseAdapter: DatabaseAdapter,
-    masterColumn: String,
-    builder: SQLStatementBuilderImpl,
-    binder: StatementBinder<UserOrganisationUnitLink>
-) : LinkStoreImpl<UserOrganisationUnitLink>(
-    databaseAdapter,
-    builder,
-    masterColumn,
-    binder,
-    { cursor: Cursor -> UserOrganisationUnitLink.create(cursor) }
-),
-    UserOrganisationUnitLinkStore {
+internal class UserOrganisationUnitLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : UserOrganisationUnitLinkStore,
+    LinkStoreImpl<UserOrganisationUnitLink>(
+        databaseAdapter,
+        UserOrganisationUnitLinkTableInfo.TABLE_INFO,
+        UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
+        BINDER,
+        { cursor: Cursor -> UserOrganisationUnitLink.create(cursor) }
+    ) {
 
     @Throws(RuntimeException::class)
     override fun queryRootCaptureOrganisationUnitUids(): List<String> {
@@ -111,16 +105,5 @@ internal class UserOrganisationUnitLinkStoreImpl private constructor(
                 w.bind(4, o.root())
                 w.bind(5, o.userAssigned())
             }
-
-        @JvmStatic
-        fun create(databaseAdapter: DatabaseAdapter): UserOrganisationUnitLinkStore {
-            val statementBuilder = SQLStatementBuilderImpl(UserOrganisationUnitLinkTableInfo.TABLE_INFO)
-            return UserOrganisationUnitLinkStoreImpl(
-                databaseAdapter,
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                statementBuilder,
-                BINDER
-            )
-        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
index 0234f04303..858871616f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
@@ -29,14 +29,12 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.User
-import org.hisp.dhis.android.core.user.UserRole
 
 @Reusable
 internal class UserRoleChildrenAppender @Inject constructor(
-    private val store: IdentifiableObjectStore<UserRole>
+    private val store: UserRoleStore
 ) : ChildrenAppender<User>() {
     override fun appendChildren(user: User): User {
         val builder = user.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.java
deleted file mode 100644
index 9258e9168d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableEntityDIModule;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.user.UserRole;
-import org.hisp.dhis.android.core.user.UserRoleTableInfo;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class UserRoleEntityDIModule implements IdentifiableEntityDIModule<UserRole> {
-
-    @Override
-    @Provides
-    @Reusable
-    public IdentifiableObjectStore<UserRole> store(DatabaseAdapter databaseAdapter) {
-        return UserRoleStore.create(databaseAdapter);
-    }
-
-    @Override
-    @Provides
-    @Reusable
-    public Handler<UserRole> handler(IdentifiableObjectStore<UserRole> store) {
-        return new IdentifiableHandlerImpl<>(store);
-    }
-
-    @Provides
-    @Reusable
-    Map<String, ChildrenAppender<UserRole>> childrenAppenders() {
-        return Collections.emptyMap();
-    }
-
-    @Provides
-    @Reusable
-    CollectionCleaner<UserRole> collectionCleaner(DatabaseAdapter databaseAdapter) {
-        return new CollectionCleanerImpl<>(UserRoleTableInfo.TABLE_INFO.name(), databaseAdapter);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
index 1f8e6ce6ed..8b1bd69bbf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
@@ -25,40 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.RelationshipFields;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.user.UserRole
+import org.hisp.dhis.android.core.user.UserRoleTableInfo
 
 @Module
-public final class RelationshipEntityDIModule {
-
+internal class UserRoleEntityDIModule {
     @Provides
     @Reusable
-    RelationshipStore store(DatabaseAdapter databaseAdapter) {
-        return RelationshipStoreImpl.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): UserRoleStore {
+        return UserRoleStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    RelationshipHandler relationshipHandler(RelationshipHandlerImpl impl) {
-        return impl;
+    fun childrenAppenders(): Map<String, ChildrenAppender<UserRole>> {
+        return emptyMap()
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<Relationship>> childrenAppenders(
-            RelationshipItemChildrenAppender itemChildrenAppender) {
-        return Collections.singletonMap(RelationshipFields.ITEMS, itemChildrenAppender);
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<UserRole> {
+        return CollectionCleanerImpl(UserRoleTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
new file mode 100644
index 0000000000..28ff22044b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.user.UserRole
+
+@Reusable
+internal class UserRoleHandler @Inject constructor(
+    store: UserRoleStore
+) : IdentifiableHandlerImpl<UserRole>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.kt
new file mode 100644
index 0000000000..21572a3768
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.user.UserRole
+
+internal interface UserRoleStore : IdentifiableObjectStore<UserRole>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
new file mode 100644
index 0000000000..c1bfdb8cf9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.user.UserRole
+import org.hisp.dhis.android.core.user.UserRoleTableInfo
+
+internal class UserRoleStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : UserRoleStore,
+    IdentifiableObjectStoreImpl<UserRole>(
+        databaseAdapter,
+        UserRoleTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> UserRole.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<UserRole> = object : IdentifiableStatementBinder<UserRole>() {
+            override fun bindToStatement(o: UserRole, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.java
deleted file mode 100644
index cdd47122df..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.user.User;
-import org.hisp.dhis.android.core.user.UserTableInfo;
-
-import androidx.annotation.NonNull;
-
-public final class UserStore {
-    private UserStore() {}
-
-    private static StatementBinder<User> BINDER = new IdentifiableStatementBinder<User>() {
-
-        @Override
-        public void bindToStatement(@NonNull User o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(7, o.birthday());
-            w.bind(8, o.education());
-            w.bind(9, o.gender());
-            w.bind(10, o.jobTitle());
-            w.bind(11, o.surname());
-            w.bind(12, o.firstName());
-            w.bind(13, o.introduction());
-            w.bind(14, o.employer());
-            w.bind(15, o.interests());
-            w.bind(16, o.languages());
-            w.bind(17, o.email());
-            w.bind(18, o.phoneNumber());
-            w.bind(19, o.nationality());
-            w.bind(20, o.username());
-        }
-    };
-
-    public static IdentifiableObjectStore<User> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter, UserTableInfo.TABLE_INFO, BINDER, User::create);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.kt
new file mode 100644
index 0000000000..aa34209191
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.user.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.user.User
+
+internal interface UserStore : IdentifiableObjectStore<User>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
new file mode 100644
index 0000000000..a291dc572d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.user.User
+import org.hisp.dhis.android.core.user.UserTableInfo
+
+@Suppress("MagicNumber")
+internal class UserStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : UserStore,
+    IdentifiableObjectStoreImpl<User>(
+        databaseAdapter,
+        UserTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> User.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER: StatementBinder<User> = object : IdentifiableStatementBinder<User>() {
+            override fun bindToStatement(o: User, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.birthday())
+                w.bind(8, o.education())
+                w.bind(9, o.gender())
+                w.bind(10, o.jobTitle())
+                w.bind(11, o.surname())
+                w.bind(12, o.firstName())
+                w.bind(13, o.introduction())
+                w.bind(14, o.employer())
+                w.bind(15, o.interests())
+                w.bind(16, o.languages())
+                w.bind(17, o.email())
+                w.bind(18, o.phoneNumber())
+                w.bind(19, o.nationality())
+                w.bind(20, o.username())
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.java
index ef2ad305cc..58706e9c42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.java
@@ -27,7 +27,8 @@
  */
 package org.hisp.dhis.android.core.validation;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
+import static org.hisp.dhis.android.core.validation.ValidationRuleTableInfo.Columns;
+
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -37,6 +38,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.common.IdentifiableColumns;
 import org.hisp.dhis.android.core.period.PeriodType;
+import org.hisp.dhis.android.core.validation.internal.ValidationRuleStore;
 
 import java.util.List;
 import java.util.Map;
@@ -45,14 +47,12 @@
 
 import dagger.Reusable;
 
-import static org.hisp.dhis.android.core.validation.ValidationRuleTableInfo.Columns;
-
 @Reusable
 public final class ValidationRuleCollectionRepository
         extends ReadOnlyNameableCollectionRepositoryImpl<ValidationRule, ValidationRuleCollectionRepository> {
 
     @Inject
-    ValidationRuleCollectionRepository(final IdentifiableObjectStore<ValidationRule> store,
+    ValidationRuleCollectionRepository(final ValidationRuleStore store,
                                        final Map<String, ChildrenAppender<ValidationRule>> childrenAppenders,
                                        final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
index b900cf8cf6..ef57cec9b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
@@ -29,15 +29,14 @@ package org.hisp.dhis.android.core.validation.engine.internal
 
 import io.reactivex.Single
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantCollectionRepository
 import org.hisp.dhis.android.core.datavalue.DataValueCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitCollectionRepository
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DimensionalItemObject
 import org.hisp.dhis.android.core.parser.internal.service.utils.ExpressionHelper.getValueMap
@@ -56,7 +55,7 @@ internal class ValidationEngineImpl @Inject constructor(
     private val constantRepository: ConstantCollectionRepository,
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
     private val periodHelper: PeriodHelper,
-    private val orgunitGroupLinkStore: LinkStore<OrganisationUnitOrganisationUnitGroupLink>
+    private val orgunitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore
 ) : ValidationEngine {
     override fun validate(
         dataSetUid: String,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.java
deleted file mode 100644
index fa7881810f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public final class DataSetValidationRuleLinkEntityDIModule {
-
-    @Provides
-    @Reusable
-    LinkStore<DataSetValidationRuleLink> store(DatabaseAdapter databaseAdapter) {
-        return DataSetValidationRuleLinkStore.create(databaseAdapter);
-    }
-
-    @Provides
-    @Reusable
-    LinkHandler<ObjectWithUid, DataSetValidationRuleLink> handler(LinkStore<DataSetValidationRuleLink> store) {
-        return new LinkHandlerImpl<>(store);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt
new file mode 100644
index 0000000000..cec156ab96
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+@Module
+internal class DataSetValidationRuleLinkEntityDIModule {
+    @Provides
+    @Reusable
+    fun store(databaseAdapter: DatabaseAdapter): DataSetValidationRuleLinkStore {
+        return DataSetValidationRuleLinkStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
new file mode 100644
index 0000000000..68678d1509
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
+
+@Reusable
+internal class DataSetValidationRuleLinkHandler @Inject constructor(
+    store: DataSetValidationRuleLinkStore
+) : LinkHandlerImpl<ObjectWithUid, DataSetValidationRuleLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.kt
new file mode 100644
index 0000000000..31e3e99514
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.validation.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
+
+internal interface DataSetValidationRuleLinkStore : LinkStore<DataSetValidationRuleLink>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
index dc68536d25..0afd7eca96 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
@@ -25,27 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink;
-import org.hisp.dhis.android.core.validation.DataSetValidationRuleLinkTableInfo;
+internal class DataSetValidationRuleLinkStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : DataSetValidationRuleLinkStore,
+    LinkStoreImpl<DataSetValidationRuleLink>(
+        databaseAdapter,
+        DataSetValidationRuleLinkTableInfo.TABLE_INFO,
+        DataSetValidationRuleLinkTableInfo.Columns.DATA_SET,
+        BINDER,
+        { cursor: Cursor -> DataSetValidationRuleLink.create(cursor) }
+    ) {
 
-public final class DataSetValidationRuleLinkStore {
-
-    private static final StatementBinder<DataSetValidationRuleLink> BINDER = (o, w) -> {
-        w.bind(1, o.dataSet());
-        w.bind(2, o.validationRule());
-    };
-
-    private DataSetValidationRuleLinkStore() {}
-
-    public static LinkStore<DataSetValidationRuleLink> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.linkStore(databaseAdapter, DataSetValidationRuleLinkTableInfo.TABLE_INFO,
-                DataSetValidationRuleLinkTableInfo.Columns.DATA_SET, BINDER, DataSetValidationRuleLink::create);
+    companion object {
+        private val BINDER = StatementBinder { o: DataSetValidationRuleLink, w: StatementWrapper ->
+            w.bind(1, o.dataSet())
+            w.bind(2, o.validationRule())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
index 07605a5e2c..a0b67fbf61 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
@@ -25,47 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.validation.ValidationModule;
-import org.hisp.dhis.android.core.validation.ValidationRule;
-import org.hisp.dhis.android.core.validation.engine.internal.ValidationEngineEntityDIModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        DataSetValidationRuleLinkEntityDIModule.class,
-        ValidationEngineEntityDIModule.class,
-        ValidationRuleEntityDIModule.class
-})
-public final class ValidationPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.validation.ValidationModule
+import org.hisp.dhis.android.core.validation.ValidationRule
+import org.hisp.dhis.android.core.validation.engine.internal.ValidationEngineEntityDIModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        DataSetValidationRuleLinkEntityDIModule::class,
+        ValidationEngineEntityDIModule::class,
+        ValidationRuleEntityDIModule::class
+    ]
+)
+internal class ValidationPackageDIModule {
     @Provides
     @Reusable
-    UidsCall<ValidationRule> validationRuleCall(ValidationRuleCall impl) {
-        return impl;
+    fun validationRuleCall(impl: ValidationRuleCall): UidsCall<ValidationRule> {
+        return impl
     }
 
     @Provides
     @Reusable
-    ValidationRuleUidsCall validationRuleUidsCall(ValidationRuleUidsCallImpl impl) {
-        return impl;
+    fun validationRuleUidsCall(impl: ValidationRuleUidsCallImpl): ValidationRuleUidsCall {
+        return impl
     }
 
     @Provides
     @Reusable
-    ValidationRuleService validationRuleService(Retrofit retrofit) {
-        return retrofit.create(ValidationRuleService.class);
+    fun validationRuleService(retrofit: Retrofit): ValidationRuleService {
+        return retrofit.create(ValidationRuleService::class.java)
     }
 
     @Provides
     @Reusable
-    ValidationModule module(ValidationModuleImpl impl) {
-        return impl;
+    fun module(impl: ValidationModuleImpl): ValidationModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
index de3ec583f4..696e37421e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.validation.ValidationRule;
 
@@ -48,11 +47,13 @@ final class ValidationRuleCall implements UidsCall<ValidationRule> {
     private static final int MAX_UID_LIST_SIZE = 64;
 
     private final ValidationRuleService service;
-    private final Handler<ValidationRule> handler;
+    private final ValidationRuleHandler handler;
     private final APIDownloader apiDownloader;
 
     @Inject
-    ValidationRuleCall(ValidationRuleService service, Handler<ValidationRule> handler, APIDownloader apiDownloader) {
+    ValidationRuleCall(ValidationRuleService service,
+                       ValidationRuleHandler handler,
+                       APIDownloader apiDownloader) {
         this.service = service;
         this.handler = handler;
         this.apiDownloader = apiDownloader;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
index cdb0324488..91ac5fa45e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
@@ -25,39 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
-
-import java.util.Collections;
-import java.util.Map;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.validation.ValidationRule
+import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
 
 @Module
-public final class TrackedEntityAttributeValueEntityDIModule {
-
+internal class ValidationRuleEntityDIModule {
     @Provides
     @Reusable
-    public TrackedEntityAttributeValueStore store(DatabaseAdapter databaseAdapter) {
-        return TrackedEntityAttributeValueStoreImpl.create(databaseAdapter);
+    fun store(databaseAdapter: DatabaseAdapter): ValidationRuleStore {
+        return ValidationRuleStoreImpl(databaseAdapter)
     }
 
     @Provides
     @Reusable
-    public HandlerWithTransformer<TrackedEntityAttributeValue> handler(TrackedEntityAttributeValueStore store) {
-        return new TrackedEntityAttributeValueHandler(store);
+    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<ValidationRule> {
+        return CollectionCleanerImpl(ValidationRuleTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
 
     @Provides
     @Reusable
-    Map<String, ChildrenAppender<TrackedEntityAttributeValue>> childrenAppenders() {
-        return Collections.emptyMap();
+    fun childrenAppenders(): Map<String, ChildrenAppender<ValidationRule>> {
+        return emptyMap()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
new file mode 100644
index 0000000000..1ebba42150
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
+import org.hisp.dhis.android.core.validation.ValidationRule
+
+@Reusable
+internal class ValidationRuleHandler @Inject constructor(
+    store: ValidationRuleStore,
+    private val collectionCleaner: CollectionCleaner<ValidationRule>
+) : IdentifiableHandlerImpl<ValidationRule>(store) {
+    override fun afterCollectionHandled(oCollection: Collection<ValidationRule>?) {
+        collectionCleaner.deleteNotPresent(oCollection)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.kt
new file mode 100644
index 0000000000..a64d8b738d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.validation.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.validation.ValidationRule
+
+internal interface ValidationRuleStore : IdentifiableObjectStore<ValidationRule>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
index 960423f991..60387d8163 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
@@ -25,47 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.IntegerArrayColumnAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.validation.ValidationRule
+import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
 
-import androidx.annotation.NonNull;
+@Suppress("MagicNumber")
+internal class ValidationRuleStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : ValidationRuleStore,
+    IdentifiableObjectStoreImpl<ValidationRule>(
+        databaseAdapter,
+        ValidationRuleTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> ValidationRule.create(cursor) }
+    ) {
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.IntegerArrayColumnAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.NameableStatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder;
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.validation.ValidationRule;
-import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo;
-
-final class ValidationRuleStore {
-
-    private ValidationRuleStore() {
-    }
-
-    private static StatementBinder<ValidationRule> BINDER = new NameableStatementBinder<ValidationRule>() {
-        @Override
-        public void bindToStatement(@NonNull ValidationRule o, @NonNull StatementWrapper w) {
-            super.bindToStatement(o, w);
-            w.bind(11, o.instruction());
-            w.bind(12, o.importance());
-            w.bind(13, o.operator());
-            w.bind(14, o.periodType());
-            w.bind(15, o.skipFormValidation());
-            w.bind(16, o.leftSide().expression());
-            w.bind(17, o.leftSide().description());
-            w.bind(18, o.leftSide().missingValueStrategy());
-            w.bind(19, o.rightSide().expression());
-            w.bind(20, o.rightSide().description());
-            w.bind(21, o.rightSide().missingValueStrategy());
-            w.bind(22, IntegerArrayColumnAdapter.serialize(o.organisationUnitLevels()));
+    companion object {
+        private val BINDER: StatementBinder<ValidationRule> = object : NameableStatementBinder<ValidationRule>() {
+            override fun bindToStatement(o: ValidationRule, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(11, o.instruction())
+                w.bind(12, o.importance())
+                w.bind(13, o.operator())
+                w.bind(14, o.periodType())
+                w.bind(15, o.skipFormValidation())
+                w.bind(16, o.leftSide().expression())
+                w.bind(17, o.leftSide().description())
+                w.bind(18, o.leftSide().missingValueStrategy())
+                w.bind(19, o.rightSide().expression())
+                w.bind(20, o.rightSide().description())
+                w.bind(21, o.rightSide().missingValueStrategy())
+                w.bind(22, IntegerArrayColumnAdapter.serialize(o.organisationUnitLevels()))
+            }
         }
-    };
-
-    public static IdentifiableObjectStore<ValidationRule> create(DatabaseAdapter databaseAdapter) {
-        return StoreFactory.objectWithUidStore(databaseAdapter,
-                ValidationRuleTableInfo.TABLE_INFO, BINDER, ValidationRule::create);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java
index dc1df0a4bd..024916ae7c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.validation.internal;
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink;
@@ -48,12 +47,12 @@
 final class ValidationRuleUidsCallImpl implements ValidationRuleUidsCall {
 
     private final ValidationRuleService service;
-    private final LinkHandler<ObjectWithUid, DataSetValidationRuleLink> linkHandler;
+    private final DataSetValidationRuleLinkHandler linkHandler;
     private final APIDownloader apiDownloader;
 
     @Inject
     ValidationRuleUidsCallImpl(ValidationRuleService service,
-                               LinkHandler<ObjectWithUid, DataSetValidationRuleLink> linkHandler,
+                               DataSetValidationRuleLinkHandler linkHandler,
                                APIDownloader apiDownloader) {
         this.service = service;
         this.linkHandler = linkHandler;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.java
index 436429dc44..8c786e497f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.java
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.visualization;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -37,6 +36,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo.Columns;
 import org.hisp.dhis.android.core.visualization.internal.VisualizationFields;
+import org.hisp.dhis.android.core.visualization.internal.VisualizationStore;
 
 import java.util.Map;
 
@@ -49,7 +49,7 @@ public final class VisualizationCollectionRepository
         extends ReadOnlyIdentifiableCollectionRepositoryImpl<Visualization, VisualizationCollectionRepository> {
 
     @Inject
-    VisualizationCollectionRepository(final IdentifiableObjectStore<Visualization> store,
+    VisualizationCollectionRepository(final VisualizationStore store,
                                       final Map<String, ChildrenAppender<Visualization>> childrenAppenders,
                                       final RepositoryScope scope) {
         super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
index 59ce24031a..4f6f6096ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
@@ -33,7 +33,6 @@ import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
@@ -41,7 +40,7 @@ import org.hisp.dhis.android.core.visualization.Visualization
 
 @Reusable
 internal class VisualizationCall @Inject constructor(
-    private val handler: Handler<Visualization>,
+    private val handler: VisualizationHandler,
     private val service: VisualizationService,
     private val dhis2VersionManager: DHISVersionManager,
     private val apiDownloader: APIDownloader
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt
index 65fe7a0581..2803cbf411 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt
@@ -31,24 +31,13 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
-import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
 
 @Module
 internal class VisualizationDimensionItemEntityDIModule {
 
     @Provides
     @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LinkStore<VisualizationDimensionItem> {
-        return VisualizationDimensionItemStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: LinkStore<VisualizationDimensionItem>):
-        LinkHandler<VisualizationDimensionItem, VisualizationDimensionItem> {
-        return LinkHandlerImpl(store)
+    fun store(databaseAdapter: DatabaseAdapter): VisualizationDimensionItemStore {
+        return VisualizationDimensionItemStoreImpl(databaseAdapter)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
new file mode 100644
index 0000000000..2385d3ccac
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.visualization.internal
+
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
+import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
+
+@Reusable
+internal class VisualizationDimensionItemHandler @Inject constructor(
+    store: VisualizationDimensionItemStore
+) : LinkHandlerImpl<VisualizationDimensionItem, VisualizationDimensionItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStore.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStore.kt
index ac1728f272..7cbad2d30d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStore.kt
@@ -25,32 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.visualization.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
-import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
-
-@Suppress("MagicNumber")
-internal object VisualizationDimensionItemStore {
-    private val BINDER = StatementBinder { o: VisualizationDimensionItem, w: StatementWrapper ->
-        w.bind(1, o.visualization())
-        w.bind(2, o.position())
-        w.bind(3, o.dimension())
-        w.bind(4, o.dimensionItem())
-        w.bind(5, o.dimensionItemType())
-    }
 
-    fun create(databaseAdapter: DatabaseAdapter): LinkStore<VisualizationDimensionItem> {
-        return StoreFactory.linkStore(
-            databaseAdapter,
-            VisualizationDimensionItemTableInfo.TABLE_INFO,
-            VisualizationDimensionItemTableInfo.Columns.VISUALIZATION,
-            BINDER
-        ) { VisualizationDimensionItem.create(it) }
-    }
-}
+internal interface VisualizationDimensionItemStore : LinkStore<VisualizationDimensionItem>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
new file mode 100644
index 0000000000..1dad541871
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.visualization.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
+import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
+import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
+
+@Suppress("MagicNumber")
+internal class VisualizationDimensionItemStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : VisualizationDimensionItemStore,
+    LinkStoreImpl<VisualizationDimensionItem>(
+        databaseAdapter,
+        VisualizationDimensionItemTableInfo.TABLE_INFO,
+        VisualizationDimensionItemTableInfo.Columns.VISUALIZATION,
+        BINDER,
+        { VisualizationDimensionItem.create(it) }
+    ) {
+    companion object {
+        private val BINDER = StatementBinder { o: VisualizationDimensionItem, w: StatementWrapper ->
+            w.bind(1, o.visualization())
+            w.bind(2, o.position())
+            w.bind(3, o.dimension())
+            w.bind(4, o.dimensionItem())
+            w.bind(5, o.dimensionItemType())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
index 75929c33d5..961dea173a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
@@ -33,26 +33,17 @@ import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.di.internal.IdentifiableStoreProvider
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
 
 @Module
-internal class VisualizationEntityDIModule : IdentifiableStoreProvider<Visualization> {
+internal class VisualizationEntityDIModule {
 
     @Provides
     @Reusable
-    override fun store(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<Visualization> {
-        return VisualizationStore.create(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(impl: VisualizationHandler): Handler<Visualization> {
-        return impl
+    fun store(databaseAdapter: DatabaseAdapter): VisualizationStore {
+        return VisualizationStoreImpl(databaseAdapter)
     }
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
index e00adc163e..ce0b125830 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
@@ -30,10 +30,8 @@ package org.hisp.dhis.android.core.visualization.internal
 import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.visualization.LayoutPosition
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
@@ -41,9 +39,9 @@ import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
 
 @Reusable
 internal class VisualizationHandler @Inject constructor(
-    store: IdentifiableObjectStore<Visualization>,
+    store: VisualizationStore,
     private val visualizationCollectionCleaner: CollectionCleaner<Visualization>,
-    private val itemHandler: LinkHandler<VisualizationDimensionItem, VisualizationDimensionItem>
+    private val itemHandler: VisualizationDimensionItemHandler
 ) : IdentifiableHandlerImpl<Visualization>(store) {
 
     override fun afterObjectHandled(o: Visualization, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index ebaebe3141..88685b8d99 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -31,15 +31,14 @@ import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
-import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
+import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.visualization.Visualization
 
 @Reusable
 internal class VisualizationModuleDownloader @Inject internal constructor(
     private val visualizationCall: UidsCall<Visualization>,
-    private val analyticsDhisVisualizationStore: ObjectWithoutUidStore<AnalyticsDhisVisualization>
+    private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore
 ) :
     TypedModuleDownloader<List<Visualization>> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStore.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStore.kt
index afe7920549..1431f914fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStore.kt
@@ -25,60 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.visualization.internal
 
-import android.database.Cursor
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
-import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.visualization.Visualization
-import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
-
-@Suppress("MagicNumber")
-internal object VisualizationStore {
-    private val BINDER = object : IdentifiableStatementBinder<Visualization>() {
-        override fun bindToStatement(o: Visualization, w: StatementWrapper) {
-            super.bindToStatement(o, w)
-            w.bind(7, o.description())
-            w.bind(8, o.displayDescription())
-            w.bind(9, o.displayFormName())
-            w.bind(10, o.title())
-            w.bind(11, o.displayTitle())
-            w.bind(12, o.subtitle())
-            w.bind(13, o.displaySubtitle())
-            w.bind(14, o.type())
-            w.bind(15, o.hideTitle())
-            w.bind(16, o.hideSubtitle())
-            w.bind(17, o.hideEmptyColumns())
-            w.bind(18, o.hideEmptyRows())
-            w.bind(19, o.hideEmptyRowItems())
-            w.bind(20, o.hideLegend())
-            w.bind(21, o.showHierarchy())
-            w.bind(22, o.rowTotals())
-            w.bind(23, o.rowSubTotals())
-            w.bind(24, o.colTotals())
-            w.bind(25, o.colSubTotals())
-            w.bind(26, o.showDimensionLabels())
-            w.bind(27, o.percentStackedValues())
-            w.bind(28, o.noSpaceBetweenColumns())
-            w.bind(29, o.skipRounding())
-            w.bind(30, o.displayDensity())
-            w.bind(31, o.digitGroupSeparator())
-            w.bind(32, o.legend()?.showKey())
-            w.bind(33, o.legend()?.style())
-            w.bind(34, UidsHelper.getUidOrNull(o.legend()?.set()))
-            w.bind(35, o.legend()?.strategy())
-            w.bind(36, o.aggregationType())
-        }
-    }
 
-    @JvmStatic
-    fun create(databaseAdapter: DatabaseAdapter): IdentifiableObjectStore<Visualization> {
-        return StoreFactory.objectWithUidStore(
-            databaseAdapter, VisualizationTableInfo.TABLE_INFO, BINDER
-        ) { cursor: Cursor -> Visualization.create(cursor) }
-    }
-}
+internal interface VisualizationStore : IdentifiableObjectStore<Visualization>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
new file mode 100644
index 0000000000..d7823e2a90
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.visualization.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.IdentifiableStatementBinder
+import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper
+import org.hisp.dhis.android.core.visualization.Visualization
+import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
+
+@Suppress("MagicNumber")
+internal class VisualizationStoreImpl(
+    databaseAdapter: DatabaseAdapter
+) : VisualizationStore,
+    IdentifiableObjectStoreImpl<Visualization>(
+        databaseAdapter,
+        VisualizationTableInfo.TABLE_INFO,
+        BINDER,
+        { cursor: Cursor -> Visualization.create(cursor) }
+    ) {
+    companion object {
+        private val BINDER = object : IdentifiableStatementBinder<Visualization>() {
+            override fun bindToStatement(o: Visualization, w: StatementWrapper) {
+                super.bindToStatement(o, w)
+                w.bind(7, o.description())
+                w.bind(8, o.displayDescription())
+                w.bind(9, o.displayFormName())
+                w.bind(10, o.title())
+                w.bind(11, o.displayTitle())
+                w.bind(12, o.subtitle())
+                w.bind(13, o.displaySubtitle())
+                w.bind(14, o.type())
+                w.bind(15, o.hideTitle())
+                w.bind(16, o.hideSubtitle())
+                w.bind(17, o.hideEmptyColumns())
+                w.bind(18, o.hideEmptyRows())
+                w.bind(19, o.hideEmptyRowItems())
+                w.bind(20, o.hideLegend())
+                w.bind(21, o.showHierarchy())
+                w.bind(22, o.rowTotals())
+                w.bind(23, o.rowSubTotals())
+                w.bind(24, o.colTotals())
+                w.bind(25, o.colSubTotals())
+                w.bind(26, o.showDimensionLabels())
+                w.bind(27, o.percentStackedValues())
+                w.bind(28, o.noSpaceBetweenColumns())
+                w.bind(29, o.skipRounding())
+                w.bind(30, o.displayDensity())
+                w.bind(31, o.digitGroupSeparator())
+                w.bind(32, o.legend()?.showKey())
+                w.bind(33, o.legend()?.style())
+                w.bind(34, UidsHelper.getUidOrNull(o.legend()?.set()))
+                w.bind(35, o.legend()?.strategy())
+                w.bind(36, o.aggregationType())
+            }
+        }
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt
index 0c4490624b..733d4760a7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt
@@ -33,22 +33,20 @@ import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 import org.junit.Test
 
 class AnalyticsOrganisationUnitHelperShould {
 
     private val userOrganisationUnitStore: UserOrganisationUnitLinkStore = mock()
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit> = mock()
-    private val organisationUnitLevelStore: IdentifiableObjectStore<OrganisationUnitLevel> = mock()
-    private val organisationUnitOrganisationUnitGroupLinkStore: LinkStore<OrganisationUnitOrganisationUnitGroupLink> =
-        mock()
+    private val organisationUnitStore: OrganisationUnitStore = mock()
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore = mock()
+    private val organisationUnitOrganisationUnitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore = mock()
 
     private val helper = AnalyticsOrganisationUnitHelper(
         userOrganisationUnitStore,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
index c7703f7414..0e415c73d1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
@@ -34,21 +34,21 @@ import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceHelperSamples as s
 import org.hisp.dhis.android.core.analytics.aggregated.mock.AggregatedSamples
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
+import org.hisp.dhis.android.core.category.internal.CategoryStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
 import org.hisp.dhis.android.core.indicator.Indicator
-import org.hisp.dhis.android.core.legendset.Legend
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import org.hisp.dhis.android.core.legendset.internal.LegendStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -56,18 +56,18 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class AnalyticsServiceMetadataHelperShould {
 
-    private val categoryStore: IdentifiableObjectStore<Category> = mock()
-    private val categoryOptionStore: IdentifiableObjectStore<CategoryOption> = mock()
-    private val dataElementStore: IdentifiableObjectStore<DataElement> = mock()
+    private val categoryStore: CategoryStore = mock()
+    private val categoryOptionStore: CategoryOptionStore = mock()
+    private val dataElementStore: DataElementStore = mock()
     private val categoryOptionComboStore: CategoryOptionComboStore = mock()
     private val indicatorStore: IdentifiableObjectStore<Indicator> = mock()
-    private val expressionDimensionItemStore: IdentifiableObjectStore<ExpressionDimensionItem> = mock()
-    private val legendStore: IdentifiableObjectStore<Legend> = mock()
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit> = mock()
-    private val organisationUnitGroupStore: IdentifiableObjectStore<OrganisationUnitGroup> = mock()
-    private val organisationUnitLevelStore: IdentifiableObjectStore<OrganisationUnitLevel> = mock()
-    private val programStore: ProgramStoreInterface = mock()
-    private val trackedEntityAttribute: IdentifiableObjectStore<TrackedEntityAttribute> = mock()
+    private val expressionDimensionItemStore: ExpressionDimensionItemStore = mock()
+    private val legendStore: LegendStore = mock()
+    private val organisationUnitStore: OrganisationUnitStore = mock()
+    private val organisationUnitGroupStore: OrganisationUnitGroupStore = mock()
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore = mock()
+    private val programStore: ProgramStore = mock()
+    private val trackedEntityAttribute: TrackedEntityAttributeStore = mock()
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository = mock()
     private val analyticsOrganisationUnitHelper: AnalyticsOrganisationUnitHelper = mock()
     private val parentPeriodGenerator: ParentPeriodGenerator = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt
index 628e6ca030..2a809320bf 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt
@@ -33,13 +33,13 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
+import org.hisp.dhis.android.core.category.internal.CategoryCategoryOptionLinkStore
+import org.hisp.dhis.android.core.category.internal.CategoryStore
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
 import org.hisp.dhis.android.core.visualization.*
 import org.junit.Assert.fail
 import org.junit.Test
@@ -50,9 +50,9 @@ import org.mockito.ArgumentMatchers.anyString
 @RunWith(JUnit4::class)
 class AnalyticsVisualizationsServiceDimensionHelperShould {
 
-    private val categoryStore: IdentifiableObjectStore<Category> = mock()
-    private val categoryOptionLinkStore: LinkStore<CategoryCategoryOptionLink> = mock()
-    private val organisationUnitLevelStore: IdentifiableObjectStore<OrganisationUnitLevel> = mock()
+    private val categoryStore: CategoryStore = mock()
+    private val categoryOptionLinkStore: CategoryCategoryOptionLinkStore = mock()
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore = mock()
     private val category: Category = mock()
     private val orgUnitLevel: OrganisationUnitLevel = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java
index 89108a5033..3818f44bc6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java
@@ -35,9 +35,9 @@
 import static org.mockito.Mockito.when;
 
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
 import org.hisp.dhis.android.core.user.User;
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher;
 import org.junit.Before;
@@ -57,7 +57,7 @@
 public class APICallExecutorShould {
 
     @Mock
-    private ObjectStore<D2Error> errorStore;
+    private D2ErrorStore errorStore;
 
     @Mock
     private User user;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
index 755f0198d8..343846c7eb 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
@@ -31,10 +31,10 @@ package org.hisp.dhis.android.core.arch.api.executors.internal
 import com.nhaarman.mockitokotlin2.mock
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
 import org.junit.Assert.assertEquals
@@ -45,7 +45,7 @@ class CoroutineAPICallExecutorShould {
 
     private val errorMapper: APIErrorMapper = mock()
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher = mock()
-    private val errorStore: ObjectStore<D2Error> = mock()
+    private val errorStore: D2ErrorStore = mock()
     private val databaseAdapter: DatabaseAdapter = mock()
     private val foreignKeyCleaner: ForeignKeyCleaner = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
index da4b98258c..ff700f3c3a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
@@ -27,15 +27,18 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import com.nhaarman.mockitokotlin2.*
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.same
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
 import org.hisp.dhis.android.core.category.Category
-import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryComboInternalAccessor.accessCategoryOptionCombos
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
@@ -43,9 +46,9 @@ import org.junit.Before
 import org.junit.Test
 
 class CategoryComboHandlerShould {
-    private val categoryComboStore: IdentifiableObjectStore<CategoryCombo> = mock()
-    private val optionComboHandler: HandlerWithTransformer<CategoryOptionCombo> = mock()
-    private val categoryCategoryComboLinkHandler: OrderedLinkHandler<Category, CategoryCategoryComboLink> = mock()
+    private val categoryComboStore: CategoryComboStore = mock()
+    private val optionComboHandler: CategoryOptionComboHandler = mock()
+    private val categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler = mock()
     private val categoryOptionCleaner: OrphanCleaner<CategoryCombo, CategoryOptionCombo> = mock()
 
     private val comboUid = "comboId"
diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
index 531f2716a7..a2539d9374 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
@@ -27,8 +27,13 @@
  */
 package org.hisp.dhis.android.core.common.internal
 
-import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
+import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -41,6 +46,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.junit.Before
 import org.junit.Test
 
@@ -52,7 +58,7 @@ class TrackerDataManagerShould {
     private val relationshipStore: RelationshipStore = mock()
     private val relationshipChildrenAppender: RelationshipItemChildrenAppender = mock()
     private val dataStatePropagator: DataStatePropagator = mock()
-    private val programOwnerStore: ObjectWithoutUidStore<ProgramOwner> = mock()
+    private val programOwnerStore: ProgramOwnerStore = mock()
 
     private val trackedEntity: TrackedEntityInstance = mock()
     private val enrollment: Enrollment = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandlerShould.java
index 14b3a1a6bd..f14f784a23 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandlerShould.java
@@ -27,10 +27,15 @@
  */
 package org.hisp.dhis.android.core.common.valuetype.rendering.internal;
 
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
 import org.hisp.dhis.android.core.common.ValueTypeRendering;
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingHandler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,12 +43,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ValueTypeRenderingHandlerShould {
 
@@ -51,7 +50,7 @@ public class ValueTypeRenderingHandlerShould {
     private static final String TABLE = "table";
     
     @Mock
-    private HandlerWithTransformer<ValueTypeDeviceRendering> deviceRenderingHandler;
+    private ValueTypeDeviceRenderingHandler deviceRenderingHandler;
     
     @Mock
     private ValueTypeDeviceRendering desktopRenderType;
@@ -63,7 +62,7 @@ public class ValueTypeRenderingHandlerShould {
     private ValueTypeRendering renderType;
 
     // object to test
-    private DictionaryTableHandler<ValueTypeRendering> renderTypeHandler;
+    private ValueTypeRenderingHandler renderTypeHandler;
 
     @Before
     public void setUp() throws Exception {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
index c7e17cff86..dcb35b85d3 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.configuration.internal
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.junit.Before
 import org.junit.Test
@@ -42,7 +41,7 @@ class MultiUserDatabaseManagerForD2ManagerUnitShould : BaseCallShould() {
 
     private val databaseAdapterFactory: DatabaseAdapterFactory = mock()
     private val migration: DatabaseConfigurationMigration = mock()
-    private val databaseConfigurationStore: ObjectKeyValueStore<DatabasesConfiguration> = mock()
+    private val databaseConfigurationStore: DatabaseConfigurationInsecureStore = mock()
 
     private val username = "username"
     private val serverUrl = "https://dhis2.org"
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
index d645f584fd..0f974ad21b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
@@ -31,7 +31,6 @@ import android.content.Context
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseExport
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.configuration.internal.DatabasesConfigurationUtil.buildUserConfiguration
 import org.junit.Before
@@ -43,7 +42,7 @@ import org.junit.runners.JUnit4
 class MultiUserDatabaseManagerUnitShould : BaseCallShould() {
 
     private val context: Context = mock()
-    private val databaseConfigurationSecureStore: ObjectKeyValueStore<DatabasesConfiguration> = mock()
+    private val databaseConfigurationSecureStore: DatabaseConfigurationInsecureStore = mock()
     private val configurationHelper: DatabaseConfigurationHelper = mock()
     private val databaseExport: DatabaseExport = mock()
     private val databaseAdapterFactory: DatabaseAdapterFactory = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.java
deleted file mode 100644
index 480b21bfc1..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.AttributeValue;
-import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink;
-import org.hisp.dhis.android.core.legendset.LegendSet;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(JUnit4.class)
-public class DataElementHandlerShould {
-    @Mock
-    private IdentifiableObjectStore<DataElement> dataElementStore;
-
-    @Mock
-    private LinkHandler<Attribute, DataElementAttributeValueLink> dataElementAttributeValueLinkHandler;
-
-    @Mock
-    private Handler<Attribute> attributeHandler;
-
-    @Mock
-    private OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink> dataElementLegendSetLinkHandler;
-
-    @Mock
-    private Handler<ObjectWithUid> legendSetHandler;
-
-    @Mock
-    private DataElement dataElement;
-
-    @Mock
-    private ObjectWithUid legendSet;
-
-    // object to test
-    private Handler<DataElement> dataElementHandler;
-
-    private List<DataElement> dataElements;
-
-    private List<ObjectWithUid> legendSets;
-
-    private List<AttributeValue> attributeValues = new ArrayList<>();
-
-    Attribute attribute;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        dataElementHandler = new DataElementHandler(
-                dataElementStore,
-                attributeHandler,
-                dataElementAttributeValueLinkHandler,
-                dataElementLegendSetLinkHandler
-        );
-
-        dataElements = new ArrayList<>();
-        dataElements.add(dataElement);
-
-        legendSets = new ArrayList<>();
-        legendSets.add(legendSet);
-
-        when(dataElement.uid()).thenReturn("test_data_element_uid");
-
-        attribute = Attribute.builder()
-                .dataElementAttribute(true)
-                .uid("Att_Uid")
-                .name("att")
-                .code("att")
-                .valueType(ValueType.TEXT)
-                .build();
-
-        AttributeValue attValue = AttributeValue.builder()
-                .value("5")
-                .attribute(attribute)
-                .build();
-
-        attributeValues.add(attValue);
-
-        when(dataElement.attributeValues()).thenReturn(attributeValues);
-        when(dataElement.legendSets()).thenReturn(legendSets);
-    }
-
-    @Test
-    public void do_nothing_when_passing_null_argument() {
-        dataElementHandler.handle(null);
-
-        // verify that program indicator store is never called
-        verify(dataElementStore, never()).delete(anyString());
-
-        verify(dataElementStore, never()).update(any(DataElement.class));
-
-        verify(dataElementStore, never()).insert(any(DataElement.class));
-    }
-
-
-    @Test
-    public void delete_shouldDeleteDataElement() {
-        when(dataElement.deleted()).thenReturn(Boolean.TRUE);
-
-        dataElementHandler.handleMany(dataElements);
-
-        // verify that delete is called once
-        verify(dataElementStore, times(1)).deleteIfExists(dataElement.uid());
-    }
-
-    @Test
-    public void update_shouldUpdateDataElement() {
-        dataElementHandler.handleMany(dataElements);
-
-        // verify that update is called once
-        verify(dataElementStore, times(1)).updateOrInsert(any(DataElement.class));
-
-        verify(dataElementStore, never()).delete(anyString());
-    }
-
-    @Test
-    public void call_attribute_handlers() {
-        dataElementHandler.handleMany(dataElements);
-        verify(attributeHandler).handleMany(eq(Arrays.asList(attribute)));
-        verify(dataElementAttributeValueLinkHandler).handleMany(eq(dataElement.uid()), eq(Arrays.asList(attribute)), any());
-    }
-
-    public void call_legend_set_handler() {
-        dataElementHandler.handleMany(dataElements);
-        verify(legendSetHandler).handleMany(eq(legendSets));
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt
new file mode 100644
index 0000000000..2626455d61
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataelement.internal
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.attribute.Attribute
+import org.hisp.dhis.android.core.attribute.AttributeValue
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
+import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.mockito.Mockito
+
+@RunWith(JUnit4::class)
+class DataElementHandlerShould {
+    private val dataElementStore: DataElementStore = mock()
+    private val dataElementAttributeValueLinkHandler: DataElementAttributeValueLinkHandler = mock()
+    private val attributeHandler: AttributeHandler = mock()
+    private val dataElementLegendSetLinkHandler: DataElementLegendSetLinkHandler = mock()
+
+    private val dataElement: DataElement = mock()
+    private val legendSet: ObjectWithUid = mock()
+
+    // object to test
+    private lateinit var dataElementHandler: DataElementHandler
+    private lateinit var dataElements: List<DataElement>
+    private lateinit var legendSets: List<ObjectWithUid>
+
+    private val attributeValues: MutableList<AttributeValue> = ArrayList()
+    private var attribute: Attribute? = null
+
+    @Before
+    fun setUp() {
+        dataElementHandler = DataElementHandler(
+            dataElementStore,
+            attributeHandler,
+            dataElementAttributeValueLinkHandler,
+            dataElementLegendSetLinkHandler
+        )
+        dataElements = listOf(dataElement)
+        legendSets = listOf(legendSet)
+
+        whenever(dataElement.uid()).doReturn("test_data_element_uid")
+        attribute = Attribute.builder()
+            .dataElementAttribute(true)
+            .uid("Att_Uid")
+            .name("att")
+            .code("att")
+            .valueType(ValueType.TEXT)
+            .build()
+        val attValue = AttributeValue.builder()
+            .value("5")
+            .attribute(attribute)
+            .build()
+        attributeValues.add(attValue)
+
+        whenever(dataElement.attributeValues()).doReturn(attributeValues)
+        whenever(dataElement.legendSets()).doReturn(legendSets)
+
+        whenever(dataElementStore.updateOrInsert(any())).doReturn(HandleAction.Insert)
+    }
+
+    @Test
+    fun do_nothing_when_passing_null_argument() {
+        dataElementHandler.handle(null)
+
+        // verify that program indicator store is never called
+        verify(dataElementStore, never()).delete(any())
+        verify(dataElementStore, never()).update(any())
+        verify(dataElementStore, never()).insert(any<DataElement>())
+    }
+
+    @Test
+    fun delete_shouldDeleteDataElement() {
+        whenever(dataElement.deleted()).doReturn(true)
+        dataElementHandler.handleMany(dataElements)
+
+        // verify that delete is called once
+        verify(dataElementStore, times(1)).deleteIfExists(dataElement.uid())
+    }
+
+    @Test
+    fun update_shouldUpdateDataElement() {
+        dataElementHandler.handleMany(dataElements)
+
+        // verify that update is called once
+        verify(dataElementStore, times(1)).updateOrInsert(any())
+        verify(dataElementStore, never()).delete(any())
+    }
+
+    @Test
+    fun call_attribute_handlers() {
+        dataElementHandler.handleMany(dataElements)
+        verify(attributeHandler).handleMany(eq(listOf(attribute) as Collection<Attribute>))
+        Mockito.verify(dataElementAttributeValueLinkHandler).handleMany(
+            eq(dataElement.uid()),
+            eq(listOf(attribute) as Collection<Attribute>),
+            any()
+        )
+    }
+
+    @Test
+    fun call_data_element_legend_set_handler() {
+        dataElementHandler.handleMany(dataElements)
+        verify(dataElementLegendSetLinkHandler).handleMany(any(), any(), any())
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
index 5aee8b24a6..9ab277cab2 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
@@ -28,6 +28,14 @@
 
 package org.hisp.dhis.android.core.dataset.internal;
 
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
@@ -38,10 +46,9 @@
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.DataAccess;
 import org.hisp.dhis.android.core.dataelement.DataElementOperand;
+import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler;
 import org.hisp.dhis.android.core.dataset.DataInputPeriod;
 import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink;
-import org.hisp.dhis.android.core.dataset.DataSetElement;
 import org.hisp.dhis.android.core.dataset.DataSetInternalAccessor;
 import org.hisp.dhis.android.core.dataset.Section;
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink;
@@ -56,14 +63,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class DataSetHandlerShould {
 
@@ -77,14 +76,13 @@ public class DataSetHandlerShould {
     private OrphanCleaner<DataSet, Section> sectionOrphanCleaner;
 
     @Mock
-    private Handler<DataElementOperand> compulsoryDataElementOperandHandler;
+    private DataElementOperandHandler compulsoryDataElementOperandHandler;
 
     @Mock
-    private LinkHandler<DataElementOperand, DataSetCompulsoryDataElementOperandLink>
-            dataSetCompulsoryDataElementOperandLinkHandler;
+    private DataSetCompulsoryDataElementOperandHandler dataSetCompulsoryDataElementOperandLinkHandler;
 
     @Mock
-    private LinkHandler<DataInputPeriod, DataInputPeriod> dataInputPeriodHandler;
+    private DataInputPeriodHandler dataInputPeriodHandler;
 
     @Mock
     private DataSet dataSet;
@@ -114,7 +112,7 @@ public class DataSetHandlerShould {
     private DataInputPeriod dataInputPeriod;
 
     @Mock
-    private LinkHandler<DataSetElement, DataSetElement> dataSetElementLinkHandler;
+    private DataSetElementHandler dataSetElementHandler;
 
     @Mock
     private LinkHandler<Indicator, DataSetIndicatorLink> dataSetIndicatorLinkHandler;
@@ -142,7 +140,7 @@ public void setUp() throws Exception {
                 compulsoryDataElementOperandHandler,
                 dataSetCompulsoryDataElementOperandLinkHandler,
                 dataInputPeriodHandler,
-                dataSetElementLinkHandler,
+                dataSetElementHandler,
                 dataSetIndicatorLinkHandler,
                 collectionCleaner,
                 linkCleaner);
@@ -166,6 +164,8 @@ public void setUp() throws Exception {
         dataInputPeriods = new ArrayList<>();
         dataInputPeriods.add(dataInputPeriod);
         when(dataSet.dataInputPeriods()).thenReturn(dataInputPeriods);
+
+        when(dataSetStore.updateOrInsert(any(DataSet.class))).thenReturn(HandleAction.Insert);
     }
 
     @Test
@@ -239,7 +239,7 @@ public void handle_data_element_links() {
 
         dataSetHandler.handle(dataSet);
 
-        verify(dataSetElementLinkHandler).handleMany(anyString(), anyList(), any());
+        verify(dataSetElementHandler).handleMany(anyString(), anyList(), any());
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/SectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/SectionHandlerShould.java
index ce4807cf42..b7026e3027 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/SectionHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/SectionHandlerShould.java
@@ -27,18 +27,19 @@
  */
 package org.hisp.dhis.android.core.dataset.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyListOf;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
 import org.hisp.dhis.android.core.dataelement.DataElement;
 import org.hisp.dhis.android.core.dataelement.DataElementOperand;
+import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler;
 import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.dataset.SectionDataElementLink;
-import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink;
-import org.hisp.dhis.android.core.indicator.Indicator;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,34 +50,26 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class SectionHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<Section> sectionStore;
+    private SectionStore sectionStore;
 
     @Mock
-    private OrderedLinkHandler<DataElement, SectionDataElementLink> sectionDataElementLinkHandler;
+    private SectionDataElementLinkHandler sectionDataElementLinkHandler;
 
     @Mock
-    private Handler<DataElementOperand> greyedFieldsHandler;
+    private DataElementOperandHandler greyedFieldsHandler;
 
     @Mock
-    private LinkHandler<DataElementOperand, SectionGreyedFieldsLink> sectionGreyedFieldsLinkHandler;
+    private SectionGreyedFieldsLinkHandler sectionGreyedFieldsLinkHandler;
 
     @Mock
-    private LinkHandler<Indicator, SectionIndicatorLink> sectionIndicatorLinkHandler;
+    private SectionIndicatorLinkHandler sectionIndicatorLinkHandler;
 
     @Mock
-    private LinkStore<SectionGreyedFieldsLink> sectionGreyedFieldsStore;
+    private SectionGreyedFieldsLinkStore sectionGreyedFieldsStore;
 
     @Mock
     private Section section;
@@ -87,7 +80,7 @@ public class SectionHandlerShould {
 
     @Before
     public void setUp() throws Exception {
-        
+
         MockitoAnnotations.initMocks(this);
 
         sectionHandler = new SectionHandler(sectionStore, sectionDataElementLinkHandler,
@@ -107,7 +100,7 @@ public void setUp() throws Exception {
 
     @Test
     public void passingNullArguments_shouldNotPerformAnyAction() {
-       sectionHandler.handle(null);
+        sectionHandler.handle(null);
 
         verify(sectionStore, never()).delete(anyString());
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandlerShould.java
index 8329958dbc..734972dd5d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandlerShould.java
@@ -28,10 +28,14 @@
 
 package org.hisp.dhis.android.core.datavalue.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.datavalue.DataValue;
-import org.hisp.dhis.android.core.datavalue.DataValueConflict;
 import org.hisp.dhis.android.core.imports.ImportStatus;
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary;
 import org.junit.Before;
@@ -43,12 +47,6 @@
 
 import java.util.Collections;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class DataValueImportHandlerShould {
 
@@ -59,7 +57,7 @@ public class DataValueImportHandlerShould {
     DataValueConflictParser dataValueConflictParser;
 
     @Mock
-    ObjectStore<DataValueConflict> dataValueConflictStore;
+    DataValueConflictStore dataValueConflictStore;
 
     @Mock
     DataValueImportSummary dataValueImportSummary;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
index 15a92b30de..0ea9d1ac65 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
@@ -32,7 +32,6 @@ import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitCollectionRepository
@@ -53,7 +52,7 @@ class AggregatedDataCallBundleFactoryShould {
     private val organisationUnitRepository: OrganisationUnitCollectionRepository = mock()
     private val dataSetSettingsObjectRepository: DataSetSettingsObjectRepository = mock()
     private val periodManager: PeriodForDataSetManager = mock()
-    private val aggregatedDataSyncStore: ObjectWithoutUidStore<AggregatedDataSync> = mock()
+    private val aggregatedDataSyncStore: AggregatedDataSyncStore = mock()
     private val lastUpdatedCalculator: AggregatedDataSyncLastUpdatedCalculator = mock()
     private val dataSetSettings: DataSetSettings = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
index 96a44933ec..420c7a4de3 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
@@ -32,7 +32,6 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.helpers.AccessHelper
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.Access
@@ -50,6 +49,7 @@ import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStore
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -78,7 +78,7 @@ class EnrollmentServiceShould {
         mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
     private val programStageCollectionRepository: ProgramStageCollectionRepository =
         mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
-    private val programTempOwnerStore: ObjectWithoutUidStore<ProgramTempOwner> = mock()
+    private val programTempOwnerStore: ProgramTempOwnerStore = mock()
 
     private lateinit var enrollmentService: EnrollmentService
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventFilterHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventFilterHandlerShould.java
index a9e063572e..1820a4cdf4 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventFilterHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventFilterHandlerShould.java
@@ -28,12 +28,14 @@
 
 package org.hisp.dhis.android.core.event.internal;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.Lists;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.event.EventDataFilter;
 import org.hisp.dhis.android.core.event.EventFilter;
 import org.hisp.dhis.android.core.event.EventQueryCriteria;
@@ -47,19 +49,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class EventFilterHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<EventFilter> eventFilterStore;
+    private EventFilterStore eventFilterStore;
 
     @Mock
-    private HandlerWithTransformer<EventDataFilter> eventDataFilterHandler;
+    private EventDataFilterHandler eventDataFilterHandler;
 
     @Mock
     private EventQueryCriteria eventQueryCriteria;
@@ -98,8 +95,7 @@ public void setUp() throws Exception {
 
     @Test
     public void extend_identifiable_handler_impl() {
-        IdentifiableHandlerImpl<EventFilter> genericHandler =
-                new EventFilterHandler(eventFilterStore, eventDataFilterHandler);
+        EventFilterHandler genericHandler = new EventFilterHandler(eventFilterStore, eventDataFilterHandler);
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
index 9b842866f0..60f38ab15a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
@@ -30,13 +30,13 @@ package org.hisp.dhis.android.core.event.internal
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
+import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
@@ -54,7 +54,7 @@ class EventHandlerShould {
     private val eventStore: EventStore = mock()
     private val trackedEntityDataValueHandler: TrackedEntityDataValueHandler = mock()
     private val trackedEntityDataValue: TrackedEntityDataValue = mock()
-    private val noteHandler: Handler<Note> = mock()
+    private val noteHandler: NoteHandler = mock()
     private val noteUniquenessManager: NoteUniquenessManager = mock()
     private val note: Note = mock()
     private val noteVersionManager: NoteDHISVersionManager = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
index 52c29dba7a..d0a4d80891 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
@@ -32,11 +32,11 @@ import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.settings.*
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactoryCommonHelper
@@ -50,12 +50,12 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class EventQueryBundleFactoryShould {
     private val resourceHandler: ResourceHandler = mock()
-    private val programStore: ProgramStoreInterface = mock()
+    private val programStore: ProgramStore = mock()
     private val programSettingsObjectRepository: ProgramSettingsObjectRepository = mock()
     private val programSettings: ProgramSettings = mock()
     private val lastUpdatedManager: EventLastUpdatedManager = mock()
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore = mock()
-    private val organisationUnitProgramLinkLinkStore: LinkStore<OrganisationUnitProgramLink> = mock()
+    private val organisationUnitProgramLinkLinkStore: OrganisationUnitProgramLinkStore = mock()
 
     private val p1 = "program1"
     private val p2 = "program2"
diff --git a/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java
index f77fa64c06..2054f8f2c5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java
@@ -27,11 +27,14 @@
  */
 package org.hisp.dhis.android.core.legendset.internal;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.legendset.Legend;
 import org.hisp.dhis.android.core.legendset.LegendSet;
 import org.junit.Before;
@@ -44,20 +47,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class LegendSetHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<LegendSet> legendSetStore;
+    private LegendSetStore legendSetStore;
 
     @Mock
-    private HandlerWithTransformer<Legend> legendHandler;
+    private LegendHandler legendHandler;
 
     @Mock
     private Legend legend;
@@ -81,12 +78,14 @@ public void setUp() throws Exception {
         legends = new ArrayList<>();
         legends.add(legend);
         when(legendSet.legends()).thenReturn(legends);
+
+        when(legendSetStore.updateOrInsert(any(LegendSet.class))).thenReturn(HandleAction.Insert);
     }
 
     @Test
     public void extend_identifiable_sync_handler_impl() {
-        IdentifiableHandlerImpl<LegendSet> genericHandler = new LegendSetHandler
-                (legendSetStore, null, null);
+        LegendSetHandler genericHandler = new LegendSetHandler
+                (legendSetStore, legendHandler, legendCleaner);
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandlerShould.kt
index d0d3b11876..770b5ea536 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandlerShould.kt
@@ -28,12 +28,9 @@
 package org.hisp.dhis.android.core.map.layer.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.map.layer.MapLayer
-import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -42,8 +39,8 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class MapLayerHandlerShould {
 
-    private val store: IdentifiableObjectStore<MapLayer> = mock()
-    private val providerHandler: LinkHandler<MapLayerImageryProvider, MapLayerImageryProvider> = mock()
+    private val store: MapLayerStore = mock()
+    private val providerHandler: MapLayerImageryProviderHandler = mock()
     private val mapLayer: MapLayer = mock()
 
     private lateinit var mapLayerHandler: Handler<MapLayer>
diff --git a/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java
index dfb755c4d0..a041b89550 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java
@@ -28,8 +28,10 @@
 
 package org.hisp.dhis.android.core.option.internal;
 
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ObjectStyle;
@@ -44,13 +46,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class OptionHandlerShould {
     @Mock
-    private IdentifiableObjectStore<Option> optionStore;
+    private OptionStore optionStore;
 
     @Mock
     private Option option;
@@ -84,6 +83,6 @@ public void clean_orphan_options() {
 
     @Test
     public void extend_identifiable_handler_impl() {
-        IdentifiableHandlerImpl<Option> genericHandler = new OptionHandler(optionStore, null);
+        IdentifiableHandlerImpl<Option> genericHandler = new OptionHandler(optionStore, optionCleaner);
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
index 84673676da..f739cd1c24 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
@@ -37,7 +37,6 @@ import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
@@ -66,7 +65,7 @@ class OrganisationUnitCallUnitShould {
     private val collectionCleaner: CollectionCleaner<OrganisationUnit> = mock()
     private val organisationUnitHandler: OrganisationUnitHandler = mock()
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore = mock()
-    private val organisationUnitIdentifiableObjectStore: IdentifiableObjectStore<OrganisationUnit> = mock()
+    private val organisationUnitStore: OrganisationUnitStore = mock()
     private val organisationUnitDisplayPathTransformer: OrganisationUnitDisplayPathTransformer = mock()
 
     // the call we are testing:
@@ -120,7 +119,7 @@ class OrganisationUnitCallUnitShould {
             organisationUnitHandler,
             organisationUnitDisplayPathTransformer,
             userOrganisationUnitLinkStore,
-            organisationUnitIdentifiableObjectStore,
+            organisationUnitStore,
             collectionCleaner
         )
             .download(user)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
index 6d8df8394c..5b14de8a5f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
@@ -28,17 +28,12 @@
 package org.hisp.dhis.android.core.organisationunit.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.common.ObjectWithUid
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
+import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
 import org.junit.Before
@@ -48,15 +43,13 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class OrganisationUnitHandlerShould {
-    private val organisationUnitStore: IdentifiableObjectStore<OrganisationUnit> = mock()
-    private val organisationUnitProgramLinkStore: LinkStore<OrganisationUnitProgramLink> = mock()
-    private val organisationUnitProgramLinkHandler: LinkHandler<ObjectWithUid, OrganisationUnitProgramLink> = mock()
-    private val dataSetDataSetOrganisationUnitLinkHandler: LinkHandler<ObjectWithUid, DataSetOrganisationUnitLink> =
-        mock()
+    private val organisationUnitStore: OrganisationUnitStore = mock()
+    private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore = mock()
+    private val organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler = mock()
+    private val dataSetDataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler = mock()
     private val userOrganisationUnitLinkHandler: LinkHandler<OrganisationUnit, UserOrganisationUnitLink> = mock()
-    private val organisationUnitGroupHandler: Handler<OrganisationUnitGroup> = mock()
-    private val organisationUnitGroupLinkHandler:
-        LinkHandler<OrganisationUnitGroup, OrganisationUnitOrganisationUnitGroupLink> = mock()
+    private val organisationUnitGroupHandler: OrganisationUnitGroupHandler = mock()
+    private val organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler = mock()
     private val organisationUnitGroup: OrganisationUnitGroup = mock()
     private val program: ObjectWithUid = mock()
     private val user: User = mock()
@@ -71,7 +64,7 @@ class OrganisationUnitHandlerShould {
     fun setUp() {
         val programUid = "test_program_uid"
         pathTransformer = OrganisationUnitDisplayPathTransformer()
-        organisationUnitHandler = OrganisationUnitHandlerImpl(
+        organisationUnitHandler = OrganisationUnitHandler(
             organisationUnitStore, userOrganisationUnitLinkHandler, organisationUnitProgramLinkHandler,
             dataSetDataSetOrganisationUnitLinkHandler, organisationUnitGroupHandler,
             organisationUnitGroupLinkHandler
diff --git a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt
index b6f6bc4bef..694dc61354 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt
@@ -30,18 +30,19 @@ package org.hisp.dhis.android.core.parser.internal.expression
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DataElementObject
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DataElementOperandObject
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DimensionalItemObject
-import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import org.hisp.dhis.android.core.validation.MissingValueStrategy
 import org.junit.Assert.fail
 import org.junit.Before
@@ -56,7 +57,7 @@ class ExpressionServiceShould {
     private val orgunitGroupId = "RAL7YE4KJ58"
     private val days = "[days]"
 
-    private val dataElementStore: IdentifiableObjectStore<DataElement> = mock()
+    private val dataElementStore: DataElementStore = mock()
     private val dataElement1: DataElement = mock()
     private val dataElement2: DataElement = mock()
 
@@ -64,10 +65,10 @@ class ExpressionServiceShould {
     private val categoryOptionCombo1: CategoryOptionCombo = mock()
     private val categoryOptionCombo2: CategoryOptionCombo = mock()
 
-    private val organisationUnitGroupStore: IdentifiableObjectStore<OrganisationUnitGroup> = mock()
+    private val organisationUnitGroupStore: OrganisationUnitGroupStore = mock()
     private val organisationUnitGroup: OrganisationUnitGroup = mock()
 
-    private val programStageStore: IdentifiableObjectStore<ProgramStage> = mock()
+    private val programStageStore: ProgramStageStore = mock()
 
     private val constant: Constant = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
index 2a629a9c42..ac8c3fe489 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
@@ -27,6 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl;
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
@@ -50,15 +59,6 @@
 
 import io.reactivex.Single;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramEndpointCallShould extends BaseCallShould {
 
@@ -66,7 +66,7 @@ public class ProgramEndpointCallShould extends BaseCallShould {
     private ProgramService programService;
 
     @Mock
-    private Handler<Program> programHandler;
+    private ProgramHandler programHandler;
 
     @Captor
     private ArgumentCaptor<Fields<Program>> fieldsCaptor;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
index 48492cf80e..45919b97c1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
@@ -28,15 +28,22 @@
 
 package org.hisp.dhis.android.core.program.internal;
 
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyListOf;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
 import org.hisp.dhis.android.core.attribute.Attribute;
 import org.hisp.dhis.android.core.attribute.AttributeValue;
-import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink;
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler;
+import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHandler;
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.DataAccess;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
@@ -60,28 +67,20 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramHandlerShould {
 
     @Mock
-    private ProgramStoreInterface programStore;
+    private ProgramStore programStore;
 
     @Mock
-    private Handler<ProgramRuleVariable> programRuleVariableHandler;
+    private ProgramRuleVariableHandler programRuleVariableHandler;
 
     @Mock
-    private Handler<ProgramTrackedEntityAttribute> programTrackedEntityAttributeHandler;
+    private ProgramTrackedEntityAttributeHandler programTrackedEntityAttributeHandler;
 
     @Mock
-    private Handler<ProgramSection> programSectionHandler;
+    private ProgramSectionHandler programSectionHandler;
 
     @Mock
     private ParentOrphanCleaner<Program> orphanCleaner;
@@ -93,10 +92,10 @@ public class ProgramHandlerShould {
     private LinkCleaner<Program> linkCleaner;
 
     @Mock
-    private LinkHandler<Attribute, ProgramAttributeValueLink> programAttributeValueLinkHandler;
+    private ProgramAttributeValueLinkHandler programAttributeValueLinkHandler;
 
     @Mock
-    private Handler<Attribute> attributeHandler;
+    private AttributeHandler attributeHandler;
 
     @Mock
     private Program program;
@@ -201,6 +200,8 @@ public void setUp() throws Exception {
         attributeValues.add(attValue);
 
         when(program.attributeValues()).thenReturn(attributeValues);
+
+        when(programStore.updateOrInsert(any(Program.class))).thenReturn(HandleAction.Insert);
     }
 
     @Test
@@ -254,6 +255,6 @@ public void not_store_tracker_program_witout_tracked_entity_type() {
     public void call_attribute_handlers() {
         programHandler.handleMany(Collections.singletonList(program));
         verify(attributeHandler).handleMany(eq(Arrays.asList(attribute)));
-        verify(programAttributeValueLinkHandler).handleMany(eq(program.uid()),eq(Arrays.asList(attribute)),any());
+        verify(programAttributeValueLinkHandler).handleMany(eq(program.uid()), eq(Arrays.asList(attribute)), any());
     }
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandlerShould.java
index f15aaac3ab..3ead9a8ca2 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandlerShould.java
@@ -27,13 +27,20 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.Lists;
+
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink;
+import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkHandler;
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary;
 import org.hisp.dhis.android.core.program.ProgramIndicator;
 import org.junit.Before;
@@ -46,26 +53,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.collect.Lists;
-
 @RunWith(JUnit4.class)
 public class ProgramIndicatorHandlerShould {
     @Mock
-    private IdentifiableObjectStore<ProgramIndicator> programIndicatorStore;
+    private ProgramIndicatorStore programIndicatorStore;
 
     @Mock
-    private OrderedLinkHandler<ObjectWithUid, ProgramIndicatorLegendSetLink> programIndicatorLegendSetLinkHandler;
+    private ProgramIndicatorLegendSetLinkHandler programIndicatorLegendSetLinkHandler;
 
     @Mock
-    private LinkHandler<AnalyticsPeriodBoundary, AnalyticsPeriodBoundary> analyticsPeriodBoundaryHandler;
+    private AnalyticsPeriodBoundaryHandler analyticsPeriodBoundaryHandler;
 
     @Mock
     private Handler<ObjectWithUid> legendSetHandler;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index fcab7acf84..0dc6375910 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -36,13 +36,12 @@ import okhttp3.MediaType
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionSet
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramStage
@@ -75,7 +74,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
     private val optionSetCall: UidsCall<OptionSet> = mock()
     private val optionCall: UidsCall<Option> = mock()
     private val optionGroupCall: UidsCall<OptionGroup> = mock()
-    private val organisationUnitProgramLinkLinkStore: LinkStore<OrganisationUnitProgramLink> = mock()
+    private val organisationUnitProgramLinkLinkStore: OrganisationUnitProgramLinkStore = mock()
 
     // object to test
     private lateinit var programModuleDownloader: ProgramModuleDownloader
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
index 8f141b15bc..98c92d9576 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
@@ -27,11 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.program.ProgramRule;
@@ -47,19 +51,13 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramRuleHandlerShould {
     @Mock
-    private IdentifiableObjectStore<ProgramRule> programRuleStore;
+    private ProgramRuleStore programRuleStore;
 
     @Mock
-    private HandlerWithTransformer<ProgramRuleAction> programRuleActionHandler;
+    private ProgramRuleActionHandler programRuleActionHandler;
 
     @Mock
     private ProgramRule programRule;
@@ -85,11 +83,17 @@ public void setUp() throws Exception {
         when(programRule.uid()).thenReturn("test_program_rule_uid");
         when(programRule.program()).thenReturn(ObjectWithUid.create("program"));
         when(programRule.programRuleActions()).thenReturn(programRuleActions);
+
+        when(programRuleStore.updateOrInsert(programRule)).thenReturn(HandleAction.Insert);
     }
 
     @Test
     public void extend_identifiable_sync_handler_impl() {
-        IdentifiableHandlerImpl<ProgramRule> genericHandler = new ProgramRuleHandler(programRuleStore, null, null, null);
+        IdentifiableHandlerImpl<ProgramRule> genericHandler = new ProgramRuleHandler(
+                programRuleStore,
+                programRuleActionHandler,
+                programRuleCleaner,
+                programRuleActionCleaner);
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandlerShould.java
index 2c9ab81575..c76c0386f5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandlerShould.java
@@ -28,13 +28,17 @@
 
 package org.hisp.dhis.android.core.program.internal;
 
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.same;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.Lists;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
 import org.hisp.dhis.android.core.program.ProgramSection;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,21 +49,14 @@
 
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.same;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramSectionHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<ProgramSection> programSectionStore;
+    private ProgramSectionStore programSectionStore;
 
     @Mock
-    private OrderedLinkHandler<TrackedEntityAttribute, ProgramSectionAttributeLink>
-            programSectionAttributeLinkHandler;
+    private ProgramSectionAttributeLinkHandler programSectionAttributeLinkHandler;
 
     @Mock
     private ProgramSection programSection;
@@ -79,6 +76,8 @@ public void setUp() throws Exception {
                 TrackedEntityAttribute.builder().uid("attribute_uid").build());
         when(programSection.attributes()).thenReturn(attributes);
         when(programSection.uid()).thenReturn(SECTION_UID);
+
+        when(programSectionStore.updateOrInsert(any())).thenReturn(HandleAction.Insert);
     }
 
     @Test
@@ -91,6 +90,6 @@ public void save_program_section_attribute_links() throws Exception {
     @Test
     public void extend_identifiable_handler_impl() {
         IdentifiableHandlerImpl<ProgramSection> genericHandler = new ProgramSectionHandler(
-                programSectionStore,null);
+                programSectionStore, programSectionAttributeLinkHandler);
     }
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandlerShould.java
index 55b2bc4273..fb547b00e7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandlerShould.java
@@ -27,12 +27,16 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ValueTypeRendering;
+import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler;
 import org.hisp.dhis.android.core.dataelement.DataElement;
+import org.hisp.dhis.android.core.dataelement.internal.DataElementHandler;
 import org.hisp.dhis.android.core.program.ProgramStageDataElement;
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo;
 import org.junit.Before;
@@ -42,20 +46,17 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramStageDataElementHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<ProgramStageDataElement> programStageDataElementStore;
+    private ProgramStageDataElementStore programStageDataElementStore;
 
     @Mock
-    private Handler<DataElement> dataElementHandler;
+    private DataElementHandler dataElementHandler;
 
     @Mock
-    private DictionaryTableHandler<ValueTypeRendering> renderTypeHandler;
+    private ValueTypeRenderingHandler renderTypeHandler;
 
     @Mock
     private ProgramStageDataElement programStageDataElement;
@@ -77,6 +78,8 @@ public void setUp() throws Exception {
         when(programStageDataElement.dataElement()).thenReturn(dataElement);
         when(dataElement.uid()).thenReturn("test_data_element_uid");
         when(programStageDataElement.renderType()).thenReturn(valueTypeRendering);
+
+        when(programStageDataElementStore.updateOrInsert(any())).thenReturn(HandleAction.Insert);
     }
 
     @Test
@@ -94,7 +97,10 @@ public void call_value_type_rendering_handler() throws Exception {
 
     @Test
     public void extend_identifiable_handler_impl() {
-        IdentifiableHandlerImpl<ProgramStageDataElement> genericHandler =
-                new ProgramStageDataElementHandler(programStageDataElementStore, null, null);
+        IdentifiableHandlerImpl<ProgramStageDataElement> genericHandler = new ProgramStageDataElementHandler(
+                programStageDataElementStore,
+                dataElementHandler,
+                renderTypeHandler
+        );
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
index 37610bd6da..f33747cc55 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
@@ -28,15 +28,18 @@
 
 package org.hisp.dhis.android.core.program.internal;
 
+import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.attribute.Attribute;
-import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink;
+import org.hisp.dhis.android.core.attribute.internal.AttributeHandler;
+import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler;
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.DataAccess;
 import org.hisp.dhis.android.core.common.FeatureType;
@@ -56,23 +59,16 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.anyCollection;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramStageHandlerShould {
     @Mock
-    private IdentifiableObjectStore<ProgramStage> programStageStore;
+    private ProgramStageStore programStageStore;
 
     @Mock
-    private HandlerWithTransformer<ProgramStageSection> programStageSectionHandler;
+    private ProgramStageSectionHandler programStageSectionHandler;
 
     @Mock
-    private Handler<ProgramStageDataElement> programStageDataElementHandler;
+    private ProgramStageDataElementHandler programStageDataElementHandler;
 
     @Mock
     private ProgramStage programStage;
@@ -109,10 +105,10 @@ public class ProgramStageHandlerShould {
     private ProgramStage.Builder programStageBuilder;
 
     @Mock
-    private Handler<Attribute> attributeHandler;
+    private AttributeHandler attributeHandler;
 
     @Mock
-    private LinkHandler<Attribute, ProgramStageAttributeValueLink> programStageAttributeValueLinkHandler;
+    private ProgramStageAttributeValueLinkHandler programStageAttributeValueLinkHandler;
 
     // object to test
     private ProgramStageHandler programStageHandler;
@@ -148,6 +144,8 @@ public void setUp() throws Exception {
         when(programStage.toBuilder()).thenReturn(programStageBuilder);
         when(programStageBuilder.featureType(any(FeatureType.class))).thenReturn(programStageBuilder);
         when(programStageBuilder.build()).thenReturn(programStage);
+
+        when(programStageStore.updateOrInsert(any(ProgramStage.class))).thenReturn(HandleAction.Insert);
     }
 
     @Test
@@ -165,7 +163,7 @@ public void call_program_stage_section_handler() throws Exception {
     @Test
     public void call_attribute_handler() throws Exception {
         programStageHandler.handle(programStage);
-        verify(attributeHandler).handleMany( anyCollection());
+        verify(attributeHandler).handleMany(anyCollection());
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandlerShould.java
index 339092075e..566e7c6301 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandlerShould.java
@@ -27,14 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.dataelement.DataElement;
 import org.hisp.dhis.android.core.program.ProgramIndicator;
 import org.hisp.dhis.android.core.program.ProgramStageSection;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,25 +46,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramStageSectionHandlerShould {
     private static final String PROGRAM_STAGE_SECTION_UID = "test_program_stage_section_uid";
 
     @Mock
-    private IdentifiableObjectStore<ProgramStageSection> programStageSectionStore;
+    private ProgramStageSectionStoreImpl programStageSectionStore;
 
     @Mock
-    private LinkHandler<ProgramIndicator, ProgramStageSectionProgramIndicatorLink>
-            programStageSectionProgramIndicatorLinkHandler;
+    private ProgramStageSectionProgramIndicatorLinkHandler programStageSectionProgramIndicatorLinkHandler;
 
     @Mock
-    private OrderedLinkHandler<DataElement, ProgramStageSectionDataElementLink>
-            programStageSectionDataElementLinkHandler;
+    private ProgramStageSectionDataElementLinkHandler programStageSectionDataElementLinkHandler;
 
     @Mock
     private ProgramStageSection programStageSection;
@@ -96,6 +90,8 @@ public void setUp() throws Exception {
         when(programStageSection.programIndicators()).thenReturn(programIndicators);
         when(dataElement.uid()).thenReturn("data_element_uid");
         when(programIndicator.uid()).thenReturn("program_indicator_uid");
+
+        when(programStageSectionStore.updateOrInsert(any())).thenReturn(HandleAction.Insert);
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandlerShould.java
index d045b6aa8a..0f87b683cf 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandlerShould.java
@@ -27,12 +27,16 @@
  */
 package org.hisp.dhis.android.core.program.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.common.ValueTypeRendering;
+import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
 import org.junit.Before;
@@ -45,14 +49,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(JUnit4.class)
 public class ProgramTrackedEntityAttributeHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<ProgramTrackedEntityAttribute> store;
+    private ProgramTrackedEntityAttributeStore store;
 
     @Mock
     private List<ProgramTrackedEntityAttribute> programTrackedEntityAttributes;
@@ -61,7 +62,7 @@ public class ProgramTrackedEntityAttributeHandlerShould {
     private ProgramTrackedEntityAttribute programTrackedEntityAttribute;
 
     @Mock
-    private DictionaryTableHandler<ValueTypeRendering> renderTypeHandler;
+    private ValueTypeRenderingHandler renderTypeHandler;
 
     @Mock
     private ObjectWithUid program;
@@ -88,12 +89,14 @@ public void setUp() throws Exception {
         when(trackedEntityAttribute.uid()).thenReturn("tracked_entity_attribute_uid");
         when(programTrackedEntityAttribute.program()).thenReturn(program);
         when(program.uid()).thenReturn("program_uid");
+
+        when(store.updateOrInsert(any())).thenReturn(HandleAction.Insert);
     }
 
     @Test
     public void extend_identifiable_handler_impl() {
         IdentifiableHandlerImpl<ProgramTrackedEntityAttribute> syncHandler =
-                new ProgramTrackedEntityAttributeHandler(store, null);
+                new ProgramTrackedEntityAttributeHandler(store, renderTypeHandler);
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt
index 28a0ce991c..0612066a18 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt
@@ -28,9 +28,7 @@
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageQueryCriteria
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
@@ -52,10 +50,9 @@ class ProgramStageWorkingListHandlerShould {
     private lateinit var eventDataFilters: List<ProgramStageWorkingListEventDataFilter>
     private lateinit var attributeValueFilters: List<ProgramStageWorkingListAttributeValueFilter>
 
-    private val programStageWorkingListStore: IdentifiableObjectStore<ProgramStageWorkingList> = mock()
-    private val eventDataFilterHandler: HandlerWithTransformer<ProgramStageWorkingListEventDataFilter> = mock()
-    private val attributeValueFilterHandler: HandlerWithTransformer<ProgramStageWorkingListAttributeValueFilter> =
-        mock()
+    private val programStageWorkingListStore: ProgramStageWorkingListStore = mock()
+    private val eventDataFilterHandler: ProgramStageWorkingListEventDataFilterHandler = mock()
+    private val attributeValueFilterHandler: ProgramStageWorkingListAttributeValueFilterHandler = mock()
 
     private lateinit var handler: ProgramStageWorkingListHandler
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManagerShould.kt
index 58257a1c3e..62017f418a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManagerShould.kt
@@ -30,13 +30,12 @@ package org.hisp.dhis.android.core.relationship.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.junit.Before
 import org.junit.Test
 
 class RelationshipDHISVersionManagerShould {
-    private val relationshipTypeStore: IdentifiableObjectStore<RelationshipType> = mock()
+    private val relationshipTypeStore: RelationshipTypeStore = mock()
 
     private val relationshipType: RelationshipType = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
index 6617348302..a4f0dd99f7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.relationship.internal
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreWithState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
@@ -47,7 +46,7 @@ class RelationshipHandlerShould {
 
     private val relationshipItemStore: RelationshipItemStore = mock()
 
-    private val relationshipItemHandler: Handler<RelationshipItem> = mock()
+    private val relationshipItemHandler: RelationshipItemHandler = mock()
 
     private val storeSelector: RelationshipItemElementStoreSelector = mock()
 
@@ -64,11 +63,11 @@ class RelationshipHandlerShould {
     private val newRelationship: Relationship = RelationshipSamples.get230(NEW_UID, TEI_3_UID, TEI_4_UID)
 
     // object to test
-    private lateinit var relationshipHandler: RelationshipHandlerImpl
+    private lateinit var relationshipHandler: RelationshipHandler
 
     @Before
     fun setUp() {
-        relationshipHandler = RelationshipHandlerImpl(
+        relationshipHandler = RelationshipHandler(
             relationshipStore, relationshipItemStore,
             relationshipItemHandler, storeSelector
         )
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
index 0f8e3be728..7008b8d2af 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
@@ -35,11 +35,8 @@ import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
-import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
 import org.hisp.dhis.android.core.settings.AnalyticsSettings
-import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,8 +44,8 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class AnalyticsSettingCallShould {
-    private val handler: Handler<AnalyticsTeiSetting> = mock()
-    private val analyticsDhisVisualizationsSettingHandler: Handler<AnalyticsDhisVisualization> = mock()
+    private val handler: AnalyticsTeiSettingHandler = mock()
+    private val analyticsDhisVisualizationsSettingHandler: AnalyticsDhisVisualizationSettingHandler = mock()
     private val service: SettingAppService = mock()
     private val analyticsSettingSingle: Single<AnalyticsSettings> = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
index 6abffcc3a7..df76dd10ce 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
@@ -28,26 +28,24 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.settings.*
 import org.junit.Before
 import org.junit.Test
 
 class AnalyticsTeiSettingHandlerShould {
 
-    private val analyticsTeiSettingStore: ObjectWithoutUidStore<AnalyticsTeiSetting> = mock()
+    private val analyticsTeiSettingStore: AnalyticsTeiSettingStore = mock()
 
     private val analyticsTeiSetting: AnalyticsTeiSetting = mock()
 
     private lateinit var analyticsTeiSettingHandler: Handler<AnalyticsTeiSetting>
 
-    private val teiDataElementHandler: LinkHandler<AnalyticsTeiDataElement, AnalyticsTeiDataElement> = mock()
-    private val teiIndicatorHandler: LinkHandler<AnalyticsTeiIndicator, AnalyticsTeiIndicator> = mock()
-    private val teiAttributeHandler: LinkHandler<AnalyticsTeiAttribute, AnalyticsTeiAttribute> = mock()
-    private val whoDataHandler: LinkHandler<AnalyticsTeiWHONutritionData, AnalyticsTeiWHONutritionData> = mock()
+    private val teiDataElementHandler: AnalyticsTeiDataElementHandler = mock()
+    private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler = mock()
+    private val teiAttributeHandler: AnalyticsTeiAttributeHandler = mock()
+    private val whoDataHandler: AnalyticsTeiWHONutritionDataHandler = mock()
 
     private val analyticsTeiSettingList: List<AnalyticsTeiSetting> = listOf(analyticsTeiSetting)
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
index 1005712b57..22121fa05c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
@@ -28,20 +28,17 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
-import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.junit.Before
 import org.junit.Test
 
 class AnalyticsTeiWHONutritionDataHandlerShould {
 
-    private val store: LinkStore<AnalyticsTeiWHONutritionData> = mock()
+    private val store: AnalyticsTeiWHONutritionDataStore = mock()
 
-    private val teiDataElementHandler: LinkHandler<AnalyticsTeiDataElement, AnalyticsTeiDataElement> = mock()
-    private val teiIndicatorHandler: LinkHandler<AnalyticsTeiIndicator, AnalyticsTeiIndicator> = mock()
+    private val teiDataElementHandler: AnalyticsTeiDataElementHandler = mock()
+    private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler = mock()
 
     private val whoData: AnalyticsTeiWHONutritionData = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
index eac9489b83..2eb9ec6eec 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
@@ -31,11 +31,8 @@ package org.hisp.dhis.android.core.settings.internal
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.AppearanceSettings
-import org.hisp.dhis.android.core.settings.FilterSetting
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -44,8 +41,8 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class AppearanceSettingsCallShould {
 
-    private val filterSettingHandler: Handler<FilterSetting> = mock()
-    private val programConfigurationHandler: Handler<ProgramConfigurationSetting> = mock()
+    private val filterSettingHandler: FilterSettingHandler = mock()
+    private val programConfigurationHandler: ProgramConfigurationSettingHandler = mock()
     private val service: SettingAppService = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
     private val appVersionManager: SettingsAppInfoManager = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt
index a8f8238419..e4433b0b51 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.settings.internal
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
-import org.hisp.dhis.android.core.settings.DataSetSetting
 import org.hisp.dhis.android.core.settings.DataSetSettings
 import org.junit.Before
 import org.junit.Test
@@ -41,7 +39,7 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class DataSetSettingCallShould {
-    private val handler: Handler<DataSetSetting> = mock()
+    private val handler: DataSetSettingHandler = mock()
     private val service: SettingAppService = mock()
     private val dataSetSettingSingle: Single<DataSetSettings> = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandlerShould.java
index 6aaa83027e..e39fed17a1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandlerShould.java
@@ -28,7 +28,12 @@
 
 package org.hisp.dhis.android.core.settings.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.settings.DataSetSetting;
@@ -41,16 +46,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class DataSetSettingHandlerShould {
 
     @Mock
-    private ObjectWithoutUidStore<DataSetSetting> dataSetSettingStore;
+    private DataSetSettingStore dataSetSettingStore;
 
     @Mock
     private DataSetSetting dataSetSetting;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandlerShould.kt
index 1c12425c67..bc790e252e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandlerShould.kt
@@ -34,7 +34,6 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.settings.FilterSetting
 import org.junit.Before
@@ -42,7 +41,7 @@ import org.junit.Test
 
 class FilterSettingHandlerShould {
 
-    private val filterSettingStore: ObjectWithoutUidStore<FilterSetting> = mock()
+    private val filterSettingStore: FilterSettingStore = mock()
 
     private val filterSetting: FilterSetting = FilterSetting.builder().build()
     private lateinit var filterSettingsHandler: FilterSettingHandler
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt
index c7dee9d4f2..0aaac55ebc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.settings.internal
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.GeneralSettings
 import org.junit.Before
@@ -40,7 +39,7 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class GeneralSettingCallShould {
-    private val handler: Handler<GeneralSettings> = mock()
+    private val handler: GeneralSettingHandler = mock()
     private val service: SettingAppService = mock()
     private val generalSettingSingle: Single<GeneralSettings> = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsHandlerShould.kt
index fa5ba2271b..c1fbd49b55 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsHandlerShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.settings.GeneralSettings
@@ -38,7 +37,7 @@ import org.mockito.Mockito
 
 class GeneralSettingsHandlerShould {
 
-    private val generalSettingStore: ObjectWithoutUidStore<GeneralSettings> = mock()
+    private val generalSettingStore: GeneralSettingStore = mock()
 
     private val generalSettings: GeneralSettings = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandlerShould.kt
index e2dfa2b3f0..48c461a756 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandlerShould.kt
@@ -34,8 +34,6 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import java.lang.Exception
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingSamples
@@ -43,7 +41,7 @@ import org.junit.Before
 import org.junit.Test
 
 class ProgramConfigurationSettingHandlerShould {
-    private val programConfigurationSettingStore: ObjectWithoutUidStore<ProgramConfigurationSetting> = mock()
+    private val programConfigurationSettingStore: ProgramConfigurationSettingStore = mock()
 
     private val programConfigurationSetting = ProgramConfigurationSettingSamples.get()
     private lateinit var programConfigurationSettingHandler: ProgramConfigurationSettingHandler
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt
index 8c11a9699e..553a076e8e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.settings.internal
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
-import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.junit.Before
 import org.junit.Test
@@ -41,7 +39,7 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class ProgramSettingCallShould {
-    private val handler: Handler<ProgramSetting> = mock()
+    private val handler: ProgramSettingHandler = mock()
     private val service: SettingAppService = mock()
     private val programSettingSingle: Single<ProgramSettings> = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandlerShould.java
index cf4a39b755..d732b9329e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandlerShould.java
@@ -28,7 +28,12 @@
 
 package org.hisp.dhis.android.core.settings.internal;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
 import org.hisp.dhis.android.core.settings.ProgramSetting;
@@ -41,16 +46,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class ProgramSettingHandlerShould {
 
     @Mock
-    private ObjectWithoutUidStore<ProgramSetting> programSettingStore;
+    private ProgramSettingStore programSettingStore;
 
     @Mock
     private ProgramSetting programSetting;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
index c1c157a8f4..f355d3d11d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.settings.internal
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
 import org.junit.Before
@@ -42,7 +41,7 @@ import org.mockito.Mockito
 @RunWith(JUnit4::class)
 class SynchronizationSettingCallShould {
 
-    private val handler: Handler<SynchronizationSettings> = mock()
+    private val handler: SynchronizationSettingHandler = mock()
     private val service: SettingAppService = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
     private val generalSettingCall: GeneralSettingCall = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
index a09d155e6b..c833dad34d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
@@ -28,20 +28,17 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.settings.DataSetSetting
-import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
 import org.junit.Before
 import org.junit.Test
 
 class SynchronizationSettingsHandlerShould {
 
-    private val synchronizationSettingStore: ObjectWithoutUidStore<SynchronizationSettings> = mock()
-    private val dataSetSettingHandler: Handler<DataSetSetting> = mock()
-    private val programSettingHandler: Handler<ProgramSetting> = mock()
+    private val synchronizationSettingStore: SynchronizationSettingStore = mock()
+    private val dataSetSettingHandler: DataSetSettingHandler = mock()
+    private val programSettingHandler: ProgramSettingHandler = mock()
 
     private val synchronizationSettings: SynchronizationSettings = SynchronizationSettings.builder().build()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerShould.kt
index 829c2243bb..3ee9d335b6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerShould.kt
@@ -30,14 +30,17 @@ package org.hisp.dhis.android.core.systeminfo.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.systeminfo.*
+import org.hisp.dhis.android.core.systeminfo.DHISPatchVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.hisp.dhis.android.core.systeminfo.SMSVersion
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.junit.Before
 import org.junit.Test
 
 class DHISVersionManagerShould {
-    private val systemInfoStore: ObjectWithoutUidStore<SystemInfo> = mock()
+    private val systemInfoStore: SystemInfoStore = mock()
     private val systemInfo: SystemInfo = mock()
 
     // Object to test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
index b8feb03d16..5e092aaa01 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.resource.internal.Resource
@@ -53,7 +52,7 @@ class SystemInfoCallShould {
     private val databaseAdapter: DatabaseAdapter = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
     private val d2Error: D2Error = mock()
-    private val systemInfoHandler: Handler<SystemInfo> = mock()
+    private val systemInfoHandler: SystemInfoHandler = mock()
     private val resourceHandler: ResourceHandler = mock()
     private val systemInfoSingle: Single<SystemInfo> = mock()
     private val transaction: Transaction = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandlerShould.java
index 4ab67db6af..c628222062 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandlerShould.java
@@ -31,14 +31,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler;
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.ObjectStyle;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,10 +49,10 @@
 public class TrackedEntityAttributeHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<TrackedEntityAttribute> trackedEntityAttributeStore;
+    private TrackedEntityAttributeStore trackedEntityAttributeStore;
 
     @Mock
-    private OrderedLinkHandler<ObjectWithUid, TrackedEntityAttributeLegendSetLink> trackedEntityAttributeLegendSetLinkHandler;
+    private TrackedEntityAttributeLegendSetLinkHandler trackedEntityAttributeLegendSetLinkHandler;
 
     @Mock
     private ObjectStyle objectStyle;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandlerShould.java
index 199a3d2b35..ff406c922a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandlerShould.java
@@ -35,13 +35,10 @@
 
 import com.google.common.collect.Lists;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ObjectStyle;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter;
 import org.hisp.dhis.android.core.trackedentity.EntityQueryCriteria;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter;
@@ -59,16 +56,16 @@
 public class TrackedEntityInstanceFilterHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<TrackedEntityInstanceFilter> trackedEntityInstanceFilterStore;
+    private TrackedEntityInstanceFilterStore trackedEntityInstanceFilterStore;
 
     @Mock
     private ObjectStyle objectStyle;
 
     @Mock
-    private HandlerWithTransformer<TrackedEntityInstanceEventFilter> trackedEntityInstanceEventFilterHandler;
+    private TrackedEntityInstanceEventFilterHandler trackedEntityInstanceEventFilterHandler;
 
     @Mock
-    private HandlerWithTransformer<AttributeValueFilter> attributeValueFilterHandler;
+    private AttributeValueFilterHandler attributeValueFilterHandler;
 
     @Mock
     private TrackedEntityInstanceEventFilter eventFilter;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
index fd2248fc57..14683bc037 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
@@ -30,10 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentHandler
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
@@ -42,12 +41,11 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelative
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerHandler
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.mockito.ArgumentMatchers
 
 @RunWith(JUnit4::class)
 class TrackedEntityInstanceHandlerShould {
@@ -55,9 +53,9 @@ class TrackedEntityInstanceHandlerShould {
     private val relationshipHandler: RelationshipHandler = mock()
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore = mock()
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore = mock()
-    private val trackedEntityAttributeValueHandler: HandlerWithTransformer<TrackedEntityAttributeValue> = mock()
-    private val enrollmentHandler: IdentifiableDataHandler<Enrollment> = mock()
-    private val programOwnerHandler: HandlerWithTransformer<ProgramOwner> = mock()
+    private val trackedEntityAttributeValueHandler: TrackedEntityAttributeValueHandler = mock()
+    private val enrollmentHandler: EnrollmentHandler = mock()
+    private val programOwnerHandler: ProgramOwnerHandler = mock()
 
     private val trackedEntityInstance: TrackedEntityInstance = mock()
     private val enrollment: Enrollment = mock()
@@ -99,8 +97,7 @@ class TrackedEntityInstanceHandlerShould {
         whenever(relationship.from()).thenReturn(RelationshipHelper.teiItem(TEI_UID))
         whenever(relationship.to()).thenReturn(RelationshipHelper.teiItem(RELATIVE_UID))
         whenever(relative.uid()).thenReturn(RELATIVE_UID)
-        whenever(trackedEntityInstanceStore.updateOrInsert(ArgumentMatchers.any()))
-            .thenReturn(HandleAction.Insert)
+        whenever(trackedEntityInstanceStore.updateOrInsert(any())).thenReturn(HandleAction.Insert)
 
         trackedEntityInstanceHandler = TrackedEntityInstanceHandler(
             relationshipVersionManager,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
index 7cec241c84..16a05ac9f7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
@@ -31,11 +31,11 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
-import org.hisp.dhis.android.core.program.internal.ProgramStoreInterface
+import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.settings.DownloadPeriod
 import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettings
@@ -50,8 +50,8 @@ import org.junit.runners.JUnit4
 class TrackedEntityInstanceQueryFactoryShould {
 
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore = mock()
-    private val organisationUnitProgramLinkLinkStore: LinkStore<OrganisationUnitProgramLink> = mock()
-    private val programStore: ProgramStoreInterface = mock()
+    private val organisationUnitProgramLinkLinkStore: OrganisationUnitProgramLinkStore = mock()
+    private val programStore: ProgramStore = mock()
     private val programSettingsObjectRepository: ProgramSettingsObjectRepository = mock()
     private val programSettings: ProgramSettings = mock()
     private val lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperShould.java b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperShould.java
index 9b0c492700..8a89318dc8 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperShould.java
@@ -28,13 +28,16 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.Lists;
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.enrollment.Enrollment;
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor;
 import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor;
 import org.junit.Before;
@@ -45,14 +48,10 @@
 import java.util.ArrayList;
 import java.util.Set;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class TrackedEntityInstanceUidHelperShould {
 
     @Mock
-    private IdentifiableObjectStore<OrganisationUnit> organisationUnitStore;
+    private OrganisationUnitStore organisationUnitStore;
 
     @Mock
     private TrackedEntityInstance tei1;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
index 585314f1fc..25e2265653 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -47,8 +46,8 @@ class OwnershipManagerShould {
     private val apiCallExecutor: APICallExecutor = mock()
     private val ownershipService: OwnershipService = mock()
     private val dataStatePropagator: DataStatePropagator = mock()
-    private val programTempOwnerStore: ObjectWithoutUidStore<ProgramTempOwner> = mock()
-    private val programOwnerStore: ObjectWithoutUidStore<ProgramOwner> = mock()
+    private val programTempOwnerStore: ProgramTempOwnerStore = mock()
+    private val programOwnerStore: ProgramOwnerStore = mock()
 
     private val httpResponse: HttpMessageResponse = mock()
     private val call: Call<HttpMessageResponse> = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelperShould.kt
index 4375e7c4bc..1e6e697c84 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelperShould.kt
@@ -32,18 +32,19 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
 import org.hisp.dhis.android.core.systeminfo.DHISPatchVersion
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.hisp.dhis.android.core.systeminfo.internal.DHISVersionManagerImpl
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStore
 import org.junit.Before
 import org.junit.Test
 
 class TrackerPostParentCallHelperShould {
 
-    private val systemInfoStore: ObjectWithoutUidStore<SystemInfo> = mock()
-    private val synchronizationSettingStore: ObjectWithoutUidStore<SynchronizationSettings> = mock()
+    private val systemInfoStore: SystemInfoStore = mock()
+    private val synchronizationSettingStore: SynchronizationSettingStore = mock()
 
     private val systemInfo: SystemInfo = mock()
     private val syncSettings: SynchronizationSettings = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt
index d9850efd65..9971cd4b3c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt
@@ -30,9 +30,9 @@ package org.hisp.dhis.android.core.usecase.stock
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseCall
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseHandler
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseService
 import org.junit.Before
 import org.junit.Test
@@ -41,7 +41,7 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class StockUseCaseCallShould {
-    private val handler: IdentifiableWithoutDeleteInterfaceHandlerImpl<InternalStockUseCase> = mock()
+    private val handler: StockUseCaseHandler = mock()
     private val service: StockUseCaseService = mock()
     private val stockUseCaseSingle: Single<List<InternalStockUseCase>> = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
index 3a188328e4..212b2ce223 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
@@ -33,7 +33,6 @@ import com.nhaarman.mockitokotlin2.whenever
 import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.user.Authority
 import org.junit.Before
@@ -46,7 +45,7 @@ import retrofit2.Response
 @RunWith(JUnit4::class)
 class AuthorityEndpointCallShould : BaseCallShould() {
     private val authorityService: AuthorityService = mock()
-    private val handler: Handler<Authority> = mock()
+    private val handler: AuthorityHandler = mock()
     private val retrofitCall: Call<List<String>> = mock()
     private val payload: List<String> = mock()
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 2cee3de4d4..507497a7c9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -34,11 +34,7 @@ import io.reactivex.Single
 import io.reactivex.observers.TestObserver
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.helpers.UserHelper
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
@@ -50,6 +46,7 @@ import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.junit.Before
@@ -64,8 +61,8 @@ import retrofit2.Call
 class LogInCallUnitShould : BaseCallShould() {
     private val userService: UserService = mock()
     private val apiCallExecutor: APICallExecutor = mock()
-    private val userHandler: Handler<User> = mock()
-    private val authenticatedUserStore: ObjectWithoutUidStore<AuthenticatedUser> = mock()
+    private val userHandler: UserHandler = mock()
+    private val authenticatedUserStore: AuthenticatedUserStore = mock()
     private val credentialsSecureStore: CredentialsSecureStore = mock()
     private val userIdStore: UserIdInMemoryStore = mock()
     private val authenticateAPICall: Call<User> = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
@@ -80,8 +77,8 @@ class LogInCallUnitShould : BaseCallShould() {
     private val systemInfoFromDb: SystemInfo = mock()
     private val authenticatedUser: AuthenticatedUser = mock()
     private val credentials: Credentials = mock()
-    private val userStore: IdentifiableObjectStore<User> = mock()
-    private val systemInfoRepository: ReadOnlyWithDownloadObjectRepository<SystemInfo> = mock()
+    private val userStore: UserStore = mock()
+    private val systemInfoRepository: SystemInfoObjectRepository = mock()
     private val multiUserDatabaseManager: MultiUserDatabaseManager = mock()
     private val generalSettingCall: GeneralSettingCall = mock()
     private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 9d4e8cf48b..1799d957d0 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.user.internal
 import com.nhaarman.mockitokotlin2.*
 import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -47,7 +46,7 @@ import retrofit2.Call
 class UserCallShould : BaseCallShould() {
     private val userService: UserService = mock()
     private val apiCallExecutor: APICallExecutor = mock()
-    private val userHandler: Handler<User> = mock()
+    private val userHandler: UserHandler = mock()
     private val userCall: Call<User> = mock()
     private val dhisVersionManager: DHISVersionManager = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt
index 1d2f0d67b7..bc9162038f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.user.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserCredentials
@@ -44,8 +42,8 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class UserHandlerShould {
-    private val userStore: IdentifiableObjectStore<User> = mock()
-    private val userRoleHandler: Handler<UserRole> = mock()
+    private val userStore: UserStore = mock()
+    private val userRoleHandler: UserRoleHandler = mock()
     private val userRoleCollectionCleaner: CollectionCleaner<UserRole> = mock()
 
     private val userRoles: List<UserRole> = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
index add391cc94..6c574d0f1a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
@@ -29,12 +29,9 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
-import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -43,10 +40,9 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class VisualizationHandlerShould {
 
-    private val visualizationStore: IdentifiableObjectStore<Visualization> = mock()
+    private val visualizationStore: VisualizationStore = mock()
     private val visualizationCollectionCleaner: CollectionCleaner<Visualization> = mock()
-    private val visualizationDimensionItemHandler:
-        LinkHandler<VisualizationDimensionItem, VisualizationDimensionItem> = mock()
+    private val visualizationDimensionItemHandler: VisualizationDimensionItemHandler = mock()
     private val visualizationDimension: VisualizationDimension = mock()
     private val visualization: Visualization = mock()
 

From 44c6f30ae27a44152b75704c40c7e4b07578ec26 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 30 Jun 2023 14:59:57 +1000
Subject: [PATCH 031/478] [ANDROSDK-1698] Ktlint

---
 .../BaseEvaluatorIntegrationShould.kt         |   4 +-
 ...etIndicatorLinkStoreIntegrationShould.java |   2 +-
 .../IndicatorStoreIntegrationShould.kt        |   2 +-
 .../AnalyticsServiceMetadataHelper.kt         |   2 +-
 .../indicatorengine/IndicatorEngine.kt        |   2 +-
 .../indicatorengine/IndicatorSQLEngine.kt     |   2 +-
 ...DIModule.java => CommonPackageDIModule.kt} |  64 ++++----
 ...le.java => DataApprovalPackageDIModule.kt} |  33 ++---
 ...ule.java => DataElementPackageDIModule.kt} |  49 +++----
 .../core/dataset/internal/DataSetHandler.kt   |   3 +-
 ...IModule.java => DataSetPackageDIModule.kt} |  78 +++++-----
 ...odule.java => DataValuePackageDIModule.kt} |  39 +++--
 ...dule.java => EnrollmentPackageDIModule.kt} |  31 ++--
 ...eDIModule.java => EventPackageDIModule.kt} |  57 ++++----
 ...DIModule.java => ImportPackageDIModule.kt} |  22 ++-
 .../internal/DataSetIndicatorLinkHandler.kt   |   2 +-
 .../indicator/internal/IndicatorHandler.kt    |   2 +-
 ...odule.java => IndicatorPackageDIModule.kt} |  61 ++++----
 .../indicator/internal/IndicatorStoreImpl.kt  |   1 +
 .../internal/IndicatorTypeHandler.kt          |   2 +-
 .../internal/IndicatorTypeStoreImpl.kt        |   1 +
 ...DIModule.java => LegendPackageDIModule.kt} |  47 +++---
 ...ule.java => MaintenancePackageDIModule.kt} |  41 +++---
 ...geDIModule.java => NotePackageDIModule.kt} |  25 ++--
 ...DIModule.java => OptionPackageDIModule.kt} |  69 +++++----
 ...ava => OrganisationUnitPackageDIModule.kt} |  43 +++---
 .../internal/ProgramPackageDIModule.java      | 119 ---------------
 .../internal/ProgramPackageDIModule.kt        | 118 +++++++++++++++
 ...le.java => RelationshipPackageDIModule.kt} |  53 ++++---
 ...dule.java => SystemInfoPackageDIModule.kt} |  43 +++---
 ...e.java => TrackedEntityPackageDIModule.kt} | 137 +++++++++---------
 ...e.java => VisualizationPackageDIModule.kt} |  45 +++---
 .../AnalyticsServiceMetadataHelperShould.kt   |   5 +-
 .../internal/DataSetHandlerShould.java        |  12 +-
 34 files changed, 591 insertions(+), 625 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/common/internal/{CommonPackageDIModule.java => CommonPackageDIModule.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/{DataApprovalPackageDIModule.java => DataApprovalPackageDIModule.kt} (73%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementPackageDIModule.java => DataElementPackageDIModule.kt} (66%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetPackageDIModule.java => DataSetPackageDIModule.kt} (56%)
 rename core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/{DataValuePackageDIModule.java => DataValuePackageDIModule.kt} (72%)
 rename core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/{EnrollmentPackageDIModule.java => EnrollmentPackageDIModule.kt} (76%)
 rename core/src/main/java/org/hisp/dhis/android/core/event/internal/{EventPackageDIModule.java => EventPackageDIModule.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/imports/internal/{ImportPackageDIModule.java => ImportPackageDIModule.kt} (83%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorPackageDIModule.java => IndicatorPackageDIModule.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/internal/{LegendPackageDIModule.java => LegendPackageDIModule.kt} (69%)
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/{MaintenancePackageDIModule.java => MaintenancePackageDIModule.kt} (72%)
 rename core/src/main/java/org/hisp/dhis/android/core/note/internal/{NotePackageDIModule.java => NotePackageDIModule.kt} (82%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionPackageDIModule.java => OptionPackageDIModule.kt} (59%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitPackageDIModule.java => OrganisationUnitPackageDIModule.kt} (69%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipPackageDIModule.java => RelationshipPackageDIModule.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/{SystemInfoPackageDIModule.java => SystemInfoPackageDIModule.kt} (69%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityPackageDIModule.java => TrackedEntityPackageDIModule.kt} (55%)
 rename core/src/main/java/org/hisp/dhis/android/core/visualization/internal/{VisualizationPackageDIModule.java => VisualizationPackageDIModule.kt} (71%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
index 12398f87ef..4e3dc5606d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
@@ -141,8 +141,8 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
     protected val programStore = ProgramStoreImpl(databaseAdapter)
     protected val programStageStore = ProgramStageStoreImpl(databaseAdapter)
 
-    protected val indicatorTypeStore = IndicatorTypeStoreImpl.create(databaseAdapter)
-    protected val indicatorStore = IndicatorStoreImpl.create(databaseAdapter)
+    protected val indicatorTypeStore = IndicatorTypeStoreImpl(databaseAdapter)
+    protected val indicatorStore = IndicatorStoreImpl(databaseAdapter)
 
     protected val relationshipTypeStore = RelationshipTypeStoreImpl(databaseAdapter)
     protected val relationshipConstraintStore = RelationshipConstraintStoreImpl(databaseAdapter)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java
index 2e054a2ffc..7fc0ab1d96 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreIntegrationShould.java
@@ -41,7 +41,7 @@ public class DataSetIndicatorLinkStoreIntegrationShould
         extends LinkStoreAbstractIntegrationShould<DataSetIndicatorLink> {
 
     public DataSetIndicatorLinkStoreIntegrationShould() {
-        super(DataSetIndicatorLinkStoreImpl.create(TestDatabaseAdapterFactory.get()),
+        super(new DataSetIndicatorLinkStoreImpl(TestDatabaseAdapterFactory.get()),
                 DataSetIndicatorLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get());
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
index ce35b6d70f..22d4c30c96 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.indicator.IndicatorTableInfo
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
 
 class IndicatorStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Indicator>(
-    IndicatorStoreImpl.create(TestDatabaseAdapterFactory.get()),
+    IndicatorStoreImpl(TestDatabaseAdapterFactory.get()),
     IndicatorTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
index 18406ecdeb..f1ab4266c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
@@ -28,6 +28,7 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
+import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
@@ -48,7 +49,6 @@ import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import javax.inject.Inject
 
 @Suppress("LongParameterList")
 internal class AnalyticsServiceMetadataHelper @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
index e50f3a15fc..a3f25c0abc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine
 
+import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
@@ -35,7 +36,6 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
-import javax.inject.Inject
 
 internal class IndicatorEngine @Inject constructor(
     private val indicatorTypeStore: IndicatorTypeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
index 2768160fbe..0a3aad3cff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine
 
+import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
@@ -35,7 +36,6 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
-import javax.inject.Inject
 
 internal class IndicatorSQLEngine @Inject constructor(
     private val indicatorTypeStore: IndicatorTypeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
index e6320b67c3..3aa7cb2b70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
@@ -25,45 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.common.internal
 
-package org.hisp.dhis.android.core.common.internal;
-
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingEntityDIModule;
-import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingEntityDIModule;
-import org.hisp.dhis.android.core.resource.internal.ResourceHandler;
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        ValueTypeDeviceRenderingEntityDIModule.class,
-        ValueTypeRenderingEntityDIModule.class
-})
-class CommonPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingEntityDIModule
+import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingEntityDIModule
+import org.hisp.dhis.android.core.resource.internal.ResourceHandler
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        ValueTypeDeviceRenderingEntityDIModule::class,
+        ValueTypeRenderingEntityDIModule::class
+    ]
+)
+internal class CommonPackageDIModule {
     @Provides
     @Reusable
-    GenericCallData genericCallData(DatabaseAdapter databaseAdapter,
-                                    Retrofit retrofit,
-                                    ResourceHandler resourceHandler,
-                                    DHISVersionManager versionManager) {
-        return GenericCallData.create(databaseAdapter, retrofit, resourceHandler, versionManager);
+    fun genericCallData(
+        databaseAdapter: DatabaseAdapter,
+        retrofit: Retrofit,
+        resourceHandler: ResourceHandler,
+        versionManager: DHISVersionManager
+    ): GenericCallData {
+        return GenericCallData.create(
+            databaseAdapter,
+            retrofit,
+            resourceHandler,
+            versionManager
+        )
     }
 
     @Provides
     @Reusable
-    public DataStatePropagator dataStatePropagator(DataStatePropagatorImpl impl) {
-        return impl;
+    fun dataStatePropagator(impl: DataStatePropagatorImpl): DataStatePropagator {
+        return impl
     }
 
     @Provides
     @Reusable
-    public TrackerDataManager trackerDataManager(TrackerDataManagerImpl impl) {
-        return impl;
+    fun trackerDataManager(impl: TrackerDataManagerImpl): TrackerDataManager {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
index 4cc152c35e..0d5266bd61 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
@@ -25,33 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataapproval.internal
 
-package org.hisp.dhis.android.core.dataapproval.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall;
-import org.hisp.dhis.android.core.dataapproval.DataApproval;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        DataApprovalEntityDIModule.class
-})
-
-public class DataApprovalPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
+import org.hisp.dhis.android.core.dataapproval.DataApproval
+import retrofit2.Retrofit
 
+@Module(includes = [DataApprovalEntityDIModule::class])
+internal class DataApprovalPackageDIModule {
     @Provides
     @Reusable
-    QueryCall<DataApproval, DataApprovalQuery> dataApprovalCallFactory(DataApprovalCall dataApprovalCall) {
-        return dataApprovalCall;
+    fun dataApprovalCallFactory(dataApprovalCall: DataApprovalCall): QueryCall<DataApproval, DataApprovalQuery> {
+        return dataApprovalCall
     }
 
     @Provides
     @Reusable
-    DataApprovalService dataApprovalService(Retrofit retrofit) {
-        return retrofit.create(DataApprovalService.class);
+    fun dataApprovalService(retrofit: Retrofit): DataApprovalService {
+        return retrofit.create(DataApprovalService::class.java)
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
index 7ae0d6cd06..3d06ea4db2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
@@ -25,41 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.dataelement.DataElementModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        DataElementEntityDIModule.class,
-        DataElementOperandEntityDIModule.class,
-        DataElementAttributeValueEntityDIModule.class,
-        DataElementLegendSetEntityDIModule.class
-})
-public final class DataElementPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.DataElementModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        DataElementEntityDIModule::class,
+        DataElementOperandEntityDIModule::class,
+        DataElementAttributeValueEntityDIModule::class,
+        DataElementLegendSetEntityDIModule::class
+    ]
+)
+internal class DataElementPackageDIModule {
     @Provides
     @Reusable
-    UidsCallFactory<DataElement> dataElementEndpointCallFactory(DataElementEndpointCallFactory impl) {
-        return impl;
+    fun dataElementEndpointCallFactory(impl: DataElementEndpointCallFactory): UidsCallFactory<DataElement> {
+        return impl
     }
 
     @Provides
     @Reusable
-    DataElementService service(Retrofit retrofit) {
-        return retrofit.create(DataElementService.class);
+    fun service(retrofit: Retrofit): DataElementService {
+        return retrofit.create(DataElementService::class.java)
     }
 
     @Provides
     @Reusable
-    DataElementModule module(DataElementModuleImpl impl) {
-        return impl;
+    fun module(impl: DataElementModuleImpl): DataElementModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index b3053fcffb..57601d6039 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -48,7 +47,7 @@ import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
 
 @Suppress("LongParameterList")
 internal class DataSetHandler constructor(
-    dataSetStore: IdentifiableObjectStore<DataSet>,
+    dataSetStore: DataSetStore,
     private val sectionHandler: SectionHandler,
     private val sectionOrphanCleaner: OrphanCleaner<DataSet, Section>,
     private val compulsoryDataElementOperandHandler: DataElementOperandHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
index f9bbafac06..d0319b9063 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
@@ -25,63 +25,63 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration;
-import org.hisp.dhis.android.core.dataset.DataSetModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        DataInputPeriodEntityDIModule.class,
-        DataSetElementEntityDIModule.class,
-        DataSetCompulsoryDataElementOperandEntityDIModule.class,
-        DataSetEntityDIModule.class,
-        DataSetCompleteRegistrationEntityDIModule.class,
-        DataSetInstanceEntityDIModule.class,
-        DataSetOrganisationUnitLinkEntityDIModule.class,
-        SectionEntityDIModule.class,
-        SectionIndicatorEntityDIModule.class,
-        SectionDataElementEntityDIModule.class,
-        SectionGreyedFieldsEntityDIModule.class
-})
-public final class DataSetPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import org.hisp.dhis.android.core.dataset.DataSetModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        DataInputPeriodEntityDIModule::class,
+        DataSetElementEntityDIModule::class,
+        DataSetCompulsoryDataElementOperandEntityDIModule::class,
+        DataSetEntityDIModule::class,
+        DataSetCompleteRegistrationEntityDIModule::class,
+        DataSetInstanceEntityDIModule::class,
+        DataSetOrganisationUnitLinkEntityDIModule::class,
+        SectionEntityDIModule::class,
+        SectionIndicatorEntityDIModule::class,
+        SectionDataElementEntityDIModule::class,
+        SectionGreyedFieldsEntityDIModule::class
+    ]
+)
+internal class DataSetPackageDIModule {
     @Provides
     @Reusable
-    QueryCall<DataSetCompleteRegistration, DataSetCompleteRegistrationQuery>
-    dataSetCompleteRegistrationCallFactory(DataSetCompleteRegistrationCall impl) {
-        return impl;
+    fun dataSetCompleteRegistrationCallFactory(
+        impl: DataSetCompleteRegistrationCall
+    ): QueryCall<DataSetCompleteRegistration, DataSetCompleteRegistrationQuery> {
+        return impl
     }
 
     @Provides
     @Reusable
-    UidsCallFactory<DataSet> dataSetEndpointCallFactory(DataSetEndpointCallFactory impl) {
-        return impl;
+    fun dataSetEndpointCallFactory(impl: DataSetEndpointCallFactory): UidsCallFactory<DataSet> {
+        return impl
     }
 
     @Provides
     @Reusable
-    DataSetService dataSetService(Retrofit retrofit) {
-        return retrofit.create(DataSetService.class);
+    fun dataSetService(retrofit: Retrofit): DataSetService {
+        return retrofit.create(DataSetService::class.java)
     }
 
     @Provides
     @Reusable
-    DataSetCompleteRegistrationService dataSetCompleteRegistrationService(Retrofit retrofit) {
-        return retrofit.create(DataSetCompleteRegistrationService.class);
+    fun dataSetCompleteRegistrationService(retrofit: Retrofit): DataSetCompleteRegistrationService {
+        return retrofit.create(DataSetCompleteRegistrationService::class.java)
     }
 
     @Provides
     @Reusable
-    DataSetModule module(DataSetModuleImpl impl) {
-        return impl;
+    fun module(impl: DataSetModuleImpl): DataSetModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
similarity index 72%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
index f88cc491b7..7ea87a9a9a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
@@ -25,38 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.datavalue.internal
 
-package org.hisp.dhis.android.core.datavalue.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall;
-import org.hisp.dhis.android.core.datavalue.DataValue;
-import org.hisp.dhis.android.core.datavalue.DataValueModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        DataValueEntityDIModule.class
-})
-public final class DataValuePackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
+import org.hisp.dhis.android.core.datavalue.DataValue
+import org.hisp.dhis.android.core.datavalue.DataValueModule
+import retrofit2.Retrofit
 
+@Module(includes = [DataValueEntityDIModule::class])
+internal class DataValuePackageDIModule {
     @Provides
     @Reusable
-    DataValueService service(Retrofit retrofit) {
-        return retrofit.create(DataValueService.class);
+    fun service(retrofit: Retrofit): DataValueService {
+        return retrofit.create(DataValueService::class.java)
     }
 
     @Provides
     @Reusable
-    QueryCall<DataValue, DataValueQuery> dataValueCall(DataValueCall callImpl) {
-        return callImpl;
+    fun dataValueCall(callImpl: DataValueCall): QueryCall<DataValue, DataValueQuery> {
+        return callImpl
     }
 
     @Provides
     @Reusable
-    DataValueModule module(DataValueModuleImpl impl) {
-        return impl;
+    fun module(impl: DataValueModuleImpl): DataValueModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.kt
similarity index 76%
rename from core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.kt
index 095b9888b2..ab25c01c29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.kt
@@ -25,30 +25,25 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.enrollment.internal
 
-package org.hisp.dhis.android.core.enrollment.internal;
-
-import org.hisp.dhis.android.core.enrollment.EnrollmentModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        EnrollmentEntityDIModule.class
-})
-public final class EnrollmentPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.enrollment.EnrollmentModule
+import retrofit2.Retrofit
 
+@Module(includes = [EnrollmentEntityDIModule::class])
+internal class EnrollmentPackageDIModule {
     @Provides
     @Reusable
-    EnrollmentService service(Retrofit retrofit) {
-        return retrofit.create(EnrollmentService.class);
+    fun service(retrofit: Retrofit): EnrollmentService {
+        return retrofit.create(EnrollmentService::class.java)
     }
 
     @Provides
     @Reusable
-    EnrollmentModule module(EnrollmentModuleImpl impl) {
-        return impl;
+    fun module(impl: EnrollmentModuleImpl): EnrollmentModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
index 0008f293ac..36b04b5445 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
@@ -25,49 +25,48 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.event.internal
 
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.event.EventFilter;
-import org.hisp.dhis.android.core.event.EventModule;
-import org.hisp.dhis.android.core.event.search.EventQueryEntityDIModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        EventEntityDIModule.class,
-        EventFilterEntityDIModule.class,
-        EventDataFilterEntityDIModule.class,
-        EventSyncEntityDIModule.class,
-        EventQueryEntityDIModule.class
-})
-public final class EventPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.event.EventFilter
+import org.hisp.dhis.android.core.event.EventModule
+import org.hisp.dhis.android.core.event.search.EventQueryEntityDIModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        EventEntityDIModule::class,
+        EventFilterEntityDIModule::class,
+        EventDataFilterEntityDIModule::class,
+        EventSyncEntityDIModule::class,
+        EventQueryEntityDIModule::class
+    ]
+)
+internal class EventPackageDIModule {
     @Provides
     @Reusable
-    EventService service(Retrofit retrofit) {
-        return retrofit.create(EventService.class);
+    fun service(retrofit: Retrofit): EventService {
+        return retrofit.create(EventService::class.java)
     }
 
     @Provides
     @Reusable
-    EventModule module(EventModuleImpl impl) {
-        return impl;
+    fun module(impl: EventModuleImpl): EventModule {
+        return impl
     }
 
     @Provides
     @Reusable
-    UidsCall<EventFilter> trackedEntityInstanceFilterCall(EventFilterCall impl) {
-        return impl;
+    fun trackedEntityInstanceFilterCall(impl: EventFilterCall): UidsCall<EventFilter> {
+        return impl
     }
 
     @Provides
     @Reusable
-    EventFilterService eventFilterService(Retrofit retrofit) {
-        return retrofit.create(EventFilterService.class);
+    fun eventFilterService(retrofit: Retrofit): EventFilterService {
+        return retrofit.create(EventFilterService::class.java)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.kt
similarity index 83%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.kt
index af0836128e..40f2c384d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.kt
@@ -25,21 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.imports.internal
 
-package org.hisp.dhis.android.core.imports.internal;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module(includes = {
-        TrackerImportConflictEntityDIModule.class
-})
-public final class ImportPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
 
+@Module(includes = [TrackerImportConflictEntityDIModule::class])
+internal class ImportPackageDIModule {
     @Provides
     @Reusable
-    ImportModule module(ImportModuleImpl impl) {
-        return impl;
+    fun module(impl: ImportModuleImpl): ImportModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
index ddeefcb6d6..11a94c4b95 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
@@ -29,10 +29,10 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.Indicator
-import javax.inject.Inject
 
 @Reusable
 internal class DataSetIndicatorLinkHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
index b054acd1bf..8f4c3a9b71 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.internal.IndicatorLegendSetLinkHandler
-import javax.inject.Inject
 
 @Reusable
 internal class IndicatorHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
index 0103637e0f..8234600b8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
@@ -25,55 +25,54 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.indicator.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory;
-import org.hisp.dhis.android.core.indicator.Indicator;
-import org.hisp.dhis.android.core.indicator.IndicatorModule;
-import org.hisp.dhis.android.core.indicator.IndicatorType;
-import org.hisp.dhis.android.core.indicator.datasetindicatorengine.IndicatorEngineEntityDIModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        DataSetIndicatorEntityDIModule.class,
-        IndicatorEntityDIModule.class,
-        IndicatorTypeEntityDIModule.class,
-        IndicatorEngineEntityDIModule.class
-})
-public final class IndicatorPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
+import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.indicator.IndicatorModule
+import org.hisp.dhis.android.core.indicator.IndicatorType
+import org.hisp.dhis.android.core.indicator.datasetindicatorengine.IndicatorEngineEntityDIModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        DataSetIndicatorEntityDIModule::class,
+        IndicatorEntityDIModule::class,
+        IndicatorTypeEntityDIModule::class,
+        IndicatorEngineEntityDIModule::class
+    ]
+)
+internal class IndicatorPackageDIModule {
     @Provides
     @Reusable
-    UidsCallFactory<Indicator> indicatorCallFactory(IndicatorEndpointCallFactory impl) {
-        return impl;
+    fun indicatorCallFactory(impl: IndicatorEndpointCallFactory): UidsCallFactory<Indicator> {
+        return impl
     }
 
     @Provides
     @Reusable
-    UidsCallFactory<IndicatorType> indicatorTypeCallFactory(IndicatorTypeEndpointCallFactory impl) {
-        return impl;
+    fun indicatorTypeCallFactory(impl: IndicatorTypeEndpointCallFactory): UidsCallFactory<IndicatorType> {
+        return impl
     }
 
     @Provides
     @Reusable
-    IndicatorService indicatorService(Retrofit retrofit) {
-        return retrofit.create(IndicatorService.class);
+    fun indicatorService(retrofit: Retrofit): IndicatorService {
+        return retrofit.create(IndicatorService::class.java)
     }
 
     @Provides
     @Reusable
-    IndicatorTypeService indicatorTypeService(Retrofit retrofit) {
-        return retrofit.create(IndicatorTypeService.class);
+    fun indicatorTypeService(retrofit: Retrofit): IndicatorTypeService {
+        return retrofit.create(IndicatorTypeService::class.java)
     }
 
     @Provides
     @Reusable
-    IndicatorModule module(IndicatorModuleImpl impl) {
-        return impl;
+    fun module(impl: IndicatorModuleImpl): IndicatorModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
index a3c0e9c5fc..2f1c5a8676 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
@@ -37,6 +37,7 @@ import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.TABLE_INFO
 
+@Suppress("MagicNumber")
 internal class IndicatorStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : IndicatorStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
index ef02ceeb64..8a2b2aa53f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
@@ -29,9 +29,9 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.indicator.IndicatorType
-import javax.inject.Inject
 
 @Reusable
 internal class IndicatorTypeHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
index 1cc8af4a0e..d4a4d122b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
@@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.indicator.IndicatorType
 import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.TABLE_INFO
 
+@Suppress("MagicNumber")
 internal class IndicatorTypeStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : IndicatorTypeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
index 94b14bf85c..855655ae4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
@@ -25,40 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.legendset.internal
 
-package org.hisp.dhis.android.core.legendset.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.legendset.LegendSet;
-import org.hisp.dhis.android.core.legendset.LegendSetModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        LegendEntityDIModule.class,
-        LegendSetEntityDIModule.class,
-        IndicatorLegendSetEntityDIModule.class
-})
-public final class LegendPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.legendset.LegendSet
+import org.hisp.dhis.android.core.legendset.LegendSetModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        LegendEntityDIModule::class,
+        LegendSetEntityDIModule::class,
+        IndicatorLegendSetEntityDIModule::class
+    ]
+)
+internal class LegendPackageDIModule {
     @Provides
     @Reusable
-    LegendSetModule module(LegendSetModuleImpl impl) {
-        return impl;
+    fun module(impl: LegendSetModuleImpl): LegendSetModule {
+        return impl
     }
 
     @Provides
     @Reusable
-    UidsCall<LegendSet> legendSetCall(LegendSetCall impl) {
-        return impl;
+    fun legendSetCall(impl: LegendSetCall): UidsCall<LegendSet> {
+        return impl
     }
 
     @Provides
     @Reusable
-    LegendSetService legendSetService(Retrofit retrofit) {
-        return retrofit.create(LegendSetService.class);
+    fun legendSetService(retrofit: Retrofit): LegendSetService {
+        return retrofit.create(LegendSetService::class.java)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
similarity index 72%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
index e4b5f1d35f..37bae69d41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
@@ -25,32 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.maintenance.internal
 
-package org.hisp.dhis.android.core.maintenance.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.maintenance.MaintenanceModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module(includes = {
-        D2ErrorEntityDIModule.class,
-        ForeignKeyViolationEntityDIModule.class
-})
-public final class MaintenancePackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.maintenance.MaintenanceModule
 
+@Module(
+    includes = [
+        D2ErrorEntityDIModule::class,
+        ForeignKeyViolationEntityDIModule::class
+    ]
+)
+internal class MaintenancePackageDIModule {
     @Provides
     @Reusable
-    ForeignKeyCleaner cleaner(DatabaseAdapter databaseAdapter,
-                              ForeignKeyViolationStore foreignKeyViolationStore) {
-        return new ForeignKeyCleanerImpl(databaseAdapter, foreignKeyViolationStore);
+    fun cleaner(
+        databaseAdapter: DatabaseAdapter,
+        foreignKeyViolationStore: ForeignKeyViolationStore
+    ): ForeignKeyCleaner {
+        return ForeignKeyCleanerImpl(databaseAdapter, foreignKeyViolationStore)
     }
 
     @Provides
     @Reusable
-    MaintenanceModule module(MaintenanceModuleImpl impl) {
-        return impl;
+    fun module(impl: MaintenanceModuleImpl): MaintenanceModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.kt
index 02e5e38729..b35bb7a4d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.kt
@@ -25,23 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.note.internal
 
-package org.hisp.dhis.android.core.note.internal;
-
-import org.hisp.dhis.android.core.note.NoteModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module(includes = {
-        NoteEntityDIModule.class
-})
-public final class NotePackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.note.NoteModule
 
+@Module(includes = [NoteEntityDIModule::class])
+internal class NotePackageDIModule {
     @Provides
     @Reusable
-    NoteModule module(NoteModuleImpl impl) {
-        return impl;
+    fun module(impl: NoteModuleImpl): NoteModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
similarity index 59%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
index fbd45c8055..8ef95fec69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
@@ -25,67 +25,66 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.option.Option;
-import org.hisp.dhis.android.core.option.OptionGroup;
-import org.hisp.dhis.android.core.option.OptionModule;
-import org.hisp.dhis.android.core.option.OptionSet;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        OptionEntityDIModule.class,
-        OptionGroupEntityDIModule.class,
-        OptionGroupOptionEntityDIModule.class,
-        OptionSetEntityDIModule.class
-})
-public final class OptionPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.OptionModule
+import org.hisp.dhis.android.core.option.OptionSet
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        OptionEntityDIModule::class,
+        OptionGroupEntityDIModule::class,
+        OptionGroupOptionEntityDIModule::class,
+        OptionSetEntityDIModule::class
+    ]
+)
+internal class OptionPackageDIModule {
     @Provides
     @Reusable
-    UidsCall<OptionSet> optionSetCall(OptionSetCall impl) {
-        return impl;
+    fun optionSetCall(impl: OptionSetCall): UidsCall<OptionSet> {
+        return impl
     }
 
     @Provides
     @Reusable
-    OptionSetService optionSetService(Retrofit retrofit) {
-        return retrofit.create(OptionSetService.class);
+    fun optionSetService(retrofit: Retrofit): OptionSetService {
+        return retrofit.create(OptionSetService::class.java)
     }
 
     @Provides
     @Reusable
-    UidsCall<Option> optionCall(OptionCall impl) {
-        return impl;
+    fun optionCall(impl: OptionCall): UidsCall<Option> {
+        return impl
     }
 
     @Provides
     @Reusable
-    OptionService optionService(Retrofit retrofit) {
-        return retrofit.create(OptionService.class);
+    fun optionService(retrofit: Retrofit): OptionService {
+        return retrofit.create(OptionService::class.java)
     }
 
     @Provides
     @Reusable
-    UidsCall<OptionGroup> optionGroupCall(OptionGroupCall impl) {
-        return impl;
+    fun optionGroupCall(impl: OptionGroupCall): UidsCall<OptionGroup> {
+        return impl
     }
 
     @Provides
     @Reusable
-    OptionGroupService optionGroupService(Retrofit retrofit) {
-        return retrofit.create(OptionGroupService.class);
+    fun optionGroupService(retrofit: Retrofit): OptionGroupService {
+        return retrofit.create(OptionGroupService::class.java)
     }
 
     @Provides
     @Reusable
-    OptionModule module(OptionModuleImpl impl) {
-        return impl;
+    fun module(impl: OptionModuleImpl): OptionModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
index 2180545246..86c212e470 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
@@ -25,34 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        OrganisationUnitEntityDIModule.class,
-        OrganisationUnitLevelEntityDIModule.class,
-        OrganisationUnitGroupEntityDIModule.class,
-        OrganisationUnitProgramLinkEntityDIModule.class,
-        OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.class
-})
-public final class OrganisationUnitPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        OrganisationUnitEntityDIModule::class,
+        OrganisationUnitLevelEntityDIModule::class,
+        OrganisationUnitGroupEntityDIModule::class,
+        OrganisationUnitProgramLinkEntityDIModule::class,
+        OrganisationUnitOrganisationUnitGroupLinkEntityDIModule::class
+    ]
+)
+internal class OrganisationUnitPackageDIModule {
     @Provides
     @Reusable
-    OrganisationUnitService service(Retrofit retrofit) {
-        return retrofit.create(OrganisationUnitService.class);
+    fun service(retrofit: Retrofit): OrganisationUnitService {
+        return retrofit.create(OrganisationUnitService::class.java)
     }
 
     @Provides
     @Reusable
-    OrganisationUnitModule module(OrganisationUnitModuleImpl impl) {
-        return impl;
+    fun module(impl: OrganisationUnitModuleImpl): OrganisationUnitModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.java
deleted file mode 100644
index 9f6c97b4e0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramIndicator;
-import org.hisp.dhis.android.core.program.ProgramModule;
-import org.hisp.dhis.android.core.program.ProgramRule;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorEngineEntityDIModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        AnalyticsPeriodBoundaryEntityDIModule.class,
-        ProgramEntityDIModule.class,
-        ProgramIndicatorEngineEntityDIModule.class,
-        ProgramIndicatorEntityDIModule.class,
-        ProgramIndicatorLegendSetEntityDIModule.class,
-        ProgramRuleActionEntityDIModule.class,
-        ProgramRuleEntityDIModule.class,
-        ProgramRuleVariableEntityDIModule.class,
-        ProgramSectionEntityDIModule.class,
-        ProgramStageDataElementEntityDIModule.class,
-        ProgramStageAttributeValueEntityDIModule.class,
-        ProgramStageSectionDataElementEntityDIModule.class,
-        ProgramSectionAttributeEntityDIModule.class,
-        ProgramStageSectionEntityDIModule.class,
-        ProgramStageSectionProgramIndicatorEntityDIModule.class,
-        ProgramStageEntityDIModule.class,
-        ProgramTrackedEntityAttributeEntityDIModule.class,
-        ProgramAttributeValueEntityDIModule.class
-})
-public final class ProgramPackageDIModule {
-
-    @Provides
-    @Reusable
-    UidsCall<Program> programCall(ProgramCall impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    UidsCall<ProgramIndicator> programIndicatorCall(ProgramIndicatorCall impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    UidsCall<ProgramRule> programRuleCall(ProgramRuleCall impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    UidsCall<ProgramStage> programStageCall(ProgramStageCall impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    ProgramRuleService programRuleService(Retrofit retrofit) {
-        return retrofit.create(ProgramRuleService.class);
-    }
-
-    @Provides
-    @Reusable
-    ProgramIndicatorService programIndicatorService(Retrofit retrofit) {
-        return retrofit.create(ProgramIndicatorService.class);
-    }
-
-    @Provides
-    @Reusable
-    ProgramService programService(Retrofit retrofit) {
-        return retrofit.create(ProgramService.class);
-    }
-
-    @Provides
-    @Reusable
-    ProgramStageService programStageService(Retrofit retrofit) {
-        return retrofit.create(ProgramStageService.class);
-    }
-
-    @Provides
-    @Reusable
-    ProgramModule module(ProgramModuleImpl impl) {
-        return impl;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
new file mode 100644
index 0000000000..0562eb77d3
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.program.ProgramModule
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorEngineEntityDIModule
+import retrofit2.Retrofit
+
+@Module(
+    includes = [
+        AnalyticsPeriodBoundaryEntityDIModule::class,
+        ProgramEntityDIModule::class,
+        ProgramIndicatorEngineEntityDIModule::class,
+        ProgramIndicatorEntityDIModule::class,
+        ProgramIndicatorLegendSetEntityDIModule::class,
+        ProgramRuleActionEntityDIModule::class,
+        ProgramRuleEntityDIModule::class,
+        ProgramRuleVariableEntityDIModule::class,
+        ProgramSectionEntityDIModule::class,
+        ProgramStageDataElementEntityDIModule::class,
+        ProgramStageAttributeValueEntityDIModule::class,
+        ProgramStageSectionDataElementEntityDIModule::class,
+        ProgramSectionAttributeEntityDIModule::class,
+        ProgramStageSectionEntityDIModule::class,
+        ProgramStageSectionProgramIndicatorEntityDIModule::class,
+        ProgramStageEntityDIModule::class,
+        ProgramTrackedEntityAttributeEntityDIModule::class,
+        ProgramAttributeValueEntityDIModule::class
+    ]
+)
+internal class ProgramPackageDIModule {
+    @Provides
+    @Reusable
+    fun programCall(impl: ProgramCall): UidsCall<Program> {
+        return impl
+    }
+
+    @Provides
+    @Reusable
+    fun programIndicatorCall(impl: ProgramIndicatorCall): UidsCall<ProgramIndicator> {
+        return impl
+    }
+
+    @Provides
+    @Reusable
+    fun programRuleCall(impl: ProgramRuleCall): UidsCall<ProgramRule> {
+        return impl
+    }
+
+    @Provides
+    @Reusable
+    fun programStageCall(impl: ProgramStageCall): UidsCall<ProgramStage> {
+        return impl
+    }
+
+    @Provides
+    @Reusable
+    fun programRuleService(retrofit: Retrofit): ProgramRuleService {
+        return retrofit.create(ProgramRuleService::class.java)
+    }
+
+    @Provides
+    @Reusable
+    fun programIndicatorService(retrofit: Retrofit): ProgramIndicatorService {
+        return retrofit.create(ProgramIndicatorService::class.java)
+    }
+
+    @Provides
+    @Reusable
+    fun programService(retrofit: Retrofit): ProgramService {
+        return retrofit.create(ProgramService::class.java)
+    }
+
+    @Provides
+    @Reusable
+    fun programStageService(retrofit: Retrofit): ProgramStageService {
+        return retrofit.create(ProgramStageService::class.java)
+    }
+
+    @Provides
+    @Reusable
+    fun module(impl: ProgramModuleImpl): ProgramModule {
+        return impl
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
index e2f22757a6..d9c7f12a9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
@@ -25,47 +25,46 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.relationship.RelationshipModule;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        RelationshipConstraintEntityDIModule.class,
-        RelationshipEntityDIModule.class,
-        RelationshipItemEntityDIModule.class,
-        RelationshipTypeEntityDIModule.class
-})
-public final class RelationshipPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.relationship.RelationshipModule
+import org.hisp.dhis.android.core.relationship.RelationshipType
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        RelationshipConstraintEntityDIModule::class,
+        RelationshipEntityDIModule::class,
+        RelationshipItemEntityDIModule::class,
+        RelationshipTypeEntityDIModule::class
+    ]
+)
+internal class RelationshipPackageDIModule {
     @Provides
     @Reusable
-    ListCall<RelationshipType> relationshipCall(RelationshipTypeCall impl) {
-        return impl;
+    fun relationshipCall(impl: RelationshipTypeCall): ListCall<RelationshipType> {
+        return impl
     }
 
     @Provides
     @Reusable
-    RelationshipTypeService relationshipTypeService(Retrofit retrofit) {
-        return retrofit.create(RelationshipTypeService.class);
+    fun relationshipTypeService(retrofit: Retrofit): RelationshipTypeService {
+        return retrofit.create(RelationshipTypeService::class.java)
     }
 
     @Provides
     @Reusable
-    RelationshipService relationshipService(Retrofit retrofit) {
-        return retrofit.create(RelationshipService.class);
+    fun relationshipService(retrofit: Retrofit): RelationshipService {
+        return retrofit.create(RelationshipService::class.java)
     }
 
     @Provides
     @Reusable
-    RelationshipModule module(RelationshipModuleImpl impl) {
-        return impl;
+    fun module(impl: RelationshipModuleImpl): RelationshipModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
index 416d971b8d..b2f09a9341 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
@@ -25,38 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.systeminfo.internal
 
-package org.hisp.dhis.android.core.systeminfo.internal;
-
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-import org.hisp.dhis.android.core.systeminfo.SystemInfoModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        PingEntityDIModule.class,
-        SystemInfoEntityDIModule.class
-})
-public final class SystemInfoPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.hisp.dhis.android.core.systeminfo.SystemInfoModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        PingEntityDIModule::class,
+        SystemInfoEntityDIModule::class
+    ]
+)
+internal class SystemInfoPackageDIModule {
     @Provides
     @Reusable
-    SystemInfoService service(Retrofit retrofit) {
-        return retrofit.create(SystemInfoService.class);
+    fun service(retrofit: Retrofit): SystemInfoService {
+        return retrofit.create(SystemInfoService::class.java)
     }
 
     @Provides
     @Reusable
-    SystemInfoModule systemInfoModule(SystemInfoModuleImpl impl) {
-        return impl;
+    fun systemInfoModule(impl: SystemInfoModuleImpl): SystemInfoModule {
+        return impl
     }
 
     @Provides
     @Reusable
-    DHISVersionManager versionManager(DHISVersionManagerImpl impl) {
-        return impl;
+    fun versionManager(impl: DHISVersionManagerImpl): DHISVersionManager {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
index db20b4a58e..4b6bc5a955 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
@@ -25,105 +25,104 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity
 
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEndpointCallFactory;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeService;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEventFilterEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterService;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSyncEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityModuleImpl;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeService;
-import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipEntityDIModule;
-import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryEntityDIModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        OwnershipEntityDIModule.class,
-        ReservedValueSettingDIModule.class,
-        TrackedEntityAttributeEntityDIModule.class,
-        TrackedEntityAttributeReservedValueEntityDIModule.class,
-        TrackedEntityAttributeValueEntityDIModule.class,
-        TrackedEntityDataValueEntityDIModule.class,
-        TrackedEntityInstanceEntityDIModule.class,
-        TrackedEntityInstanceEventFilterEntityDIModule.class,
-        TrackedEntityInstanceFilterEntityDIModule.class,
-        TrackedEntityInstanceQueryEntityDIModule.class,
-        TrackedEntityInstanceSyncEntityDIModule.class,
-        TrackedEntityTypeEntityDIModule.class,
-        TrackedEntityTypeAttributeEntityDIModule.class,
-        AttributeValueFilterEntityDIModule.class
-})
-public final class TrackedEntityPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEndpointCallFactory
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEventFilterEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSyncEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityModuleImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeService
+import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipEntityDIModule
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryEntityDIModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        OwnershipEntityDIModule::class,
+        ReservedValueSettingDIModule::class,
+        TrackedEntityAttributeEntityDIModule::class,
+        TrackedEntityAttributeReservedValueEntityDIModule::class,
+        TrackedEntityAttributeValueEntityDIModule::class,
+        TrackedEntityDataValueEntityDIModule::class,
+        TrackedEntityInstanceEntityDIModule::class,
+        TrackedEntityInstanceEventFilterEntityDIModule::class,
+        TrackedEntityInstanceFilterEntityDIModule::class,
+        TrackedEntityInstanceQueryEntityDIModule::class,
+        TrackedEntityInstanceSyncEntityDIModule::class,
+        TrackedEntityTypeEntityDIModule::class,
+        TrackedEntityTypeAttributeEntityDIModule::class,
+        AttributeValueFilterEntityDIModule::class
+    ]
+)
+internal class TrackedEntityPackageDIModule {
     @Provides
     @Reusable
-    UidsCall<TrackedEntityType> trackedEntityTypeCall(TrackedEntityTypeCall impl) {
-        return impl;
+    fun trackedEntityTypeCall(impl: TrackedEntityTypeCall): UidsCall<TrackedEntityType> {
+        return impl
     }
 
     @Provides
     @Reusable
-    TrackedEntityTypeService trackedEntityTypeService(Retrofit retrofit) {
-        return retrofit.create(TrackedEntityTypeService.class);
+    fun trackedEntityTypeService(retrofit: Retrofit): TrackedEntityTypeService {
+        return retrofit.create(TrackedEntityTypeService::class.java)
     }
 
     @Provides
     @Reusable
-    UidsCall<TrackedEntityAttribute> trackedEntityAttributeCall(TrackedEntityAttributeCall impl) {
-        return impl;
+    fun trackedEntityAttributeCall(impl: TrackedEntityAttributeCall): UidsCall<TrackedEntityAttribute> {
+        return impl
     }
 
     @Provides
     @Reusable
-    TrackedEntityAttributeService trackedEntityAttributeService(Retrofit retrofit) {
-        return retrofit.create(TrackedEntityAttributeService.class);
+    fun trackedEntityAttributeService(retrofit: Retrofit): TrackedEntityAttributeService {
+        return retrofit.create(TrackedEntityAttributeService::class.java)
     }
 
     @Provides
     @Reusable
-    QueryCallFactory<TrackedEntityAttributeReservedValue,
-            TrackedEntityAttributeReservedValueQuery> dataValueCallFactory(
-            TrackedEntityAttributeReservedValueEndpointCallFactory impl) {
-        return impl;
+    fun dataValueCallFactory(
+        impl: TrackedEntityAttributeReservedValueEndpointCallFactory
+    ): QueryCallFactory<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery> {
+        return impl
     }
 
     @Provides
     @Reusable
-    UidsCall<TrackedEntityInstanceFilter> trackedEntityInstanceFilterCall(TrackedEntityInstanceFilterCall impl) {
-        return impl;
+    fun trackedEntityInstanceFilterCall(impl: TrackedEntityInstanceFilterCall): UidsCall<TrackedEntityInstanceFilter> {
+        return impl
     }
 
     @Provides
     @Reusable
-    TrackedEntityInstanceFilterService trackedEntityInstanceFilterService(Retrofit retrofit) {
-        return retrofit.create(TrackedEntityInstanceFilterService.class);
+    fun trackedEntityInstanceFilterService(retrofit: Retrofit): TrackedEntityInstanceFilterService {
+        return retrofit.create(TrackedEntityInstanceFilterService::class.java)
     }
 
     @Provides
     @Reusable
-    TrackedEntityModule module(TrackedEntityModuleImpl impl) {
-        return impl;
+    fun module(impl: TrackedEntityModuleImpl): TrackedEntityModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
similarity index 71%
rename from core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
index 75f3f12722..72fe1eb5c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
@@ -25,39 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.visualization.internal
 
-package org.hisp.dhis.android.core.visualization.internal;
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.visualization.Visualization;
-import org.hisp.dhis.android.core.visualization.VisualizationModule;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        VisualizationEntityDIModule.class,
-        VisualizationDimensionItemEntityDIModule.class,
-})
-public final class VisualizationPackageDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.visualization.Visualization
+import org.hisp.dhis.android.core.visualization.VisualizationModule
+import retrofit2.Retrofit
 
+@Module(
+    includes = [
+        VisualizationEntityDIModule::class,
+        VisualizationDimensionItemEntityDIModule::class
+    ]
+)
+internal class VisualizationPackageDIModule {
     @Provides
     @Reusable
-    UidsCall<Visualization> visualizationCall(VisualizationCall impl) {
-        return impl;
+    fun visualizationCall(impl: VisualizationCall): UidsCall<Visualization> {
+        return impl
     }
 
     @Provides
     @Reusable
-    VisualizationService visualizationService(Retrofit retrofit) {
-        return retrofit.create(VisualizationService.class);
+    fun visualizationService(retrofit: Retrofit): VisualizationService {
+        return retrofit.create(VisualizationService::class.java)
     }
 
     @Provides
     @Reusable
-    VisualizationModule module(VisualizationModuleImpl impl) {
-        return impl;
+    fun module(impl: VisualizationModuleImpl): VisualizationModule {
+        return impl
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
index 0e415c73d1..6529714d3b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
@@ -33,13 +33,12 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceHelperSamples as s
 import org.hisp.dhis.android.core.analytics.aggregated.mock.AggregatedSamples
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.category.internal.CategoryStore
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
-import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
 import org.hisp.dhis.android.core.legendset.internal.LegendStore
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
@@ -60,7 +59,7 @@ class AnalyticsServiceMetadataHelperShould {
     private val categoryOptionStore: CategoryOptionStore = mock()
     private val dataElementStore: DataElementStore = mock()
     private val categoryOptionComboStore: CategoryOptionComboStore = mock()
-    private val indicatorStore: IdentifiableObjectStore<Indicator> = mock()
+    private val indicatorStore: IndicatorStore = mock()
     private val expressionDimensionItemStore: ExpressionDimensionItemStore = mock()
     private val legendStore: LegendStore = mock()
     private val organisationUnitStore: OrganisationUnitStore = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
index 9ab277cab2..00a95b4ed6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
@@ -39,10 +39,7 @@
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler;
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.DataAccess;
 import org.hisp.dhis.android.core.dataelement.DataElementOperand;
@@ -51,8 +48,7 @@
 import org.hisp.dhis.android.core.dataset.DataSet;
 import org.hisp.dhis.android.core.dataset.DataSetInternalAccessor;
 import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink;
-import org.hisp.dhis.android.core.indicator.Indicator;
+import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -67,10 +63,10 @@
 public class DataSetHandlerShould {
 
     @Mock
-    private IdentifiableObjectStore<DataSet> dataSetStore;
+    private DataSetStore dataSetStore;
 
     @Mock
-    private Handler<Section> sectionHandler;
+    private SectionHandler sectionHandler;
 
     @Mock
     private OrphanCleaner<DataSet, Section> sectionOrphanCleaner;
@@ -115,7 +111,7 @@ public class DataSetHandlerShould {
     private DataSetElementHandler dataSetElementHandler;
 
     @Mock
-    private LinkHandler<Indicator, DataSetIndicatorLink> dataSetIndicatorLinkHandler;
+    private DataSetIndicatorLinkHandler dataSetIndicatorLinkHandler;
 
     @Mock
     private CollectionCleaner<DataSet> collectionCleaner;

From 989a61b03b22ac9544839adc8b7ac0ac5695ebd9 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 30 Jun 2023 15:33:12 +1000
Subject: [PATCH 032/478] [ANDROSDK-1698] Replace mapping by built-in function

---
 .../TrackedEntityDataValueStoreImpl.kt        | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
index 4f5fc5d4f5..69e0b0fe9f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
@@ -78,7 +78,7 @@ internal class TrackedEntityDataValueStoreImpl(
         return selectWhere(whereClauseBuilder.build())
     }
 
-    override fun querySingleEventsTrackedEntityDataValues(): Map<String, MutableList<TrackedEntityDataValue>> {
+    override fun querySingleEventsTrackedEntityDataValues(): Map<String, List<TrackedEntityDataValue>> {
         val queryStatement = "SELECT TrackedEntityDataValue.* " +
             " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid)" +
             " WHERE Event.enrollment ISNULL " +
@@ -103,7 +103,7 @@ internal class TrackedEntityDataValueStoreImpl(
         return "(Event." + EventTableInfo.Columns.AGGREGATED_SYNC_STATE + " IN (" + states + "))"
     }
 
-    override fun queryTrackerTrackedEntityDataValues(): Map<String, MutableList<TrackedEntityDataValue>> {
+    override fun queryTrackerTrackedEntityDataValues(): Map<String, List<TrackedEntityDataValue>> {
         val queryStatement = "SELECT TrackedEntityDataValue.* " +
             " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid) " +
             " WHERE Event.enrollment IS NOT NULL " +
@@ -111,32 +111,21 @@ internal class TrackedEntityDataValueStoreImpl(
         return queryTrackedEntityDataValues(queryStatement)
     }
 
-    override fun queryByUploadableEvents(): Map<String, MutableList<TrackedEntityDataValue>> {
+    override fun queryByUploadableEvents(): Map<String, List<TrackedEntityDataValue>> {
         val queryStatement = "SELECT TrackedEntityDataValue.* " +
             " FROM (TrackedEntityDataValue INNER JOIN Event ON TrackedEntityDataValue.event = Event.uid) " +
             " WHERE " + eventInUploadableState() + ";"
         return queryTrackedEntityDataValues(queryStatement)
     }
 
-    private fun queryTrackedEntityDataValues(queryStatement: String): Map<String, MutableList<TrackedEntityDataValue>> {
+    private fun queryTrackedEntityDataValues(queryStatement: String): Map<String, List<TrackedEntityDataValue>> {
         val dataValueList: MutableList<TrackedEntityDataValue> = ArrayList()
         val cursor = databaseAdapter.rawQuery(queryStatement)
         addObjectsToCollection(cursor, dataValueList)
-        val dataValuesMap: MutableMap<String, MutableList<TrackedEntityDataValue>> = HashMap()
-        for (dataValue in dataValueList) {
-            addDataValuesToMap(dataValuesMap, dataValue)
-        }
-        return dataValuesMap
-    }
 
-    private fun addDataValuesToMap(
-        dataValuesMap: MutableMap<String, MutableList<TrackedEntityDataValue>>,
-        dataValue: TrackedEntityDataValue
-    ) {
-        if (dataValuesMap[dataValue.event()] == null) {
-            dataValuesMap[dataValue.event()!!] = ArrayList()
-        }
-        dataValuesMap[dataValue.event()]!!.add(dataValue)
+        return dataValueList
+            .filter { it.event() != null }
+            .groupBy { it.event()!! }
     }
 
     companion object {

From d15dbe67b2494cf38c70e54385014c5682f5e9f8 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 2 Jul 2023 19:31:43 +0200
Subject: [PATCH 033/478] [ANDROSDK-1680] refactor: -
 FileResourceDownloadCall.kt to Flow and Coroutines - FileResourceService.kt
 to coroutines - FileResourceDownloader.kt to retrieve Flow and cast as
 Observable

---
 .../fileresource/FileResourceDownloader.kt    |  3 +-
 .../internal/FileResourceDownloadCall.kt      | 84 +++++++++++--------
 .../internal/FileResourceService.kt           | 18 ++--
 3 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
index 2b6e4888b1..cea54a1139 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.fileresource
 
 import dagger.Reusable
 import io.reactivex.Observable
+import kotlinx.coroutines.rx2.asObservable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
@@ -56,7 +57,7 @@ class FileResourceDownloader @Inject internal constructor(
      * @return -
      */
     fun download(): Observable<D2Progress> {
-        return call.download(params)
+        return call.download(params).asObservable()
     }
 
     fun blockingDownload() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index 32410bf79d..aced20f4eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -30,12 +30,10 @@ package org.hisp.dhis.android.core.fileresource.internal
 import android.content.Context
 import android.util.Log
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
-import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import okhttp3.ResponseBody
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
@@ -44,25 +42,29 @@ import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.ValueType
-import org.hisp.dhis.android.core.fileresource.*
+import org.hisp.dhis.android.core.fileresource.FileResource
+import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
+import org.hisp.dhis.android.core.fileresource.FileResourceElementType
+import org.hisp.dhis.android.core.fileresource.FileResourceInternalAccessor
+import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourceDownloadCall @Inject constructor(
-    private val rxCallExecutor: RxAPICallExecutor,
     private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
     private val helper: FileResourceDownloadCallHelper,
     private val fileResourceService: FileResourceService,
     private val handler: HandlerWithTransformer<FileResource>,
     private val fileResourceRoutine: FileResourceRoutine,
-    private val apiCallExecutor: APICallExecutor,
     private val synchronizationSettingsStore: ObjectWithoutUidStore<SynchronizationSettings>,
-    private val context: Context
+    private val context: Context,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+
 ) {
 
-    fun download(params: FileResourceDownloadParams): Observable<D2Progress> {
+    fun download(params: FileResourceDownloadParams): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(2)
         val existingFileResources = fileResourceStore.selectUids()
 
@@ -72,21 +74,18 @@ internal class FileResourceDownloadCall @Inject constructor(
                 ?: defaultDownloadMaxContentLength
         )
 
-        return rxCallExecutor.wrapObservableTransactionally(
-            Observable.create { emitter: ObservableEmitter<D2Progress> ->
-                downloadAggregatedValues(paramsWithCorrectedMaxContentLength, existingFileResources)
-                emitter.onNext(progressManager.increaseProgress(FileResource::class.java, isComplete = false))
-
-                downloadTrackerValues(paramsWithCorrectedMaxContentLength, existingFileResources)
-                emitter.onNext(progressManager.increaseProgress(FileResource::class.java, isComplete = false))
-                fileResourceRoutine.blockingDeleteOutdatedFileResources()
-                emitter.onComplete()
-            },
-            true
-        )
+        downloadAggregatedValues(paramsWithCorrectedMaxContentLength, existingFileResources)
+        emit(progressManager.increaseProgress(FileResource::class.java, isComplete = false))
+
+        downloadTrackerValues(paramsWithCorrectedMaxContentLength, existingFileResources)
+        emit(progressManager.increaseProgress(FileResource::class.java, isComplete = false))
+        fileResourceRoutine.blockingDeleteOutdatedFileResources()
     }
 
-    private fun downloadAggregatedValues(params: FileResourceDownloadParams, existingFileResources: List<String>) {
+    private suspend fun downloadAggregatedValues(
+        params: FileResourceDownloadParams,
+        existingFileResources: List<String>
+    ) {
         if (params.domainTypes.contains(FileResourceDomainType.AGGREGATED)) {
             val dataValues = helper.getMissingAggregatedDataValues(params, existingFileResources)
 
@@ -104,10 +103,11 @@ internal class FileResourceDownloadCall @Inject constructor(
                 },
                 getUid = { v -> v.value() }
             )
+
         }
     }
 
-    private fun downloadTrackerValues(params: FileResourceDownloadParams, existingFileResources: List<String>) {
+    private suspend fun downloadTrackerValues(params: FileResourceDownloadParams, existingFileResources: List<String>) {
         if (params.domainTypes.contains(FileResourceDomainType.TRACKER)) {
             if (params.elementTypes.contains(FileResourceElementType.TRACED_ENTITY_ATTRIBUTE)) {
                 val attributeDataValues = helper.getMissingTrackerAttributeValues(params, existingFileResources)
@@ -123,11 +123,13 @@ internal class FileResourceDownloadCall @Inject constructor(
                                     v.value.trackedEntityAttribute()!!,
                                     FileResizerHelper.Dimension.MEDIUM.name
                                 )
+
                             ValueType.FILE_RESOURCE ->
                                 fileResourceService.getFileFromTrackedEntityAttribute(
                                     v.value.trackedEntityInstance()!!,
                                     v.value.trackedEntityAttribute()!!
                                 )
+
                             else -> null
                         }
                     },
@@ -147,6 +149,7 @@ internal class FileResourceDownloadCall @Inject constructor(
                             v.dataElement()!!,
                             FileResizerHelper.Dimension.MEDIUM.name
                         )
+
                     },
                     getUid = { v -> v.value() }
                 )
@@ -154,10 +157,10 @@ internal class FileResourceDownloadCall @Inject constructor(
         }
     }
 
-    private fun <V> downloadAndPersistFiles(
+    private suspend fun <V> downloadAndPersistFiles(
         values: List<V>,
         maxContentLength: Int?,
-        download: (V) -> Call<ResponseBody>?,
+        download: suspend (V) -> ResponseBody?,
         getUid: (V) -> String?
     ) {
         val fileResources = values.mapNotNull { downloadFile(it, maxContentLength, download, getUid) }
@@ -169,25 +172,32 @@ internal class FileResourceDownloadCall @Inject constructor(
         }
     }
 
-    private fun <V> downloadFile(
+
+    private suspend fun <V> downloadFile(
         value: V,
         maxContentLength: Int?,
-        download: (V) -> Call<ResponseBody>?,
+        download: suspend (V) -> ResponseBody?,
         getUid: (V) -> String?
     ): FileResource? {
+
         return getUid(value)?.let { uid ->
             try {
-                val fileResource = apiCallExecutor.executeObjectCall(fileResourceService.getFileResource(uid))
+                val fileResource =
+                    coroutineAPICallExecutor.wrap { fileResourceService.getFileResource(uid) }.getOrThrow()
 
                 val acceptedContentLength = (maxContentLength == null) ||
-                    (fileResource.contentLength() == null) ||
-                    (fileResource.contentLength()!! <= maxContentLength)
+                        (fileResource.contentLength() == null) ||
+                        (fileResource.contentLength()!! <= maxContentLength)
 
                 if (acceptedContentLength && FileResourceInternalAccessor.isStored(fileResource)) {
-                    val responseBody = apiCallExecutor.executeObjectCall(download(value))
-
-                    val file = FileResourceUtil.saveFileFromResponse(responseBody, fileResource, context)
-                    fileResource.toBuilder().path(file.absolutePath).build()
+                    val responseBody = coroutineAPICallExecutor.wrap { download(value) }.getOrThrow()
+
+                    if (responseBody == null) {
+                        null
+                    } else {
+                        val file = FileResourceUtil.saveFileFromResponse(responseBody, fileResource, context)
+                        fileResource.toBuilder().path(file.absolutePath).build()
+                    }
                 } else {
                     null
                 }
@@ -197,8 +207,10 @@ internal class FileResourceDownloadCall @Inject constructor(
                 null
             }
         }
+
     }
 
+
     companion object {
         const val defaultDownloadMaxContentLength: Int = 6000000
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
index a97f862539..04af383cef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
@@ -40,36 +40,36 @@ internal interface FileResourceService {
     fun uploadFile(@Part filePart: MultipartBody.Part): Call<ResponseBody>
 
     @GET("$FILE_RESOURCES/{$FILE_RESOURCE}")
-    fun getFileResource(@Path(FILE_RESOURCE) fileResource: String): Call<FileResource>
+    suspend fun getFileResource(@Path(FILE_RESOURCE) fileResource: String): FileResource
 
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTANCE}/{$TRACKED_ENTITY_ATTRIBUTE}/image")
-    fun getImageFromTrackedEntityAttribute(
+    suspend fun getImageFromTrackedEntityAttribute(
         @Path(TRACKED_ENTITY_INSTANCE) trackedEntityInstanceUid: String,
         @Path(TRACKED_ENTITY_ATTRIBUTE) trackedEntityAttributeUid: String,
         @Query("dimension") dimension: String
-    ): Call<ResponseBody>
+    ): ResponseBody
 
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTANCE}/{$TRACKED_ENTITY_ATTRIBUTE}/file")
-    fun getFileFromTrackedEntityAttribute(
+    suspend fun getFileFromTrackedEntityAttribute(
         @Path(TRACKED_ENTITY_INSTANCE) trackedEntityInstanceUid: String,
         @Path(TRACKED_ENTITY_ATTRIBUTE) trackedEntityAttributeUid: String
-    ): Call<ResponseBody>
+    ): ResponseBody
 
     @GET("$EVENTS/files")
-    fun getFileFromEventValue(
+    suspend fun getFileFromEventValue(
         @Query("eventUid") eventUid: String,
         @Query("dataElementUid") dataElementUid: String,
         @Query("dimension") dimension: String
-    ): Call<ResponseBody>
+    ): ResponseBody
 
     @GET("$DATA_VALUES/files")
-    fun getFileFromDataValue(
+    suspend fun getFileFromDataValue(
         @Query("de") dataElement: String,
         @Query("pe") period: String,
         @Query("ou") organisationUnit: String,
         @Query("co") categoryOptionCombo: String,
         @Query("dimension") dimension: String
-    ): Call<ResponseBody>
+    ): ResponseBody
 
     companion object {
         const val FILE_RESOURCES = "fileResources"

From 164d2de7b514a1d627c8ec526c22ffc1c4dc451f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 08:16:20 +0200
Subject: [PATCH 034/478] [ANDROSDK-1701] Move EventOrphanCleaner to an
 external class

---
 .../internal/DataOrphanCleanerImpl.kt         |  2 +-
 .../internal/EnrollmentEntityDIModule.kt      | 13 +----
 .../enrollment/internal/EnrollmentHandler.kt  |  2 +-
 .../enrollment/internal/EventOrphanCleaner.kt | 47 +++++++++++++++++++
 4 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt
index 758adb0b62..a86b1338d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
 
-internal class DataOrphanCleanerImpl<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
+internal open class DataOrphanCleanerImpl<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
     private val tableName: String,
     private val parentColumn: String,
     private val stateColumn: String,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
index 58b6244f29..39514be24e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
@@ -67,7 +67,7 @@ internal class EnrollmentEntityDIModule {
         noteVersionManager: NoteDHISVersionManager,
         enrollmentStore: EnrollmentStore,
         eventHandler: EventHandler,
-        eventOrphanCleaner: OrphanCleaner<Enrollment, Event>,
+        eventOrphanCleaner: EventOrphanCleaner,
         noteHandler: NoteHandler,
         noteUniquenessManager: NoteUniquenessManager,
         relationshipOrphanCleaner: OrphanCleaner<Enrollment, Relationship>
@@ -106,15 +106,4 @@ internal class EnrollmentEntityDIModule {
     ): OrphanCleaner<Enrollment, Relationship> {
         return impl
     }
-
-    @Provides
-    @Reusable
-    fun eventOrphanCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<Enrollment, Event> {
-        return DataOrphanCleanerImpl(
-            EventTableInfo.TABLE_INFO.name(),
-            EventTableInfo.Columns.ENROLLMENT,
-            DataColumns.SYNC_STATE,
-            databaseAdapter
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
index 92d891191c..21e260c2a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
@@ -53,7 +53,7 @@ internal class EnrollmentHandler constructor(
     private val noteVersionManager: NoteDHISVersionManager,
     enrollmentStore: EnrollmentStore,
     private val eventHandler: IdentifiableDataHandler<Event>,
-    private val eventOrphanCleaner: OrphanCleaner<Enrollment, Event>,
+    private val eventOrphanCleaner: EventOrphanCleaner,
     private val noteHandler: Handler<Note>,
     private val noteUniquenessManager: NoteUniquenessManager,
     private val relationshipOrphanCleaner: OrphanCleaner<Enrollment, Relationship>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
new file mode 100644
index 0000000000..1bc422fba9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.enrollment.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.common.DataColumns
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.EventTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class EventOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : DataOrphanCleanerImpl<Enrollment, Event>(
+    tableName = EventTableInfo.TABLE_INFO.name(),
+    parentColumn = EventTableInfo.Columns.ENROLLMENT,
+    stateColumn = DataColumns.SYNC_STATE,
+    databaseAdapter = databaseAdapter
+)
\ No newline at end of file

From 1e2bfed286d55f8a0bb92b9de83bb568953f23fe Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 08:23:59 +0200
Subject: [PATCH 035/478] [ANDROSDK-1701] Move CategoryOptionComboOrphanCleaner
 to an external class

---
 .../cleaners/internal/OrphanCleanerImpl.kt    |  2 +-
 .../internal/CategoryComboEntityDIModule.kt   | 12 +----
 .../category/internal/CategoryComboHandler.kt |  2 +-
 .../CategoryOptionComboOrphanCleaner.kt       | 45 +++++++++++++++++++
 .../internal/CategoryComboHandlerShould.kt    |  3 +-
 5 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt
index f2a907cda3..111f9e3a11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.helpers.UidsHelper.commaSeparatedUidsWith
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal class OrphanCleanerImpl<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
+internal open class OrphanCleanerImpl<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
     private val tableName: String,
     private val parentColumn: String,
     private val databaseAdapter: DatabaseAdapter
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
index 07cbcaeb57..487f536d8f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
@@ -52,21 +52,11 @@ internal class CategoryComboEntityDIModule {
         store: CategoryComboStore,
         optionComboHandler: CategoryOptionComboHandler,
         categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
-        categoryOptionCleaner: OrphanCleaner<CategoryCombo, CategoryOptionCombo>
+        categoryOptionCleaner: CategoryOptionComboOrphanCleaner
     ): CategoryComboHandler {
         return CategoryComboHandler(store, optionComboHandler, categoryCategoryComboLinkHandler, categoryOptionCleaner)
     }
 
-    @Provides
-    @Reusable
-    fun orphanCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<CategoryCombo, CategoryOptionCombo> {
-        return OrphanCleanerImpl(
-            CategoryOptionComboTableInfo.TABLE_INFO.name(),
-            CategoryOptionComboTableInfo.Columns.CATEGORY_COMBO,
-            databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<CategoryCombo>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
index 5eef18956c..092589b2be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
@@ -42,7 +42,7 @@ internal class CategoryComboHandler constructor(
     store: CategoryComboStore,
     private val optionComboHandler: CategoryOptionComboHandler,
     private val categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
-    private val categoryOptionCleaner: OrphanCleaner<CategoryCombo, CategoryOptionCombo>
+    private val categoryOptionCleaner: CategoryOptionComboOrphanCleaner
 ) : IdentifiableHandlerImpl<CategoryCombo>(store) {
 
     override fun afterObjectHandled(o: CategoryCombo, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
new file mode 100644
index 0000000000..6d4b848956
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.category.internal
+
+import dagger.Module
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.category.CategoryCombo
+import org.hisp.dhis.android.core.category.CategoryOptionCombo
+import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
+import javax.inject.Inject
+
+@Module
+internal class CategoryOptionComboOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<CategoryCombo, CategoryOptionCombo>(
+    tableName = CategoryOptionComboTableInfo.TABLE_INFO.name(),
+    parentColumn = CategoryOptionComboTableInfo.Columns.CATEGORY_COMBO,
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
index ff700f3c3a..1a25721b78 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
@@ -35,7 +35,6 @@ import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.same
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.category.Category
@@ -49,7 +48,7 @@ class CategoryComboHandlerShould {
     private val categoryComboStore: CategoryComboStore = mock()
     private val optionComboHandler: CategoryOptionComboHandler = mock()
     private val categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler = mock()
-    private val categoryOptionCleaner: OrphanCleaner<CategoryCombo, CategoryOptionCombo> = mock()
+    private val categoryOptionCleaner: CategoryOptionComboOrphanCleaner = mock()
 
     private val comboUid = "comboId"
 

From 0ef03e5497709edcc8149b3a879756a25eee1998 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 08:24:56 +0200
Subject: [PATCH 036/478] [ANDROSDK-1701] Use reusable instead of module on
 CategoryOptionComboOrphanCleaner

---
 .../category/internal/CategoryOptionComboOrphanCleaner.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
index 6d4b848956..16c55bcf5b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Module
+import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 import javax.inject.Inject
 
-@Module
+@Reusable
 internal class CategoryOptionComboOrphanCleaner @Inject constructor(
     databaseAdapter: DatabaseAdapter
 ) : OrphanCleanerImpl<CategoryCombo, CategoryOptionCombo>(

From 3be5e708b760def90717a64905344d88d80a363f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 08:30:15 +0200
Subject: [PATCH 037/478] [ANDROSDK-1701] Move SectionOrphanCleaner to a class

---
 .../dataset/internal/DataSetEntityDIModule.kt | 15 +------
 .../core/dataset/internal/DataSetHandler.kt   | 10 +----
 .../dataset/internal/SectionOrphanCleaner.kt  | 45 +++++++++++++++++++
 3 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
index 6497b30362..4569f01860 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
@@ -34,16 +34,12 @@ import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
-import org.hisp.dhis.android.core.dataset.Section
-import org.hisp.dhis.android.core.dataset.SectionTableInfo
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
 
@@ -61,7 +57,7 @@ internal class DataSetEntityDIModule {
     fun handler(
         dataSetStore: DataSetStore,
         sectionHandler: SectionHandler,
-        sectionOrphanCleaner: OrphanCleaner<DataSet, Section>,
+        sectionOrphanCleaner: SectionOrphanCleaner,
         compulsoryDataElementOperandHandler: DataElementOperandHandler,
         dataSetCompulsoryDataElementOperandLinkHandler: DataSetCompulsoryDataElementOperandHandler,
         dataInputPeriodHandler: DataInputPeriodHandler,
@@ -84,15 +80,6 @@ internal class DataSetEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun sectionOrphanCleaner(databaseAdapter: DatabaseAdapter?): OrphanCleaner<DataSet, Section> {
-        return OrphanCleanerImpl(
-            SectionTableInfo.TABLE_INFO.name(), SectionTableInfo.Columns.DATA_SET,
-            databaseAdapter!!
-        )
-    }
-
     @Provides
     @Reusable
     fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<DataSet> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index 57601d6039..b3303ddf63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -29,18 +29,12 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
-import org.hisp.dhis.android.core.dataset.DataInputPeriod
-import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
-import org.hisp.dhis.android.core.dataset.DataSetElement
-import org.hisp.dhis.android.core.dataset.DataSetInternalAccessor
-import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.dataset.*
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
@@ -49,7 +43,7 @@ import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
 internal class DataSetHandler constructor(
     dataSetStore: DataSetStore,
     private val sectionHandler: SectionHandler,
-    private val sectionOrphanCleaner: OrphanCleaner<DataSet, Section>,
+    private val sectionOrphanCleaner: SectionOrphanCleaner,
     private val compulsoryDataElementOperandHandler: DataElementOperandHandler,
     private val dataSetCompulsoryDataElementOperandLinkHandler: DataSetCompulsoryDataElementOperandHandler,
     private val dataInputPeriodHandler: DataInputPeriodHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
new file mode 100644
index 0000000000..b282425d87
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.dataset.SectionTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class SectionOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<DataSet, Section>(
+    tableName = SectionTableInfo.TABLE_INFO.name(),
+    parentColumn = SectionTableInfo.Columns.DATA_SET,
+    databaseAdapter = databaseAdapter
+)
\ No newline at end of file

From 3bd8341154a72e776f00c54dc3c1c168a2064b53 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 09:09:59 +0200
Subject: [PATCH 038/478] [ANDROSDK-1701] Rename .java to .kt

---
 ...hanCleanerImpl.java => EnrollmentRelationshipOrphanCleaner.kt} | 0
 ...hipOrphanCleanerImpl.java => RelationshipOrphanCleanerImpl.kt} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{EnrollmentRelationshipOrphanCleanerImpl.java => EnrollmentRelationshipOrphanCleaner.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipOrphanCleanerImpl.java => RelationshipOrphanCleanerImpl.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleanerImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt

From 4c0e66758a1748396525303ae12f5e0497740c26 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 09:10:00 +0200
Subject: [PATCH 039/478] [ANDROSDK-1701] Move
 EnrollmentRelationshipOrphanCleaner to a kotlin class

---
 .../internal/EnrollmentEntityDIModule.kt      | 18 +---
 .../enrollment/internal/EnrollmentHandler.kt  |  5 +-
 .../EnrollmentRelationshipOrphanCleaner.kt    | 43 ++++-----
 .../internal/RelationshipOrphanCleanerImpl.kt | 95 ++++++++-----------
 .../internal/EnrollmentHandlerShould.kt       |  7 +-
 5 files changed, 62 insertions(+), 106 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
index 39514be24e..d2957043e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
@@ -30,23 +30,17 @@ package org.hisp.dhis.android.core.enrollment.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
-import org.hisp.dhis.android.core.event.Event
-import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.event.internal.EventHandler
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender
 import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.Relationship
-import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleanerImpl
+import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 
@@ -70,7 +64,7 @@ internal class EnrollmentEntityDIModule {
         eventOrphanCleaner: EventOrphanCleaner,
         noteHandler: NoteHandler,
         noteUniquenessManager: NoteUniquenessManager,
-        relationshipOrphanCleaner: OrphanCleaner<Enrollment, Relationship>
+        relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner
     ): EnrollmentHandler {
         return EnrollmentHandler(
             relationshipVersionManager,
@@ -98,12 +92,4 @@ internal class EnrollmentEntityDIModule {
             EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender.create(databaseAdapter)
         )
     }
-
-    @Provides
-    @Reusable
-    fun relationshipOrphanCleaner(
-        impl: EnrollmentRelationshipOrphanCleanerImpl
-    ): OrphanCleaner<Enrollment, Relationship> {
-        return impl
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
index 21e260c2a3..f8082a20fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import android.util.Log
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.*
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
@@ -42,7 +41,7 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
@@ -56,7 +55,7 @@ internal class EnrollmentHandler constructor(
     private val eventOrphanCleaner: EventOrphanCleaner,
     private val noteHandler: Handler<Note>,
     private val noteUniquenessManager: NoteUniquenessManager,
-    private val relationshipOrphanCleaner: OrphanCleaner<Enrollment, Relationship>
+    private val relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner
 ) : IdentifiableDataHandlerImpl<Enrollment>(enrollmentStore, relationshipVersionManager, relationshipHandler) {
 
     override fun addRelationshipState(o: Enrollment): Enrollment {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
index e9b6e834dd..8f10d53269 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
@@ -25,37 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.enrollment.Enrollment;
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository;
-import org.hisp.dhis.android.core.relationship.RelationshipHelper;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
+import org.hisp.dhis.android.core.relationship.RelationshipHelper
+import org.hisp.dhis.android.core.relationship.RelationshipItem
+import javax.inject.Inject
 
 @Reusable
-public class EnrollmentRelationshipOrphanCleanerImpl extends RelationshipOrphanCleanerImpl<Enrollment, Relationship> {
-
-    @Inject
-    EnrollmentRelationshipOrphanCleanerImpl(RelationshipStore relationshipStore,
-                                            RelationshipCollectionRepository relationshipRepository) {
-        super(relationshipStore, relationshipRepository);
-    }
-
-    @Override
-    public RelationshipItem getItem(String uid) {
-        return RelationshipHelper.enrollmentItem(uid);
+internal class EnrollmentRelationshipOrphanCleaner @Inject constructor(
+    relationshipStore: RelationshipStore,
+    relationshipRepository: RelationshipCollectionRepository
+) : RelationshipOrphanCleanerImpl<Enrollment, Relationship>(relationshipStore, relationshipRepository) {
+    override fun getItem(uid: String): RelationshipItem {
+        return RelationshipHelper.enrollmentItem(uid)
     }
 
-    @Override
-    public Collection<Relationship> relationships(Collection<Relationship> relationships) {
-        return relationships;
+    override fun relationships(relationships: Collection<Relationship>): Collection<Relationship> {
+        return relationships
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt
index 30dbc2fb84..120be6b5d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt
@@ -25,74 +25,57 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.relationship.*
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.relationship.BaseRelationship;
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
-
-import java.util.Collection;
-import java.util.List;
-
-import static org.hisp.dhis.android.core.relationship.RelationshipHelper.areItemsEqual;
-
-abstract class RelationshipOrphanCleanerImpl<O extends ObjectWithUidInterface, R extends BaseRelationship>
-        implements OrphanCleaner<O, R> {
-
-    private final RelationshipStore relationshipStore;
-    private final RelationshipCollectionRepository relationshipRepository;
-
-    RelationshipOrphanCleanerImpl(RelationshipStore relationshipStore,
-                                  RelationshipCollectionRepository relationshipRepository) {
-        this.relationshipStore = relationshipStore;
-        this.relationshipRepository = relationshipRepository;
-    }
-
-    abstract RelationshipItem getItem(String uid);
-
-    abstract Collection<Relationship> relationships(Collection<R> relationships);
-
-    public boolean deleteOrphan(O instance, Collection<R> relationships) {
-        if (instance == null || relationships == null) {
-            return false;
+internal abstract class RelationshipOrphanCleanerImpl<O : ObjectWithUidInterface, R : BaseRelationship>(
+    private val relationshipStore: RelationshipStore,
+    private val relationshipRepository: RelationshipCollectionRepository
+) : OrphanCleaner<O, R> {
+    abstract fun getItem(uid: String): RelationshipItem
+    abstract fun relationships(relationships: Collection<R>): Collection<Relationship>
+    override fun deleteOrphan(parent: O?, children: Collection<R>?): Boolean {
+        if (parent == null || children == null) {
+            return false
         }
-
-        List<Relationship> existingRelationships =
-                relationshipRepository.getByItem(getItem(instance.uid()), true, false);
-
-        int count = 0;
-        for (Relationship existingRelationship : existingRelationships) {
-            if (isSynced(existingRelationship.syncState()) &&
-                    !isInRelationshipList(existingRelationship, relationships(relationships))) {
-                relationshipStore.delete(existingRelationship.uid());
-                count++;
+        val existingRelationships = relationshipRepository.getByItem(getItem(parent.uid()), true, false)
+        var count = 0
+        for (existingRelationship in existingRelationships) {
+            if (isSynced(existingRelationship.syncState()!!) &&
+                !isInRelationshipList(existingRelationship, relationships(children))
+            ) {
+                relationshipStore.delete(existingRelationship.uid()!!)
+                count++
             }
         }
-
-        return count > 0;
+        return count > 0
     }
 
-    private boolean isSynced(State state) {
-        return State.SYNCED.equals(state) || State.SYNCED_VIA_SMS.equals(state);
+    private fun isSynced(state: State): Boolean {
+        return State.SYNCED == state || State.SYNCED_VIA_SMS == state
     }
 
-    private boolean isInRelationshipList(Relationship target,
-                                         Collection<Relationship> list) {
-        for (Relationship relationship : list) {
+    private fun isInRelationshipList(
+        target: Relationship,
+        list: Collection<Relationship>
+    ): Boolean {
+        for (relationship in list) {
             if (target.from() == null || target.to() == null || relationship.from() == null || target.to() == null) {
-                continue;
+                continue
             }
-            if (areItemsEqual(target.from(), relationship.from()) &&
-                    areItemsEqual(target.to(), relationship.to()) &&
-                    target.relationshipType().equals(relationship.relationshipType())) {
-                return true;
+            if (RelationshipHelper.areItemsEqual(target.from(), relationship.from()) &&
+                RelationshipHelper.areItemsEqual(
+                    target.to(),
+                    relationship.to()
+                ) && target.relationshipType() == relationship.relationshipType()
+            ) {
+                return true
             }
         }
-        return false;
+        return false
     }
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
index 3930b73e59..8dcf2f95bf 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler
@@ -40,7 +39,7 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
@@ -64,8 +63,8 @@ class EnrollmentHandlerShould {
     private val enrollmentBuilder: Enrollment.Builder = mock()
     private val relationshipVersionManager: RelationshipDHISVersionManager = mock()
     private val relationshipHandler: RelationshipHandler = mock()
-    private val relationshipOrphanCleaner: OrphanCleaner<Enrollment, Relationship> = mock()
-    private val eventCleaner: OrphanCleaner<Enrollment, Event> = mock()
+    private val relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner = mock()
+    private val eventCleaner: EventOrphanCleaner = mock()
 
     // object to test
     private lateinit var enrollmentHandler: EnrollmentHandler

From 061b4142e95c83a1c2ba78786ea00a23b0a4aa17 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 09:19:48 +0200
Subject: [PATCH 040/478] [ANDROSDK-1701] Rename .java to .kt

---
 ...ipOrphanCleanerImpl.java => EventRelationshipOrphanCleaner.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{EventRelationshipOrphanCleanerImpl.java => EventRelationshipOrphanCleaner.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleanerImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt

From 3dcf0211d23714a9f7a598cde81197266b3ca457 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 09:19:48 +0200
Subject: [PATCH 041/478] [ANDROSDK-1701] Move EventRelationshipOrphanCleaner
 to a kotlin class

---
 .../event/internal/EventEntityDIModule.kt     | 12 +----
 .../core/event/internal/EventHandler.kt       |  7 ++-
 .../EventRelationshipOrphanCleaner.kt         | 45 +++++++------------
 .../core/event/internal/EventHandlerShould.kt |  5 +--
 4 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
index debfb70206..ce60897a4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
@@ -40,8 +39,7 @@ import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteForEventChildrenAppender
 import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.Relationship
-import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleanerImpl
+import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueChildrenAppender
@@ -66,7 +64,7 @@ internal class EventEntityDIModule {
         noteHandler: NoteHandler,
         noteVersionManager: NoteDHISVersionManager,
         noteUniquenessManager: NoteUniquenessManager,
-        relationshipOrphanCleaner: OrphanCleaner<Event, Relationship>
+        relationshipOrphanCleaner: EventRelationshipOrphanCleaner
     ): EventHandler {
         return EventHandler(
             relationshipVersionManager,
@@ -86,12 +84,6 @@ internal class EventEntityDIModule {
         return EventProjectionTransformer()
     }
 
-    @Provides
-    @Reusable
-    fun relationshipOrphanCleaner(impl: EventRelationshipOrphanCleanerImpl): OrphanCleaner<Event, Relationship> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Event>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
index 01859c4dfa..f619a7cab6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.event.internal
 
 import android.util.Log
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -43,12 +41,13 @@ import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
+import javax.inject.Inject
 
 @Reusable
 internal class EventHandler @Inject constructor(
@@ -59,7 +58,7 @@ internal class EventHandler @Inject constructor(
     private val noteHandler: NoteHandler,
     private val noteVersionManager: NoteDHISVersionManager,
     private val noteUniquenessManager: NoteUniquenessManager,
-    private val relationshipOrphanCleaner: OrphanCleaner<Event, Relationship>
+    private val relationshipOrphanCleaner: EventRelationshipOrphanCleaner
 ) : IdentifiableDataHandlerImpl<Event>(eventStore, relationshipVersionManager, relationshipHandler) {
 
     override fun beforeObjectHandled(o: Event, params: IdentifiableDataHandlerParams): Event {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
index 32d501085a..bd87f404a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
@@ -25,37 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository;
-import org.hisp.dhis.android.core.relationship.RelationshipHelper;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
+import org.hisp.dhis.android.core.relationship.RelationshipHelper
+import org.hisp.dhis.android.core.relationship.RelationshipItem
+import javax.inject.Inject
 
 @Reusable
-public class EventRelationshipOrphanCleanerImpl extends RelationshipOrphanCleanerImpl<Event, Relationship> {
-
-    @Inject
-    EventRelationshipOrphanCleanerImpl(RelationshipStore relationshipStore,
-                                       RelationshipCollectionRepository relationshipRepository) {
-        super(relationshipStore, relationshipRepository);
-    }
-
-    @Override
-    public RelationshipItem getItem(String uid) {
-        return RelationshipHelper.eventItem(uid);
+internal class EventRelationshipOrphanCleaner @Inject internal constructor(
+    relationshipStore: RelationshipStore,
+    relationshipRepository: RelationshipCollectionRepository
+) : RelationshipOrphanCleanerImpl<Event, Relationship>(relationshipStore, relationshipRepository) {
+    override fun getItem(uid: String): RelationshipItem {
+        return RelationshipHelper.eventItem(uid)
     }
 
-    @Override
-    public Collection<Relationship> relationships(Collection<Relationship> relationships) {
-        return relationships;
+    override fun relationships(relationships: Collection<Relationship>): Collection<Relationship> {
+        return relationships
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
index 60f38ab15a..7158163e29 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.common.State
@@ -38,7 +37,7 @@ import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
@@ -62,7 +61,7 @@ class EventHandlerShould {
     private val relationshipItemRelatives: RelationshipItemRelatives = mock()
     private val relationshipHandler: RelationshipHandler = mock()
     private val eventBuilder: Event.Builder = mock()
-    private val relationshipOrphanCleaner: OrphanCleaner<Event, Relationship> = mock()
+    private val relationshipOrphanCleaner: EventRelationshipOrphanCleaner = mock()
     private val event: Event = mock()
 
     // object to test

From 7508eaaf2a5b68d958450922dadf83ebb8f3025f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 09:25:11 +0200
Subject: [PATCH 042/478] [ANDROSDK-1701] Rename .java to .kt

---
 ...shipOrphanCleanerImpl.java => TEIRelationshipOrphanCleaner.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{TEIRelationshipOrphanCleanerImpl.java => TEIRelationshipOrphanCleaner.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleanerImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt

From 6bcec7c3b9268a14cef105f46a67f34e4be39005 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 09:25:12 +0200
Subject: [PATCH 043/478] [ANDROSDK-1701] Move TEIRelationshipOrphanCleaner to
 a kotlin class

---
 .../internal/TEIRelationshipOrphanCleaner.kt  | 44 +++++++------------
 .../TrackedEntityInstanceEntityDIModule.kt    | 11 -----
 .../internal/TrackedEntityInstanceHandler.kt  |  7 ++-
 .../TrackedEntityInstanceHandlerShould.kt     |  4 +-
 4 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
index 1e48fb949f..9a7f6c079a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
@@ -25,38 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship.internal
 
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.relationship.Relationship;
-import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository;
-import org.hisp.dhis.android.core.relationship.RelationshipHelper;
-import org.hisp.dhis.android.core.relationship.RelationshipItem;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.relationship.Relationship
+import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
+import org.hisp.dhis.android.core.relationship.RelationshipHelper
+import org.hisp.dhis.android.core.relationship.RelationshipItem
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import javax.inject.Inject
 
 @Reusable
-public class TEIRelationshipOrphanCleanerImpl
-        extends RelationshipOrphanCleanerImpl<TrackedEntityInstance, Relationship> {
-
-    @Inject
-    TEIRelationshipOrphanCleanerImpl(RelationshipStore relationshipStore,
-                                     RelationshipCollectionRepository relationshipRepository) {
-        super(relationshipStore, relationshipRepository);
-    }
-
-    @Override
-    public RelationshipItem getItem(String uid) {
-        return RelationshipHelper.teiItem(uid);
+internal class TEIRelationshipOrphanCleaner @Inject internal constructor(
+    relationshipStore: RelationshipStore,
+    relationshipRepository: RelationshipCollectionRepository
+) : RelationshipOrphanCleanerImpl<TrackedEntityInstance, Relationship>(relationshipStore, relationshipRepository) {
+    override fun getItem(uid: String): RelationshipItem {
+        return RelationshipHelper.teiItem(uid)
     }
 
-    @Override
-    public Collection<Relationship> relationships(Collection<Relationship> relationships) {
-        return relationships;
+    override fun relationships(relationships: Collection<Relationship>): Collection<Relationship> {
+        return relationships
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index 738511676e..daa1c3f999 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.relationship.Relationship
-import org.hisp.dhis.android.core.relationship.internal.TEIRelationshipOrphanCleanerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
@@ -74,14 +71,6 @@ internal class TrackedEntityInstanceEntityDIModule {
         return impl
     }
 
-    @Provides
-    @Reusable
-    fun relationshipOrphanCleaner(
-        impl: TEIRelationshipOrphanCleanerImpl
-    ): OrphanCleaner<TrackedEntityInstance, Relationship> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
index 7865ec68c8..f155ebae4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
@@ -29,22 +29,21 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import android.util.Log
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentHandler
-import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
+import org.hisp.dhis.android.core.relationship.internal.TEIRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerHandler
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceHandler @Inject constructor(
@@ -56,7 +55,7 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
     private val enrollmentHandler: EnrollmentHandler,
     private val programOwnerHandler: ProgramOwnerHandler,
     private val enrollmentOrphanCleaner: TrackedEntityEnrollmentOrphanCleaner,
-    private val relationshipOrphanCleaner: OrphanCleaner<TrackedEntityInstance, Relationship>
+    private val relationshipOrphanCleaner: TEIRelationshipOrphanCleaner
 ) : IdentifiableDataHandlerImpl<TrackedEntityInstance>(
     trackedEntityInstanceStore,
     relationshipVersionManager,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
index 14683bc037..fd274690eb 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
+import org.hisp.dhis.android.core.relationship.internal.TEIRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
@@ -64,7 +64,7 @@ class TrackedEntityInstanceHandlerShould {
     private val relative: TrackedEntityInstance = mock()
     private val relativeBuilder: TrackedEntityInstance.Builder = mock()
     private val enrollmentCleaner: TrackedEntityEnrollmentOrphanCleaner = mock()
-    private val relationshipCleaner: OrphanCleaner<TrackedEntityInstance, Relationship> = mock()
+    private val relationshipCleaner: TEIRelationshipOrphanCleaner = mock()
     private val relatives: RelationshipItemRelatives = mock()
     private val teiBuilder: TrackedEntityInstance.Builder = mock()
 

From 24b2cf3818363a17b38782ea876d89b765cd45ae Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 10:27:07 +0200
Subject: [PATCH 044/478] [ANDROSDK-1701] Refactor
 TrackedEntityEnrollmentOrphanCleaner class

---
 .../TrackedEntityEnrollmentOrphanCleaner.kt   | 55 ++++++++++-
 ...rackedEntityEnrollmentOrphanCleanerImpl.kt | 91 -------------------
 .../TrackedEntityInstanceEntityDIModule.kt    |  6 --
 3 files changed, 53 insertions(+), 99 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleanerImpl.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
index 8bc2f3ba1e..0c4a613ef2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
@@ -27,14 +27,65 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
 
-internal interface TrackedEntityEnrollmentOrphanCleaner {
+@Reusable
+internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(
+    private val enrollmentStore: EnrollmentStore,
+    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
+) {
 
     fun deleteOrphan(
         parent: TrackedEntityInstance?,
         children: Collection<Enrollment>?,
         program: String?
-    ): Boolean
+    ): Boolean {
+        return if (parent != null && children != null) {
+            val orphanEnrollmentsClause = WhereClauseBuilder().run {
+                appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, parent.uid())
+                appendNotInKeyStringValues(EnrollmentTableInfo.Columns.UID, children.map { it.uid() })
+                appendInKeyEnumValues(
+                    EnrollmentTableInfo.Columns.SYNC_STATE,
+                    listOf(State.SYNCED, State.SYNCED_VIA_SMS)
+                )
+                if (program != null) {
+                    appendKeyStringValue(EnrollmentTableInfo.Columns.PROGRAM, program)
+                }
+                build()
+            }
+
+            val orphanEnrollments = enrollmentStore.selectWhere(orphanEnrollmentsClause)
+
+            val deletedEnrollments = orphanEnrollments.filter { e -> isAccessibleByGlass(e, program) }
+
+            if (deletedEnrollments.isNotEmpty()) {
+                val deleteWhereClause = WhereClauseBuilder()
+                    .appendInKeyStringValues(EnrollmentTableInfo.Columns.UID, deletedEnrollments.map { it.uid() })
+                    .build()
+
+                enrollmentStore.deleteWhere(deleteWhereClause)
+            }
+
+            deletedEnrollments.isNotEmpty()
+        } else {
+            false
+        }
+    }
+
+    private fun isAccessibleByGlass(enrollment: Enrollment, program: String?): Boolean {
+        val isProtected = breakTheGlassHelper.isProtectedInSearchScope(
+            program = enrollment.program(),
+            organisationUnit = enrollment.organisationUnit()
+        )
+
+        return !isProtected || enrollment.program() == program
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleanerImpl.kt
deleted file mode 100644
index 11752cc41e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleanerImpl.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.common.State
-import org.hisp.dhis.android.core.enrollment.Enrollment
-import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
-
-@Reusable
-internal class TrackedEntityEnrollmentOrphanCleanerImpl @Inject constructor(
-    private val enrollmentStore: EnrollmentStore,
-    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
-) : TrackedEntityEnrollmentOrphanCleaner {
-
-    override fun deleteOrphan(
-        parent: TrackedEntityInstance?,
-        children: Collection<Enrollment>?,
-        program: String?
-    ): Boolean {
-        return if (parent != null && children != null) {
-            val orphanEnrollmentsClause = WhereClauseBuilder().run {
-                appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, parent.uid())
-                appendNotInKeyStringValues(EnrollmentTableInfo.Columns.UID, children.map { it.uid() })
-                appendInKeyEnumValues(
-                    EnrollmentTableInfo.Columns.SYNC_STATE,
-                    listOf(State.SYNCED, State.SYNCED_VIA_SMS)
-                )
-                if (program != null) {
-                    appendKeyStringValue(EnrollmentTableInfo.Columns.PROGRAM, program)
-                }
-                build()
-            }
-
-            val orphanEnrollments = enrollmentStore.selectWhere(orphanEnrollmentsClause)
-
-            val deletedEnrollments = orphanEnrollments.filter { e -> isAccessibleByGlass(e, program) }
-
-            if (deletedEnrollments.isNotEmpty()) {
-                val deleteWhereClause = WhereClauseBuilder()
-                    .appendInKeyStringValues(EnrollmentTableInfo.Columns.UID, deletedEnrollments.map { it.uid() })
-                    .build()
-
-                enrollmentStore.deleteWhere(deleteWhereClause)
-            }
-
-            deletedEnrollments.isNotEmpty()
-        } else {
-            false
-        }
-    }
-
-    private fun isAccessibleByGlass(enrollment: Enrollment, program: String?): Boolean {
-        val isProtected = breakTheGlassHelper.isProtectedInSearchScope(
-            program = enrollment.program(),
-            organisationUnit = enrollment.organisationUnit()
-        )
-
-        return !isProtected || enrollment.program() == program
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index daa1c3f999..12d9e6f844 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -65,12 +65,6 @@ internal class TrackedEntityInstanceEntityDIModule {
         return impl
     }
 
-    @Provides
-    @Reusable
-    fun enrollmentOrphanCleaner(impl: TrackedEntityEnrollmentOrphanCleanerImpl): TrackedEntityEnrollmentOrphanCleaner {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(

From 4f72c706d87d11dfa55fab9812940c5808c2efcc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 10:27:33 +0200
Subject: [PATCH 045/478] [ANDROSDK-1701] Remove import on
 TrackedEntityEnrollmentOrphanCleaner

---
 .../internal/TrackedEntityEnrollmentOrphanCleaner.kt            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
index 0c4a613ef2..2ee33575cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -36,6 +35,7 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(

From 88b4309b512af09708709b2428f34907631d8f93 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 10:43:32 +0200
Subject: [PATCH 046/478] [ANDROSDK-1701] Move LegendSetLegendOrphanCleaner to
 a kotlin class

---
 .../internal/LegendSetEntityDIModule.kt       | 16 +------
 .../legendset/internal/LegendSetHandler.kt    |  3 +-
 .../internal/LegendSetLegendOrphanCleaner.kt  | 45 +++++++++++++++++++
 3 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
index df0364f070..63929c3aa3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
@@ -30,13 +30,9 @@ package org.hisp.dhis.android.core.legendset.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendSet
-import org.hisp.dhis.android.core.legendset.LegendTableInfo
 
 @Module
 internal class LegendSetEntityDIModule {
@@ -51,7 +47,7 @@ internal class LegendSetEntityDIModule {
     fun handler(
         legendSetStore: LegendSetStore,
         legendHandler: LegendHandler,
-        legendCleaner: OrphanCleaner<LegendSet, Legend>
+        legendCleaner: LegendSetLegendOrphanCleaner
     ): LegendSetHandler {
         return LegendSetHandler(
             legendSetStore,
@@ -60,16 +56,6 @@ internal class LegendSetEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun legendCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<LegendSet, Legend> {
-        return OrphanCleanerImpl(
-            LegendTableInfo.TABLE_INFO.name(),
-            LegendTableInfo.Columns.LEGEND_SET,
-            databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<LegendSet>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
index eb3fdd4046..a0df4d5ab7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.legendset.internal
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -37,7 +36,7 @@ import org.hisp.dhis.android.core.legendset.LegendSet
 internal class LegendSetHandler constructor(
     legendSetStore: LegendSetStore,
     private val legendHandler: LegendHandler,
-    private val legendCleaner: OrphanCleaner<LegendSet, Legend>
+    private val legendCleaner: LegendSetLegendOrphanCleaner
 ) : IdentifiableHandlerImpl<LegendSet>(legendSetStore) {
 
     override fun afterObjectHandled(o: LegendSet, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
new file mode 100644
index 0000000000..f3247983a6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.legendset.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.legendset.Legend
+import org.hisp.dhis.android.core.legendset.LegendSet
+import org.hisp.dhis.android.core.legendset.LegendTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class LegendSetLegendOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<LegendSet, Legend>(
+    tableName = LegendTableInfo.TABLE_INFO.name(),
+    parentColumn = LegendTableInfo.Columns.LEGEND_SET,
+    databaseAdapter = databaseAdapter
+)

From 6455034d31fb2a289b68d02e89611557bd438ebf Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 10:56:57 +0200
Subject: [PATCH 047/478] [ANDROSDK-1701] Move ProgramRuleActionOrphanCleaner
 to a kotlin class

---
 .../ProgramRuleActionOrphanCleaner.kt         | 45 +++++++++++++++++++
 .../internal/ProgramRuleEntityDIModule.kt     | 13 ------
 .../program/internal/ProgramRuleHandler.kt    |  5 +--
 3 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
new file mode 100644
index 0000000000..0b2ecd8d94
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramRuleActionOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<ProgramRule, ProgramRuleAction>(
+    ProgramRuleActionTableInfo.TABLE_INFO.name(),
+    ProgramRuleActionTableInfo.Columns.PROGRAM_RULE,
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
index e4fd5c719b..0f640e4af1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
@@ -30,16 +30,12 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.ProgramRule
-import org.hisp.dhis.android.core.program.ProgramRuleAction
-import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
 import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
 
 @Module
@@ -50,15 +46,6 @@ internal class ProgramRuleEntityDIModule {
         return ProgramRuleStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun actionCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<ProgramRule, ProgramRuleAction> {
-        return OrphanCleanerImpl(
-            ProgramRuleActionTableInfo.TABLE_INFO.name(),
-            ProgramRuleActionTableInfo.Columns.PROGRAM_RULE, databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun ruleCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<ProgramRule> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
index a76bd630d1..a7cb9cc9e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
@@ -28,21 +28,20 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleHandler @Inject constructor(
     programRuleStore: ProgramRuleStore,
     private val programRuleActionHandler: ProgramRuleActionHandler,
     private val programRuleCleaner: SubCollectionCleaner<ProgramRule>,
-    private val programRuleActionCleaner: OrphanCleaner<ProgramRule, ProgramRuleAction>
+    private val programRuleActionCleaner: ProgramRuleActionOrphanCleaner
 ) : IdentifiableHandlerImpl<ProgramRule>(programRuleStore) {
 
     override fun afterObjectHandled(o: ProgramRule, action: HandleAction) {

From 7c4f46d0405711d19e5b566894031a78bfad4282 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 11:02:38 +0200
Subject: [PATCH 048/478] [ANDROSDK-1701] Move
 ProgramStageDataElementOrphanCleaner to a kotlin class

---
 .../ProgramRuleActionOrphanCleaner.kt         |  4 +-
 .../ProgramStageDataElementOrphanCleaner.kt   | 45 +++++++++++++++++++
 .../internal/ProgramStageEntityDIModule.kt    | 13 ------
 .../program/internal/ProgramStageHandler.kt   |  5 +--
 4 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
index 0b2ecd8d94..487d960146 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
 internal class ProgramRuleActionOrphanCleaner @Inject constructor(
     databaseAdapter: DatabaseAdapter
 ) : OrphanCleanerImpl<ProgramRule, ProgramRuleAction>(
-    ProgramRuleActionTableInfo.TABLE_INFO.name(),
-    ProgramRuleActionTableInfo.Columns.PROGRAM_RULE,
+    tableName = ProgramRuleActionTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramRuleActionTableInfo.Columns.PROGRAM_RULE,
     databaseAdapter = databaseAdapter
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
new file mode 100644
index 0000000000..425d835499
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramStageDataElementOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<ProgramStage, ProgramStageDataElement>(
+    tableName = ProgramStageDataElementTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE,
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
index b2588f65c7..4aa94ee29d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
@@ -38,8 +38,6 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.ProgramStageDataElement
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
@@ -52,17 +50,6 @@ internal class ProgramStageEntityDIModule {
         return ProgramStageStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun dataElementOrphanCleaner(
-        databaseAdapter: DatabaseAdapter
-    ): OrphanCleaner<ProgramStage, ProgramStageDataElement> {
-        return OrphanCleanerImpl(
-            ProgramStageDataElementTableInfo.TABLE_INFO.name(),
-            ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE, databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun sectionOrphanCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<ProgramStage, ProgramStageSection> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index efd057191b..cdb59ec448 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
@@ -40,16 +39,16 @@ import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
 import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramStageSection
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageHandler @Inject constructor(
     programStageStore: ProgramStageStore,
     private val programStageSectionHandler: ProgramStageSectionHandler,
     private val programStageDataElementHandler: ProgramStageDataElementHandler,
-    private val programStageDataElementCleaner: OrphanCleaner<ProgramStage, ProgramStageDataElement>,
+    private val programStageDataElementCleaner: ProgramStageDataElementOrphanCleaner,
     private val programStageSectionCleaner: OrphanCleaner<ProgramStage, ProgramStageSection>,
     private val programStageCleaner: SubCollectionCleaner<ProgramStage>,
     private val attributeHandler: AttributeHandler,

From bc1fe803cffc0969e78ff9f1f7d3264451d18982 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 11:03:56 +0200
Subject: [PATCH 049/478] [ANDROSDK-1701] Removes OptionSet Option orphan
 cleaner

---
 .../option/internal/OptionSetEntityDIModule.kt     | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
index a77fa3aa8c..1ccb60143d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
@@ -30,13 +30,9 @@ package org.hisp.dhis.android.core.option.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionSet
-import org.hisp.dhis.android.core.option.OptionTableInfo
 
 @Module
 internal class OptionSetEntityDIModule {
@@ -52,16 +48,6 @@ internal class OptionSetEntityDIModule {
         return OptionSetHandler(store)
     }
 
-    @Provides
-    @Reusable
-    fun optionCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<OptionSet, Option> {
-        return OrphanCleanerImpl(
-            OptionTableInfo.TABLE_INFO.name(),
-            OptionTableInfo.Columns.OPTION_SET,
-            databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<OptionSet>> {

From 0ca042a5daca539db4827e1e3b456326df8376c2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 11:35:58 +0200
Subject: [PATCH 050/478] [ANDROSDK-1701] Move ProgramStageSectionOrphanCleaner
 to a kotlin class

---
 .../internal/ProgramStageEntityDIModule.kt    | 13 ------
 .../program/internal/ProgramStageHandler.kt   |  3 +-
 .../ProgramStageSectionOrphanCleaner.kt       | 45 +++++++++++++++++++
 3 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
index 4aa94ee29d..0526d468b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
@@ -30,16 +30,12 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.ProgramStageSection
-import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
 
 @Module
@@ -50,15 +46,6 @@ internal class ProgramStageEntityDIModule {
         return ProgramStageStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun sectionOrphanCleaner(databaseAdapter: DatabaseAdapter): OrphanCleaner<ProgramStage, ProgramStageSection> {
-        return OrphanCleanerImpl(
-            ProgramStageSectionTableInfo.TABLE_INFO.name(),
-            ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE, databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun stageCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<ProgramStage> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index cdb59ec448..e66c7c18de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
@@ -49,7 +48,7 @@ internal class ProgramStageHandler @Inject constructor(
     private val programStageSectionHandler: ProgramStageSectionHandler,
     private val programStageDataElementHandler: ProgramStageDataElementHandler,
     private val programStageDataElementCleaner: ProgramStageDataElementOrphanCleaner,
-    private val programStageSectionCleaner: OrphanCleaner<ProgramStage, ProgramStageSection>,
+    private val programStageSectionCleaner: ProgramStageSectionOrphanCleaner,
     private val programStageCleaner: SubCollectionCleaner<ProgramStage>,
     private val attributeHandler: AttributeHandler,
     private val programStageAttributeValueLinkHandler: ProgramStageAttributeValueLinkHandler
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
new file mode 100644
index 0000000000..ae0dda73ed
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageSection
+import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramStageSectionOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<ProgramStage, ProgramStageSection>(
+    tableName = ProgramStageSectionTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE,
+    databaseAdapter = databaseAdapter
+)

From 4d848c1046ec006b3dd6fc57f5bab97f15d68f0d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 11:40:51 +0200
Subject: [PATCH 051/478] [ANDROSDK-1701] Rename data and relationship orphan
 cleaners

---
 .../{DataOrphanCleanerImpl.kt => DataOrphanCleaner.kt}        | 2 +-
 .../android/core/enrollment/internal/EventOrphanCleaner.kt    | 4 ++--
 .../internal/EnrollmentRelationshipOrphanCleaner.kt           | 2 +-
 .../relationship/internal/EventRelationshipOrphanCleaner.kt   | 2 +-
 ...nshipOrphanCleanerImpl.kt => RelationshipOrphanCleaner.kt} | 2 +-
 .../relationship/internal/TEIRelationshipOrphanCleaner.kt     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/{DataOrphanCleanerImpl.kt => DataOrphanCleaner.kt} (96%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipOrphanCleanerImpl.kt => RelationshipOrphanCleaner.kt} (97%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt
similarity index 96%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt
index a86b1338d0..1284ab2338 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
 
-internal open class DataOrphanCleanerImpl<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
+internal open class DataOrphanCleaner<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
     private val tableName: String,
     private val parentColumn: String,
     private val stateColumn: String,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
index 1bc422fba9..34140bf880 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -39,7 +39,7 @@ import javax.inject.Inject
 @Reusable
 internal class EventOrphanCleaner @Inject constructor(
     databaseAdapter: DatabaseAdapter
-) : DataOrphanCleanerImpl<Enrollment, Event>(
+) : DataOrphanCleaner<Enrollment, Event>(
     tableName = EventTableInfo.TABLE_INFO.name(),
     parentColumn = EventTableInfo.Columns.ENROLLMENT,
     stateColumn = DataColumns.SYNC_STATE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
index 8f10d53269..1bf4e61b6e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
 internal class EnrollmentRelationshipOrphanCleaner @Inject constructor(
     relationshipStore: RelationshipStore,
     relationshipRepository: RelationshipCollectionRepository
-) : RelationshipOrphanCleanerImpl<Enrollment, Relationship>(relationshipStore, relationshipRepository) {
+) : RelationshipOrphanCleaner<Enrollment, Relationship>(relationshipStore, relationshipRepository) {
     override fun getItem(uid: String): RelationshipItem {
         return RelationshipHelper.enrollmentItem(uid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
index bd87f404a1..72c51b01cc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
 internal class EventRelationshipOrphanCleaner @Inject internal constructor(
     relationshipStore: RelationshipStore,
     relationshipRepository: RelationshipCollectionRepository
-) : RelationshipOrphanCleanerImpl<Event, Relationship>(relationshipStore, relationshipRepository) {
+) : RelationshipOrphanCleaner<Event, Relationship>(relationshipStore, relationshipRepository) {
     override fun getItem(uid: String): RelationshipItem {
         return RelationshipHelper.eventItem(uid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
similarity index 97%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
index 120be6b5d2..86ece9b77b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.relationship.*
 
-internal abstract class RelationshipOrphanCleanerImpl<O : ObjectWithUidInterface, R : BaseRelationship>(
+internal abstract class RelationshipOrphanCleaner<O : ObjectWithUidInterface, R : BaseRelationship>(
     private val relationshipStore: RelationshipStore,
     private val relationshipRepository: RelationshipCollectionRepository
 ) : OrphanCleaner<O, R> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
index 9a7f6c079a..23a54b14a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
 internal class TEIRelationshipOrphanCleaner @Inject internal constructor(
     relationshipStore: RelationshipStore,
     relationshipRepository: RelationshipCollectionRepository
-) : RelationshipOrphanCleanerImpl<TrackedEntityInstance, Relationship>(relationshipStore, relationshipRepository) {
+) : RelationshipOrphanCleaner<TrackedEntityInstance, Relationship>(relationshipStore, relationshipRepository) {
     override fun getItem(uid: String): RelationshipItem {
         return RelationshipHelper.teiItem(uid)
     }

From a08a2ea5928b57cfe60e72bdbf1934477923548a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 11:51:33 +0200
Subject: [PATCH 052/478] [ANDROSDK-1701] Rename .java to .kt

---
 .../{ProgramOrphanCleaner.java => ProgramOrphanCleaner.kt}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramOrphanCleaner.java => ProgramOrphanCleaner.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt

From 5dc5c3ccbad73f8f2fc9e3e4c102b06490ff9cdc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 5 Jul 2023 11:51:34 +0200
Subject: [PATCH 053/478] [ANDROSDK-1701] Move ProgramOrphanCleaner to a kotlin
 class

---
 .../program/internal/ProgramEntityDIModule.kt |  7 --
 .../core/program/internal/ProgramHandler.kt   |  5 +-
 .../program/internal/ProgramOrphanCleaner.kt  | 67 ++++++-------------
 .../ProgramRuleVariableOrphanCleaner.kt       | 45 +++++++++++++
 .../internal/ProgramSectionOrphanCleaner.kt   | 45 +++++++++++++
 ...gramTrackedEntityAttributeOrphanCleaner.kt | 45 +++++++++++++
 6 files changed, 157 insertions(+), 57 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
index d860b04262..8eb6666482 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
-import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
@@ -76,10 +75,4 @@ internal class ProgramEntityDIModule {
             OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM, programStore, databaseAdapter
         )
     }
-
-    @Provides
-    @Reusable
-    fun parentOrphanCleaner(databaseAdapter: DatabaseAdapter): ParentOrphanCleaner<Program> {
-        return ProgramOrphanCleaner.create(databaseAdapter)
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index 9c61682296..7d29ea4b41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -28,10 +28,8 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -42,6 +40,7 @@ import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHa
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramType
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramHandler @Inject constructor(
@@ -49,7 +48,7 @@ internal class ProgramHandler @Inject constructor(
     private val programRuleVariableHandler: ProgramRuleVariableHandler,
     private val programTrackedEntityAttributeHandler: ProgramTrackedEntityAttributeHandler,
     private val programSectionHandler: ProgramSectionHandler,
-    private val orphanCleaner: ParentOrphanCleaner<Program>,
+    private val orphanCleaner: ProgramOrphanCleaner,
     private val collectionCleaner: CollectionCleaner<Program>,
     private val linkCleaner: LinkCleaner<Program>,
     private val attributeHandler: AttributeHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
index 2b6999d476..fc9ca265a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
@@ -25,53 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramInternalAccessor
+import javax.inject.Inject
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl;
-import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramInternalAccessor;
-import org.hisp.dhis.android.core.program.ProgramRuleVariable;
-import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo;
-import org.hisp.dhis.android.core.program.ProgramSection;
-import org.hisp.dhis.android.core.program.ProgramSectionTableInfo;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
-
-final class ProgramOrphanCleaner implements ParentOrphanCleaner<Program> {
-
-    private final OrphanCleaner<Program, ProgramRuleVariable> programRuleVariableCleaner;
-    private final OrphanCleaner<Program, ProgramTrackedEntityAttribute> programTrackedEntityAttributeCleaner;
-    private final OrphanCleaner<Program, ProgramSection> programSectionCleaner;
-
-    private ProgramOrphanCleaner(
-            OrphanCleaner<Program, ProgramRuleVariable> programRuleVariableCleaner,
-            OrphanCleaner<Program, ProgramTrackedEntityAttribute>
-                    programTrackedEntityAttributeCleaner,
-            OrphanCleaner<Program, ProgramSection> programSectionCleaner) {
-        this.programRuleVariableCleaner = programRuleVariableCleaner;
-        this.programTrackedEntityAttributeCleaner = programTrackedEntityAttributeCleaner;
-        this.programSectionCleaner = programSectionCleaner;
-    }
-
-    @Override
-    public void deleteOrphan(Program program) {
-        programRuleVariableCleaner.deleteOrphan(program, ProgramInternalAccessor.accessProgramRuleVariables(program));
-        programTrackedEntityAttributeCleaner.deleteOrphan(program,
-                ProgramInternalAccessor.accessProgramTrackedEntityAttributes(program));
-        programSectionCleaner.deleteOrphan(program, ProgramInternalAccessor.accessProgramSections(program));
-    }
-
-    public static ProgramOrphanCleaner create(DatabaseAdapter databaseAdapter) {
-        return new ProgramOrphanCleaner(
-                new OrphanCleanerImpl<>(ProgramRuleVariableTableInfo.TABLE_INFO.name(),
-                        ProgramRuleVariableTableInfo.Columns.PROGRAM, databaseAdapter),
-                new OrphanCleanerImpl<>(ProgramTrackedEntityAttributeTableInfo.
-                        TABLE_INFO.name(), ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM, databaseAdapter),
-                new OrphanCleanerImpl<>(ProgramSectionTableInfo.TABLE_INFO.name(),
-                        ProgramSectionTableInfo.Columns.PROGRAM, databaseAdapter));
+@Reusable
+internal class ProgramOrphanCleaner @Inject constructor(
+    private val programRuleVariableCleaner: ProgramRuleVariableOrphanCleaner,
+    private val programTrackedEntityAttributeCleaner: ProgramTrackedEntityAttributeOrphanCleaner,
+    private val programSectionCleaner: ProgramSectionOrphanCleaner
+) : ParentOrphanCleaner<Program> {
+    override fun deleteOrphan(parent: Program?) {
+        programRuleVariableCleaner.deleteOrphan(parent, ProgramInternalAccessor.accessProgramRuleVariables(parent))
+        programTrackedEntityAttributeCleaner.deleteOrphan(
+            parent,
+            ProgramInternalAccessor.accessProgramTrackedEntityAttributes(parent)
+        )
+        programSectionCleaner.deleteOrphan(parent, ProgramInternalAccessor.accessProgramSections(parent))
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
new file mode 100644
index 0000000000..4c2ec57f4b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramRuleVariable
+import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramRuleVariableOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<Program, ProgramRuleVariable>(
+    tableName = ProgramRuleVariableTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramRuleVariableTableInfo.Columns.PROGRAM,
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
new file mode 100644
index 0000000000..d842a130d1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramSection
+import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramSectionOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<Program, ProgramSection>(
+    tableName = ProgramSectionTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramSectionTableInfo.Columns.PROGRAM,
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
new file mode 100644
index 0000000000..acf3b0a723
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramTrackedEntityAttributeOrphanCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : OrphanCleanerImpl<Program, ProgramTrackedEntityAttribute>(
+    tableName = ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
+    databaseAdapter = databaseAdapter
+)

From e79089f18e97f2f460190d6fe798d559890ae9b9 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 08:38:49 +0200
Subject: [PATCH 054/478] [ANDROSDK-1701] Move
 ProgramOrganisationUnitLinkCleaner to a kotlin class

---
 .../arch/cleaners/internal/LinkCleanerImpl.kt |  2 +-
 .../OrganisationUnitModuleDownloader.kt       |  4 +-
 .../program/internal/ProgramEntityDIModule.kt | 15 ------
 .../core/program/internal/ProgramHandler.kt   |  3 +-
 .../ProgramOrganisationUnitLinkCleaner.kt     | 46 +++++++++++++++++++
 5 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt
index 5f70b0f0f9..2e7e095a7a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.commaSeparatedUidsWithSingleQuotationMarks
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal class LinkCleanerImpl<P : ObjectWithUidInterface>(
+internal open class LinkCleanerImpl<P : ObjectWithUidInterface>(
     private val tableName: String,
     private val applicableColumn: String,
     private val parentStore: ObjectStore<P>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index 7c4d4b1e4a..5f2cc893f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
 import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserCall
 
@@ -45,7 +45,7 @@ internal class OrganisationUnitModuleDownloader @Inject constructor(
     private val organisationUnitLevelEndpointCall: OrganisationUnitLevelEndpointCall,
     private val rxCallExecutor: RxAPICallExecutor,
     private val dataSetLinkCleaner: LinkCleaner<DataSet>,
-    private val programLinkCleaner: LinkCleaner<Program>
+    private val programLinkCleaner: ProgramOrganisationUnitLinkCleaner
 ) {
     fun downloadMetadata(user: User): Completable {
         return organisationUnitLevelEndpointCall.download()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
index 8eb6666482..9e275c6418 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
@@ -32,11 +32,8 @@ import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTableInfo
 
@@ -63,16 +60,4 @@ internal class ProgramEntityDIModule {
     fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<Program> {
         return CollectionCleanerImpl(ProgramTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun linkCleaner(
-        programStore: ProgramStore,
-        databaseAdapter: DatabaseAdapter
-    ): LinkCleaner<Program> {
-        return LinkCleanerImpl(
-            OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
-            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM, programStore, databaseAdapter
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index 7d29ea4b41..ec8a5a7fdd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -50,7 +49,7 @@ internal class ProgramHandler @Inject constructor(
     private val programSectionHandler: ProgramSectionHandler,
     private val orphanCleaner: ProgramOrphanCleaner,
     private val collectionCleaner: CollectionCleaner<Program>,
-    private val linkCleaner: LinkCleaner<Program>,
+    private val linkCleaner: ProgramOrganisationUnitLinkCleaner,
     private val attributeHandler: AttributeHandler,
     private val programAttributeLinkHandler: ProgramAttributeValueLinkHandler
 ) : IdentifiableHandlerImpl<Program>(programStore) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
new file mode 100644
index 0000000000..51291a7de2
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.program.Program
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramOrganisationUnitLinkCleaner @Inject constructor(
+    programStore: ProgramStore,
+    databaseAdapter: DatabaseAdapter
+) : LinkCleanerImpl<Program>(
+    tableName = OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
+    applicableColumn = OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
+    parentStore = programStore,
+    databaseAdapter = databaseAdapter
+)

From be10ac577cb75256f00103052f4a9ac863d32be6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 09:12:05 +0200
Subject: [PATCH 055/478] [ANDROSDK-1701] Move
 DataSetOrganisationUnitLinkCleaner to a kotlin class

---
 .../dataset/internal/DataSetEntityDIModule.kt | 19 +-------
 .../core/dataset/internal/DataSetHandler.kt   |  3 +-
 .../DataSetOrganisationUnitLinkCleaner.kt     | 46 +++++++++++++++++++
 .../OrganisationUnitModuleDownloader.kt       |  7 ++-
 4 files changed, 51 insertions(+), 24 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
index 4569f01860..3a8f370a30 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
@@ -32,13 +32,10 @@ import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
 import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
@@ -64,7 +61,7 @@ internal class DataSetEntityDIModule {
         dataSetElementLinkHandler: DataSetElementHandler,
         dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
         collectionCleaner: CollectionCleaner<DataSet>,
-        linkCleaner: LinkCleaner<DataSet>
+        linkCleaner: DataSetOrganisationUnitLinkCleaner
     ): DataSetHandler {
         return DataSetHandler(
             dataSetStore,
@@ -86,20 +83,6 @@ internal class DataSetEntityDIModule {
         return CollectionCleanerImpl(DataSetTableInfo.TABLE_INFO.name(), databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun linkCleaner(
-        dataSetStore: DataSetStore,
-        databaseAdapter: DatabaseAdapter
-    ): LinkCleaner<DataSet> {
-        return LinkCleanerImpl(
-            DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
-            dataSetStore,
-            databaseAdapter
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataSet>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index b3303ddf63..6f31b67108 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -50,7 +49,7 @@ internal class DataSetHandler constructor(
     private val dataSetElementLinkHandler: DataSetElementHandler,
     private val dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
     private val collectionCleaner: CollectionCleaner<DataSet>,
-    private val linkCleaner: LinkCleaner<DataSet>
+    private val linkCleaner: DataSetOrganisationUnitLinkCleaner
 ) : IdentifiableHandlerImpl<DataSet>(dataSetStore) {
 
     override fun afterObjectHandled(o: DataSet, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
new file mode 100644
index 0000000000..b808fdecc5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class DataSetOrganisationUnitLinkCleaner @Inject constructor(
+    programStore: DataSetStore,
+    databaseAdapter: DatabaseAdapter
+) : LinkCleanerImpl<DataSet>(
+    tableName = DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+    applicableColumn = DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
+    parentStore = programStore,
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index 5f2cc893f2..025f1cd681 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -30,13 +30,12 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner
-import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserCall
+import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitModuleDownloader @Inject constructor(
@@ -44,7 +43,7 @@ internal class OrganisationUnitModuleDownloader @Inject constructor(
     private val userCall: UserCall,
     private val organisationUnitLevelEndpointCall: OrganisationUnitLevelEndpointCall,
     private val rxCallExecutor: RxAPICallExecutor,
-    private val dataSetLinkCleaner: LinkCleaner<DataSet>,
+    private val dataSetLinkCleaner: DataSetOrganisationUnitLinkCleaner,
     private val programLinkCleaner: ProgramOrganisationUnitLinkCleaner
 ) {
     fun downloadMetadata(user: User): Completable {

From f223fe21f56e8e866ff0855dc1fa04b1a29c8153 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 09:38:52 +0200
Subject: [PATCH 056/478] [ANDROSDK-1701] Update some unit tests

---
 .../android/core/dataset/internal/DataSetHandlerShould.java | 6 ++----
 .../core/legendset/internal/LegendSetHandlerShould.java     | 3 +--
 .../android/core/program/internal/ProgramHandlerShould.java | 6 ++----
 .../core/program/internal/ProgramRuleHandlerShould.java     | 3 +--
 .../core/program/internal/ProgramStageHandlerShould.java    | 5 ++---
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
index 00a95b4ed6..9efe154a4d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
@@ -37,8 +37,6 @@
 import static org.mockito.Mockito.when;
 
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.DataAccess;
@@ -69,7 +67,7 @@ public class DataSetHandlerShould {
     private SectionHandler sectionHandler;
 
     @Mock
-    private OrphanCleaner<DataSet, Section> sectionOrphanCleaner;
+    private SectionOrphanCleaner sectionOrphanCleaner;
 
     @Mock
     private DataElementOperandHandler compulsoryDataElementOperandHandler;
@@ -117,7 +115,7 @@ public class DataSetHandlerShould {
     private CollectionCleaner<DataSet> collectionCleaner;
 
     @Mock
-    private LinkCleaner<DataSet> linkCleaner;
+    private DataSetOrganisationUnitLinkCleaner linkCleaner;
 
     @Mock
     private List<DataInputPeriod> dataInputPeriods;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java
index 2054f8f2c5..582bf2205e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandlerShould.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.legendset.Legend;
 import org.hisp.dhis.android.core.legendset.LegendSet;
@@ -66,7 +65,7 @@ public class LegendSetHandlerShould {
     private LegendSet legendSet;
 
     @Mock
-    private OrphanCleaner<LegendSet, Legend> legendCleaner;
+    private LegendSetLegendOrphanCleaner legendCleaner;
 
     // object to test
     private LegendSetHandler legendSetHandler;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
index 45919b97c1..7128d50fb9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
@@ -37,8 +37,6 @@
 import static org.mockito.Mockito.when;
 
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleaner;
-import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.attribute.Attribute;
 import org.hisp.dhis.android.core.attribute.AttributeValue;
@@ -83,13 +81,13 @@ public class ProgramHandlerShould {
     private ProgramSectionHandler programSectionHandler;
 
     @Mock
-    private ParentOrphanCleaner<Program> orphanCleaner;
+    private ProgramOrphanCleaner orphanCleaner;
 
     @Mock
     private CollectionCleaner<Program> collectionCleaner;
 
     @Mock
-    private LinkCleaner<Program> linkCleaner;
+    private ProgramOrganisationUnitLinkCleaner linkCleaner;
 
     @Mock
     private ProgramAttributeValueLinkHandler programAttributeValueLinkHandler;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
index 98c92d9576..03d950b2c6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
@@ -66,7 +65,7 @@ public class ProgramRuleHandlerShould {
     private SubCollectionCleaner<ProgramRule> programRuleCleaner;
 
     @Mock
-    private OrphanCleaner<ProgramRule, ProgramRuleAction> programRuleActionCleaner;
+    private ProgramRuleActionOrphanCleaner programRuleActionCleaner;
 
     @Mock
     private List<ProgramRuleAction> programRuleActions;
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
index f33747cc55..2d347d30aa 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner;
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.attribute.internal.AttributeHandler;
@@ -93,10 +92,10 @@ public class ProgramStageHandlerShould {
     private List<ProgramStageSection> programStageSections;
 
     @Mock
-    private OrphanCleaner<ProgramStage, ProgramStageDataElement> programStageDataElementCleaner;
+    private ProgramStageDataElementOrphanCleaner programStageDataElementCleaner;
 
     @Mock
-    private OrphanCleaner<ProgramStage, ProgramStageSection> programStageSectionCleaner;
+    private ProgramStageSectionOrphanCleaner programStageSectionCleaner;
 
     @Mock
     private SubCollectionCleaner<ProgramStage> programStageCleaner;

From 4efee1cf74e11c47843144e748e86a66a9563585 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 09:44:25 +0200
Subject: [PATCH 057/478] [ANDROSDK-1701] Move OptionSubCollectionCleaner to a
 kotlin class

---
 .../internal/SubCollectionCleanerImpl.kt      |  2 +-
 .../option/internal/OptionEntityDIModule.kt   | 22 +-------
 .../core/option/internal/OptionHandler.kt     |  3 +-
 .../internal/OptionSubCollectionCleaner.kt    | 50 +++++++++++++++++++
 4 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt
index 7f21745fa3..b37352e158 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByParentUid
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal class SubCollectionCleanerImpl<P : ObjectWithUidInterface>(
+internal open class SubCollectionCleanerImpl<P : ObjectWithUidInterface>(
     private val tableName: String,
     private val parentColumn: String,
     private val databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
index e332168c66..38889a80cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
@@ -30,13 +30,9 @@ package org.hisp.dhis.android.core.option.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.option.Option
-import org.hisp.dhis.android.core.option.OptionTableInfo
 
 @Module
 internal class OptionEntityDIModule {
@@ -50,7 +46,7 @@ internal class OptionEntityDIModule {
     @Reusable
     fun handler(
         optionStore: OptionStore,
-        optionCleaner: SubCollectionCleaner<Option>
+        optionCleaner: OptionSubCollectionCleaner
     ): OptionHandler {
         return OptionHandler(
             optionStore,
@@ -58,22 +54,6 @@ internal class OptionEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun optionCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<Option> {
-        return SubCollectionCleanerImpl(
-            OptionTableInfo.TABLE_INFO.name(),
-            OptionTableInfo.Columns.OPTION_SET,
-            databaseAdapter,
-            object : Transformer<Option, String> {
-                override fun transform(o: Option): String {
-                    return o.optionSet()!!
-                        .uid()
-                }
-            }
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<Option>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
index 3d0e7bbd98..55dc40089d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.option.Option
 
 internal class OptionHandler constructor(
     optionStore: OptionStore,
-    private val optionCleaner: SubCollectionCleaner<Option>
+    private val optionCleaner: OptionSubCollectionCleaner
 ) : IdentifiableHandlerImpl<Option>(optionStore) {
 
     override fun afterCollectionHandled(oCollection: Collection<Option>?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
new file mode 100644
index 0000000000..b488f34930
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.OptionTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class OptionSubCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : SubCollectionCleanerImpl<Option>(
+    tableName = OptionTableInfo.TABLE_INFO.name(),
+    parentColumn = OptionTableInfo.Columns.OPTION_SET,
+    databaseAdapter = databaseAdapter,
+    keyExtractor = object : Transformer<Option, String> {
+        override fun transform(o: Option): String {
+            return o.optionSet()!!.uid()
+        }
+    }
+)

From 8439fff92d95720ae479a24297342130c52d0c7f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 09:48:37 +0200
Subject: [PATCH 058/478] [ANDROSDK-1701] Move ProgramRuleSubCollectionCleaner
 to a kotlin class

---
 .../internal/ProgramRuleEntityDIModule.kt     | 18 -------
 .../program/internal/ProgramRuleHandler.kt    |  3 +-
 .../ProgramRuleSubCollectionCleaner.kt        | 50 +++++++++++++++++++
 .../internal/ProgramRuleHandlerShould.java    |  3 +-
 4 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
index 0f640e4af1..936ce17ef8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
@@ -30,13 +30,9 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.ProgramRule
-import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
 
 @Module
 internal class ProgramRuleEntityDIModule {
@@ -46,20 +42,6 @@ internal class ProgramRuleEntityDIModule {
         return ProgramRuleStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun ruleCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<ProgramRule> {
-        return SubCollectionCleanerImpl(
-            ProgramRuleTableInfo.TABLE_INFO.name(),
-            ProgramRuleTableInfo.Columns.PROGRAM, databaseAdapter,
-            object : Transformer<ProgramRule, String> {
-                override fun transform(o: ProgramRule): String {
-                    return o.program()!!.uid()
-                }
-            }
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramRule>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
index a7cb9cc9e8..419e75cd91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -40,7 +39,7 @@ import javax.inject.Inject
 internal class ProgramRuleHandler @Inject constructor(
     programRuleStore: ProgramRuleStore,
     private val programRuleActionHandler: ProgramRuleActionHandler,
-    private val programRuleCleaner: SubCollectionCleaner<ProgramRule>,
+    private val programRuleCleaner: ProgramRuleSubCollectionCleaner,
     private val programRuleActionCleaner: ProgramRuleActionOrphanCleaner
 ) : IdentifiableHandlerImpl<ProgramRule>(programRuleStore) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
new file mode 100644
index 0000000000..5aac16740d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramRuleSubCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : SubCollectionCleanerImpl<ProgramRule>(
+    tableName = ProgramRuleTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramRuleTableInfo.Columns.PROGRAM,
+    databaseAdapter = databaseAdapter,
+    keyExtractor = object : Transformer<ProgramRule, String> {
+        override fun transform(o: ProgramRule): String {
+            return o.program()!!.uid()
+        }
+    }
+)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
index 03d950b2c6..822cc3c768 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandlerShould.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
@@ -62,7 +61,7 @@ public class ProgramRuleHandlerShould {
     private ProgramRule programRule;
 
     @Mock
-    private SubCollectionCleaner<ProgramRule> programRuleCleaner;
+    private ProgramRuleSubCollectionCleaner programRuleCleaner;
 
     @Mock
     private ProgramRuleActionOrphanCleaner programRuleActionCleaner;

From be58f0dd6a8f691d5da011f447e367bee7be1c46 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 09:50:57 +0200
Subject: [PATCH 059/478] [ANDROSDK-1701] Move ProgramStageSubCollectionCleaner
 to a kotlin class

---
 .../internal/ProgramStageEntityDIModule.kt    | 18 -------
 .../program/internal/ProgramStageHandler.kt   |  3 +-
 .../ProgramStageSubCollectionCleaner.kt       | 50 +++++++++++++++++++
 .../internal/ProgramStageHandlerShould.java   |  3 +-
 4 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
index 0526d468b6..a058dc09a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
@@ -30,13 +30,9 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.ProgramStageTableInfo
 
 @Module
 internal class ProgramStageEntityDIModule {
@@ -46,20 +42,6 @@ internal class ProgramStageEntityDIModule {
         return ProgramStageStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun stageCleaner(databaseAdapter: DatabaseAdapter): SubCollectionCleaner<ProgramStage> {
-        return SubCollectionCleanerImpl(
-            ProgramStageTableInfo.TABLE_INFO.name(),
-            ProgramStageTableInfo.Columns.PROGRAM, databaseAdapter,
-            object : Transformer<ProgramStage, String> {
-                override fun transform(o: ProgramStage): String {
-                    return o.program()!!.uid()
-                }
-            }
-        )
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<ProgramStage>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index e66c7c18de..cd8b6a8302 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -49,7 +48,7 @@ internal class ProgramStageHandler @Inject constructor(
     private val programStageDataElementHandler: ProgramStageDataElementHandler,
     private val programStageDataElementCleaner: ProgramStageDataElementOrphanCleaner,
     private val programStageSectionCleaner: ProgramStageSectionOrphanCleaner,
-    private val programStageCleaner: SubCollectionCleaner<ProgramStage>,
+    private val programStageCleaner: ProgramStageSubCollectionCleaner,
     private val attributeHandler: AttributeHandler,
     private val programStageAttributeValueLinkHandler: ProgramStageAttributeValueLinkHandler
 ) : IdentifiableHandlerImpl<ProgramStage>(programStageStore) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
new file mode 100644
index 0000000000..9b640600a8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramStageSubCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : SubCollectionCleanerImpl<ProgramStage>(
+    tableName = ProgramStageTableInfo.TABLE_INFO.name(),
+    parentColumn = ProgramStageTableInfo.Columns.PROGRAM,
+    databaseAdapter = databaseAdapter,
+    keyExtractor = object : Transformer<ProgramStage, String> {
+        override fun transform(o: ProgramStage): String {
+            return o.program()!!.uid()
+        }
+    }
+)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
index 2d347d30aa..fb5e9572fa 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandlerShould.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.attribute.internal.AttributeHandler;
 import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler;
@@ -98,7 +97,7 @@ public class ProgramStageHandlerShould {
     private ProgramStageSectionOrphanCleaner programStageSectionCleaner;
 
     @Mock
-    private SubCollectionCleaner<ProgramStage> programStageCleaner;
+    private ProgramStageSubCollectionCleaner programStageCleaner;
 
     @Mock
     private ProgramStage.Builder programStageBuilder;

From cb1d846e5eef6c40173fa86414b32b14642ae415 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 09:55:38 +0200
Subject: [PATCH 060/478] [ANDROSDK-1701] Move OptionGroupCollectionCleaner to
 a kotlin class

---
 .../internal/CollectionCleanerImpl.kt         |  2 +-
 .../internal/OptionGroupCollectionCleaner.kt  | 43 +++++++++++++++++++
 .../internal/OptionGroupEntityDIModule.kt     |  8 +---
 .../option/internal/OptionGroupHandler.kt     |  3 +-
 .../option/internal/OptionHandlerShould.java  |  3 +-
 5 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt
index bffba5d2e7..b9f7cec590 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal class CollectionCleanerImpl<P : ObjectWithUidInterface>(
+internal open class CollectionCleanerImpl<P : ObjectWithUidInterface>(
     private val tableName: String,
     private val databaseAdapter: DatabaseAdapter
 ) : CollectionCleaner<P> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
new file mode 100644
index 0000000000..065a5d2ad5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.option.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.OptionGroupTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class OptionGroupCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<OptionGroup>(
+    tableName = OptionGroupTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
index d36b0ae28f..3ef2b07183 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
@@ -50,7 +50,7 @@ internal class OptionGroupEntityDIModule {
     fun handler(
         optionStore: OptionGroupStore,
         optionGroupOptionLinkHandler: OptionGroupOptionLinkHandler,
-        collectionCleaner: CollectionCleaner<OptionGroup>
+        collectionCleaner: OptionGroupCollectionCleaner
     ): OptionGroupHandler {
         return OptionGroupHandler(
             optionStore,
@@ -59,12 +59,6 @@ internal class OptionGroupEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<OptionGroup> {
-        return CollectionCleanerImpl(OptionGroupTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<OptionGroup>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
index de8bdf6fa7..39f5981626 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -38,7 +37,7 @@ import org.hisp.dhis.android.core.option.OptionGroupOptionLink
 internal class OptionGroupHandler(
     optionStore: OptionGroupStore,
     private val optionGroupOptionLinkHandler: LinkHandler<ObjectWithUid, OptionGroupOptionLink>,
-    private val collectionCleaner: CollectionCleaner<OptionGroup>
+    private val collectionCleaner: OptionGroupCollectionCleaner
 ) : IdentifiableHandlerImpl<OptionGroup>(optionStore) {
 
     override fun afterObjectHandled(o: OptionGroup, action: HandleAction) {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java
index a041b89550..e992ba9a1f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/option/internal/OptionHandlerShould.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl;
 import org.hisp.dhis.android.core.common.ObjectStyle;
@@ -58,7 +57,7 @@ public class OptionHandlerShould {
     private ObjectStyle style;
 
     @Mock
-    private SubCollectionCleaner<Option> optionCleaner;
+    private OptionSubCollectionCleaner optionCleaner;
 
     private List<Option> options;
 

From e52dc10759fb2d9e87768afbfd21db5438deb503 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:00:45 +0200
Subject: [PATCH 061/478] [ANDROSDK-1701] Move ConstantCollectionCleaner to a
 kotlin class

---
 .../internal/ConstantCollectionCleaner.kt     | 43 +++++++++++++++++++
 .../core/constant/internal/ConstantHandler.kt |  3 +-
 .../internal/ConstantPackageDIModule.kt       | 11 +----
 3 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
new file mode 100644
index 0000000000..a658cf989d
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.constant.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.constant.Constant
+import org.hisp.dhis.android.core.constant.ConstantTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ConstantCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<Constant>(
+    tableName = ConstantTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
index d02cf3abce..d71311b0d4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.constant.internal
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.constant.Constant
 
 @Suppress("MagicNumber")
 internal class ConstantHandler constructor(
     optionStore: ConstantStore,
-    private val collectionCleaner: CollectionCleaner<Constant>
+    private val collectionCleaner: ConstantCollectionCleaner
 ) : IdentifiableHandlerImpl<Constant>(optionStore) {
     override fun afterCollectionHandled(oCollection: Collection<Constant>?) {
         collectionCleaner.deleteNotPresent(oCollection)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
index aa9643d9ea..e4dd7e389b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
@@ -31,13 +31,10 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantModule
-import org.hisp.dhis.android.core.constant.ConstantTableInfo
 import retrofit2.Retrofit
 
 @Module
@@ -52,7 +49,7 @@ internal class ConstantPackageDIModule {
     @Reusable
     fun handler(
         optionStore: ConstantStore,
-        collectionCleaner: CollectionCleaner<Constant>
+        collectionCleaner: ConstantCollectionCleaner
     ): ConstantHandler {
         return ConstantHandler(optionStore, collectionCleaner)
     }
@@ -75,12 +72,6 @@ internal class ConstantPackageDIModule {
         return emptyMap()
     }
 
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter?): CollectionCleaner<Constant> {
-        return CollectionCleanerImpl(ConstantTableInfo.TABLE_INFO.name(), databaseAdapter!!)
-    }
-
     @Provides
     @Reusable
     fun module(impl: ConstantModuleImpl): ConstantModule {

From 95e39112c7d994b1763b6f83105a9f3ac92d8be0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:03:51 +0200
Subject: [PATCH 062/478] [ANDROSDK-1701] Move DataSetCollectionCleaner to a
 kotlin class

---
 .../internal/DataSetCollectionCleaner.kt      | 43 +++++++++++++++++++
 .../dataset/internal/DataSetEntityDIModule.kt | 11 +----
 .../core/dataset/internal/DataSetHandler.kt   |  3 +-
 .../internal/DataSetHandlerShould.java        |  3 +-
 4 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
new file mode 100644
index 0000000000..9aa7e99752
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class DataSetCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<DataSet>(
+    tableName = DataSetTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
index 3a8f370a30..25b1aec585 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
@@ -30,13 +30,10 @@ package org.hisp.dhis.android.core.dataset.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
 import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
 
@@ -60,7 +57,7 @@ internal class DataSetEntityDIModule {
         dataInputPeriodHandler: DataInputPeriodHandler,
         dataSetElementLinkHandler: DataSetElementHandler,
         dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
-        collectionCleaner: CollectionCleaner<DataSet>,
+        collectionCleaner: DataSetCollectionCleaner,
         linkCleaner: DataSetOrganisationUnitLinkCleaner
     ): DataSetHandler {
         return DataSetHandler(
@@ -77,12 +74,6 @@ internal class DataSetEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<DataSet> {
-        return CollectionCleanerImpl(DataSetTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataSet>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index 6f31b67108..fafb958715 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -48,7 +47,7 @@ internal class DataSetHandler constructor(
     private val dataInputPeriodHandler: DataInputPeriodHandler,
     private val dataSetElementLinkHandler: DataSetElementHandler,
     private val dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
-    private val collectionCleaner: CollectionCleaner<DataSet>,
+    private val collectionCleaner: DataSetCollectionCleaner,
     private val linkCleaner: DataSetOrganisationUnitLinkCleaner
 ) : IdentifiableHandlerImpl<DataSet>(dataSetStore) {
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
index 9efe154a4d..6ed39e8917 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandlerShould.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.common.Access;
 import org.hisp.dhis.android.core.common.DataAccess;
@@ -112,7 +111,7 @@ public class DataSetHandlerShould {
     private DataSetIndicatorLinkHandler dataSetIndicatorLinkHandler;
 
     @Mock
-    private CollectionCleaner<DataSet> collectionCleaner;
+    private DataSetCollectionCleaner collectionCleaner;
 
     @Mock
     private DataSetOrganisationUnitLinkCleaner linkCleaner;

From 76787dbcd100c8b012487434e42575b956a8c51c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:29:21 +0200
Subject: [PATCH 063/478] [ANDROSDK-1701] Move
 OrganisationUnitCollectionCleaner to a kotlin class

---
 ...ganisationUnitCallMockIntegrationShould.kt |  8 +---
 .../internal/OrganisationUnitCall.kt          |  7 ++-
 .../OrganisationUnitCollectionCleaner.kt      | 43 +++++++++++++++++++
 .../OrganisationUnitEntityDIModule.kt         |  9 ----
 .../OrganisationUnitCallUnitShould.kt         |  7 ++-
 5 files changed, 51 insertions(+), 23 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
index 0f581a5960..bad8b916ec 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
@@ -30,9 +30,6 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import android.content.ContentValues
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Completable
-import java.io.IOException
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
@@ -42,7 +39,6 @@ import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 import org.hisp.dhis.android.core.program.ProgramTableInfo
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
@@ -54,6 +50,7 @@ import org.junit.AfterClass
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.IOException
 
 @RunWith(D2JunitRunner::class)
 class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
@@ -96,8 +93,7 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
                 OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter)
             )
         )
-        val organisationUnitCollectionCleaner: CollectionCleaner<OrganisationUnit> =
-            CollectionCleanerImpl(OrganisationUnitTableInfo.TABLE_INFO.name(), databaseAdapter)
+        val organisationUnitCollectionCleaner = OrganisationUnitCollectionCleaner(databaseAdapter)
         val pathTransformer = OrganisationUnitDisplayPathTransformer()
         organisationUnitCall = OrganisationUnitCall(
             organisationUnitService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index 599d4b17ae..c238ce3d3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -31,9 +31,6 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Single
-import java.util.concurrent.atomic.AtomicInteger
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTree
@@ -41,6 +38,8 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import java.util.concurrent.atomic.AtomicInteger
+import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitCall @Inject constructor(
@@ -49,7 +48,7 @@ internal class OrganisationUnitCall @Inject constructor(
     private val pathTransformer: OrganisationUnitDisplayPathTransformer,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val organisationUnitStore: OrganisationUnitStore,
-    private val collectionCleaner: CollectionCleaner<OrganisationUnit>
+    private val collectionCleaner: OrganisationUnitCollectionCleaner
 ) {
     fun download(user: User): Completable {
         return Completable.defer {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
new file mode 100644
index 0000000000..fd4f19bc39
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class OrganisationUnitCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<OrganisationUnit>(
+    tableName = OrganisationUnitTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
index 1e7c0be577..52552358ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
@@ -30,13 +30,10 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
 
 @Module
@@ -68,12 +65,6 @@ internal class OrganisationUnitEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<OrganisationUnit> {
-        return CollectionCleanerImpl(OrganisationUnitTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
-
     @Provides
     @Reusable
     fun pathTransformer(): OrganisationUnitDisplayPathTransformer {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
index f739cd1c24..4881280b12 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
@@ -31,12 +31,9 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
 import io.reactivex.Single
-import java.io.IOException
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
@@ -45,6 +42,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import java.io.IOException
+import java.util.*
 
 @RunWith(JUnit4::class)
 class OrganisationUnitCallUnitShould {
@@ -62,7 +61,7 @@ class OrganisationUnitCallUnitShould {
     private val organisationUnit: OrganisationUnit = mock()
     private val user: User = mock()
     private val created: Date = mock()
-    private val collectionCleaner: CollectionCleaner<OrganisationUnit> = mock()
+    private val collectionCleaner: OrganisationUnitCollectionCleaner = mock()
     private val organisationUnitHandler: OrganisationUnitHandler = mock()
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore = mock()
     private val organisationUnitStore: OrganisationUnitStore = mock()

From 2cfeb5e6034ce7d84c7c0889261b86e886ff5ac1 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:30:38 +0200
Subject: [PATCH 064/478] [ANDROSDK-1701] Remove
 OrganisationUnitGroupCollectionCleaner

---
 .../internal/OrganisationUnitGroupEntityDIModule.kt   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
index 0f8ba1fba1..eb5f07504e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
 
 @Module
 internal class OrganisationUnitGroupEntityDIModule {
@@ -51,14 +48,6 @@ internal class OrganisationUnitGroupEntityDIModule {
         return OrganisationUnitGroupHandler(store)
     }
 
-    @Provides
-    @Reusable
-    fun organisationUnitGroupCollectionCleaner(
-        databaseAdapter: DatabaseAdapter
-    ): CollectionCleaner<OrganisationUnitGroup> {
-        return CollectionCleanerImpl(OrganisationUnitGroupTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<OrganisationUnitGroup>> {

From 0031f7ba3e9688715b7dc7ea843cc5ea73026421 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:32:14 +0200
Subject: [PATCH 065/478] [ANDROSDK-1701] Remove ProgramCollectionCleaner to a
 kotlin class

---
 .../internal/ProgramCollectionCleaner.kt      | 43 +++++++++++++++++++
 .../program/internal/ProgramEntityDIModule.kt |  8 ----
 .../core/program/internal/ProgramHandler.kt   |  3 +-
 .../internal/ProgramHandlerShould.java        |  3 +-
 4 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
new file mode 100644
index 0000000000..813b590ad6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ProgramCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<Program>(
+    tableName = ProgramTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
index 9e275c6418..2a3d184a1b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.Program
@@ -54,10 +52,4 @@ internal class ProgramEntityDIModule {
             ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE to trackedEntityTypeChildrenAppender
         )
     }
-
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<Program> {
-        return CollectionCleanerImpl(ProgramTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index ec8a5a7fdd..5fa285e9c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -48,7 +47,7 @@ internal class ProgramHandler @Inject constructor(
     private val programTrackedEntityAttributeHandler: ProgramTrackedEntityAttributeHandler,
     private val programSectionHandler: ProgramSectionHandler,
     private val orphanCleaner: ProgramOrphanCleaner,
-    private val collectionCleaner: CollectionCleaner<Program>,
+    private val collectionCleaner: ProgramCollectionCleaner,
     private val linkCleaner: ProgramOrganisationUnitLinkCleaner,
     private val attributeHandler: AttributeHandler,
     private val programAttributeLinkHandler: ProgramAttributeValueLinkHandler
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
index 7128d50fb9..f472cef909 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramHandlerShould.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.attribute.Attribute;
 import org.hisp.dhis.android.core.attribute.AttributeValue;
@@ -84,7 +83,7 @@ public class ProgramHandlerShould {
     private ProgramOrphanCleaner orphanCleaner;
 
     @Mock
-    private CollectionCleaner<Program> collectionCleaner;
+    private ProgramCollectionCleaner collectionCleaner;
 
     @Mock
     private ProgramOrganisationUnitLinkCleaner linkCleaner;

From 542379690129298ee64797d2e6642b3194ef8fc3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:39:44 +0200
Subject: [PATCH 066/478] [ANDROSDK-1701] Move
 TrackedEntityTypeCollectionCleaner to a kotlin class

---
 .../TrackedEntityTypeCollectionCleaner.kt     | 43 +++++++++++++++++++
 .../TrackedEntityTypeEntityDIModule.kt        |  9 ----
 .../internal/TrackedEntityTypeHandler.kt      |  5 +--
 3 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
new file mode 100644
index 0000000000..e3ca929d89
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class TrackedEntityTypeCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<TrackedEntityType>(
+    tableName = TrackedEntityTypeTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
index f8e0258369..947a684ea1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
 
 @Module
 internal class TrackedEntityTypeEntityDIModule {
@@ -53,10 +50,4 @@ internal class TrackedEntityTypeEntityDIModule {
                 TrackedEntityTypeAttributeChildrenAppender.create(databaseAdapter)
         )
     }
-
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<TrackedEntityType> {
-        return CollectionCleanerImpl(TrackedEntityTypeTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
index a498e4e5f2..0626c930a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
@@ -28,18 +28,17 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityTypeHandler @Inject constructor(
     trackedEntityTypeStore: TrackedEntityTypeStore,
     private val attributeHandler: TrackedEntityTypeAttributeHandler,
-    private val collectionCleaner: CollectionCleaner<TrackedEntityType>
+    private val collectionCleaner: TrackedEntityTypeCollectionCleaner
 ) : IdentifiableHandlerImpl<TrackedEntityType>(trackedEntityTypeStore) {
     override fun afterObjectHandled(o: TrackedEntityType, action: HandleAction) {
         attributeHandler.handleMany(

From 902b856b60eb5f5fc92a1d2454b7a9fc65a68371 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:43:02 +0200
Subject: [PATCH 067/478] [ANDROSDK-1701] Move UserRoleCollectionCleaner to a
 kotlin class

---
 .../android/core/user/internal/UserHandler.kt |  6 +--
 .../internal/UserRoleCollectionCleaner.kt     | 43 +++++++++++++++++++
 .../user/internal/UserRoleEntityDIModule.kt   |  9 ----
 .../core/user/internal/UserHandlerShould.kt   |  3 +-
 4 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
index eeab569d6c..dd3292c33b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
@@ -28,19 +28,17 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
-import org.hisp.dhis.android.core.user.UserRole
+import javax.inject.Inject
 
 @Reusable
 internal class UserHandler @Inject constructor(
     userStore: UserStore,
     private val userRoleHandler: UserRoleHandler,
-    private val userRoleCollectionCleaner: CollectionCleaner<UserRole>
+    private val userRoleCollectionCleaner: UserRoleCollectionCleaner
 ) : IdentifiableHandlerImpl<User>(userStore) {
 
     override fun beforeObjectHandled(o: User): User {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
new file mode 100644
index 0000000000..52e7b4d832
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.user.UserRole
+import org.hisp.dhis.android.core.user.UserRoleTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class UserRoleCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<UserRole>(
+    tableName = UserRoleTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
index 8b1bd69bbf..9191505fd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.UserRole
-import org.hisp.dhis.android.core.user.UserRoleTableInfo
 
 @Module
 internal class UserRoleEntityDIModule {
@@ -50,10 +47,4 @@ internal class UserRoleEntityDIModule {
     fun childrenAppenders(): Map<String, ChildrenAppender<UserRole>> {
         return emptyMap()
     }
-
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<UserRole> {
-        return CollectionCleanerImpl(UserRoleTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt
index bc9162038f..6c1459d820 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserHandlerShould.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
@@ -44,7 +43,7 @@ import org.junit.runners.JUnit4
 class UserHandlerShould {
     private val userStore: UserStore = mock()
     private val userRoleHandler: UserRoleHandler = mock()
-    private val userRoleCollectionCleaner: CollectionCleaner<UserRole> = mock()
+    private val userRoleCollectionCleaner: UserRoleCollectionCleaner = mock()
 
     private val userRoles: List<UserRole> = mock()
 

From 6836dd0d8f7fa64efad994dcae89d1bd8ac99297 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:44:54 +0200
Subject: [PATCH 068/478] [ANDROSDK-1701] Move ValidationRuleCollectionCleaner
 to a kotlin class

---
 .../ValidationRuleCollectionCleaner.kt        | 43 +++++++++++++++++++
 .../internal/ValidationRuleEntityDIModule.kt  |  9 ----
 .../internal/ValidationRuleHandler.kt         |  5 +--
 3 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
new file mode 100644
index 0000000000..7bea853cd5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.validation.ValidationRule
+import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class ValidationRuleCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<ValidationRule>(
+    tableName = ValidationRuleTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
index 91ac5fa45e..b5127b0e07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.validation.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.validation.ValidationRule
-import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
 
 @Module
 internal class ValidationRuleEntityDIModule {
@@ -45,12 +42,6 @@ internal class ValidationRuleEntityDIModule {
         return ValidationRuleStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<ValidationRule> {
-        return CollectionCleanerImpl(ValidationRuleTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<ValidationRule>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
index 1ebba42150..090c0bac05 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
@@ -28,15 +28,14 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.validation.ValidationRule
+import javax.inject.Inject
 
 @Reusable
 internal class ValidationRuleHandler @Inject constructor(
     store: ValidationRuleStore,
-    private val collectionCleaner: CollectionCleaner<ValidationRule>
+    private val collectionCleaner: ValidationRuleCollectionCleaner
 ) : IdentifiableHandlerImpl<ValidationRule>(store) {
     override fun afterCollectionHandled(oCollection: Collection<ValidationRule>?) {
         collectionCleaner.deleteNotPresent(oCollection)

From d185b37ad40fd078827ad8b9132a6a3df24e93d4 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 6 Jul 2023 10:46:41 +0200
Subject: [PATCH 069/478] [ANDROSDK-1701] Move VisualizationCollectionCleaner
 to a kotlin class

---
 .../VisualizationCollectionCleaner.kt         | 43 +++++++++++++++++++
 .../internal/VisualizationEntityDIModule.kt   |  9 ----
 .../internal/VisualizationHandler.kt          |  5 +--
 .../internal/VisualizationHandlerShould.kt    |  3 +-
 4 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
new file mode 100644
index 0000000000..88b6a1eabd
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.visualization.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.visualization.Visualization
+import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
+import javax.inject.Inject
+
+@Reusable
+internal class VisualizationCollectionCleaner @Inject constructor(
+    databaseAdapter: DatabaseAdapter
+) : CollectionCleanerImpl<Visualization>(
+    tableName = VisualizationTableInfo.TABLE_INFO.name(),
+    databaseAdapter = databaseAdapter
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
index 961dea173a..1db7986d0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.visualization.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.visualization.Visualization
-import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
 
 @Module
 internal class VisualizationEntityDIModule {
@@ -46,12 +43,6 @@ internal class VisualizationEntityDIModule {
         return VisualizationStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun collectionCleaner(databaseAdapter: DatabaseAdapter): CollectionCleaner<Visualization> {
-        return CollectionCleanerImpl(VisualizationTableInfo.TABLE_INFO.name(), databaseAdapter)
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Visualization>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
index ce0b125830..95123f50c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
@@ -28,19 +28,18 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.visualization.LayoutPosition
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationHandler @Inject constructor(
     store: VisualizationStore,
-    private val visualizationCollectionCleaner: CollectionCleaner<Visualization>,
+    private val visualizationCollectionCleaner: VisualizationCollectionCleaner,
     private val itemHandler: VisualizationDimensionItemHandler
 ) : IdentifiableHandlerImpl<Visualization>(store) {
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
index 6c574d0f1a..3b1d14276c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
@@ -41,7 +40,7 @@ import org.junit.runners.JUnit4
 class VisualizationHandlerShould {
 
     private val visualizationStore: VisualizationStore = mock()
-    private val visualizationCollectionCleaner: CollectionCleaner<Visualization> = mock()
+    private val visualizationCollectionCleaner: VisualizationCollectionCleaner = mock()
     private val visualizationDimensionItemHandler: VisualizationDimensionItemHandler = mock()
     private val visualizationDimension: VisualizationDimension = mock()
     private val visualization: Visualization = mock()

From d8d865e81b4785233bef92b83089dc032f49db61 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 7 Jul 2023 10:05:23 +0200
Subject: [PATCH 070/478] [ANDROSDK-1701] Refactor RelationshipOrphanCleaner

---
 .../internal/RelationshipOrphanCleaner.kt     | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
index 86ece9b77b..adc51fce6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
@@ -63,19 +63,11 @@ internal abstract class RelationshipOrphanCleaner<O : ObjectWithUidInterface, R
         target: Relationship,
         list: Collection<Relationship>
     ): Boolean {
-        for (relationship in list) {
-            if (target.from() == null || target.to() == null || relationship.from() == null || target.to() == null) {
-                continue
-            }
-            if (RelationshipHelper.areItemsEqual(target.from(), relationship.from()) &&
-                RelationshipHelper.areItemsEqual(
-                    target.to(),
-                    relationship.to()
-                ) && target.relationshipType() == relationship.relationshipType()
-            ) {
-                return true
-            }
+        return list.any { relationship ->
+            target.from() != null && target.to() != null && relationship.from() != null && relationship.to() != null &&
+                RelationshipHelper.areItemsEqual(target.from(), relationship.from()) &&
+                RelationshipHelper.areItemsEqual(target.to(), relationship.to()) &&
+                target.relationshipType() == relationship.relationshipType()
         }
-        return false
     }
-}
\ No newline at end of file
+}

From 5d8ef3ceb1b8a880be30c1fbbb853ad55995415d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 7 Jul 2023 10:07:14 +0200
Subject: [PATCH 071/478] [ANDROSDK-1701] PMD, detekt, lint

---
 .../internal/OrganisationUnitCallMockIntegrationShould.kt     | 2 +-
 .../core/category/internal/CategoryComboEntityDIModule.kt     | 4 ----
 .../android/core/category/internal/CategoryComboHandler.kt    | 1 -
 .../category/internal/CategoryOptionComboOrphanCleaner.kt     | 2 +-
 .../core/constant/internal/ConstantCollectionCleaner.kt       | 2 +-
 .../android/core/dataset/internal/DataSetCollectionCleaner.kt | 2 +-
 .../dataset/internal/DataSetOrganisationUnitLinkCleaner.kt    | 2 +-
 .../android/core/dataset/internal/SectionOrphanCleaner.kt     | 4 ++--
 .../android/core/enrollment/internal/EventOrphanCleaner.kt    | 4 ++--
 .../org/hisp/dhis/android/core/event/internal/EventHandler.kt | 2 +-
 .../core/legendset/internal/LegendSetLegendOrphanCleaner.kt   | 2 +-
 .../core/option/internal/OptionGroupCollectionCleaner.kt      | 2 +-
 .../android/core/option/internal/OptionGroupEntityDIModule.kt | 3 ---
 .../core/option/internal/OptionSubCollectionCleaner.kt        | 2 +-
 .../core/organisationunit/internal/OrganisationUnitCall.kt    | 4 ++--
 .../internal/OrganisationUnitCollectionCleaner.kt             | 2 +-
 .../internal/OrganisationUnitModuleDownloader.kt              | 2 +-
 .../android/core/program/internal/ProgramCollectionCleaner.kt | 2 +-
 .../hisp/dhis/android/core/program/internal/ProgramHandler.kt | 2 +-
 .../program/internal/ProgramOrganisationUnitLinkCleaner.kt    | 2 +-
 .../android/core/program/internal/ProgramOrphanCleaner.kt     | 2 +-
 .../core/program/internal/ProgramRuleActionOrphanCleaner.kt   | 2 +-
 .../dhis/android/core/program/internal/ProgramRuleHandler.kt  | 2 +-
 .../core/program/internal/ProgramRuleSubCollectionCleaner.kt  | 2 +-
 .../core/program/internal/ProgramRuleVariableOrphanCleaner.kt | 2 +-
 .../core/program/internal/ProgramSectionOrphanCleaner.kt      | 2 +-
 .../program/internal/ProgramStageDataElementOrphanCleaner.kt  | 2 +-
 .../dhis/android/core/program/internal/ProgramStageHandler.kt | 2 +-
 .../core/program/internal/ProgramStageSectionOrphanCleaner.kt | 2 +-
 .../core/program/internal/ProgramStageSubCollectionCleaner.kt | 2 +-
 .../internal/ProgramTrackedEntityAttributeOrphanCleaner.kt    | 2 +-
 .../internal/EnrollmentRelationshipOrphanCleaner.kt           | 4 ++--
 .../relationship/internal/EventRelationshipOrphanCleaner.kt   | 2 +-
 .../relationship/internal/TEIRelationshipOrphanCleaner.kt     | 4 ++--
 .../internal/TrackedEntityEnrollmentOrphanCleaner.kt          | 2 +-
 .../trackedentity/internal/TrackedEntityInstanceHandler.kt    | 2 +-
 .../internal/TrackedEntityTypeCollectionCleaner.kt            | 2 +-
 .../core/trackedentity/internal/TrackedEntityTypeHandler.kt   | 2 +-
 .../org/hisp/dhis/android/core/user/internal/UserHandler.kt   | 2 +-
 .../android/core/user/internal/UserRoleCollectionCleaner.kt   | 2 +-
 .../validation/internal/ValidationRuleCollectionCleaner.kt    | 2 +-
 .../android/core/validation/internal/ValidationRuleHandler.kt | 2 +-
 .../visualization/internal/VisualizationCollectionCleaner.kt  | 2 +-
 .../core/visualization/internal/VisualizationHandler.kt       | 2 +-
 .../internal/OrganisationUnitCallUnitShould.kt                | 4 ++--
 45 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
index bad8b916ec..60b5dafed7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import android.content.ContentValues
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Completable
+import java.io.IOException
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
@@ -50,7 +51,6 @@ import org.junit.AfterClass
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.IOException
 
 @RunWith(D2JunitRunner::class)
 class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
index 487f536d8f..a2887d7477 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
@@ -30,13 +30,9 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.category.CategoryCombo
-import org.hisp.dhis.android.core.category.CategoryOptionCombo
-import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 
 @Module
 internal class CategoryComboEntityDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
index 092589b2be..c9e840e832 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.category.internal
 
-import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleaner
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.Category
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
index 16c55bcf5b..54f9f0d7b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class CategoryOptionComboOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
index a658cf989d..012cbba365 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ConstantCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
index 9aa7e99752..e91fd4b79a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class DataSetCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
index b808fdecc5..08df21c1f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class DataSetOrganisationUnitLinkCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
index b282425d87..067fd6a0bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class SectionOrphanCleaner @Inject constructor(
@@ -42,4 +42,4 @@ internal class SectionOrphanCleaner @Inject constructor(
     tableName = SectionTableInfo.TABLE_INFO.name(),
     parentColumn = SectionTableInfo.Columns.DATA_SET,
     databaseAdapter = databaseAdapter
-)
\ No newline at end of file
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
index 34140bf880..fd9f5fd0bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class EventOrphanCleaner @Inject constructor(
@@ -44,4 +44,4 @@ internal class EventOrphanCleaner @Inject constructor(
     parentColumn = EventTableInfo.Columns.ENROLLMENT,
     stateColumn = DataColumns.SYNC_STATE,
     databaseAdapter = databaseAdapter
-)
\ No newline at end of file
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
index f619a7cab6..ac9104bfcc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.event.internal
 
 import android.util.Log
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -47,7 +48,6 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
-import javax.inject.Inject
 
 @Reusable
 internal class EventHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
index f3247983a6..9b7c7bc9d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.legendset.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendSet
 import org.hisp.dhis.android.core.legendset.LegendTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class LegendSetLegendOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
index 065a5d2ad5..0a548f6952 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionGroupTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class OptionGroupCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
index 3ef2b07183..6a1dfbd863 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
@@ -30,12 +30,9 @@ package org.hisp.dhis.android.core.option.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleaner
-import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.option.OptionGroup
-import org.hisp.dhis.android.core.option.OptionGroupTableInfo
 
 @Module
 internal class OptionGroupEntityDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
index b488f34930..12a0521270 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class OptionSubCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index c238ce3d3f..a89fe00214 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -31,6 +31,8 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Single
+import java.util.concurrent.atomic.AtomicInteger
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTree
@@ -38,8 +40,6 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import java.util.concurrent.atomic.AtomicInteger
-import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitCall @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
index fd4f19bc39..a51645b1f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.organisationunit.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index 025f1cd681..2211a2dafa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -30,12 +30,12 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserCall
-import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitModuleDownloader @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
index 813b590ad6..3ef3e7c0df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index 5fa285e9c6..0598de54a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -38,7 +39,6 @@ import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHa
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramType
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
index 51291a7de2..58c0dc725c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.program.Program
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramOrganisationUnitLinkCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
index fc9ca265a7..2d8abe36e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
index 487d960146..21814137c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleActionOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
index 419e75cd91..d36fd0f798 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
index 5aac16740d..79059c0cd7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleSubCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
index 4c2ec57f4b..9078f3ebba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramRuleVariable
 import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleVariableOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
index d842a130d1..3e0b080f08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramSectionOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
index 425d835499..8cebb90853 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageDataElementOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index cd8b6a8302..da4a7f4dc7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -39,7 +40,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramStageSection
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
index ae0dda73ed..3b09ddd004 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageSectionOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
index 9b640600a8..cff77ef2ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageSubCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
index acf3b0a723..c7182e02e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityAttributeOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
index 1bf4e61b6e..95e945b338 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
-import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentRelationshipOrphanCleaner @Inject constructor(
@@ -47,4 +47,4 @@ internal class EnrollmentRelationshipOrphanCleaner @Inject constructor(
     override fun relationships(relationships: Collection<Relationship>): Collection<Relationship> {
         return relationships
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
index 72c51b01cc..f38870d1c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
-import javax.inject.Inject
 
 @Reusable
 internal class EventRelationshipOrphanCleaner @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
index 23a54b14a0..a085759135 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import javax.inject.Inject
 
 @Reusable
 internal class TEIRelationshipOrphanCleaner @Inject internal constructor(
@@ -47,4 +47,4 @@ internal class TEIRelationshipOrphanCleaner @Inject internal constructor(
     override fun relationships(relationships: Collection<Relationship>): Collection<Relationship> {
         return relationships
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
index 2ee33575cf..0c4a613ef2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -35,7 +36,6 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
-import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
index f155ebae4f..dd487ea709 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import android.util.Log
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -43,7 +44,6 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerHandler
-import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
index e3ca929d89..3a09a4399d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityTypeCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
index 0626c930a1..6512971c68 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
-import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityTypeHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
index dd3292c33b..38d7f965c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
-import javax.inject.Inject
 
 @Reusable
 internal class UserHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
index 52e7b4d832..724d38a54c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.user.UserRole
 import org.hisp.dhis.android.core.user.UserRoleTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class UserRoleCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
index 7bea853cd5..6914762d7e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.validation.ValidationRule
 import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class ValidationRuleCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
index 090c0bac05..3295380f12 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.validation.ValidationRule
-import javax.inject.Inject
 
 @Reusable
 internal class ValidationRuleHandler @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
index 88b6a1eabd..1d9f9b1d76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
-import javax.inject.Inject
 
 @Reusable
 internal class VisualizationCollectionCleaner @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
index 95123f50c3..2fde746733 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.visualization.LayoutPosition
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
-import javax.inject.Inject
 
 @Reusable
 internal class VisualizationHandler @Inject constructor(
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
index 4881280b12..ac4f6af274 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
@@ -31,6 +31,8 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
 import io.reactivex.Single
+import java.io.IOException
+import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -42,8 +44,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import java.io.IOException
-import java.util.*
 
 @RunWith(JUnit4::class)
 class OrganisationUnitCallUnitShould {

From b18e1a36be2bed878cf19d5010dd5ba719da2f87 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 10 Jul 2023 11:22:30 +1000
Subject: [PATCH 072/478] [ANDROSDK-1716] Refactor base classes

---
 ...ldrenAppender.java => ChildrenAppender.kt} | 14 ++-
 .../internal/ChildrenAppenderExecutor.java    | 88 -------------------
 .../internal/ChildrenAppenderExecutor.kt      | 71 +++++++++++++++
 ...renSelection.java => ChildrenSelection.kt} | 29 +++---
 ...OnlyWithTransformerObjectRepositoryImpl.kt | 12 +--
 ...RelationshipConstraintChildrenAppender.kt} | 56 +++++-------
 .../AnalyticsTeiDataChildrenAppender.kt       |  4 +-
 7 files changed, 116 insertions(+), 158 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/{ChildrenAppender.java => ChildrenAppender.kt} (87%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/{ChildrenSelection.java => ChildrenSelection.kt} (74%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipConstraintChildrenAppender.java => RelationshipConstraintChildrenAppender.kt} (56%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
similarity index 87%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
index b75e559183..d45098fe7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
@@ -25,18 +25,14 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.children.internal;
+package org.hisp.dhis.android.core.arch.repositories.children.internal
 
-import java.util.Collection;
-
-public abstract class ChildrenAppender<M> {
-
-    @SuppressWarnings("PMD.EmptyMethodInAbstractClassShouldBeAbstract")
-    protected void prepareChildren(Collection<M> collection) {
+abstract class ChildrenAppender<M> {
+    open fun prepareChildren(collection: Collection<M>) {
         /* Method is not abstract since empty action is the default action and we don't want it to
          * be unnecessarily written in every child.
          */
     }
 
-    public abstract M appendChildren(M m);
-}
\ No newline at end of file
+    abstract fun appendChildren(m: M): M
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java
deleted file mode 100644
index 87d5b02338..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.repositories.children.internal;
-
-import org.hisp.dhis.android.core.common.CoreObject;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public final class ChildrenAppenderExecutor {
-
-    private ChildrenAppenderExecutor() {
-    }
-
-    public static <M> M appendInObject(
-            M m, Map<String, ChildrenAppender<M>> childrenAppenders, ChildrenSelection childrenSelection) {
-
-        if (m == null) {
-            return null;
-        } else {
-            M mWithChildren = m;
-            for (ChildrenAppender<M> appender : getSelectedChildrenAppenders(childrenAppenders, childrenSelection)) {
-                appender.prepareChildren(Collections.singleton(mWithChildren));
-                mWithChildren = appender.appendChildren(mWithChildren);
-            }
-            return mWithChildren;
-        }
-    }
-
-    public static <M extends CoreObject> List<M> appendInObjectCollection(
-            List<M> list, Map<String, ChildrenAppender<M>> childrenAppenders, ChildrenSelection childrenSelection) {
-
-
-        Collection<ChildrenAppender<M>> selectedAppenders
-                = getSelectedChildrenAppenders(childrenAppenders, childrenSelection);
-
-        for (ChildrenAppender<M> appender : selectedAppenders) {
-            appender.prepareChildren(list);
-        }
-
-        List<M> setWithChildren = new ArrayList<>(list.size());
-        for (M m : list) {
-            M mWithChildren = m;
-            for (ChildrenAppender<M> appender : selectedAppenders) {
-                mWithChildren = appender.appendChildren(mWithChildren);
-            }
-            setWithChildren.add(mWithChildren);
-        }
-        return setWithChildren;
-    }
-
-    private static <M> Collection<ChildrenAppender<M>> getSelectedChildrenAppenders(
-            Map<String, ChildrenAppender<M>> appendersMap, ChildrenSelection childrenSelection) {
-        List<ChildrenAppender<M>> appendersList = new ArrayList<>(appendersMap.size());
-        for (String key : childrenSelection.children) {
-            appendersList.add(appendersMap.get(key));
-        }
-        return appendersList;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
new file mode 100644
index 0000000000..86a5639bfa
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.children.internal
+
+import org.hisp.dhis.android.core.common.CoreObject
+
+internal object ChildrenAppenderExecutor {
+    @JvmStatic
+    fun <M> appendInObject(
+        m: M?,
+        childrenAppenders: Map<String, ChildrenAppender<M>>,
+        childrenSelection: ChildrenSelection
+    ): M? {
+        return m?.let {
+            val selectedAppenders = getSelectedChildrenAppenders(childrenAppenders, childrenSelection)
+            selectedAppenders.fold(m) { nWithChildren: M, appender ->
+                appender.prepareChildren(setOf(nWithChildren))
+                appender.appendChildren(nWithChildren)
+            }
+        }
+    }
+
+    @JvmStatic
+    fun <M : CoreObject?> appendInObjectCollection(
+        list: List<M>,
+        childrenAppenders: Map<String, ChildrenAppender<M>>,
+        childrenSelection: ChildrenSelection
+    ): List<M> {
+        val selectedAppenders = getSelectedChildrenAppenders(childrenAppenders, childrenSelection)
+
+        selectedAppenders.forEach { it.prepareChildren(list) }
+
+        return list.map { item ->
+            selectedAppenders.fold(item) { itemWithChildren: M, appender ->
+                appender.appendChildren(itemWithChildren)
+            }
+        }
+    }
+
+    private fun <M> getSelectedChildrenAppenders(
+        appendersMap: Map<String, ChildrenAppender<M>>,
+        childrenSelection: ChildrenSelection
+    ): Collection<ChildrenAppender<M>> {
+        return childrenSelection.children.mapNotNull { key -> appendersMap[key] }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt
similarity index 74%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt
index f16e3888a1..3b31c91c2a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt
@@ -25,27 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.children.internal;
+package org.hisp.dhis.android.core.arch.repositories.children.internal
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+class ChildrenSelection(val children: Set<String>) {
 
-public final class ChildrenSelection {
-
-    public final Set<String> children;
-
-    public ChildrenSelection(Set<String> children) {
-        this.children = Collections.unmodifiableSet(children);
-    }
-
-    public ChildrenSelection withChild(String child) {
-        Set<String> newSet = new HashSet<>(children);
-        newSet.add(child);
-        return new ChildrenSelection(newSet);
+    fun withChild(child: String): ChildrenSelection {
+        return ChildrenSelection(children + child)
     }
 
-    public static ChildrenSelection empty() {
-        return new ChildrenSelection(Collections.emptySet());
+    companion object {
+        @JvmStatic
+        fun empty(): ChildrenSelection {
+            return ChildrenSelection(emptySet())
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
index 7b129b1596..74e8eb566d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
@@ -54,7 +54,7 @@ internal constructor(
      * Returns the object in an asynchronous way, returning a `Single<M>`.
      * @return A `Single` object with the object
      */
-    override fun get(): Single<T> {
+    override fun get(): Single<T?> {
         return Single.fromCallable { blockingGet() }
     }
 
@@ -63,12 +63,12 @@ internal constructor(
      * executed in the main thread. Consider the asynchronous version [.get].
      * @return the object
      */
-    override fun blockingGet(): T {
-        return transformer.transform(
-            ChildrenAppenderExecutor.appendInObject(
-                blockingGetWithoutChildren(), childrenAppenders, scope.children()
-            )
+    override fun blockingGet(): T? {
+        val item = ChildrenAppenderExecutor.appendInObject(
+            blockingGetWithoutChildren(), childrenAppenders, scope.children()
         )
+
+        return item?.let { transformer.transform(it) }
     }
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
index 4db9cdc984..cd2cf5d28b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
@@ -25,43 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraint;
-import org.hisp.dhis.android.core.relationship.RelationshipConstraintType;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-
-import java.util.Collection;
-import java.util.List;
-
-final class RelationshipConstraintChildrenAppender extends ChildrenAppender<RelationshipType> {
-
-    private final RelationshipConstraintStore constraintStore;
-    private List<RelationshipConstraint> constraints;
-
-
-    RelationshipConstraintChildrenAppender(RelationshipConstraintStore constraintStore) {
-        this.constraintStore = constraintStore;
-    }
-
-    @Override
-    public void prepareChildren(Collection<RelationshipType> collection) {
-        this.constraints = this.constraintStore.selectAll();
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.relationship.RelationshipConstraint
+import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
+import org.hisp.dhis.android.core.relationship.RelationshipType
+
+internal class RelationshipConstraintChildrenAppender(private val constraintStore: RelationshipConstraintStore) :
+    ChildrenAppender<RelationshipType>() {
+    private var constraints: List<RelationshipConstraint>? = null
+    override fun prepareChildren(collection: Collection<RelationshipType>) {
+        constraints = constraintStore.selectAll()
     }
 
-    @Override
-    public RelationshipType appendChildren(RelationshipType relationshipType) {
-        RelationshipType.Builder builder = relationshipType.toBuilder();
-        for (RelationshipConstraint constraint : this.constraints) {
-            if (constraint.relationshipType().uid().equals(relationshipType.uid())) {
-                if (constraint.constraintType().equals(RelationshipConstraintType.FROM)) {
-                    builder.fromConstraint(constraint);
-                } else if (constraint.constraintType().equals(RelationshipConstraintType.TO)) {
-                    builder.toConstraint(constraint);
+    override fun appendChildren(m: RelationshipType): RelationshipType {
+        val builder = m.toBuilder()
+        for (constraint in constraints!!) {
+            if (constraint.relationshipType()!!.uid() == m.uid()) {
+                if (constraint.constraintType() == RelationshipConstraintType.FROM) {
+                    builder.fromConstraint(constraint)
+                } else if (constraint.constraintType() == RelationshipConstraintType.TO) {
+                    builder.toConstraint(constraint)
                 }
             }
         }
-        return builder.build();
+        return builder.build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
index a9e10c551d..fb6c47cd65 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
@@ -61,9 +61,9 @@ internal class AnalyticsTeiDataChildrenAppender @Inject constructor(
         whoNutritionData = analyticsTeiWHONutritionDataStore.selectAll()
     }
 
-    override fun appendChildren(analyticsTeiSetting: AnalyticsTeiSetting): AnalyticsTeiSetting {
+    override fun appendChildren(m: AnalyticsTeiSetting): AnalyticsTeiSetting {
         return buildAnalyticsTeiSetting(
-            analyticsTeiSetting,
+            m,
             dataElements!!,
             indicators!!,
             attributes!!,

From 14a4b6493f67f181af2daecd64dd5a9745b3a0f7 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 10 Jul 2023 12:06:26 +1000
Subject: [PATCH 073/478] [ANDROSDK-1716] Refactor childrenAppenders to Kotlin

---
 .../children/internal/ChildrenAppender.kt     |  2 +-
 .../children/internal/ChildrenSelection.kt    |  2 +-
 .../internal/DataElementEntityDIModule.kt     |  2 +-
 ...> DataElementLegendSetChildrenAppender.kt} | 53 +++++++-------
 .../DataInputPeriodChildrenAppender.kt}       | 53 +++++++-------
 ...soryDataElementOperandChildrenAppender.kt} | 69 +++++++++---------
 ...java => DataSetElementChildrenAppender.kt} | 64 ++++++++---------
 ... => SectionDataElementChildrenAppender.kt} | 69 +++++++++---------
 ...=> SectionGreyedFieldsChildrenAppender.kt} | 69 +++++++++---------
 ...FilterEventDataFilterChildrenAppender.java | 65 -----------------
 ...ntFilterEventDataFilterChildrenAppender.kt | 61 ++++++++++++++++
 ...va => DataSetIndicatorChildrenAppender.kt} | 70 +++++++++---------
 .../internal/LegendChildrenAppender.kt}       | 53 +++++++-------
 .../NoteForEnrollmentChildrenAppender.kt}     | 54 +++++++-------
 ...r.java => NoteForEventChildrenAppender.kt} | 53 +++++++-------
 ...a => OptionGroupOptionChildrenAppender.kt} | 63 ++++++++--------
 ...rganisationUnitDataSetChildrenAppender.kt} | 64 ++++++++---------
 .../OrganisationUnitEntityDIModule.kt         |  2 +-
 ...sationUnitGroupProgramChildrenAppender.kt} | 71 +++++++++----------
 ...rganisationUnitProgramChildrenAppender.kt} | 65 ++++++++---------
 ...mentValueTypeRenderingChildrenAppender.kt} | 34 ++++-----
 ...gramIndicatorLegendSetChildrenAppender.kt} | 53 +++++++-------
 .../ProgramRuleActionChildrenAppender.java    | 60 ----------------
 .../ProgramRuleActionChildrenAppender.kt      | 57 +++++++++++++++
 ...rogramSectionAttributeChildrenAppender.kt} | 70 +++++++++---------
 ...ogramStageDataElementChildrenAppender.java | 67 -----------------
 ...tageSectionDataElementChildrenAppender.kt} | 70 +++++++++---------
 ...ectionProgramIndicatorChildrenAppender.kt} | 70 +++++++++---------
 ...buteValueTypeRenderingChildrenAppender.kt} | 36 ++++------
 ...ogramTrackedEntityTypeChildrenAppender.kt} | 40 ++++-------
 ... => ValueTypeRenderingChildrenAppender.kt} | 64 ++++++++---------
 ...edEntityAttributeValueChildrenAppender.kt} | 55 +++++++-------
 ...TrackedEntityDataValueChildrenAppender.kt} | 54 +++++++-------
 ...kedEntityTypeAttributeChildrenAppender.kt} | 55 +++++++-------
 34 files changed, 799 insertions(+), 990 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementLegendSetChildrenAppender.java => DataElementLegendSetChildrenAppender.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/{legendset/internal/LegendChildrenAppender.java => dataset/internal/DataInputPeriodChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetCompulsoryDataElementOperandChildrenAppender.java => DataSetCompulsoryDataElementOperandChildrenAppender.kt} (64%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetElementChildrenAppender.java => DataSetElementChildrenAppender.kt} (61%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{SectionDataElementChildrenAppender.java => SectionDataElementChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{SectionGreyedFieldsChildrenAppender.java => SectionGreyedFieldsChildrenAppender.kt} (64%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{DataSetIndicatorChildrenAppender.java => DataSetIndicatorChildrenAppender.kt} (58%)
 rename core/src/main/java/org/hisp/dhis/android/core/{note/internal/NoteForEnrollmentChildrenAppender.java => legendset/internal/LegendChildrenAppender.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/{dataset/internal/DataInputPeriodChildrenAppender.java => note/internal/NoteForEnrollmentChildrenAppender.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/note/internal/{NoteForEventChildrenAppender.java => NoteForEventChildrenAppender.kt} (64%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionGroupOptionChildrenAppender.java => OptionGroupOptionChildrenAppender.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitDataSetChildrenAppender.java => OrganisationUnitDataSetChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java => OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitProgramChildrenAppender.java => OrganisationUnitProgramChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{DataElementValueTypeRenderingChildrenAppender.java => DataElementValueTypeRenderingChildrenAppender.kt} (68%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramIndicatorLegendSetChildrenAppender.java => ProgramIndicatorLegendSetChildrenAppender.kt} (61%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramSectionAttributeChildrenAppender.java => ProgramSectionAttributeChildrenAppender.kt} (62%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementChildrenAppender.java
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageSectionDataElementChildrenAppender.java => ProgramStageSectionDataElementChildrenAppender.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageSectionProgramIndicatorChildrenAppender.java => ProgramStageSectionProgramIndicatorChildrenAppender.kt} (59%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java => ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramTrackedEntityTypeChildrenAppender.java => ProgramTrackedEntityTypeChildrenAppender.kt} (70%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ValueTypeRenderingChildrenAppender.java => ValueTypeRenderingChildrenAppender.kt} (56%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeValueChildrenAppender.java => TrackedEntityAttributeValueChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityDataValueChildrenAppender.java => TrackedEntityDataValueChildrenAppender.kt} (63%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeAttributeChildrenAppender.java => TrackedEntityTypeAttributeChildrenAppender.kt} (63%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
index d45098fe7b..0d11a36638 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.children.internal
 
-abstract class ChildrenAppender<M> {
+internal abstract class ChildrenAppender<M> {
     open fun prepareChildren(collection: Collection<M>) {
         /* Method is not abstract since empty action is the default action and we don't want it to
          * be unnecessarily written in every child.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt
index 3b31c91c2a..12056bb71b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenSelection.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.children.internal
 
-class ChildrenSelection(val children: Set<String>) {
+internal class ChildrenSelection(val children: Set<String>) {
 
     fun withChild(child: String): ChildrenSelection {
         return ChildrenSelection(children + child)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
index b915f3b69c..9e9925cdc3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
@@ -64,7 +64,7 @@ internal class DataElementEntityDIModule {
 
     @Provides
     @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter?): Map<String, ChildrenAppender<DataElement>> {
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataElement>> {
         return Collections.singletonMap(
             DataElementFields.LEGEND_SETS,
             DataElementLegendSetChildrenAppender.create(databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt
index 0d67922131..775e1ce22c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt
@@ -25,38 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataelement.internal;
+package org.hisp.dhis.android.core.dataelement.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
 
-final class DataElementLegendSetChildrenAppender extends ChildrenAppender<DataElement> {
-
-    private final ObjectWithUidChildStore<DataElement> linkChildStore;
-
-    private DataElementLegendSetChildrenAppender(
-            ObjectWithUidChildStore<DataElement> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public DataElement appendChildren(DataElement dataElement) {
-        DataElement.Builder builder = dataElement.toBuilder();
-        builder.legendSets(linkChildStore.getChildren(dataElement));
-        return builder.build();
+internal class DataElementLegendSetChildrenAppender private constructor(
+    private val linkChildStore: ObjectWithUidChildStore<DataElement>
+) : ChildrenAppender<DataElement>() {
+    override fun appendChildren(m: DataElement): DataElement {
+        return m.toBuilder()
+            .legendSets(linkChildStore.getChildren(m))
+            .build()
     }
 
-    static ChildrenAppender<DataElement> create(DatabaseAdapter databaseAdapter) {
-        return new DataElementLegendSetChildrenAppender(
-                StoreFactory.objectWithUidChildStore(
-                        databaseAdapter,
-                        DataElementLegendSetLinkTableInfo.TABLE_INFO,
-                        DataElementLegendSetLinkTableInfo.CHILD_PROJECTION
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataElement> {
+            return DataElementLegendSetChildrenAppender(
+                objectWithUidChildStore(
+                    databaseAdapter,
+                    DataElementLegendSetLinkTableInfo.TABLE_INFO,
+                    DataElementLegendSetLinkTableInfo.CHILD_PROJECTION
                 )
-        );
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt
index e47abf0951..7fa021cd97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt
@@ -25,36 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.legendset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.legendset.Legend;
-import org.hisp.dhis.android.core.legendset.LegendSet;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataset.DataInputPeriod
+import org.hisp.dhis.android.core.dataset.DataSet
 
-final class LegendChildrenAppender extends ChildrenAppender<LegendSet> {
-
-    private final SingleParentChildStore<LegendSet, Legend> childStore;
-
-    private LegendChildrenAppender(SingleParentChildStore<LegendSet, Legend> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public LegendSet appendChildren(LegendSet legendSet) {
-        LegendSet.Builder builder = legendSet.toBuilder();
-        builder.legends(childStore.getChildren(legendSet));
-        return builder.build();
+internal class DataInputPeriodChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<DataSet, DataInputPeriod>
+) : ChildrenAppender<DataSet>() {
+    override fun appendChildren(m: DataSet): DataSet {
+        val builder = m.toBuilder()
+        builder.dataInputPeriods(childStore.getChildren(m))
+        return builder.build()
     }
 
-    static ChildrenAppender<LegendSet> create(DatabaseAdapter databaseAdapter) {
-        return new LegendChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        LegendStoreImpl.Companion.getCHILD_PROJECTION(),
-                        Legend::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
+            return DataInputPeriodChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    DataInputPeriodStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor? -> DataInputPeriod.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt
index 60798b70af..ab7425f4a6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt
@@ -25,46 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
-import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo
 
-final class DataSetCompulsoryDataElementOperandChildrenAppender extends ChildrenAppender<DataSet> {
+internal class DataSetCompulsoryDataElementOperandChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<DataSet, DataElementOperand>
+) : ChildrenAppender<DataSet>() {
+    override fun appendChildren(m: DataSet): DataSet {
+        val builder = m.toBuilder()
+        builder.compulsoryDataElementOperands(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementOperandTableInfo.TABLE_INFO,
             DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_SET,
-            DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_ELEMENT_OPERAND);
-
-    private final LinkChildStore<DataSet, DataElementOperand> linkChildStore;
-
-    private DataSetCompulsoryDataElementOperandChildrenAppender(
-            LinkChildStore<DataSet, DataElementOperand> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public DataSet appendChildren(DataSet dataSet) {
-        DataSet.Builder builder = dataSet.toBuilder();
-        builder.compulsoryDataElementOperands(linkChildStore.getChildren(dataSet));
-        return builder.build();
-    }
+            DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_ELEMENT_OPERAND
+        )
 
-    static ChildrenAppender<DataSet> create(DatabaseAdapter databaseAdapter) {
-        return new DataSetCompulsoryDataElementOperandChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        DataElementOperand::create)
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
+            return DataSetCompulsoryDataElementOperandChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> DataElementOperand.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt
index 5fe9d72bbe..80a6b5c908 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt
@@ -25,42 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetElement;
-import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetElement
+import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
 
-final class DataSetElementChildrenAppender extends ChildrenAppender<DataSet> {
-
-    private static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            DataSetElementLinkTableInfo.TABLE_INFO,
-            DataSetElementLinkTableInfo.Columns.DATA_SET);
-
-    private final SingleParentChildStore<DataSet, DataSetElement> childStore;
-
-    private DataSetElementChildrenAppender(SingleParentChildStore<DataSet, DataSetElement> childStore) {
-        this.childStore = childStore;
+internal class DataSetElementChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<DataSet, DataSetElement>
+) : ChildrenAppender<DataSet>() {
+    override fun appendChildren(m: DataSet): DataSet {
+        val builder = m.toBuilder()
+        builder.dataSetElements(childStore.getChildren(m))
+        return builder.build()
     }
 
-    @Override
-    public DataSet appendChildren(DataSet dataSet) {
-        DataSet.Builder builder = dataSet.toBuilder();
-        builder.dataSetElements(childStore.getChildren(dataSet));
-        return builder.build();
-    }
+    companion object {
+        private val CHILD_PROJECTION = SingleParentChildProjection(
+            DataSetElementLinkTableInfo.TABLE_INFO,
+            DataSetElementLinkTableInfo.Columns.DATA_SET
+        )
 
-    static ChildrenAppender<DataSet> create(DatabaseAdapter databaseAdapter) {
-        return new DataSetElementChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        CHILD_PROJECTION,
-                        DataSetElement::create)
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
+            return DataSetElementChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> DataSetElement.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt
index d743999826..7acae63564 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt
@@ -25,46 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.dataelement.DataElementTableInfo;
-import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
+import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo
 
-final class SectionDataElementChildrenAppender extends ChildrenAppender<Section> {
+internal class SectionDataElementChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<Section, DataElement>
+) : ChildrenAppender<Section>() {
+    override fun appendChildren(m: Section): Section {
+        val builder = m.toBuilder()
+        builder.dataElements(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementTableInfo.TABLE_INFO,
             SectionDataElementLinkTableInfo.Columns.SECTION,
-            SectionDataElementLinkTableInfo.Columns.DATA_ELEMENT);
-
-    private final LinkChildStore<Section, DataElement> linkChildStore;
-
-    private SectionDataElementChildrenAppender(LinkChildStore<Section, DataElement> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public Section appendChildren(Section section) {
-        Section.Builder builder = section.toBuilder();
-        builder.dataElements(linkChildStore.getChildren(section));
-        return builder.build();
-    }
+            SectionDataElementLinkTableInfo.Columns.DATA_ELEMENT
+        )
 
-    static ChildrenAppender<Section> create(DatabaseAdapter databaseAdapter) {
-        return new SectionDataElementChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        SectionDataElementLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        DataElement::create
-                )
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Section> {
+            return SectionDataElementChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    SectionDataElementLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> DataElement.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt
index 9a7ff746c4..98add1cbfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt
@@ -25,46 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataelement.DataElementOperand;
-import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo;
-import org.hisp.dhis.android.core.dataset.Section;
-import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo
+import org.hisp.dhis.android.core.dataset.Section
+import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
 
-final class SectionGreyedFieldsChildrenAppender extends ChildrenAppender<Section> {
+internal class SectionGreyedFieldsChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<Section, DataElementOperand>
+) : ChildrenAppender<Section>() {
+    override fun appendChildren(m: Section): Section {
+        val builder = m.toBuilder()
+        builder.greyedFields(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementOperandTableInfo.TABLE_INFO,
             SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
-            SectionGreyedFieldsLinkTableInfo.Columns.DATA_ELEMENT_OPERAND);
-
-    private final LinkChildStore<Section, DataElementOperand> linkChildStore;
-
-    private SectionGreyedFieldsChildrenAppender(LinkChildStore<Section, DataElementOperand> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public Section appendChildren(Section section) {
-        Section.Builder builder = section.toBuilder();
-        builder.greyedFields(linkChildStore.getChildren(section));
-        return builder.build();
-    }
+            SectionGreyedFieldsLinkTableInfo.Columns.DATA_ELEMENT_OPERAND
+        )
 
-    static ChildrenAppender<Section> create(DatabaseAdapter databaseAdapter) {
-        return new SectionGreyedFieldsChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        DataElementOperand::create
-                )
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Section> {
+            return SectionGreyedFieldsChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> DataElementOperand.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java
deleted file mode 100644
index e7ec839f84..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.event.EventDataFilter;
-import org.hisp.dhis.android.core.event.EventFilter;
-import org.hisp.dhis.android.core.event.EventQueryCriteria;
-
-public final class EventFilterEventDataFilterChildrenAppender extends ChildrenAppender<EventFilter> {
-
-    private final SingleParentChildStore<EventFilter, EventDataFilter> childStore;
-
-    private EventFilterEventDataFilterChildrenAppender(
-            SingleParentChildStore<EventFilter, EventDataFilter> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public EventFilter appendChildren(EventFilter eventFilter) {
-        if (eventFilter.eventQueryCriteria() != null) {
-            EventQueryCriteria.Builder criteriaBuilder = eventFilter.eventQueryCriteria().toBuilder();
-            criteriaBuilder.dataFilters(childStore.getChildren(eventFilter));
-            return eventFilter.toBuilder().eventQueryCriteria(criteriaBuilder.build()).build();
-        }
-        return EventFilter.builder().build();
-    }
-
-    public static ChildrenAppender<EventFilter> create(DatabaseAdapter databaseAdapter) {
-        return new EventFilterEventDataFilterChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        EventDataFilterStoreImpl.Companion.getCHILD_PROJECTION(),
-                        EventDataFilter::create)
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt
new file mode 100644
index 0000000000..7794285650
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.event.EventDataFilter
+import org.hisp.dhis.android.core.event.EventFilter
+
+internal class EventFilterEventDataFilterChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<EventFilter, EventDataFilter>
+) : ChildrenAppender<EventFilter>() {
+    override fun appendChildren(m: EventFilter): EventFilter {
+        return if (m.eventQueryCriteria() != null) {
+            val criteriaBuilder = m.eventQueryCriteria()!!.toBuilder()
+            criteriaBuilder.dataFilters(childStore.getChildren(m))
+            return m.toBuilder().eventQueryCriteria(criteriaBuilder.build()).build()
+        } else {
+            m
+        }
+    }
+
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<EventFilter> {
+            return EventFilterEventDataFilterChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    EventDataFilterStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor -> EventDataFilter.create(cursor) }
+            )
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt
index 9bad7abdb6..0eb7bd5afa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt
@@ -25,45 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator.internal;
+package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo;
-import org.hisp.dhis.android.core.indicator.Indicator;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
+import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.TABLE_INFO
 
-public final class DataSetIndicatorChildrenAppender extends ChildrenAppender<DataSet> {
-
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
-            IndicatorTableInfo.INSTANCE.getTABLE_INFO(),
-            DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
-            DataSetIndicatorLinkTableInfo.Columns.INDICATOR);
-    private final LinkChildStore<DataSet, Indicator> linkChildStore;
-
-    private DataSetIndicatorChildrenAppender(
-            LinkChildStore<DataSet, Indicator> linkChildStore) {
-        this.linkChildStore = linkChildStore;
+internal class DataSetIndicatorChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<DataSet, Indicator>
+) : ChildrenAppender<DataSet>() {
+    override fun appendChildren(m: DataSet): DataSet {
+        val builder = m.toBuilder()
+        builder.indicators(linkChildStore.getChildren(m))
+        return builder.build()
     }
 
-    @Override
-    public DataSet appendChildren(DataSet dataSet) {
-        DataSet.Builder builder = dataSet.toBuilder();
-        builder.indicators(linkChildStore.getChildren(dataSet));
-        return builder.build();
-    }
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
+            TABLE_INFO,
+            DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
+            DataSetIndicatorLinkTableInfo.Columns.INDICATOR
+        )
 
-    public static ChildrenAppender<DataSet> create(DatabaseAdapter databaseAdapter) {
-        return new DataSetIndicatorChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        DataSetIndicatorLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        Indicator::create)
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
+            return DataSetIndicatorChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    DataSetIndicatorLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> Indicator.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt
index 49f43b91cf..db10130b4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt
@@ -25,36 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.note.internal;
+package org.hisp.dhis.android.core.legendset.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.enrollment.Enrollment;
-import org.hisp.dhis.android.core.note.Note;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.legendset.Legend
+import org.hisp.dhis.android.core.legendset.LegendSet
 
-public final class NoteForEnrollmentChildrenAppender extends ChildrenAppender<Enrollment> {
-
-    private final SingleParentChildStore<Enrollment, Note> childStore;
-
-    private NoteForEnrollmentChildrenAppender(SingleParentChildStore<Enrollment, Note> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public Enrollment appendChildren(Enrollment enrollment) {
-        Enrollment.Builder builder = enrollment.toBuilder();
-        builder.notes(childStore.getChildren(enrollment));
-        return builder.build();
+internal class LegendChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<LegendSet, Legend>
+) : ChildrenAppender<LegendSet>() {
+    override fun appendChildren(m: LegendSet): LegendSet {
+        val builder = m.toBuilder()
+        builder.legends(childStore.getChildren(m))
+        return builder.build()
     }
 
-    public static ChildrenAppender<Enrollment> create(DatabaseAdapter databaseAdapter) {
-        return new NoteForEnrollmentChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        NoteStoreImpl.Companion.getENROLLMENT_CHILD_PROJECTION(),
-                        Note::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<LegendSet> {
+            return LegendChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    LegendStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor -> Legend.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt
index 933ef51b92..aeb1a978ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt
@@ -25,37 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.note.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataset.DataInputPeriod;
-import org.hisp.dhis.android.core.dataset.DataSet;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.note.Note
 
-final class DataInputPeriodChildrenAppender extends ChildrenAppender<DataSet> {
-
-
-    private final SingleParentChildStore<DataSet, DataInputPeriod> childStore;
-
-    private DataInputPeriodChildrenAppender(SingleParentChildStore<DataSet, DataInputPeriod> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public DataSet appendChildren(DataSet dataSet) {
-        DataSet.Builder builder = dataSet.toBuilder();
-        builder.dataInputPeriods(childStore.getChildren(dataSet));
-        return builder.build();
+internal class NoteForEnrollmentChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<Enrollment, Note>
+) : ChildrenAppender<Enrollment>() {
+    override fun appendChildren(m: Enrollment): Enrollment {
+        val builder = m.toBuilder()
+        builder.notes(childStore.getChildren(m))
+        return builder.build()
     }
 
-    static ChildrenAppender<DataSet> create(DatabaseAdapter databaseAdapter) {
-        return new DataInputPeriodChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        DataInputPeriodStoreImpl.Companion.getCHILD_PROJECTION(),
-                        DataInputPeriod::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Enrollment> {
+            return NoteForEnrollmentChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    NoteStoreImpl.ENROLLMENT_CHILD_PROJECTION
+                ) { cursor: Cursor -> Note.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt
index 6aeb9a2c10..baa29b9fa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt
@@ -25,36 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.note.internal;
+package org.hisp.dhis.android.core.note.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.note.Note;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.note.Note
 
-public final class NoteForEventChildrenAppender extends ChildrenAppender<Event> {
-
-    private final SingleParentChildStore<Event, Note> childStore;
-
-    private NoteForEventChildrenAppender(SingleParentChildStore<Event, Note> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public Event appendChildren(Event event) {
-        Event.Builder builder = event.toBuilder();
-        builder.notes(childStore.getChildren(event));
-        return builder.build();
+internal class NoteForEventChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<Event, Note>
+) : ChildrenAppender<Event>() {
+    override fun appendChildren(m: Event): Event {
+        val builder = m.toBuilder()
+        builder.notes(childStore.getChildren(m))
+        return builder.build()
     }
 
-    public static ChildrenAppender<Event> create(DatabaseAdapter databaseAdapter) {
-        return new NoteForEventChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        NoteStoreImpl.Companion.getEVENT_CHILD_PROJECTION(),
-                        Note::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Event> {
+            return NoteForEventChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    NoteStoreImpl.EVENT_CHILD_PROJECTION
+                ) { cursor: Cursor -> Note.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt
index 7424d329dd..2060415637 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt
@@ -25,44 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.option.internal;
+package org.hisp.dhis.android.core.option.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.option.OptionGroup;
-import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo;
-import org.hisp.dhis.android.core.option.OptionTableInfo;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo
+import org.hisp.dhis.android.core.option.OptionTableInfo
 
-final class OptionGroupOptionChildrenAppender extends ChildrenAppender<OptionGroup> {
+internal class OptionGroupOptionChildrenAppender private constructor(
+    private val childStore: ObjectWithUidChildStore<OptionGroup>
+) : ChildrenAppender<OptionGroup>() {
+    override fun appendChildren(m: OptionGroup): OptionGroup {
+        val builder = m.toBuilder()
+        builder.options(childStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             OptionTableInfo.TABLE_INFO,
             OptionGroupOptionLinkTableInfo.Columns.OPTION_GROUP,
-            OptionGroupOptionLinkTableInfo.Columns.OPTION);
-
-    private final ObjectWithUidChildStore<OptionGroup> childStore;
-
-    private OptionGroupOptionChildrenAppender(ObjectWithUidChildStore<OptionGroup> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public OptionGroup appendChildren(OptionGroup optionGroup) {
-        OptionGroup.Builder builder = optionGroup.toBuilder();
-        builder.options(childStore.getChildren(optionGroup));
-        return builder.build();
-    }
+            OptionGroupOptionLinkTableInfo.Columns.OPTION
+        )
 
-    static ChildrenAppender<OptionGroup> create(DatabaseAdapter databaseAdapter) {
-        return new OptionGroupOptionChildrenAppender(
-                StoreFactory.objectWithUidChildStore(
-                        databaseAdapter,
-                        OptionGroupOptionLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OptionGroup> {
+            return OptionGroupOptionChildrenAppender(
+                objectWithUidChildStore(
+                    databaseAdapter,
+                    OptionGroupOptionLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
                 )
-        );
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt
index 8113cb7c6f..b60a0e8ed3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt
@@ -25,45 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-
-final class OrganisationUnitDataSetChildrenAppender extends ChildrenAppender<OrganisationUnit> {
+internal class OrganisationUnitDataSetChildrenAppender private constructor(
+    private val childStore: ObjectWithUidChildStore<OrganisationUnit>
+) : ChildrenAppender<OrganisationUnit>() {
+    override fun appendChildren(m: OrganisationUnit): OrganisationUnit {
+        val builder = m.toBuilder()
+        builder.dataSets(childStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             DataSetTableInfo.TABLE_INFO,
             DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET);
-
-    private final ObjectWithUidChildStore<OrganisationUnit> childStore;
-
-    private OrganisationUnitDataSetChildrenAppender(ObjectWithUidChildStore<OrganisationUnit> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public OrganisationUnit appendChildren(OrganisationUnit organisationUnit) {
-        OrganisationUnit.Builder builder = organisationUnit.toBuilder();
-        builder.dataSets(childStore.getChildren(organisationUnit));
-        return builder.build();
-    }
+            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET
+        )
 
-    static ChildrenAppender<OrganisationUnit> create(DatabaseAdapter databaseAdapter) {
-        return new OrganisationUnitDataSetChildrenAppender(
-                StoreFactory.objectWithUidChildStore(
-                        databaseAdapter,
-                        DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OrganisationUnit> {
+            return OrganisationUnitDataSetChildrenAppender(
+                objectWithUidChildStore(
+                    databaseAdapter,
+                    DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
                 )
-        );
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
index 52552358ec..0ad132bc47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
@@ -73,7 +73,7 @@ internal class OrganisationUnitEntityDIModule {
 
     @Provides
     @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter?): Map<String, ChildrenAppender<OrganisationUnit>> {
+    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<OrganisationUnit>> {
         return mapOf(
             OrganisationUnitFields.PROGRAMS to OrganisationUnitProgramChildrenAppender.create(databaseAdapter),
             OrganisationUnitFields.DATA_SETS to OrganisationUnitDataSetChildrenAppender.create(databaseAdapter),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt
index 5d0f1fb168..0d3e395bcb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt
@@ -25,48 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo;
-
-final class OrganisationUnitOrganisationUnitGroupProgramChildrenAppender extends ChildrenAppender<OrganisationUnit> {
+internal class OrganisationUnitOrganisationUnitGroupProgramChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<OrganisationUnit, OrganisationUnitGroup>
+) : ChildrenAppender<OrganisationUnit>() {
+    override fun appendChildren(m: OrganisationUnit): OrganisationUnit {
+        val builder = m.toBuilder()
+        builder.organisationUnitGroups(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             OrganisationUnitGroupTableInfo.TABLE_INFO,
             OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT,
-            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP);
-
-    private final LinkChildStore<OrganisationUnit, OrganisationUnitGroup> linkChildStore;
-
-    private OrganisationUnitOrganisationUnitGroupProgramChildrenAppender(
-            LinkChildStore<OrganisationUnit, OrganisationUnitGroup> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public OrganisationUnit appendChildren(OrganisationUnit organisationUnit) {
-        OrganisationUnit.Builder builder = organisationUnit.toBuilder();
-        builder.organisationUnitGroups(linkChildStore.getChildren(organisationUnit));
-        return builder.build();
-    }
+            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP
+        )
 
-    static ChildrenAppender<OrganisationUnit> create(DatabaseAdapter databaseAdapter) {
-        return new OrganisationUnitOrganisationUnitGroupProgramChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        OrganisationUnitGroup::create
-                )
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OrganisationUnit> {
+            return OrganisationUnitOrganisationUnitGroupProgramChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> OrganisationUnitGroup.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt
index 4a33eda447..b382165a53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt
@@ -25,46 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.program.ProgramTableInfo
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
-import org.hisp.dhis.android.core.program.ProgramTableInfo;
-
-final class OrganisationUnitProgramChildrenAppender extends ChildrenAppender<OrganisationUnit> {
+internal class OrganisationUnitProgramChildrenAppender private constructor(
+    private val childStore: ObjectWithUidChildStore<OrganisationUnit>
+) : ChildrenAppender<OrganisationUnit>() {
+    override fun appendChildren(m: OrganisationUnit): OrganisationUnit {
+        val builder = m.toBuilder()
+        builder.programs(childStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             ProgramTableInfo.TABLE_INFO,
             OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM);
-
-    private final ObjectWithUidChildStore<OrganisationUnit> childStore;
-
-    private OrganisationUnitProgramChildrenAppender(
-            ObjectWithUidChildStore<OrganisationUnit> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public OrganisationUnit appendChildren(OrganisationUnit organisationUnit) {
-        OrganisationUnit.Builder builder = organisationUnit.toBuilder();
-        builder.programs(childStore.getChildren(organisationUnit));
-        return builder.build();
-    }
+            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM
+        )
 
-    static ChildrenAppender<OrganisationUnit> create(DatabaseAdapter databaseAdapter) {
-        return new OrganisationUnitProgramChildrenAppender(
-                StoreFactory.objectWithUidChildStore(
-                        databaseAdapter,
-                        OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OrganisationUnit> {
+            return OrganisationUnitProgramChildrenAppender(
+                objectWithUidChildStore(
+                    databaseAdapter,
+                    OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
                 )
-        );
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
index 494add3f84..48aa65be02 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
@@ -25,29 +25,19 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
 
 @Reusable
-final class DataElementValueTypeRenderingChildrenAppender
-        extends ValueTypeRenderingChildrenAppender<ProgramStageDataElement> {
-
-    @Inject
-    DataElementValueTypeRenderingChildrenAppender(ValueTypeDeviceRenderingStore store) {
-        super(store);
-    }
-
-    @Override
-    public ProgramStageDataElement appendChildren(ProgramStageDataElement programStageDataElement) {
-        ValueTypeRendering valueTypeRendering = getValueTypeDeviceRendering(programStageDataElement);
-
-        return programStageDataElement.toBuilder().renderType(valueTypeRendering).build();
+internal class DataElementValueTypeRenderingChildrenAppender @Inject constructor(
+    store: ValueTypeDeviceRenderingStore
+) : ValueTypeRenderingChildrenAppender<ProgramStageDataElement>(store) {
+    override fun appendChildren(m: ProgramStageDataElement): ProgramStageDataElement {
+        val valueTypeRendering = getValueTypeDeviceRendering(m)
+        return m.toBuilder().renderType(valueTypeRendering).build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt
index be4b814e0f..96c10ebcae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt
@@ -25,38 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo;
-import org.hisp.dhis.android.core.program.ProgramIndicator;
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithUidChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.objectWithUidChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
+import org.hisp.dhis.android.core.program.ProgramIndicator
 
-final class ProgramIndicatorLegendSetChildrenAppender extends ChildrenAppender<ProgramIndicator> {
-
-    private final ObjectWithUidChildStore<ProgramIndicator> linkChildStore;
-
-    private ProgramIndicatorLegendSetChildrenAppender(
-            ObjectWithUidChildStore<ProgramIndicator> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public ProgramIndicator appendChildren(ProgramIndicator programIndicator) {
-        ProgramIndicator.Builder builder = programIndicator.toBuilder();
-        builder.legendSets(linkChildStore.getChildren(programIndicator));
-        return builder.build();
+internal class ProgramIndicatorLegendSetChildrenAppender private constructor(
+    private val linkChildStore: ObjectWithUidChildStore<ProgramIndicator>
+) : ChildrenAppender<ProgramIndicator>() {
+    override fun appendChildren(m: ProgramIndicator): ProgramIndicator {
+        val builder = m.toBuilder()
+        builder.legendSets(linkChildStore.getChildren(m))
+        return builder.build()
     }
 
-    static ChildrenAppender<ProgramIndicator> create(DatabaseAdapter databaseAdapter) {
-        return new ProgramIndicatorLegendSetChildrenAppender(
-                StoreFactory.objectWithUidChildStore(
-                        databaseAdapter,
-                        ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
-                        ProgramIndicatorLegendSetLinkTableInfo.CHILD_PROJECTION
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramIndicator> {
+            return ProgramIndicatorLegendSetChildrenAppender(
+                objectWithUidChildStore(
+                    databaseAdapter,
+                    ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
+                    ProgramIndicatorLegendSetLinkTableInfo.CHILD_PROJECTION
                 )
-        );
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java
deleted file mode 100644
index cc367439c5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramRule;
-import org.hisp.dhis.android.core.program.ProgramRuleAction;
-
-final class ProgramRuleActionChildrenAppender extends ChildrenAppender<ProgramRule> {
-
-    private final SingleParentChildStore<ProgramRule, ProgramRuleAction> childStore;
-
-    private ProgramRuleActionChildrenAppender(SingleParentChildStore<ProgramRule, ProgramRuleAction> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public ProgramRule appendChildren(ProgramRule programRule) {
-        ProgramRule.Builder builder = programRule.toBuilder();
-        builder.programRuleActions(childStore.getChildren(programRule));
-        return builder.build();
-    }
-
-    static ChildrenAppender<ProgramRule> create(DatabaseAdapter databaseAdapter) {
-        return new ProgramRuleActionChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        ProgramRuleActionStoreImpl.Companion.getCHILD_PROJECTION(),
-                        ProgramRuleAction::create)
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt
new file mode 100644
index 0000000000..2de247abfb
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.program.internal
+
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramRule
+import org.hisp.dhis.android.core.program.ProgramRuleAction
+
+internal class ProgramRuleActionChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<ProgramRule, ProgramRuleAction>
+) : ChildrenAppender<ProgramRule>() {
+    override fun appendChildren(m: ProgramRule): ProgramRule {
+        val builder = m.toBuilder()
+        builder.programRuleActions(childStore.getChildren(m))
+        return builder.build()
+    }
+
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramRule> {
+            return ProgramRuleActionChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    ProgramRuleActionStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor -> ProgramRuleAction.create(cursor) }
+            )
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt
index d482f6fa4b..9d15c4874a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt
@@ -25,47 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramSection;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramSection
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
 
-final class ProgramSectionAttributeChildrenAppender extends ChildrenAppender<ProgramSection> {
+internal class ProgramSectionAttributeChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<ProgramSection, TrackedEntityAttribute>
+) : ChildrenAppender<ProgramSection>() {
+    override fun appendChildren(m: ProgramSection): ProgramSection {
+        val builder = m.toBuilder()
+        builder.attributes(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        val CHILD_PROJECTION = LinkTableChildProjection(
             TrackedEntityAttributeTableInfo.TABLE_INFO,
             ProgramSectionAttributeLinkTableInfo.Columns.PROGRAM_SECTION,
-            ProgramSectionAttributeLinkTableInfo.Columns.ATTRIBUTE);
-
-    private final LinkChildStore<ProgramSection, TrackedEntityAttribute> linkChildStore;
-
-    private ProgramSectionAttributeChildrenAppender(
-            LinkChildStore<ProgramSection, TrackedEntityAttribute> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public ProgramSection appendChildren(ProgramSection programSection) {
-        ProgramSection.Builder builder = programSection.toBuilder();
-        builder.attributes(linkChildStore.getChildren(programSection));
-        return builder.build();
-    }
+            ProgramSectionAttributeLinkTableInfo.Columns.ATTRIBUTE
+        )
 
-    static ChildrenAppender<ProgramSection> create(DatabaseAdapter databaseAdapter) {
-        return new ProgramSectionAttributeChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        TrackedEntityAttribute::create
-                )
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramSection> {
+            return ProgramSectionAttributeChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> TrackedEntityAttribute.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementChildrenAppender.java
deleted file mode 100644
index 7e3b981846..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementChildrenAppender.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor;
-
-final class ProgramStageDataElementChildrenAppender extends ChildrenAppender<ProgramStage> {
-
-    private static final SingleParentChildProjection CHILD_PROJECTION = new SingleParentChildProjection(
-            ProgramStageDataElementTableInfo.TABLE_INFO,
-            ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE);
-
-    private final SingleParentChildStore<ProgramStage, ProgramStageDataElement> childStore;
-
-    private ProgramStageDataElementChildrenAppender(
-            SingleParentChildStore<ProgramStage, ProgramStageDataElement> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public ProgramStage appendChildren(ProgramStage programStage) {
-        return ProgramStageInternalAccessor.insertProgramStageDataElements(programStage.toBuilder(),
-                childStore.getChildren(programStage)).build();
-    }
-
-    static ChildrenAppender<ProgramStage> create(DatabaseAdapter databaseAdapter) {
-        return new ProgramStageDataElementChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        CHILD_PROJECTION,
-                        ProgramStageDataElement::create)
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt
index 38e2993e1d..bbc3e74c37 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt
@@ -25,47 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-import org.hisp.dhis.android.core.dataelement.DataElementTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageSection;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageSection
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo
 
-final class ProgramStageSectionDataElementChildrenAppender extends ChildrenAppender<ProgramStageSection> {
+internal class ProgramStageSectionDataElementChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<ProgramStageSection, DataElement>
+) : ChildrenAppender<ProgramStageSection>() {
+    override fun appendChildren(m: ProgramStageSection): ProgramStageSection {
+        val builder = m.toBuilder()
+        builder.dataElements(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementTableInfo.TABLE_INFO,
             ProgramStageSectionDataElementLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
-            ProgramStageSectionDataElementLinkTableInfo.Columns.DATA_ELEMENT);
-
-    private final LinkChildStore<ProgramStageSection, DataElement> linkChildStore;
-
-    private ProgramStageSectionDataElementChildrenAppender(
-            LinkChildStore<ProgramStageSection, DataElement> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public ProgramStageSection appendChildren(ProgramStageSection programStageSection) {
-        ProgramStageSection.Builder builder = programStageSection.toBuilder();
-        builder.dataElements(linkChildStore.getChildren(programStageSection));
-        return builder.build();
-    }
+            ProgramStageSectionDataElementLinkTableInfo.Columns.DATA_ELEMENT
+        )
 
-    static ChildrenAppender<ProgramStageSection> create(DatabaseAdapter databaseAdapter) {
-        return new ProgramStageSectionDataElementChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        DataElement::create
-                )
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramStageSection> {
+            return ProgramStageSectionDataElementChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> DataElement.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt
similarity index 59%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt
index a552578853..cf0ec6cf0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt
@@ -25,47 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.ProgramIndicator;
-import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageSection;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.LinkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.linkChildStore
+import org.hisp.dhis.android.core.arch.db.stores.projections.internal.LinkTableChildProjection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageSection
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo
 
-final class ProgramStageSectionProgramIndicatorChildrenAppender extends ChildrenAppender<ProgramStageSection> {
+internal class ProgramStageSectionProgramIndicatorChildrenAppender private constructor(
+    private val linkChildStore: LinkChildStore<ProgramStageSection, ProgramIndicator>
+) : ChildrenAppender<ProgramStageSection>() {
+    override fun appendChildren(m: ProgramStageSection): ProgramStageSection {
+        val builder = m.toBuilder()
+        builder.programIndicators(linkChildStore.getChildren(m))
+        return builder.build()
+    }
 
-    private static final LinkTableChildProjection CHILD_PROJECTION = new LinkTableChildProjection(
+    companion object {
+        private val CHILD_PROJECTION = LinkTableChildProjection(
             ProgramIndicatorTableInfo.TABLE_INFO,
             ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
-            ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_INDICATOR);
-
-    private final LinkChildStore<ProgramStageSection, ProgramIndicator> linkChildStore;
-
-    private ProgramStageSectionProgramIndicatorChildrenAppender(
-            LinkChildStore<ProgramStageSection, ProgramIndicator> linkChildStore) {
-        this.linkChildStore = linkChildStore;
-    }
-
-    @Override
-    public ProgramStageSection appendChildren(ProgramStageSection programStageSection) {
-        ProgramStageSection.Builder builder = programStageSection.toBuilder();
-        builder.programIndicators(linkChildStore.getChildren(programStageSection));
-        return builder.build();
-    }
+            ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_INDICATOR
+        )
 
-    static ChildrenAppender<ProgramStageSection> create(DatabaseAdapter databaseAdapter) {
-        return new ProgramStageSectionProgramIndicatorChildrenAppender(
-                StoreFactory.linkChildStore(
-                        databaseAdapter,
-                        ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
-                        CHILD_PROJECTION,
-                        ProgramIndicator::create
-                )
-        );
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramStageSection> {
+            return ProgramStageSectionProgramIndicatorChildrenAppender(
+                linkChildStore(
+                    databaseAdapter,
+                    ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
+                    CHILD_PROJECTION
+                ) { cursor: Cursor -> ProgramIndicator.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
index 3b56de905a..27634ff11f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
@@ -25,31 +25,19 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 
 @Reusable
-final class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender
-        extends ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute> {
-
-    @Inject
-    ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender(
-            ValueTypeDeviceRenderingStore store) {
-        super(store);
-    }
-
-    @Override
-    public ProgramTrackedEntityAttribute appendChildren(
-            ProgramTrackedEntityAttribute programTrackedEntityAttribute) {
-        ValueTypeRendering valueTypeRendering = getValueTypeDeviceRendering(programTrackedEntityAttribute);
-
-        return programTrackedEntityAttribute.toBuilder().renderType(valueTypeRendering).build();
+internal class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender @Inject constructor(
+    store: ValueTypeDeviceRenderingStore
+) : ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute>(store) {
+    override fun appendChildren(m: ProgramTrackedEntityAttribute): ProgramTrackedEntityAttribute {
+        val valueTypeRendering = getValueTypeDeviceRendering(m)
+        return m.toBuilder().renderType(valueTypeRendering).build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
index fe0f9d583a..82becb17b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
@@ -25,34 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
 
 @Reusable
-final class ProgramTrackedEntityTypeChildrenAppender extends ChildrenAppender<Program> {
-
-    private final TrackedEntityTypeStore store;
-
-    @Inject
-    ProgramTrackedEntityTypeChildrenAppender(TrackedEntityTypeStore store) {
-        this.store = store;
-    }
-
-    @Override
-    public Program appendChildren(Program program) {
-        Program.Builder builder = program.toBuilder();
-        TrackedEntityType trackedEntityType = program.trackedEntityType();
+internal class ProgramTrackedEntityTypeChildrenAppender @Inject constructor(
+    private val store: TrackedEntityTypeStore
+) : ChildrenAppender<Program>() {
+    override fun appendChildren(m: Program): Program {
+        val builder = m.toBuilder()
+        val trackedEntityType = m.trackedEntityType()
         if (trackedEntityType != null) {
-            builder.trackedEntityType(store.selectByUid(trackedEntityType.uid()));
+            builder.trackedEntityType(store.selectByUid(trackedEntityType.uid()))
         }
-        return builder.build();
+        return builder.build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt
index 933b8068bd..cde058bb11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt
@@ -25,39 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering;
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo;
-import org.hisp.dhis.android.core.common.ValueTypeRendering;
-
-abstract class ValueTypeRenderingChildrenAppender<M extends ObjectWithUidInterface> extends ChildrenAppender<M> {
-
-    private final ObjectWithoutUidStore<ValueTypeDeviceRendering> store;
-
-    ValueTypeRenderingChildrenAppender(ObjectWithoutUidStore<ValueTypeDeviceRendering> store) {
-        this.store = store;
-    }
-
-    ValueTypeRendering getValueTypeDeviceRendering(M model) {
-        String desktopWhereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(IdentifiableColumns.UID, model.uid())
-                .appendKeyStringValue(ValueTypeDeviceRenderingTableInfo.Columns.DEVICE_TYPE, ValueTypeRendering.DESKTOP)
-                .build();
-        ValueTypeDeviceRendering desktop = store.selectOneWhere(desktopWhereClause);
-
-        String mobileWhereClause = new WhereClauseBuilder()
-                .appendKeyStringValue(IdentifiableColumns.UID, model.uid())
-                .appendKeyStringValue(ValueTypeDeviceRenderingTableInfo.Columns.DEVICE_TYPE, ValueTypeRendering.MOBILE)
-                .build();
-        ValueTypeDeviceRendering mobile = store.selectOneWhere(mobileWhereClause);
-
-        return ValueTypeRendering.create(desktop, mobile);
+package org.hisp.dhis.android.core.program.internal
+
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo
+import org.hisp.dhis.android.core.common.ValueTypeRendering
+
+internal abstract class ValueTypeRenderingChildrenAppender<M : ObjectWithUidInterface>(
+    private val store: ObjectWithoutUidStore<ValueTypeDeviceRendering>
+) : ChildrenAppender<M>() {
+    fun getValueTypeDeviceRendering(model: M): ValueTypeRendering {
+        val desktopWhereClause = WhereClauseBuilder()
+            .appendKeyStringValue(IdentifiableColumns.UID, model.uid())
+            .appendKeyStringValue(ValueTypeDeviceRenderingTableInfo.Columns.DEVICE_TYPE, ValueTypeRendering.DESKTOP)
+            .build()
+        val desktop = store.selectOneWhere(desktopWhereClause)
+
+        val mobileWhereClause = WhereClauseBuilder()
+            .appendKeyStringValue(IdentifiableColumns.UID, model.uid())
+            .appendKeyStringValue(ValueTypeDeviceRenderingTableInfo.Columns.DEVICE_TYPE, ValueTypeRendering.MOBILE)
+            .build()
+        val mobile = store.selectOneWhere(mobileWhereClause)
+
+        return ValueTypeRendering.create(desktop, mobile)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt
index 716eb04df7..0cb32ba4cc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt
@@ -25,38 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
-public final class TrackedEntityAttributeValueChildrenAppender extends ChildrenAppender<TrackedEntityInstance> {
-
-
-    private final SingleParentChildStore<TrackedEntityInstance, TrackedEntityAttributeValue> childStore;
-
-    private TrackedEntityAttributeValueChildrenAppender(
-            SingleParentChildStore<TrackedEntityInstance, TrackedEntityAttributeValue> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public TrackedEntityInstance appendChildren(TrackedEntityInstance tei) {
-        TrackedEntityInstance.Builder builder = tei.toBuilder();
-        builder.trackedEntityAttributeValues(childStore.getChildren(tei));
-        return builder.build();
+internal class TrackedEntityAttributeValueChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<TrackedEntityInstance, TrackedEntityAttributeValue>
+) : ChildrenAppender<TrackedEntityInstance>() {
+    override fun appendChildren(m: TrackedEntityInstance): TrackedEntityInstance {
+        val builder = m.toBuilder()
+        builder.trackedEntityAttributeValues(childStore.getChildren(m))
+        return builder.build()
     }
 
-    public static ChildrenAppender<TrackedEntityInstance> create(DatabaseAdapter databaseAdapter) {
-        return new TrackedEntityAttributeValueChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        TrackedEntityAttributeValueStoreImpl.Companion.getCHILD_PROJECTION(),
-                        TrackedEntityAttributeValue::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<TrackedEntityInstance> {
+            return TrackedEntityAttributeValueChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    TrackedEntityAttributeValueStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt
index 3978fb4eae..db03881029 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt
@@ -25,37 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 
-public final class TrackedEntityDataValueChildrenAppender extends ChildrenAppender<Event> {
-
-
-    private final SingleParentChildStore<Event, TrackedEntityDataValue> childStore;
-
-    private TrackedEntityDataValueChildrenAppender(SingleParentChildStore<Event, TrackedEntityDataValue> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public Event appendChildren(Event event) {
-        Event.Builder builder = event.toBuilder();
-        builder.trackedEntityDataValues(childStore.getChildren(event));
-        return builder.build();
+internal class TrackedEntityDataValueChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<Event, TrackedEntityDataValue>
+) : ChildrenAppender<Event>() {
+    override fun appendChildren(m: Event): Event {
+        val builder = m.toBuilder()
+        builder.trackedEntityDataValues(childStore.getChildren(m))
+        return builder.build()
     }
 
-    public static ChildrenAppender<Event> create(DatabaseAdapter databaseAdapter) {
-        return new TrackedEntityDataValueChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        TrackedEntityDataValueStoreImpl.Companion.getCHILD_PROJECTION(),
-                        TrackedEntityDataValue::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Event> {
+            return TrackedEntityDataValueChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    TrackedEntityDataValueStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor -> TrackedEntityDataValue.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt
index 3c8c48d468..08b64eebc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt
@@ -25,38 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore;
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
+import android.database.Cursor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.SingleParentChildStore
+import org.hisp.dhis.android.core.arch.db.stores.internal.StoreFactory.singleParentChildStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 
-public final class TrackedEntityTypeAttributeChildrenAppender extends ChildrenAppender<TrackedEntityType> {
-
-
-    private final SingleParentChildStore<TrackedEntityType, TrackedEntityTypeAttribute> childStore;
-
-    private TrackedEntityTypeAttributeChildrenAppender(
-            SingleParentChildStore<TrackedEntityType, TrackedEntityTypeAttribute> childStore) {
-        this.childStore = childStore;
-    }
-
-    @Override
-    public TrackedEntityType appendChildren(TrackedEntityType trackedEntityType) {
-        TrackedEntityType.Builder builder = trackedEntityType.toBuilder();
-        builder.trackedEntityTypeAttributes(childStore.getChildren(trackedEntityType));
-        return builder.build();
+internal class TrackedEntityTypeAttributeChildrenAppender private constructor(
+    private val childStore: SingleParentChildStore<TrackedEntityType, TrackedEntityTypeAttribute>
+) : ChildrenAppender<TrackedEntityType>() {
+    override fun appendChildren(m: TrackedEntityType): TrackedEntityType {
+        val builder = m.toBuilder()
+        builder.trackedEntityTypeAttributes(childStore.getChildren(m))
+        return builder.build()
     }
 
-    public static ChildrenAppender<TrackedEntityType> create(DatabaseAdapter databaseAdapter) {
-        return new TrackedEntityTypeAttributeChildrenAppender(
-                StoreFactory.singleParentChildStore(
-                        databaseAdapter,
-                        TrackedEntityTypeAttributeStoreImpl.Companion.getCHILD_PROJECTION(),
-                        TrackedEntityTypeAttribute::create)
-        );
+    companion object {
+        fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<TrackedEntityType> {
+            return TrackedEntityTypeAttributeChildrenAppender(
+                singleParentChildStore(
+                    databaseAdapter,
+                    TrackedEntityTypeAttributeStoreImpl.CHILD_PROJECTION
+                ) { cursor: Cursor -> TrackedEntityTypeAttribute.create(cursor) }
+            )
+        }
     }
-}
\ No newline at end of file
+}

From db5627adea69f52cce7c524f132c07f5c72a587e Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Mon, 10 Jul 2023 14:57:33 +0200
Subject: [PATCH 074/478] [ANDROSDK-1677] Replace RXAPICallExecutor by
 CoroutineAPICallExecutor in TrackerDownloadCall

---
 ...ava => TrackedEntityInstanceDownloader.kt} | 100 ++++----
 .../tracker/exporter/TrackerDownloadCall.kt   | 231 ++++++++++--------
 2 files changed, 173 insertions(+), 158 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityInstanceDownloader.java => TrackedEntityInstanceDownloader.kt} (58%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
index a5449e0c1c..eb05a35296 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
@@ -25,37 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import static org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams;
-import org.hisp.dhis.android.core.settings.EnrollmentScope;
-import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
+package org.hisp.dhis.android.core.trackedentity.internal
+
+import dagger.Reusable
+import io.reactivex.Observable
+import javax.inject.Inject
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.rx2.asObservable
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
+import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams
+import org.hisp.dhis.android.core.settings.EnrollmentScope
+import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress
 
 @Reusable
-public final class TrackedEntityInstanceDownloader extends BaseRepositoryImpl<TrackedEntityInstanceDownloader> {
-
-    private final RepositoryScope scope;
-
-    private final TrackedEntityInstanceDownloadCall downloadCall;
-
-    @Inject
-    TrackedEntityInstanceDownloader(final RepositoryScope scope,
-                                    final TrackedEntityInstanceDownloadCall downloadCall) {
-        super(scope, new FilterConnectorFactory<>(scope, s -> new TrackedEntityInstanceDownloader(s, downloadCall)));
-        this.scope = scope;
-        this.downloadCall = downloadCall;
+class TrackedEntityInstanceDownloader @Inject internal constructor(
+    scope: RepositoryScope,
+    private val downloadCall: TrackedEntityInstanceDownloadCall
+) : BaseRepositoryImpl<TrackedEntityInstanceDownloader>(
+    scope,
+    FilterConnectorFactory(scope) { s: RepositoryScope ->
+        TrackedEntityInstanceDownloader(
+            s,
+            downloadCall
+        )
     }
+) {
 
     /**
      * Downloads and persists TrackedEntityInstances from the server. Only instances in capture scope are downloaded.
@@ -66,41 +65,37 @@ public final class TrackedEntityInstanceDownloader extends BaseRepositoryImpl<Tr
      *
      * @return An Observable that notifies about the progress.
      */
-    public Observable<TrackerD2Progress> download() {
-        ProgramDataDownloadParams params = ProgramDataDownloadParams.fromRepositoryScope(scope);
-        return this.downloadCall.download(params);
-    }
+    fun download(): Observable<TrackerD2Progress> = flow {
+        val params = ProgramDataDownloadParams.fromRepositoryScope(scope)
+        emitAll(downloadCall.download(params))
+    }.asObservable()
 
-    public void blockingDownload() {
-        download().blockingSubscribe();
+    fun blockingDownload() {
+        download().blockingSubscribe()
     }
 
-    public UnwrappedEqInFilterConnector<TrackedEntityInstanceDownloader> byUid() {
-        return cf.unwrappedEqIn(QueryParams.UID);
+    fun byUid(): UnwrappedEqInFilterConnector<TrackedEntityInstanceDownloader> {
+        return cf.unwrappedEqIn(QueryParams.UID)
     }
 
-    public TrackedEntityInstanceDownloader byProgramUid(String programUid) {
-        return cf.baseString(QueryParams.PROGRAM).eq(programUid);
+    fun byProgramUid(programUid: String): TrackedEntityInstanceDownloader {
+        return cf.baseString(QueryParams.PROGRAM).eq(programUid)!!
     }
 
-    /*public TrackedEntityInstanceDownloader byOrgunitUids(String... uids) {
-        return cf.string(QueryParams.ORG_UNITS).in(uids);
-    }*/
-
-    public TrackedEntityInstanceDownloader limitByOrgunit(Boolean limitByOrgunit) {
-        return cf.bool(QueryParams.LIMIT_BY_ORGUNIT).eq(limitByOrgunit);
+    fun limitByOrgunit(limitByOrgunit: Boolean): TrackedEntityInstanceDownloader {
+        return cf.bool(QueryParams.LIMIT_BY_ORGUNIT).eq(limitByOrgunit)!!
     }
 
-    public TrackedEntityInstanceDownloader limitByProgram(Boolean limitByProgram) {
-        return cf.bool(QueryParams.LIMIT_BY_PROGRAM).eq(limitByProgram);
+    fun limitByProgram(limitByProgram: Boolean): TrackedEntityInstanceDownloader {
+        return cf.bool(QueryParams.LIMIT_BY_PROGRAM).eq(limitByProgram)!!
     }
 
-    public TrackedEntityInstanceDownloader limit(Integer limit) {
-        return cf.integer(QueryParams.LIMIT).eq(limit);
+    fun limit(limit: Int): TrackedEntityInstanceDownloader {
+        return cf.integer(QueryParams.LIMIT).eq(limit)!!
     }
 
-    public TrackedEntityInstanceDownloader byProgramStatus(EnrollmentScope status) {
-        return cf.baseString(QueryParams.PROGRAM_STATUS).eq(status.toString());
+    fun byProgramStatus(status: EnrollmentScope): TrackedEntityInstanceDownloader {
+        return cf.baseString(QueryParams.PROGRAM_STATUS).eq(status.toString())!!
     }
 
     /**
@@ -110,8 +105,7 @@ public TrackedEntityInstanceDownloader byProgramStatus(EnrollmentScope status) {
      * @param overwrite True to overwrite
      * @return the new repository
      */
-    public TrackedEntityInstanceDownloader overwrite(Boolean overwrite) {
-        return cf.bool(QueryParams.OVERWRITE).eq(overwrite);
+    fun overwrite(overwrite: Boolean): TrackedEntityInstanceDownloader {
+        return cf.bool(QueryParams.OVERWRITE).eq(overwrite)!!
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 1da1e2fab6..398c5e3fa0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -28,13 +28,23 @@
 package org.hisp.dhis.android.core.tracker.exporter
 
 import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
 import io.reactivex.Single
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.fold
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.rx2.asFlow
+import kotlinx.coroutines.rx2.asFlowable
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.paging.internal.ApiPagingEngine
 import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -50,88 +60,95 @@ import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 
 @Suppress("TooManyFunctions")
 internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
-    private val rxCallExecutor: RxAPICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val systemInfoModuleDownloader: SystemInfoModuleDownloader,
     private val relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory
 ) {
 
-    fun download(params: ProgramDataDownloadParams): Observable<TrackerD2Progress> {
-        return Observable.defer {
-            val progressManager = TrackerD2ProgressManager(null)
-            if (userOrganisationUnitLinkStore.count() == 0) {
-                return@defer Observable.fromCallable {
-                    progressManager.setTotalCalls(1)
-                    progressManager.increaseProgress(TrackedEntityInstance::class.java, true)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = flow {
+        val progressManager = TrackerD2ProgressManager(null)
+        if (userOrganisationUnitLinkStore.count() == 0) {
+            progressManager.setTotalCalls(1)
+            emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, true))
+        } else {
+            systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
+                .asFlow()
+                .flatMapLatest {
+                    downloadBundle(params, progressManager)
                 }
-            } else {
-                val relatives = RelationshipItemRelatives()
-                return@defer systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
-                    .switchMap {
-                        rxCallExecutor.wrapObservableTransactionally(
-                            Observable.merge(
-                                Observable.defer { downloadInternal(params, progressManager, relatives) },
-                                Observable.defer { downloadRelationships(progressManager, relatives) },
-                                Observable.fromCallable { progressManager.complete() }
-                            ),
-                            cleanForeignKeys = true
-                        )
-                    }
-            }
         }
     }
 
+    private fun downloadBundle(
+        params: ProgramDataDownloadParams,
+        progressManager: TrackerD2ProgressManager
+    ): Flow<TrackerD2ProgressManager> = flow {
+        val relatives = RelationshipItemRelatives()
+
+        coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+            merge(
+                downloadInternal(params, progressManager, relatives),
+                downloadRelationships(progressManager, relatives),
+                flowOf(progressManager.complete())
+            )
+        }.asFlowable()
+    }
+
     private fun downloadInternal(
         params: ProgramDataDownloadParams,
         progressManager: TrackerD2ProgressManager,
         relatives: RelationshipItemRelatives
-    ): Observable<TrackerD2Progress> {
-        return Observable.create { emitter ->
-            val bundles: List<Q> = getBundles(params)
-            val programs = bundles.flatMap { it.commonParams().programs }
+    ): Flow<TrackerD2Progress> = flow {
+        val bundles: List<Q> = getBundles(params)
+        val programs = bundles.flatMap { it.commonParams().programs }
 
-            progressManager.setTotalCalls(programs.size + 2)
-            progressManager.setPrograms(programs)
-            emitter.onNext(progressManager.getProgress())
+        progressManager.setTotalCalls(programs.size + 2)
+        progressManager.setPrograms(programs)
+        emit(progressManager.getProgress())
 
-            for (bundle in bundles) {
-                if (bundle.commonParams().uids.isNotEmpty()) {
-                    val result = queryByUids(bundle, params.overwrite(), relatives)
+        for (bundle in bundles) {
+            if (bundle.commonParams().uids.isNotEmpty()) {
+                val result = queryByUids(bundle, params.overwrite(), relatives)
 
-                    result.d2Error?.let {
-                        emitter.onError(it)
-                    }
-                } else {
-                    val orgunitPrograms = bundle.orgUnits()
-                        .associateWith {
-                            bundle.commonParams().programs
-                                .map { ItemsByProgramCount(it, 0) }
-                                .toMutableList()
-                        }.toMutableMap()
-
-                    val bundleResult = BundleResult(0, orgunitPrograms, bundle.orgUnits().toMutableList())
-
-                    var iterationCount = 0
-                    var successfulSync = true
-
-                    do {
-                        val result = iterateBundle(bundle, params, bundleResult, relatives, emitter, progressManager)
-                        successfulSync = successfulSync && result.successfulSync
-                        iterationCount++
-                    } while (iterationNotFinished(bundle, params, bundleResult, iterationCount))
-
-                    if (successfulSync) {
-                        updateLastUpdated(bundle)
-                    }
+                result.d2Error?.let {
+                    // TODO (Not sure how to return this)
                 }
-            }
+            } else {
+                val orgunitPrograms = bundle.orgUnits()
+                    .associateWith {
+                        bundle.commonParams().programs
+                            .map { ItemsByProgramCount(it, 0) }
+                            .toMutableList()
+                    }.toMutableMap()
+
+                val bundleResult = BundleResult(0, orgunitPrograms, bundle.orgUnits().toMutableList())
+
+                var iterationCount = 0
+                var successfulSync: Boolean
+
+                do {
+                    val result = iterateBundle(bundle, params, bundleResult, relatives, progressManager)
+
+                    successfulSync = result.fold(true) { accumulative, value ->
+                        accumulative && value.successfulSync
+                    }
 
-            if (progressManager.getProgress().programs().any { !it.value.isComplete }) {
-                emitter.onNext(progressManager.completePrograms())
+                    iterationCount++
+                } while (iterationNotFinished(bundle, params, bundleResult, iterationCount))
+
+                if (successfulSync) {
+                    updateLastUpdated(bundle)
+                }
             }
+        }
 
-            emitter.onComplete()
+        if (progressManager.getProgress().programs().any { !it.value.isComplete }) {
+            emit(progressManager.completePrograms())
         }
+
+        emit(progressManager.complete())
     }
 
     private fun iterationNotFinished(
@@ -146,15 +163,18 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
             iterationCount < max(bundle.commonParams().limit * BUNDLE_SECURITY_FACTOR, BUNDLE_ITERATION_LIMIT)
     }
 
+    /*
+    it uses a callbackFlow to create a flow that can emit the IterationResult asynchronously
+     */
+
     @Suppress("LongParameterList")
     private fun iterateBundle(
         bundle: Q,
         params: ProgramDataDownloadParams,
         bundleResult: BundleResult,
         relatives: RelationshipItemRelatives,
-        emitter: ObservableEmitter<TrackerD2Progress>,
         progressManager: TrackerD2ProgressManager
-    ): IterationResult {
+    ): Flow<IterationResult> = callbackFlow {
         val iterationResult = IterationResult()
         val limitPerCombo = getBundleLimit(bundle, params, bundleResult)
 
@@ -174,13 +194,13 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 bundleResult,
                 bundleLimit,
                 relatives,
-                emitter,
                 progressManager
             )
             iterationResult.successfulSync = iterationResult.successfulSync && result.successfulSync
         }
 
-        return iterationResult
+        trySend(iterationResult)
+        awaitClose()
     }
 
     @Suppress("LongParameterList", "NestedBlockDepth")
@@ -191,46 +211,46 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         bundleResult: BundleResult,
         limit: Int,
         relatives: RelationshipItemRelatives,
-        emitter: ObservableEmitter<TrackerD2Progress>,
         progressManager: TrackerD2ProgressManager
     ): IterationResult {
         val iterationResult = IterationResult()
 
-        for (bundleProgram in bundleResult.bundleOrgUnitPrograms[orgUnitUid]!!) {
-            if (bundleResult.bundleCount < bundle.commonParams().limit) {
-                val trackerQuery = getQuery(bundle, bundleProgram.program, orgUnitUid, limit)
-
-                val result = getItemsForOrgUnitProgramCombination(
-                    trackerQuery,
-                    limit,
-                    bundleProgram.itemCount,
-                    params.overwrite(),
-                    relatives
-                )
-
-                bundleResult.bundleCount += result.count
-                bundleProgram.itemCount += result.count
-                iterationResult.successfulSync = iterationResult.successfulSync && result.successfulSync
-
-                val syncStatus =
-                    if (result.successfulSync) D2ProgressSyncStatus.SUCCESS
-                    else D2ProgressSyncStatus.ERROR
-
-                progressManager.updateProgramSyncStatus(bundleProgram.program, syncStatus)
-
-                if (result.emptyProgram || !result.successfulSync) {
-                    bundleResult.bundleOrgUnitPrograms[orgUnitUid] =
-                        bundleResult.bundleOrgUnitPrograms[orgUnitUid]!!
-                            .filter { it.program != bundleProgram.program }.toMutableList()
-
-                    val hasOtherOrgunits = bundleResult.bundleOrgUnitPrograms.values.any { list ->
-                        list.any { it.program == bundleProgram.program }
-                    }
-
-                    if (!hasOtherOrgunits) {
-                        progressManager.increaseProgress(TrackedEntityInstance::class.java, false)
-                        progressManager.completeProgram(bundleProgram.program)
-                        emitter.onNext(progressManager.getProgress())
+        bundleResult.bundleOrgUnitPrograms[orgUnitUid]?.let { bundlePrograms ->
+            for (bundleProgram in bundlePrograms) {
+                if (bundleResult.bundleCount < bundle.commonParams().limit) {
+                    val trackerQuery = getQuery(bundle, bundleProgram.program, orgUnitUid, limit)
+
+                    val result = getItemsForOrgUnitProgramCombination(
+                        trackerQuery,
+                        limit,
+                        bundleProgram.itemCount,
+                        params.overwrite(),
+                        relatives
+                    )
+
+                    bundleResult.bundleCount += result.count
+                    bundleProgram.itemCount += result.count
+                    iterationResult.successfulSync = iterationResult.successfulSync && result.successfulSync
+
+                    val syncStatus =
+                        if (result.successfulSync) D2ProgressSyncStatus.SUCCESS
+                        else D2ProgressSyncStatus.ERROR
+
+                    progressManager.updateProgramSyncStatus(bundleProgram.program, syncStatus)
+
+                    if (result.emptyProgram || !result.successfulSync) {
+                        bundleResult.bundleOrgUnitPrograms[orgUnitUid] = bundlePrograms
+                            .filter { it.program != bundleProgram.program }
+                            .toMutableList()
+
+                        val hasOtherOrgunits = bundleResult.bundleOrgUnitPrograms.values.any { list ->
+                            list.any { it.program == bundleProgram.program }
+                        }
+
+                        if (!hasOtherOrgunits) {
+                            progressManager.increaseProgress(TrackedEntityInstance::class.java, false)
+                            progressManager.completeProgram(bundleProgram.program)
+                        }
                     }
                 }
             }
@@ -252,6 +272,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 if (numOfCombinations == 0 || pendingTeis == 0) 0
                 else ceil(pendingTeis.toDouble() / numOfCombinations.toDouble()).roundToInt()
             }
+
             else -> bundle.commonParams().limit - bundleResult.bundleCount
         }
     }
@@ -330,8 +351,8 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private fun downloadRelationships(
         progressManager: TrackerD2ProgressManager,
         relatives: RelationshipItemRelatives
-    ): Observable<TrackerD2Progress> {
-        return relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives).andThen(
+    ): Flow<TrackerD2Progress> = flow {
+        relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives).andThen(
             Observable.fromCallable {
                 progressManager.increaseProgress(
                     TrackedEntityInstance::class.java, false

From ff08f463fa9e2570ad086c7593127748424ef580 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Mon, 10 Jul 2023 15:02:07 +0200
Subject: [PATCH 075/478] Rename .java to .kt

---
 .../core/event/{EventDownloader.java => EventDownloader.kt}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/event/{EventDownloader.java => EventDownloader.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt

From d4ec5a9a9c58ae3c7994db349013e77af5fd7964 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Mon, 10 Jul 2023 15:02:08 +0200
Subject: [PATCH 076/478] [ANDROSDK-1677] Refactor EventDownloader to Java

---
 .../android/core/event/EventDownloader.kt     | 85 +++++++++----------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
index acc9d1383f..bd3a3ca7e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
@@ -25,37 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event;
-
-import static org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.event.internal.EventDownloadCall;
-import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams;
-import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
+package org.hisp.dhis.android.core.event
+
+import dagger.Reusable
+import io.reactivex.Observable
+import javax.inject.Inject
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.rx2.asObservable
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.event.internal.EventDownloadCall
+import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
+import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams
+import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress
 
 @Reusable
-public final class EventDownloader extends BaseRepositoryImpl<EventDownloader> {
-
-    private final RepositoryScope scope;
-
-    private final EventDownloadCall callFactory;
-
-    @Inject
-    EventDownloader(final RepositoryScope scope,
-                    final EventDownloadCall callFactory) {
-        super(scope, new FilterConnectorFactory<>(scope, s -> new EventDownloader(s, callFactory)));
-        this.scope = scope;
-        this.callFactory = callFactory;
-    }
+class EventDownloader @Inject internal constructor(
+    scope: RepositoryScope,
+    private val callFactory: EventDownloadCall
+) : BaseRepositoryImpl<EventDownloader>(
+    scope,
+    FilterConnectorFactory(scope) { s: RepositoryScope -> EventDownloader(s, callFactory) }
+) {
 
     /**
      * Downloads and persists Events from the server. Only instances in capture scope are downloaded.
@@ -66,33 +60,32 @@ public final class EventDownloader extends BaseRepositoryImpl<EventDownloader> {
      *
      * @return -
      */
-    public Observable<TrackerD2Progress> download() {
-        ProgramDataDownloadParams params = ProgramDataDownloadParams.fromRepositoryScope(scope);
-        return this.callFactory.download(params);
-    }
+    fun download(): Observable<TrackerD2Progress> = flow {
+        val params = ProgramDataDownloadParams.fromRepositoryScope(scope)
+        emitAll(callFactory.download(params))
+    }.asObservable()
 
-    public void blockingDownload() {
-        download().blockingSubscribe();
+    fun blockingDownload() {
+        download().blockingSubscribe()
     }
 
-    public UnwrappedEqInFilterConnector<EventDownloader> byUid() {
-        return cf.unwrappedEqIn(QueryParams.UID);
+    fun byUid(): UnwrappedEqInFilterConnector<EventDownloader> {
+        return cf.unwrappedEqIn(QueryParams.UID)
     }
 
-    public EventDownloader byProgramUid(String programUid) {
-        return cf.baseString(QueryParams.PROGRAM).eq(programUid);
+    fun byProgramUid(programUid: String): EventDownloader {
+        return cf.baseString(QueryParams.PROGRAM).eq(programUid)!!
     }
 
-    public EventDownloader limitByOrgunit(Boolean limitByOrgunit) {
-        return cf.bool(QueryParams.LIMIT_BY_ORGUNIT).eq(limitByOrgunit);
+    fun limitByOrgunit(limitByOrgunit: Boolean): EventDownloader {
+        return cf.bool(QueryParams.LIMIT_BY_ORGUNIT).eq(limitByOrgunit)!!
     }
 
-    public EventDownloader limitByProgram(Boolean limitByProgram) {
-        return cf.bool(QueryParams.LIMIT_BY_PROGRAM).eq(limitByProgram);
+    fun limitByProgram(limitByProgram: Boolean): EventDownloader {
+        return cf.bool(QueryParams.LIMIT_BY_PROGRAM).eq(limitByProgram)!!
     }
 
-    public EventDownloader limit(Integer limit) {
-        return cf.integer(QueryParams.LIMIT).eq(limit);
+    fun limit(limit: Int): EventDownloader {
+        return cf.integer(QueryParams.LIMIT).eq(limit)!!
     }
-
 }

From 4113c2dc43d59e9c651eed58e0eb29535184e138 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 11 Jul 2023 09:20:13 +0200
Subject: [PATCH 077/478] [ANDROSDK-1680] fix: - ",", ";", ":" characters in
 filters need to be escaped with "/" Cleaned up the code

---
 .../core/fileresource/FileResourceDownloader.kt      |  2 +-
 .../internal/FileResourceDownloadCall.kt             | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
index cea54a1139..60158d21be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
@@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.fileresource
 
 import dagger.Reusable
 import io.reactivex.Observable
-import kotlinx.coroutines.rx2.asObservable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index aced20f4eb..2901640566 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.fileresource.internal
 import android.content.Context
 import android.util.Log
 import dagger.Reusable
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import okhttp3.ResponseBody
@@ -49,7 +50,6 @@ import org.hisp.dhis.android.core.fileresource.FileResourceInternalAccessor
 import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import javax.inject.Inject
 
 @Reusable
 internal class FileResourceDownloadCall @Inject constructor(
@@ -103,7 +103,6 @@ internal class FileResourceDownloadCall @Inject constructor(
                 },
                 getUid = { v -> v.value() }
             )
-
         }
     }
 
@@ -149,7 +148,6 @@ internal class FileResourceDownloadCall @Inject constructor(
                             v.dataElement()!!,
                             FileResizerHelper.Dimension.MEDIUM.name
                         )
-
                     },
                     getUid = { v -> v.value() }
                 )
@@ -172,7 +170,7 @@ internal class FileResourceDownloadCall @Inject constructor(
         }
     }
 
-
+    @Suppress("NestedBlockDepth")
     private suspend fun <V> downloadFile(
         value: V,
         maxContentLength: Int?,
@@ -186,8 +184,8 @@ internal class FileResourceDownloadCall @Inject constructor(
                     coroutineAPICallExecutor.wrap { fileResourceService.getFileResource(uid) }.getOrThrow()
 
                 val acceptedContentLength = (maxContentLength == null) ||
-                        (fileResource.contentLength() == null) ||
-                        (fileResource.contentLength()!! <= maxContentLength)
+                    (fileResource.contentLength() == null) ||
+                    (fileResource.contentLength()!! <= maxContentLength)
 
                 if (acceptedContentLength && FileResourceInternalAccessor.isStored(fileResource)) {
                     val responseBody = coroutineAPICallExecutor.wrap { download(value) }.getOrThrow()
@@ -207,10 +205,8 @@ internal class FileResourceDownloadCall @Inject constructor(
                 null
             }
         }
-
     }
 
-
     companion object {
         const val defaultDownloadMaxContentLength: Int = 6000000
     }

From d31fe5ddf06de9e6349a719a359548cbf25d037f Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Tue, 11 Jul 2023 09:14:33 +0200
Subject: [PATCH 078/478] [ANDROSDK-1677] Change TrackDownloadCall parameter

---
 .../datavalue/internal/DataValueFileResourcePostCall.kt  | 2 +-
 .../org/hisp/dhis/android/core/event/EventDownloader.kt  | 9 +++------
 .../android/core/event/internal/EventDownloadCall.kt     | 4 +++-
 .../internal/TrackedEntityInstanceDownloadCall.kt        | 2 +-
 .../internal/TrackedEntityInstanceDownloader.kt          | 9 +++------
 .../android/core/tracker/exporter/TrackerDownloadCall.kt | 5 +++--
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
index 41d278241b..a86459048a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
@@ -40,7 +40,7 @@ internal class DataValueFileResourcePostCall @Inject constructor(
     private val fileResourceHelper: FileResourceHelper,
     private val fileResourcePostCall: FileResourcePostCall
 ) {
-    suspend fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
+    fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
         val fileResources = fileResourceHelper.getUploadableFileResources()
 
         return if (fileResources.isEmpty()) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
index bd3a3ca7e8..789e6003bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
@@ -30,9 +30,6 @@ package org.hisp.dhis.android.core.event
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector
@@ -60,10 +57,10 @@ class EventDownloader @Inject internal constructor(
      *
      * @return -
      */
-    fun download(): Observable<TrackerD2Progress> = flow {
+    fun download(): Observable<TrackerD2Progress> {
         val params = ProgramDataDownloadParams.fromRepositoryScope(scope)
-        emitAll(callFactory.download(params))
-    }.asObservable()
+        return callFactory.download(params)
+    }
 
     fun blockingDownload() {
         download().blockingSubscribe()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 5ea81b86fa..0e79bbcbaa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -50,12 +51,13 @@ internal class EventDownloadCall @Inject internal constructor(
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
     private val rxCallExecutor: RxAPICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val eventQueryBundleFactory: EventQueryBundleFactory,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val persistenceCallFactory: EventPersistenceCallFactory,
     private val lastUpdatedManager: EventLastUpdatedManager
 ) : TrackerDownloadCall<Event, EventQueryBundle>(
-    rxCallExecutor,
+    coroutineAPICallExecutor,
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index 154bdde336..69696f0be7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -57,7 +57,7 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     private val persistenceCallFactory: TrackedEntityInstancePersistenceCallFactory,
     private val lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager
 ) : TrackerDownloadCall<TrackedEntityInstance, TrackerQueryBundle>(
-    rxCallExecutor,
+    coroutineCallExecutor,
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
index eb05a35296..d2291fc0ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
@@ -30,9 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector
@@ -65,10 +62,10 @@ class TrackedEntityInstanceDownloader @Inject internal constructor(
      *
      * @return An Observable that notifies about the progress.
      */
-    fun download(): Observable<TrackerD2Progress> = flow {
+    fun download(): Observable<TrackerD2Progress> {
         val params = ProgramDataDownloadParams.fromRepositoryScope(scope)
-        emitAll(downloadCall.download(params))
-    }.asObservable()
+        return downloadCall.download(params)
+    }
 
     fun blockingDownload() {
         download().blockingSubscribe()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 398c5e3fa0..17e5104b69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -44,6 +44,7 @@ import kotlinx.coroutines.flow.fold
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.rx2.asFlow
 import kotlinx.coroutines.rx2.asFlowable
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.paging.internal.ApiPagingEngine
 import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
@@ -67,7 +68,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
 ) {
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = flow {
+    fun download(params: ProgramDataDownloadParams): Observable<TrackerD2Progress> = flow {
         val progressManager = TrackerD2ProgressManager(null)
         if (userOrganisationUnitLinkStore.count() == 0) {
             progressManager.setTotalCalls(1)
@@ -79,7 +80,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                     downloadBundle(params, progressManager)
                 }
         }
-    }
+    }.asObservable()
 
     private fun downloadBundle(
         params: ProgramDataDownloadParams,

From 45cf6bdfbf8a3798199fb3e123041eb0e942c1f4 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:14:44 +0200
Subject: [PATCH 079/478] [ANDROSDK-1710] Rename .java to .kt

---
 ...jectionTransformer.java => EnrollmentProjectionTransformer.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/{EnrollmentProjectionTransformer.java => EnrollmentProjectionTransformer.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.java
rename to core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt

From f7ff6b7c9d5cf580eb52abc8b31c2d01c745fa3c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:14:45 +0200
Subject: [PATCH 080/478] [ANDROSDK-1710] Move EnrollmentProjectionTransformer
 to kotlin

---
 .../EnrollmentCollectionRepository.java       |  4 +-
 .../internal/EnrollmentEntityDIModule.kt      |  8 ---
 .../EnrollmentProjectionTransformer.kt        | 59 +++++++++----------
 3 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
index 01e75bc925..ebb2c22457 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.enrollment;
 
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
@@ -45,6 +44,7 @@
 import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo.Columns;
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentFields;
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentProjectionTransformer;
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore;
 
 import java.util.Map;
@@ -65,7 +65,7 @@ public final class EnrollmentCollectionRepository extends ReadWriteWithUidCollec
             final EnrollmentStore store,
             final Map<String, ChildrenAppender<Enrollment>> childrenAppenders,
             final RepositoryScope scope,
-            final Transformer<EnrollmentCreateProjection, Enrollment> transformer,
+            final EnrollmentProjectionTransformer transformer,
             final TrackerDataManager trackerDataManager) {
         super(store, childrenAppenders, scope, transformer, new FilterConnectorFactory<>(scope, s ->
                 new EnrollmentCollectionRepository(store, childrenAppenders, s, transformer, trackerDataManager)));
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
index d2957043e4..bcec169004 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
@@ -31,10 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.enrollment.Enrollment
-import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
 import org.hisp.dhis.android.core.event.internal.EventHandler
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender
@@ -79,12 +77,6 @@ internal class EnrollmentEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun transformer(): Transformer<EnrollmentCreateProjection, Enrollment> {
-        return EnrollmentProjectionTransformer()
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Enrollment>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
index 9171e793a4..bf23598f69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
@@ -25,38 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.enrollment.internal
 
-package org.hisp.dhis.android.core.enrollment.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.enrollment.Enrollment;
-import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection;
-import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
-
-import java.util.Date;
-
-final class EnrollmentProjectionTransformer implements Transformer<EnrollmentCreateProjection, Enrollment> {
-
-    @Override
-    public Enrollment transform(EnrollmentCreateProjection projection) {
-        String generatedUid = new UidGeneratorImpl().generate();
-        Date creationDate = new Date();
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
+import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import java.util.Date
 
+@Reusable
+internal class EnrollmentProjectionTransformer : Transformer<EnrollmentCreateProjection, Enrollment> {
+    override fun transform(o: EnrollmentCreateProjection): Enrollment {
+        val generatedUid = UidGeneratorImpl().generate()
+        val creationDate = Date()
         return Enrollment.builder()
-                .uid(generatedUid)
-                .aggregatedSyncState(State.TO_POST)
-                .syncState(State.TO_POST)
-                .created(creationDate)
-                .lastUpdated(creationDate)
-                .createdAtClient(creationDate)
-                .lastUpdatedAtClient(creationDate)
-                .organisationUnit(projection.organisationUnit())
-                .program(projection.program())
-                .trackedEntityInstance(projection.trackedEntityInstance())
-                .status(EnrollmentStatus.ACTIVE)
-                .deleted(false)
-                .build();
+            .uid(generatedUid)
+            .aggregatedSyncState(State.TO_POST)
+            .syncState(State.TO_POST)
+            .created(creationDate)
+            .lastUpdated(creationDate)
+            .createdAtClient(creationDate)
+            .lastUpdatedAtClient(creationDate)
+            .organisationUnit(o.organisationUnit())
+            .program(o.program())
+            .trackedEntityInstance(o.trackedEntityInstance())
+            .status(EnrollmentStatus.ACTIVE)
+            .deleted(false)
+            .build()
     }
-}
\ No newline at end of file
+}

From f80c510ff4cc42d5b21585033fbd34893f6b4bb1 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:27:47 +0200
Subject: [PATCH 081/478] [ANDROSDK-1710] Add an inject to the constructor to
 EnrollmentProjectionTransformer

---
 .../enrollment/internal/EnrollmentProjectionTransformer.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
index bf23598f69..1515fb7923 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
@@ -28,16 +28,18 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
+import java.util.Date
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
-import java.util.Date
 
 @Reusable
-internal class EnrollmentProjectionTransformer : Transformer<EnrollmentCreateProjection, Enrollment> {
+internal class EnrollmentProjectionTransformer @Inject constructor() :
+    Transformer<EnrollmentCreateProjection, Enrollment> {
     override fun transform(o: EnrollmentCreateProjection): Enrollment {
         val generatedUid = UidGeneratorImpl().generate()
         val creationDate = Date()

From bc36d752d8ce1b69e44fb2ee52fa947b83b6e0a3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:35:13 +0200
Subject: [PATCH 082/478] [ANDROSDK-1710] Rename .java to .kt

---
 ...oteProjectionTransformer.java => NoteProjectionTransformer.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/note/internal/{NoteProjectionTransformer.java => NoteProjectionTransformer.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt

From 11931c07e3a8f124509530fb367765d4e82b982a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:35:14 +0200
Subject: [PATCH 083/478] [ANDROSDK-1710] Move NoteProjectionTransformer to
 kotlin

---
 .../core/note/NoteCollectionRepository.java   |  4 +-
 .../core/note/internal/NoteEntityDIModule.kt  |  8 ---
 .../internal/NoteProjectionTransformer.kt     | 66 ++++++++-----------
 3 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
index ff9091e392..6679714600 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.note;
 
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
@@ -43,6 +42,7 @@
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
 import org.hisp.dhis.android.core.note.NoteTableInfo.Columns;
+import org.hisp.dhis.android.core.note.internal.NoteProjectionTransformer;
 import org.hisp.dhis.android.core.note.internal.NoteStore;
 
 import java.util.Map;
@@ -61,7 +61,7 @@ public final class NoteCollectionRepository
     NoteCollectionRepository(final NoteStore store,
                              final Map<String, ChildrenAppender<Note>> childrenAppenders,
                              final RepositoryScope scope,
-                             final Transformer<NoteCreateProjection, Note> transformer,
+                             final NoteProjectionTransformer transformer,
                              final DataStatePropagator dataStatePropagator) {
         super(store, childrenAppenders, scope, transformer, new FilterConnectorFactory<>(scope,
                 s -> new NoteCollectionRepository(store, childrenAppenders, s, transformer, dataStatePropagator)));
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
index f416e5b368..576be3365b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
@@ -31,10 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.note.Note
-import org.hisp.dhis.android.core.note.NoteCreateProjection
 
 @Module
 internal class NoteEntityDIModule {
@@ -55,10 +53,4 @@ internal class NoteEntityDIModule {
     fun childrenAppenders(): Map<String, ChildrenAppender<Note>> {
         return emptyMap()
     }
-
-    @Provides
-    @Reusable
-    fun transformer(impl: NoteProjectionTransformer): Transformer<NoteCreateProjection, Note> {
-        return impl
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
index b6d737cc5b..cb6e990794 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
@@ -25,47 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.note.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.arch.storage.internal.Credentials;
-import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore;
-import org.hisp.dhis.android.core.arch.storage.internal.ObjectKeyValueStore;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.note.Note;
-import org.hisp.dhis.android.core.note.NoteCreateProjection;
-
-import java.util.Date;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.note.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.note.Note
+import org.hisp.dhis.android.core.note.NoteCreateProjection
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
-final class NoteProjectionTransformer implements Transformer<NoteCreateProjection, Note> {
-
-    private final ObjectKeyValueStore<Credentials> credentialsSecureStore;
-
-    @Inject
-    NoteProjectionTransformer(CredentialsSecureStore credentialsSecureStore) {
-        this.credentialsSecureStore = credentialsSecureStore;
-    }
+internal class NoteProjectionTransformer @Inject constructor(
+    private val credentialsSecureStore: CredentialsSecureStore
+) : Transformer<NoteCreateProjection, Note> {
 
-    @Override
-    public Note transform(NoteCreateProjection projection) {
+    override fun transform(o: NoteCreateProjection): Note {
         return Note.builder()
-                .uid(new UidGeneratorImpl().generate())
-                .syncState(State.TO_POST)
-                .noteType(projection.noteType())
-                .event(projection.event())
-                .enrollment(projection.enrollment())
-                .value(projection.value())
-                .storedBy(credentialsSecureStore.get().getUsername())
-                .storedDate(BaseIdentifiableObject.dateToDateStr(new Date()))
-                .deleted(false)
-                .build();
+            .uid(UidGeneratorImpl().generate())
+            .syncState(State.TO_POST)
+            .noteType(o.noteType())
+            .event(o.event())
+            .enrollment(o.enrollment())
+            .value(o.value())
+            .storedBy(credentialsSecureStore.get().username)
+            .storedDate(BaseIdentifiableObject.dateToDateStr(Date()))
+            .deleted(false)
+            .build()
     }
-}
\ No newline at end of file
+}

From d89478966b2be3e7bccd3e725d24a9a887865660 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:37:24 +0200
Subject: [PATCH 084/478] [ANDROSDK-1710] Rename .java to .kt

---
 ...ntProjectionTransformer.java => EventProjectionTransformer.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/event/internal/{EventProjectionTransformer.java => EventProjectionTransformer.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt

From eb01b98ae31151933469c5aa950ea57d7d55c00b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:37:25 +0200
Subject: [PATCH 085/478] [ANDROSDK-1710] Move EventProjectionTransformer to
 kotlin

---
 .../core/event/EventCollectionRepository.java |  4 +-
 .../event/internal/EventEntityDIModule.kt     |  8 ---
 .../internal/EventProjectionTransformer.kt    | 64 +++++++++----------
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
index bd0812ddd5..fe9cf74dc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
@@ -31,7 +31,6 @@
 
 import org.hisp.dhis.android.core.arch.call.D2Progress;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
@@ -50,6 +49,7 @@
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo;
 import org.hisp.dhis.android.core.event.internal.EventFields;
 import org.hisp.dhis.android.core.event.internal.EventPostParentCall;
+import org.hisp.dhis.android.core.event.internal.EventProjectionTransformer;
 import org.hisp.dhis.android.core.event.internal.EventStore;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo;
@@ -84,7 +84,7 @@ public final class EventCollectionRepository
                               final Map<String, ChildrenAppender<Event>> childrenAppenders,
                               final RepositoryScope scope,
                               final EventPostParentCall postCall,
-                              final Transformer<EventCreateProjection, Event> transformer,
+                              final EventProjectionTransformer transformer,
                               final TrackerDataManager trackerDataManager,
                               final JobQueryCall jobQueryCall) {
         super(store, childrenAppenders, scope, transformer,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
index ce60897a4a..9107fa6508 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
@@ -31,10 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.event.Event
-import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
 import org.hisp.dhis.android.core.note.internal.NoteForEventChildrenAppender
 import org.hisp.dhis.android.core.note.internal.NoteHandler
@@ -78,12 +76,6 @@ internal class EventEntityDIModule {
         )
     }
 
-    @Provides
-    @Reusable
-    fun transformer(): Transformer<EventCreateProjection, Event> {
-        return EventProjectionTransformer()
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Event>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
index 7f1105a98e..24171992c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
@@ -25,40 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.event.internal
 
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.event.EventCreateProjection;
-import org.hisp.dhis.android.core.event.EventStatus;
-
-import java.util.Date;
-
-final class EventProjectionTransformer implements Transformer<EventCreateProjection, Event> {
-
-    @Override
-    public Event transform(EventCreateProjection projection) {
-        String generatedUid = new UidGeneratorImpl().generate();
-        Date creationDate = new Date();
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.EventCreateProjection
+import org.hisp.dhis.android.core.event.EventStatus
+import java.util.Date
+import javax.inject.Inject
 
+@Reusable
+internal class EventProjectionTransformer @Inject constructor() : Transformer<EventCreateProjection, Event> {
+    override fun transform(o: EventCreateProjection): Event {
+        val generatedUid = UidGeneratorImpl().generate()
+        val creationDate = Date()
         return Event.builder()
-                .uid(generatedUid)
-                .aggregatedSyncState(State.TO_POST)
-                .syncState(State.TO_POST)
-                .created(creationDate)
-                .lastUpdated(creationDate)
-                .createdAtClient(creationDate)
-                .lastUpdatedAtClient(creationDate)
-                .enrollment(projection.enrollment())
-                .program(projection.program())
-                .programStage(projection.programStage())
-                .organisationUnit(projection.organisationUnit())
-                .attributeOptionCombo(projection.attributeOptionCombo())
-                .status(EventStatus.ACTIVE)
-                .deleted(false)
-                .build();
+            .uid(generatedUid)
+            .aggregatedSyncState(State.TO_POST)
+            .syncState(State.TO_POST)
+            .created(creationDate)
+            .lastUpdated(creationDate)
+            .createdAtClient(creationDate)
+            .lastUpdatedAtClient(creationDate)
+            .enrollment(o.enrollment())
+            .program(o.program())
+            .programStage(o.programStage())
+            .organisationUnit(o.organisationUnit())
+            .attributeOptionCombo(o.attributeOptionCombo())
+            .status(EventStatus.ACTIVE)
+            .deleted(false)
+            .build()
     }
-}
\ No newline at end of file
+}

From fa8f631ab26b28731da5152ddbd0b7e7aeedfbf5 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:40:53 +0200
Subject: [PATCH 086/478] [ANDROSDK-1710] Rename .java to .kt

---
 ...ctionTransformer.java => FileResourceProjectionTransformer.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/{FileResourceProjectionTransformer.java => FileResourceProjectionTransformer.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.java
rename to core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt

From 670870b8d76e1de6f8cf084f52d5e43fc29d5aa6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:40:54 +0200
Subject: [PATCH 087/478] [ANDROSDK-1710] Move
 FileResourceProjectionTransformer to kotlin

---
 .../FileResourceCollectionRepository.java     |  4 +-
 .../internal/FileResourceEntityDIModule.kt    |  8 ----
 .../FileResourceProjectionTransformer.kt      | 47 +++++++++----------
 3 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
index d1d8392129..61076bd5da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
@@ -34,7 +34,6 @@
 
 import org.hisp.dhis.android.core.arch.call.D2Progress;
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository;
@@ -48,6 +47,7 @@
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceProjectionTransformer;
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore;
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil;
 import org.hisp.dhis.android.core.maintenance.D2Error;
@@ -75,7 +75,7 @@ public final class FileResourceCollectionRepository
     FileResourceCollectionRepository(final FileResourceStore store,
                                      final Map<String, ChildrenAppender<FileResource>> childrenAppenders,
                                      final RepositoryScope scope,
-                                     final Transformer<File, FileResource> transformer,
+                                     final FileResourceProjectionTransformer transformer,
                                      final DataStatePropagator dataStatePropagator,
                                      final Context context) {
         super(store, childrenAppenders, scope, transformer,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
index 56cc10ab19..ceff4dddfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.fileresource.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.io.File
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.fileresource.FileResource
 
@@ -51,12 +49,6 @@ internal class FileResourceEntityDIModule {
         return FileResourceHandler(store)
     }
 
-    @Provides
-    @Reusable
-    fun transformer(): Transformer<File, FileResource> {
-        return FileResourceProjectionTransformer()
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<FileResource>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
index 8cf365f05d..bd24fdad9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
@@ -25,32 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.fileresource.internal
 
-package org.hisp.dhis.android.core.fileresource.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.fileresource.FileResource;
-import org.hisp.dhis.android.core.fileresource.FileResourceDomain;
-
-import java.io.File;
-import java.util.Date;
-
-final class FileResourceProjectionTransformer implements Transformer<File, FileResource> {
-
-    @Override
-    public FileResource transform(File file) {
-        Date creationDate = new Date();
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.fileresource.FileResource
+import org.hisp.dhis.android.core.fileresource.FileResourceDomain
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.getContentTypeFromName
+import java.io.File
+import java.util.Date
+import javax.inject.Inject
 
+@Reusable
+internal class FileResourceProjectionTransformer @Inject constructor() : Transformer<File, FileResource> {
+    override fun transform(o: File): FileResource {
+        val creationDate = Date()
         return FileResource.builder()
-                .syncState(State.TO_POST)
-                .name(file.getName())
-                .created(creationDate)
-                .lastUpdated(creationDate)
-                .contentLength(file.length())
-                .contentType(FileResourceUtil.getContentTypeFromName(file.getName()))
-                .path(file.getAbsolutePath())
-                .domain(FileResourceDomain.DATA_VALUE)
-                .build();
+            .syncState(State.TO_POST)
+            .name(o.name)
+            .created(creationDate)
+            .lastUpdated(creationDate)
+            .contentLength(o.length())
+            .contentType(getContentTypeFromName(o.name))
+            .path(o.absolutePath)
+            .domain(FileResourceDomain.DATA_VALUE)
+            .build()
     }
 }
\ No newline at end of file

From ccaedbdc7fca66668ad69f30372d39c3f5b04936 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:43:24 +0200
Subject: [PATCH 088/478] [ANDROSDK-1710] Rename .java to .kt

---
 ...sformer.java => TrackedEntityInstanceProjectionTransformer.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityInstanceProjectionTransformer.java => TrackedEntityInstanceProjectionTransformer.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt

From 2db7df675dedfa14eac94ad2181b7d4acb666796 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 13 Jul 2023 14:43:25 +0200
Subject: [PATCH 089/478] [ANDROSDK-1710] Move
 TrackedEntityInstanceProjectionTransformer to kotlin

---
 ...kedEntityInstanceCollectionRepository.java |  4 +-
 .../TrackedEntityInstanceEntityDIModule.kt    | 12 +---
 ...ckedEntityInstanceProjectionTransformer.kt | 56 +++++++++----------
 3 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java
index 0a3b283a7b..254baf6434 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java
@@ -30,7 +30,6 @@
 
 import org.hisp.dhis.android.core.arch.call.D2Progress;
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
@@ -48,6 +47,7 @@
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo.Columns;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePostParentCall;
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceProjectionTransformer;
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore;
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall;
 
@@ -76,7 +76,7 @@ public final class TrackedEntityInstanceCollectionRepository
             final TrackedEntityInstanceStore store,
             final Map<String, ChildrenAppender<TrackedEntityInstance>> childrenAppenders,
             final RepositoryScope scope,
-            final Transformer<TrackedEntityInstanceCreateProjection, TrackedEntityInstance> transformer,
+            final TrackedEntityInstanceProjectionTransformer transformer,
             final TrackerDataManager trackerDataManager,
             final TrackedEntityInstancePostParentCall postCall,
             final JobQueryCall jobQueryCall) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index 12d9e6f844..f7f37cc3d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -31,10 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import retrofit2.Retrofit
 
@@ -53,12 +51,6 @@ internal class TrackedEntityInstanceEntityDIModule {
         return retrofit.create(TrackedEntityInstanceService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun transformer(): Transformer<TrackedEntityInstanceCreateProjection, TrackedEntityInstance> {
-        return TrackedEntityInstanceProjectionTransformer()
-    }
-
     @Provides
     @Reusable
     fun uidHelper(impl: TrackedEntityInstanceUidHelperImpl): TrackedEntityInstanceUidHelper {
@@ -73,9 +65,9 @@ internal class TrackedEntityInstanceEntityDIModule {
     ): Map<String, ChildrenAppender<TrackedEntityInstance>> {
         return mapOf(
             TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES to
-                TrackedEntityAttributeValueChildrenAppender.create(databaseAdapter),
+                    TrackedEntityAttributeValueChildrenAppender.create(databaseAdapter),
             TrackedEntityInstanceFields.PROGRAM_OWNERS to
-                ProgramOwnerChildrenAppender(programOwnerStore)
+                    ProgramOwnerChildrenAppender(programOwnerStore)
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
index 3a803f258a..4e72c9af86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
@@ -25,36 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection;
-
-import java.util.Date;
-
-final class TrackedEntityInstanceProjectionTransformer
-        implements Transformer<TrackedEntityInstanceCreateProjection, TrackedEntityInstance> {
-
-    @Override
-    public TrackedEntityInstance transform(TrackedEntityInstanceCreateProjection projection) {
-        String generatedUid = new UidGeneratorImpl().generate();
-        Date creationDate = new Date();
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
+import java.util.Date
+import javax.inject.Inject
 
+@Reusable
+internal class TrackedEntityInstanceProjectionTransformer @Inject constructor() :
+    Transformer<TrackedEntityInstanceCreateProjection, TrackedEntityInstance> {
+    override fun transform(o: TrackedEntityInstanceCreateProjection): TrackedEntityInstance {
+        val generatedUid = UidGeneratorImpl().generate()
+        val creationDate = Date()
         return TrackedEntityInstance.builder()
-                .uid(generatedUid)
-                .aggregatedSyncState(State.TO_POST)
-                .syncState(State.TO_POST)
-                .created(creationDate)
-                .lastUpdated(creationDate)
-                .createdAtClient(creationDate)
-                .lastUpdatedAtClient(creationDate)
-                .organisationUnit(projection.organisationUnit())
-                .trackedEntityType(projection.trackedEntityType())
-                .deleted(false)
-                .build();
+            .uid(generatedUid)
+            .aggregatedSyncState(State.TO_POST)
+            .syncState(State.TO_POST)
+            .created(creationDate)
+            .lastUpdated(creationDate)
+            .createdAtClient(creationDate)
+            .lastUpdatedAtClient(creationDate)
+            .organisationUnit(o.organisationUnit())
+            .trackedEntityType(o.trackedEntityType())
+            .deleted(false)
+            .build()
     }
-}
\ No newline at end of file
+}

From ae122082308717722c066041564ae273c30bb4de Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 17 Jul 2023 10:12:10 +0200
Subject: [PATCH 090/478] [ANDROSDK-1710] Move UserUserCredentialsTransformer
 to a reusable kotlin class

---
 .../android/core/user/UserCredentialsObjectRepository.kt  | 6 +++---
 .../dhis/android/core/user/internal/UserEntityDIModule.kt | 8 --------
 .../core/user/internal/UserUserCredentialsTransformer.kt  | 5 ++++-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index 543cc22384..8c9951b7dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
@@ -37,13 +35,15 @@ import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyWi
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserCredentialsFields
 import org.hisp.dhis.android.core.user.internal.UserStore
+import org.hisp.dhis.android.core.user.internal.UserUserCredentialsTransformer
+import javax.inject.Inject
 
 @Reusable
 class UserCredentialsObjectRepository @Inject internal constructor(
     store: UserStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
     scope: RepositoryScope,
-    transformer: TwoWayTransformer<User, UserCredentials>
+    transformer: UserUserCredentialsTransformer
 ) : ReadOnlyObjectRepository<UserCredentials> by ReadOnlyWithTransformerObjectRepositoryImpl(
     store,
     childrenAppenders,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
index 4cc293acc7..4bbb180d72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
@@ -31,10 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.User
-import org.hisp.dhis.android.core.user.UserCredentials
 
 @Module
 internal class UserEntityDIModule {
@@ -51,10 +49,4 @@ internal class UserEntityDIModule {
             UserFields.USER_ROLES to userRoleChildrenAppender
         )
     }
-
-    @Provides
-    @Reusable
-    fun transformer(): TwoWayTransformer<User, UserCredentials> {
-        return UserUserCredentialsTransformer()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
index 05f3829fbc..5c14af9be0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
@@ -28,11 +28,14 @@
 
 package org.hisp.dhis.android.core.user.internal
 
+import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserCredentials
+import javax.inject.Inject
 
-internal class UserUserCredentialsTransformer : TwoWayTransformer<User, UserCredentials> {
+@Reusable
+internal class UserUserCredentialsTransformer @Inject constructor() : TwoWayTransformer<User, UserCredentials> {
     override fun transform(o: User): UserCredentials {
         return UserCredentials.builder()
             .name(o.name())

From 20bcbe2d0819db4d70ee0685743a98ac954144c3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 17 Jul 2023 10:14:58 +0200
Subject: [PATCH 091/478] [ANDROSDK-1710] Move StockUseCaseTransformer to a
 reusable kotlin class

---
 .../usecase/stock/StockUseCaseCollectionRepository.kt     | 6 +++---
 .../usecase/stock/internal/StockUseCaseEntityDIModule.kt  | 8 --------
 .../usecase/stock/internal/StockUseCaseTransformer.kt     | 3 ++-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index ead407d5fb..0bd002e8d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -28,21 +28,21 @@
 package org.hisp.dhis.android.core.usecase.stock
 
 import dagger.Reusable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransformer
+import javax.inject.Inject
 
 @Reusable
 class StockUseCaseCollectionRepository @Inject internal constructor(
     store: StockUseCaseStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<InternalStockUseCase>>,
     scope: RepositoryScope,
-    transformer: TwoWayTransformer<InternalStockUseCase, StockUseCase>,
+    transformer: StockUseCaseTransformer,
 ) : ReadOnlyWithUidCollectionRepository<StockUseCase> by
 ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<InternalStockUseCase, StockUseCase,
     StockUseCaseCollectionRepository>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
index c33a121e01..8789bc3e4c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
@@ -31,10 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import org.hisp.dhis.android.core.usecase.stock.StockUseCase
 
 @Module
 internal class StockUseCaseEntityDIModule {
@@ -44,12 +42,6 @@ internal class StockUseCaseEntityDIModule {
         return StockUseCaseStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
-    fun transformer(): TwoWayTransformer<InternalStockUseCase, StockUseCase> {
-        return StockUseCaseTransformer()
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(linkStore: StockUseCaseTransactionLinkStore):
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
index 054157020d..9c0a594da1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
@@ -32,9 +32,10 @@ import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransaction
+import javax.inject.Inject
 
 @Reusable
-internal class StockUseCaseTransformer : TwoWayTransformer<InternalStockUseCase, StockUseCase> {
+internal class StockUseCaseTransformer @Inject constructor() : TwoWayTransformer<InternalStockUseCase, StockUseCase> {
     override fun transform(o: InternalStockUseCase): StockUseCase {
         return StockUseCase(
             o.uid(),

From dd132c9285d588ad4340f000b1818ffc6f8858b3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 17 Jul 2023 10:28:43 +0200
Subject: [PATCH 092/478] [ANDROSDK-1710] ktlintFormat

---
 .../core/event/internal/EventProjectionTransformer.kt     | 4 ++--
 .../internal/FileResourceProjectionTransformer.kt         | 8 ++++----
 .../core/note/internal/NoteProjectionTransformer.kt       | 4 ++--
 .../internal/TrackedEntityInstanceEntityDIModule.kt       | 4 ++--
 .../TrackedEntityInstanceProjectionTransformer.kt         | 4 ++--
 .../usecase/stock/StockUseCaseCollectionRepository.kt     | 2 +-
 .../usecase/stock/internal/StockUseCaseTransformer.kt     | 2 +-
 .../android/core/user/UserCredentialsObjectRepository.kt  | 2 +-
 .../core/user/internal/UserUserCredentialsTransformer.kt  | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
index 24171992c1..036835479a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
+import java.util.Date
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.event.EventStatus
-import java.util.Date
-import javax.inject.Inject
 
 @Reusable
 internal class EventProjectionTransformer @Inject constructor() : Transformer<EventCreateProjection, Event> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
index bd24fdad9b..7682e5a9b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import dagger.Reusable
+import java.io.File
+import java.util.Date
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomain
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.getContentTypeFromName
-import java.io.File
-import java.util.Date
-import javax.inject.Inject
 
 @Reusable
 internal class FileResourceProjectionTransformer @Inject constructor() : Transformer<File, FileResource> {
@@ -52,4 +52,4 @@ internal class FileResourceProjectionTransformer @Inject constructor() : Transfo
             .domain(FileResourceDomain.DATA_VALUE)
             .build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
index cb6e990794..fbc6e4a32b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
@@ -28,6 +28,8 @@
 package org.hisp.dhis.android.core.note.internal
 
 import dagger.Reusable
+import java.util.Date
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -35,8 +37,6 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteCreateProjection
-import java.util.Date
-import javax.inject.Inject
 
 @Reusable
 internal class NoteProjectionTransformer @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index f7f37cc3d5..3458cf5306 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -65,9 +65,9 @@ internal class TrackedEntityInstanceEntityDIModule {
     ): Map<String, ChildrenAppender<TrackedEntityInstance>> {
         return mapOf(
             TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES to
-                    TrackedEntityAttributeValueChildrenAppender.create(databaseAdapter),
+                TrackedEntityAttributeValueChildrenAppender.create(databaseAdapter),
             TrackedEntityInstanceFields.PROGRAM_OWNERS to
-                    ProgramOwnerChildrenAppender(programOwnerStore)
+                ProgramOwnerChildrenAppender(programOwnerStore)
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
index 4e72c9af86..875f79a630 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
+import java.util.Date
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
-import java.util.Date
-import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceProjectionTransformer @Inject constructor() :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index 0bd002e8d1..6339789424 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.usecase.stock
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
@@ -35,7 +36,6 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransformer
-import javax.inject.Inject
 
 @Reusable
 class StockUseCaseCollectionRepository @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
index 9c0a594da1..97f8106df5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransaction
-import javax.inject.Inject
 
 @Reusable
 internal class StockUseCaseTransformer @Inject constructor() : TwoWayTransformer<InternalStockUseCase, StockUseCase> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index 8c9951b7dd..507161a52d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
@@ -36,7 +37,6 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserCredentialsFields
 import org.hisp.dhis.android.core.user.internal.UserStore
 import org.hisp.dhis.android.core.user.internal.UserUserCredentialsTransformer
-import javax.inject.Inject
 
 @Reusable
 class UserCredentialsObjectRepository @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
index 5c14af9be0..3e9d4633a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
@@ -29,10 +29,10 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserCredentials
-import javax.inject.Inject
 
 @Reusable
 internal class UserUserCredentialsTransformer @Inject constructor() : TwoWayTransformer<User, UserCredentials> {

From 081374ebc145c59c5d164ca72008bc1a3d23c350 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 09:19:32 +0200
Subject: [PATCH 093/478] [ANDROSDK-1702] Refactor Category Call DI

---
 .../core/category/internal/CategoryInternalModule.kt       | 5 ++---
 .../core/category/internal/CategoryModuleDownloader.kt     | 5 ++---
 .../core/category/internal/CategoryPackageDIModule.kt      | 7 -------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
index b54d13f40a..36e1f31621 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
@@ -28,13 +28,12 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCombo
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryInternalModule @Inject constructor(
-    val categoryCall: UidsCall<Category>,
+    val categoryCall: CategoryCall,
     val categoryComboCall: UidsCall<CategoryCombo>
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 125b91c58d..9ebfc11960 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -30,16 +30,15 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryOption
+import javax.inject.Inject
 
 @Reusable
 class CategoryModuleDownloader @Inject internal constructor(
-    private val categoryCall: UidsCall<Category>,
+    private val categoryCall: CategoryCall,
     private val categoryComboCall: UidsCall<CategoryCombo>,
     private val categoryOptionCall: UidsCall<CategoryOption>,
     private val categoryOptionOrganisationUnitsCall: CategoryOptionOrganisationUnitsCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
index 3c5bc35a2f..0ebc6977c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
@@ -31,7 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryModule
 import org.hisp.dhis.android.core.category.CategoryOption
@@ -69,12 +68,6 @@ internal class CategoryPackageDIModule {
         return retrofit.create(CategoryComboService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun categoryCall(impl: CategoryCall): UidsCall<Category> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun categoryOptionCall(impl: CategoryOptionCall): UidsCall<CategoryOption> {

From 1320c65b8ee33bd62707b3ec546d9f32eb948676 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 09:20:52 +0200
Subject: [PATCH 094/478] [ANDROSDK-1702] Refactor CategoryOption Call DI

---
 .../core/category/internal/CategoryModuleDownloader.kt     | 3 +--
 .../core/category/internal/CategoryPackageDIModule.kt      | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 9ebfc11960..38f5d46fd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -33,14 +33,13 @@ import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.category.CategoryCombo
-import org.hisp.dhis.android.core.category.CategoryOption
 import javax.inject.Inject
 
 @Reusable
 class CategoryModuleDownloader @Inject internal constructor(
     private val categoryCall: CategoryCall,
     private val categoryComboCall: UidsCall<CategoryCombo>,
-    private val categoryOptionCall: UidsCall<CategoryOption>,
+    private val categoryOptionCall: CategoryOptionCall,
     private val categoryOptionOrganisationUnitsCall: CategoryOptionOrganisationUnitsCall,
     private val categoryComboUidsSeeker: CategoryComboUidsSeeker,
     private val categoryCategoryOptionLinkPersistor: CategoryCategoryOptionLinkPersistor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
index 0ebc6977c9..507afe51de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
@@ -33,7 +33,6 @@ import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryModule
-import org.hisp.dhis.android.core.category.CategoryOption
 import retrofit2.Retrofit
 
 @Module(
@@ -68,12 +67,6 @@ internal class CategoryPackageDIModule {
         return retrofit.create(CategoryComboService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun categoryOptionCall(impl: CategoryOptionCall): UidsCall<CategoryOption> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun categoryComboCall(impl: CategoryComboCall): UidsCall<CategoryCombo> {

From 55c393783f4b8e3decd00643793958c2d163aa9a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 09:21:59 +0200
Subject: [PATCH 095/478] [ANDROSDK-1702] Refactor CategoryCombo Call DI

---
 .../core/category/internal/CategoryInternalModule.kt      | 4 +---
 .../core/category/internal/CategoryModuleDownloader.kt    | 4 +---
 .../core/category/internal/CategoryPackageDIModule.kt     | 8 --------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
index 36e1f31621..d27b421f70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
@@ -28,12 +28,10 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.category.CategoryCombo
 import javax.inject.Inject
 
 @Reusable
 internal class CategoryInternalModule @Inject constructor(
     val categoryCall: CategoryCall,
-    val categoryComboCall: UidsCall<CategoryCombo>
+    val categoryComboCall: CategoryComboCall
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 38f5d46fd9..0eef931fdb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -30,15 +30,13 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.category.CategoryCombo
 import javax.inject.Inject
 
 @Reusable
 class CategoryModuleDownloader @Inject internal constructor(
     private val categoryCall: CategoryCall,
-    private val categoryComboCall: UidsCall<CategoryCombo>,
+    private val categoryComboCall: CategoryComboCall,
     private val categoryOptionCall: CategoryOptionCall,
     private val categoryOptionOrganisationUnitsCall: CategoryOptionOrganisationUnitsCall,
     private val categoryComboUidsSeeker: CategoryComboUidsSeeker,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
index 507afe51de..293c63008f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryModule
 import retrofit2.Retrofit
 
@@ -67,12 +65,6 @@ internal class CategoryPackageDIModule {
         return retrofit.create(CategoryComboService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun categoryComboCall(impl: CategoryComboCall): UidsCall<CategoryCombo> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun module(impl: CategoryModuleImpl): CategoryModule {

From 9bc1dbf01851c2932b111130a2b337425f88e4c0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 09:28:49 +0200
Subject: [PATCH 096/478] [ANDROSDK-1702] Refactor OptionSet and DataSet Call
 DI

---
 .../android/core/arch/d2/internal/D2DIComponent.kt     |  6 +++---
 .../core/dataset/internal/DataSetModuleDownloader.kt   |  6 +++---
 .../core/event/internal/EventPackageDIModule.kt        |  8 --------
 .../core/legendset/internal/LegendPackageDIModule.kt   |  8 --------
 .../core/option/internal/OptionPackageDIModule.kt      |  7 -------
 .../core/program/internal/ProgramModuleDownloader.kt   | 10 +++++-----
 6 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index 08c8afbffe..68c71a7f27 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.arch.d2.internal
 import android.content.Context
 import androidx.annotation.VisibleForTesting
 import dagger.Component
-import javax.inject.Singleton
 import org.hisp.dhis.android.core.D2Configuration
 import org.hisp.dhis.android.core.analytics.AnalyticsPackageDIModule
 import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule
@@ -70,8 +69,8 @@ import org.hisp.dhis.android.core.maintenance.internal.MaintenancePackageDIModul
 import org.hisp.dhis.android.core.map.internal.MapPackageDIModule
 import org.hisp.dhis.android.core.note.internal.NotePackageDIModule
 import org.hisp.dhis.android.core.option.Option
-import org.hisp.dhis.android.core.option.OptionSet
 import org.hisp.dhis.android.core.option.internal.OptionPackageDIModule
+import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitPackageDIModule
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.period.internal.PeriodPackageDIModule
@@ -98,6 +97,7 @@ import org.hisp.dhis.android.core.visualization.internal.VisualizationPackageDIM
 import org.hisp.dhis.android.core.wipe.internal.WipeDIModule
 import org.hisp.dhis.android.core.wipe.internal.WipeModule
 import retrofit2.Retrofit
+import javax.inject.Singleton
 
 @Singleton
 @Component(
@@ -175,7 +175,7 @@ internal interface D2DIComponent {
     fun programCall(): UidsCall<Program>
 
     @VisibleForTesting
-    fun optionSetCall(): UidsCall<OptionSet>
+    fun optionSetCall(): OptionSetCall
 
     @VisibleForTesting
     fun optionCall(): UidsCall<Option>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index d76cb0488c..d52a2ca70f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
@@ -38,16 +37,17 @@ import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.Option
-import org.hisp.dhis.android.core.option.OptionSet
+import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.ValidationRule
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCall
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetModuleDownloader @Inject internal constructor(
     private val dataSetCallFactory: UidsCallFactory<DataSet>,
     private val dataElementCallFactory: UidsCallFactory<DataElement>,
-    private val optionSetCall: UidsCall<OptionSet>,
+    private val optionSetCall: OptionSetCall,
     private val optionCall: UidsCall<Option>,
     private val validationRuleCall: UidsCall<ValidationRule>,
     private val validationRuleUidsCall: ValidationRuleUidsCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
index 36b04b5445..13b5822d53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.event.EventModule
 import org.hisp.dhis.android.core.event.search.EventQueryEntityDIModule
 import retrofit2.Retrofit
@@ -58,12 +56,6 @@ internal class EventPackageDIModule {
         return impl
     }
 
-    @Provides
-    @Reusable
-    fun trackedEntityInstanceFilterCall(impl: EventFilterCall): UidsCall<EventFilter> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun eventFilterService(retrofit: Retrofit): EventFilterService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
index 855655ae4a..dd97a4565e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.legendset.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.legendset.LegendSet
 import org.hisp.dhis.android.core.legendset.LegendSetModule
 import retrofit2.Retrofit
 
@@ -49,12 +47,6 @@ internal class LegendPackageDIModule {
         return impl
     }
 
-    @Provides
-    @Reusable
-    fun legendSetCall(impl: LegendSetCall): UidsCall<LegendSet> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun legendSetService(retrofit: Retrofit): LegendSetService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
index 8ef95fec69..fd84adc22a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionModule
-import org.hisp.dhis.android.core.option.OptionSet
 import retrofit2.Retrofit
 
 @Module(
@@ -46,12 +45,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class OptionPackageDIModule {
-    @Provides
-    @Reusable
-    fun optionSetCall(impl: OptionSetCall): UidsCall<OptionSet> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun optionSetService(retrofit: Retrofit): OptionSetService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 2024e97e1e..46be08fb07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -30,15 +30,14 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.event.EventFilter
+import org.hisp.dhis.android.core.event.internal.EventFilterCall
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionGroup
-import org.hisp.dhis.android.core.option.OptionSet
+import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.Program
@@ -49,6 +48,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -59,10 +59,10 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val trackedEntityTypeCall: UidsCall<TrackedEntityType>,
     private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute>,
     private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter>,
-    private val eventFilterCall: UidsCall<EventFilter>,
+    private val eventFilterCall: EventFilterCall,
     private val programStageWorkingListCall: UidsCall<ProgramStageWorkingList>,
     private val relationshipTypeCall: ListCall<RelationshipType>,
-    private val optionSetCall: UidsCall<OptionSet>,
+    private val optionSetCall: OptionSetCall,
     private val optionCall: UidsCall<Option>,
     private val optionGroupCall: UidsCall<OptionGroup>,
     private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore

From 439597b087998426d02628c573ba5b72d70ba31c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:08:49 +0200
Subject: [PATCH 097/478] [ANDROSDK-1702] Refactor Option Call DI

---
 .../core/arch/d2/internal/D2DIComponent.kt        |  4 ++--
 .../dataset/internal/DataSetModuleDownloader.kt   |  4 ++--
 .../core/option/internal/OptionGroupCall.java     |  2 +-
 .../core/option/internal/OptionPackageDIModule.kt | 15 ---------------
 .../program/internal/ProgramModuleDownloader.kt   |  8 ++++----
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index 68c71a7f27..ed5d4f295a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -68,7 +68,7 @@ import org.hisp.dhis.android.core.legendset.internal.LegendPackageDIModule
 import org.hisp.dhis.android.core.maintenance.internal.MaintenancePackageDIModule
 import org.hisp.dhis.android.core.map.internal.MapPackageDIModule
 import org.hisp.dhis.android.core.note.internal.NotePackageDIModule
-import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionPackageDIModule
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitPackageDIModule
@@ -178,7 +178,7 @@ internal interface D2DIComponent {
     fun optionSetCall(): OptionSetCall
 
     @VisibleForTesting
-    fun optionCall(): UidsCall<Option>
+    fun optionCall(): OptionCall
 
     @VisibleForTesting
     fun dataElementCallFactory(): UidsCallFactory<DataElement>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index d52a2ca70f..0acd0fafa7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
-import org.hisp.dhis.android.core.option.Option
+import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.ValidationRule
@@ -48,7 +48,7 @@ internal class DataSetModuleDownloader @Inject internal constructor(
     private val dataSetCallFactory: UidsCallFactory<DataSet>,
     private val dataElementCallFactory: UidsCallFactory<DataElement>,
     private val optionSetCall: OptionSetCall,
-    private val optionCall: UidsCall<Option>,
+    private val optionCall: OptionCall,
     private val validationRuleCall: UidsCall<ValidationRule>,
     private val validationRuleUidsCall: ValidationRuleUidsCall,
     private val periodHandler: PeriodHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
index ee0545ebdf..f5a3ecea64 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
@@ -41,7 +41,7 @@
 import io.reactivex.Single;
 
 @Reusable
-final class OptionGroupCall implements UidsCall<OptionGroup> {
+public final class OptionGroupCall implements UidsCall<OptionGroup> {
 
     private static final int MAX_UID_LIST_SIZE = 130;
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
index fd84adc22a..35bc780590 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
@@ -30,9 +30,6 @@ package org.hisp.dhis.android.core.option.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.option.Option
-import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionModule
 import retrofit2.Retrofit
 
@@ -51,24 +48,12 @@ internal class OptionPackageDIModule {
         return retrofit.create(OptionSetService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun optionCall(impl: OptionCall): UidsCall<Option> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun optionService(retrofit: Retrofit): OptionService {
         return retrofit.create(OptionService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun optionGroupCall(impl: OptionGroupCall): UidsCall<OptionGroup> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun optionGroupService(retrofit: Retrofit): OptionGroupService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 46be08fb07..1aa9b1407f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
-import org.hisp.dhis.android.core.option.Option
-import org.hisp.dhis.android.core.option.OptionGroup
+import org.hisp.dhis.android.core.option.internal.OptionCall
+import org.hisp.dhis.android.core.option.internal.OptionGroupCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
@@ -63,8 +63,8 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val programStageWorkingListCall: UidsCall<ProgramStageWorkingList>,
     private val relationshipTypeCall: ListCall<RelationshipType>,
     private val optionSetCall: OptionSetCall,
-    private val optionCall: UidsCall<Option>,
-    private val optionGroupCall: UidsCall<OptionGroup>,
+    private val optionCall: OptionCall,
+    private val optionGroupCall: OptionGroupCall,
     private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore
 ) : UntypedModuleDownloader {
 

From 988dccd9e35a23784ebe3d5d8356633411bd9e90 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:13:39 +0200
Subject: [PATCH 098/478] [ANDROSDK-1702] Refactor Program and ProgramIndicator
 Call DI

---
 .../android/core/arch/d2/internal/D2DIComponent.kt |  5 ++---
 .../android/core/program/internal/ProgramCall.java |  2 +-
 .../internal/ProgramIndicatorModuleDownloader.kt   |  6 ++----
 .../program/internal/ProgramModuleDownloader.kt    |  3 +--
 .../program/internal/ProgramPackageDIModule.kt     | 14 --------------
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index ed5d4f295a..9fbdddb285 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -33,7 +33,6 @@ import dagger.Component
 import org.hisp.dhis.android.core.D2Configuration
 import org.hisp.dhis.android.core.analytics.AnalyticsPackageDIModule
 import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseDIModule
@@ -74,7 +73,7 @@ import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitPackageDIModule
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.period.internal.PeriodPackageDIModule
-import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.internal.ProgramCall
 import org.hisp.dhis.android.core.program.internal.ProgramPackageDIModule
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListPackageDIModule
 import org.hisp.dhis.android.core.relationship.internal.RelationshipPackageDIModule
@@ -172,7 +171,7 @@ internal interface D2DIComponent {
     fun internalModules(): D2InternalModules
 
     @VisibleForTesting
-    fun programCall(): UidsCall<Program>
+    fun programCall(): ProgramCall
 
     @VisibleForTesting
     fun optionSetCall(): OptionSetCall
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
index c2c842da42..45a841e124 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
@@ -43,7 +43,7 @@
 import io.reactivex.Single;
 
 @Reusable
-final class ProgramCall implements UidsCall<Program> {
+public final class ProgramCall implements UidsCall<Program> {
 
     private static final int MAX_UID_LIST_SIZE = 50;
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
index f5c65704ff..da76c455e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
@@ -31,14 +31,12 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.program.ProgramIndicator
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorModuleDownloader @Inject constructor(
-    private val programIndicatorCall: UidsCall<ProgramIndicator>,
+    private val programIndicatorCall: ProgramIndicatorCall,
     private val programIndicatorUidsSeeker: ProgramIndicatorUidsSeeker
 ) : UntypedModuleDownloader {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 1aa9b1407f..6c61e7a3e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -40,7 +40,6 @@ import org.hisp.dhis.android.core.option.internal.OptionGroupCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
-import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
@@ -53,7 +52,7 @@ import javax.inject.Inject
 @Reusable
 @Suppress("LongParameterList")
 internal class ProgramModuleDownloader @Inject constructor(
-    private val programCall: UidsCall<Program>,
+    private val programCall: ProgramCall,
     private val programStageCall: UidsCall<ProgramStage>,
     private val programRuleCall: UidsCall<ProgramRule>,
     private val trackedEntityTypeCall: UidsCall<TrackedEntityType>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
index 0562eb77d3..abd504742c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.program.Program
-import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramModule
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramStage
@@ -62,18 +60,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class ProgramPackageDIModule {
-    @Provides
-    @Reusable
-    fun programCall(impl: ProgramCall): UidsCall<Program> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun programIndicatorCall(impl: ProgramIndicatorCall): UidsCall<ProgramIndicator> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun programRuleCall(impl: ProgramRuleCall): UidsCall<ProgramRule> {

From 6121b77beab4df09073c267134e2c622c594334e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:14:41 +0200
Subject: [PATCH 099/478] [ANDROSDK-1702] Refactor ProgramRule Call DI

---
 .../core/program/internal/ProgramModuleDownloader.kt       | 3 +--
 .../core/program/internal/ProgramPackageDIModule.kt        | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 6c61e7a3e8..c901d49516 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -40,7 +40,6 @@ import org.hisp.dhis.android.core.option.internal.OptionGroupCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
-import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import org.hisp.dhis.android.core.relationship.RelationshipType
@@ -54,7 +53,7 @@ import javax.inject.Inject
 internal class ProgramModuleDownloader @Inject constructor(
     private val programCall: ProgramCall,
     private val programStageCall: UidsCall<ProgramStage>,
-    private val programRuleCall: UidsCall<ProgramRule>,
+    private val programRuleCall: ProgramRuleCall,
     private val trackedEntityTypeCall: UidsCall<TrackedEntityType>,
     private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute>,
     private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
index abd504742c..c6c34e5986 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
@@ -32,7 +32,6 @@ import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.program.ProgramModule
-import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorEngineEntityDIModule
 import retrofit2.Retrofit
@@ -60,12 +59,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class ProgramPackageDIModule {
-    @Provides
-    @Reusable
-    fun programRuleCall(impl: ProgramRuleCall): UidsCall<ProgramRule> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun programStageCall(impl: ProgramStageCall): UidsCall<ProgramStage> {

From c15175bea0575e3b3a0356355237614a490c6c92 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:15:34 +0200
Subject: [PATCH 100/478] [ANDROSDK-1702] Refactor ProgramStage Call DI

---
 .../core/program/internal/ProgramModuleDownloader.kt      | 3 +--
 .../core/program/internal/ProgramPackageDIModule.kt       | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index c901d49516..35ea805278 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -40,7 +40,6 @@ import org.hisp.dhis.android.core.option.internal.OptionGroupCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
-import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
@@ -52,7 +51,7 @@ import javax.inject.Inject
 @Suppress("LongParameterList")
 internal class ProgramModuleDownloader @Inject constructor(
     private val programCall: ProgramCall,
-    private val programStageCall: UidsCall<ProgramStage>,
+    private val programStageCall: ProgramStageCall,
     private val programRuleCall: ProgramRuleCall,
     private val trackedEntityTypeCall: UidsCall<TrackedEntityType>,
     private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
index c6c34e5986..86fe2707b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.program.ProgramModule
-import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorEngineEntityDIModule
 import retrofit2.Retrofit
 
@@ -59,12 +57,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class ProgramPackageDIModule {
-    @Provides
-    @Reusable
-    fun programStageCall(impl: ProgramStageCall): UidsCall<ProgramStage> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun programRuleService(retrofit: Retrofit): ProgramRuleService {

From 73b60e4588c533b51655d52723c81320ae3d42b9 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:17:32 +0200
Subject: [PATCH 101/478] [ANDROSDK-1702] Refactor ProgramStageWorkingList Call
 DI

---
 .../core/program/internal/ProgramModuleDownloader.kt   |  4 ++--
 .../internal/ProgramStageWorkingListPackageDIModule.kt | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 35ea805278..266dd82455 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.option.internal.OptionGroupCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListCall
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
@@ -57,7 +57,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute>,
     private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter>,
     private val eventFilterCall: EventFilterCall,
-    private val programStageWorkingListCall: UidsCall<ProgramStageWorkingList>,
+    private val programStageWorkingListCall: ProgramStageWorkingListCall,
     private val relationshipTypeCall: ListCall<RelationshipType>,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
index 012aea1451..47c57c8879 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
@@ -28,10 +28,6 @@
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 
 @Module(
     includes = [
@@ -41,10 +37,4 @@ import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingLis
     ]
 )
 internal class ProgramStageWorkingListPackageDIModule {
-
-    @Reusable
-    @Provides
-    fun call(impl: ProgramStageWorkingListCall): UidsCall<ProgramStageWorkingList> {
-        return impl
-    }
 }

From 1b7cb83e32c3254339689c98972fa1b701636080 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:22:12 +0200
Subject: [PATCH 102/478] [ANDROSDK-1702] Refactor Visualization Call DI

---
 .../internal/ProgramModuleDownloader.kt       |  4 +-
 .../TrackedEntityPackageDIModule.kt           |  7 ----
 .../internal/VisualizationInternalModule.kt   |  4 +-
 .../internal/VisualizationModuleDownloader.kt |  5 +--
 .../internal/VisualizationPackageDIModule.kt  |  8 ----
 .../internal/ProgramModuleDownloaderShould.kt | 40 +++++++++----------
 6 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 266dd82455..d711363662 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -44,7 +44,7 @@ import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageW
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
 import javax.inject.Inject
 
 @Reusable
@@ -53,7 +53,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val programCall: ProgramCall,
     private val programStageCall: ProgramStageCall,
     private val programRuleCall: ProgramRuleCall,
-    private val trackedEntityTypeCall: UidsCall<TrackedEntityType>,
+    private val trackedEntityTypeCall: TrackedEntityTypeCall,
     private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute>,
     private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter>,
     private val eventFilterCall: EventFilterCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
index 4b6bc5a955..2db78b5f5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
@@ -50,7 +50,6 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFi
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSyncEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityModuleImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeService
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipEntityDIModule
@@ -76,12 +75,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class TrackedEntityPackageDIModule {
-    @Provides
-    @Reusable
-    fun trackedEntityTypeCall(impl: TrackedEntityTypeCall): UidsCall<TrackedEntityType> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun trackedEntityTypeService(retrofit: Retrofit): TrackedEntityTypeService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
index 043664816e..1a1e15e7c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
@@ -30,10 +30,8 @@ package org.hisp.dhis.android.core.visualization.internal
 import androidx.annotation.VisibleForTesting
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.visualization.Visualization
 
 @Reusable
 internal class VisualizationInternalModule @Inject internal constructor(
-    @field:VisibleForTesting val visualizationCall: UidsCall<Visualization>
+    @field:VisibleForTesting val visualizationCall: VisualizationCall
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index 88685b8d99..4e3c5bae81 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -29,15 +29,14 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.visualization.Visualization
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationModuleDownloader @Inject internal constructor(
-    private val visualizationCall: UidsCall<Visualization>,
+    private val visualizationCall: VisualizationCall,
     private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore
 ) :
     TypedModuleDownloader<List<Visualization>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
index 72fe1eb5c2..b70233312d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.visualization.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationModule
 import retrofit2.Retrofit
 
@@ -42,12 +40,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class VisualizationPackageDIModule {
-    @Provides
-    @Reusable
-    fun visualizationCall(impl: VisualizationCall): UidsCall<Visualization> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun visualizationService(retrofit: Retrofit): VisualizationService {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index 0dc6375910..7eb80e3085 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -31,49 +31,49 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
-import javax.net.ssl.HttpsURLConnection
 import okhttp3.MediaType
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.BaseCallShould
-import org.hisp.dhis.android.core.event.EventFilter
-import org.hisp.dhis.android.core.option.Option
-import org.hisp.dhis.android.core.option.OptionGroup
-import org.hisp.dhis.android.core.option.OptionSet
+import org.hisp.dhis.android.core.event.internal.EventFilterCall
+import org.hisp.dhis.android.core.option.internal.OptionCall
+import org.hisp.dhis.android.core.option.internal.OptionGroupCall
+import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.Program
-import org.hisp.dhis.android.core.program.ProgramRule
-import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListCall
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.ArgumentMatchers
 import retrofit2.Response
+import javax.net.ssl.HttpsURLConnection
 
 @RunWith(JUnit4::class)
 class ProgramModuleDownloaderShould : BaseCallShould() {
     private val program: Program = mock()
     private val trackedEntityType: TrackedEntityType = mock()
     private val trackedEntityAttribute: TrackedEntityAttribute = mock()
-    private val programCall: UidsCall<Program> = mock()
-    private val programStageCall: UidsCall<ProgramStage> = mock()
-    private val programRuleCall: UidsCall<ProgramRule> = mock()
-    private val trackedEntityTypeCall: UidsCall<TrackedEntityType> = mock()
-    private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute> = mock()
-    private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter> = mock()
-    private val eventFilterCall: UidsCall<EventFilter> = mock()
-    private val programStageWorkingListCall: UidsCall<ProgramStageWorkingList> = mock()
+    private val programCall: ProgramCall = mock()
+    private val programStageCall: ProgramStageCall = mock()
+    private val programRuleCall: ProgramRuleCall = mock()
+    private val trackedEntityTypeCall: TrackedEntityTypeCall = mock()
+    private val trackedEntityAttributeCall: TrackedEntityAttributeCall = mock()
+    private val trackedEntityInstanceFilterCall: TrackedEntityInstanceFilterCall = mock()
+    private val eventFilterCall: EventFilterCall = mock()
+    private val programStageWorkingListCall: ProgramStageWorkingListCall = mock()
     private val relationshipTypeCall: ListCall<RelationshipType> = mock()
-    private val optionSetCall: UidsCall<OptionSet> = mock()
-    private val optionCall: UidsCall<Option> = mock()
-    private val optionGroupCall: UidsCall<OptionGroup> = mock()
+    private val optionSetCall: OptionSetCall = mock()
+    private val optionCall: OptionCall = mock()
+    private val optionGroupCall: OptionGroupCall = mock()
     private val organisationUnitProgramLinkLinkStore: OrganisationUnitProgramLinkStore = mock()
 
     // object to test

From 64e030d50ff9fb9383cf4ecbbd733a5d854f84dc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:22:54 +0200
Subject: [PATCH 103/478] [ANDROSDK-1702] Refactor TrackedEntityAttribute Call
 DI

---
 .../core/program/internal/ProgramModuleDownloader.kt       | 4 ++--
 .../core/trackedentity/TrackedEntityPackageDIModule.kt     | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index d711363662..41b60a5a35 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -42,8 +42,8 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTa
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListCall
 import org.hisp.dhis.android.core.relationship.RelationshipType
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
 import javax.inject.Inject
 
@@ -54,7 +54,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val programStageCall: ProgramStageCall,
     private val programRuleCall: ProgramRuleCall,
     private val trackedEntityTypeCall: TrackedEntityTypeCall,
-    private val trackedEntityAttributeCall: UidsCall<TrackedEntityAttribute>,
+    private val trackedEntityAttributeCall: TrackedEntityAttributeCall,
     private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter>,
     private val eventFilterCall: EventFilterCall,
     private val programStageWorkingListCall: ProgramStageWorkingListCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
index 2db78b5f5e..184817bf54 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEndpointCallFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEntityDIModule
@@ -81,12 +80,6 @@ internal class TrackedEntityPackageDIModule {
         return retrofit.create(TrackedEntityTypeService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun trackedEntityAttributeCall(impl: TrackedEntityAttributeCall): UidsCall<TrackedEntityAttribute> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun trackedEntityAttributeService(retrofit: Retrofit): TrackedEntityAttributeService {

From 8d75bc5ac0219b96008c33d5e3dda56c505902d4 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:23:57 +0200
Subject: [PATCH 104/478] [ANDROSDK-1702] Refactor TrackedEntityInstanceFilter
 Call DI

---
 .../core/program/internal/ProgramModuleDownloader.kt      | 5 ++---
 .../core/trackedentity/TrackedEntityPackageDIModule.kt    | 8 --------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 41b60a5a35..fc039305a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -31,7 +31,6 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -42,8 +41,8 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTa
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListCall
 import org.hisp.dhis.android.core.relationship.RelationshipType
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
 import javax.inject.Inject
 
@@ -55,7 +54,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val programRuleCall: ProgramRuleCall,
     private val trackedEntityTypeCall: TrackedEntityTypeCall,
     private val trackedEntityAttributeCall: TrackedEntityAttributeCall,
-    private val trackedEntityInstanceFilterCall: UidsCall<TrackedEntityInstanceFilter>,
+    private val trackedEntityInstanceFilterCall: TrackedEntityInstanceFilterCall,
     private val eventFilterCall: EventFilterCall,
     private val programStageWorkingListCall: ProgramStageWorkingListCall,
     private val relationshipTypeCall: ListCall<RelationshipType>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
index 184817bf54..a34f231d41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
@@ -31,7 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeEntityDIModule
@@ -43,7 +42,6 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeV
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEventFilterEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterEntityDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterService
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSyncEntityDIModule
@@ -94,12 +92,6 @@ internal class TrackedEntityPackageDIModule {
         return impl
     }
 
-    @Provides
-    @Reusable
-    fun trackedEntityInstanceFilterCall(impl: TrackedEntityInstanceFilterCall): UidsCall<TrackedEntityInstanceFilter> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun trackedEntityInstanceFilterService(retrofit: Retrofit): TrackedEntityInstanceFilterService {

From 0dac0be2c6470d7d7416f4d136940ad57cbfaccc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:25:18 +0200
Subject: [PATCH 105/478] [ANDROSDK-1702] Refactor ValidationRule Call DI

---
 .../android/core/dataset/internal/DataSetModuleDownloader.kt | 5 ++---
 .../android/core/validation/internal/ValidationRuleCall.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index 0acd0fafa7..1ea9d6d13b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
@@ -39,7 +38,7 @@ import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
-import org.hisp.dhis.android.core.validation.ValidationRule
+import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCall
 import javax.inject.Inject
 
@@ -49,7 +48,7 @@ internal class DataSetModuleDownloader @Inject internal constructor(
     private val dataElementCallFactory: UidsCallFactory<DataElement>,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
-    private val validationRuleCall: UidsCall<ValidationRule>,
+    private val validationRuleCall: ValidationRuleCall,
     private val validationRuleUidsCall: ValidationRuleUidsCall,
     private val periodHandler: PeriodHandler,
     private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
index 696e37421e..ffefc77a9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
@@ -42,7 +42,7 @@
 import io.reactivex.Single;
 
 @Reusable
-final class ValidationRuleCall implements UidsCall<ValidationRule> {
+public final class ValidationRuleCall implements UidsCall<ValidationRule> {
 
     private static final int MAX_UID_LIST_SIZE = 64;
 

From e7ed5779cc8bbfdbde9971050908fdbc54ac630b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:27:23 +0200
Subject: [PATCH 106/478] [ANDROSDK-1702] Refactor ValidationRule Call provides
 DI

---
 .../core/validation/internal/ValidationPackageDIModule.kt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
index a0b67fbf61..af54e4ce76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.validation.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.validation.ValidationModule
-import org.hisp.dhis.android.core.validation.ValidationRule
 import org.hisp.dhis.android.core.validation.engine.internal.ValidationEngineEntityDIModule
 import retrofit2.Retrofit
 
@@ -44,12 +42,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class ValidationPackageDIModule {
-    @Provides
-    @Reusable
-    fun validationRuleCall(impl: ValidationRuleCall): UidsCall<ValidationRule> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun validationRuleUidsCall(impl: ValidationRuleUidsCallImpl): ValidationRuleUidsCall {

From 50e485d89c6aecd6c7dc35b7de2ed77d2755277e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:41:50 +0200
Subject: [PATCH 107/478] [ANDROSDK-1702] Refactor List Calls DI

---
 .../internal/OrganisationUnitLevelEntityDIModule.kt       | 7 -------
 .../core/program/internal/ProgramModuleDownloader.kt      | 5 ++---
 .../relationship/internal/RelationshipPackageDIModule.kt  | 8 --------
 .../core/relationship/internal/RelationshipTypeCall.java  | 2 +-
 .../program/internal/ProgramModuleDownloaderShould.kt     | 5 ++---
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
index ba83c3e25c..2750b04aea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
@@ -56,12 +55,6 @@ internal class OrganisationUnitLevelEntityDIModule {
         return retrofit.create(OrganisationUnitLevelService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun organisationUnitLevelCallFactory(impl: OrganisationUnitLevelEndpointCall): ListCall<OrganisationUnitLevel> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun childrenAppenders(): Map<String, ChildrenAppender<OrganisationUnitLevel>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index fc039305a3..4545d37c28 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -40,7 +39,7 @@ import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListCall
-import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
@@ -57,7 +56,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val trackedEntityInstanceFilterCall: TrackedEntityInstanceFilterCall,
     private val eventFilterCall: EventFilterCall,
     private val programStageWorkingListCall: ProgramStageWorkingListCall,
-    private val relationshipTypeCall: ListCall<RelationshipType>,
+    private val relationshipTypeCall: RelationshipTypeCall,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val optionGroupCall: OptionGroupCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
index d9c7f12a9b..265b9e9b8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.relationship.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.relationship.RelationshipModule
-import org.hisp.dhis.android.core.relationship.RelationshipType
 import retrofit2.Retrofit
 
 @Module(
@@ -44,12 +42,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class RelationshipPackageDIModule {
-    @Provides
-    @Reusable
-    fun relationshipCall(impl: RelationshipTypeCall): ListCall<RelationshipType> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun relationshipTypeService(retrofit: Retrofit): RelationshipTypeService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
index 755001f419..164fa690b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
@@ -42,7 +42,7 @@
 import io.reactivex.Single;
 
 @Reusable
-final class RelationshipTypeCall implements ListCall<RelationshipType> {
+public final class RelationshipTypeCall implements ListCall<RelationshipType> {
 
     private final Resource.Type resourceType = Resource.Type.RELATIONSHIP_TYPE;
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index 7eb80e3085..1e07e443c4 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -33,7 +33,6 @@ import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
 import okhttp3.MediaType
 import okhttp3.ResponseBody
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -43,7 +42,7 @@ import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListCall
-import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCall
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
@@ -70,7 +69,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
     private val trackedEntityInstanceFilterCall: TrackedEntityInstanceFilterCall = mock()
     private val eventFilterCall: EventFilterCall = mock()
     private val programStageWorkingListCall: ProgramStageWorkingListCall = mock()
-    private val relationshipTypeCall: ListCall<RelationshipType> = mock()
+    private val relationshipTypeCall: RelationshipTypeCall = mock()
     private val optionSetCall: OptionSetCall = mock()
     private val optionCall: OptionCall = mock()
     private val optionGroupCall: OptionGroupCall = mock()

From 1b2f587d0809e998c24811c59894b4e86351782c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 10:45:42 +0200
Subject: [PATCH 108/478] [ANDROSDK-1702] Refactor Query Calls DI

---
 .../internal/DataApprovalPackageDIModule.kt          |  8 --------
 .../core/dataset/internal/DataSetPackageDIModule.kt  | 10 ----------
 .../datavalue/internal/DataValuePackageDIModule.kt   |  8 --------
 .../aggregated/data/internal/AggregatedDataCall.kt   | 12 +++++++-----
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
index 0d5266bd61..147d8d769b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
@@ -30,18 +30,10 @@ package org.hisp.dhis.android.core.dataapproval.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
-import org.hisp.dhis.android.core.dataapproval.DataApproval
 import retrofit2.Retrofit
 
 @Module(includes = [DataApprovalEntityDIModule::class])
 internal class DataApprovalPackageDIModule {
-    @Provides
-    @Reusable
-    fun dataApprovalCallFactory(dataApprovalCall: DataApprovalCall): QueryCall<DataApproval, DataApprovalQuery> {
-        return dataApprovalCall
-    }
-
     @Provides
     @Reusable
     fun dataApprovalService(retrofit: Retrofit): DataApprovalService {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
index d0319b9063..1505865a43 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
@@ -30,10 +30,8 @@ package org.hisp.dhis.android.core.dataset.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 import org.hisp.dhis.android.core.dataset.DataSetModule
 import retrofit2.Retrofit
 
@@ -53,14 +51,6 @@ import retrofit2.Retrofit
     ]
 )
 internal class DataSetPackageDIModule {
-    @Provides
-    @Reusable
-    fun dataSetCompleteRegistrationCallFactory(
-        impl: DataSetCompleteRegistrationCall
-    ): QueryCall<DataSetCompleteRegistration, DataSetCompleteRegistrationQuery> {
-        return impl
-    }
-
     @Provides
     @Reusable
     fun dataSetEndpointCallFactory(impl: DataSetEndpointCallFactory): UidsCallFactory<DataSet> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
index 7ea87a9a9a..d4e5839dca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.datavalue.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
-import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueModule
 import retrofit2.Retrofit
 
@@ -43,12 +41,6 @@ internal class DataValuePackageDIModule {
         return retrofit.create(DataValueService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun dataValueCall(callImpl: DataValueCall): QueryCall<DataValue, DataValueQuery> {
-        return callImpl
-    }
-
     @Provides
     @Reusable
     fun module(impl: DataValueModuleImpl): DataValueModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index 0da0c7024f..4c544ebf25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapLatest
@@ -36,30 +35,33 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asFlow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2ProgressSyncStatus
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.dataapproval.DataApproval
+import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalCall
 import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalQuery
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationCall
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationQuery
 import org.hisp.dhis.android.core.datavalue.DataValue
+import org.hisp.dhis.android.core.datavalue.internal.DataValueCall
 import org.hisp.dhis.android.core.datavalue.internal.DataValueQuery
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
 internal class AggregatedDataCall @Inject constructor(
     private val systemInfoModuleDownloader: SystemInfoModuleDownloader,
-    private val dataValueCall: QueryCall<DataValue, DataValueQuery>,
-    private val dsCompleteRegistrationCall: QueryCall<DataSetCompleteRegistration, DataSetCompleteRegistrationQuery>,
-    private val dataApprovalCall: QueryCall<DataApproval, DataApprovalQuery>,
+    private val dataValueCall: DataValueCall,
+    private val dsCompleteRegistrationCall: DataSetCompleteRegistrationCall,
+    private val dataApprovalCall: DataApprovalCall,
     private val categoryOptionComboStore: CategoryOptionComboStore,
     private val coroutineCallExecutor: CoroutineAPICallExecutor,
     private val aggregatedDataSyncStore: AggregatedDataSyncStore,

From 6047fa990e939e2ae6918767eac24c144fa08257 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 18 Jul 2023 11:12:46 +0200
Subject: [PATCH 109/478] [ANDROSDK-1702] ktlintFormat

---
 .../hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt   | 2 +-
 .../android/core/category/internal/CategoryModuleDownloader.kt | 2 +-
 .../android/core/dataset/internal/DataSetModuleDownloader.kt   | 2 +-
 .../core/domain/aggregated/data/internal/AggregatedDataCall.kt | 2 +-
 .../core/program/internal/ProgramIndicatorModuleDownloader.kt  | 2 +-
 .../android/core/program/internal/ProgramModuleDownloader.kt   | 2 +-
 .../internal/ProgramStageWorkingListPackageDIModule.kt         | 3 +--
 .../visualization/internal/VisualizationModuleDownloader.kt    | 2 +-
 .../core/program/internal/ProgramModuleDownloaderShould.kt     | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index 9fbdddb285..c505c95e7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.arch.d2.internal
 import android.content.Context
 import androidx.annotation.VisibleForTesting
 import dagger.Component
+import javax.inject.Singleton
 import org.hisp.dhis.android.core.D2Configuration
 import org.hisp.dhis.android.core.analytics.AnalyticsPackageDIModule
 import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule
@@ -96,7 +97,6 @@ import org.hisp.dhis.android.core.visualization.internal.VisualizationPackageDIM
 import org.hisp.dhis.android.core.wipe.internal.WipeDIModule
 import org.hisp.dhis.android.core.wipe.internal.WipeModule
 import retrofit2.Retrofit
-import javax.inject.Singleton
 
 @Singleton
 @Component(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 0eef931fdb..a375dc33c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -30,8 +30,8 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 
 @Reusable
 class CategoryModuleDownloader @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index 1ea9d6d13b..5332e7975e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
@@ -40,7 +41,6 @@ import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCall
-import javax.inject.Inject
 
 @Reusable
 internal class DataSetModuleDownloader @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index 4c544ebf25..66c56eaa88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapLatest
@@ -53,7 +54,6 @@ import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
-import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
index da76c455e9..416e536e21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
@@ -31,8 +31,8 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 
 @Reusable
 internal class ProgramIndicatorModuleDownloader @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 4545d37c28..1a3098c848 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -43,7 +44,6 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
-import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
index 47c57c8879..13e4867944 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
@@ -36,5 +36,4 @@ import dagger.Module
         ProgramStageWorkingListAttributeValueFilterEntityDIModule::class
     ]
 )
-internal class ProgramStageWorkingListPackageDIModule {
-}
+internal class ProgramStageWorkingListPackageDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index 4e3c5bae81..89fecb72a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.visualization.Visualization
-import javax.inject.Inject
 
 @Reusable
 internal class VisualizationModuleDownloader @Inject internal constructor(
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index 1e07e443c4..87f728abf4 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -31,6 +31,7 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
+import javax.net.ssl.HttpsURLConnection
 import okhttp3.MediaType
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
@@ -54,7 +55,6 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.ArgumentMatchers
 import retrofit2.Response
-import javax.net.ssl.HttpsURLConnection
 
 @RunWith(JUnit4::class)
 class ProgramModuleDownloaderShould : BaseCallShould() {

From d1ba114d90a2b3de80e260fd722971f3d4c48d11 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Tue, 18 Jul 2023 12:01:32 +0200
Subject: [PATCH 110/478] [ANDROSDK-1677] Remove flow from iterationBundle

---
 .../android/core/event/EventDownloader.kt     |  3 +-
 .../TrackedEntityInstanceDownloader.kt        |  3 +-
 .../tracker/exporter/TrackerDownloadCall.kt   | 57 +++++++------------
 3 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
index 789e6003bb..e2aedfe325 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.event
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector
@@ -59,7 +60,7 @@ class EventDownloader @Inject internal constructor(
      */
     fun download(): Observable<TrackerD2Progress> {
         val params = ProgramDataDownloadParams.fromRepositoryScope(scope)
-        return callFactory.download(params)
+        return callFactory.download(params).asObservable()
     }
 
     fun blockingDownload() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
index d2291fc0ac..553778e4cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.UnwrappedEqInFilterConnector
@@ -64,7 +65,7 @@ class TrackedEntityInstanceDownloader @Inject internal constructor(
      */
     fun download(): Observable<TrackerD2Progress> {
         val params = ProgramDataDownloadParams.fromRepositoryScope(scope)
-        return downloadCall.download(params)
+        return downloadCall.download(params).asObservable()
     }
 
     fun blockingDownload() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 17e5104b69..2d3559d468 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -34,17 +34,11 @@ import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.fold
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.rx2.asFlow
-import kotlinx.coroutines.rx2.asFlowable
-import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.paging.internal.ApiPagingEngine
 import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
@@ -68,33 +62,27 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
 ) {
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    fun download(params: ProgramDataDownloadParams): Observable<TrackerD2Progress> = flow {
+    fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = flow {
         val progressManager = TrackerD2ProgressManager(null)
         if (userOrganisationUnitLinkStore.count() == 0) {
             progressManager.setTotalCalls(1)
             emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, true))
         } else {
+            val relatives = RelationshipItemRelatives()
             systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
                 .asFlow()
                 .flatMapLatest {
-                    downloadBundle(params, progressManager)
+                    coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+                        merge(
+                            downloadInternal(params, progressManager, relatives),
+                            downloadRelationships(progressManager, relatives),
+                            flow { emit(progressManager.complete()) }
+                        )
+                    }
+                }.collect { progress ->
+                    emit(progress)
                 }
         }
-    }.asObservable()
-
-    private fun downloadBundle(
-        params: ProgramDataDownloadParams,
-        progressManager: TrackerD2ProgressManager
-    ): Flow<TrackerD2ProgressManager> = flow {
-        val relatives = RelationshipItemRelatives()
-
-        coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
-            merge(
-                downloadInternal(params, progressManager, relatives),
-                downloadRelationships(progressManager, relatives),
-                flowOf(progressManager.complete())
-            )
-        }.asFlowable()
     }
 
     private fun downloadInternal(
@@ -114,7 +102,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 val result = queryByUids(bundle, params.overwrite(), relatives)
 
                 result.d2Error?.let {
-                    // TODO (Not sure how to return this)
+                    throw it
                 }
             } else {
                 val orgunitPrograms = bundle.orgUnits()
@@ -127,15 +115,11 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 val bundleResult = BundleResult(0, orgunitPrograms, bundle.orgUnits().toMutableList())
 
                 var iterationCount = 0
-                var successfulSync: Boolean
+                var successfulSync = true
 
                 do {
                     val result = iterateBundle(bundle, params, bundleResult, relatives, progressManager)
-
-                    successfulSync = result.fold(true) { accumulative, value ->
-                        accumulative && value.successfulSync
-                    }
-
+                    successfulSync = successfulSync && result.successfulSync
                     iterationCount++
                 } while (iterationNotFinished(bundle, params, bundleResult, iterationCount))
 
@@ -169,13 +153,13 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
      */
 
     @Suppress("LongParameterList")
-    private fun iterateBundle(
+    private suspend fun iterateBundle(
         bundle: Q,
         params: ProgramDataDownloadParams,
         bundleResult: BundleResult,
         relatives: RelationshipItemRelatives,
         progressManager: TrackerD2ProgressManager
-    ): Flow<IterationResult> = callbackFlow {
+    ): IterationResult {
         val iterationResult = IterationResult()
         val limitPerCombo = getBundleLimit(bundle, params, bundleResult)
 
@@ -200,8 +184,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
             iterationResult.successfulSync = iterationResult.successfulSync && result.successfulSync
         }
 
-        trySend(iterationResult)
-        awaitClose()
+        return iterationResult
     }
 
     @Suppress("LongParameterList", "NestedBlockDepth")
@@ -352,14 +335,14 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private fun downloadRelationships(
         progressManager: TrackerD2ProgressManager,
         relatives: RelationshipItemRelatives
-    ): Flow<TrackerD2Progress> = flow {
-        relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives).andThen(
+    ): Flow<TrackerD2Progress> {
+        return relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives).andThen(
             Observable.fromCallable {
                 progressManager.increaseProgress(
                     TrackedEntityInstance::class.java, false
                 )
             }
-        )
+        ).asFlow()
     }
 
     @Suppress("TooGenericExceptionCaught")

From c67a7def7caac3be26fadafb2e6397f0757c0f34 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 18 Jul 2023 12:04:26 +0200
Subject: [PATCH 111/478] [ANDROSDK-1721] Refactor colletion repository base
 classes to Kotlin

---
 .../arch/db/stores/internal/ReadableStore.kt  |   3 +-
 .../arch/handlers/internal/HandleAction.kt    |   2 +-
 ...{BaseRepository.java => BaseRepository.kt} |   6 +-
 ...oad.java => CollectionRepositoryUpload.kt} |  25 ++-
 ...y.java => ReadOnlyCollectionRepository.kt} |  52 +++---
 ...adOnlyIdentifiableCollectionRepository.kt} |  14 +-
 ...> ReadOnlyNameableCollectionRepository.kt} |  15 +-
 ...> ReadOnlyWithDownloadObjectRepository.kt} |  21 +--
 ...=> ReadOnlyWithUidCollectionRepository.kt} |  33 ++--
 ...ReadOnlyWithUploadCollectionRepository.kt} |  10 +-
 .../ReadWriteCollectionRepository.java        |  56 ------
 ...> ReadWriteWithUidCollectionRepository.kt} |  32 ++--
 ...WithUploadWithUidCollectionRepository.java |  35 ----
 ...teWithUploadWithUidCollectionRepository.kt |  34 ++++
 ...eadOnlyWithUidCollectionRepositoryImpl.kt} |  71 ++++----
 ...yFactory.java => BaseRepositoryFactory.kt} |  11 +-
 ...ositoryImpl.java => BaseRepositoryImpl.kt} |  24 +--
 ...va => ReadOnlyCollectionRepositoryImpl.kt} | 163 ++++++++----------
 ...lyIdentifiableCollectionRepositoryImpl.kt} | 107 +++++-------
 ...adOnlyNameableCollectionRepositoryImpl.kt} |  85 ++++-----
 ...WithTransformerCollectionRepositoryImpl.kt |   2 +-
 ...dAndTransformerCollectionRepositoryImpl.kt |   2 +-
 ...eadOnlyWithUidCollectionRepositoryImpl.kt} |  53 +++---
 ...adWriteWithUidCollectionRepositoryImpl.kt} | 106 +++++-------
 ...actory.java => ScopedRepositoryFactory.kt} |  11 +-
 .../datastore/DataStoreObjectRepository.kt    |   2 +-
 .../EnrollmentCollectionRepository.java       |   3 +
 .../core/event/internal/EventServiceImpl.kt   |  10 +-
 28 files changed, 412 insertions(+), 576 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{BaseRepository.java => BaseRepository.kt} (93%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{CollectionRepositoryUpload.java => CollectionRepositoryUpload.kt} (81%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadOnlyCollectionRepository.java => ReadOnlyCollectionRepository.kt} (73%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadOnlyNameableCollectionRepository.java => ReadOnlyIdentifiableCollectionRepository.kt} (79%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadOnlyIdentifiableCollectionRepository.java => ReadOnlyNameableCollectionRepository.kt} (78%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadOnlyWithDownloadObjectRepository.java => ReadOnlyWithDownloadObjectRepository.kt} (80%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadOnlyWithUidCollectionRepository.java => ReadOnlyWithUidCollectionRepository.kt} (70%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadOnlyWithUploadCollectionRepository.java => ReadOnlyWithUploadCollectionRepository.kt} (85%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/{ReadWriteWithUidCollectionRepository.java => ReadWriteWithUidCollectionRepository.kt} (70%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{BaseReadOnlyWithUidCollectionRepositoryImpl.java => BaseReadOnlyWithUidCollectionRepositoryImpl.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{BaseRepositoryFactory.java => BaseRepositoryFactory.kt} (92%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{BaseRepositoryImpl.java => BaseRepositoryImpl.kt} (81%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{ReadOnlyCollectionRepositoryImpl.java => ReadOnlyCollectionRepositoryImpl.kt} (51%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{ReadOnlyIdentifiableCollectionRepositoryImpl.java => ReadOnlyIdentifiableCollectionRepositoryImpl.kt} (52%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{ReadOnlyNameableCollectionRepositoryImpl.java => ReadOnlyNameableCollectionRepositoryImpl.kt} (54%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{ReadOnlyWithUidCollectionRepositoryImpl.java => ReadOnlyWithUidCollectionRepositoryImpl.kt} (59%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{ReadWriteWithUidCollectionRepositoryImpl.java => ReadWriteWithUidCollectionRepositoryImpl.kt} (51%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/{ScopedRepositoryFactory.java => ScopedRepositoryFactory.kt} (92%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt
index d3d1190108..9a3ac80e7f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt
@@ -29,8 +29,7 @@ package org.hisp.dhis.android.core.arch.db.stores.internal
 
 import org.hisp.dhis.android.core.arch.db.sqlorder.internal.SQLOrderType
 
-@Suppress("TooManyFunctions")
-internal interface ReadableStore<O> {
+@Suppress("TooManyFunctions") interface ReadableStore<O> {
     fun selectAll(): List<O>
     fun selectWhere(whereClause: String): List<O>
     fun selectWhere(filterWhereClause: String, orderByClause: String): List<O>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.kt
index f74e309f00..e39ba00f21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandleAction.kt
@@ -27,6 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.handlers.internal
 
-internal enum class HandleAction {
+enum class HandleAction {
     Insert, Update, Delete, NoAction
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/BaseRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/BaseRepository.kt
similarity index 93%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/BaseRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/BaseRepository.kt
index 9d9ed31083..997d1fe23a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/BaseRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/BaseRepository.kt
@@ -25,8 +25,6 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection;
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-public interface BaseRepository {
-
-}
\ No newline at end of file
+interface BaseRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryUpload.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryUpload.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryUpload.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryUpload.kt
index 501e095cb5..700db45c08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryUpload.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/CollectionRepositoryUpload.kt
@@ -25,26 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-package org.hisp.dhis.android.core.arch.repositories.collection;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-
-import io.reactivex.Observable;
-
-public interface CollectionRepositoryUpload {
+import io.reactivex.Observable
+import org.hisp.dhis.android.core.arch.call.D2Progress
 
+interface CollectionRepositoryUpload {
     /**
-     * Uploads the resources in scope in an asynchronous way. An {@code Observable<D2Progress>} is returned, which
-     * will emit progress until the whole upload is finished and the {@code Observable} is completed.
-     * @return the {@code Observable<D2Progress>} emitting the progress
+     * Uploads the resources in scope in an asynchronous way. An `Observable<D2Progress>` is returned, which
+     * will emit progress until the whole upload is finished and the `Observable` is completed.
+     * @return the `Observable<D2Progress>` emitting the progress
      */
-    Observable<D2Progress> upload();
+    fun upload(): Observable<D2Progress>
 
     /**
      * Uploads the resources in scope in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #upload()}.
+     * executed in the main thread. Consider the asynchronous version [.upload].
      * The method will finish as soon as the whole upload an processing is finished.
      */
-    void blockingUpload();
-}
\ No newline at end of file
+    fun blockingUpload()
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
index dd25c08e12..d54740678f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
@@ -25,32 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection;
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-
-import java.util.List;
-
-import androidx.lifecycle.LiveData;
-import androidx.paging.PagedList;
-import io.reactivex.Single;
-
-public interface ReadOnlyCollectionRepository<M> extends BaseRepository {
+import androidx.lifecycle.LiveData
+import androidx.paging.PagedList
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 
+interface ReadOnlyCollectionRepository<M> : BaseRepository {
     /**
-     * Get the objects in scope in an asynchronous way, returning a {@code Single<List>}.
+     * Get the objects in scope in an asynchronous way, returning a `Single<List>`.
      *
-     * @return A {@code Single} object with the list of objects.
+     * @return A `Single` object with the list of objects.
      */
-    Single<List<M>> get();
+    fun get(): Single<List<M>>
 
     /**
      * Get the list of objects in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #get()}.
+     * executed in the main thread. Consider the asynchronous version [.get].
      *
      * @return List of objects
      */
-    List<M> blockingGet();
+    fun blockingGet(): List<M>
 
     /**
      * Handy method to use in conjunction with PagedListAdapter to build paged lists.
@@ -58,42 +54,42 @@ public interface ReadOnlyCollectionRepository<M> extends BaseRepository {
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    LiveData<PagedList<M>> getPaged(int pageSize);
+    fun getPaged(pageSize: Int): LiveData<PagedList<M>>
 
     /**
-     * Get the count of elements in an asynchronous way, returning a {@code Single}.
-     * @return A {@code Single} object with the element count
+     * Get the count of elements in an asynchronous way, returning a `Single`.
+     * @return A `Single` object with the element count
      */
-    Single<Integer> count();
+    fun count(): Single<Int>
 
     /**
      * Get the count of elements. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #count()}.
+     * executed in the main thread. Consider the asynchronous version [.count].
      *
      * @return Element count
      */
-    int blockingCount();
+    fun blockingCount(): Int
 
     /**
      * Check if selection of objects in current scope with applied filters is empty in an asynchronous way,
-     * returning a {@code Single}.
+     * returning a `Single`.
      * @return If selection is empty
      */
-    Single<Boolean> isEmpty();
+    fun isEmpty(): Single<Boolean>
 
     /**
      * Check if selection of objects with applied filters is empty in a synchronous way.
      * Important: this is a blocking method and it should not be executed in the main thread.
-     * Consider the asynchronous version {@link #isEmpty()}.
+     * Consider the asynchronous version [.isEmpty].
      *
      * @return If selection is empty
      */
-    boolean blockingIsEmpty();
+    fun blockingIsEmpty(): Boolean
 
     /**
-     * Get a {@link ReadOnlyObjectRepository} pointing to the first element in the list.
+     * Get a [ReadOnlyObjectRepository] pointing to the first element in the list.
      *
      * @return Object repository
      */
-    ReadOnlyObjectRepository<M> one();
-}
\ No newline at end of file
+    fun one(): ReadOnlyObjectRepository<M>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.kt
index 5970ae374b..a288fc0620 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.kt
@@ -25,13 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection;
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.NameableFilters;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.NameableObject;
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IdentifiableFilters
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.IdentifiableObject
 
-public interface ReadOnlyNameableCollectionRepository
-        <M extends CoreObject & NameableObject, R extends ReadOnlyCollectionRepository<?>>
-        extends ReadOnlyIdentifiableCollectionRepository<M, R>, NameableFilters<R> {
-}
\ No newline at end of file
+interface ReadOnlyIdentifiableCollectionRepository<M, R : ReadOnlyCollectionRepository<*>> :
+    ReadOnlyWithUidCollectionRepository<M>, IdentifiableFilters<R> where M : CoreObject, M : IdentifiableObject
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.kt
index 553427583e..33d91340f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyNameableCollectionRepository.kt
@@ -25,14 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection;
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IdentifiableFilters;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.IdentifiableObject;
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.NameableFilters
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.NameableObject
 
-public interface ReadOnlyIdentifiableCollectionRepository
-        <M extends CoreObject & IdentifiableObject, R extends ReadOnlyCollectionRepository<?>>
-        extends ReadOnlyWithUidCollectionRepository<M>,
-        IdentifiableFilters<R> {
-}
\ No newline at end of file
+interface ReadOnlyNameableCollectionRepository<M, R : ReadOnlyCollectionRepository<*>> :
+    ReadOnlyIdentifiableCollectionRepository<M, R>, NameableFilters<R> where M : CoreObject, M : NameableObject
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.kt
similarity index 80%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.kt
index 71eac66dd7..f2850b8a6f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithDownloadObjectRepository.kt
@@ -25,26 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-package org.hisp.dhis.android.core.arch.repositories.collection;
-
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-
-import io.reactivex.Completable;
-
-public interface ReadOnlyWithDownloadObjectRepository<M> extends ReadOnlyObjectRepository<M> {
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 
+interface ReadOnlyWithDownloadObjectRepository<M> : ReadOnlyObjectRepository<M> {
     /**
      * Downloads the resource in scope in an asynchronous way. As soon as it's downloaded and processed, the Completable
      * is completed.
-     * @return a {@code Completable} that completes when the download and processing is finished
+     * @return a `Completable` that completes when the download and processing is finished
      */
-    Completable download();
+    fun download(): Completable
 
     /**
      * Downloads the resource in scope in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #get()}. The method will finish
+     * executed in the main thread. Consider the asynchronous version [.get]. The method will finish
      * with a void as soon as the whole download and processing is finished.
      */
-    void blockingDownload();
-}
\ No newline at end of file
+    fun blockingDownload()
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.kt
index ad458a9045..000ea39077 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUidCollectionRepository.kt
@@ -25,38 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection;
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-
-import java.util.List;
-
-import io.reactivex.Single;
-
-public interface ReadOnlyWithUidCollectionRepository<M extends ObjectWithUidInterface>
-        extends ReadOnlyCollectionRepository<M> {
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
+interface ReadOnlyWithUidCollectionRepository<M : ObjectWithUidInterface> : ReadOnlyCollectionRepository<M> {
     /**
-     * Returns a new {@link ReadOnlyObjectRepository} whose scope is the one of the current repository plus the
+     * Returns a new [ReadOnlyObjectRepository] whose scope is the one of the current repository plus the
      * equal filter applied to the uid. This method is equivalent to byUid().eq(uid).one().
      * @param uid to compare
-     * @return the {@link ReadOnlyObjectRepository}
+     * @return the [ReadOnlyObjectRepository]
      */
-    ReadOnlyObjectRepository<M> uid(String uid);
+    fun uid(uid: String?): ReadOnlyObjectRepository<M>
 
     /**
-     * Get the list of uids of objects in scope in an asynchronous way, returning a {@code Single<List<String>>}.
+     * Get the list of uids of objects in scope in an asynchronous way, returning a `Single<List<String>>`.
      *
-     * @return A {@code Single} object with the list of uids.
+     * @return A `Single` object with the list of uids.
      */
-    Single<List<String>> getUids();
+    fun getUids(): Single<List<String>>
 
     /**
      * Get the list of uids of objects in scope in a synchronous way. Important: this is a blocking method and it should
-     * not be executed in the main thread. Consider the asynchronous version {@link #getUids()}.
+     * not be executed in the main thread. Consider the asynchronous version [.getUids].
      *
      * @return List of uids
      */
-    List<String> blockingGetUids();
-}
\ No newline at end of file
+    fun blockingGetUids(): List<String>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt
similarity index 85%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt
index b46ca407cf..fd7d5fe6fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt
@@ -25,11 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-package org.hisp.dhis.android.core.arch.repositories.collection;
+import org.hisp.dhis.android.core.common.CoreObject
 
-import org.hisp.dhis.android.core.common.CoreObject;
-
-public interface ReadOnlyWithUploadCollectionRepository<M extends CoreObject> extends ReadOnlyCollectionRepository<M>,
-        CollectionRepositoryUpload {
-}
\ No newline at end of file
+interface ReadOnlyWithUploadCollectionRepository<M : CoreObject> : ReadOnlyCollectionRepository<M>,
+    CollectionRepositoryUpload
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java
deleted file mode 100644
index 682257b29a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteCollectionRepository.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.repositories.collection;
-
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import io.reactivex.Completable;
-
-public interface ReadWriteCollectionRepository<M extends CoreObject> extends ReadOnlyCollectionRepository<M> {
-
-    /**
-     * Adds a new object to the given collection in an asynchronous way. It returns a {@code Completable} which
-     * is completed when the object is added to the database. It adds an object with a {@link State#TO_POST},
-     * which will be uploaded to the server in the next upload.
-     * @param m the object to add
-     * @return the {@code Completable} which notifies the completion
-     */
-    Completable add(M m);
-
-    /**
-     * Adds a new object to the given collection in a synchronous way. Important: this is a blocking method and it
-     * should not be executed in the main thread. Consider the asynchronous version {@link #add}.I t finishes with as
-     * soon as the object is added to the database. It adds an object with a {@link State#TO_POST},
-     * which will be uploaded to the server in the next upload.
-     * @param m the object to add
-     * @throws D2Error a D2Error wrapping any possible error
-     */
-    void blockingAdd(M m) throws D2Error;
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt
index 7a13ae0386..d15838c7fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt
@@ -25,36 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection;
+package org.hisp.dhis.android.core.arch.repositories.collection
 
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import io.reactivex.Single;
-
-public interface ReadWriteWithUidCollectionRepository<M extends CoreObject & ObjectWithUidInterface, C>
-        extends ReadOnlyWithUidCollectionRepository<M> {
+import io.reactivex.Single
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.maintenance.D2Error
 
+interface ReadWriteWithUidCollectionRepository<M, C> :
+    ReadOnlyWithUidCollectionRepository<M> where M : CoreObject, M : ObjectWithUidInterface {
     /**
      * Adds a new object to the given collection in an asynchronous way based on the provided CreateProjection.
-     * It returns a {@code Single<String>} with the generated UID, which is completed when the object is added to the
-     * database. It adds an object with a {@link State#TO_POST}, which will be uploaded to the server in the next
+     * It returns a `Single<String>` with the generated UID, which is completed when the object is added to the
+     * database. It adds an object with a [State.TO_POST], which will be uploaded to the server in the next
      * upload.
      * @param c the CreateProjection of the object to add
      * @return the Single with the UID
      */
-    Single<String> add(C c);
+    fun add(c: C): Single<String>
 
     /**
      * Adds a new object to the given collection in a synchronous way based on the provided CreateProjection.
      * It blocks the current thread and returns the generated UID.
-     * It adds an object with a {@link State#TO_POST}, which will be uploaded to the server in the next
+     * It adds an object with a [State.TO_POST], which will be uploaded to the server in the next
      * upload. Important: this is a blocking method and it should not be executed in the main thread. Consider the
-     * asynchronous version {@link #add}.
+     * asynchronous version [.add].
      * @param c the CreateProjection of the object to add
      * @return the UID
      */
-    String blockingAdd(C c) throws D2Error;
-}
\ No newline at end of file
+    @Throws(D2Error::class)
+    fun blockingAdd(c: C): String
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java
deleted file mode 100644
index 75f444c31b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.repositories.collection;
-
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-
-public interface ReadWriteWithUploadWithUidCollectionRepository<M extends CoreObject & ObjectWithUidInterface, C>
-        extends ReadWriteWithUidCollectionRepository<M, C>, CollectionRepositoryUpload {
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt
new file mode 100644
index 0000000000..01a9f874e1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.collection
+
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+
+interface ReadWriteWithUploadWithUidCollectionRepository<M, C> : ReadWriteWithUidCollectionRepository<M, C>,
+    CollectionRepositoryUpload where M : CoreObject, M : ObjectWithUidInterface
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
index 5cbd9e1d7d..552f0a6e92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -25,56 +25,49 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Single;
-
-public abstract class BaseReadOnlyWithUidCollectionRepositoryImpl<M extends CoreObject & ObjectWithUidInterface,
-        R extends ReadOnlyCollectionRepository<M>>
-        extends ReadOnlyCollectionRepositoryImpl<M, R>
-        implements ReadOnlyWithUidCollectionRepository<M> {
-
-    protected final IdentifiableObjectStore<M> store;
-
-    public BaseReadOnlyWithUidCollectionRepositoryImpl(IdentifiableObjectStore<M> store,
-                                                       Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                       RepositoryScope scope,
-                                                       FilterConnectorFactory<R> cf) {
-        super(store, childrenAppenders, scope, cf);
-        this.store = store;
-    }
+abstract class BaseReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
+    @JvmField internal val store: IdentifiableObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    cf: FilterConnectorFactory<R>
+) : ReadOnlyCollectionRepositoryImpl<M, R>(store, childrenAppenders, scope, cf),
+    ReadOnlyWithUidCollectionRepository<M> where M : CoreObject, M : ObjectWithUidInterface {
 
     /**
-     * Get the list of uids of objects in scope in an asynchronous way, returning a {@code Single<List<String>>}.
+     * Get the list of uids of objects in scope in an asynchronous way, returning a `Single<List<String>>`.
      *
-     * @return A {@code Single} object with the list of uids.
+     * @return A `Single` object with the list of uids.
      */
-    public Single<List<String>> getUids() {
-        return Single.fromCallable(this::blockingGetUids);
-
+    override fun getUids(): Single<List<String>> {
+        return Single.fromCallable { blockingGetUids() }
     }
 
     /**
      * Get the list of uids of objects in scope in a synchronous way. Important: this is a blocking method and it should
-     * not be executed in the main thread. Consider the asynchronous version {@link #getUids()}.
+     * not be executed in the main thread. Consider the asynchronous version [.getUids].
      *
      * @return List of uids
      */
-    public List<String> blockingGetUids() {
-        return store.selectUidsWhere(getWhereClause(), OrderByClauseBuilder.orderByFromItems(
-                scope.orderBy(), scope.pagingKey()));
+    override fun blockingGetUids(): List<String> {
+        return store.selectUidsWhere(
+            whereClause,
+            OrderByClauseBuilder.orderByFromItems(
+                scope.orderBy(),
+                scope.pagingKey()
+            )
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
similarity index 92%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
index e56f5f22ef..a068dcdd8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
@@ -25,12 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-public interface BaseRepositoryFactory<R extends BaseRepository> {
-    R updated(RepositoryScope updatedScope);
+internal fun interface BaseRepositoryFactory<R : BaseRepository> {
+    fun updated(updatedScope: RepositoryScope): R
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
index 6d03eda945..abe25f07ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
@@ -25,21 +25,13 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-public class BaseRepositoryImpl<R extends BaseRepository>
-        implements BaseRepository {
-
-    protected final RepositoryScope scope;
-    protected final FilterConnectorFactory<R> cf;
-
-    public BaseRepositoryImpl(RepositoryScope scope,
-                              FilterConnectorFactory<R> cf) {
-        this.scope = scope;
-        this.cf = cf;
-    }
-}
+open class BaseRepositoryImpl<R : BaseRepository>(
+    @JvmField protected val scope: RepositoryScope,
+    @JvmField protected val cf: FilterConnectorFactory<R>
+) : BaseRepository
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
similarity index 51%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index 18d9c97fd5..a4c74499dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -25,83 +25,71 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
-
-import androidx.lifecycle.LiveData;
-import androidx.paging.DataSource;
-import androidx.paging.LivePagedListBuilder;
-import androidx.paging.PagedList;
-
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl;
-import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder;
-import org.hisp.dhis.android.core.common.CoreObject;
-
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.Single;
-
-public class ReadOnlyCollectionRepositoryImpl<M extends CoreObject, R extends ReadOnlyCollectionRepository<M>>
-        extends BaseRepositoryImpl<R>
-        implements ReadOnlyCollectionRepository<M> {
-
-    private final ReadableStore<M> store;
-    protected final Map<String, ChildrenAppender<M>> childrenAppenders;
-
-    public ReadOnlyCollectionRepositoryImpl(ReadableStore<M> store,
-                                            Map<String, ChildrenAppender<M>> childrenAppenders,
-                                            RepositoryScope scope,
-                                            FilterConnectorFactory<R> cf) {
-        super(scope, cf);
-        this.store = store;
-        this.childrenAppenders = childrenAppenders;
-    }
-
-    protected List<M> blockingGetWithoutChildren() {
-        return store.selectWhere(getWhereClause(), OrderByClauseBuilder.orderByFromItems(scope.orderBy(),
-                scope.pagingKey()));
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
+
+import androidx.lifecycle.LiveData
+import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
+import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
+import org.hisp.dhis.android.core.common.CoreObject
+
+open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollectionRepository<M>> internal constructor(
+    private val store: ReadableStore<M>,
+    @JvmField internal val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    cf: FilterConnectorFactory<R>
+) : BaseRepositoryImpl<R>(scope, cf), ReadOnlyCollectionRepository<M> {
+    protected fun blockingGetWithoutChildren(): List<M> {
+        return store.selectWhere(
+            whereClause, OrderByClauseBuilder.orderByFromItems(
+                scope.orderBy(),
+                scope.pagingKey()
+            )
+        )
     }
 
     /**
-     * Get a {@link ReadOnlyObjectRepository} pointing to the first element in the list.
+     * Get a [ReadOnlyObjectRepository] pointing to the first element in the list.
      *
      * @return Object repository
      */
-    @Override
-    public ReadOnlyOneObjectRepositoryFinalImpl<M> one() {
-        return new ReadOnlyOneObjectRepositoryFinalImpl<>(store, childrenAppenders, scope);
+    override fun one(): ReadOnlyOneObjectRepositoryFinalImpl<M> {
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, scope)
     }
 
     /**
      * Get the list of objects in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #get()}.
+     * executed in the main thread. Consider the asynchronous version [.get].
      *
      * @return List of objects
      */
-    @Override
-    public List<M> blockingGet() {
-        return ChildrenAppenderExecutor.appendInObjectCollection(blockingGetWithoutChildren(),
-                childrenAppenders, scope.children());
+    override fun blockingGet(): List<M> {
+        return ChildrenAppenderExecutor.appendInObjectCollection(
+            blockingGetWithoutChildren(),
+            childrenAppenders,
+            scope.children()
+        )
     }
 
     /**
-     * Get the objects in scope in an asynchronous way, returning a {@code Single<List>}.
+     * Get the objects in scope in an asynchronous way, returning a `Single<List>`.
      *
-     * @return A {@code Single} object with the list of objects.
+     * @return A `Single` object with the list of objects.
      */
-    @Override
-    public Single<List<M>> get() {
-        return Single.fromCallable(this::blockingGet);
+    override fun get(): Single<List<M>> {
+        return Single.fromCallable { blockingGet() }
     }
 
     /**
@@ -110,65 +98,56 @@ public Single<List<M>> get() {
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    @Override
-    public LiveData<PagedList<M>> getPaged(int pageSize) {
-        DataSource.Factory<M, M> factory = new DataSource.Factory<M, M>() {
-            @Override
-            public DataSource<M, M> create() {
-                return getDataSource();
+    override fun getPaged(pageSize: Int): LiveData<PagedList<M>> {
+        val factory: DataSource.Factory<M, M> = object : DataSource.Factory<M, M>() {
+            override fun create(): DataSource<M, M> {
+                return dataSource
             }
-        };
-
-        return new LivePagedListBuilder<>(factory, pageSize).build();
+        }
+        return LivePagedListBuilder(factory, pageSize).build()
     }
 
-    public DataSource<M, M> getDataSource() {
-        return new RepositoryDataSource<>(store, scope, childrenAppenders);
-    }
+    val dataSource: DataSource<M, M>
+        get() = RepositoryDataSource(store, scope, childrenAppenders)
 
     /**
-     * Get the count of elements in an asynchronous way, returning a {@code Single}.
-     * @return A {@code Single} object with the element count
+     * Get the count of elements in an asynchronous way, returning a `Single`.
+     * @return A `Single` object with the element count
      */
-    @Override
-    public Single<Integer> count() {
-        return Single.fromCallable(this::blockingCount);
+    override fun count(): Single<Int> {
+        return Single.fromCallable { blockingCount() }
     }
 
     /**
      * Get the count of elements. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #count()}.
+     * executed in the main thread. Consider the asynchronous version [.count].
      *
      * @return Element count
      */
-    @Override
-    public int blockingCount() {
-        return store.countWhere(getWhereClause());
+    override fun blockingCount(): Int {
+        return store.countWhere(whereClause)
     }
 
     /**
      * Check if selection of objects in current scope with applied filters is empty in an asynchronous way,
-     * returning a {@code Single}.
+     * returning a `Single`.
      * @return If selection is empty
      */
-    @Override
-    public Single<Boolean> isEmpty() {
-        return Single.fromCallable(this::blockingIsEmpty);
+    override fun isEmpty(): Single<Boolean> {
+        return Single.fromCallable { blockingIsEmpty() }
     }
 
     /**
      * Check if selection of objects with applied filters is empty in a synchronous way.
      * Important: this is a blocking method and it should not be executed in the main thread.
-     * Consider the asynchronous version {@link #isEmpty()}.
+     * Consider the asynchronous version [.isEmpty].
      *
      * @return If selection is empty
      */
-    @Override
-    public boolean blockingIsEmpty() {
-        return !one().blockingExists();
+    override fun blockingIsEmpty(): Boolean {
+        return !one().blockingExists()
     }
 
-    protected String getWhereClause() {
-        return new WhereClauseFromScopeBuilder(new WhereClauseBuilder()).getWhereClause(scope);
-    }
-}
+    protected val whereClause: String
+        get() = WhereClauseFromScopeBuilder(WhereClauseBuilder()).getWhereClause(scope)
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
similarity index 52%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 62c225df17..0f68d79424 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -25,86 +25,73 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.common.IdentifiableObject;
-
-import java.util.Map;
-
-public class ReadOnlyIdentifiableCollectionRepositoryImpl<M extends CoreObject & IdentifiableObject,
-        R extends ReadOnlyCollectionRepository<M>>
-        extends ReadOnlyWithUidCollectionRepositoryImpl<M, R>
-        implements ReadOnlyIdentifiableCollectionRepository<M, R> {
-
-    public ReadOnlyIdentifiableCollectionRepositoryImpl(final IdentifiableObjectStore<M> store,
-                                                        final Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                        final RepositoryScope scope,
-                                                        final FilterConnectorFactory<R> cf) {
-        super(store, childrenAppenders, scope, cf);
-    }
-
-    @Override
-    public StringFilterConnector<R> byUid() {
-        return cf.string(IdentifiableColumns.UID);
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.IdentifiableObject
+
+open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
+    store: IdentifiableObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    cf: FilterConnectorFactory<R>
+) : ReadOnlyWithUidCollectionRepositoryImpl<M, R>(store, childrenAppenders, scope, cf),
+    ReadOnlyIdentifiableCollectionRepository<M, R> where M : CoreObject, M : IdentifiableObject {
+    override fun byUid(): StringFilterConnector<R> {
+        return cf.string(IdentifiableColumns.UID)
     }
 
-    @Override
-    public StringFilterConnector<R> byCode() {
-        return cf.string(IdentifiableColumns.CODE);
+    override fun byCode(): StringFilterConnector<R> {
+        return cf.string(IdentifiableColumns.CODE)
     }
 
-    @Override
-    public StringFilterConnector<R> byName() {
-        return cf.string(IdentifiableColumns.NAME);
+    override fun byName(): StringFilterConnector<R> {
+        return cf.string(IdentifiableColumns.NAME)
     }
 
-    @Override
-    public StringFilterConnector<R> byDisplayName() {
-        return cf.string(IdentifiableColumns.DISPLAY_NAME);
+    override fun byDisplayName(): StringFilterConnector<R> {
+        return cf.string(IdentifiableColumns.DISPLAY_NAME)
     }
 
-    @Override
-    public DateFilterConnector<R> byCreated() {
-        return cf.date(IdentifiableColumns.CREATED);
+    override fun byCreated(): DateFilterConnector<R> {
+        return cf.date(IdentifiableColumns.CREATED)
     }
 
-    @Override
-    public DateFilterConnector<R> byLastUpdated() {
-        return cf.date(IdentifiableColumns.LAST_UPDATED);
+    override fun byLastUpdated(): DateFilterConnector<R> {
+        return cf.date(IdentifiableColumns.LAST_UPDATED)
     }
 
-    public R orderByUid(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(IdentifiableColumns.UID, direction);
+    fun orderByUid(direction: OrderByDirection?): R {
+        return cf.withOrderBy(IdentifiableColumns.UID, direction)
     }
 
-    public R orderByCode(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(IdentifiableColumns.CODE, direction);
+    fun orderByCode(direction: OrderByDirection?): R {
+        return cf.withOrderBy(IdentifiableColumns.CODE, direction)
     }
 
-    public R orderByName(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(IdentifiableColumns.NAME, direction);
+    fun orderByName(direction: OrderByDirection?): R {
+        return cf.withOrderBy(IdentifiableColumns.NAME, direction)
     }
 
-    public R orderByDisplayName(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(IdentifiableColumns.DISPLAY_NAME, direction);
+    fun orderByDisplayName(direction: OrderByDirection?): R {
+        return cf.withOrderBy(IdentifiableColumns.DISPLAY_NAME, direction)
     }
 
-    public R orderByCreated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(IdentifiableColumns.CREATED, direction);
+    fun orderByCreated(direction: OrderByDirection?): R {
+        return cf.withOrderBy(IdentifiableColumns.CREATED, direction)
     }
 
-    public R orderByLastUpdated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(IdentifiableColumns.LAST_UPDATED, direction);
+    fun orderByLastUpdated(direction: OrderByDirection?): R {
+        return cf.withOrderBy(IdentifiableColumns.LAST_UPDATED, direction)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
similarity index 54%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 33b0955dd7..d346954d50 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -25,68 +25,57 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.NameableColumns
+import org.hisp.dhis.android.core.common.NameableObject
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.NameableColumns;
-import org.hisp.dhis.android.core.common.NameableObject;
-
-import java.util.Map;
-
-public class ReadOnlyNameableCollectionRepositoryImpl<M extends CoreObject & NameableObject,
-        R extends ReadOnlyCollectionRepository<M>>
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<M, R>
-        implements ReadOnlyNameableCollectionRepository<M, R> {
-
-
-    public ReadOnlyNameableCollectionRepositoryImpl(final IdentifiableObjectStore<M> store,
-                                                    final Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                    final RepositoryScope scope,
-                                                    final FilterConnectorFactory<R> cf) {
-        super(store, childrenAppenders, scope, cf);
-    }
-
-    @Override
-    public StringFilterConnector<R> byShortName() {
-        return cf.string(NameableColumns.SHORT_NAME);
+internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>>(
+    store: IdentifiableObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    cf: FilterConnectorFactory<R>
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<M, R>(
+    store, childrenAppenders, scope, cf
+), ReadOnlyNameableCollectionRepository<M, R> where M : CoreObject, M : NameableObject {
+    override fun byShortName(): StringFilterConnector<R> {
+        return cf.string(NameableColumns.SHORT_NAME)
     }
 
-    @Override
-    public StringFilterConnector<R> byDisplayShortName() {
-        return cf.string(NameableColumns.DISPLAY_SHORT_NAME);
+    override fun byDisplayShortName(): StringFilterConnector<R> {
+        return cf.string(NameableColumns.DISPLAY_SHORT_NAME)
     }
 
-    @Override
-    public StringFilterConnector<R> byDescription() {
-        return cf.string(NameableColumns.DESCRIPTION);
+    override fun byDescription(): StringFilterConnector<R> {
+        return cf.string(NameableColumns.DESCRIPTION)
     }
 
-    @Override
-    public StringFilterConnector<R> byDisplayDescription() {
-        return cf.string(NameableColumns.DISPLAY_DESCRIPTION);
+    override fun byDisplayDescription(): StringFilterConnector<R> {
+        return cf.string(NameableColumns.DISPLAY_DESCRIPTION)
     }
 
-    public R orderByShortName(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(NameableColumns.SHORT_NAME, direction);
+    fun orderByShortName(direction: OrderByDirection?): R {
+        return cf.withOrderBy(NameableColumns.SHORT_NAME, direction)
     }
 
-    public R orderByShortDisplayName(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(NameableColumns.DISPLAY_SHORT_NAME, direction);
+    fun orderByShortDisplayName(direction: OrderByDirection?): R {
+        return cf.withOrderBy(NameableColumns.DISPLAY_SHORT_NAME, direction)
     }
 
-    public R orderByDescription(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(NameableColumns.DESCRIPTION, direction);
+    fun orderByDescription(direction: OrderByDirection?): R {
+        return cf.withOrderBy(NameableColumns.DESCRIPTION, direction)
     }
 
-    public R orderByDisplayDescription(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(NameableColumns.DISPLAY_DESCRIPTION, direction);
+    fun orderByDisplayDescription(direction: OrderByDirection?): R {
+        return cf.withOrderBy(NameableColumns.DISPLAY_DESCRIPTION, direction)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index 9a0a0e6183..22530cfdd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -52,7 +52,7 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl
     private val store: ReadableStore<M>,
     val childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    val cf: FilterConnectorFactory<R>,
+    cf: FilterConnectorFactory<R>,
     open val transformer: TwoWayTransformer<M, T>
 ) : BaseRepositoryImpl<R>(scope, cf), ReadOnlyCollectionRepository<T> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index e70373cc7a..f7db5e0712 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -82,7 +82,7 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
      * @param uid to compare
      * @return the ReadOnlyObjectRepository
      */
-    override fun uid(uid: String): ReadOnlyObjectRepository<T> {
+    override fun uid(uid: String?): ReadOnlyObjectRepository<T> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
         return ReadOnlyWithTransformerObjectRepositoryImpl(store, childrenAppenders, updatedScope, transformer)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
similarity index 59%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index 33da6e260c..6596774b78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -25,41 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-
-import java.util.Map;
-
-public class ReadOnlyWithUidCollectionRepositoryImpl<M extends CoreObject & ObjectWithUidInterface,
-        R extends ReadOnlyCollectionRepository<M>>
-        extends BaseReadOnlyWithUidCollectionRepositoryImpl<M, R> {
-
-    public ReadOnlyWithUidCollectionRepositoryImpl(IdentifiableObjectStore<M> store,
-                                                   Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                   RepositoryScope scope,
-                                                   FilterConnectorFactory<R> cf) {
-        super(store, childrenAppenders, scope, cf);
-    }
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
+open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
+    store: IdentifiableObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    cf: FilterConnectorFactory<R>
+) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
+    store, childrenAppenders, scope, cf
+) where M : CoreObject, M : ObjectWithUidInterface {
     /**
-     * Returns a new {@link ReadOnlyObjectRepository} whose scope is the one of the current repository plus the
+     * Returns a new [ReadOnlyObjectRepository] whose scope is the one of the current repository plus the
      * equal filter applied to the uid. This method is equivalent to byUid().eq(uid).one().
      * @param uid to compare
      * @return the ReadOnlyObjectRepository
      */
-    @Override
-    public ReadOnlyOneObjectRepositoryFinalImpl<M> uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new ReadOnlyOneObjectRepositoryFinalImpl<>(store, childrenAppenders, updatedScope);
+    override fun uid(uid: String?): ReadOnlyOneObjectRepositoryFinalImpl<M> {
+        val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, updatedScope)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
similarity index 51%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index 48341932fa..c3d59f28ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -25,86 +25,72 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-
-import java.util.Map;
-
-import io.reactivex.Single;
-
-public abstract class ReadWriteWithUidCollectionRepositoryImpl
-        <M extends CoreObject & ObjectWithUidInterface, P, R extends ReadOnlyCollectionRepository<M>>
-        extends BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>
-        implements ReadWriteWithUidCollectionRepository<M, P> {
-
-    protected final Transformer<P, M> transformer;
-
-    public ReadWriteWithUidCollectionRepositoryImpl(IdentifiableObjectStore<M> store,
-                                                    Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                    RepositoryScope scope,
-                                                    Transformer<P, M> transformer,
-                                                    FilterConnectorFactory<R> cf) {
-        super(store, childrenAppenders, scope, cf);
-        this.transformer = transformer;
-    }
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
+internal abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadOnlyCollectionRepository<M>>(
+    store: IdentifiableObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    @JvmField protected val transformer: Transformer<P, M>,
+    cf: FilterConnectorFactory<R>
+) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
+    store, childrenAppenders, scope, cf
+), ReadWriteWithUidCollectionRepository<M, P> where M : CoreObject, M : ObjectWithUidInterface {
     /**
      * Adds a new object to the given collection in an asynchronous way based on the provided CreateProjection.
-     * It returns a {@code Single<String>} with the generated UID, which is completed when the object is added to the
-     * database. It adds an object with a {@link State#TO_POST}, which will be uploaded to the server in the next
+     * It returns a `Single<String>` with the generated UID, which is completed when the object is added to the
+     * database. It adds an object with a [State.TO_POST], which will be uploaded to the server in the next
      * upload.
      * @param projection the CreateProjection of the object to add
      * @return the Single with the UID
      */
-    @Override
-    public Single<String> add(P projection) {
-        return Single.fromCallable(() -> blockingAdd(projection));
+    override fun add(projection: P): Single<String> {
+        return Single.fromCallable { blockingAdd(projection) }
     }
 
     /**
      * Adds a new object to the given collection in a synchronous way based on the provided CreateProjection.
      * It blocks the current thread and returns the generated UID.
-     * It adds an object with a {@link State#TO_POST}, which will be uploaded to the server in the next
+     * It adds an object with a [State.TO_POST], which will be uploaded to the server in the next
      * upload. Important: this is a blocking method and it should not be executed in the main thread. Consider the
-     * asynchronous version {@link #add}.
+     * asynchronous version [.add].
      * @param projection the CreateProjection of the object to add
      * @return the UID
      */
-    @SuppressWarnings({"PMD.PreserveStackTrace"})
-    @Override
-    public String blockingAdd(P projection) throws D2Error {
-        M object = transformer.transform(projection);
-        try {
-            store.insert(object);
-            propagateState(object, HandleAction.Insert);
-            return object.uid();
-        } catch (Exception e) {
+    @Throws(D2Error::class)
+    override fun blockingAdd(projection: P): String {
+        val `object` = transformer.transform(projection)
+        return try {
+            store.insert(`object`)
+            propagateState(`object`, HandleAction.Insert)
+            `object`.uid()
+        } catch (e: Exception) {
             throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.OBJECT_CANT_BE_INSERTED)
-                    .errorDescription("Object can't be inserted")
-                    .originalException(e)
-                    .build();
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.OBJECT_CANT_BE_INSERTED)
+                .errorDescription("Object can't be inserted")
+                .originalException(e)
+                .build()
         }
     }
 
-    @SuppressWarnings("PMD.EmptyMethodInAbstractClassShouldBeAbstract")
-    protected void propagateState(M m, HandleAction action) {
+    protected open fun propagateState(m: M, action: HandleAction?) {
         // Method is empty because is the default action.
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ScopedRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ScopedRepositoryFactory.kt
similarity index 92%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ScopedRepositoryFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ScopedRepositoryFactory.kt
index 5074547a29..cea5e613a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ScopedRepositoryFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ScopedRepositoryFactory.kt
@@ -25,12 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-package org.hisp.dhis.android.core.arch.repositories.collection.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.BaseScope
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.BaseScope;
-
-public interface ScopedRepositoryFactory<R extends BaseRepository, S extends BaseScope> {
-    R updated(S updatedScope);
+internal fun interface ScopedRepositoryFactory<R : BaseRepository, S : BaseScope> {
+    fun updated(updatedScope: S): R
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
index d937beaac2..81ab572ec2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
@@ -42,7 +42,7 @@ import org.hisp.dhis.android.core.common.State
 @Reusable
 class DataStoreObjectRepository @Inject internal constructor(
     store: ObjectWithoutUidStore<DataStoreEntry>,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataStoreEntry>>,
+    childrenAppenders: Map<String, ChildrenAppender<DataStoreEntry>>,
     scope: RepositoryScope,
     private val namespace: String,
     private val key: String
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
index ebb2c22457..3b3d7bbd46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
@@ -28,6 +28,8 @@
 
 package org.hisp.dhis.android.core.enrollment;
 
+import androidx.annotation.NonNull;
+
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
@@ -78,6 +80,7 @@ protected void propagateState(Enrollment enrollment, HandleAction action) {
         trackerDataManager.propagateEnrollmentUpdate(enrollment, action);
     }
 
+    @NonNull
     @Override
     public EnrollmentObjectRepository uid(String uid) {
         RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
index 95571b77c7..ea5b963e8f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
@@ -95,19 +95,19 @@ internal class EventServiceImpl @Inject constructor(
 
     @Suppress("ComplexMethod")
     override fun blockingGetEditableStatus(eventUid: String): EventEditableStatus {
-        val event = eventRepository.uid(eventUid).blockingGet()
+        val event = eventRepository.uid(eventUid).blockingGet()!!
         val program = programRepository.uid(event.program()).blockingGet()
         val programStage = programStageRepository.uid(event.programStage()).blockingGet()
 
         return when {
-            event.status() == EventStatus.COMPLETED && programStage.blockEntryForm() == true ->
+            event.status() == EventStatus.COMPLETED && programStage?.blockEntryForm() == true ->
                 EventEditableStatus.NonEditable(EventNonEditableReason.BLOCKED_BY_COMPLETION)
 
             eventDateUtils.isEventExpired(
                 event = event,
-                completeExpiryDays = program.completeEventsExpiryDays() ?: 0,
-                programPeriodType = programStage.periodType() ?: program.expiryPeriodType(),
-                expiryDays = program.expiryDays() ?: 0
+                completeExpiryDays = program?.completeEventsExpiryDays() ?: 0,
+                programPeriodType = programStage?.periodType() ?: program?.expiryPeriodType(),
+                expiryDays = program?.expiryDays() ?: 0
             ) ->
                 EventEditableStatus.NonEditable(EventNonEditableReason.EXPIRED)
 

From 196e2601c3708897c6f540c68cc6f42a4adb9c26 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 18 Jul 2023 20:49:38 +0200
Subject: [PATCH 112/478] [ANDROSDK-1721] Refactor object repository base
 classes to Kotlin

---
 .editorconfig                                 |   2 +-
 ...llectionRepositoryImplIntegrationShould.kt |   8 +-
 .../DataSetInstanceStoreIntegrationShould.kt  |   8 +-
 ...ntEndpointCallBaseMockIntegrationShould.kt |   2 +-
 .../EventPostBaseMockIntegrationShould.kt     |   6 +-
 .../EventPostCallRealIntegrationShould.kt     |  12 +-
 .../FileResourceCallRealIntegrationShould.kt  |  14 +-
 .../internal/ForeignKeyCleanerShould.kt       |   2 +-
 .../SystemInfoCallMockIntegrationShould.kt    |   2 +-
 .../SystemInfoModuleMockIntegrationShould.kt  |   2 +-
 .../BasePayloadGeneratorMockIntegration.kt    |  14 +-
 ...ceQueryAndDownloadRealIntegrationShould.kt |   2 +-
 .../LogInCallMockIntegrationShould.kt         |   6 +-
 ...nalyticsAggregatedMockIntegrationShould.kt |  18 +-
 ...alAnalyticsTrackerMockIntegrationShould.kt |   8 +-
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 .../CategoryModuleMockIntegrationShould.kt    |  16 +-
 ...llectionRepositoryMockIntegrationShould.kt |  10 +-
 ...reObjectRepositoryMockIntegrationShould.kt |  28 ++--
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 ...ueObjectRepositoryMockIntegrationShould.kt |  26 +--
 .../FileResourceAddMockIntegrationShould.kt   |   2 +-
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 ...llectionRepositoryMockIntegrationShould.kt |   4 +-
 ...ngObjectRepositoryMockIntegrationShould.kt |   2 +-
 ...lsObjectRepositoryMockIntegrationShould.kt |   4 +-
 ...erObjectRepositoryMockIntegrationShould.kt |   4 +-
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 .../org/hisp/dhis/android/core/D2Manager.kt   |   5 +-
 .../android/core/analytics/LegendEvaluator.kt |  10 +-
 .../linelist/EventLineListServiceImpl.kt      |   2 +-
 .../ReadOnlyWithUploadCollectionRepository.kt |   3 +-
 ...teWithUploadWithUidCollectionRepository.kt |   3 +-
 .../collection/internal/BaseRepositoryImpl.kt |   2 +-
 .../ReadOnlyCollectionRepositoryImpl.kt       |   5 +-
 ...nlyIdentifiableCollectionRepositoryImpl.kt |   1 +
 ...eadOnlyNameableCollectionRepositoryImpl.kt |   3 +-
 ...eadWriteWithUidCollectionRepositoryImpl.kt |  16 +-
 ...sDIModule.java => RepositoriesDIModule.kt} |  23 ++-
 ...itory.java => ReadOnlyObjectRepository.kt} |  32 ++--
 ...> ReadOnlyOneObjectRepositoryFinalImpl.kt} |  35 ++--
 ...tory.java => ReadWriteObjectRepository.kt} |  39 ++---
 ...java => ReadWriteValueObjectRepository.kt} |  23 ++-
 ...actory.java => ObjectRepositoryFactory.kt} |  13 +-
 ...nlyAnyObjectWithDownloadRepositoryImpl.kt} |  42 ++---
 ...yFirstObjectWithDownloadRepositoryImpl.kt} |  60 ++++---
 ...l.java => ReadOnlyObjectRepositoryImpl.kt} |  77 ++++-----
 ...ava => ReadOnlyOneObjectRepositoryImpl.kt} |  40 ++---
 ...dWriteWithUidDataObjectRepositoryImpl.java | 142 ----------------
 ...eadWriteWithUidDataObjectRepositoryImpl.kt | 127 ++++++++++++++
 ...> ReadWriteWithUidObjectRepositoryImpl.kt} |  75 ++++-----
 ...eadWriteWithValueObjectRepositoryImpl.java | 158 ------------------
 .../ReadWriteWithValueObjectRepositoryImpl.kt | 147 ++++++++++++++++
 .../DataSetCompleteRegistrationPostCall.kt    |   2 +-
 .../internal/DataSetInstanceServiceImpl.kt    |   4 +-
 .../datastore/DataStoreObjectRepository.kt    |  16 +-
 .../internal/EnrollmentServiceImpl.kt         |   4 +-
 .../EventCollectionRepositoryAdapter.kt       |   2 +-
 .../DataSetIndicatorEngineImpl.kt             |  29 ++--
 .../relationship/RelationshipServiceImpl.kt   |   2 +-
 .../internal/LocalDbRepositoryImpl.kt         |   4 +-
 62 files changed, 655 insertions(+), 703 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/{RepositoriesDIModule.java => RepositoriesDIModule.kt} (89%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ReadOnlyObjectRepository.java => ReadOnlyObjectRepository.kt} (79%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ReadOnlyOneObjectRepositoryFinalImpl.java => ReadOnlyOneObjectRepositoryFinalImpl.kt} (69%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ReadWriteObjectRepository.java => ReadWriteObjectRepository.kt} (70%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/{ReadWriteValueObjectRepository.java => ReadWriteValueObjectRepository.kt} (81%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/{ObjectRepositoryFactory.java => ObjectRepositoryFactory.kt} (82%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/{ReadOnlyAnyObjectWithDownloadRepositoryImpl.java => ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt} (66%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/{ReadOnlyFirstObjectWithDownloadRepositoryImpl.java => ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt} (60%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/{ReadOnlyObjectRepositoryImpl.java => ReadOnlyObjectRepositoryImpl.kt} (55%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/{ReadOnlyOneObjectRepositoryImpl.java => ReadOnlyOneObjectRepositoryImpl.kt} (65%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/{ReadWriteWithUidObjectRepositoryImpl.java => ReadWriteWithUidObjectRepositoryImpl.kt} (50%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt

diff --git a/.editorconfig b/.editorconfig
index 99e7aeef22..ac530d6325 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,3 @@
 [*.{kt,kts}]
 max_line_length = 120
-disabled_rules=no-wildcard-imports
+disabled_rules=no-wildcard-imports,no-unit-return
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
index d49e38532a..357c0af1a2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
@@ -48,7 +48,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
             .blockingGet()
 
         RelationshipTypeAsserts.assertTypesWithoutConstraints(
-            relationshipType,
+            relationshipType!!,
             RelationshipTypeSamples.RELATIONSHIP_TYPE_1
         )
     }
@@ -91,7 +91,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
                 .blockingGet()
 
         RelationshipTypeAsserts.assertTypesWithoutConstraints(
-            relationshipType,
+            relationshipType!!,
             RelationshipTypeSamples.RELATIONSHIP_TYPE_2
         )
     }
@@ -104,7 +104,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
             .blockingGet()
 
         RelationshipTypeAsserts.assertTypeWithConstraints(
-            relationshipType,
+            relationshipType!!,
             RelationshipTypeSamples.RELATIONSHIP_TYPE_1
         )
     }
@@ -114,7 +114,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
         val relationshipType = relationshipTypeCollectionRepository
             .withConstraints()
             .uid(RelationshipTypeSamples.RELATIONSHIP_TYPE_UID_2)
-            .blockingGet()
+            .blockingGet()!!
 
         RelationshipTypeAsserts.assertTypeWithConstraints(
             relationshipType,
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
index 19a47101b0..db2aec6a79 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
@@ -78,7 +78,7 @@ class DataSetInstanceStoreIntegrationShould : BaseMockIntegrationTestMetadataDis
             .byUid().eq("lyLU2wR22tC")
             .withDataSetElements()
             .one()
-            .blockingGet()
+            .blockingGet()!!
 
         val dataElements = dataset.dataSetElements()!!
 
@@ -88,15 +88,15 @@ class DataSetInstanceStoreIntegrationShould : BaseMockIntegrationTestMetadataDis
 
         val categoryOption1 = d2.categoryModule().categoryOptionCombos()
             .byCategoryComboUid().eq(dataElements[0]?.categoryCombo()?.uid())
-            .one().blockingGet()
+            .one().blockingGet()!!
 
         val categoryOption2 = d2.categoryModule().categoryOptionCombos()
             .byCategoryComboUid().eq(dataElements[1]?.categoryCombo()?.uid())
-            .one().blockingGet()
+            .one().blockingGet()!!
 
         val attributeOption = d2.categoryModule().categoryOptionCombos()
             .byCategoryComboUid().eq(dataset.categoryCombo()?.uid())
-            .one().blockingGet()
+            .one().blockingGet()!!
 
         val baseBuilder = DataValue.builder()
             .value("")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
index 228dcc2fa0..536c3101d1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
@@ -107,7 +107,7 @@ abstract class EventEndpointCallBaseMockIntegrationShould : BaseMockIntegrationT
         enqueue(events1File)
         d2.eventModule().eventDownloader().blockingDownload()
 
-        val event1 = d2.eventModule().events().one().blockingGet()
+        val event1 = d2.eventModule().events().one().blockingGet()!!
         assertThat(event1.uid()).isEqualTo("V1CerIi3sdL")
         assertThat(event1.status()).isEqualTo(finalStatus)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt
index 2bd41b18bd..c09f1c77a3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostBaseMockIntegrationShould.kt
@@ -112,9 +112,9 @@ abstract class EventPostBaseMockIntegrationShould : BaseMockIntegrationTestMetad
     }
 
     private fun storeEvents() {
-        val orgUnit = d2.organisationUnitModule().organisationUnits().one().blockingGet()
-        val program = d2.programModule().programs().one().blockingGet()
-        val programStage = d2.programModule().programStages().one().blockingGet()
+        val orgUnit = d2.organisationUnitModule().organisationUnits().one().blockingGet()!!
+        val program = d2.programModule().programs().one().blockingGet()!!
+        val programStage = d2.programModule().programStages().one().blockingGet()!!
         val dataValue1 = TrackedEntityDataValueSamples.get().toBuilder().event(event1Id).build()
 
         val event1 = Event.builder()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 39ebd679b9..66ecf1b293 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -110,7 +110,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     fun pull_events_delete_with_repository_and_post() {
         downloadMetadata()
         d2.eventModule().eventDownloader().limit(10).blockingDownload()
-        val uid = d2.eventModule().events().one().blockingGet().uid()
+        val uid = d2.eventModule().events().one().blockingGet()!!.uid()
         d2.eventModule().events().uid(uid).blockingDelete()
         d2.eventModule().events().blockingUpload()
     }
@@ -187,25 +187,25 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
         orgUnitUid = d2.organisationUnitModule().organisationUnits()
-            .one().blockingGet()
+            .one().blockingGet()!!
             .uid()
         programUid = d2.programModule().programs()
             .byOrganisationUnitUid(orgUnitUid)
             .byProgramType().eq(ProgramType.WITHOUT_REGISTRATION)
-            .one().blockingGet()
+            .one().blockingGet()!!
             .uid()
 
         // Before running, make sure no data elements are compulsory
         programStageUid = d2.programModule().programStages()
             .byProgramUid().eq(programUid)
-            .one().blockingGet()
+            .one().blockingGet()!!
             .uid()
         dataElementUid = d2.programModule().programStageDataElements()
             .byProgramStage().eq(programStageUid)
-            .one().blockingGet().dataElement()
+            .one().blockingGet()!!.dataElement()
             ?.uid()
         attributeOptionCombo = d2.categoryModule().categoryOptionCombos()
-            .one().blockingGet()
+            .one().blockingGet()!!
             .uid()
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
index 946a532331..73c60a985e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
@@ -69,7 +69,9 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
 
         val valueUid = d2.fileResourceModule().fileResources().blockingAdd(file)
         val trackedEntityAttribute =
-            d2.trackedEntityModule().trackedEntityAttributes().byValueType().eq(ValueType.IMAGE).one().blockingGet()
+            d2.trackedEntityModule().trackedEntityAttributes()
+                .byValueType().eq(ValueType.IMAGE)
+                .one().blockingGet()!!
         val trackedEntityInstance = d2.trackedEntityModule().trackedEntityInstances().blockingGet()[0]
         d2.trackedEntityModule().trackedEntityAttributeValues()
             .value(trackedEntityAttribute.uid(), trackedEntityInstance.uid()).blockingSet(valueUid)
@@ -99,9 +101,13 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
         assertThat(file.exists()).isTrue()
 
         val valueUid = d2.fileResourceModule().fileResources().blockingAdd(file)
-        val dataElement = d2.dataElementModule().dataElements().byValueType().eq(ValueType.IMAGE).one().blockingGet()
+        val dataElement = d2.dataElementModule().dataElements()
+            .byValueType().eq(ValueType.IMAGE)
+            .one().blockingGet()!!
         val event = d2.eventModule().events().blockingGet()[0]
-        d2.trackedEntityModule().trackedEntityDataValues().value(event.uid(), dataElement.uid()).blockingSet(valueUid)
+        d2.trackedEntityModule().trackedEntityDataValues()
+            .value(event.uid(), dataElement.uid())
+            .blockingSet(valueUid)
         d2.eventModule().events().blockingUpload()
 
         val fileResources2 = d2.fileResourceModule().fileResources().blockingGet()
@@ -128,7 +134,7 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
             .byValue().eq(fileResource.uid())
             .one().blockingGet()!!
 
-        val existingEvent = d2.eventModule().events().uid(existingValue.event()).blockingGet()
+        val existingEvent = d2.eventModule().events().uid(existingValue.event()).blockingGet()!!
 
         val newEventUid = d2.eventModule().events().blockingAdd(
             EventCreateProjection.create(
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
index d3bb701c34..9981d342c2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
@@ -68,7 +68,7 @@ class ForeignKeyCleanerShould : BaseMockIntegrationTestEmptyDispatcher() {
     fun add_foreign_key_violation_to_table() {
         addOptionForeignKeyViolation()
         assertThat(d2.maintenanceModule().foreignKeyViolations().blockingCount()).isEqualTo(1)
-        val foreignKeyViolation = d2.maintenanceModule().foreignKeyViolations().one().blockingGet()
+        val foreignKeyViolation = d2.maintenanceModule().foreignKeyViolations().one().blockingGet()!!
         val expectedViolation = ForeignKeyViolation.builder()
             .toTable(OptionSetTableInfo.TABLE_INFO.name())
             .toColumn(IdentifiableColumns.UID)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.kt
index b5ed849b81..354b334801 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoCallMockIntegrationShould.kt
@@ -64,7 +64,7 @@ class SystemInfoCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
     }
 
     private fun isSystemInfoInDb(si: SystemInfo) {
-        val siDb = systemInfoRepository.blockingGet()
+        val siDb = systemInfoRepository.blockingGet()!!
         assertThat(si.toBuilder().id(null).build()).isEqualTo(siDb.toBuilder().id(null).build())
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
index 4f41828aea..c8974253f3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class SystemInfoModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun allow_access_to_system_info_user() {
-        val systemInfo = d2.systemInfoModule().systemInfo().blockingGet()
+        val systemInfo = d2.systemInfoModule().systemInfo().blockingGet()!!
         assertThat(systemInfo.version()).isEqualTo("2.40.0")
         assertThat(systemInfo.systemName()).isEqualTo("DHIS 2 Demo - Sierra Leone")
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
index 35464e78b1..3ee445650b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
@@ -79,19 +79,19 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
     }
 
     protected fun storeTrackerData() {
-        val orgUnit = OrganisationUnitStoreImpl(databaseAdapter).selectFirst()
-        val teiType = TrackedEntityTypeStoreImpl(databaseAdapter).selectFirst()
-        val program = d2.programModule().programs().one().blockingGet()
-        val programStage = ProgramStageStoreImpl(databaseAdapter).selectFirst()
+        val orgUnit = OrganisationUnitStoreImpl(databaseAdapter).selectFirst()!!
+        val teiType = TrackedEntityTypeStoreImpl(databaseAdapter).selectFirst()!!
+        val program = d2.programModule().programs().one().blockingGet()!!
+        val programStage = ProgramStageStoreImpl(databaseAdapter).selectFirst()!!
 
         val dataValue1 = TrackedEntityDataValueSamples.get().toBuilder().event(event1Id).build()
 
         val event1 = Event.builder()
             .uid(event1Id)
             .enrollment(enrollment1Id)
-            .organisationUnit(orgUnit!!.uid())
+            .organisationUnit(orgUnit.uid())
             .program(program.uid())
-            .programStage(programStage!!.uid())
+            .programStage(programStage.uid())
             .syncState(State.TO_UPDATE)
             .aggregatedSyncState(State.TO_UPDATE)
             .trackedEntityDataValues(listOf(dataValue1))
@@ -153,7 +153,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
             TrackedEntityInstance.builder(), listOf(enrollment1, enrollment2, enrollment3)
         )
             .uid(teiId)
-            .trackedEntityType(teiType!!.uid())
+            .trackedEntityType(teiType.uid())
             .organisationUnit(orgUnit.uid())
             .syncState(State.TO_POST)
             .aggregatedSyncState(State.TO_POST)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryAndDownloadRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryAndDownloadRealIntegrationShould.kt
index 5da9c78af3..c0663cfa3d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryAndDownloadRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryAndDownloadRealIntegrationShould.kt
@@ -39,7 +39,7 @@ class TrackedEntityInstanceQueryAndDownloadRealIntegrationShould : BaseRealInteg
         d2.metadataModule().blockingDownload()
 
         val orgUnit = d2.organisationUnitModule().organisationUnits()
-            .one().blockingGet().uid()
+            .one().blockingGet()!!.uid()
         val queriedTeis = d2.trackedEntityModule().trackedEntityInstanceQuery()
             .byOrgUnits().`in`(listOf(orgUnit))
             .byOrgUnitMode().eq(OrganisationUnitMode.ACCESSIBLE)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogInCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogInCallMockIntegrationShould.kt
index 63a9f27c88..1593f85f0b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogInCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogInCallMockIntegrationShould.kt
@@ -55,15 +55,15 @@ class LogInCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
     @Test
     fun persist_user_in_data_base_when_call() {
         login()
-        val user = d2.userModule().user().blockingGet()
+        val user = d2.userModule().user().blockingGet()!!
         assertThat(user.uid()).isEqualTo("DXyJmlo9rge")
         assertThat(user.name()).isEqualTo("John Barnes")
         assertThat(user.username()).isEqualTo("android")
 
-        val userCredentials = d2.userModule().userCredentials().blockingGet()
+        val userCredentials = d2.userModule().userCredentials().blockingGet()!!
         assertThat(userCredentials.username()).isEqualTo("android")
 
-        val authenticatedUser = d2.userModule().authenticatedUser().blockingGet()
+        val authenticatedUser = d2.userModule().authenticatedUser().blockingGet()!!
         assertThat(authenticatedUser.user()).isEqualTo("DXyJmlo9rge")
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsAggregatedMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsAggregatedMockIntegrationShould.kt
index 05ef156849..e813cecd95 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsAggregatedMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsAggregatedMockIntegrationShould.kt
@@ -51,7 +51,7 @@ internal abstract class BaseLocalAnalyticsAggregatedMockIntegrationShould : Base
 
     @Test
     fun count_data_values_for_data_element() {
-        val firstDataValue = d2.dataValueModule().dataValues().one().blockingGet()
+        val firstDataValue = d2.dataValueModule().dataValues().one().blockingGet()!!
         val dataValuesCount = d2.dataValueModule().dataValues()
             .byDataElementUid().eq(firstDataValue.dataElement())
             .blockingCount()
@@ -60,7 +60,7 @@ internal abstract class BaseLocalAnalyticsAggregatedMockIntegrationShould : Base
 
     @Test
     fun sum_data_values_for_data_element() {
-        val dv = d2.dataValueModule().dataValues().one().blockingGet()
+        val dv = d2.dataValueModule().dataValues().one().blockingGet()!!
         val dataValues = d2.dataValueModule().dataValues()
             .byDataElementUid().eq(dv.dataElement())
             .blockingGet()
@@ -70,7 +70,7 @@ internal abstract class BaseLocalAnalyticsAggregatedMockIntegrationShould : Base
 
     @Test
     fun avg_data_values_for_data_element() {
-        val dv = d2.dataValueModule().dataValues().one().blockingGet()
+        val dv = d2.dataValueModule().dataValues().one().blockingGet()!!
         val dataValues = d2.dataValueModule().dataValues()
             .byDataElementUid().eq(dv.dataElement())
             .blockingGet()
@@ -86,9 +86,9 @@ internal abstract class BaseLocalAnalyticsAggregatedMockIntegrationShould : Base
     fun count_data_values_for_data_element_for_ou_level_3() {
         val ou = d2.organisationUnitModule().organisationUnits()
             .byLevel().eq(3)
-            .one().blockingGet()
+            .one().blockingGet()!!
         val firstDataValue = d2.dataValueModule().dataValues()
-            .one().blockingGet()
+            .one().blockingGet()!!
         val dataValuesCount = d2.dataValueModule().dataValues()
             .byOrganisationUnitUid().eq(ou.uid())
             .byDataElementUid().eq(firstDataValue.dataElement())
@@ -137,13 +137,13 @@ internal abstract class BaseLocalAnalyticsAggregatedMockIntegrationShould : Base
     private fun dataValuesForDataElementForOuAndDescendentsRepository(level: Int): DataValueCollectionRepository {
         val ou3 = d2.organisationUnitModule().organisationUnits()
             .byLevel().eq(3)
-            .one().blockingGet()
+            .one().blockingGet()!!
         val level2Uid = ou3.path()!!.split("/")[level]
         val ous2AndChildren = d2.organisationUnitModule().organisationUnits()
             .byPath().like(level2Uid)
             .blockingGet()
         val firstDataValue = d2.dataValueModule().dataValues()
-            .one().blockingGet()
+            .one().blockingGet()!!
         return d2.dataValueModule().dataValues()
             .byOrganisationUnitUid().`in`(ous2AndChildren.map { it.uid() })
             .byDataElementUid().eq(firstDataValue.dataElement())
@@ -153,9 +153,9 @@ internal abstract class BaseLocalAnalyticsAggregatedMockIntegrationShould : Base
     fun count_data_values_for_data_element_for_ou_level_3_per_period() {
         val ou = d2.organisationUnitModule().organisationUnits()
             .byLevel().eq(3)
-            .one().blockingGet()
+            .one().blockingGet()!!
         val firstDataValue = d2.dataValueModule().dataValues()
-            .one().blockingGet()
+            .one().blockingGet()!!
         val dataValues = d2.dataValueModule().dataValues()
             .byOrganisationUnitUid().eq(ou.uid())
             .byDataElementUid().eq(firstDataValue.dataElement())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt
index abbbf1b60d..fae486d3c2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt
@@ -168,7 +168,7 @@ internal abstract class BaseLocalAnalyticsTrackerMockIntegrationShould : BaseLoc
     @Test
     fun count_tedv_for_a_data_element() {
         val firstTedv = d2.trackedEntityModule().trackedEntityDataValues()
-            .one().blockingGet()
+            .one().blockingGet()!!
         val tedvCount = d2.trackedEntityModule().trackedEntityDataValues()
             .byDataElement().eq(firstTedv.dataElement())
             .blockingCount()
@@ -178,7 +178,7 @@ internal abstract class BaseLocalAnalyticsTrackerMockIntegrationShould : BaseLoc
     @Test
     fun aggregate_tedv_for_a_data_element() {
         val firstTedv = d2.trackedEntityModule().trackedEntityDataValues()
-            .one().blockingGet()
+            .one().blockingGet()!!
         val tedv = d2.trackedEntityModule().trackedEntityDataValues()
             .byDataElement().eq(firstTedv.dataElement())
             .blockingGet()
@@ -208,14 +208,14 @@ internal abstract class BaseLocalAnalyticsTrackerMockIntegrationShould : BaseLoc
         return d2.programModule().programs()
             .byProgramType().eq(ProgramType.WITH_REGISTRATION)
             .one()
-            .blockingGet()
+            .blockingGet()!!
     }
 
     private fun getProgramWithoutRegistration(): Program {
         return d2.programModule().programs()
             .byProgramType().eq(ProgramType.WITHOUT_REGISTRATION)
             .one()
-            .blockingGet()
+            .blockingGet()!!
     }
 
     private fun getEventRepositoryByTEDV(tedvCount: Int): EventCollectionRepository {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
index 952f24736f..7b79908398 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
@@ -65,7 +65,7 @@ class CategoryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTes
         val category = d2.categoryModule().categories()
             .withCategoryOptions()
             .uid("vGs6omsRekv")
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(category.categoryOptions()!!.size).isEqualTo(1)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
index 4623fb1a3d..84e7a93e9c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
@@ -250,7 +250,7 @@ class CategoryComboCollectionRepositoryMockIntegrationShould : BaseMockIntegrati
         val categoryCombo = d2.categoryModule().categoryCombos()
             .withCategories()
             .uid("m2jTvAj5kkm")
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(categoryCombo.categories()!!.size).isEqualTo(2)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
index ae4d1630b6..fcdfb72368 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
@@ -62,7 +62,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_combo_by_uid_without_children() {
-        val combo = d2.categoryModule().categoryCombos().uid("m2jTvAj5kkm").blockingGet()
+        val combo = d2.categoryModule().categoryCombos().uid("m2jTvAj5kkm").blockingGet()!!
         assertThat(combo.uid()).isEqualTo("m2jTvAj5kkm")
         assertThat(combo.code()).isEqualTo("BIRTHS")
         assertThat(combo.name()).isEqualTo("Births")
@@ -72,7 +72,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_combo_by_uid_with_category_option_combos() {
-        val combo = d2.categoryModule().categoryCombos().uid("m2jTvAj5kkm").blockingGet()
+        val combo = d2.categoryModule().categoryCombos().uid("m2jTvAj5kkm").blockingGet()!!
         assertThat(combo.uid()).isEqualTo("m2jTvAj5kkm")
         assertThat(combo.code()).isEqualTo("BIRTHS")
         assertThat(combo.name()).isEqualTo("Births")
@@ -96,7 +96,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_combo_by_uid_with_sorted_categories() {
-        val combo = d2.categoryModule().categoryCombos().withCategories().uid("m2jTvAj5kkm").blockingGet()
+        val combo = d2.categoryModule().categoryCombos().withCategories().uid("m2jTvAj5kkm").blockingGet()!!
         assertThat(combo.uid()).isEqualTo("m2jTvAj5kkm")
         assertThat(combo.code()).isEqualTo("BIRTHS")
         assertThat(combo.name()).isEqualTo("Births")
@@ -122,7 +122,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_by_uid_without_children() {
-        val category = d2.categoryModule().categories().uid("vGs6omsRekv").blockingGet()
+        val category = d2.categoryModule().categories().uid("vGs6omsRekv").blockingGet()!!
         assertThat(category.uid()).isEqualTo("vGs6omsRekv")
         assertThat(category.name()).isEqualTo("default")
         assertThat(category.dataDimensionType()).isEqualTo("DISAGGREGATION")
@@ -139,7 +139,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_by_uid_with_sorted_category_options() {
-        val category = d2.categoryModule().categories().withCategoryOptions().uid("KfdsGBcoiCa").blockingGet()
+        val category = d2.categoryModule().categories().withCategoryOptions().uid("KfdsGBcoiCa").blockingGet()!!
         assertThat(category.uid()).isEqualTo("KfdsGBcoiCa")
         assertThat(category.name()).isEqualTo("Births attended by")
         assertThat(category.dataDimensionType()).isEqualTo("DISAGGREGATION")
@@ -179,7 +179,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_option_combo_by_uid_without_children() {
-        val categoryOptionCombo = d2.categoryModule().categoryOptionCombos().uid("Gmbgme7z9BF").blockingGet()
+        val categoryOptionCombo = d2.categoryModule().categoryOptionCombos().uid("Gmbgme7z9BF").blockingGet()!!
         assertThat(categoryOptionCombo.uid()).isEqualTo("Gmbgme7z9BF")
         assertThat(categoryOptionCombo.name()).isEqualTo("Trained TBA, At PHU")
     }
@@ -187,7 +187,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
     @Test
     fun allow_access_to_category_option_combo_by_uid_with_category_options() {
         val categoryOptionCombo = d2.categoryModule().categoryOptionCombos()
-            .withCategoryOptions().uid("Gmbgme7z9BF").blockingGet()
+            .withCategoryOptions().uid("Gmbgme7z9BF").blockingGet()!!
         assertThat(categoryOptionCombo.uid()).isEqualTo("Gmbgme7z9BF")
         assertThat(categoryOptionCombo.name()).isEqualTo("Trained TBA, At PHU")
 
@@ -213,7 +213,7 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_combo_by_uid_without_children() {
-        val categoryOption = d2.categoryModule().categoryOptions().uid("apsOixVZlf1").blockingGet()
+        val categoryOption = d2.categoryModule().categoryOptions().uid("apsOixVZlf1").blockingGet()!!
         assertThat(categoryOption.uid()).isEqualTo("apsOixVZlf1")
         assertThat(categoryOption.name()).isEqualTo("Female")
         assertThat(categoryOption.code()).isEqualTo("FMLE")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
index b80795b402..655f6abc04 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
@@ -110,7 +110,7 @@ class CategoryOptionComboCollectionRepositoryMockIntegrationShould : BaseMockInt
         val categoryOptionCombo = d2.categoryModule().categoryOptionCombos()
             .withCategoryOptions()
             .one()
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(categoryOptionCombo.categoryOptions()!![0].name()).isEqualTo("At PHU")
     }
@@ -127,7 +127,7 @@ class CategoryOptionComboCollectionRepositoryMockIntegrationShould : BaseMockInt
         val categoryOptionCombo = d2.categoryModule().categoryOptionCombos()
             .withCategoryOptions()
             .one()
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(categoryOptionCombo.categoryOptions()!![0].name()).isEqualTo("At PHU")
     }
@@ -137,7 +137,7 @@ class CategoryOptionComboCollectionRepositoryMockIntegrationShould : BaseMockInt
         val categoryOption = d2.categoryModule().categoryOptions()
             .withOrganisationUnits()
             .uid("as6ygGvUGNg")
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(categoryOption.organisationUnits()!!.size).isEqualTo(1)
         assertThat(categoryOption.organisationUnits()!![0].uid()).isEqualTo("DiszpKrYNg8")
@@ -148,7 +148,7 @@ class CategoryOptionComboCollectionRepositoryMockIntegrationShould : BaseMockInt
         val categoryOption = d2.categoryModule().categoryOptions()
             .withOrganisationUnits()
             .uid("TXGfLxZlInA")
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(categoryOption.organisationUnits()).isNull()
     }
@@ -158,7 +158,7 @@ class CategoryOptionComboCollectionRepositoryMockIntegrationShould : BaseMockInt
         val categoryOption = d2.categoryModule().categoryOptions()
             .withOrganisationUnits()
             .uid("apsOixVZlf1")
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(categoryOption.organisationUnits()).isEmpty()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
index 2c9eb94deb..1f0d596b14 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
@@ -45,7 +45,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
             .value("settings", "new_key")
         repository.blockingSet(value)
 
-        assertThat(repository.blockingGet().value()).isEqualTo(value)
+        assertThat(repository.blockingGet()!!.value()).isEqualTo(value)
         repository.blockingDelete()
     }
 
@@ -56,7 +56,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
             .value("new_namespace", "new_key")
         repository.blockingSet(value)
 
-        assertThat(repository.blockingGet().value()).isEqualTo(value)
+        assertThat(repository.blockingGet()!!.value()).isEqualTo(value)
         repository.blockingDelete()
     }
 
@@ -67,7 +67,7 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         repository.blockingSet("new_value")
 
         assertThat(repository.blockingExists()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_POST)
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_POST)
 
         repository.blockingDelete()
         assertThat(repository.blockingExists()).isFalse()
@@ -80,18 +80,18 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         repository.blockingSet("value")
 
         DataStoreEntryStoreImpl(databaseAdapter)
-            .updateWhere(repository.blockingGet().toBuilder().syncState(State.ERROR).build())
+            .updateWhere(repository.blockingGet()!!.toBuilder().syncState(State.ERROR).build())
 
         assertThat(repository.blockingExists()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.ERROR)
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.ERROR)
 
         repository.blockingDelete()
         assertThat(repository.blockingExists()).isTrue()
-        assertThat(repository.blockingGet().deleted()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
+        assertThat(repository.blockingGet()!!.deleted()).isTrue()
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_UPDATE)
 
         DataStoreEntryStoreImpl(databaseAdapter)
-            .deleteWhere(repository.blockingGet())
+            .deleteWhere(repository.blockingGet()!!)
     }
 
     @Test
@@ -101,18 +101,18 @@ class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         repository.blockingSet("value")
 
         DataStoreEntryStoreImpl(databaseAdapter)
-            .updateWhere(repository.blockingGet().toBuilder().syncState(State.TO_UPDATE).build())
+            .updateWhere(repository.blockingGet()!!.toBuilder().syncState(State.TO_UPDATE).build())
 
         repository.blockingDelete()
 
-        assertThat(repository.blockingGet().deleted()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
+        assertThat(repository.blockingGet()!!.deleted()).isTrue()
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_UPDATE)
 
         repository.blockingSet("new_value")
-        assertThat(repository.blockingGet().deleted()).isFalse()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
+        assertThat(repository.blockingGet()!!.deleted()).isFalse()
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_UPDATE)
 
         DataStoreEntryStoreImpl(databaseAdapter)
-            .deleteWhere(repository.blockingGet())
+            .deleteWhere(repository.blockingGet()!!)
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
index c6030817ec..e446a7744d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
@@ -191,6 +191,6 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             )
 
         assertThat(objectRepository.blockingExists()).isTrue()
-        assertThat(objectRepository.blockingGet().value()).isEqualTo("10")
+        assertThat(objectRepository.blockingGet()!!.value()).isEqualTo("10")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
index 229d7a9fd9..3e913c2cd6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
@@ -45,7 +45,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         val repository = objectRepository()
         repository.blockingSet(value)
 
-        assertThat(repository.blockingGet().value()).isEqualTo(value)
+        assertThat(repository.blockingGet()!!.value()).isEqualTo(value)
         repository.blockingDelete()
     }
 
@@ -55,7 +55,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         val repository = objectRepository()
         repository.setFollowUp(followUp)
 
-        assertThat(repository.blockingGet().followUp()).isEqualTo(followUp)
+        assertThat(repository.blockingGet()!!.followUp()).isEqualTo(followUp)
         repository.blockingDelete()
     }
 
@@ -65,7 +65,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         val repository = objectRepository()
         repository.setComment(comment)
 
-        assertThat(repository.blockingGet().comment()).isEqualTo(comment)
+        assertThat(repository.blockingGet()!!.comment()).isEqualTo(comment)
         repository.blockingDelete()
     }
 
@@ -75,7 +75,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         repository.blockingSet("value")
 
         assertThat(repository.blockingExists()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_POST)
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_POST)
 
         repository.blockingDelete()
         assertThat(repository.blockingExists()).isFalse()
@@ -85,30 +85,30 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
     fun set_state_to_delete_if_state_is_not_to_post() {
         val repository = objectRepository()
         repository.blockingSet("value")
-        DataValueStoreImpl(databaseAdapter).setState(repository.blockingGet(), State.ERROR)
+        DataValueStoreImpl(databaseAdapter).setState(repository.blockingGet()!!, State.ERROR)
 
         assertThat(repository.blockingExists()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.ERROR)
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.ERROR)
 
         repository.blockingDelete()
         assertThat(repository.blockingExists()).isTrue()
-        assertThat(repository.blockingGet().deleted()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
+        assertThat(repository.blockingGet()!!.deleted()).isTrue()
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_UPDATE)
     }
 
     @Test
     fun set_not_deleted_when_updating_deleted_value() {
         val repository = objectRepository()
         repository.blockingSet("value")
-        DataValueStoreImpl(databaseAdapter).setState(repository.blockingGet(), State.TO_UPDATE)
+        DataValueStoreImpl(databaseAdapter).setState(repository.blockingGet()!!, State.TO_UPDATE)
         repository.blockingDelete()
 
-        assertThat(repository.blockingGet().deleted()).isTrue()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
+        assertThat(repository.blockingGet()!!.deleted()).isTrue()
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_UPDATE)
 
         repository.blockingSet("new_value")
-        assertThat(repository.blockingGet().deleted()).isFalse()
-        assertThat(repository.blockingGet().syncState()).isEqualTo(State.TO_UPDATE)
+        assertThat(repository.blockingGet()!!.deleted()).isFalse()
+        assertThat(repository.blockingGet()!!.syncState()).isEqualTo(State.TO_UPDATE)
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
index 1afc2f792d..5edc0af610 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
@@ -58,7 +58,7 @@ class FileResourceAddMockIntegrationShould : BaseMockIntegrationTestEmptyDispatc
 
         val fileResource = d2.fileResourceModule().fileResources()
             .uid(fileResourceUid)
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(fileResource.uid()).isEqualTo(fileResourceUid)
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
index ebff92efb3..c992d7d139 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -48,7 +48,7 @@ class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
         val indicator = d2.indicatorModule().indicators()
             .withLegendSets()
             .one()
-            .blockingGet()
+            .blockingGet()!!
         Truth.assertThat(indicator.legendSets()!!.size).isEqualTo(1)
         Truth.assertThat(indicator.legendSets()!![0].uid()).isEqualTo("rtOkbpGEud4")
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
index 8b494b91bb..9d41603a07 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
@@ -142,7 +142,7 @@ class ProgramStageWorkingListCollectionRepositoryMockIntegrationShould : BaseMoc
         val lists = d2.programModule().programStageWorkingLists()
             .withDataFilters()
             .one()
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(lists.programStageQueryCriteria()?.dataFilters()?.size).isEqualTo(1)
     }
@@ -152,7 +152,7 @@ class ProgramStageWorkingListCollectionRepositoryMockIntegrationShould : BaseMoc
         val lists = d2.programModule().programStageWorkingLists()
             .withAttributeValueFilters()
             .one()
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(lists.programStageQueryCriteria()?.attributeValueFilters()?.size).isEqualTo(1)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
index dd5c7d61b7..c9c44b7dc4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
@@ -43,7 +43,7 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
             .settingModule()
             .analyticsSetting()
             .visualizationsSettings()
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(analyticsDhisVisualizationsSetting.home().size).isEqualTo(2)
         assertThat(analyticsDhisVisualizationsSetting.home().first().visualizations().first().name()).isNotEmpty()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
index 0160b1b870..0cb4304813 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class UserCredentialsObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_user() {
-        val userCredentials = d2.userModule().userCredentials().blockingGet()
+        val userCredentials = d2.userModule().userCredentials().blockingGet()!!
         assertThat(userCredentials.username()).isEqualTo("android")
         assertThat(userCredentials.name()).isEqualTo("John Barnes")
         assertThat(userCredentials.displayName()).isEqualTo("John Barnes")
@@ -45,7 +45,7 @@ class UserCredentialsObjectRepositoryMockIntegrationShould : BaseMockIntegration
 
     @Test
     fun return_user_roles_as_children() {
-        val userCredentials = d2.userModule().userCredentials().withUserRoles().blockingGet()
+        val userCredentials = d2.userModule().userCredentials().withUserRoles().blockingGet()!!
         assertThat(userCredentials.userRoles()!!.size).isEqualTo(1)
         assertThat(userCredentials.userRoles()!![0].name()).isEqualTo("Superuser")
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
index 4476c3a9fb..eed510386f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class UserObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_user() {
-        val user = d2.userModule().user().blockingGet()
+        val user = d2.userModule().user().blockingGet()!!
 
         assertThat(user.uid()).isEqualTo("DXyJmlo9rge")
         assertThat(user.firstName()).isEqualTo("John")
@@ -47,7 +47,7 @@ class UserObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDis
     fun with_user_roles() {
         val user = d2.userModule().user()
             .withUserRoles()
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(user.userRoles()!!.size).isEqualTo(1)
         assertThat(user.userRoles()!![0].name()).isEqualTo("Superuser")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
index f3756bd684..8ab1739c4f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
@@ -175,7 +175,7 @@ class VisualizationCollectionRepositoryMockIntegrationShould : BaseMockIntegrati
         val visualization = d2.visualizationModule().visualizations()
             .withColumnsRowsAndFilters()
             .uid("PYBH8ZaAQnC")
-            .blockingGet()
+            .blockingGet()!!
 
         assertThat(visualization.columns()!![0].id()).isEqualTo("dx")
         assertThat(visualization.columns()!![0].items()!!.size).isEqualTo(3)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
index 3e10a7912f..3a43b10930 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
@@ -123,8 +123,9 @@ object D2Manager {
             d2 = D2(d2DIComponent)
 
             if (credentials != null) {
-                val uid = d2!!.userModule().user().blockingGet().uid()
-                d2DIComponent.userIdInMemoryStore().set(uid)
+                d2!!.userModule().user().blockingGet()?.uid()?.let { uid ->
+                    d2DIComponent.userIdInMemoryStore().set(uid)
+                }
             }
 
             val setUpTime = System.currentTimeMillis() - startTime
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
index 20b279e7e2..a1d2981202 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
@@ -55,7 +55,7 @@ internal class LegendEvaluator @Inject constructor(
                 .withLegendSets()
                 .one().blockingGet()
 
-            val legendSet = programIndicator.legendSets()!![0]
+            val legendSet = programIndicator?.legendSets()!![0]
 
             return getLegendByLegendSet(legendSet.uid(), value)
         } catch (e: Exception) {
@@ -75,7 +75,7 @@ internal class LegendEvaluator @Inject constructor(
                 .withLegendSets()
                 .one().blockingGet()
 
-            val legendSet = dataElement.legendSets()!![0]
+            val legendSet = dataElement?.legendSets()!![0]
 
             return getLegendByLegendSet(legendSet.uid(), value)
         } catch (e: Exception) {
@@ -95,7 +95,7 @@ internal class LegendEvaluator @Inject constructor(
                 .withLegendSets()
                 .one().blockingGet()
 
-            val legendSet = trackedEntityAttribute.legendSets()!![0]
+            val legendSet = trackedEntityAttribute?.legendSets()!![0]
 
             return getLegendByLegendSet(legendSet.uid(), value)
         } catch (e: Exception) {
@@ -115,7 +115,7 @@ internal class LegendEvaluator @Inject constructor(
                 .withLegendSets()
                 .one().blockingGet()
 
-            val legendSet = indicator.legendSets()!![0]
+            val legendSet = indicator?.legendSets()!![0]
 
             return getLegendByLegendSet(legendSet.uid(), value)
         } catch (e: Exception) {
@@ -136,7 +136,7 @@ internal class LegendEvaluator @Inject constructor(
                 .byEndValue().biggerOrEqualTo(value.toDouble())
                 .byLegendSet().eq(legendSetUid)
                 .one()
-                .blockingGet().uid()
+                .blockingGet()?.uid()
         } catch (e: Exception) {
             null
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
index 183dcd7974..3721f9ec1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
@@ -86,7 +86,7 @@ internal class EventLineListServiceImpl @Inject constructor(
 
         return events.mapNotNull {
             (it.eventDate() ?: it.dueDate())?.let { referenceDate ->
-                val periodType = programStage.periodType() ?: PeriodType.Daily
+                val periodType = programStage?.periodType() ?: PeriodType.Daily
                 val eventPeriod = periodHelper.blockingGetPeriodForPeriodTypeAndDate(periodType, referenceDate)
 
                 val eventDataValues = params.dataElements.map { de ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt
index fd7d5fe6fc..9630539b8f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyWithUploadCollectionRepository.kt
@@ -29,5 +29,6 @@ package org.hisp.dhis.android.core.arch.repositories.collection
 
 import org.hisp.dhis.android.core.common.CoreObject
 
-interface ReadOnlyWithUploadCollectionRepository<M : CoreObject> : ReadOnlyCollectionRepository<M>,
+interface ReadOnlyWithUploadCollectionRepository<M : CoreObject> :
+    ReadOnlyCollectionRepository<M>,
     CollectionRepositoryUpload
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt
index 01a9f874e1..d453d83dac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUploadWithUidCollectionRepository.kt
@@ -30,5 +30,6 @@ package org.hisp.dhis.android.core.arch.repositories.collection
 import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-interface ReadWriteWithUploadWithUidCollectionRepository<M, C> : ReadWriteWithUidCollectionRepository<M, C>,
+interface ReadWriteWithUploadWithUidCollectionRepository<M, C> :
+    ReadWriteWithUidCollectionRepository<M, C>,
     CollectionRepositoryUpload where M : CoreObject, M : ObjectWithUidInterface
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
index abe25f07ae..91a65c5e05 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
@@ -34,4 +34,4 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 open class BaseRepositoryImpl<R : BaseRepository>(
     @JvmField protected val scope: RepositoryScope,
     @JvmField protected val cf: FilterConnectorFactory<R>
-) : BaseRepository
\ No newline at end of file
+) : BaseRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index a4c74499dd..6235e4c83f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -53,7 +53,8 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
 ) : BaseRepositoryImpl<R>(scope, cf), ReadOnlyCollectionRepository<M> {
     protected fun blockingGetWithoutChildren(): List<M> {
         return store.selectWhere(
-            whereClause, OrderByClauseBuilder.orderByFromItems(
+            whereClause,
+            OrderByClauseBuilder.orderByFromItems(
                 scope.orderBy(),
                 scope.pagingKey()
             )
@@ -150,4 +151,4 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
 
     protected val whereClause: String
         get() = WhereClauseFromScopeBuilder(WhereClauseBuilder()).getWhereClause(scope)
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 0f68d79424..9c1446f2dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -40,6 +40,7 @@ import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.IdentifiableObject
 
+@Suppress("TooManyFunctions")
 open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
     store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index d346954d50..6ece628960 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -46,7 +46,8 @@ internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyColl
     cf: FilterConnectorFactory<R>
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<M, R>(
     store, childrenAppenders, scope, cf
-), ReadOnlyNameableCollectionRepository<M, R> where M : CoreObject, M : NameableObject {
+),
+    ReadOnlyNameableCollectionRepository<M, R> where M : CoreObject, M : NameableObject {
     override fun byShortName(): StringFilterConnector<R> {
         return cf.string(NameableColumns.SHORT_NAME)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index c3d59f28ba..a33c758c84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -50,7 +50,8 @@ internal abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadO
     cf: FilterConnectorFactory<R>
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
     store, childrenAppenders, scope, cf
-), ReadWriteWithUidCollectionRepository<M, P> where M : CoreObject, M : ObjectWithUidInterface {
+),
+    ReadWriteWithUidCollectionRepository<M, P> where M : CoreObject, M : ObjectWithUidInterface {
     /**
      * Adds a new object to the given collection in an asynchronous way based on the provided CreateProjection.
      * It returns a `Single<String>` with the generated UID, which is completed when the object is added to the
@@ -69,16 +70,17 @@ internal abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadO
      * It adds an object with a [State.TO_POST], which will be uploaded to the server in the next
      * upload. Important: this is a blocking method and it should not be executed in the main thread. Consider the
      * asynchronous version [.add].
-     * @param projection the CreateProjection of the object to add
+     * @param c the CreateProjection of the object to add
      * @return the UID
      */
     @Throws(D2Error::class)
-    override fun blockingAdd(projection: P): String {
-        val `object` = transformer.transform(projection)
+    @Suppress("TooGenericExceptionCaught")
+    override fun blockingAdd(c: P): String {
+        val obj = transformer.transform(c)
         return try {
-            store.insert(`object`)
-            propagateState(`object`, HandleAction.Insert)
-            `object`.uid()
+            store.insert(obj)
+            propagateState(obj, HandleAction.Insert)
+            obj.uid()
         } catch (e: Exception) {
             throw D2Error
                 .builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt
similarity index 89%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt
index f55f6f8fca..884ec06d56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt
@@ -25,21 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.di.internal
 
-package org.hisp.dhis.android.core.arch.repositories.di.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module()
-public final class RepositoriesDIModule {
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
+@Module
+class RepositoriesDIModule {
     @Provides
     @Reusable
-    RepositoryScope emptyScope() {
-        return RepositoryScope.empty();
+    fun emptyScope(): RepositoryScope {
+        return RepositoryScope.empty()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.kt
index 6d03d56d4e..5be2626ed0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyObjectRepository.kt
@@ -25,37 +25,35 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object;
+package org.hisp.dhis.android.core.arch.repositories.`object`
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-
-import io.reactivex.Single;
-
-public interface ReadOnlyObjectRepository<M> extends BaseRepository {
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
+interface ReadOnlyObjectRepository<M> : BaseRepository {
     /**
-     * Returns the object in an asynchronous way, returning a {@code Single<M>}.
-     * @return A {@code Single} object with the object
+     * Returns the object in an asynchronous way, returning a `Single<M>`.
+     * @return A `Single` object with the object
      */
-    Single<M> get();
+    fun get(): Single<M?>
 
     /**
      * Returns the object in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #get()}.
+     * executed in the main thread. Consider the asynchronous version [.get].
      * @return the object
      */
-    M blockingGet();
+    fun blockingGet(): M?
 
     /**
-     * Returns if the object exists in an asynchronous way, returning a {@code Single<Boolean>}.
-     * @return if the object exists, wrapped in a {@code Single}
+     * Returns if the object exists in an asynchronous way, returning a `Single<Boolean>`.
+     * @return if the object exists, wrapped in a `Single`
      */
-    Single<Boolean> exists();
+    fun exists(): Single<Boolean>
 
     /**
      * Returns if the object exists in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #exists()}.
+     * executed in the main thread. Consider the asynchronous version [.exists].
      * @return if the object exists
      */
-    boolean blockingExists();
-}
\ No newline at end of file
+    fun blockingExists(): Boolean
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
index f200e690e7..a395a46931 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
@@ -25,22 +25,25 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object;
+package org.hisp.dhis.android.core.arch.repositories.`object`
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import java.util.Map;
-
-public final class ReadOnlyOneObjectRepositoryFinalImpl<M>
-        extends ReadOnlyOneObjectRepositoryImpl<M, ReadOnlyOneObjectRepositoryFinalImpl<M>> {
-
-    public ReadOnlyOneObjectRepositoryFinalImpl(ReadableStore<M> store,
-                                                Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                RepositoryScope scope) {
-        super(store, childrenAppenders, scope,
-                s -> new ReadOnlyOneObjectRepositoryFinalImpl<>(store, childrenAppenders, s));
+class ReadOnlyOneObjectRepositoryFinalImpl<M> internal constructor(
+    store: ReadableStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope
+) : ReadOnlyOneObjectRepositoryImpl<M, ReadOnlyOneObjectRepositoryFinalImpl<M>>(
+    store, childrenAppenders, scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        ReadOnlyOneObjectRepositoryFinalImpl(
+            store,
+            childrenAppenders,
+            s
+        )
     }
-}
\ No newline at end of file
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.kt
index 64359d88bf..79367a5ac7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteObjectRepository.kt
@@ -25,24 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.`object`
 
-package org.hisp.dhis.android.core.arch.repositories.object;
-
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import io.reactivex.Completable;
-
-
-public interface ReadWriteObjectRepository<M extends CoreObject> extends ReadOnlyObjectRepository<M> {
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.maintenance.D2Error
 
+interface ReadWriteObjectRepository<M : CoreObject> : ReadOnlyObjectRepository<M> {
     /**
      * Removes the object in scope in an asynchronous way. See the implementation JavaDoc for details on how deletion
-     * is performed. It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * The {@code Completable} fails if the object doesn't exist.
-     * @return the {@code Completable} which notifies the completion
+     * is performed. It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * The `Completable` fails if the object doesn't exist.
+     * @return the `Completable` which notifies the completion
      */
-    Completable delete();
+    fun delete(): Completable
 
     /**
      * Removes the object in scope in a synchronous way. See the implementation JavaDoc for details on how deletion
@@ -50,20 +46,21 @@ public interface ReadWriteObjectRepository<M extends CoreObject> extends ReadOnl
      * It throws an exception if the object doesn't exist.
      * @throws D2Error if any errors occur, including when the object doesn't exist.
      */
-    void blockingDelete() throws D2Error;
+    @Throws(D2Error::class)
+    fun blockingDelete()
 
     /**
      * Removes the object in scope in a synchronous way. See the implementation JavaDoc for details on how deletion
-     * is performed. Unlike {@link #delete()}, it doesn't throw an exception if the object doesn't exist.
-     * It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * @return the {@code Completable} which notifies the completion
+     * is performed. Unlike [.delete], it doesn't throw an exception if the object doesn't exist.
+     * It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * @return the `Completable` which notifies the completion
      */
-    Completable deleteIfExist();
+    fun deleteIfExist(): Completable
 
     /**
      * Removes the object in scope in an asynchronous way. See the implementation JavaDoc for details on how deletion
-     * is performed. Unlike {@link #blockingDelete()}, it doesn't throw an exception if the object doesn't exist.
+     * is performed. Unlike [.blockingDelete], it doesn't throw an exception if the object doesn't exist.
      * It blocks the thread and finishes as soon as the object is deleted in the database.
      */
-    void blockingDeleteIfExist();
-}
\ No newline at end of file
+    fun blockingDeleteIfExist()
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.kt
index 231ab8500d..8892e07133 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadWriteValueObjectRepository.kt
@@ -25,23 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.`object`
 
-package org.hisp.dhis.android.core.arch.repositories.object;
-
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import io.reactivex.Completable;
-
-public interface ReadWriteValueObjectRepository<M extends CoreObject> extends ReadWriteObjectRepository<M> {
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.maintenance.D2Error
 
+interface ReadWriteValueObjectRepository<M : CoreObject> : ReadWriteObjectRepository<M> {
     /**
-     * Sets the object in scope in an asynchronous way. It returns a {@code Completable} which
+     * Sets the object in scope in an asynchronous way. It returns a `Completable` which
      * is completed when the object is updated to the database. It adds an object with a ASDASDASDASDASD
      * which will be uploaded to the server in the next upload.
      * @param value the object to add
      * @return the Completable which notifies the completion
      */
-    Completable set(String value);
-    void blockingSet(String value) throws D2Error;
-}
\ No newline at end of file
+    fun set(value: String?): Completable
+
+    @Throws(D2Error::class)
+    fun blockingSet(value: String?)
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.kt
index 000932c6fd..c70fc97feb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ObjectRepositoryFactory.kt
@@ -25,13 +25,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-public interface ObjectRepositoryFactory<R extends ReadOnlyObjectRepository<?>> extends BaseRepositoryFactory<R> {
-    R updated(RepositoryScope updatedScope);
+internal fun interface ObjectRepositoryFactory<R : ReadOnlyObjectRepository<*>> : BaseRepositoryFactory<R> {
+    override fun updated(updatedScope: RepositoryScope): R
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
index 327d6e1c4f..b42e33d6e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
@@ -25,40 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider;
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 
-import io.reactivex.Completable;
-import io.reactivex.Single;
-
-public abstract class ReadOnlyAnyObjectWithDownloadRepositoryImpl<M> {
-
-    private final CompletableProvider downloadCompletableProvider;
-
-    public ReadOnlyAnyObjectWithDownloadRepositoryImpl(CompletableProvider downloadCompletableProvider) {
-        this.downloadCompletableProvider = downloadCompletableProvider;
-    }
-
-    public Single<M> get() {
-        return Single.fromCallable(this::blockingGet);
+abstract class ReadOnlyAnyObjectWithDownloadRepositoryImpl<M>(
+    private val downloadCompletableProvider: CompletableProvider
+) {
+    fun get(): Single<M?> {
+        return Single.fromCallable { blockingGet() }
     }
 
-    public abstract M blockingGet();
+    abstract fun blockingGet(): M?
 
-    public Single<Boolean> exists() {
-        return Single.fromCallable(this::blockingExists);
+    fun exists(): Single<Boolean> {
+        return Single.fromCallable { blockingExists() }
     }
 
-    public boolean blockingExists() {
-        return blockingGet() != null;
+    fun blockingExists(): Boolean {
+        return blockingGet() != null
     }
 
-    public Completable download() {
-        return downloadCompletableProvider.getCompletable(false);
+    fun download(): Completable {
+        return downloadCompletableProvider.getCompletable(false)
     }
 
-    public void blockingDownload() {
-        download().blockingAwait();
+    fun blockingDownload() {
+        download().blockingAwait()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
similarity index 60%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
index d16b5f5c92..2ab4e83848 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
@@ -25,51 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.CoreObject
 
-import java.util.Map;
+open class ReadOnlyFirstObjectWithDownloadRepositoryImpl<M : CoreObject, R : ReadOnlyObjectRepository<M>>
+internal constructor(
+    store: ObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    downloadCompletableProvider: CompletableProvider,
+    repositoryFactory: ObjectRepositoryFactory<R>
+) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
+    ReadOnlyWithDownloadObjectRepository<M> {
+    private val downloadCompletableProvider: CompletableProvider
 
-import io.reactivex.Completable;
-
-public class ReadOnlyFirstObjectWithDownloadRepositoryImpl<M extends CoreObject, R extends ReadOnlyObjectRepository<M>>
-        extends ReadOnlyOneObjectRepositoryImpl<M, R> implements ReadOnlyWithDownloadObjectRepository<M> {
-
-    private final CompletableProvider downloadCompletableProvider;
-
-    public ReadOnlyFirstObjectWithDownloadRepositoryImpl(ObjectStore<M> store,
-                                                         Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                         RepositoryScope scope,
-                                                         CompletableProvider downloadCompletableProvider,
-                                                         ObjectRepositoryFactory<R> repositoryFactory) {
-        super(store, childrenAppenders, scope, repositoryFactory);
-        this.downloadCompletableProvider = downloadCompletableProvider;
+    init {
+        this.downloadCompletableProvider = downloadCompletableProvider
     }
 
     /**
      * Downloads the resource in scope in an asynchronous way. As soon as it's downloaded and processed, the
-     * {@code Completable} is completed.
-     * @return a {@code Completable} that completes when the download and processing is finished
+     * `Completable` is completed.
+     * @return a `Completable` that completes when the download and processing is finished
      */
-    @Override
-    public Completable download() {
-        return downloadCompletableProvider.getCompletable(true);
+    override fun download(): Completable {
+        return downloadCompletableProvider.getCompletable(true)
     }
 
     /**
      * Downloads the resource in scope in a synchronous way. The method will finish
      * as soon as the whole download and processing is finished. Important: this is a blocking method and it should
-     * not be executed in the main thread. Consider the asynchronous version {@link #download()}.
+     * not be executed in the main thread. Consider the asynchronous version [.download].
      */
-    @Override
-    public void blockingDownload() {
-        download().blockingAwait();
+    override fun blockingDownload() {
+        download().blockingAwait()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
index 3cb7a506a1..c353955855 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
@@ -25,73 +25,58 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import java.util.Map;
+abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
+    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    protected val scope: RepositoryScope,
+    repositoryFactory: ObjectRepositoryFactory<R>
+) : ReadOnlyObjectRepository<M> {
+    @JvmField protected val cf: FilterConnectorFactory<R> = FilterConnectorFactory(scope, repositoryFactory)
 
-import io.reactivex.Single;
-
-public abstract class ReadOnlyObjectRepositoryImpl<M, R extends ReadOnlyObjectRepository<M>>
-        implements ReadOnlyObjectRepository<M> {
-
-    protected final Map<String, ChildrenAppender<M>> childrenAppenders;
-    protected final RepositoryScope scope;
-    protected final ObjectRepositoryFactory<R> repositoryFactory;
-    protected final FilterConnectorFactory<R> cf;
-
-    ReadOnlyObjectRepositoryImpl(Map<String, ChildrenAppender<M>> childrenAppenders,
-                                 RepositoryScope scope,
-                                 ObjectRepositoryFactory<R> repositoryFactory) {
-        this.childrenAppenders = childrenAppenders;
-        this.scope = scope;
-        this.repositoryFactory = repositoryFactory;
-        this.cf = new FilterConnectorFactory<>(scope, repositoryFactory);
-    }
-
-    abstract M blockingGetWithoutChildren();
+    abstract fun blockingGetWithoutChildren(): M?
 
     /**
-     * Returns the object in an asynchronous way, returning a {@code Single<M>}.
-     * @return A {@code Single} object with the object
+     * Returns the object in an asynchronous way, returning a `Single<M>`.
+     * @return A `Single` object with the object
      */
-    @Override
-    public final Single<M> get() {
-        return Single.fromCallable(this::blockingGet);
+    override fun get(): Single<M?> {
+        return Single.fromCallable { blockingGet() }
     }
 
     /**
      * Returns the object in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #get()}.
+     * executed in the main thread. Consider the asynchronous version [.get].
      * @return the object
      */
-    @Override
-    public final M blockingGet() {
-        return ChildrenAppenderExecutor.appendInObject(blockingGetWithoutChildren(), childrenAppenders,
-                scope.children());
+    override fun blockingGet(): M? {
+        return ChildrenAppenderExecutor.appendInObject(
+            blockingGetWithoutChildren(), childrenAppenders,
+            scope.children()
+        )
     }
 
     /**
-     * Returns if the object exists in an asynchronous way, returning a {@code Single<Boolean>}.
-     * @return if the object exists, wrapped in a {@code Single}
+     * Returns if the object exists in an asynchronous way, returning a `Single<Boolean>`.
+     * @return if the object exists, wrapped in a `Single`
      */
-    @Override
-    public final Single<Boolean> exists() {
-        return Single.fromCallable(this::blockingExists);
+    override fun exists(): Single<Boolean> {
+        return Single.fromCallable { blockingExists() }
     }
 
     /**
      * Returns if the object exists in a synchronous way. Important: this is a blocking method and it should not be
-     * executed in the main thread. Consider the asynchronous version {@link #exists()}.
+     * executed in the main thread. Consider the asynchronous version [.exists].
      * @return if the object exists
      */
-    @Override
-    public boolean blockingExists() {
-        return blockingGetWithoutChildren() != null;
+    override fun blockingExists(): Boolean {
+        return blockingGetWithoutChildren() != null
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
index ce5c6019cc..f66fcd9a70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
@@ -25,32 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder;
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 
-import java.util.Map;
+open class ReadOnlyOneObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
+    private val store: ReadableStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    repositoryFactory: ObjectRepositoryFactory<R>
+) : ReadOnlyObjectRepositoryImpl<M, R>(childrenAppenders, scope, repositoryFactory) {
 
-public class ReadOnlyOneObjectRepositoryImpl<M, R extends ReadOnlyObjectRepository<M>>
-        extends ReadOnlyObjectRepositoryImpl<M, R> {
-
-    private final ReadableStore<M> store;
-
-    public ReadOnlyOneObjectRepositoryImpl(ReadableStore<M> store,
-                                           Map<String, ChildrenAppender<M>> childrenAppenders,
-                                           RepositoryScope scope,
-                                           ObjectRepositoryFactory<R> repositoryFactory) {
-        super(childrenAppenders, scope, repositoryFactory);
-        this.store = store;
-    }
-
-    protected M blockingGetWithoutChildren() {
-        WhereClauseFromScopeBuilder whereClauseBuilder = new WhereClauseFromScopeBuilder(new WhereClauseBuilder());
-        return store.selectOneWhere(whereClauseBuilder.getWhereClause(scope));
+    override fun blockingGetWithoutChildren(): M? {
+        val whereClauseBuilder = WhereClauseFromScopeBuilder(WhereClauseBuilder())
+        return store.selectOneWhere(whereClauseBuilder.getWhereClause(scope))
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java
deleted file mode 100644
index 472a1ebc3f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
-
-import android.util.Log;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.DataObject;
-import org.hisp.dhis.android.core.common.DeletableDataObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.Unit;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public abstract class ReadWriteWithUidDataObjectRepositoryImpl
-        <M extends CoreObject & ObjectWithUidInterface & DeletableDataObject, R extends ReadOnlyObjectRepository<M>>
-        extends ReadWriteWithUidObjectRepositoryImpl<M, R> implements ReadWriteObjectRepository<M> {
-
-    public ReadWriteWithUidDataObjectRepositoryImpl(IdentifiableDeletableDataObjectStore<M> store,
-                                                    Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                    RepositoryScope scope,
-                                                    ObjectRepositoryFactory<R> repositoryFactory) {
-        super(store, childrenAppenders, scope, repositoryFactory);
-    }
-
-    /**
-     * Removes the object in scope in an asynchronous way. Field {@link DataObject#syncState()} is marked as
-     * {@link State#TO_UPDATE} and {@link DeletableDataObject#deleted()} as true. In the next upload, it will be deleted
-     * in the server. It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * The {@code Completable} fails if the object doesn't exist.
-     * @return the {@code Completable} which notifies the completion
-     */
-    @Override
-    public Completable delete() {
-        return Completable.fromAction(this::blockingDelete);
-    }
-
-    /**
-     * Removes the object in scope in a synchronous way. Field {@link DataObject#syncState()} is marked as
-     * {@link State#TO_UPDATE} and {@link DeletableDataObject#deleted()} as true. In the next upload, it will be deleted
-     * in the server. It blocks the thread and finishes as soon as the object is deleted in the database.
-     * It throws an exception if the object doesn't exist.
-     *
-     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
-     * asynchronous version {@link #delete()}.
-     *
-     * @throws D2Error if any errors occur, including when the object doesn't exist.
-     */
-    @Override
-    public void blockingDelete() throws D2Error {
-        M object = blockingGet();
-        if (object == null) {
-            throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.CANT_DELETE_NON_EXISTING_OBJECT)
-                    .errorDescription("Tried to delete non existing object")
-                    .build();
-        } else {
-            deleteObject(object);
-        }
-    }
-
-    /**
-     * Removes the object in scope in a synchronous way. Field {@link DataObject#syncState()} is marked as
-     * {@link State#TO_POST} and {@link DeletableDataObject#deleted()} as true. Unlike {@link #delete()},
-     * it doesn't throw an exception if the object doesn't exist.
-     * It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * @return the {@code Completable} which notifies the completion
-     */
-    @Override
-    public Completable deleteIfExist() {
-        return Completable.fromAction(this::blockingDeleteIfExist);
-    }
-
-    /**
-     * Removes the object in scope in an asynchronous way. Field {@link DataObject#syncState()} is marked as
-     * {@link State#TO_POST} and {@link DeletableDataObject#deleted()} as true.
-     * Unlike {@link #blockingDelete()}, it doesn't throw an exception if the object doesn't exist.
-     * It blocks the thread and finishes as soon as the object is deleted in the database.
-     *
-     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
-     * asynchronous version {@link #delete()}.
-     */
-    @Override
-    public void blockingDeleteIfExist() {
-        try {
-            blockingDelete();
-        } catch (D2Error d2Error) {
-            Log.v(ReadWriteWithUidDataObjectRepositoryImpl.class.getCanonicalName(), d2Error.errorDescription());
-        }
-    }
-
-    @Override
-    protected Unit updateObject(M m) throws D2Error {
-        super.updateObject(m);
-        propagateState(m, HandleAction.Update);
-        return new Unit();
-    }
-
-    protected abstract void propagateState(M m, HandleAction action);
-
-    protected abstract void deleteObject(M m);
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
new file mode 100644
index 0000000000..3095f1bf2b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
@@ -0,0 +1,127 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
+
+import android.util.Log
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.DeletableDataObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.Unit
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+
+abstract class ReadWriteWithUidDataObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
+    store: IdentifiableDeletableDataObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    repositoryFactory: ObjectRepositoryFactory<R>
+) : ReadWriteWithUidObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
+    ReadWriteObjectRepository<M> where M : CoreObject, M : ObjectWithUidInterface, M : DeletableDataObject {
+    /**
+     * Removes the object in scope in an asynchronous way. Field [DataObject.syncState] is marked as
+     * [State.TO_UPDATE] and [DeletableDataObject.deleted] as true. In the next upload, it will be deleted
+     * in the server. It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * The `Completable` fails if the object doesn't exist.
+     * @return the `Completable` which notifies the completion
+     */
+    override fun delete(): Completable {
+        return Completable.fromAction { blockingDelete() }
+    }
+
+    /**
+     * Removes the object in scope in a synchronous way. Field [DataObject.syncState] is marked as
+     * [State.TO_UPDATE] and [DeletableDataObject.deleted] as true. In the next upload, it will be deleted
+     * in the server. It blocks the thread and finishes as soon as the object is deleted in the database.
+     * It throws an exception if the object doesn't exist.
+     *
+     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
+     * asynchronous version [.delete].
+     *
+     * @throws D2Error if any errors occur, including when the object doesn't exist.
+     */
+    @Throws(D2Error::class)
+    override fun blockingDelete() {
+        val obj = blockingGet()
+        if (obj === null) {
+            throw D2Error
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.CANT_DELETE_NON_EXISTING_OBJECT)
+                .errorDescription("Tried to delete non existing object")
+                .build()
+        } else {
+            deleteObject(obj)
+        }
+    }
+
+    /**
+     * Removes the object in scope in a synchronous way. Field [DataObject.syncState] is marked as
+     * [State.TO_POST] and [DeletableDataObject.deleted] as true. Unlike [.delete],
+     * it doesn't throw an exception if the object doesn't exist.
+     * It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * @return the `Completable` which notifies the completion
+     */
+    override fun deleteIfExist(): Completable {
+        return Completable.fromAction { blockingDeleteIfExist() }
+    }
+
+    /**
+     * Removes the object in scope in an asynchronous way. Field [DataObject.syncState] is marked as
+     * [State.TO_POST] and [DeletableDataObject.deleted] as true.
+     * Unlike [.blockingDelete], it doesn't throw an exception if the object doesn't exist.
+     * It blocks the thread and finishes as soon as the object is deleted in the database.
+     *
+     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
+     * asynchronous version [.delete].
+     */
+    override fun blockingDeleteIfExist() {
+        try {
+            blockingDelete()
+        } catch (d2Error: D2Error) {
+            Log.v(ReadWriteWithUidDataObjectRepositoryImpl::class.java.canonicalName, d2Error.errorDescription())
+        }
+    }
+
+    @Throws(D2Error::class)
+    override fun updateObject(m: M): Unit {
+        super.updateObject(m)
+        propagateState(m, HandleAction.Update)
+        return Unit()
+    }
+
+    protected abstract fun propagateState(m: M, action: HandleAction)
+    protected abstract fun deleteObject(m: M)
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
similarity index 50%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
index a4efce954a..d3c69bb84c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
@@ -25,48 +25,45 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.Unit;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.Unit
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
-import java.util.Map;
+open class ReadWriteWithUidObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
+    private val store: IdentifiableObjectStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    repositoryFactory: ObjectRepositoryFactory<R>
+) : ReadOnlyOneObjectRepositoryImpl<M, R>(
+    store,
+    childrenAppenders,
+    scope,
+    repositoryFactory
+) where M : CoreObject, M : ObjectWithUidInterface {
 
-public class ReadWriteWithUidObjectRepositoryImpl
-        <M extends CoreObject & ObjectWithUidInterface, R extends ReadOnlyObjectRepository<M>>
-        extends ReadOnlyOneObjectRepositoryImpl<M, R> {
-
-    private final IdentifiableObjectStore<M> store;
-
-    public ReadWriteWithUidObjectRepositoryImpl(IdentifiableObjectStore<M> store,
-                                                Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                RepositoryScope scope,
-                                                ObjectRepositoryFactory<R> repositoryFactory) {
-        super(store, childrenAppenders, scope, repositoryFactory);
-        this.store = store;
-    }
-
-    @SuppressWarnings({"PMD.PreserveStackTrace"})
-    protected Unit updateObject(M m) throws D2Error {
-        try {
-            store.update(m);
-            return new Unit();
-        } catch (Exception e) {
+    @Throws(D2Error::class)
+    @Suppress("TooGenericExceptionCaught")
+    protected open fun updateObject(m: M): Unit {
+        return try {
+            store.update(m)
+            Unit()
+        } catch (e: Exception) {
             throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.OBJECT_CANT_BE_UPDATED)
-                    .errorDescription("Object property can't be updated")
-                    .originalException(e)
-                    .build();
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.OBJECT_CANT_BE_UPDATED)
+                .errorDescription("Object property can't be updated")
+                .originalException(e)
+                .build()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java
deleted file mode 100644
index bdca010de2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.object.internal;
-
-import android.util.Log;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.CoreObject;
-import org.hisp.dhis.android.core.common.DataObject;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public class ReadWriteWithValueObjectRepositoryImpl<M extends CoreObject, R extends ReadOnlyObjectRepository<M>>
-        extends ReadOnlyOneObjectRepositoryImpl<M, R> implements ReadWriteObjectRepository<M> {
-
-    private final ObjectWithoutUidStore<M> store;
-
-    public ReadWriteWithValueObjectRepositoryImpl(ObjectWithoutUidStore<M> store,
-                                                  Map<String, ChildrenAppender<M>> childrenAppenders,
-                                                  RepositoryScope scope,
-                                                  ObjectRepositoryFactory<R> repositoryFactory) {
-        super(store, childrenAppenders, scope, repositoryFactory);
-        this.store = store;
-    }
-
-    /**
-     * Removes the object in scope in an asynchronous way. It removes the value in the database and propagates
-     * the changes to modify the {@link DataObject#syncState()} of the parent, so it's updated in the server in
-     * the next upload.
-     * It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * The {@code Completable} fails if the object doesn't exist.
-     * @return the {@code Completable} which notifies the completion
-     */
-    @Override
-    public Completable delete() {
-        return Completable.fromAction(this::blockingDelete);
-    }
-
-    /**
-     * Removes the object in scope in a synchronous way. It removes the value in the database and propagates
-     * the changes to modify the {@link DataObject#syncState()} of the parent, so it's updated in the server in
-     * the next upload.
-     * It blocks the thread and finishes as soon as the object is deleted in the database.
-     *
-     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
-     * asynchronous version {@link #delete()}.
-     *
-     * It throws an exception if the object doesn't exist.
-     */
-    @Override
-    public void blockingDelete() throws D2Error {
-        delete(blockingGetWithoutChildren());
-    }
-
-    /**
-     * Removes the object in scope in an asynchronous way. It removes the value in the database and propagates
-     * the changes to modify the {@link DataObject#syncState()} of the parent, so it's updated in the server in
-     * the next upload.
-     * It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * Unlike {@link #delete()}, it doesn't throw an exception if the object doesn't exist.
-     * It returns a {@code Completable} that completes as soon as the object is deleted in the database.
-     * @return the {@code Completable} which notifies the completion
-     */
-    @Override
-    public Completable deleteIfExist() {
-        return Completable.fromAction(this::blockingDeleteIfExist);
-    }
-
-    /**
-     * Removes the object in scope in a synchronous way. It removes the value in the database and propagates
-     * the changes to modify the {@link DataObject#syncState()} of the parent, so it's updated in the server in
-     * the next upload.
-     * Unlike {@link #blockingDelete()}, it doesn't throw an exception if the object doesn't exist.
-     * It blocks the thread and finishes as soon as the object is deleted in the database.
-     *
-     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
-     * asynchronous version {@link #deleteIfExist()}.
-     */
-    @Override
-    public void blockingDeleteIfExist() {
-        try {
-            blockingDelete();
-        } catch (D2Error d2Error) {
-            Log.v(ReadWriteWithValueObjectRepositoryImpl.class.getCanonicalName(), d2Error.errorDescription());
-        }
-    }
-
-    @SuppressWarnings({"PMD.PreserveStackTrace"})
-    protected void delete(M m) throws D2Error {
-        try {
-            store.deleteWhere(m);
-            propagateState(m);
-        } catch (Exception e) {
-            throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.UNEXPECTED)
-                    .errorDescription("Unexpected exception on value delete")
-                    .originalException(e)
-                    .build();
-        }
-    }
-
-    @SuppressWarnings({"PMD.PreserveStackTrace"})
-    protected void setObject(M m) throws D2Error {
-        try {
-            store.updateOrInsertWhere(m);
-            propagateState(m);
-        } catch (Exception e) {
-            throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.VALUE_CANT_BE_SET)
-                    .errorDescription("Value can't be set")
-                    .originalException(e)
-                    .build();
-        }
-    }
-
-    protected void propagateState(M m) {
-        // Method is empty because is the default action.
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
new file mode 100644
index 0000000000..9a0a7dc691
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
@@ -0,0 +1,147 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.`object`.internal
+
+import android.util.Log
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.CoreObject
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+
+open class ReadWriteWithValueObjectRepositoryImpl<M : CoreObject, R : ReadOnlyObjectRepository<M>>
+internal constructor(
+    private val store: ObjectWithoutUidStore<M>,
+    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    scope: RepositoryScope,
+    repositoryFactory: ObjectRepositoryFactory<R>
+) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
+    ReadWriteObjectRepository<M> {
+
+    /**
+     * Removes the object in scope in an asynchronous way. It removes the value in the database and propagates
+     * the changes to modify the [DataObject.syncState] of the parent, so it's updated in the server in
+     * the next upload.
+     * It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * The `Completable` fails if the object doesn't exist.
+     * @return the `Completable` which notifies the completion
+     */
+    override fun delete(): Completable {
+        return Completable.fromAction { blockingDelete() }
+    }
+
+    /**
+     * Removes the object in scope in a synchronous way. It removes the value in the database and propagates
+     * the changes to modify the [DataObject.syncState] of the parent, so it's updated in the server in
+     * the next upload.
+     * It blocks the thread and finishes as soon as the object is deleted in the database.
+     *
+     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
+     * asynchronous version [.delete].
+     *
+     * It throws an exception if the object doesn't exist.
+     */
+    @Throws(D2Error::class)
+    override fun blockingDelete() {
+        blockingGetWithoutChildren()?.let { delete(it) }
+    }
+
+    /**
+     * Removes the object in scope in an asynchronous way. It removes the value in the database and propagates
+     * the changes to modify the [DataObject.syncState] of the parent, so it's updated in the server in
+     * the next upload.
+     * It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * Unlike [.delete], it doesn't throw an exception if the object doesn't exist.
+     * It returns a `Completable` that completes as soon as the object is deleted in the database.
+     * @return the `Completable` which notifies the completion
+     */
+    override fun deleteIfExist(): Completable {
+        return Completable.fromAction { blockingDeleteIfExist() }
+    }
+
+    /**
+     * Removes the object in scope in a synchronous way. It removes the value in the database and propagates
+     * the changes to modify the [DataObject.syncState] of the parent, so it's updated in the server in
+     * the next upload.
+     * Unlike [.blockingDelete], it doesn't throw an exception if the object doesn't exist.
+     * It blocks the thread and finishes as soon as the object is deleted in the database.
+     *
+     * Important: this is a blocking method and it should not be executed in the main thread. Consider the
+     * asynchronous version [.deleteIfExist].
+     */
+    override fun blockingDeleteIfExist() {
+        try {
+            blockingDelete()
+        } catch (d2Error: D2Error) {
+            Log.v(ReadWriteWithValueObjectRepositoryImpl::class.java.canonicalName, d2Error.errorDescription())
+        }
+    }
+
+    @Throws(D2Error::class)
+    @Suppress("TooGenericExceptionCaught")
+    protected open fun delete(m: M) {
+        try {
+            store.deleteWhere(m)
+            propagateState(m)
+        } catch (e: Exception) {
+            throw D2Error
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.UNEXPECTED)
+                .errorDescription("Unexpected exception on value delete")
+                .originalException(e)
+                .build()
+        }
+    }
+
+    @Throws(D2Error::class)
+    @Suppress("TooGenericExceptionCaught")
+    protected fun setObject(m: M) {
+        try {
+            store.updateOrInsertWhere(m)
+            propagateState(m)
+        } catch (e: Exception) {
+            throw D2Error
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.VALUE_CANT_BE_SET)
+                .errorDescription("Value can't be set")
+                .originalException(e)
+                .build()
+        }
+    }
+
+    protected open fun propagateState(m: M?) {
+        // Method is empty because is the default action.
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index b0db683b67..8fcc47e762 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -108,7 +108,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
                     dataSetCompleteRegistration.dataSet(),
                     dataSetCompleteRegistration.period(),
                     dataSetCompleteRegistration.organisationUnit(),
-                    coc.categoryCombo()!!.uid(),
+                    coc!!.categoryCombo()!!.uid(),
                     CollectionsHelper.semicolonSeparatedCollectionValues(getUids(coc.categoryOptions()!!)),
                     false
                 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index d7221848e0..39ffccc7e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -95,9 +95,9 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.ATTRIBUTE_OPTION_COMBO_NO_ASSIGN_TO_ORGUNIT)
             !blockingIsPeriodInOrgUnitRange(period, organisationUnitUid) ->
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.PERIOD_IS_NOT_IN_ORGUNIT_RANGE)
-            !blockingIsExpired(dataSet, period) ->
+            dataSet?.let { !blockingIsExpired(dataSet, period) } ?: false ->
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.EXPIRED)
-            !blockingIsClosed(dataSet, period) ->
+            dataSet?.let { !blockingIsClosed(dataSet, period) } ?: false ->
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.CLOSED)
             else -> DataSetEditableStatus.Editable
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
index 81ab572ec2..6601b278bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
@@ -69,17 +69,19 @@ class DataStoreObjectRepository @Inject internal constructor(
     }
 
     override fun blockingDelete() {
-        val entry = blockingGetWithoutChildren()
-        if (entry.syncState() == State.TO_POST) {
-            super.blockingDelete()
-        } else {
-            setObject(entry.toBuilder().deleted(true).syncState(State.TO_UPDATE).build())
+        blockingGetWithoutChildren()?.let { entry ->
+            if (entry.syncState() == State.TO_POST) {
+                super.blockingDelete()
+            } else {
+                setObject(entry.toBuilder().deleted(true).syncState(State.TO_UPDATE).build())
+            }
         }
     }
 
     private fun setBuilder(): DataStoreEntry.Builder {
-        return if (blockingExists()) {
-            val entry = blockingGetWithoutChildren()
+        val entry = blockingGetWithoutChildren()
+
+        return if (entry != null) {
             entry.toBuilder()
                 .syncState(if (entry.syncState() == State.TO_POST) State.TO_POST else State.TO_UPDATE)
         } else {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index c52a2c3730..97440a0dfd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -98,7 +98,7 @@ internal class EnrollmentServiceImpl @Inject constructor(
 
         return organisationUnitRepository
             .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
-            .uid(tei.organisationUnit())
+            .uid(tei?.organisationUnit())
             .blockingExists()
     }
 
@@ -110,7 +110,7 @@ internal class EnrollmentServiceImpl @Inject constructor(
             .toList()
             .flatMap { currentProgramStagesUids: List<String?> ->
                 val repository = programStagesCollectionRepository.byProgramUid().eq(
-                    enrollmentRepository.uid(enrollmentUid).blockingGet().program()
+                    enrollmentRepository.uid(enrollmentUid).blockingGet()?.program()
                 ).byAccessDataWrite().isTrue
 
                 repository.get().toFlowable()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
index e6815c431a..8ff63f8c0d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
@@ -183,7 +183,7 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
         mode: AssignedUserMode
     ): EventCollectionRepository {
         return when (mode) {
-            AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet().user())
+            AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet()?.user())
             AssignedUserMode.ANY -> repository.byAssignedUser().isNotNull
             AssignedUserMode.NONE -> repository.byAssignedUser().isNull
             // TODO Not implemented yet
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
index 3206839b26..c8858978ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
@@ -39,6 +39,7 @@ import org.hisp.dhis.android.core.indicator.IndicatorCollectionRepository
 import org.hisp.dhis.android.core.indicator.IndicatorTypeCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
+import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DimensionalItemObject
 import org.hisp.dhis.android.core.parser.internal.service.utils.ExpressionHelper
@@ -76,20 +77,24 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
         attributeOptionComboUid: String
     ): Double {
         val indicator = indicatorRepository.uid(indicatorUid).blockingGet()
-        val indicatorType = indicatorTypeRepository.uid(indicator.indicatorType()?.uid()).blockingGet()
+        val indicatorType = indicatorTypeRepository.uid(indicator?.indicatorType()?.uid()).blockingGet()
 
-        val context = ExpressionServiceContext(
-            valueMap = getValueMap(dataSetUid, attributeOptionComboUid, orgUnitUid, periodId),
-            constantMap = getConstantMap(),
-            orgUnitCountMap = getOrgunitGroupMap(),
-            days = PeriodHelper.getDays(getPeriod(periodId))
-        )
+        return if (indicator != null && indicatorType != null) {
+            val context = ExpressionServiceContext(
+                valueMap = getValueMap(dataSetUid, attributeOptionComboUid, orgUnitUid, periodId),
+                constantMap = getConstantMap(),
+                orgUnitCountMap = getOrgunitGroupMap(),
+                days = PeriodHelper.getDays(getPeriod(periodId))
+            )
 
-        return dataSetIndicatorEvaluator.evaluate(
-            indicator = indicator,
-            indicatorType = indicatorType,
-            context = context
-        )
+            dataSetIndicatorEvaluator.evaluate(
+                indicator = indicator,
+                indicatorType = indicatorType,
+                context = context
+            )
+        } else {
+            ParserUtils.DOUBLE_VALUE_IF_NULL
+        }
     }
 
     private fun getValueMap(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
index c8cb2dbceb..8219a408eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
@@ -72,7 +72,7 @@ internal class RelationshipServiceImpl @Inject constructor(
         }
         RelationshipEntityType.TRACKED_ENTITY_INSTANCE -> {
             val teTypeUid = constraint.trackedEntityType()?.uid()
-            trackedEntityTypeRepository.uid(teTypeUid).blockingGet().access().data().write()
+            trackedEntityTypeRepository.uid(teTypeUid).blockingGet()!!.access().data().write()!!
         }
         else -> false
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
index ecf50551fd..f2dbedd284 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
@@ -81,7 +81,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
 ) : LocalDbRepository {
 
     override fun getUserName(): Single<String> {
-        return Single.fromCallable { userRepository.blockingGet().user() }
+        return Single.fromCallable { userRepository.blockingGet()?.user() }
     }
 
     override fun getGatewayNumber(): Single<String> {
@@ -146,7 +146,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
 
     override fun getTeiEnrollmentToSubmit(enrollmentUid: String): Single<TrackedEntityInstance> {
         return Single.fromCallable {
-            val enrollment = enrollmentModule.enrollments().byUid().eq(enrollmentUid).one().blockingGet()
+            val enrollment = enrollmentModule.enrollments().byUid().eq(enrollmentUid).one().blockingGet()!!
             val events = getEventsForEnrollment(enrollmentUid).blockingGet()
             val enrollmentWithEvents = EnrollmentInternalAccessor
                 .insertEvents(enrollment.toBuilder(), events)

From 723e761a8741ca713fc33ac462a52f76963ec1e7 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 19 Jul 2023 09:30:03 +0200
Subject: [PATCH 113/478] Rename .java to .kt

---
 ...edEntityAttributeReservedValueManagerRealIntegrationShould.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java => TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt} (100%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
similarity index 100%
rename from core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.java
rename to core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt

From e39c5ba3902fea93665c2e004defd240fb281e83 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 18 Jul 2023 09:05:02 +0200
Subject: [PATCH 114/478] [ANDROSDK-1680] chore: - Change FileResource handler
 - Suppress "LongParameterList" warning

---
 .../internal/FileResourceDownloadCall.kt           | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index 2901640566..6fcde65e73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -37,9 +37,6 @@ import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.handlers.internal.HandlerWithTransformer
 import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.ValueType
@@ -49,19 +46,19 @@ import org.hisp.dhis.android.core.fileresource.FileResourceElementType
 import org.hisp.dhis.android.core.fileresource.FileResourceInternalAccessor
 import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
 
+@SuppressWarnings("LongParameterList")
 @Reusable
 internal class FileResourceDownloadCall @Inject constructor(
-    private val fileResourceStore: IdentifiableDataObjectStore<FileResource>,
+    private val fileResourceStore: FileResourceStore,
     private val helper: FileResourceDownloadCallHelper,
     private val fileResourceService: FileResourceService,
-    private val handler: HandlerWithTransformer<FileResource>,
+    private val handler: FileResourceHandler,
     private val fileResourceRoutine: FileResourceRoutine,
-    private val synchronizationSettingsStore: ObjectWithoutUidStore<SynchronizationSettings>,
+    private val synchronizationSettingsStore: SynchronizationSettingStore,
     private val context: Context,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor
-
 ) {
 
     fun download(params: FileResourceDownloadParams): Flow<D2Progress> = flow {
@@ -161,6 +158,7 @@ internal class FileResourceDownloadCall @Inject constructor(
         download: suspend (V) -> ResponseBody?,
         getUid: (V) -> String?
     ) {
+
         val fileResources = values.mapNotNull { downloadFile(it, maxContentLength, download, getUid) }
 
         handler.handleMany(fileResources) { fileResource: FileResource ->

From 4350225c755ab948fd6eb98a7d5ca320dee30b29 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 19 Jul 2023 11:09:15 +0200
Subject: [PATCH 115/478] [ANDROSDK-1677] create a flow that emits progress
 sequentially

---
 .../EventDownloadCallMockIntegrationShould.kt |  2 ++
 .../core/event/internal/EventDownloadCall.kt  |  3 ---
 .../TrackedEntityInstanceDownloadCall.kt      |  1 -
 .../tracker/exporter/TrackerDownloadCall.kt   | 27 +++++++++----------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDownloadCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDownloadCallMockIntegrationShould.kt
index e8ecbf9ece..1028df896e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDownloadCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDownloadCallMockIntegrationShould.kt
@@ -39,6 +39,8 @@ class EventDownloadCallMockIntegrationShould : BaseMockIntegrationTestMetadataDi
     fun emit_progress() {
         val testObserver = d2.eventModule().eventDownloader().download().test()
 
+        testObserver.awaitTerminalEvent()
+
         testObserver.assertValueCount(4)
 
         testObserver.assertValueAt(0) { v: TrackerD2Progress ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 0e79bbcbaa..1cd773d229 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -51,13 +50,11 @@ internal class EventDownloadCall @Inject internal constructor(
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
     private val rxCallExecutor: RxAPICallExecutor,
-    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val eventQueryBundleFactory: EventQueryBundleFactory,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val persistenceCallFactory: EventPersistenceCallFactory,
     private val lastUpdatedManager: EventLastUpdatedManager
 ) : TrackerDownloadCall<Event, EventQueryBundle>(
-    coroutineAPICallExecutor,
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index 69696f0be7..dab03babe3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -57,7 +57,6 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     private val persistenceCallFactory: TrackedEntityInstancePersistenceCallFactory,
     private val lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager
 ) : TrackerDownloadCall<TrackedEntityInstance, TrackerQueryBundle>(
-    coroutineCallExecutor,
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 2d3559d468..0e30f31e0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -33,13 +33,12 @@ import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flatMapConcat
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.rx2.asFlow
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.paging.internal.ApiPagingEngine
 import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -55,13 +54,12 @@ import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 
 @Suppress("TooManyFunctions")
 internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val systemInfoModuleDownloader: SystemInfoModuleDownloader,
     private val relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory
 ) {
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+    @OptIn(FlowPreview::class)
     fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = flow {
         val progressManager = TrackerD2ProgressManager(null)
         if (userOrganisationUnitLinkStore.count() == 0) {
@@ -71,15 +69,14 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
             val relatives = RelationshipItemRelatives()
             systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
                 .asFlow()
-                .flatMapLatest {
-                    coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
-                        merge(
-                            downloadInternal(params, progressManager, relatives),
-                            downloadRelationships(progressManager, relatives),
-                            flow { emit(progressManager.complete()) }
-                        )
+                .flatMapConcat {
+                    flow {
+                        emitAll(downloadInternal(params, progressManager, relatives))
+                        emitAll(downloadRelationships(progressManager, relatives))
+                        emit(progressManager.complete())
                     }
-                }.collect { progress ->
+                }
+                .collect { progress ->
                     emit(progress)
                 }
         }
@@ -153,7 +150,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
      */
 
     @Suppress("LongParameterList")
-    private suspend fun iterateBundle(
+    private fun iterateBundle(
         bundle: Q,
         params: ProgramDataDownloadParams,
         bundleResult: BundleResult,

From 0f4de2b6915a12581e9869aaef218d3fbd2c604f Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 19 Jul 2023 16:28:26 +0200
Subject: [PATCH 116/478] [ANDROSDK-1.9.0-SNAPSHOT] Restore version tag
 1.9.2-SNAPSHOT

---
 core/gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/gradle.properties b/core/gradle.properties
index c782b7cf6a..bbebc1c830 100644
--- a/core/gradle.properties
+++ b/core/gradle.properties
@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=1.8.2-SNAPSHOT
-VERSION_CODE=283
+VERSION_NAME=1.9.0-SNAPSHOT
+VERSION_CODE=290
 
 GROUP=org.hisp.dhis
 

From 6adcda0fbe2aeb5dc0c1f7344a21d3b8ef0aef7c Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 20 Jul 2023 11:46:15 +0200
Subject: [PATCH 117/478] 
 [ANDROSDK-1677-NETWORK-REPLACE-RX-JAVA-IN-TRACKER-DOWNLOAD] Replace flow by
 channelFlow

---
 ...stanceDownloadCallMockIntegrationShould.kt |  2 ++
 .../core/event/internal/EventDownloadCall.kt  |  5 ++-
 .../TrackedEntityInstanceDownloadCall.kt      |  3 +-
 .../tracker/exporter/TrackerDownloadCall.kt   | 34 +++++++------------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCallMockIntegrationShould.kt
index 64d3307f3b..dc54a7cefe 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCallMockIntegrationShould.kt
@@ -39,6 +39,8 @@ class TrackedEntityInstanceDownloadCallMockIntegrationShould : BaseMockIntegrati
     fun emit_progress() {
         val testObserver = d2.trackedEntityModule().trackedEntityInstanceDownloader().download().test()
 
+        testObserver.awaitTerminalEvent()
+
         testObserver.assertValueCount(5)
 
         testObserver.assertValueAt(0) { v: TrackerD2Progress ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 1cd773d229..40bbe88008 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Reusable
 import io.reactivex.Single
 import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -49,6 +50,7 @@ internal class EventDownloadCall @Inject internal constructor(
     userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val rxCallExecutor: RxAPICallExecutor,
     private val eventQueryBundleFactory: EventQueryBundleFactory,
     private val trackerParentCallFactory: TrackerParentCallFactory,
@@ -57,7 +59,8 @@ internal class EventDownloadCall @Inject internal constructor(
 ) : TrackerDownloadCall<Event, EventQueryBundle>(
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
-    relationshipDownloadAndPersistCallFactory
+    relationshipDownloadAndPersistCallFactory,
+    coroutineAPICallExecutor
 ) {
 
     override fun getBundles(params: ProgramDataDownloadParams): List<EventQueryBundle> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index dab03babe3..aed2b335de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -59,7 +59,8 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
 ) : TrackerDownloadCall<TrackedEntityInstance, TrackerQueryBundle>(
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
-    relationshipDownloadAndPersistCallFactory
+    relationshipDownloadAndPersistCallFactory,
+    coroutineCallExecutor
 ) {
     override fun getBundles(params: ProgramDataDownloadParams): List<TrackerQueryBundle> {
         return queryFactory.getQueries(params)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 0e30f31e0c..0ccf6faa03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -33,12 +33,11 @@ import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flatMapConcat
+import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asFlow
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.paging.internal.ApiPagingEngine
 import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -56,29 +55,23 @@ import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val systemInfoModuleDownloader: SystemInfoModuleDownloader,
-    private val relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory
+    private val relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) {
 
-    @OptIn(FlowPreview::class)
-    fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = flow {
+    fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = channelFlow {
         val progressManager = TrackerD2ProgressManager(null)
         if (userOrganisationUnitLinkStore.count() == 0) {
             progressManager.setTotalCalls(1)
-            emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, true))
+            send(progressManager.increaseProgress(TrackedEntityInstance::class.java, true))
         } else {
             val relatives = RelationshipItemRelatives()
-            systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
-                .asFlow()
-                .flatMapConcat {
-                    flow {
-                        emitAll(downloadInternal(params, progressManager, relatives))
-                        emitAll(downloadRelationships(progressManager, relatives))
-                        emit(progressManager.complete())
-                    }
-                }
-                .collect { progress ->
-                    emit(progress)
-                }
+            systemInfoModuleDownloader.downloadWithProgressManager(progressManager).blockingSubscribe()
+            coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+                downloadInternal(params, progressManager, relatives).collect { v -> send(v) }
+                downloadRelationships(progressManager, relatives).collect { v -> send(v) }
+                send(progressManager.complete())
+            }
         }
     }
 
@@ -124,13 +117,12 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                     updateLastUpdated(bundle)
                 }
             }
+            emit(progressManager.getProgress())
         }
 
         if (progressManager.getProgress().programs().any { !it.value.isComplete }) {
             emit(progressManager.completePrograms())
         }
-
-        emit(progressManager.complete())
     }
 
     private fun iterationNotFinished(

From fbc1c5507a3d6e12f92e1440134e0064ae1a0bcf Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 20 Jul 2023 12:19:17 +0200
Subject: [PATCH 118/478] [ANDROSDK-1677] Remove unnsecessary comments

---
 .../dhis/android/core/tracker/exporter/TrackerDownloadCall.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 0ccf6faa03..ed2a99ec6f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -137,10 +137,6 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
             iterationCount < max(bundle.commonParams().limit * BUNDLE_SECURITY_FACTOR, BUNDLE_ITERATION_LIMIT)
     }
 
-    /*
-    it uses a callbackFlow to create a flow that can emit the IterationResult asynchronously
-     */
-
     @Suppress("LongParameterList")
     private fun iterateBundle(
         bundle: Q,

From e62a102fb1b7d54144eda7207aaabf30155fb9dd Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 19 Jul 2023 09:30:03 +0200
Subject: [PATCH 119/478] test

---
 ...servedValueManagerRealIntegrationShould.kt | 513 +++++++++---------
 ...edEntityAttributeReservedValueManager.java | 417 --------------
 ...ckedEntityAttributeReservedValueManager.kt | 406 ++++++++++++++
 3 files changed, 669 insertions(+), 667 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index d5a142d8f6..df88c9bd1c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -25,302 +25,314 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.CREATED;
-import static org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.FUTURE_DATE;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hisp.dhis.android.core.BaseRealIntegrationTest;
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory;
-import org.hisp.dhis.android.core.category.CategoryCombo;
-import org.hisp.dhis.android.core.category.CategoryComboTableInfo;
-import org.hisp.dhis.android.core.common.Access;
-import org.hisp.dhis.android.core.common.DataAccess;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStoreImpl;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl;
-import org.hisp.dhis.android.core.program.Program;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
-import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl;
-import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStoreImpl;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueHandler;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStoreImpl;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl;
-import org.junit.Before;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public class TrackedEntityAttributeReservedValueManagerRealIntegrationShould extends BaseRealIntegrationTest {
-
-    private TrackedEntityAttributeReservedValueStore store;
-    private String organisationUnitUid = "org_unit_uid";
-    private String programUid = "program_uid";
-    private String categoryComboUid = "category_combo_uid";
-    private String ownerUid = "xs8A6tQJY0s";
-    private OrganisationUnit organisationUnit;
-    private String pattern;
+package org.hisp.dhis.android.core.trackedentity
+
+import com.google.common.truth.Truth
+import java.util.concurrent.Callable
+import org.hisp.dhis.android.core.BaseRealIntegrationTest
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
+import org.hisp.dhis.android.core.category.CategoryCombo
+import org.hisp.dhis.android.core.category.CategoryComboTableInfo
+import org.hisp.dhis.android.core.common.Access
+import org.hisp.dhis.android.core.common.DataAccess
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.CREATED
+import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils.FUTURE_DATE
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStoreImpl
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStoreImpl
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+import org.hisp.dhis.android.core.program.internal.ProgramStoreImpl
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueHandler
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStoreImpl
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStoreImpl
+import org.junit.Before
+import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers
+import org.mockito.Captor
+import org.mockito.Mock
+import org.mockito.Mockito
+
+@SuppressWarnings("MaxLineLength")
+class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
+    private var store: TrackedEntityAttributeReservedValueStore? = null
+    private val organisationUnitUid = "org_unit_uid"
+    private val programUid = "program_uid"
+    private val categoryComboUid = "category_combo_uid"
+    private val ownerUid = "xs8A6tQJY0s"
+    private var organisationUnit: OrganisationUnit? = null
+    private var pattern: String? = null
 
     @Mock
-    QueryCallFactory<TrackedEntityAttributeReservedValue,
-            TrackedEntityAttributeReservedValueQuery> trackedEntityAttributeReservedValueQueryCallFactory;
+    var trackedEntityAttributeReservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
+        TrackedEntityAttributeReservedValueQuery>? =
+        null
+
     @Mock
-    Callable<List<TrackedEntityAttributeReservedValue>> trackedEntityAttributeReservedValueCall;
+    var trackedEntityAttributeReservedValueCall: Callable<List<TrackedEntityAttributeReservedValue>>? =
+        null
 
     @Captor
-    private ArgumentCaptor<TrackedEntityAttributeReservedValueQuery> trackedEntityAttributeReservedValueQueryCaptor;
-
-    private TrackedEntityAttributeReservedValueManager manager;
+    private val trackedEntityAttributeReservedValueQueryCaptor:
+        ArgumentCaptor<TrackedEntityAttributeReservedValueQuery>? = null
+    private var manager: TrackedEntityAttributeReservedValueManager? = null
 
     @Before
-    public void setUp() {
-        super.setUp();
-
-        login();
-
-        store = new TrackedEntityAttributeReservedValueStoreImpl(d2.databaseAdapter());
-
-        OrganisationUnitStore organisationUnitStore =
-                new OrganisationUnitStoreImpl(d2.databaseAdapter());
-
-        TrackedEntityAttributeStore trackedEntityAttributeStore =
-                new TrackedEntityAttributeStoreImpl(d2.databaseAdapter());
-
-        manager = d2.trackedEntityModule().reservedValueManager();
-
-        TrackedEntityAttributeReservedValueHandler handler = new TrackedEntityAttributeReservedValueHandler(store);
-
-        List<TrackedEntityAttributeReservedValue> trackedEntityAttributeReservedValues = new ArrayList<>();
-
-        TrackedEntityAttributeReservedValue.Builder reservedValueBuilder =
-                TrackedEntityAttributeReservedValue.builder()
-                        .ownerObject("owner_obj")
-                        .ownerUid(ownerUid)
-                        .key("key")
-                        .created(CREATED)
-                        .expiryDate(FUTURE_DATE)
-                        .organisationUnit(organisationUnitUid);
-
-        TrackedEntityAttributeReservedValue reservedValue1 = reservedValueBuilder.value("value1").build();
-        TrackedEntityAttributeReservedValue reservedValue2 = reservedValueBuilder.value("value2").build();
-        TrackedEntityAttributeReservedValue reservedValue3 = reservedValueBuilder.value("value3").build();
-
-        trackedEntityAttributeReservedValues.add(reservedValue1);
-        trackedEntityAttributeReservedValues.add(reservedValue2);
-        trackedEntityAttributeReservedValues.add(reservedValue3);
-
-        organisationUnit = OrganisationUnit.builder().uid(organisationUnitUid).code("org_unit_code").build();
-        organisationUnitStore.insert(organisationUnit);
-
-        pattern = "CURRENT_DATE(YYYYMM) + \"-\" + CURRENT_DATE(ww) + ORG_UNIT_CODE(...)";
-
-        trackedEntityAttributeStore.updateOrInsert(TrackedEntityAttribute.builder().uid(ownerUid).pattern(pattern).build());
-
-        CategoryCombo categoryCombo = CategoryCombo.builder().uid(categoryComboUid).build();
-        d2.databaseAdapter().insert(CategoryComboTableInfo.TABLE_INFO.name(), null, categoryCombo.toContentValues());
-
-        Program program = Program.builder().uid(programUid).categoryCombo(ObjectWithUid.create(categoryCombo.uid()))
-                .access(Access.create(null, null, DataAccess.create(true, true))).build();
-        new ProgramStoreImpl(d2.databaseAdapter()).insert(program);
-
-        ProgramTrackedEntityAttribute programTrackedEntityAttribute =
-                ProgramTrackedEntityAttribute.builder()
-                        .uid("ptea_uid")
-                        .trackedEntityAttribute(ObjectWithUid.create(ownerUid))
-                        .program(ObjectWithUid.create(programUid))
-                        .build();
-        new ProgramTrackedEntityAttributeStoreImpl(d2.databaseAdapter()).insert(programTrackedEntityAttribute);
-
-        OrganisationUnitProgramLink organisationUnitProgramLink =
-                OrganisationUnitProgramLink.builder().organisationUnit(organisationUnitUid).program(programUid).build();
-        new OrganisationUnitProgramLinkStoreImpl(d2.databaseAdapter()).insert(organisationUnitProgramLink);
-
-
-        when(trackedEntityAttributeReservedValueQueryCallFactory.create(
-                any(TrackedEntityAttributeReservedValueQuery.class)))
-                .thenReturn(trackedEntityAttributeReservedValueCall);
-
-
-        handler.handleMany(trackedEntityAttributeReservedValues);
+    override fun setUp() {
+        super.setUp()
+        login()
+        store = TrackedEntityAttributeReservedValueStoreImpl(d2.databaseAdapter())
+        val organisationUnitStore: OrganisationUnitStore =
+            OrganisationUnitStoreImpl(d2.databaseAdapter())
+        val trackedEntityAttributeStore: TrackedEntityAttributeStore =
+            TrackedEntityAttributeStoreImpl(d2.databaseAdapter())
+        manager = d2.trackedEntityModule().reservedValueManager()
+        val handler = TrackedEntityAttributeReservedValueHandler(store as TrackedEntityAttributeReservedValueStoreImpl)
+        val trackedEntityAttributeReservedValues: MutableList<TrackedEntityAttributeReservedValue> =
+            ArrayList()
+        val reservedValueBuilder = TrackedEntityAttributeReservedValue.builder()
+            .ownerObject("owner_obj")
+            .ownerUid(ownerUid)
+            .key("key")
+            .created(CREATED)
+            .expiryDate(FUTURE_DATE)
+            .organisationUnit(organisationUnitUid)
+        val reservedValue1 = reservedValueBuilder.value("value1").build()
+        val reservedValue2 = reservedValueBuilder.value("value2").build()
+        val reservedValue3 = reservedValueBuilder.value("value3").build()
+        trackedEntityAttributeReservedValues.add(reservedValue1)
+        trackedEntityAttributeReservedValues.add(reservedValue2)
+        trackedEntityAttributeReservedValues.add(reservedValue3)
+
+        organisationUnit =
+            OrganisationUnit.builder().uid(organisationUnitUid).code("org_unit_code").build()
+        organisationUnitStore.insert(organisationUnit as OrganisationUnit)
+
+        pattern = "CURRENT_DATE(YYYYMM) + \"-\" + CURRENT_DATE(ww) + ORG_UNIT_CODE(...)"
+        trackedEntityAttributeStore.updateOrInsert(
+            TrackedEntityAttribute.builder().uid(ownerUid).pattern(pattern).build()
+        )
+        val categoryCombo = CategoryCombo.builder().uid(categoryComboUid).build()
+        d2.databaseAdapter()
+            .insert(CategoryComboTableInfo.TABLE_INFO.name(), null, categoryCombo.toContentValues())
+        val program = Program.builder().uid(programUid)
+            .categoryCombo(ObjectWithUid.create(categoryCombo.uid()))
+            .access(Access.create(null, null, DataAccess.create(true, true))).build()
+        ProgramStoreImpl(d2.databaseAdapter()).insert(program)
+        val programTrackedEntityAttribute = ProgramTrackedEntityAttribute.builder()
+            .uid("ptea_uid")
+            .trackedEntityAttribute(ObjectWithUid.create(ownerUid))
+            .program(ObjectWithUid.create(programUid))
+            .build()
+        ProgramTrackedEntityAttributeStoreImpl(d2.databaseAdapter()).insert(
+            programTrackedEntityAttribute
+        )
+        val organisationUnitProgramLink =
+            OrganisationUnitProgramLink.builder().organisationUnit(organisationUnitUid)
+                .program(programUid).build()
+        OrganisationUnitProgramLinkStoreImpl(d2.databaseAdapter()).insert(
+            organisationUnitProgramLink
+        )
+        Mockito.`when`(
+            trackedEntityAttributeReservedValueQueryCallFactory!!.create(
+                ArgumentMatchers.any(
+                    TrackedEntityAttributeReservedValueQuery::class.java
+                )
+            )
+        )
+            .thenReturn(trackedEntityAttributeReservedValueCall)
+        handler.handleMany(trackedEntityAttributeReservedValues)
     }
 
-//    @Test
-    public void get_one_reserved_value() throws D2Error {
-
-        assertThat(selectAll().size()).isEqualTo(3);
-
-        String value1 = d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-
-        assertThat(value1).isEqualTo("value1");
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun get_one_reserved_value() {
+        Truth.assertThat(selectAll().size).isEqualTo(3)
+        val value1 = d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(value1).isEqualTo("value1")
     }
 
-//    @Test
-    public void get_more_than_one_reserved_value() throws D2Error {
-        String value1 = d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        String value2 = d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        String value3 = d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-
-        assertThat(value1).isEqualTo("value1");
-        assertThat(value2).isEqualTo("value2");
-        assertThat(value3).isEqualTo("value3");
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun get_more_than_one_reserved_value() {
+        val value1 = d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        val value2 = d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        val value3 = d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(value1).isEqualTo("value1")
+        Truth.assertThat(value2).isEqualTo("value2")
+        Truth.assertThat(value3).isEqualTo("value3")
     }
 
-//    @Test
-    public void sync_reserved_values_for_one_tracked_entity_attribute() {
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 100);
-        assertThat(selectAll().size()).isEqualTo(100);
+    //    @Test
+    suspend fun sync_reserved_values_for_one_tracked_entity_attribute() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, 100)
+        Truth.assertThat(selectAll().size).isEqualTo(100)
     }
 
-//    @Test
-    public void sync_20_reserved_values_for_one_tracked_entity_attribute() {
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 20);
-        assertThat(selectAll().size()).isEqualTo(20);
+    //    @Test
+    suspend fun sync_20_reserved_values_for_one_tracked_entity_attribute() {
+        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 20)
+        Truth.assertThat(selectAll().size).isEqualTo(20)
     }
 
-//    @Test
-    public void sync_100_reserved_values_when_not_number_of_values_to_reserve_is_specified() {
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, null);
-        assertThat(selectAll().size()).isEqualTo(100);
+    //    @Test
+    suspend fun sync_100_reserved_values_when_not_number_of_values_to_reserve_is_specified() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, null)
+        Truth.assertThat(selectAll().size).isEqualTo(100)
     }
 
-//    @Test
-    public void sync_pop_sync_again_and_have_99_reserved_values_when_not_number_of_values_to_reserve_is_specified()
-            throws D2Error {
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, null);
-        assertThat(selectAll().size()).isEqualTo(100);
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        assertThat(selectAll().size()).isEqualTo(99);
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, null);
-        assertThat(selectAll().size()).isEqualTo(99);
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun sync_pop_sync_again_and_have_99_reserved_values_when_not_number_of_values_to_reserve_is_specified() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, null)
+        Truth.assertThat(selectAll().size).isEqualTo(100)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(selectAll().size).isEqualTo(99)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, null)
+        Truth.assertThat(selectAll().size).isEqualTo(99)
     }
 
-//    @Test
-    public void fill_up_to_100_values_if_db_does_not_have_at_least_50_values_when_not_number_of_values_to_reserve_is_specified()
-            throws D2Error {
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 50);
-        assertThat(selectAll().size()).isEqualTo(50);
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, null);
-        assertThat(selectAll().size()).isEqualTo(50);
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        assertThat(selectAll().size()).isEqualTo(49);
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, null);
-        assertThat(selectAll().size()).isEqualTo(100);
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun fill_up_to_100_values_if_db_does_not_have_at_least_50_values_when_not_number_of_values_to_reserve_is_specified() {
+        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 50)
+        Truth.assertThat(selectAll().size).isEqualTo(50)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, null)
+        Truth.assertThat(selectAll().size).isEqualTo(50)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(selectAll().size).isEqualTo(49)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, null)
+        Truth.assertThat(selectAll().size).isEqualTo(100)
     }
 
-//    @Test
-    public void sync_pop_sync_again_and_have_99_reserved_values_if_less_than_existing_values_are_requested()
-            throws D2Error {
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 100);
-        assertThat(selectAll().size()).isEqualTo(100);
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        assertThat(selectAll().size()).isEqualTo(99);
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 20);
-        assertThat(selectAll().size()).isEqualTo(99);
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun sync_pop_sync_again_and_have_99_reserved_values_if_less_than_existing_values_are_requested() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingDownloadReservedValues(ownerUid, 100)
+        Truth.assertThat(selectAll().size).isEqualTo(100)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(selectAll().size).isEqualTo(99)
+        d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 20)
+        Truth.assertThat(selectAll().size).isEqualTo(99)
     }
 
-//    @Test
-    public void reserve_100_new_values_and_take_one() throws D2Error {
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        assertThat(selectAll().size()).isEqualTo(99);
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun reserve_100_new_values_and_take_one() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(selectAll().size).isEqualTo(99)
     }
 
-//    @Test
-    public void have_98_values_after_sync_and_take_two() throws D2Error {
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, organisationUnitUid);
-        assertThat(selectAll().size()).isEqualTo(98);
+    //    @Test
+    @Throws(D2Error::class)
+    suspend fun have_98_values_after_sync_and_take_two() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, organisationUnitUid)
+        Truth.assertThat(selectAll().size).isEqualTo(98)
     }
 
-//    @Test
-    public void sync_all_tracked_entity_instances() throws Exception {
-        assertThat(selectAll().size()).isEqualTo(3);
-        d2.metadataModule().blockingDownload();
-        d2.trackedEntityModule().reservedValueManager().blockingDownloadAllReservedValues(null);
+    //    @Test
+    @Throws(Exception::class)
+    suspend fun sync_all_tracked_entity_instances() {
+        Truth.assertThat(selectAll().size).isEqualTo(3)
+        d2.metadataModule().blockingDownload()
+        d2.trackedEntityModule().reservedValueManager().blockingDownloadAllReservedValues(null)
 
-        /* 100 Reserved values by default * 2 TEA with generated property true on server = 200 */
-        assertThat(selectAll().size()).isEqualTo(200);
+        /* 100 Reserved values by default * 2 TEA with generated property true on server = 200 */Truth.assertThat(
+            selectAll().size
+        ).isEqualTo(200)
     }
 
-//    @Test
-    public void create_the_right_query_when_nothing_is_passed() {
-        manager.blockingDownloadAllReservedValues(null);
-        assertQueryIsCreatedRight(97);
+    //    @Test
+    suspend fun create_the_right_query_when_nothing_is_passed() {
+        manager!!.blockingDownloadAllReservedValues(null)
+        assertQueryIsCreatedRight(97)
     }
 
-//    @Test
-    public void create_the_right_query_when_only_an_attribute_is_passed() {
-        manager.blockingDownloadReservedValues(ownerUid, null);
-        assertQueryIsCreatedRight(97);
+    //    @Test
+    suspend fun create_the_right_query_when_only_an_attribute_is_passed() {
+        manager!!.blockingDownloadReservedValues(ownerUid, null)
+        assertQueryIsCreatedRight(97)
     }
 
-//    @Test
-    public void create_the_right_query_when_only_a_organisation_unit_is_passed() {
-        manager.blockingDownloadAllReservedValues(null);
-        assertQueryIsCreatedRight(97);
+    //    @Test
+    suspend fun create_the_right_query_when_only_a_organisation_unit_is_passed() {
+        manager!!.blockingDownloadAllReservedValues(null)
+        assertQueryIsCreatedRight(97)
     }
 
-//    @Test
-    public void create_the_right_query_when_an_attribute_and_a_organisation_unit_is_passed() {
-        manager.blockingDownloadReservedValues(ownerUid, null);
-        assertQueryIsCreatedRight(97);
+    //    @Test
+    suspend fun create_the_right_query_when_an_attribute_and_a_organisation_unit_is_passed() {
+        manager!!.blockingDownloadReservedValues(ownerUid, null)
+        assertQueryIsCreatedRight(97)
     }
 
-//    @Test
-    public void create_the_right_query_when_a_number_of_values_to_fill_up_is_passed() {
-        manager.blockingDownloadReservedValues(null, 20);
-        assertQueryIsCreatedRight(17);
+    //    @Test
+    suspend fun create_the_right_query_when_a_number_of_values_to_fill_up_is_passed() {
+        manager!!.blockingDownloadReservedValues("", 20)
+        assertQueryIsCreatedRight(17)
     }
 
-
-//    @Test
-    public void create_the_right_query_when_a_number_of_values_to_fill_up_and_an_attribute_is_passed() {
-        manager.blockingDownloadReservedValues(ownerUid, 20);
-        assertQueryIsCreatedRight(17);
+    //    @Test
+    suspend fun create_the_right_query_when_a_number_of_values_to_fill_up_and_an_attribute_is_passed() {
+        manager!!.blockingDownloadReservedValues(ownerUid, 20)
+        assertQueryIsCreatedRight(17)
     }
 
-//    @Test
-    public void create_the_right_query_when_a_number_of_values_to_fill_up_and_a_organisation_unit_is_passed() {
-        manager.blockingDownloadAllReservedValues(20);
-        assertQueryIsCreatedRight(17);
+    //    @Test
+    suspend fun create_the_right_query_when_a_number_of_values_to_fill_up_and_a_organisation_unit_is_passed() {
+        manager!!.blockingDownloadAllReservedValues(20)
+        assertQueryIsCreatedRight(17)
     }
 
-//    @Test
-    public void create_the_right_query_when_all_arguments_are_passed() {
-        manager.blockingDownloadReservedValues(ownerUid, 20);
-        assertQueryIsCreatedRight(17);
+    //    @Test
+    suspend fun create_the_right_query_when_all_arguments_are_passed() {
+        manager!!.blockingDownloadReservedValues(ownerUid, 20)
+        assertQueryIsCreatedRight(17)
     }
 
-//    @Test (expected = D2Error.class)
-    public void return_d2_call_exception_if_no_valid_org_unit() throws D2Error {
-        d2.trackedEntityModule().reservedValueManager().blockingGetValue(ownerUid, "not_stored_organisation_unit_uid");
+    //    @Test (expected = D2Error.class)
+    @Throws(D2Error::class)
+    suspend fun return_d2_call_exception_if_no_valid_org_unit() {
+        d2.trackedEntityModule().reservedValueManager()
+            .blockingGetValue(ownerUid, "not_stored_organisation_unit_uid")
     }
 
-    private List<TrackedEntityAttributeReservedValue> selectAll() {
-        return store.selectAll();
+    private fun selectAll(): List<TrackedEntityAttributeReservedValue> {
+        return store!!.selectAll()
     }
 
-    private void login() {
+    private fun login() {
         try {
             if (!d2.userModule().isLogged().blockingGet()) {
-                d2.userModule().logIn(username, password, url).blockingGet();
+                d2.userModule().logIn(username, password, url).blockingGet()
             }
-        } catch (Exception ignored) {
+        } catch (ignored: Exception) {
         }
     }
 
@@ -328,14 +340,15 @@ public class TrackedEntityAttributeReservedValueManagerRealIntegrationShould ext
      * This method stopped working because QueryCallFactory mock instance differs from Dagger's injected one,
      * so the code is calling .create() on Dagger's instance and .verify() is trying to catch the call from Mockito's instace.
      */
-    private void assertQueryIsCreatedRight(Integer numberOfValuesExpected) {
-        verify(trackedEntityAttributeReservedValueQueryCallFactory).create(trackedEntityAttributeReservedValueQueryCaptor.capture());
-
-        TrackedEntityAttributeReservedValueQuery query = trackedEntityAttributeReservedValueQueryCaptor.getValue();
-        assertThat(query.organisationUnit().uid()).isEqualTo(organisationUnit.uid());
-        assertThat(query.numberToReserve()).isEqualTo(numberOfValuesExpected); // values expected - 3 that it had before.
-        assertThat(query.trackedEntityAttributePattern()).isEqualTo(pattern);
-        assertThat(query.trackedEntityAttributeUid()).isEqualTo(ownerUid);
+    private fun assertQueryIsCreatedRight(numberOfValuesExpected: Int) {
+        Mockito.verify(trackedEntityAttributeReservedValueQueryCallFactory)!!.create(
+            trackedEntityAttributeReservedValueQueryCaptor!!.capture()
+        )
+        val query = trackedEntityAttributeReservedValueQueryCaptor.value
+        Truth.assertThat(query.organisationUnit()!!.uid()).isEqualTo(organisationUnit!!.uid())
+        Truth.assertThat(query.numberToReserve())
+            .isEqualTo(numberOfValuesExpected) // values expected - 3 that it had before.
+        Truth.assertThat(query.trackedEntityAttributePattern()).isEqualTo(pattern)
+        Truth.assertThat(query.trackedEntityAttributeUid()).isEqualTo(ownerUid)
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java
deleted file mode 100644
index a9f03ab17c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor;
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory;
-import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem;
-import org.hisp.dhis.android.core.common.CoreColumns;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
-import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore;
-import org.hisp.dhis.android.core.settings.GeneralSettingObjectRepository;
-import org.hisp.dhis.android.core.settings.GeneralSettings;
-import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore;
-import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-
-@Reusable
-@SuppressWarnings("PMD.ExcessiveImports")
-public final class TrackedEntityAttributeReservedValueManager {
-
-    private static final Integer FILL_UP_TO = 100;
-    private static final Double FACTOR_TO_REFILL = 0.5;
-
-
-    private final TrackedEntityAttributeReservedValueStore store;
-    private final OrganisationUnitStore organisationUnitStore;
-    private final TrackedEntityAttributeStore trackedEntityAttributeStore;
-    private final ProgramTrackedEntityAttributeStore programTrackedEntityAttributeStore;
-    private final OrganisationUnitProgramLinkStore organisationUnitProgramLinkStore;
-    private final UserOrganisationUnitLinkStore userOrganisationUnitLinkStore;
-    private final GeneralSettingObjectRepository generalSettingObjectRepository;
-    private final ReservedValueSettingStore reservedValueSettingStore;
-    private final D2CallExecutor executor;
-    private final QueryCallFactory<TrackedEntityAttributeReservedValue,
-            TrackedEntityAttributeReservedValueQuery> reservedValueQueryCallFactory;
-
-    private final D2ProgressManager d2ProgressManager = new D2ProgressManager(null);
-
-    @Inject
-    TrackedEntityAttributeReservedValueManager(
-            TrackedEntityAttributeReservedValueStore store,
-            OrganisationUnitStore organisationUnitStore,
-            TrackedEntityAttributeStore trackedEntityAttributeStore,
-            ProgramTrackedEntityAttributeStore programTrackedEntityAttributeStore,
-            OrganisationUnitProgramLinkStore organisationUnitProgramLinkStore,
-            UserOrganisationUnitLinkStore userOrganisationUnitLinkStore,
-            GeneralSettingObjectRepository generalSettingObjectRepository,
-            ReservedValueSettingStore reservedValueSettingStore,
-            D2CallExecutor executor,
-            QueryCallFactory<TrackedEntityAttributeReservedValue,
-                    TrackedEntityAttributeReservedValueQuery> reservedValueQueryCallFactory) {
-        this.store = store;
-        this.organisationUnitStore = organisationUnitStore;
-        this.trackedEntityAttributeStore = trackedEntityAttributeStore;
-        this.programTrackedEntityAttributeStore = programTrackedEntityAttributeStore;
-        this.organisationUnitProgramLinkStore = organisationUnitProgramLinkStore;
-        this.userOrganisationUnitLinkStore = userOrganisationUnitLinkStore;
-        this.generalSettingObjectRepository = generalSettingObjectRepository;
-        this.reservedValueSettingStore = reservedValueSettingStore;
-        this.executor = executor;
-        this.reservedValueQueryCallFactory = reservedValueQueryCallFactory;
-    }
-
-    /**
-     * @param attributeUid        Attribute uid
-     * @param organisationUnitUid Organisation unit uid
-     * @return Value of tracked entity attribute
-     * @see #getValue(String, String)
-     */
-    public String blockingGetValue(@NonNull String attributeUid, @NonNull String organisationUnitUid) {
-        return getValue(attributeUid, organisationUnitUid).blockingGet();
-    }
-
-    /**
-     * Get a reserved value and remove it from database. If the number of available values is below a threshold
-     * (default {@link #FILL_UP_TO} * {@link #FACTOR_TO_REFILL}) it tries to download before returning a value.
-     *
-     * @param attributeUid        Attribute uid
-     * @param organisationUnitUid Organisation unit uid
-     * @return Single with value of tracked entity attribute
-     */
-    public Single<String> getValue(@NonNull String attributeUid, @NonNull String organisationUnitUid) {
-        Completable optionalDownload = downloadValuesIfBelowThreshold(
-                attributeUid, getOrganisationUnit(organisationUnitUid), null, false
-        ).onErrorComplete();
-
-        return optionalDownload.andThen(Single.create(emitter -> {
-            String pattern = trackedEntityAttributeStore.selectByUid(attributeUid).pattern();
-            String attributeOrgunit = isOrgunitDependent(pattern) ? organisationUnitUid : null;
-
-            TrackedEntityAttributeReservedValue reservedValue = store.popOne(attributeUid, attributeOrgunit);
-
-            if (reservedValue == null) {
-                emitter.onError(D2Error.builder()
-                        .errorCode(D2ErrorCode.NO_RESERVED_VALUES)
-                        .errorDescription("There are no reserved values")
-                        .errorComponent(D2ErrorComponent.Database).build());
-            } else {
-                emitter.onSuccess(reservedValue.value());
-            }
-        }));
-    }
-
-    /**
-     * @param attributeUid           Attribute uid
-     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
-     * @see #downloadReservedValues(String, Integer)
-     */
-    public void blockingDownloadReservedValues(@NonNull String attributeUid,
-                                               Integer numberOfValuesToFillUp) {
-
-        downloadReservedValues(attributeUid, numberOfValuesToFillUp).blockingSubscribe();
-    }
-
-    /**
-     * Download of TrackedEntityInstance reserved values. The number of reserved values is filled up to the
-     * numberOfValuesToFillUp. If not defined, it defaults to {@link #FILL_UP_TO}.
-     * <br><br>
-     * The download is only triggered for this attribute passed as parameter.
-     * <br><br>
-     * If the attribute pattern is dependent on OrganisationUnit code (that is, it contains "ORG_UNIT_CODE"), it
-     * reserves values for each orgunit assigned to the programs with this attribute. It applies the limit
-     * per orgunit. Otherwise the limit is applied per attribute.
-     *
-     * @param attributeUid           Attribute uid
-     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
-     * @return An Observable that notifies about the progress.
-     */
-    public Observable<D2Progress> downloadReservedValues(@NonNull String attributeUid,
-                                                         Integer numberOfValuesToFillUp) {
-
-        return downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp);
-    }
-
-    /**
-     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
-     * @see #downloadAllReservedValues(Integer)
-     */
-    public void blockingDownloadAllReservedValues(Integer numberOfValuesToFillUp) {
-        downloadAllReservedValues(numberOfValuesToFillUp).blockingSubscribe();
-    }
-
-    /**
-     * Downloads reserved values for all the trackedEntityAttributeValues of type "generated", that is, it applies
-     * {@link #downloadReservedValues(String, Integer)} for every generated attribute.
-     *
-     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
-     * @return An Observable that notifies about the progress.
-     */
-    public Observable<D2Progress> downloadAllReservedValues(Integer numberOfValuesToFillUp) {
-        List<Observable<D2Progress>> observables = new ArrayList<>();
-
-        List<TrackedEntityAttribute> generatedAttributes = getGeneratedAttributes();
-
-        for (TrackedEntityAttribute attribute : generatedAttributes) {
-            observables.add(downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp));
-        }
-
-        return Observable.merge(observables);
-    }
-
-    /**
-     * Get the count of the reserved values by attribute. If a organisation unit uid is inserted as parameter the method
-     * will return the count of the reserved values by attribute and organisation unit.
-     *
-     * @param attributeUid        Attribute uid
-     * @param organisationUnitUid An optional organisation unit uid
-     * @return Single with the reserved value count by attribute or by attribute and organisation unit.
-     */
-    public Single<Integer> count(@NonNull String attributeUid, @Nullable String organisationUnitUid) {
-        return Single.fromCallable(() -> blockingCount(attributeUid, organisationUnitUid));
-    }
-
-    /**
-     * @param attributeUid        Attribute uid
-     * @param organisationUnitUid An optional organisation unit uid
-     * @return The reserved value count by attribute or by attribute and organisation unit.
-     * @see #count(String, String)
-     */
-    public int blockingCount(@NonNull String attributeUid, @Nullable String organisationUnitUid) {
-        return store.count(attributeUid, organisationUnitUid, null);
-    }
-
-    /**
-     * Generate a list of reserved value summaries from the existing tracked entity attribute reserved values in the DB.
-     *
-     * @return Single with a list of the reserved value summaries
-     */
-    public Single<List<ReservedValueSummary>> getReservedValueSummaries() {
-        return Single.just(blockingGetReservedValueSummaries());
-    }
-
-    /**
-     * @return List of the reserved value summaries
-     * @see #getReservedValueSummaries()
-     */
-    public List<ReservedValueSummary> blockingGetReservedValueSummaries() {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build();
-        String orderByClause = OrderByClauseBuilder.orderByFromItems(
-                Collections.singletonList(RepositoryScopeOrderByItem.builder()
-                        .column(IdentifiableColumns.DISPLAY_NAME)
-                        .direction(RepositoryScope.OrderByDirection.ASC).build()),
-                CoreColumns.ID);
-        List<TrackedEntityAttribute> trackedEntityAttributes =
-                trackedEntityAttributeStore.selectWhere(whereClause, orderByClause);
-
-        List<ReservedValueSummary> reservedValueSummaries = new ArrayList<>();
-
-        for (TrackedEntityAttribute trackedEntityAttribute : trackedEntityAttributes) {
-            ReservedValueSummary.Builder builder = ReservedValueSummary.builder()
-                    .trackedEntityAttribute(trackedEntityAttribute);
-            if (isOrgunitDependent(trackedEntityAttribute.pattern())) {
-                List<OrganisationUnit> organisationUnits = getOrgUnitsLinkedToAttribute(trackedEntityAttribute.uid());
-                for (OrganisationUnit organisationUnit : organisationUnits) {
-                    builder.organisationUnit(organisationUnit)
-                            .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
-                            .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()));
-                    reservedValueSummaries.add(builder.build());
-                }
-            } else {
-                builder.count(blockingCount(trackedEntityAttribute.uid(), null))
-                        .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()));
-                reservedValueSummaries.add(builder.build());
-            }
-
-        }
-
-        return reservedValueSummaries;
-    }
-
-    private D2Progress increaseProgress() {
-        return d2ProgressManager.increaseProgress(TrackedEntityAttributeReservedValue.class, false);
-    }
-
-    private Observable<D2Progress> downloadValuesForOrgUnits(@NonNull String attribute,
-                                                             Integer numberOfValuesToFillUp) {
-
-        String pattern = trackedEntityAttributeStore.selectByUid(attribute).pattern();
-
-        if (isOrgunitDependent(pattern)) {
-            List<OrganisationUnit> organisationUnits = getOrgUnitsLinkedToAttribute(attribute);
-            return Observable.fromIterable(organisationUnits).flatMapSingle(organisationUnit ->
-                    downloadValuesIfBelowThreshold(attribute, organisationUnit, numberOfValuesToFillUp, true)
-                            .onErrorComplete()
-                            .toSingle(this::increaseProgress));
-        } else {
-            return downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
-                    .onErrorComplete()
-                    .toSingle(this::increaseProgress)
-                    .toObservable();
-        }
-    }
-
-    private Completable downloadValuesIfBelowThreshold(String attribute,
-                                                       OrganisationUnit organisationUnit,
-                                                       Integer minNumberOfValuesToHave,
-                                                       boolean storeError) {
-        return Completable.defer(() -> {
-            // Using local date. It's not worth it to make a system info call
-            store.deleteExpired(new Date());
-
-            Integer fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute);
-
-            String pattern = trackedEntityAttributeStore.selectByUid(attribute).pattern();
-            int remainingValues = store.count(
-                    attribute,
-                    isOrgunitDependent(pattern) ? UidsHelper.getUidOrNull(organisationUnit) : null,
-                    pattern);
-
-            // If number of values is explicitly specified, we use that value as threshold.
-            int minNumberToTryFill = minNumberOfValuesToHave == null ?
-                    (int) (fillUpTo * FACTOR_TO_REFILL) : minNumberOfValuesToHave;
-
-            if (remainingValues < minNumberToTryFill) {
-                Integer numberToReserve = fillUpTo - remainingValues;
-
-                return downloadValues(attribute, organisationUnit, numberToReserve, pattern, storeError);
-            } else {
-                return Completable.complete();
-            }
-        });
-    }
-
-    private Completable downloadValues(String trackedEntityAttributeUid,
-                                       OrganisationUnit organisationUnit,
-                                       Integer numberToReserve,
-                                       String pattern,
-                                       boolean storeError) {
-
-        return Completable.fromAction(() -> {
-            executor.executeD2Call(reservedValueQueryCallFactory.create(
-                    TrackedEntityAttributeReservedValueQuery.create(trackedEntityAttributeUid, numberToReserve,
-                            organisationUnit, pattern)), storeError);
-        }).doOnComplete(() -> {
-            if (pattern != null) {
-                store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern);
-            }
-        });
-    }
-
-    private List<OrganisationUnit> getOrgUnitsLinkedToAttribute(String attribute) {
-        List<String> linkedProgramUids = programTrackedEntityAttributeStore.selectStringColumnsWhereClause(
-                ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
-                new WhereClauseBuilder().appendKeyStringValue(
-                        ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                        attribute
-                ).build());
-
-        List<String> linkedOrgunitUids = organisationUnitProgramLinkStore.selectStringColumnsWhereClause(
-                OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-                new WhereClauseBuilder().appendInKeyStringValues(
-                        OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
-                        linkedProgramUids
-                ).build());
-
-        List<String> captureOrgunits = userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(
-                OrganisationUnit.Scope.SCOPE_DATA_CAPTURE);
-
-        linkedOrgunitUids.retainAll(captureOrgunits);
-
-        return organisationUnitStore.selectWhere(new WhereClauseBuilder().appendInKeyStringValues(
-                IdentifiableColumns.UID,
-                linkedOrgunitUids
-        ).build());
-    }
-
-    private List<TrackedEntityAttribute> getGeneratedAttributes() {
-        String whereClause = new WhereClauseBuilder()
-                .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build();
-        return trackedEntityAttributeStore.selectWhere(whereClause);
-    }
-
-    private OrganisationUnit getOrganisationUnit(String uid) {
-        return uid == null ? null : organisationUnitStore.selectByUid(uid);
-    }
-
-    private boolean isOrgunitDependent(String pattern) {
-        return pattern != null && pattern.contains("ORG_UNIT_CODE");
-    }
-
-    private Integer getFillUpToValue(Integer minNumberOfValuesToHave, String attribute) {
-        if (minNumberOfValuesToHave == null) {
-            ReservedValueSetting reservedValueSetting = reservedValueSettingStore.selectByUid(attribute);
-            if (reservedValueSetting == null || reservedValueSetting.numberOfValuesToReserve() == null) {
-                GeneralSettings generalSettings = generalSettingObjectRepository.blockingGet();
-                if (generalSettings == null || generalSettings.reservedValues() == null) {
-                    return FILL_UP_TO;
-                } else {
-                    return generalSettings.reservedValues();
-                }
-            } else {
-                return reservedValueSetting.numberOfValuesToReserve();
-            }
-        } else {
-            this.reservedValueSettingStore.updateOrInsert(ReservedValueSetting.builder()
-                    .uid(attribute).numberOfValuesToReserve(minNumberOfValuesToHave).build());
-            return minNumberOfValuesToHave;
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
new file mode 100644
index 0000000000..48f90b6181
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -0,0 +1,406 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity
+
+import dagger.Reusable
+import java.util.Date
+import javax.inject.Inject
+import kotlin.coroutines.suspendCoroutine
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flow
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
+import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem
+import org.hisp.dhis.android.core.common.CoreColumns
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramLinkStore
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore
+import org.hisp.dhis.android.core.settings.GeneralSettingObjectRepository
+import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+
+@SuppressWarnings("LongParameterList", "TooManyFunctions")
+@Reusable
+class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
+    private val store: TrackedEntityAttributeReservedValueStore,
+    private val organisationUnitStore: OrganisationUnitStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
+    private val programTrackedEntityAttributeStore: ProgramTrackedEntityAttributeStore,
+    private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore,
+    private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
+    private val generalSettingObjectRepository: GeneralSettingObjectRepository,
+    private val reservedValueSettingStore: ReservedValueSettingStore,
+    private val executor: D2CallExecutor,
+    private val reservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
+        TrackedEntityAttributeReservedValueQuery>
+) {
+    private val d2ProgressManager = D2ProgressManager(null)
+
+    /**
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid Organisation unit uid
+     * @return Value of tracked entity attribute
+     * @see .getValue
+     */
+    suspend fun blockingGetValue(attributeUid: String, organisationUnitUid: String): String {
+        return getValue(attributeUid, organisationUnitUid)!!
+    }
+
+    /**
+     * Get a reserved value and remove it from database. If the number of available values is below a threshold
+     * (default [.FILL_UP_TO] * [.FACTOR_TO_REFILL]) it tries to download before returning a value.
+     *
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid Organisation unit uid
+     * @return Single with value of tracked entity attribute
+     */
+
+    suspend fun getValue(attributeUid: String, organisationUnitUid: String): String? {
+
+        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
+
+        val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
+        val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
+        val reservedValue = store.popOne(attributeUid, attributeOrgunit)
+            ?: throw D2Error.builder()
+                .errorCode(D2ErrorCode.NO_RESERVED_VALUES)
+                .errorDescription("There are no reserved values")
+                .errorComponent(D2ErrorComponent.Database).build()
+
+        return reservedValue.value()
+    }
+
+    /**
+     * @param attributeUid           Attribute uid
+     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
+     * @see .downloadReservedValues
+     */
+    suspend fun blockingDownloadReservedValues(
+        attributeUid: String,
+        numberOfValuesToFillUp: Int?
+    ) {
+        downloadReservedValues(attributeUid, numberOfValuesToFillUp).collect()
+    }
+
+    /**
+     * Download of TrackedEntityInstance reserved values. The number of reserved values is filled up to the
+     * numberOfValuesToFillUp. If not defined, it defaults to [.FILL_UP_TO].
+     * <br></br><br></br>
+     * The download is only triggered for this attribute passed as parameter.
+     * <br></br><br></br>
+     * If the attribute pattern is dependent on OrganisationUnit code (that is, it contains "ORG_UNIT_CODE"), it
+     * reserves values for each orgunit assigned to the programs with this attribute. It applies the limit
+     * per orgunit. Otherwise the limit is applied per attribute.
+     *
+     * @param attributeUid           Attribute uid
+     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
+     * @return An Observable that notifies about the progress.
+     */
+    private fun downloadReservedValues(
+        attributeUid: String,
+        numberOfValuesToFillUp: Int?
+    ) = flow<D2Progress> {
+        downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp)
+    }
+
+    /**
+     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
+     * @see .downloadAllReservedValues
+     */
+    suspend fun blockingDownloadAllReservedValues(numberOfValuesToFillUp: Int?) {
+        downloadAllReservedValues(numberOfValuesToFillUp)
+    }
+
+    /**
+     * Downloads reserved values for all the trackedEntityAttributeValues of type "generated", that is, it applies
+     * [.downloadReservedValues] for every generated attribute.
+     *
+     * @param numberOfValuesToFillUp An optional maximum number of values to reserve
+     * @return An Observable that notifies about the progress.
+     */
+    private suspend fun downloadAllReservedValues(
+        numberOfValuesToFillUp: Int?
+    ): List<D2Progress> = coroutineScope {
+        val observables = generatedAttributes.map { attribute ->
+            async { downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp) }
+        }
+
+        observables.awaitAll().flatten()
+    }
+
+    /**
+     * Get the count of the reserved values by attribute. If a organisation unit uid is inserted as parameter the method
+     * will return the count of the reserved values by attribute and organisation unit.
+     *
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid An optional organisation unit uid
+     * @return Single with the reserved value count by attribute or by attribute and organisation unit.
+     */
+    fun count(attributeUid: String, organisationUnitUid: String?): Int =
+        store.count(attributeUid, organisationUnitUid, null)
+
+    /**
+     * @param attributeUid        Attribute uid
+     * @param organisationUnitUid An optional organisation unit uid
+     * @return The reserved value count by attribute or by attribute and organisation unit.
+     * @see .count
+     */
+    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int =
+        count(attributeUid, organisationUnitUid)
+
+    /**
+     * Generate a list of reserved value summaries from the existing tracked entity attribute reserved values in the DB.
+     *
+     * @return Single with a list of the reserved value summaries
+     */
+    val reservedValueSummaries: Flow<List<ReservedValueSummary>> = flow {
+        emit(blockingGetReservedValueSummaries())
+    }
+
+    /**
+     * @return List of the reserved value summaries
+     * @see .getReservedValueSummaries
+     */
+    suspend fun blockingGetReservedValueSummaries(): List<ReservedValueSummary> {
+        val whereClause = WhereClauseBuilder()
+            .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
+        val orderByClause = OrderByClauseBuilder.orderByFromItems(
+            listOf(
+                RepositoryScopeOrderByItem.builder()
+                    .column(IdentifiableColumns.DISPLAY_NAME)
+                    .direction(RepositoryScope.OrderByDirection.ASC).build()
+            ),
+            CoreColumns.ID
+        )
+        val trackedEntityAttributes =
+            trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
+        val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
+        for (trackedEntityAttribute in trackedEntityAttributes) {
+            val builder = ReservedValueSummary.builder()
+                .trackedEntityAttribute(trackedEntityAttribute)
+            if (isOrgunitDependent(trackedEntityAttribute.pattern())) {
+                val organisationUnits = getOrgUnitsLinkedToAttribute(trackedEntityAttribute.uid())
+                for (organisationUnit in organisationUnits) {
+                    builder.organisationUnit(organisationUnit)
+                        .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
+                        .numberOfValuesToFillUp(
+                            getFillUpToValue(
+                                null,
+                                trackedEntityAttribute.uid()
+                            )
+                        )
+                    reservedValueSummaries.add(builder.build())
+                }
+            } else {
+                builder.count(blockingCount(trackedEntityAttribute.uid(), null))
+                    .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()))
+                reservedValueSummaries.add(builder.build())
+            }
+        }
+        return reservedValueSummaries
+    }
+
+    private fun increaseProgress(): D2Progress {
+        return d2ProgressManager.increaseProgress(
+            TrackedEntityAttributeReservedValue::class.java, false
+        )
+    }
+
+    private suspend fun downloadValuesForOrgUnits(
+        attribute: String,
+        numberOfValuesToFillUp: Int?
+    ): List<D2Progress> = coroutineScope {
+        val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
+
+        if (isOrgunitDependent(pattern)) {
+            val organisationUnits = getOrgUnitsLinkedToAttribute(attribute)
+            val progressList = mutableListOf<D2Progress>()
+
+            for (organisationUnit in organisationUnits) {
+                downloadValuesIfBelowThreshold(
+                    attribute,
+                    organisationUnit,
+                    numberOfValuesToFillUp,
+                    true
+                )
+                progressList.add(increaseProgress())
+            }
+
+            progressList
+        } else {
+            downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
+
+            listOf(increaseProgress())
+        }
+    }
+
+    private suspend fun downloadValuesIfBelowThreshold(
+        attribute: String,
+        organisationUnit: OrganisationUnit?,
+        minNumberOfValuesToHave: Int?,
+        storeError: Boolean
+    ): Unit = coroutineScope {
+        // Using local date. It's not worth it to make a system info call
+        store.deleteExpired(Date())
+        val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
+        val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
+        val remainingValues = store.count(
+            attribute,
+            if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
+            pattern
+        )
+
+        // If number of values is explicitly specified, we use that value as threshold.
+        val minNumberToTryFill = minNumberOfValuesToHave
+            ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
+
+        if (remainingValues < minNumberToTryFill) {
+            val numberToReserve = fillUpTo!! - remainingValues
+            downloadValues(
+                attribute,
+                organisationUnit,
+                numberToReserve,
+                pattern,
+                storeError
+            )
+        }
+    }
+
+    suspend fun downloadValues(
+        trackedEntityAttributeUid: String,
+        organisationUnit: OrganisationUnit?,
+        numberToReserve: Int,
+        pattern: String?,
+        storeError: Boolean
+    ) {
+        return suspendCoroutine {
+            executor.executeD2Call(
+                reservedValueQueryCallFactory.create(
+                    TrackedEntityAttributeReservedValueQuery.create(
+                        trackedEntityAttributeUid, numberToReserve,
+                        organisationUnit, pattern
+                    )
+                ),
+                storeError
+            )
+
+            if (pattern != null) {
+                store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
+            }
+        }
+    }
+
+    private fun getOrgUnitsLinkedToAttribute(attribute: String): List<OrganisationUnit> {
+        val linkedProgramUids = programTrackedEntityAttributeStore.selectStringColumnsWhereClause(
+            ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
+            WhereClauseBuilder().appendKeyStringValue(
+                ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
+                attribute
+            ).build()
+        )
+        val linkedOrgunitUids = organisationUnitProgramLinkStore.selectStringColumnsWhereClause(
+            OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
+            WhereClauseBuilder().appendInKeyStringValues(
+                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
+                linkedProgramUids
+            ).build()
+        )
+        val captureOrgunits = userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(
+            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
+        )
+        linkedOrgunitUids.toMutableList().retainAll(captureOrgunits)
+        return organisationUnitStore.selectWhere(
+            WhereClauseBuilder().appendInKeyStringValues(
+                IdentifiableColumns.UID,
+                linkedOrgunitUids
+            ).build()
+        )
+    }
+
+    private val generatedAttributes: List<TrackedEntityAttribute>
+        private get() {
+            val whereClause = WhereClauseBuilder()
+                .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
+            return trackedEntityAttributeStore.selectWhere(whereClause)
+        }
+
+    private fun getOrganisationUnit(uid: String?): OrganisationUnit? {
+        return if (uid == null) null else organisationUnitStore.selectByUid(uid)
+    }
+
+    private fun isOrgunitDependent(pattern: String?): Boolean {
+        return pattern != null && pattern.contains("ORG_UNIT_CODE")
+    }
+
+    private fun getFillUpToValue(minNumberOfValuesToHave: Int?, attribute: String): Int? {
+        return if (minNumberOfValuesToHave == null) {
+            val reservedValueSetting = reservedValueSettingStore.selectByUid(attribute)
+            if (reservedValueSetting == null || reservedValueSetting.numberOfValuesToReserve() == null) {
+                val generalSettings = generalSettingObjectRepository.blockingGet()
+                if (generalSettings == null || generalSettings.reservedValues() == null) {
+                    FILL_UP_TO
+                } else {
+                    generalSettings.reservedValues()
+                }
+            } else {
+                reservedValueSetting.numberOfValuesToReserve()
+            }
+        } else {
+            reservedValueSettingStore.updateOrInsert(
+                ReservedValueSetting.builder()
+                    .uid(attribute).numberOfValuesToReserve(minNumberOfValuesToHave).build()
+            )
+            minNumberOfValuesToHave
+        }
+    }
+
+    companion object {
+        private const val FILL_UP_TO = 100
+        private const val FACTOR_TO_REFILL = 0.5
+    }
+}

From 9c8b9f2ab8c0c1403f434d7af3c2c8c0d039c1b9 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 21 Jul 2023 11:40:53 +0200
Subject: [PATCH 120/478] [ANDROSDK-1729] Replace RxJava in SystemInfo call

---
 ...leProvider.java => CompletableProvider.kt} |  11 +-
 .../arch/call/internal/DownloadProvider.kt    |  32 +++++
 .../UntypedSuspendModuleDownloader.kt}        |   9 +-
 ...lyFirstObjectWithDownloadRepositoryImpl.kt |  12 +-
 .../data/internal/AggregatedDataCall.kt       |   5 +-
 .../core/domain/metadata/MetadataCall.kt      | 134 ++++++++----------
 ...aModuleImpl.java => MetadataModuleImpl.kt} |  39 ++---
 .../systeminfo/internal/SystemInfoCall.kt     |  61 ++++----
 .../internal/SystemInfoModuleDownloader.kt    |  27 ++--
 ...mInfoService.java => SystemInfoService.kt} |  20 +--
 .../tracker/exporter/TrackerDownloadCall.kt   |   2 +-
 .../android/core/user/internal/LogInCall.kt   |  44 +++---
 12 files changed, 196 insertions(+), 200 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/{CompletableProvider.java => CompletableProvider.kt} (89%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/{call/internal/SingleProvider.java => modules/internal/UntypedSuspendModuleDownloader.kt} (90%)
 rename core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/{MetadataModuleImpl.java => MetadataModuleImpl.kt} (70%)
 rename core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/{SystemInfoService.java => SystemInfoService.kt} (84%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt
similarity index 89%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt
index 98e60e15d2..0a51fc1b0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt
@@ -25,11 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.internal
 
-package org.hisp.dhis.android.core.arch.call.internal;
+import io.reactivex.Completable
 
-import io.reactivex.Completable;
-
-public interface CompletableProvider {
-    Completable getCompletable(boolean storeError);
-}
\ No newline at end of file
+interface CompletableProvider {
+    fun getCompletable(storeError: Boolean): Completable
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt
new file mode 100644
index 0000000000..3f1a6cedd5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.call.internal
+
+internal interface DownloadProvider {
+    suspend fun download(storeError: Boolean)
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/SingleProvider.java b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
similarity index 90%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/SingleProvider.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
index f33d6a9be5..f7de8af77a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/SingleProvider.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
@@ -25,11 +25,8 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.modules.internal
 
-package org.hisp.dhis.android.core.arch.call.internal;
-
-import io.reactivex.Single;
-
-public interface SingleProvider {
-    Single getSingle(boolean storeError);
+interface UntypedSuspendModuleDownloader {
+    suspend fun downloadMetadata()
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
index 2ab4e83848..5ed2b3db78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import kotlinx.coroutines.rx2.rxCompletable
+import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
@@ -41,15 +42,10 @@ internal constructor(
     store: ObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    downloadCompletableProvider: CompletableProvider,
+    private val downloadProvider: DownloadProvider,
     repositoryFactory: ObjectRepositoryFactory<R>
 ) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
     ReadOnlyWithDownloadObjectRepository<M> {
-    private val downloadCompletableProvider: CompletableProvider
-
-    init {
-        this.downloadCompletableProvider = downloadCompletableProvider
-    }
 
     /**
      * Downloads the resource in scope in an asynchronous way. As soon as it's downloaded and processed, the
@@ -57,7 +53,7 @@ internal constructor(
      * @return a `Completable` that completes when the download and processing is finished
      */
     override fun download(): Completable {
-        return downloadCompletableProvider.getCompletable(true)
+        return rxCompletable { downloadProvider.download(true) }
     }
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index 66c56eaa88..fef51974cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -33,8 +33,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.rx2.asFlow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.D2ProgressSyncStatus
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
@@ -72,8 +72,7 @@ internal class AggregatedDataCall @Inject constructor(
     @OptIn(ExperimentalCoroutinesApi::class)
     fun download(): Flow<AggregatedD2Progress> {
         val progressManager = AggregatedD2ProgressManager(null)
-        return systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
-            .asFlow()
+        return flow<D2Progress> { systemInfoModuleDownloader.downloadWithProgressManager(progressManager) }
             .flatMapLatest { selectDataSetsAndDownload(progressManager) }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index d0d0710210..87dcdd5ff2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -29,10 +29,13 @@ package org.hisp.dhis.android.core.domain.metadata
 
 import dagger.Reusable
 import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.Single
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
@@ -69,11 +72,12 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserModuleDownloader
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleDownloader
+import javax.inject.Inject
 
 @Suppress("LongParameterList")
 @Reusable
 internal class MetadataCall @Inject constructor(
-    private val rxCallExecutor: RxAPICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val systemInfoDownloader: SystemInfoModuleDownloader,
     private val systemSettingDownloader: SettingModuleDownloader,
     private val useCaseDownloader: UseCaseModuleDownloader,
@@ -99,77 +103,63 @@ internal class MetadataCall @Inject constructor(
         const val CALLS_COUNT = 12
     }
 
-    fun download(): Observable<D2Progress> {
+    fun download(): Flow<D2Progress> = channelFlow {
         val progressManager = D2ProgressManager(CALLS_COUNT)
-        return changeEncryptionIfRequired().andThen(
-            rxCallExecutor.wrapObservableTransactionally(
-                Observable.merge(
-                    systemInfoDownloader.downloadWithProgressManager(progressManager),
-                    executeIndependentCalls(progressManager),
-                    executeUserCallAndChildren(progressManager)
-                ),
-                true
-            )
-        )
+        changeEncryptionIfRequired().blockingAwait()
+        coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+            systemInfoDownloader.downloadWithProgressManager(progressManager).also { send(it) }
+            executeIndependentCalls(progressManager).collect { send(it) }
+            executeUserCallAndChildren(progressManager).collect { send(it) }
+        }
     }
 
-    private fun executeIndependentCalls(progressManager: D2ProgressManager): Observable<D2Progress> {
-        return Single.merge(
-            listOf(
-                Single.fromCallable {
-                    databaseAdapter.delete(ForeignKeyViolationTableInfo.TABLE_INFO.name())
-                    progressManager.increaseProgress(SystemInfo::class.java, false)
-                },
-                systemSettingDownloader.downloadMetadata().toSingle {
-                    progressManager.increaseProgress(SystemSetting::class.java, false)
-                },
-                useCaseDownloader.downloadMetadata().toSingle {
-                    progressManager.increaseProgress(StockUseCase::class.java, false)
-                },
-                constantModuleDownloader.downloadMetadata().map {
-                    progressManager.increaseProgress(Constant::class.java, false)
-                },
-                smsModule.configCase().refreshMetadataIdsCallable().toSingle {
-                    progressManager.increaseProgress(SmsModule::class.java, false)
-                }
-            )
-        ).toObservable()
+    private fun executeIndependentCalls(progressManager: D2ProgressManager): Flow<D2Progress> = flow {
+        databaseAdapter.delete(ForeignKeyViolationTableInfo.TABLE_INFO.name())
+        emit(progressManager.increaseProgress(SystemInfo::class.java, false))
+
+        systemSettingDownloader.downloadMetadata().blockingAwait()
+        progressManager.increaseProgress(SystemSetting::class.java, false)
+
+        useCaseDownloader.downloadMetadata().blockingAwait()
+        progressManager.increaseProgress(StockUseCase::class.java, false)
+
+        constantModuleDownloader.downloadMetadata().blockingGet()
+        progressManager.increaseProgress(Constant::class.java, false)
+
+        smsModule.configCase().refreshMetadataIdsCallable().blockingAwait()
+        progressManager.increaseProgress(SmsModule::class.java, false)
     }
 
-    private fun executeUserCallAndChildren(progressManager: D2ProgressManager): Observable<D2Progress> {
-        return userModuleDownloader.downloadMetadata()
-            .flatMapCompletable { user: User ->
-                organisationUnitModuleDownloader.downloadMetadata(user)
-            }.andThen(
-                Single.concatArray(
-                    Single.just(progressManager.increaseProgress(User::class.java, false)),
-                    Single.just(progressManager.increaseProgress(OrganisationUnit::class.java, false)),
-                    programDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(Program::class.java, false)
-                    },
-                    dataSetDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(DataSet::class.java, false)
-                    },
-                    categoryDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(Category::class.java, false)
-                    },
-                    visualizationDownloader.downloadMetadata().map {
-                        progressManager.increaseProgress(Visualization::class.java, false)
-                    },
-                    programIndicatorModuleDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(ProgramIndicator::class.java, false)
-                    },
-                    indicatorModuleDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(Indicator::class.java, false)
-                    },
-                    legendSetModuleDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(LegendSet::class.java, false)
-                    },
-                    expressionDimensionItemModuleDownloader.downloadMetadata().toSingle {
-                        progressManager.increaseProgress(ExpressionDimensionItem::class.java, false)
-                    }
-                ).toObservable()
-            )
+    private fun executeUserCallAndChildren(progressManager: D2ProgressManager): Flow<D2Progress> = flow {
+        val user = userModuleDownloader.downloadMetadata().blockingGet()
+        emit(progressManager.increaseProgress(User::class.java, false))
+
+        organisationUnitModuleDownloader.downloadMetadata(user).blockingAwait()
+        emit(progressManager.increaseProgress(OrganisationUnit::class.java, false))
+
+        programDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(Program::class.java, false))
+
+        dataSetDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(DataSet::class.java, false))
+
+        categoryDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(Category::class.java, false))
+
+        visualizationDownloader.downloadMetadata().blockingGet()
+        emit(progressManager.increaseProgress(Visualization::class.java, false))
+
+        programIndicatorModuleDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(ProgramIndicator::class.java, false))
+
+        indicatorModuleDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(Indicator::class.java, false))
+
+        legendSetModuleDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(LegendSet::class.java, false))
+
+        expressionDimensionItemModuleDownloader.downloadMetadata().blockingAwait()
+        emit(progressManager.increaseProgress(ExpressionDimensionItem::class.java, true))
     }
 
     private fun changeEncryptionIfRequired(): Completable {
@@ -182,6 +172,6 @@ internal class MetadataCall @Inject constructor(
     }
 
     fun blockingDownload() {
-        download().blockingSubscribe()
+        runBlocking { download().collect() }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
index c6619e224a..6a04598942 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
@@ -25,34 +25,25 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.domain.metadata.internal;
+package org.hisp.dhis.android.core.domain.metadata.internal
 
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.modules.internal.WithProgressDownloader;
-import org.hisp.dhis.android.core.domain.metadata.MetadataCall;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
+import dagger.Reusable
+import io.reactivex.Observable
+import kotlinx.coroutines.rx2.asObservable
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.modules.internal.WithProgressDownloader
+import org.hisp.dhis.android.core.domain.metadata.MetadataCall
+import javax.inject.Inject
 
 @Reusable
-public final class MetadataModuleImpl implements WithProgressDownloader {
-
-    private final MetadataCall metadataCall;
-
-    @Inject
-    MetadataModuleImpl(MetadataCall metadataCall) {
-        this.metadataCall = metadataCall;
-    }
-
-    @Override
-    public Observable<D2Progress> download() {
-        return metadataCall.download();
+class MetadataModuleImpl @Inject internal constructor(
+    private val metadataCall: MetadataCall
+) : WithProgressDownloader {
+    override fun download(): Observable<D2Progress> {
+        return metadataCall.download().asObservable()
     }
 
-    @Override
-    public void blockingDownload() {
-        metadataCall.blockingDownload();
+    override fun blockingDownload() {
+        metadataCall.blockingDownload()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
index 356db2961d..e2254c2a5a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
@@ -28,10 +28,9 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -50,38 +49,34 @@ class SystemInfoCall @Inject internal constructor(
     private val systemInfoService: SystemInfoService,
     private val resourceHandler: ResourceHandler,
     private val versionManager: DHISVersionManagerImpl,
-    private val apiCallExecutor: RxAPICallExecutor
-) : CompletableProvider {
-    override fun getCompletable(storeError: Boolean): Completable {
-        return apiCallExecutor.wrapSingle(systemInfoService.getSystemInfo(SystemInfoFields.allFields), storeError)
-            .doOnSuccess { systemInfo: SystemInfo ->
-                val version = systemInfo.version()
-                if (version != null && isAllowedVersion(version)) {
-                    versionManager.setVersion(version)
-                } else {
-                    throw D2Error.builder()
-                        .errorComponent(D2ErrorComponent.SDK)
-                        .errorCode(D2ErrorCode.INVALID_DHIS_VERSION)
-                        .errorDescription(
-                            "Server DHIS version (" + version + ") not valid. " +
-                                "Allowed versions: " +
-                                CollectionsHelper.commaAndSpaceSeparatedArrayValues(allowedVersionsAsStr())
-                        )
-                        .build()
-                }
-                insertOrUpdateSystemInfo(systemInfo)
-            }.ignoreElement()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : DownloadProvider {
+
+    override suspend fun download(storeError: Boolean) {
+        coroutineAPICallExecutor.wrap(storeError) {
+            systemInfoService.getSystemInfo(SystemInfoFields.allFields)
+        }.map { systemInfo ->
+            val version = systemInfo.version()
+            if (version != null && isAllowedVersion(version)) {
+                versionManager.setVersion(version)
+            } else {
+                throw D2Error.builder()
+                    .errorComponent(D2ErrorComponent.SDK)
+                    .errorCode(D2ErrorCode.INVALID_DHIS_VERSION)
+                    .errorDescription(
+                        "Server DHIS version (" + version + ") not valid. " +
+                            "Allowed versions: " +
+                            CollectionsHelper.commaAndSpaceSeparatedArrayValues(allowedVersionsAsStr())
+                    )
+                    .build()
+            }
+            insertOrUpdateSystemInfo(systemInfo)
+        }
     }
 
     private fun insertOrUpdateSystemInfo(systemInfo: SystemInfo) {
-        val transaction = databaseAdapter.beginNewTransaction()
-        try {
-            systemInfoHandler.handle(systemInfo)
-            resourceHandler.serverDate = systemInfo.serverDate()
-            resourceHandler.handleResource(Resource.Type.SYSTEM_INFO)
-            transaction.setSuccessful()
-        } finally {
-            transaction.end()
-        }
+        systemInfoHandler.handle(systemInfo)
+        resourceHandler.serverDate = systemInfo.serverDate()
+        resourceHandler.handleResource(Resource.Type.SYSTEM_INFO)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
index e76bdfef4b..5015e60ec7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
@@ -28,30 +28,23 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Observable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedSuspendModuleDownloader
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
+import javax.inject.Inject
 
 @Reusable
-class SystemInfoModuleDownloader @Inject internal constructor(
-    private val systemInfoRepository: SystemInfoObjectRepository
-) : UntypedModuleDownloader {
+internal class SystemInfoModuleDownloader @Inject internal constructor(
+    private val systemInfoCall: SystemInfoCall
+) : UntypedSuspendModuleDownloader {
 
-    override fun downloadMetadata(): Completable {
-        return systemInfoRepository.download()
+    override suspend fun downloadMetadata(){
+        return systemInfoCall.download(storeError = true)
     }
 
-    fun downloadWithProgressManager(progressManager: D2ProgressManager): Observable<D2Progress> {
-        return systemInfoRepository.download()
-            .toSingle {
-                progressManager.increaseProgress(
-                    SystemInfo::class.java, false
-                )
-            }.toObservable()
+    suspend fun downloadWithProgressManager(progressManager: D2ProgressManager): D2Progress {
+        downloadMetadata()
+        return progressManager.increaseProgress(SystemInfo::class.java, false)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
similarity index 84%
rename from core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.java
rename to core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
index eec75de8d3..b9578e9c2c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
@@ -25,17 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.systeminfo.internal;
+package org.hisp.dhis.android.core.systeminfo.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.systeminfo.SystemInfo;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface SystemInfoService {
+internal interface SystemInfoService {
     @GET("system/info")
-    Single<SystemInfo> getSystemInfo(@Query("fields") @Which Fields<SystemInfo> fields);
+    suspend fun getSystemInfo(
+        @Query("fields") @Which fields: Fields<SystemInfo>
+    ): SystemInfo
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index ed2a99ec6f..ab30b1ce24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -66,7 +66,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
             send(progressManager.increaseProgress(TrackedEntityInstance::class.java, true))
         } else {
             val relatives = RelationshipItemRelatives()
-            systemInfoModuleDownloader.downloadWithProgressManager(progressManager).blockingSubscribe()
+            systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
             coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
                 downloadInternal(params, progressManager, relatives).collect { v -> send(v) }
                 downloadRelationships(progressManager, relatives).collect { v -> send(v) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index c0848aaad5..8c92ba96c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -29,9 +29,11 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
@@ -42,6 +44,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
@@ -52,12 +55,13 @@ import org.hisp.dhis.android.core.user.UserInternalAccessor
 internal class LogInCall @Inject internal constructor(
     private val databaseAdapter: DatabaseAdapter,
     private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val userIdStore: UserIdInMemoryStore,
     private val userHandler: UserHandler,
     private val authenticatedUserStore: AuthenticatedUserStore,
-    private val systemInfoRepository: SystemInfoObjectRepository,
+    private val systemInfoCall: SystemInfoCall,
     private val userStore: UserStore,
     private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher,
     private val databaseManager: LogInDatabaseManager,
@@ -126,25 +130,25 @@ internal class LogInCall @Inject internal constructor(
         credentialsSecureStore.set(credentials)
         userIdStore.set(user.uid())
         databaseManager.loadDatabaseOnline(credentials.serverUrl, credentials.username).blockingAwait()
-        val transaction = databaseAdapter.beginNewTransaction()
-        return try {
-            val authenticatedUser = AuthenticatedUser.builder()
-                .user(user.uid())
-                .hash(credentials.getHash())
-                .build()
-
-            authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
-            systemInfoRepository.download().blockingAwait()
-            userHandler.handle(user)
-            transaction.setSuccessful()
-            user
-        } catch (e: Exception) {
-            // Credentials are stored and then removed in case of error since they are required to download system info
-            credentialsSecureStore.remove()
-            userIdStore.remove()
-            throw e
-        } finally {
-            transaction.end()
+        return runBlocking {
+            coroutineAPICallExecutor.wrapTransactionally {
+                try {
+                    val authenticatedUser = AuthenticatedUser.builder()
+                        .user(user.uid())
+                        .hash(credentials.getHash())
+                        .build()
+
+                    authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
+                    systemInfoCall.download(storeError = true)
+                    userHandler.handle(user)
+                    user
+                } catch (e: Exception) {
+                    // Credentials are stored and then removed in case of error since they are required to download system info
+                    credentialsSecureStore.remove()
+                    userIdStore.remove()
+                    throw e
+                }
+            }
         }
     }
 

From d64e7978eeff0008d1fa5807e9feeb3f000a0a05 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 21 Jul 2023 11:46:36 +0200
Subject: [PATCH 121/478] [ANDROSDK-1712] refactor: - User LogInCall.kt -
 UserModuleImpl.kt - UserCall.kt - UserService.java Remove RxJava, convert to
 Coroutines Tests still need conversion

---
 .../android/core/user/internal/LogInCall.kt   | 23 ++++++++-----------
 .../android/core/user/internal/UserCall.kt    |  8 +++----
 .../core/user/internal/UserModuleImpl.kt      |  5 ++--
 .../core/user/internal/UserService.java       |  7 +++---
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index c0848aaad5..88fcd24f87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -28,10 +28,8 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import javax.inject.Inject
 import net.openid.appauth.AuthState
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
@@ -46,12 +44,13 @@ import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
 internal class LogInCall @Inject internal constructor(
     private val databaseAdapter: DatabaseAdapter,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val userIdStore: UserIdInMemoryStore,
@@ -59,20 +58,18 @@ internal class LogInCall @Inject internal constructor(
     private val authenticatedUserStore: AuthenticatedUserStore,
     private val systemInfoRepository: SystemInfoObjectRepository,
     private val userStore: UserStore,
-    private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher,
     private val databaseManager: LogInDatabaseManager,
     private val exceptions: LogInExceptions,
     private val accountManager: AccountManagerImpl,
     private val versionManager: DHISVersionManager
 ) {
-    fun logIn(username: String?, password: String?, serverUrl: String?): Single<User> {
-        return Single.fromCallable {
-            blockingLogIn(username, password, serverUrl)
-        }
+    suspend fun logIn(username: String?, password: String?, serverUrl: String?): User {
+        return blockingLogIn(username, password, serverUrl)
+
     }
 
     @Throws(D2Error::class)
-    private fun blockingLogIn(username: String?, password: String?, serverUrl: String?): User {
+    private suspend fun blockingLogIn(username: String?, password: String?, serverUrl: String?): User {
         exceptions.throwExceptionIfUsernameNull(username)
         exceptions.throwExceptionIfPasswordNull(password)
         exceptions.throwExceptionIfAlreadyAuthenticated()
@@ -90,7 +87,7 @@ internal class LogInCall @Inject internal constructor(
         val credentials = Credentials(username, trimmedServerUrl!!, password, null)
 
         return try {
-            val user = apiCallExecutor.executeObjectCallWithErrorCatcher(authenticateCall, apiCallErrorCatcher)
+            val user = coroutineAPICallExecutor.wrap { authenticateCall }.getOrThrow()
             loginOnline(user, credentials)
         } catch (d2Error: D2Error) {
             if (d2Error.isOffline) {
@@ -167,7 +164,7 @@ internal class LogInCall @Inject internal constructor(
     }
 
     @Throws(D2Error::class)
-    fun blockingLogInOpenIDConnect(serverUrl: String, openIDConnectState: AuthState): User {
+    suspend fun blockingLogInOpenIDConnect(serverUrl: String, openIDConnectState: AuthState): User {
         val trimmedServerUrl = ServerUrlParser.trimAndRemoveTrailingSlash(serverUrl)
 
         val parsedServerUrl = ServerUrlParser.parse(trimmedServerUrl)
@@ -180,7 +177,7 @@ internal class LogInCall @Inject internal constructor(
 
         var credentials: Credentials? = null
         return try {
-            val user = apiCallExecutor.executeObjectCallWithErrorCatcher(authenticateCall, apiCallErrorCatcher)
+            val user = coroutineAPICallExecutor.wrap { authenticateCall }.getOrThrow()
             credentials = getOpenIdConnectCredentials(user, trimmedServerUrl!!, openIDConnectState)
             loginOnline(user, credentials)
         } catch (d2Error: D2Error) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index a22a0cf182..64860e9e3a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import dagger.Reusable
-import java.util.concurrent.Callable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
+import java.util.concurrent.Callable
+import javax.inject.Inject
 
 @Reusable
 internal class UserCall @Inject constructor(
@@ -48,9 +48,7 @@ internal class UserCall @Inject constructor(
 
     @Throws(D2Error::class)
     override fun call(): User {
-        val user = apiCallExecutor.executeObjectCall(
-            userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()))
-        )
+        val user = userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()))
 
         val transaction = genericCallData.databaseAdapter().beginNewTransaction()
         try {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index 6f660e28c4..4984e445da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -30,10 +30,11 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions", "LongParameterList")
@@ -72,7 +73,7 @@ internal class UserModuleImpl @Inject constructor(
     }
 
     override fun logIn(username: String, password: String, serverUrl: String): Single<User> {
-        return logInCall.logIn(username, password, serverUrl)
+        return Single.create { runBlocking { logInCall.logIn(username, password, serverUrl) } }
     }
 
     override fun blockingLogIn(username: String, password: String, serverUrl: String): User {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
index d3363fcf94..62e5965dc7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
@@ -32,7 +32,6 @@
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
 import org.hisp.dhis.android.core.user.User;
 
-import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Query;
@@ -40,10 +39,10 @@
 interface UserService {
 
     @GET("me")
-    Call<User> authenticate(@Header("Authorization") String credentials,
-                            @Query("fields") @Which Fields<User> fields);
+    User authenticate(@Header("Authorization") String credentials,
+                      @Query("fields") @Which Fields<User> fields);
 
     @GET("me")
-    Call<User> getUser(@Query("fields") @Which Fields<User> fields);
+    User getUser(@Query("fields") @Which Fields<User> fields);
 
 }

From 6952592d58175e67032019ea9d37cbd845ecfd0d Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 23 Jul 2023 20:21:42 +0200
Subject: [PATCH 122/478] [ANDROSDK-1711] style: - shorten test name to pass
 ktlint restrictions

---
 ...dEntityAttributeReservedValueManagerRealIntegrationShould.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index df88c9bd1c..31dce03cae 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -211,7 +211,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
 
     //    @Test
     @Throws(D2Error::class)
-    suspend fun fill_up_to_100_values_if_db_does_not_have_at_least_50_values_when_not_number_of_values_to_reserve_is_specified() {
+    suspend fun fill_up_100_values_if_db_does_not_have_at_least_50_when_no_number_of_values_to_reserve_is_specified() {
         d2.trackedEntityModule().reservedValueManager().blockingDownloadReservedValues(ownerUid, 50)
         Truth.assertThat(selectAll().size).isEqualTo(50)
         d2.trackedEntityModule().reservedValueManager()

From b5df00f5f71e9bf2f889a6c9fc7f60065a456009 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 25 Jul 2023 10:53:38 +0200
Subject: [PATCH 123/478] [ANDROSDK-1729] Adapt test to changes in network
 queries

---
 .../UntypedSuspendModuleDownloader.kt         |  2 +-
 .../data/internal/AggregatedDataCall.kt       | 10 +--
 .../core/domain/metadata/MetadataCall.kt      | 16 ++--
 .../metadata/internal/MetadataModuleImpl.kt   |  2 +-
 .../systeminfo/internal/SystemInfoCall.kt     | 41 ++++-----
 .../internal/SystemInfoModuleDownloader.kt    |  4 +-
 .../android/core/user/internal/LogInCall.kt   |  7 +-
 .../internal/CoroutineAPICallExecutorMock.kt  | 58 ++++++++++++
 .../android/core/common/BaseCallShould.java   | 22 -----
 .../domain/metadata/MetadataCallShould.kt     | 76 ++++++++--------
 .../internal/SystemInfoCallShould.kt          | 90 +++++++++++--------
 .../core/user/internal/LogInCallUnitShould.kt | 19 ++--
 12 files changed, 201 insertions(+), 146 deletions(-)
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
index f7de8af77a..2c9b3c02b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
@@ -29,4 +29,4 @@ package org.hisp.dhis.android.core.arch.modules.internal
 
 interface UntypedSuspendModuleDownloader {
     suspend fun downloadMetadata()
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index fef51974cd..0a15643351 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -29,12 +29,9 @@ package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.D2ProgressSyncStatus
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
@@ -69,11 +66,10 @@ internal class AggregatedDataCall @Inject constructor(
     private val resourceHandler: ResourceHandler,
     private val hashHelper: AggregatedDataSyncHashHelper
 ) {
-    @OptIn(ExperimentalCoroutinesApi::class)
-    fun download(): Flow<AggregatedD2Progress> {
+    fun download(): Flow<AggregatedD2Progress> = flow {
         val progressManager = AggregatedD2ProgressManager(null)
-        return flow<D2Progress> { systemInfoModuleDownloader.downloadWithProgressManager(progressManager) }
-            .flatMapLatest { selectDataSetsAndDownload(progressManager) }
+        systemInfoModuleDownloader.downloadWithProgressManager(progressManager)
+        selectDataSetsAndDownload(progressManager).collect { emit(it) }
     }
 
     private fun selectDataSetsAndDownload(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 87dcdd5ff2..f28bf24160 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.domain.metadata
 
 import dagger.Reusable
 import io.reactivex.Completable
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -53,6 +53,7 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorModuleDownloader
 import org.hisp.dhis.android.core.legendset.LegendSet
 import org.hisp.dhis.android.core.legendset.internal.LegendSetModuleDownloader
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
@@ -72,7 +73,6 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserModuleDownloader
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleDownloader
-import javax.inject.Inject
 
 @Suppress("LongParameterList")
 @Reusable
@@ -103,13 +103,19 @@ internal class MetadataCall @Inject constructor(
         const val CALLS_COUNT = 12
     }
 
+    @Suppress("TooGenericExceptionCaught")
     fun download(): Flow<D2Progress> = channelFlow {
         val progressManager = D2ProgressManager(CALLS_COUNT)
         changeEncryptionIfRequired().blockingAwait()
         coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
-            systemInfoDownloader.downloadWithProgressManager(progressManager).also { send(it) }
-            executeIndependentCalls(progressManager).collect { send(it) }
-            executeUserCallAndChildren(progressManager).collect { send(it) }
+            try {
+                systemInfoDownloader.downloadWithProgressManager(progressManager).also { send(it) }
+                executeIndependentCalls(progressManager).collect { send(it) }
+                executeUserCallAndChildren(progressManager).collect { send(it) }
+            } catch (e: Exception) {
+                if (e !is D2Error && e.cause is D2Error) throw e.cause!!
+                else throw e
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
index 6a04598942..39b2a21096 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
@@ -29,11 +29,11 @@ package org.hisp.dhis.android.core.domain.metadata.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
+import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.modules.internal.WithProgressDownloader
 import org.hisp.dhis.android.core.domain.metadata.MetadataCall
-import javax.inject.Inject
 
 @Reusable
 class MetadataModuleImpl @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
index e2254c2a5a..3d53c8cb75 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
@@ -28,10 +28,9 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
@@ -44,7 +43,6 @@ import org.hisp.dhis.android.core.systeminfo.SystemInfo
 
 @Reusable
 class SystemInfoCall @Inject internal constructor(
-    private val databaseAdapter: DatabaseAdapter,
     private val systemInfoHandler: SystemInfoHandler,
     private val systemInfoService: SystemInfoService,
     private val resourceHandler: ResourceHandler,
@@ -55,23 +53,26 @@ class SystemInfoCall @Inject internal constructor(
     override suspend fun download(storeError: Boolean) {
         coroutineAPICallExecutor.wrap(storeError) {
             systemInfoService.getSystemInfo(SystemInfoFields.allFields)
-        }.map { systemInfo ->
-            val version = systemInfo.version()
-            if (version != null && isAllowedVersion(version)) {
-                versionManager.setVersion(version)
-            } else {
-                throw D2Error.builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.INVALID_DHIS_VERSION)
-                    .errorDescription(
-                        "Server DHIS version (" + version + ") not valid. " +
-                            "Allowed versions: " +
-                            CollectionsHelper.commaAndSpaceSeparatedArrayValues(allowedVersionsAsStr())
-                    )
-                    .build()
-            }
-            insertOrUpdateSystemInfo(systemInfo)
-        }
+        }.fold(
+            onSuccess = { systemInfo ->
+                val version = systemInfo.version()
+                if (version != null && isAllowedVersion(version)) {
+                    versionManager.setVersion(version)
+                } else {
+                    throw D2Error.builder()
+                        .errorComponent(D2ErrorComponent.SDK)
+                        .errorCode(D2ErrorCode.INVALID_DHIS_VERSION)
+                        .errorDescription(
+                            "Server DHIS version (" + version + ") not valid. " +
+                                "Allowed versions: " +
+                                CollectionsHelper.commaAndSpaceSeparatedArrayValues(allowedVersionsAsStr())
+                        )
+                        .build()
+                }
+                insertOrUpdateSystemInfo(systemInfo)
+            },
+            onFailure = { throw it }
+        )
     }
 
     private fun insertOrUpdateSystemInfo(systemInfo: SystemInfo) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
index 5015e60ec7..f926e4f26d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedSuspendModuleDownloader
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import javax.inject.Inject
 
 @Reusable
 internal class SystemInfoModuleDownloader @Inject internal constructor(
     private val systemInfoCall: SystemInfoCall
 ) : UntypedSuspendModuleDownloader {
 
-    override suspend fun downloadMetadata(){
+    override suspend fun downloadMetadata() {
         return systemInfoCall.download(storeError = true)
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 8c92ba96c0..6a35de0c4c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -29,13 +29,12 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
+import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
@@ -43,7 +42,6 @@ import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
@@ -53,7 +51,6 @@ import org.hisp.dhis.android.core.user.UserInternalAccessor
 @Reusable
 @Suppress("LongParameterList")
 internal class LogInCall @Inject internal constructor(
-    private val databaseAdapter: DatabaseAdapter,
     private val apiCallExecutor: APICallExecutor,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
@@ -143,7 +140,7 @@ internal class LogInCall @Inject internal constructor(
                     userHandler.handle(user)
                     user
                 } catch (e: Exception) {
-                    // Credentials are stored and then removed in case of error since they are required to download system info
+                    // Credentials are stored and then removed in case of error (required to download system info)
                     credentialsSecureStore.remove()
                     userIdStore.remove()
                     throw e
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
new file mode 100644
index 0000000000..5f7079f495
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.api.executors.internal
+
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+
+internal class CoroutineAPICallExecutorMock : CoroutineAPICallExecutor {
+    override suspend fun <P> wrap(
+        storeError: Boolean,
+        acceptedErrorCodes: List<Int>?,
+        errorCatcher: APICallErrorCatcher?,
+        errorClass: Class<P>?,
+        block: suspend () -> P
+    ): Result<P, D2Error> {
+        return try {
+            Result.Success(block.invoke())
+        } catch (e: Throwable) {
+            Result.Failure(
+                D2Error.builder()
+                    .errorCode(D2ErrorCode.UNEXPECTED)
+                    .errorDescription("Unexpected error")
+                    .build()
+            )
+        }
+    }
+
+    override suspend fun <P> wrapTransactionally(cleanForeignKeyErrors: Boolean, block: suspend () -> P): P {
+        return block.invoke()
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java
index 90b709a4dd..9aea678991 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/common/BaseCallShould.java
@@ -28,9 +28,6 @@
 package org.hisp.dhis.android.core.common;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hisp.dhis.android.core.arch.api.testutils.RetrofitFactory;
@@ -40,12 +37,10 @@
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.resource.internal.Resource;
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler;
-import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.util.Date;
-import java.util.concurrent.Callable;
 
 import javax.net.ssl.HttpsURLConnection;
 
@@ -95,21 +90,4 @@ public void setUp() throws Exception {
                 HttpsURLConnection.HTTP_CLIENT_TIMEOUT,
                 ResponseBody.create(MediaType.parse("application/json"), "{}"));
     }
-
-    protected void whenEndpointCallFails(Callable<?> endpointCall) throws Exception {
-        when(endpointCall.call()).thenThrow(new Exception());
-    }
-
-    protected void verifyNoTransactionCompleted() {
-        verify(databaseAdapter, never()).beginNewTransaction();
-        verify(transaction, never()).setSuccessful();
-        verify(transaction, never()).end();
-    }
-
-    protected void verifyTransactionComplete() {
-        InOrder transactionMethodsOrder = inOrder(databaseAdapter);
-        transactionMethodsOrder.verify(databaseAdapter).beginNewTransaction();
-        verify(transaction).setSuccessful();
-        verify(transaction).end();
-    }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index f1059e9964..9576cc57dc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -27,13 +27,15 @@
  */
 package org.hisp.dhis.android.core.domain.metadata
 
+import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
-import io.reactivex.Observable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.call.BaseD2Progress
-import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.category.internal.CategoryModuleDownloader
 import org.hisp.dhis.android.core.common.BaseCallShould
@@ -44,6 +46,7 @@ import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDim
 import org.hisp.dhis.android.core.indicator.internal.IndicatorModuleDownloader
 import org.hisp.dhis.android.core.legendset.internal.LegendSetModuleDownloader
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorModuleDownloader
@@ -57,17 +60,16 @@ import org.hisp.dhis.android.core.usecase.UseCaseModuleDownloader
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserModuleDownloader
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleDownloader
+import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.mockito.AdditionalAnswers
-import org.mockito.Mockito
 
 @RunWith(JUnit4::class)
 class MetadataCallShould : BaseCallShould() {
     private val user: User = mock()
-    private val rxAPICallExecutor: RxAPICallExecutor = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val systemInfoDownloader: SystemInfoModuleDownloader = mock()
     private val systemSettingDownloader: SettingModuleDownloader = mock()
     private val useCaseModuleDownloader: UseCaseModuleDownloader = mock()
@@ -88,6 +90,11 @@ class MetadataCallShould : BaseCallShould() {
     private val legendSetModuleDownloader: LegendSetModuleDownloader = mock()
     private val expressionDimensIndicatorModuleDownloader: ExpressionDimensionItemModuleDownloader = mock()
 
+    private val networkError: D2Error = D2Error.builder()
+        .errorCode(D2ErrorCode.UNKNOWN_HOST)
+        .errorDescription("Unknown host")
+        .build()
+
     // object to test
     private lateinit var metadataCall: MetadataCall
 
@@ -97,8 +104,9 @@ class MetadataCallShould : BaseCallShould() {
         super.setUp()
 
         // Calls
-        whenever(systemInfoDownloader.downloadWithProgressManager(any()))
-            .thenReturn(Observable.just(BaseD2Progress.empty(10)))
+        systemInfoDownloader.stub {
+            onBlocking { downloadWithProgressManager(any()) }.doReturn(BaseD2Progress.empty(10))
+        }
         whenever(systemSettingDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(useCaseModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(userDownloader.downloadMetadata()).thenReturn(Single.just(user))
@@ -123,16 +131,10 @@ class MetadataCallShould : BaseCallShould() {
         whenever(smsModule.configCase()).thenReturn(configCase)
         whenever(configCase.refreshMetadataIdsCallable()).thenReturn(Completable.complete())
         whenever(generalSettingCall.isDatabaseEncrypted()).thenReturn(Single.just(false))
-        Mockito.`when`<Observable<D2Progress>>(
-            rxAPICallExecutor.wrapObservableTransactionally(
-                any(),
-                any()
-            )
-        ).then(AdditionalAnswers.returnsFirstArg<Any>())
 
         // Metadata call
         metadataCall = MetadataCall(
-            rxAPICallExecutor,
+            coroutineAPICallExecutor,
             systemInfoDownloader,
             systemSettingDownloader,
             useCaseModuleDownloader,
@@ -162,76 +164,72 @@ class MetadataCallShould : BaseCallShould() {
 
     @Test
     fun fail_when_system_info_call_fail() {
-        whenever(systemInfoDownloader.downloadWithProgressManager(any())).thenReturn(Observable.error(d2Error))
+        systemInfoDownloader.stub {
+            onBlocking { downloadWithProgressManager(any()) }.then { runBlocking { throw networkError } }
+        }
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_system_setting_call_fail() {
-        whenever(systemSettingDownloader.downloadMetadata()).thenReturn(Completable.error(d2Error))
+        whenever(systemSettingDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
         downloadAndAssertError()
     }
 
-    private fun downloadAndAssertError() {
-        val testObserver = metadataCall.download().test()
-        testObserver.assertError(D2Error::class.java)
-        testObserver.dispose()
-    }
-
     @Test
     fun fail_when_user_call_fail() {
-        whenever(userDownloader.downloadMetadata()).thenReturn(Single.error(d2Error))
+        whenever(userDownloader.downloadMetadata()).thenReturn(Single.error(networkError))
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_category_download_call_fail() {
-        whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.error(d2Error))
+        whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_visualization_download_call_fail() {
-        whenever(visualizationDownloader.downloadMetadata()).thenReturn(Single.error(d2Error))
+        whenever(visualizationDownloader.downloadMetadata()).thenReturn(Single.error(networkError))
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_program_call_fail() {
-        whenever(programDownloader.downloadMetadata()).thenReturn(Completable.error(d2Error))
+        whenever(programDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_organisation_unit_call_fail() {
-        whenever(organisationUnitDownloader.downloadMetadata(user)).thenReturn(Completable.error(d2Error))
+        whenever(organisationUnitDownloader.downloadMetadata(user)).thenReturn(Completable.error(networkError))
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_dataset_parent_call_fail() {
-        whenever(dataSetDownloader.downloadMetadata()).thenReturn(Completable.error(d2Error))
+        whenever(dataSetDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
         downloadAndAssertError()
     }
 
     @Test
     fun fail_when_constant_call_fail() {
-        whenever(constantDownloader.downloadMetadata()).thenReturn(Single.error(d2Error))
+        whenever(constantDownloader.downloadMetadata()).thenReturn(Single.error(networkError))
         downloadAndAssertError()
     }
 
-    @Test
-    fun call_wrapObservableTransactionally() {
-        metadataCall.blockingDownload()
-        verify(rxAPICallExecutor).wrapObservableTransactionally<D2Progress>(
-            any(),
-            eq(true)
-        )
-    }
-
     @Test
     fun delete_foreign_key_violations_before_calls() {
         metadataCall.blockingDownload()
         verify(databaseAdapter).delete(ForeignKeyViolationTableInfo.TABLE_INFO.name())
     }
+
+    private fun downloadAndAssertError() = runBlocking {
+        try {
+            metadataCall.download().collect()
+            fail("It should throw exception")
+        } catch (e: Exception) {
+            assertThat(e).isInstanceOf(D2Error::class.java)
+        }
+    }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
index 5e092aaa01..3afd5dcae0 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
@@ -29,9 +29,10 @@ package org.hisp.dhis.android.core.systeminfo.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
 import java.util.*
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
@@ -40,7 +41,7 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.resource.internal.Resource
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import org.junit.Assert
+import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -50,11 +51,10 @@ import org.junit.runners.JUnit4
 class SystemInfoCallShould {
     private val systemInfoService: SystemInfoService = mock()
     private val databaseAdapter: DatabaseAdapter = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val d2Error: D2Error = mock()
     private val systemInfoHandler: SystemInfoHandler = mock()
     private val resourceHandler: ResourceHandler = mock()
-    private val systemInfoSingle: Single<SystemInfo> = mock()
     private val transaction: Transaction = mock()
 
     private val filterCaptor: KArgumentCaptor<Fields<SystemInfo>> = argumentCaptor()
@@ -68,73 +68,93 @@ class SystemInfoCallShould {
     @Before
     fun setUp() {
         systemInfoSyncCall = SystemInfoCall(
-            databaseAdapter, systemInfoHandler, systemInfoService, resourceHandler, versionManager,
-            apiCallExecutor
+            systemInfoHandler, systemInfoService, resourceHandler, versionManager,
+            coroutineAPICallExecutor
         )
 
         whenever(systemInfo.version()).thenReturn("2.29")
         whenever(systemInfo.serverDate()).thenReturn(serverDate)
         whenever(databaseAdapter.beginNewTransaction()).thenReturn(transaction)
-        whenever(systemInfoService.getSystemInfo(filterCaptor.capture())).thenReturn(systemInfoSingle)
+        systemInfoService.stub {
+            onBlocking { getSystemInfo(filterCaptor.capture()) }.doReturn(systemInfo)
+        }
     }
 
     @Test
-    fun pass_correct_fields_to_service() {
-        whenever(apiCallExecutor.wrapSingle(systemInfoSingle, true)).thenReturn(Single.just(systemInfo))
-        systemInfoSyncCall.getCompletable(true).subscribe()
+    fun pass_correct_fields_to_service() = runBlocking {
+        systemInfoSyncCall.download(true)
 
         assertThat(filterCaptor.firstValue).isEqualTo(SystemInfoFields.allFields)
     }
 
     @Test
-    fun emit_d2_error_when_api_call_executor_returns_error() {
-        whenever(apiCallExecutor.wrapSingle(systemInfoSingle, true)).thenReturn(Single.error(d2Error))
+    fun emit_d2_error_when_api_call_executor_returns_error() = runBlocking {
+        systemInfoService.stub {
+            onBlocking { getSystemInfo(any()) }.doAnswer { throw d2Error }
+        }
 
-        systemInfoSyncCall.getCompletable(true).test().assertError(d2Error)
+        try {
+            systemInfoSyncCall.download(true)
+            fail("It should throw exception")
+        } catch (e: Exception) {
+            assertThat(e).isInstanceOf(D2Error::class.java)
+        }
     }
 
     @Test
-    fun never_invoke_handlers_on_call_exception() {
-        whenever(apiCallExecutor.wrapSingle(systemInfoSingle, true)).thenReturn(Single.error(d2Error))
-        systemInfoSyncCall.getCompletable(true).onErrorComplete().subscribe()
+    fun never_invoke_handlers_on_call_exception() = runBlocking {
+        systemInfoService.stub {
+            onBlocking { getSystemInfo(filterCaptor.capture()) }.doAnswer { throw d2Error }
+        }
+
+        verifyThrowD2Error(
+            block = { systemInfoSyncCall.download(true) }
+        )
 
-        verify(databaseAdapter, never()).beginNewTransaction()
-        verify(transaction, never()).setSuccessful()
-        verify(transaction, never()).end()
         verifyNoMoreInteractions(systemInfoHandler)
         verifyNoMoreInteractions(resourceHandler)
     }
 
     @Test
-    fun invoke_handler_after_successful_call() {
-        whenever(apiCallExecutor.wrapSingle(systemInfoSingle, true)).thenReturn(Single.just(systemInfo))
-        systemInfoSyncCall.getCompletable(true).subscribe()
+    fun invoke_handler_after_successful_call() = runBlocking {
+        systemInfoSyncCall.download(true)
 
         verify(systemInfoHandler).handle(systemInfo)
         verify(resourceHandler).handleResource(eq(Resource.Type.SYSTEM_INFO))
     }
 
     @Test
-    fun throw_d2_call_exception_when_system_version_not_supported() {
+    fun throw_d2_call_exception_when_system_version_not_supported() = runBlocking {
         whenever(systemInfo.version()).thenReturn("2.28")
-        whenever(apiCallExecutor.wrapSingle(systemInfoSingle, true)).thenReturn(Single.just(systemInfo))
 
-        systemInfoSyncCall.getCompletable(true).test().assertError(D2Error::class.java)
+        verifyThrowD2Error(
+            block = { systemInfoSyncCall.download(true) }
+        )
     }
 
     @Test
-    fun not_call_handler_when_system_version_not_supported() {
+    fun not_call_handler_when_system_version_not_supported() = runBlocking {
         whenever(systemInfo.version()).thenReturn("2.28")
-        whenever(apiCallExecutor.wrapSingle(systemInfoSingle, true)).thenReturn(Single.just(systemInfo))
-        try {
-            systemInfoSyncCall.getCompletable(true).blockingAwait()
-            Assert.fail("It should not get here")
-        } catch (e: RuntimeException) {
-            assertThat((e.cause as D2Error).errorCode())
-                .isEquivalentAccordingToCompareTo(D2ErrorCode.INVALID_DHIS_VERSION)
-        }
+
+        verifyThrowD2Error(
+            block = { systemInfoSyncCall.download(true) },
+            code = D2ErrorCode.INVALID_DHIS_VERSION
+        )
 
         verify(systemInfoHandler, never()).handle(systemInfo)
         verify(resourceHandler, never()).handleResource(eq(Resource.Type.SYSTEM_INFO))
     }
+
+    private suspend fun verifyThrowD2Error(block: suspend () -> Unit, code: D2ErrorCode? = null) {
+        try {
+            block.invoke()
+            fail("It should not get here")
+        } catch (e: Exception) {
+            assertThat(e).isInstanceOf(D2Error::class.java)
+
+            if (code != null) {
+                assertThat((e as D2Error).errorCode()).isEquivalentAccordingToCompareTo(code)
+            }
+        }
+    }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 507497a7c9..79795261a8 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -29,10 +29,11 @@ package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Completable
 import io.reactivex.Single
 import io.reactivex.observers.TestObserver
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.helpers.UserHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
@@ -46,7 +47,7 @@ import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.junit.Before
@@ -61,6 +62,7 @@ import retrofit2.Call
 class LogInCallUnitShould : BaseCallShould() {
     private val userService: UserService = mock()
     private val apiCallExecutor: APICallExecutor = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val userHandler: UserHandler = mock()
     private val authenticatedUserStore: AuthenticatedUserStore = mock()
     private val credentialsSecureStore: CredentialsSecureStore = mock()
@@ -78,7 +80,7 @@ class LogInCallUnitShould : BaseCallShould() {
     private val authenticatedUser: AuthenticatedUser = mock()
     private val credentials: Credentials = mock()
     private val userStore: UserStore = mock()
-    private val systemInfoRepository: SystemInfoObjectRepository = mock()
+    private val systemInfoCall: SystemInfoCall = mock()
     private val multiUserDatabaseManager: MultiUserDatabaseManager = mock()
     private val generalSettingCall: GeneralSettingCall = mock()
     private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher = mock()
@@ -103,10 +105,11 @@ class LogInCallUnitShould : BaseCallShould() {
         whenever(systemInfoFromAPI.contextPath()).thenReturn(baseEndpoint)
         whenever(systemInfoFromDb.contextPath()).thenReturn(baseEndpoint)
         whenever<Call<*>?>(userService.authenticate(any(), any())).thenReturn(authenticateAPICall)
-        whenever(systemInfoRepository.download()).thenReturn(Completable.complete())
+        systemInfoCall.stub {
+            onBlocking { download(any()) }.doReturn(Unit)
+        }
         whenAPICall().thenReturn(user)
         whenever(userStore.selectFirst()).thenReturn(loggedUser)
-        whenever(systemInfoRepository.blockingGet()).thenReturn(systemInfoFromDb)
         whenever(databaseAdapter.beginNewTransaction()).thenReturn(transaction)
         whenever(d2Error.errorCode()).thenReturn(D2ErrorCode.SOCKET_TIMEOUT)
         whenever(d2Error.isOffline).thenReturn(true)
@@ -118,9 +121,9 @@ class LogInCallUnitShould : BaseCallShould() {
 
     private fun instantiateCall(username: String?, password: String?, serverUrl: String?): Single<User> {
         return LogInCall(
-            databaseAdapter, apiCallExecutor,
+            apiCallExecutor, coroutineAPICallExecutor,
             userService, credentialsSecureStore, userIdStore, userHandler, authenticatedUserStore,
-            systemInfoRepository, userStore, apiCallErrorCatcher,
+            systemInfoCall, userStore, apiCallErrorCatcher,
             LogInDatabaseManager(multiUserDatabaseManager, generalSettingCall),
             LogInExceptions(credentialsSecureStore), accountManager, versionManager
         ).logIn(username, password, serverUrl)
@@ -183,7 +186,6 @@ class LogInCallUnitShould : BaseCallShould() {
         testObserver.awaitTerminalEvent()
         assertThat(testObserver.errorCount()).isEqualTo(1)
         testObserver.dispose()
-        verifyNoTransactionCompleted()
 
         // stores must not be invoked
         verify(authenticatedUserStore, never()).updateOrInsertWhere(any())
@@ -263,7 +265,6 @@ class LogInCallUnitShould : BaseCallShould() {
             .user(UID)
             .hash(UserHelper.md5(USERNAME, PASSWORD))
             .build()
-        verifyTransactionComplete()
         verify(authenticatedUserStore).updateOrInsertWhere(authenticatedUserModel)
         verify(userHandler).handle(eq(user))
     }

From c31335a5992b1606c78a5418f68f5a17e71acc84 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 25 Jul 2023 11:17:59 +0200
Subject: [PATCH 124/478] [ANDROSDK-1729] Add mock integration test for
 MetadataCall

---
 .../MetadataCallMockIntegrationShould.kt      | 98 +++++++++++++++++++
 .../core/domain/metadata/MetadataCall.kt      | 12 +--
 2 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
new file mode 100644
index 0000000000..19946e176a
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
@@ -0,0 +1,98 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.domain.metadata
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.category.Category
+import org.hisp.dhis.android.core.constant.Constant
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
+import org.hisp.dhis.android.core.indicator.Indicator
+import org.hisp.dhis.android.core.legendset.LegendSet
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.program.Program
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.settings.SystemSetting
+import org.hisp.dhis.android.core.sms.SmsModule
+import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import org.hisp.dhis.android.core.usecase.stock.StockUseCase
+import org.hisp.dhis.android.core.user.User
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.hisp.dhis.android.core.visualization.Visualization
+import org.junit.After
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(D2JunitRunner::class)
+class MetadataCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
+
+    @After
+    fun tearDown() {
+        d2.wipeModule().wipeEverything()
+    }
+
+    @Test
+    fun emit_progress() {
+        val testObserver = d2.metadataModule().download().test()
+
+        testObserver.awaitTerminalEvent()
+
+        testObserver.assertValueCount(15)
+
+        val values = testObserver.values()
+
+        val allExceptLastValue = values.dropLast(1)
+        val lastValue = values.last()
+
+        allExceptLastValue.forEach { assertThat(it.isComplete).isFalse() }
+
+        assertThat(lastValue.isComplete).isTrue()
+        assertThat(lastValue.doneCalls()).containsExactlyElementsIn(
+            listOf(
+                SystemInfo::class,
+                SystemSetting::class,
+                StockUseCase::class,
+                Constant::class,
+                SmsModule::class,
+                User::class,
+                OrganisationUnit::class,
+                Program::class,
+                DataSet::class,
+                Category::class,
+                Visualization::class,
+                ProgramIndicator::class,
+                Indicator::class,
+                LegendSet::class,
+                ExpressionDimensionItem::class,
+            ).map { it.java.simpleName }
+        )
+
+        testObserver.dispose()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index f28bf24160..91f1c56e56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -65,7 +65,6 @@ import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
 import org.hisp.dhis.android.core.settings.internal.SettingModuleDownloader
 import org.hisp.dhis.android.core.sms.SmsModule
-import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
 import org.hisp.dhis.android.core.usecase.UseCaseModuleDownloader
 import org.hisp.dhis.android.core.usecase.stock.StockUseCase
@@ -100,7 +99,7 @@ internal class MetadataCall @Inject constructor(
 ) {
 
     companion object {
-        const val CALLS_COUNT = 12
+        const val CALLS_COUNT = 15
     }
 
     @Suppress("TooGenericExceptionCaught")
@@ -121,19 +120,18 @@ internal class MetadataCall @Inject constructor(
 
     private fun executeIndependentCalls(progressManager: D2ProgressManager): Flow<D2Progress> = flow {
         databaseAdapter.delete(ForeignKeyViolationTableInfo.TABLE_INFO.name())
-        emit(progressManager.increaseProgress(SystemInfo::class.java, false))
 
         systemSettingDownloader.downloadMetadata().blockingAwait()
-        progressManager.increaseProgress(SystemSetting::class.java, false)
+        emit(progressManager.increaseProgress(SystemSetting::class.java, false))
 
         useCaseDownloader.downloadMetadata().blockingAwait()
-        progressManager.increaseProgress(StockUseCase::class.java, false)
+        emit(progressManager.increaseProgress(StockUseCase::class.java, false))
 
         constantModuleDownloader.downloadMetadata().blockingGet()
-        progressManager.increaseProgress(Constant::class.java, false)
+        emit(progressManager.increaseProgress(Constant::class.java, false))
 
         smsModule.configCase().refreshMetadataIdsCallable().blockingAwait()
-        progressManager.increaseProgress(SmsModule::class.java, false)
+        emit(progressManager.increaseProgress(SmsModule::class.java, false))
     }
 
     private fun executeUserCallAndChildren(progressManager: D2ProgressManager): Flow<D2Progress> = flow {

From 46d5103e4687c02549aa3e189891c7d198077b0f Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 25 Jul 2023 11:45:09 +0200
Subject: [PATCH 125/478] [ANDROSDK-1729] Add function interface modifier

---
 .../dhis/android/core/arch/call/internal/CompletableProvider.kt | 2 +-
 .../dhis/android/core/arch/call/internal/DownloadProvider.kt    | 2 +-
 .../arch/modules/internal/UntypedSuspendModuleDownloader.kt     | 2 +-
 .../dhis/android/core/systeminfo/internal/SystemInfoService.kt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt
index 0a51fc1b0f..93ecbf0ca5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/CompletableProvider.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.internal
 
 import io.reactivex.Completable
 
-interface CompletableProvider {
+fun interface CompletableProvider {
     fun getCompletable(storeError: Boolean): Completable
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt
index 3f1a6cedd5..2c0369e139 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/DownloadProvider.kt
@@ -27,6 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.call.internal
 
-internal interface DownloadProvider {
+internal fun interface DownloadProvider {
     suspend fun download(storeError: Boolean)
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
index 2c9b3c02b9..ea2f0b33d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedSuspendModuleDownloader.kt
@@ -27,6 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.modules.internal
 
-interface UntypedSuspendModuleDownloader {
+fun interface UntypedSuspendModuleDownloader {
     suspend fun downloadMetadata()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
index b9578e9c2c..5c4d9a0ef5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface SystemInfoService {
+internal fun interface SystemInfoService {
     @GET("system/info")
     suspend fun getSystemInfo(
         @Query("fields") @Which fields: Fields<SystemInfo>

From 754435b97f6538027cbb2bada4ddcbb480c9e1eb Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 25 Jul 2023 18:57:11 +0200
Subject: [PATCH 126/478] [ANDROSDK-1730] Refactor RelationshipCallFactory to
 coroutines

---
 .../internal/EnrollmentEndpointCallFactory.kt |   3 +-
 .../enrollment/internal/EnrollmentService.kt  |   5 +-
 .../NewEnrollmentEndpointCallFactory.kt       |   5 +-
 .../OldEnrollmentEndpointCallFactory.kt       |   2 +-
 .../internal/EventEndpointCallFactory.kt      |   2 +-
 .../core/event/internal/EventService.kt       |   4 +-
 .../internal/NewEventEndpointCallFactory.kt   |   4 +-
 .../internal/OldEventEndpointCallFactory.kt   |   2 +-
 ...lationshipDownloadAndPersistCallFactory.kt | 169 +++++++-----------
 .../NewTrackedEntityEndpointCallFactory.kt    |   4 +-
 .../OldTrackedEntityEndpointCallFactory.kt    |   2 +-
 .../TrackedEntityEndpointCallFactory.kt       |   2 +-
 .../internal/TrackedEntityInstanceService.kt  |   4 +-
 .../tracker/exporter/TrackerDownloadCall.kt   |  13 +-
 .../exporter/TrackerExporterService.kt        |  12 +-
 15 files changed, 91 insertions(+), 142 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEndpointCallFactory.kt
index ce52488bbb..2cf0628095 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEndpointCallFactory.kt
@@ -27,9 +27,8 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.enrollment.Enrollment
 
 internal interface EnrollmentEndpointCallFactory {
-    fun getRelationshipEntityCall(uid: String): Single<Enrollment>
+    suspend fun getRelationshipEntityCall(uid: String): Enrollment
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt
index 31c29bc908..290924ea4e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -37,10 +36,10 @@ import retrofit2.http.Query
 
 interface EnrollmentService {
     @GET("$ENROLLMENTS/{$ENROLLMENT_UID}")
-    fun getEnrollmentSingle(
+    suspend fun getEnrollmentSingle(
         @Path(ENROLLMENT_UID) enrollmentUid: String?,
         @Query(FIELDS) @Which fields: Fields<Enrollment>
-    ): Single<Enrollment>
+    ): Enrollment
 
     companion object {
         const val ENROLLMENTS = "enrollments"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
index d8e99e162b..6f631a2247 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollmentTransformer
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
 internal class NewEnrollmentEndpointCallFactory @Inject constructor(
     private val service: TrackerExporterService
 ) : EnrollmentEndpointCallFactory {
-    override fun getRelationshipEntityCall(uid: String): Single<Enrollment> {
+    override suspend fun getRelationshipEntityCall(uid: String): Enrollment {
         return service.getEnrollmentSingle(
             uid,
             NewEnrollmentFields.asRelationshipFields
-        ).map { NewTrackerImporterEnrollmentTransformer.deTransform(it) }
+        ).let { NewTrackerImporterEnrollmentTransformer.deTransform(it) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
index 20b9a04752..8329bc748b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.enrollment.Enrollment
 internal class OldEnrollmentEndpointCallFactory @Inject constructor(
     private val service: EnrollmentService
 ) : EnrollmentEndpointCallFactory {
-    override fun getRelationshipEntityCall(uid: String): Single<Enrollment> {
+    override suspend fun getRelationshipEntityCall(uid: String): Enrollment {
         return service.getEnrollmentSingle(
             uid,
             EnrollmentFields.asRelationshipFields
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
index befb1dada5..35da3f535a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
@@ -38,7 +38,7 @@ internal abstract class EventEndpointCallFactory {
 
     abstract fun getCollectionCall(eventQuery: TrackerAPIQuery): Single<Payload<Event>>
 
-    abstract fun getRelationshipEntityCall(uid: String): Single<Payload<Event>>
+    abstract suspend fun getRelationshipEntityCall(uid: String): Payload<Event>
 
     protected fun getUidStr(query: TrackerAPIQuery): String? {
         return if (query.uids.isEmpty()) null else query.uids.joinToString(";")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index 30cb0e1155..60f3a304f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -76,11 +76,11 @@ internal interface EventService {
     ): Call<Event>
 
     @GET(EVENTS)
-    fun getEventSingle(
+    suspend fun getEventSingle(
         @Query(EVENT) eventUid: String,
         @Query(FIELDS) @Which fields: Fields<Event>,
         @Query(OU_MODE) orgUnitMode: String
-    ): Single<Payload<Event>>
+    ): Payload<Event>
 
     companion object {
         const val ORG_UNIT = "orgUnit"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
index ccd5e3c393..3c1895c536 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
@@ -60,12 +60,12 @@ internal class NewEventEndpointCallFactory @Inject constructor(
         ).map { mapPayload(it) }
     }
 
-    override fun getRelationshipEntityCall(uid: String): Single<Payload<Event>> {
+    override suspend fun getRelationshipEntityCall(uid: String): Payload<Event> {
         return service.getEventSingle(
             eventUid = uid,
             fields = NewEventFields.asRelationshipFields,
             orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name
-        ).map { mapPayload(it) }
+        ).let { mapPayload(it) }
     }
 
     private fun mapPayload(payload: NTIPayload<NewTrackerImporterEvent>): Payload<Event> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
index 85cb1b6383..0c9f4bfae6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
@@ -56,7 +56,7 @@ internal class OldEventEndpointCallFactory @Inject constructor(
         )
     }
 
-    override fun getRelationshipEntityCall(uid: String): Single<Payload<Event>> {
+    override suspend fun getRelationshipEntityCall(uid: String): Payload<Event> {
         return service.getEventSingle(
             eventUid = uid,
             fields = EventFields.asRelationshipFields,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
index 105cd5be6a..34c8c34281 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
@@ -28,10 +28,8 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentPersistenceCallFactory
 import org.hisp.dhis.android.core.event.Event
@@ -42,122 +40,80 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePe
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
 
 @Reusable
-class RelationshipDownloadAndPersistCallFactory @Inject internal constructor(
+internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
     private val relationshipStore: RelationshipStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val teiPersistenceCallFactory: TrackedEntityInstancePersistenceCallFactory,
     private val enrollmentPersistenceCallFactory: EnrollmentPersistenceCallFactory,
-    private val eventPersistenceCallFactory: EventPersistenceCallFactory
+    private val eventPersistenceCallFactory: EventPersistenceCallFactory,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) {
-    fun downloadAndPersist(relatives: RelationshipItemRelatives): Completable {
-        return Completable.defer {
-            downloadRelativeEvents(relatives).andThen(
-                downloadRelativeEnrolments(relatives).andThen(
-                    downloadRelativeTEIs(relatives)
-                )
-            )
-        }
+    suspend fun downloadAndPersist(relatives: RelationshipItemRelatives) {
+        downloadRelativeEvents(relatives)
+        downloadRelativeEnrolments(relatives)
+        downloadRelativeTEIs(relatives)
     }
 
-    private fun downloadRelativeEvents(relatives: RelationshipItemRelatives): Completable {
-        return Completable.defer {
-            val eventRelationships = relatives.relativeEventUids
-            val singles: MutableList<Single<Payload<Event>>> = mutableListOf()
-            val failedEvents: MutableList<String> = mutableListOf()
-
-            if (eventRelationships.isNotEmpty()) {
-                for (uid in eventRelationships) {
-                    val single: Single<Payload<Event>> = trackerParentCallFactory.getEventCall()
-                        .getRelationshipEntityCall(uid)
-                        .onErrorResumeNext { err: Throwable ->
-                            failedEvents.add(uid)
-                            Single.error(err)
-                        }
-                    singles.add(single)
-                }
-            }
-            Single.merge(singles)
-                .collect({ ArrayList() }) { obj: MutableList<Payload<Event>>, e: Payload<Event> ->
-                    obj.add(e)
-                }
-                .flatMapCompletable { eventPayloads: List<Payload<Event>> ->
-                    Completable.fromAction {
-                        val events = eventPayloads.flatMap { it.items() }
-                        eventPersistenceCallFactory.persistAsRelationships(events).blockingAwait()
-                        for (event in events) {
-                            if (event.enrollment() != null) {
-                                relatives.addEnrollment(event.enrollment())
-                            }
-                        }
-                        cleanFailedRelationships(failedEvents, RelationshipItemTableInfo.Columns.EVENT)
-                    }
-                }
+    private suspend fun downloadRelativeEvents(relatives: RelationshipItemRelatives) {
+        val events: MutableList<Event> = mutableListOf()
+        val failedEvents: MutableList<String> = mutableListOf()
+
+        for (uid in relatives.relativeEventUids) {
+            coroutineAPICallExecutor.wrap(storeError = true) {
+                trackerParentCallFactory.getEventCall().getRelationshipEntityCall(uid)
+            }.fold(
+                onSuccess = { eventPayload -> events.addAll(eventPayload.items()) },
+                onFailure = { failedEvents.add(uid) }
+            )
         }
+
+        eventPersistenceCallFactory.persistAsRelationships(events).blockingAwait()
+
+        events
+            .mapNotNull { it.enrollment() }
+            .forEach { relatives.addEnrollment(it) }
+
+        cleanFailedRelationships(failedEvents, RelationshipItemTableInfo.Columns.EVENT)
     }
 
-    private fun downloadRelativeEnrolments(relatives: RelationshipItemRelatives): Completable {
-        return Completable.defer {
-            val singles: MutableList<Single<Enrollment>> = mutableListOf()
-            val failedEnrollments: MutableList<String> = mutableListOf()
-            val enrollmentRelationships = relatives.relativeEnrollmentUids
-            if (enrollmentRelationships.isNotEmpty()) {
-                for (uid in enrollmentRelationships) {
-                    val single = trackerParentCallFactory.getEnrollmentCall()
-                        .getRelationshipEntityCall(uid)
-                        .onErrorResumeNext { err: Throwable ->
-                            failedEnrollments.add(uid)
-                            Single.error(err)
-                        }
-                    singles.add(single)
-                }
-            }
-            Single.merge(singles)
-                .collect({ ArrayList() }) { obj: MutableList<Enrollment>, e: Enrollment ->
-                    obj.add(e)
-                }
-                .flatMapCompletable { enrollments: List<Enrollment> ->
-                    Completable.fromAction {
-                        enrollmentPersistenceCallFactory.persistAsRelationships(enrollments).blockingAwait()
-                        for (enrollment in enrollments) {
-                            if (enrollment.trackedEntityInstance() != null) {
-                                relatives.addTrackedEntityInstance(enrollment.trackedEntityInstance())
-                            }
-                        }
-                        cleanFailedRelationships(failedEnrollments, RelationshipItemTableInfo.Columns.ENROLLMENT)
-                    }
-                }
+    private suspend fun downloadRelativeEnrolments(relatives: RelationshipItemRelatives) {
+        val enrollments: MutableList<Enrollment> = mutableListOf()
+        val failedEnrollments: MutableList<String> = mutableListOf()
+
+        for (uid in relatives.relativeEnrollmentUids) {
+            coroutineAPICallExecutor.wrap(storeError = true) {
+                trackerParentCallFactory.getEnrollmentCall().getRelationshipEntityCall(uid)
+            }.fold(
+                onSuccess = { enrollment -> enrollments.add(enrollment) },
+                onFailure = { failedEnrollments.add(uid) }
+            )
         }
+
+        enrollmentPersistenceCallFactory.persistAsRelationships(enrollments).blockingAwait()
+
+        enrollments
+            .mapNotNull { it.trackedEntityInstance() }
+            .forEach { relatives.addTrackedEntityInstance(it) }
+
+        cleanFailedRelationships(failedEnrollments, RelationshipItemTableInfo.Columns.ENROLLMENT)
     }
 
-    private fun downloadRelativeTEIs(relatives: RelationshipItemRelatives): Completable {
-        return Completable.defer {
-            val singles: MutableList<Single<Payload<TrackedEntityInstance>>> = mutableListOf()
-            val failedTeis: MutableList<String> = mutableListOf()
-            val teiRelationships = relatives.relativeTrackedEntityInstanceUids
-            if (teiRelationships.isNotEmpty()) {
-                for (uid in teiRelationships) {
-                    val single = trackerParentCallFactory.getTrackedEntityCall()
-                        .getRelationshipEntityCall(uid)
-                        .onErrorResumeNext {
-                            failedTeis.add(uid)
-                            Single.just(Payload.emptyPayload())
-                        }
-                    singles.add(single)
-                }
-            }
-            Single.merge(singles)
-                .collect(
-                    { ArrayList() }
-                ) { teis: MutableList<TrackedEntityInstance>, payload: Payload<TrackedEntityInstance> ->
-                    teis.addAll(payload.items())
-                }
-                .flatMapCompletable { teis: List<TrackedEntityInstance>? ->
-                    Completable.fromAction {
-                        teiPersistenceCallFactory.persistRelationships(teis!!).blockingAwait()
-                        cleanFailedRelationships(failedTeis, RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
-                    }
-                }
+    private suspend fun downloadRelativeTEIs(relatives: RelationshipItemRelatives) {
+        val teis: MutableList<TrackedEntityInstance> = mutableListOf()
+        val failedTeis: MutableList<String> = mutableListOf()
+
+        for (uid in relatives.relativeTrackedEntityInstanceUids) {
+            coroutineAPICallExecutor.wrap(storeError = true) {
+                trackerParentCallFactory.getTrackedEntityCall().getRelationshipEntityCall(uid)
+            }.fold(
+                onSuccess = { teiPayload -> teis.addAll(teiPayload.items()) },
+                onFailure = { failedTeis.add(uid) }
+            )
         }
+
+        teiPersistenceCallFactory.persistRelationships(teis).blockingAwait()
+
+        cleanFailedRelationships(failedTeis, RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
     }
 
     private fun cleanFailedRelationships(failedTeis: List<String>, elementType: String) {
@@ -168,13 +124,16 @@ class RelationshipDownloadAndPersistCallFactory @Inject internal constructor(
                 RelationshipItemTableInfo.Columns.EVENT -> builder.event(
                     RelationshipItemEvent.builder().event(uid).build()
                 )
+
                 RelationshipItemTableInfo.Columns.ENROLLMENT -> builder.enrollment(
                     RelationshipItemEnrollment.builder().enrollment(uid).build()
                 )
+
                 RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE -> builder.trackedEntityInstance(
                     RelationshipItemTrackedEntityInstance.builder()
                         .trackedEntityInstance(uid).build()
                 )
+
                 else -> {}
             }
             corruptedRelationships.addAll(relationshipStore.getRelationshipsByItem(builder.build()))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index fa7daddbf1..33049722c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -97,14 +97,14 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
         return NewTrackerImporterTrackedEntityTransformer.deTransform(tei)
     }
 
-    override fun getRelationshipEntityCall(uid: String): Single<Payload<TrackedEntityInstance>> {
+    override suspend fun getRelationshipEntityCall(uid: String): Payload<TrackedEntityInstance> {
         return trackedExporterService.getTrackedEntityInstance(
             trackedEntityInstance = uid,
             fields = NewTrackedEntityInstanceFields.asRelationshipFields,
             orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name,
             includeAllAttributes = true,
             includeDeleted = true
-        ).map { mapPayload(it) }
+        ).let { mapPayload(it) }
     }
 
     override fun getQueryCall(query: TrackedEntityInstanceQueryOnline): Callable<TrackerQueryResult> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
index ec0a2de175..df852555b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
@@ -78,7 +78,7 @@ internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
         )
     }
 
-    override fun getRelationshipEntityCall(uid: String): Single<Payload<TrackedEntityInstance>> {
+    override suspend fun getRelationshipEntityCall(uid: String): Payload<TrackedEntityInstance> {
         return trackedEntityInstanceService.getTrackedEntityInstance(
             fields = TrackedEntityInstanceFields.asRelationshipFields,
             trackedEntityInstance = uid,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt
index 06f92509d2..071f717aaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt
@@ -42,7 +42,7 @@ internal abstract class TrackedEntityEndpointCallFactory {
 
     abstract suspend fun getEntityCall(uid: String, query: TrackerAPIQuery): TrackedEntityInstance
 
-    abstract fun getRelationshipEntityCall(uid: String): Single<Payload<TrackedEntityInstance>>
+    abstract suspend fun getRelationshipEntityCall(uid: String): Payload<TrackedEntityInstance>
 
     abstract fun getQueryCall(query: TrackedEntityInstanceQueryOnline): Callable<TrackerQueryResult>
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
index 69d158239c..ab305b9b5c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
@@ -46,13 +46,13 @@ internal interface TrackedEntityInstanceService {
     ): Call<TEIWebResponse>
 
     @GET(TRACKED_ENTITY_INSTANCES)
-    fun getTrackedEntityInstance(
+    suspend fun getTrackedEntityInstance(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String,
         @Query(OU_MODE) orgUnitMode: String?,
         @Query(FIELDS) @Which fields: Fields<TrackedEntityInstance>,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean
-    ): Single<Payload<TrackedEntityInstance>>
+    ): Payload<TrackedEntityInstance>
 
     @GET(TRACKED_ENTITY_INSTANCES)
     fun getTrackedEntityInstanceAsCall(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index ab30b1ce24..2900a5979b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.exporter
 
-import io.reactivex.Observable
 import io.reactivex.Single
 import kotlin.math.ceil
 import kotlin.math.max
@@ -36,7 +35,6 @@ import kotlin.math.roundToInt
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.rx2.asFlow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.paging.internal.ApiPagingEngine
 import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
@@ -320,14 +318,9 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private fun downloadRelationships(
         progressManager: TrackerD2ProgressManager,
         relatives: RelationshipItemRelatives
-    ): Flow<TrackerD2Progress> {
-        return relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives).andThen(
-            Observable.fromCallable {
-                progressManager.increaseProgress(
-                    TrackedEntityInstance::class.java, false
-                )
-            }
-        ).asFlow()
+    ): Flow<TrackerD2Progress> = flow {
+        relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives)
+        emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, false))
     }
 
     @Suppress("TooGenericExceptionCaught")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
index 7d793524e8..f52b717e8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
@@ -39,13 +39,13 @@ import retrofit2.http.*
 @Suppress("LongParameterList")
 internal interface TrackerExporterService {
     @GET(TRACKED_ENTITY_INSTANCES)
-    fun getTrackedEntityInstance(
+    suspend fun getTrackedEntityInstance(
         @Query(FIELDS) @Which fields: Fields<NewTrackerImporterTrackedEntity>,
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String?,
         @Query(OU_MODE) orgUnitMode: String?,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean
-    ): Single<NTIPayload<NewTrackerImporterTrackedEntity>>
+    ): NTIPayload<NewTrackerImporterTrackedEntity>
 
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTACE}")
     suspend fun getSingleTrackedEntityInstance(
@@ -91,10 +91,10 @@ internal interface TrackerExporterService {
     ): NTIPayload<NewTrackerImporterTrackedEntity>
 
     @GET("$ENROLLMENTS/{$ENROLLMENT}")
-    fun getEnrollmentSingle(
+    suspend fun getEnrollmentSingle(
         @Path(ENROLLMENT) enrollmentUid: String,
         @Query(FIELDS) @Which fields: Fields<NewTrackerImporterEnrollment>
-    ): Single<NewTrackerImporterEnrollment>
+    ): NewTrackerImporterEnrollment
 
     @GET(EVENTS)
     fun getEvents(
@@ -128,11 +128,11 @@ internal interface TrackerExporterService {
     ): Single<NTIPayload<NewTrackerImporterEvent>>
 
     @GET(EVENTS)
-    fun getEventSingle(
+    suspend fun getEventSingle(
         @Query(FIELDS) @Which fields: Fields<NewTrackerImporterEvent>,
         @Query(EVENT) eventUid: String,
         @Query(OU_MODE) orgUnitMode: String
-    ): Single<NTIPayload<NewTrackerImporterEvent>>
+    ): NTIPayload<NewTrackerImporterEvent>
 
     companion object {
         const val TRACKED_ENTITY_INSTANCES = "tracker/trackedEntities"

From 6059ca8722a560099f6e3f364a6ce2880f66611a Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 25 Jul 2023 19:09:49 +0200
Subject: [PATCH 127/478] [ANDROSDK-1730] Style checks

---
 .../enrollment/internal/OldEnrollmentEndpointCallFactory.kt | 1 -
 .../internal/RelationshipDownloadAndPersistCallFactory.kt   | 2 +-
 .../dhis/android/core/user/internal/UserInternalModule.kt   | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
index 8329bc748b..cb22fb4ed9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
index 34c8c34281..e9e2bc1c60 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
@@ -28,8 +28,8 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentPersistenceCallFactory
 import org.hisp.dhis.android.core.event.Event
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
index 076f067dd8..5a23f23512 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
@@ -31,7 +31,7 @@ import dagger.Reusable
 import javax.inject.Inject
 
 @Reusable
-class UserInternalModule @Inject internal constructor(
-    internal val userCall: UserCall,
-    internal val logInCall: LogInCall
+internal class UserInternalModule @Inject constructor(
+    val userCall: UserCall,
+    val logInCall: LogInCall
 )

From 5d1a1168b72ffd34df00971564535eebe771fa19 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 27 Jul 2023 13:20:23 +0200
Subject: [PATCH 128/478] [ANDROSDK-1731] Refactor tracker calls to coroutines

---
 .../core/event/internal/EventCallFactory.kt   |   5 +-
 .../EventEndpointCallRealIntegrationShould.kt |  10 +-
 .../EventPostCallRealIntegrationShould.kt     |  11 +-
 .../LogoutCallRealIntegrationShould.kt        |   6 +-
 .../wipe/WipeDBCallRealIntegrationShould.kt   |   6 +-
 .../core/event/internal/EventDownloadCall.kt  |  16 ++-
 .../internal/EventEndpointCallFactory.kt      |   3 +-
 .../core/event/internal/EventService.kt       |   5 +-
 .../internal/NewEventEndpointCallFactory.kt   |   5 +-
 .../internal/OldEventEndpointCallFactory.kt   |   3 +-
 .../NewTrackedEntityEndpointCallFactory.kt    | 115 ++++++++----------
 .../OldTrackedEntityEndpointCallFactory.kt    |   6 +-
 .../TrackedEntityEndpointCallFactory.kt       |   6 +-
 .../TrackedEntityInstanceDownloadCall.kt      |  29 ++---
 .../internal/TrackedEntityInstanceService.kt  |   9 +-
 .../TrackedEntityInstanceQueryCallFactory.kt  |  35 +++---
 .../TrackedEntityInstanceQueryDataFetcher.kt  |   9 +-
 .../TrackedEntityInstanceQueryOnlineHelper.kt |   8 +-
 .../tracker/exporter/TrackerDownloadCall.kt   |  18 +--
 .../exporter/TrackerExporterService.kt        |   5 +-
 .../TrackedEntityInstanceQueryCallShould.kt   |  68 +++++++----
 ...ckedEntityInstanceQueryDataSourceShould.kt |  83 +++++--------
 22 files changed, 216 insertions(+), 245 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
index 9cc514754b..5f1ac0ddfe 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
@@ -37,12 +36,12 @@ import retrofit2.Retrofit
 
 object EventCallFactory {
     @JvmStatic
-    fun create(
+    suspend fun create(
         retrofit: Retrofit,
         orgUnit: String?,
         pageSize: Int,
         uids: Collection<String> = emptyList()
-    ): Single<Payload<Event>> {
+    ): Payload<Event> {
 
         val eventQuery = TrackerAPIQuery(
             commonParams = TrackerQueryCommonParams(
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
index 1cdb13ec2d..69eaf0a680 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.event.internal.EventCallFactory.create
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
@@ -38,11 +39,11 @@ class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     // Uncomment in order to quickly test changes vs a real server, but keep it uncommented after.
     // @Test
     @Throws(Exception::class)
-    fun download_number_of_events_according_to_default_limit() {
+    fun download_number_of_events_according_to_default_limit() = runBlocking {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
         val eventEndpointCall = create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
-        val events = eventEndpointCall.blockingGet().items()
+        val events = eventEndpointCall.items()
 
         assertThat(events.isEmpty()).isFalse()
 
@@ -54,11 +55,10 @@ class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     @Throws(Exception::class)
-    fun download_event_with_category_combo_option() {
+    fun download_event_with_category_combo_option() = runBlocking {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
-        val eventEndpointCall = create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
-        eventEndpointCall.blockingGet()
+        create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
 
         assertThat(verifyAtLeastOneEventWithOptionCombo()).isTrue()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 66ecf1b293..63b5abd264 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import java.util.*
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.helpers.UidGenerator
@@ -94,7 +95,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     // commented out since it is a flaky test that works against a real server.
     // @Test
     @Throws(Exception::class)
-    fun pull_event_with_correct_category_combo_after_be_pushed() {
+    fun pull_event_with_correct_category_combo_after_be_pushed() = runBlocking {
         downloadMetadata()
         createDummyDataToPost(eventUid1)
         pushDummyEvent()
@@ -118,7 +119,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     // commented out since it is a flaky test that works against a real server.
     // @Test
     @Throws(Exception::class)
-    fun pull_two_events_with_correct_category_combo_after_be_pushed() {
+    fun pull_two_events_with_correct_category_combo_after_be_pushed() = runBlocking {
         downloadMetadata()
         createDummyDataToPost(eventUid1)
         createDummyDataToPost(eventUid2)
@@ -156,11 +157,11 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     @Throws(Exception::class)
-    private fun downloadEvents() {
-        val eventEndpointCall = EventCallFactory.create(
+    private suspend fun downloadEvents() {
+        val eventPayload = EventCallFactory.create(
             d2.retrofit(), orgUnitUid, 50, emptyList()
         )
-        val events = eventEndpointCall.blockingGet().items()
+        val events = eventPayload.items()
         for (event in events) {
             eventStore.insert(event)
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
index 557757f949..33c947fe12 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.db.access.SqliteCheckerUtility
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
@@ -46,12 +47,11 @@ class LogoutCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     // @Test
-    fun delete_credentials_when_log_out_after_sync_data() {
+    fun delete_credentials_when_log_out_after_sync_data() = runBlocking {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
 
-        val eventCall = create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
-        eventCall.blockingGet()
+        create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
         assertThat(SqliteCheckerUtility.isDatabaseEmpty(d2.databaseAdapter())).isFalse()
 
         d2.userModule().logOut().blockingAwait()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
index a7466a4d4c..60bd371235 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.wipe
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.data.database.DatabaseAssert.Companion.assertThatDatabase
 import org.hisp.dhis.android.core.event.internal.EventCallFactory.create
@@ -45,12 +46,11 @@ class WipeDBCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     @Throws(Exception::class)
-    fun have_empty_database_when_wipe_db_after_sync_data() {
+    fun have_empty_database_when_wipe_db_after_sync_data() = runBlocking {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
 
-        val eventCall = create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
-        eventCall.blockingGet()
+        create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
 
         assertThatDatabase(d2.databaseAdapter()).isNotEmpty
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 40bbe88008..8af26090c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -28,12 +28,11 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
@@ -50,8 +49,7 @@ internal class EventDownloadCall @Inject internal constructor(
     userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
-    coroutineAPICallExecutor: CoroutineAPICallExecutor,
-    private val rxCallExecutor: RxAPICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val eventQueryBundleFactory: EventQueryBundleFactory,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val persistenceCallFactory: EventPersistenceCallFactory,
@@ -67,10 +65,10 @@ internal class EventDownloadCall @Inject internal constructor(
         return eventQueryBundleFactory.getQueries(params)
     }
 
-    override fun getItemsAsSingle(query: TrackerAPIQuery): Single<Payload<Event>> {
-        return rxCallExecutor.wrapSingle(
-            trackerParentCallFactory.getEventCall().getCollectionCall(query), true
-        )
+    override suspend fun getPayloadResult(query: TrackerAPIQuery): Result<Payload<Event>, D2Error> {
+        return coroutineAPICallExecutor.wrap(storeError = true) {
+            trackerParentCallFactory.getEventCall().getCollectionCall(query)
+        }
     }
 
     override fun persistItems(
@@ -85,7 +83,7 @@ internal class EventDownloadCall @Inject internal constructor(
         lastUpdatedManager.update(bundle)
     }
 
-    override fun queryByUids(
+    override suspend fun queryByUids(
         bundle: EventQueryBundle,
         overwrite: Boolean,
         relatives: RelationshipItemRelatives
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
index 35da3f535a..a27ebbef70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
@@ -36,7 +35,7 @@ import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 @Reusable
 internal abstract class EventEndpointCallFactory {
 
-    abstract fun getCollectionCall(eventQuery: TrackerAPIQuery): Single<Payload<Event>>
+    abstract suspend fun getCollectionCall(eventQuery: TrackerAPIQuery): Payload<Event>
 
     abstract suspend fun getRelationshipEntityCall(uid: String): Payload<Event>
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index 60f3a304f1..9816fa888c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -43,7 +42,7 @@ internal interface EventService {
 
     @SuppressWarnings("LongParameterList")
     @GET(EVENTS)
-    fun getEvents(
+    suspend fun getEvents(
         @Query(FIELDS) @Which fields: Fields<Event>,
         @Query(ORG_UNIT) orgUnit: String? = null,
         @Query(OU_MODE) orgUnitMode: String? = null,
@@ -66,7 +65,7 @@ internal interface EventService {
         @Query(LAST_UPDATED_END_DATE) lastUpdatedEndDate: String? = null,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean,
         @Query(EVENT) eventUid: String? = null,
-    ): Single<Payload<Event>>
+    ): Payload<Event>
 
     @GET("$EVENTS/{$EVENT_UID}")
     fun getEvent(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
index 3c1895c536..e573ca623a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -44,7 +43,7 @@ internal class NewEventEndpointCallFactory @Inject constructor(
     private val service: TrackerExporterService
 ) : EventEndpointCallFactory() {
 
-    override fun getCollectionCall(eventQuery: TrackerAPIQuery): Single<Payload<Event>> {
+    override suspend fun getCollectionCall(eventQuery: TrackerAPIQuery): Payload<Event> {
         return service.getEvents(
             fields = NewEventFields.allFields,
             orgUnit = eventQuery.orgUnit,
@@ -57,7 +56,7 @@ internal class NewEventEndpointCallFactory @Inject constructor(
             updatedAfter = eventQuery.lastUpdatedStr,
             includeDeleted = true,
             eventUid = getUidStr(eventQuery)
-        ).map { mapPayload(it) }
+        ).let { mapPayload(it) }
     }
 
     override suspend fun getRelationshipEntityCall(uid: String): Payload<Event> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
index 0c9f4bfae6..3a52aef5c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
@@ -40,7 +39,7 @@ internal class OldEventEndpointCallFactory @Inject constructor(
     private val service: EventService
 ) : EventEndpointCallFactory() {
 
-    override fun getCollectionCall(eventQuery: TrackerAPIQuery): Single<Payload<Event>> {
+    override suspend fun getCollectionCall(eventQuery: TrackerAPIQuery): Payload<Event> {
         return service.getEvents(
             fields = EventFields.allFields,
             orgUnit = eventQuery.orgUnit,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index 33049722c2..01304e1015 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -28,13 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import java.util.concurrent.Callable
 import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.wrapRxSingle
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.NewTrackerImporterEvent
@@ -55,35 +50,30 @@ import org.hisp.dhis.android.core.util.simpleDateFormat
 @Reusable
 internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
     private val trackedExporterService: TrackerExporterService,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
-    private val rxAPICallExecutor: RxAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) : TrackedEntityEndpointCallFactory() {
 
-    override fun getCollectionCall(query: TrackerAPIQuery): Single<Payload<TrackedEntityInstance>> {
-        return wrapRxSingle {
-            val payload = trackedExporterService.getTrackedEntityInstances(
-                fields = NewTrackedEntityInstanceFields.allFields,
-                trackedEntityInstances = getUidStr(query),
-                orgUnits = query.orgUnit,
-                orgUnitMode = query.commonParams.ouMode.name,
-                program = query.commonParams.program,
-                programStatus = getProgramStatus(query),
-                programStartDate = getProgramStartDate(query),
-                order = TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER.toAPIString(),
-                paging = true,
-                page = query.page,
-                pageSize = query.pageSize,
-                lastUpdatedStartDate = query.lastUpdatedStr,
-                includeAllAttributes = true,
-                includeDeleted = true
-            )
-
-            mapPayload(payload)
-        }
+    override suspend fun getCollectionCall(query: TrackerAPIQuery): Payload<TrackedEntityInstance> {
+        return trackedExporterService.getTrackedEntityInstances(
+            fields = NewTrackedEntityInstanceFields.allFields,
+            trackedEntityInstances = getUidStr(query),
+            orgUnits = query.orgUnit,
+            orgUnitMode = query.commonParams.ouMode.name,
+            program = query.commonParams.program,
+            programStatus = getProgramStatus(query),
+            programStartDate = getProgramStartDate(query),
+            order = TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER.toAPIString(),
+            paging = true,
+            page = query.page,
+            pageSize = query.pageSize,
+            lastUpdatedStartDate = query.lastUpdatedStr,
+            includeAllAttributes = true,
+            includeDeleted = true
+        ).let { mapPayload(it) }
     }
 
     override suspend fun getEntityCall(uid: String, query: TrackerAPIQuery): TrackedEntityInstance {
-        val tei = trackedExporterService.getSingleTrackedEntityInstance(
+        return trackedExporterService.getSingleTrackedEntityInstance(
             fields = NewTrackedEntityInstanceFields.allFields,
             trackedEntityInstanceUid = uid,
             orgUnitMode = query.commonParams.ouMode.name,
@@ -92,9 +82,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
             programStartDate = getProgramStartDate(query),
             includeAllAttributes = true,
             includeDeleted = true
-        )
-
-        return NewTrackerImporterTrackedEntityTransformer.deTransform(tei)
+        ).let { NewTrackerImporterTrackedEntityTransformer.deTransform(it) }
     }
 
     override suspend fun getRelationshipEntityCall(uid: String): Payload<TrackedEntityInstance> {
@@ -107,39 +95,35 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
         ).let { mapPayload(it) }
     }
 
-    override fun getQueryCall(query: TrackedEntityInstanceQueryOnline): Callable<TrackerQueryResult> {
-        return Callable {
-            runBlocking {
-                val shouldCallEventsFirst = query.dataValueFilter.isNotEmpty() ||
-                    query.dueStartDate != null || query.dueEndDate != null
-
-                if (shouldCallEventsFirst) {
-                    val events = getEventQuery(query)
-                    if (events.isEmpty()) {
-                        TrackerQueryResult(
-                            trackedEntities = emptyList(),
-                            exhausted = true
-                        )
-                    } else {
-                        val teiQuery = getPostEventTeiQuery(query, events)
-                        val instances = getTrackedEntityQuery(teiQuery)
-                        TrackerQueryResult(
-                            trackedEntities = instances,
-                            exhausted = events.size < query.pageSize
-                        )
-                    }
-                } else {
-                    val instances = getTrackedEntityQuery(query)
-                    TrackerQueryResult(
-                        trackedEntities = instances,
-                        exhausted = instances.size < query.pageSize
-                    )
-                }
+    override suspend fun getQueryCall(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
+        val shouldCallEventsFirst = query.dataValueFilter.isNotEmpty() ||
+            query.dueStartDate != null || query.dueEndDate != null
+
+        return if (shouldCallEventsFirst) {
+            val events = getEventQuery(query)
+            if (events.isEmpty()) {
+                TrackerQueryResult(
+                    trackedEntities = emptyList(),
+                    exhausted = true
+                )
+            } else {
+                val teiQuery = getPostEventTeiQuery(query, events)
+                val instances = getTrackedEntityQuery(teiQuery)
+                TrackerQueryResult(
+                    trackedEntities = instances,
+                    exhausted = events.size < query.pageSize
+                )
             }
+        } else {
+            val instances = getTrackedEntityQuery(query)
+            TrackerQueryResult(
+                trackedEntities = instances,
+                exhausted = instances.size < query.pageSize
+            )
         }
     }
 
-    private fun getEventQuery(query: TrackedEntityInstanceQueryOnline): List<NewTrackerImporterEvent> {
+    private suspend fun getEventQuery(query: TrackedEntityInstanceQueryOnline): List<NewTrackerImporterEvent> {
         return if (query.orgUnits.size <= 1) {
             getEventQueryForOrgunit(query, query.orgUnits.firstOrNull())
         } else {
@@ -149,11 +133,11 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
         }
     }
 
-    private fun getEventQueryForOrgunit(
+    private suspend fun getEventQueryForOrgunit(
         query: TrackedEntityInstanceQueryOnline,
         orgunit: String?
     ): List<NewTrackerImporterEvent> {
-        return rxAPICallExecutor.wrapSingle(
+        return coroutineAPICallExecutor.wrap(storeError = false) {
             trackedExporterService.getEvents(
                 fields = NewEventFields.teiQueryFields,
                 orgUnit = orgunit,
@@ -181,9 +165,8 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
                 updatedAfter = query.lastUpdatedStartDate.simpleDateFormat(),
                 updatedBefore = query.lastUpdatedEndDate.simpleDateFormat(),
                 includeDeleted = query.includeDeleted
-            ),
-            storeError = false
-        ).blockingGet().instances
+            )
+        }.getOrThrow().instances
     }
 
     private suspend fun getTrackedEntityQuery(query: TrackedEntityInstanceQueryOnline): List<TrackedEntityInstance> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
index df852555b8..afffc9c341 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import java.util.concurrent.Callable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
@@ -46,7 +44,7 @@ internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
     private val queryCallFactory: TrackedEntityInstanceQueryCallFactory
 ) : TrackedEntityEndpointCallFactory() {
 
-    override fun getCollectionCall(query: TrackerAPIQuery): Single<Payload<TrackedEntityInstance>> {
+    override suspend fun getCollectionCall(query: TrackerAPIQuery): Payload<TrackedEntityInstance> {
         return trackedEntityInstanceService.getTrackedEntityInstances(
             fields = TrackedEntityInstanceFields.allFields,
             trackedEntityInstances = getUidStr(query),
@@ -88,7 +86,7 @@ internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
         )
     }
 
-    override fun getQueryCall(query: TrackedEntityInstanceQueryOnline): Callable<TrackerQueryResult> {
+    override suspend fun getQueryCall(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
         return queryCallFactory.getCall(query)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt
index 071f717aaf..96b323f0ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEndpointCallFactory.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import io.reactivex.Single
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -38,13 +36,13 @@ import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 
 internal abstract class TrackedEntityEndpointCallFactory {
 
-    abstract fun getCollectionCall(query: TrackerAPIQuery): Single<Payload<TrackedEntityInstance>>
+    abstract suspend fun getCollectionCall(query: TrackerAPIQuery): Payload<TrackedEntityInstance>
 
     abstract suspend fun getEntityCall(uid: String, query: TrackerAPIQuery): TrackedEntityInstance
 
     abstract suspend fun getRelationshipEntityCall(uid: String): Payload<TrackedEntityInstance>
 
-    abstract fun getQueryCall(query: TrackedEntityInstanceQueryOnline): Callable<TrackerQueryResult>
+    abstract suspend fun getQueryCall(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult
 
     protected fun getUidStr(query: TrackerAPIQuery): String? {
         return if (query.uids.isEmpty()) null else CollectionsHelper.joinCollectionWithSeparator(query.uids, ";")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index aed2b335de..7e40cf08be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -28,13 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDownloadAndPersistCallFactory
@@ -50,7 +48,6 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
-    private val rxCallExecutor: RxAPICallExecutor,
     private val coroutineCallExecutor: CoroutineAPICallExecutor,
     private val queryFactory: TrackerQueryBundleFactory,
     private val trackerCallFactory: TrackerParentCallFactory,
@@ -66,10 +63,10 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
         return queryFactory.getQueries(params)
     }
 
-    override fun getItemsAsSingle(query: TrackerAPIQuery): Single<Payload<TrackedEntityInstance>> {
-        return rxCallExecutor.wrapSingle(
-            trackerCallFactory.getTrackedEntityCall().getCollectionCall(query), true
-        )
+    override suspend fun getPayloadResult(query: TrackerAPIQuery): Result<Payload<TrackedEntityInstance>, D2Error> {
+        return coroutineCallExecutor.wrap(storeError = true) {
+            trackerCallFactory.getTrackedEntityCall().getCollectionCall(query)
+        }
     }
 
     override fun persistItems(
@@ -84,7 +81,7 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
         lastUpdatedManager.update(bundle)
     }
 
-    override fun queryByUids(
+    override suspend fun queryByUids(
         bundle: TrackerQueryBundle,
         overwrite: Boolean,
         relatives: RelationshipItemRelatives
@@ -100,7 +97,7 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
             try {
                 val useEntityEndpoint = teiQuery.commonParams.program != null
 
-                val tei = querySingleTei(uid, useEntityEndpoint, teiQuery)
+                val tei = querySingleTei(uid, useEntityEndpoint, teiQuery).getOrThrow()
 
                 if (tei != null) {
                     val persistParams = IdentifiableDataHandlerParams(
@@ -124,25 +121,23 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
         return result
     }
 
-    private fun querySingleTei(
+    private suspend fun querySingleTei(
         uid: String,
         useEntityEndpoint: Boolean,
         query: TrackerAPIQuery
-    ): TrackedEntityInstance? {
+    ): Result<TrackedEntityInstance?, D2Error> {
         return if (useEntityEndpoint) {
-            runBlocking {
                 coroutineCallExecutor.wrap(
                     storeError = true,
                     errorCatcher = TrackedEntityInstanceCallErrorCatcher()
                 ) {
                     trackerCallFactory.getTrackedEntityCall().getEntityCall(uid, query)
                 }
-            }.getOrThrow()
         } else {
             val collectionQuery = query.copy(uids = listOf(uid))
-            rxCallExecutor.wrapSingle(
-                trackerCallFactory.getTrackedEntityCall().getCollectionCall(collectionQuery), true
-            ).blockingGet().items().firstOrNull()
+            coroutineCallExecutor.wrap(storeError = true) {
+                trackerCallFactory.getTrackedEntityCall().getCollectionCall(collectionQuery)
+            }.map { it.items().firstOrNull() }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
index ab305b9b5c..d3232ae84f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -75,7 +74,7 @@ internal interface TrackedEntityInstanceService {
     ): TrackedEntityInstance
 
     @GET(TRACKED_ENTITY_INSTANCES)
-    fun getTrackedEntityInstances(
+    suspend fun getTrackedEntityInstances(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstances: String?,
         @Query(OU) orgUnits: String?,
         @Query(OU_MODE) orgUnitMode: String?,
@@ -90,10 +89,10 @@ internal interface TrackedEntityInstanceService {
         @Query(LAST_UPDATED_START_DATE) lastUpdatedStartDate: String?,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean
-    ): Single<Payload<TrackedEntityInstance>>
+    ): Payload<TrackedEntityInstance>
 
     @GET("$TRACKED_ENTITY_INSTANCES/query")
-    fun query(
+    suspend fun query(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String?,
         @Query(OU) orgUnit: String?,
         @Query(OU_MODE) orgUnitMode: String?,
@@ -118,7 +117,7 @@ internal interface TrackedEntityInstanceService {
         @Query(PAGING) paging: Boolean,
         @Query(PAGE) page: Int,
         @Query(PAGE_SIZE) pageSize: Int
-    ): Call<SearchGrid>
+    ): SearchGrid
 
     companion object {
         const val TRACKED_ENTITY_INSTANCES = "trackedEntityInstances"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index 5dc5bc7d95..57d6408e28 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -29,10 +29,9 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import dagger.Reusable
 import java.text.ParseException
-import java.util.concurrent.Callable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventInternalAccessor
 import org.hisp.dhis.android.core.event.EventStatus
@@ -54,14 +53,14 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     private val eventService: EventService,
     private val mapper: SearchGridMapper,
     private val apiCallExecutor: APICallExecutor,
-    private val rxAPICallExecutor: RxAPICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dhisVersionManager: DHISVersionManager
 ) {
-    fun getCall(query: TrackedEntityInstanceQueryOnline): Callable<TrackerQueryResult> {
-        return Callable { queryTrackedEntityInstances(query) }
+    suspend fun getCall(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
+        return queryTrackedEntityInstances(query)
     }
 
-    private fun queryTrackedEntityInstances(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
+    private suspend fun queryTrackedEntityInstances(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
         val shouldCallEventsFirst = query.dataValueFilter.isNotEmpty() ||
             query.dueStartDate != null || query.dueEndDate != null
 
@@ -89,7 +88,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
         }
     }
 
-    private fun getEventQuery(query: TrackedEntityInstanceQueryOnline): List<Event> {
+    private suspend fun getEventQuery(query: TrackedEntityInstanceQueryOnline): List<Event> {
         return if (query.orgUnits.size <= 1) {
             getEventQueryForOrgunit(query, query.orgUnits.firstOrNull())
         } else {
@@ -99,8 +98,8 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
         }
     }
 
-    private fun getEventQueryForOrgunit(query: TrackedEntityInstanceQueryOnline, orgunit: String?): List<Event> {
-        return rxAPICallExecutor.wrapSingle(
+    private suspend fun getEventQueryForOrgunit(query: TrackedEntityInstanceQueryOnline, orgunit: String?): List<Event> {
+        return coroutineAPICallExecutor.wrap(storeError = false) {
             eventService.getEvents(
                 fields = EventFields.teiQueryFields,
                 orgUnit = orgunit,
@@ -123,12 +122,11 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
                 lastUpdatedStartDate = query.lastUpdatedStartDate.simpleDateFormat(),
                 lastUpdatedEndDate = query.lastUpdatedEndDate.simpleDateFormat(),
                 includeDeleted = query.includeDeleted
-            ),
-            storeError = false
-        ).blockingGet().items()
+            )
+        }.getOrThrow().items()
     }
 
-    private fun getTrackedEntityQuery(query: TrackedEntityInstanceQueryOnline): List<TrackedEntityInstance> {
+    private suspend fun getTrackedEntityQuery(query: TrackedEntityInstanceQueryOnline): List<TrackedEntityInstance> {
         val uidsStr = query.uids?.joinToString(";")
 
         val searchGridCall = trackedEntityService.query(
@@ -159,11 +157,12 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
         )
 
         return try {
-            val searchGrid = apiCallExecutor.executeObjectCallWithErrorCatcher(
-                searchGridCall,
-                TrackedEntityInstanceQueryErrorCatcher()
-            )
-            mapper.transform(searchGrid)
+            coroutineAPICallExecutor.wrap(
+                storeError = false,
+                errorCatcher = TrackedEntityInstanceQueryErrorCatcher()
+            ) {
+                searchGridCall
+            }.getOrThrow().let { mapper.transform(it) }
         } catch (pe: ParseException) {
             throw D2Error.builder()
                 .errorCode(D2ErrorCode.SEARCH_GRID_PARSE)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 539ecabf21..ce4e95851e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
+import kotlinx.coroutines.runBlocking
 import kotlin.collections.HashSet
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -145,6 +146,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
                 when (it) {
                     is Result.Success ->
                         !returnedUidsOffline.contains(it.value.uid()) && !returnedUidsOnline.contains(it.value.uid())
+
                     is Result.Failure ->
                         !returnedErrorCodes.contains(it.failure.errorCode())
                 }
@@ -165,9 +167,10 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         return try {
             val cachedInstances = if (scope.allowOnlineCache()) onlineCache[onlineQuery] else null
 
-            cachedInstances ?: trackerParentCallFactory.getTrackedEntityCall()
-                .getQueryCall(onlineQuery)
-                .call()
+            cachedInstances ?: runBlocking {
+                trackerParentCallFactory.getTrackedEntityCall()
+                    .getQueryCall(onlineQuery)
+            }
                 .let { result ->
                     TrackedEntityInstanceOnlineResult(
                         items = result.trackedEntities.map { Result.Success(it) },
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index 9646a491c5..d0a65d16a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
+import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
@@ -78,9 +79,10 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
     ): List<TrackedEntityInstance> {
         return fromScope(scope).foldRight(emptyList()) { queryOnline, acc ->
             val noPagingQuery = queryOnline.copy(paging = false)
-            val pageInstances = trackerParentCallFactory.getTrackedEntityCall()
-                .getQueryCall(noPagingQuery)
-                .call()
+            val pageInstances = runBlocking {
+                trackerParentCallFactory.getTrackedEntityCall()
+                    .getQueryCall(noPagingQuery)
+            }
 
             val validInstances = pageInstances.trackedEntities.filter { tei ->
                 val isExcluded = scope.excludedUids()?.contains(tei.uid()) ?: false
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 2900a5979b..9fcdc0271d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.exporter
 
-import io.reactivex.Single
 import kotlin.math.ceil
 import kotlin.math.max
 import kotlin.math.min
@@ -41,6 +40,7 @@ import org.hisp.dhis.android.core.arch.api.paging.internal.Paging
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.D2ProgressSyncStatus
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDownloadAndPersistCallFactory
@@ -136,7 +136,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     }
 
     @Suppress("LongParameterList")
-    private fun iterateBundle(
+    private suspend fun iterateBundle(
         bundle: Q,
         params: ProgramDataDownloadParams,
         bundleResult: BundleResult,
@@ -171,7 +171,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     }
 
     @Suppress("LongParameterList", "NestedBlockDepth")
-    private fun iterateBundleOrgunit(
+    private suspend fun iterateBundleOrgunit(
         orgUnitUid: String,
         bundle: Q,
         params: ProgramDataDownloadParams,
@@ -244,7 +244,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         }
     }
 
-    private fun getItemsForOrgUnitProgramCombination(
+    private suspend fun getItemsForOrgUnitProgramCombination(
         trackerQueryBuilder: TrackerAPIQuery,
         combinationLimit: Int,
         downloadedCount: Int,
@@ -260,7 +260,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     }
 
     @Throws(D2Error::class)
-    private fun getItemsWithPaging(
+    private suspend fun getItemsWithPaging(
         query: TrackerAPIQuery,
         combinationLimit: Int,
         downloadedCount: Int,
@@ -324,9 +324,9 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     }
 
     @Suppress("TooGenericExceptionCaught")
-    protected fun getItems(query: TrackerAPIQuery): List<T> {
+    protected suspend fun getItems(query: TrackerAPIQuery): List<T> {
         return try {
-            getItemsAsSingle(query).blockingGet().items()
+            getPayloadResult(query).getOrThrow().items()
         } catch (e: RuntimeException) {
             if (e.cause is D2Error) {
                 throw e.cause as D2Error
@@ -362,7 +362,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
 
     protected abstract fun getBundles(params: ProgramDataDownloadParams): List<Q>
 
-    protected abstract fun getItemsAsSingle(query: TrackerAPIQuery): Single<Payload<T>>
+    protected abstract suspend fun getPayloadResult(query: TrackerAPIQuery): Result<Payload<T>, D2Error>
 
     protected abstract fun persistItems(
         items: List<T>,
@@ -372,7 +372,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
 
     protected abstract fun updateLastUpdated(bundle: Q)
 
-    protected abstract fun queryByUids(
+    protected abstract suspend fun queryByUids(
         bundle: Q,
         overwrite: Boolean,
         relatives: RelationshipItemRelatives
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
index f52b717e8c..572c0d54fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.exporter
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
@@ -97,7 +96,7 @@ internal interface TrackerExporterService {
     ): NewTrackerImporterEnrollment
 
     @GET(EVENTS)
-    fun getEvents(
+    suspend fun getEvents(
         @Query(FIELDS) @Which fields: Fields<NewTrackerImporterEvent>,
         @Query(OU) orgUnit: String?,
         @Query(OU_MODE) orgUnitMode: String?,
@@ -125,7 +124,7 @@ internal interface TrackerExporterService {
         @Query(UPDATED_BEFORE) updatedBefore: String? = null,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean,
         @Query(EVENT) eventUid: String? = null
-    ): Single<NTIPayload<NewTrackerImporterEvent>>
+    ): NTIPayload<NewTrackerImporterEvent>
 
     @GET(EVENTS)
     suspend fun getEventSingle(
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index eae05814a2..5519881886 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -30,9 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.search
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
 import java.text.ParseException
 import java.util.*
-import java.util.concurrent.Callable
 import javax.net.ssl.HttpsURLConnection
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
@@ -82,7 +82,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     private lateinit var query: TrackedEntityInstanceQueryOnline
 
     // object to test
-    private lateinit var call: Callable<TrackerQueryResult>
+    private lateinit var callFactory: TrackedEntityInstanceQueryCallFactory
 
     @Before
     override fun setUp() {
@@ -125,25 +125,25 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(true)
 
         // Metadata call
-        call = getFactory().getCall(query)
+        callFactory = getFactory()
     }
 
     @Test
-    fun succeed_when_endpoint_calls_succeed() {
-        val teisResponse = call.call()
+    fun succeed_when_endpoint_calls_succeed() = runBlocking {
+        val teisResponse = callFactory.getCall(query)
         assertThat(teisResponse.trackedEntities).isEqualTo(teis)
     }
 
     @Test
     fun call_mapper_with_search_grid() {
-        call.call()
+        callFactory.getCall(query)
         verify(mapper).transform(searchGrid)
         verifyNoMoreInteractions(mapper)
     }
 
     @Test
     fun call_service_with_query_parameters() {
-        call.call()
+        callFactory.getCall(query)
         verifyService(query)
         verifyNoMoreInteractions(trackedEntityService)
     }
@@ -154,7 +154,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         whenever(d2Error.errorCode()).doReturn(D2ErrorCode.MAX_TEI_COUNT_REACHED)
 
         try {
-            call.call()
+            callFactory.getCall(query)
             fail("D2Error was expected but was not thrown")
         } catch (d2e: D2Error) {
             assertThat(d2e.errorCode() == D2ErrorCode.MAX_TEI_COUNT_REACHED).isTrue()
@@ -168,7 +168,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         whenever(d2Error.httpErrorCode()).doReturn(HttpsURLConnection.HTTP_REQ_TOO_LONG)
 
         try {
-            call.call()
+            callFactory.getCall(query)
             fail("D2Error was expected but was not thrown")
         } catch (d2e: D2Error) {
             assertThat(d2e.errorCode() == D2ErrorCode.TOO_MANY_ORG_UNITS).isTrue()
@@ -178,16 +178,15 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     @Test(expected = D2Error::class)
     fun throw_D2CallException_when_mapper_throws_exception() {
         whenever(mapper.transform(searchGrid)).thenThrow(ParseException::class.java)
-        call.call()
+        callFactory.getCall(query)
     }
 
     @Test
     fun should_not_map_active_event_status_if_greater_than_2_33() {
         whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(true)
         val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
-        val activeCall = getFactory().getCall(activeQuery)
 
-        activeCall.call()
+        callFactory.getCall(activeQuery)
 
         verifyService(activeQuery, EventStatus.ACTIVE)
     }
@@ -197,16 +196,12 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(false)
 
         val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
-        val activeCall = getFactory().getCall(activeQuery)
-
-        activeCall.call()
+        callFactory.getCall(activeQuery)
 
         verifyService(activeQuery, EventStatus.VISITED)
 
         val nonActiveQuery = query.copy(eventStatus = EventStatus.SCHEDULE)
-        val nonActiveCall = getFactory().getCall(nonActiveQuery)
-
-        nonActiveCall.call()
+        callFactory.getCall(nonActiveQuery)
 
         verifyService(activeQuery, EventStatus.SCHEDULE)
     }
@@ -228,9 +223,8 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
                     .build()
             )
         )
-        val call = getFactory().getCall(query)
 
-        call.call()
+        callFactory.getCall(query)
 
         val expectedTeiQuery = TrackedEntityInstanceQueryCallFactory.getPostEventTeiQuery(query, events)
 
@@ -252,9 +246,8 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             ),
             orgUnits = listOf("orgunit1", "orgunit2")
         )
-        val call = getFactory().getCall(query)
 
-        call.call()
+        callFactory.getCall(query)
 
         verifyEventService(query)
     }
@@ -306,7 +299,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             }
         }
     }
-    private fun verifyEventServiceForOrgunit(query: TrackedEntityInstanceQueryOnline, orgunit: String?) {
+    private fun verifyEventServiceForOrgunit(query: TrackedEntityInstanceQueryOnline, orgunit: String?) = runBlocking {
         verify(eventService).getEvents(
             eq(EventFields.teiQueryFields),
             eq(orgunit),
@@ -364,7 +357,34 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         )
     }
 
-    private fun whenEventServiceQuery(): OngoingStubbing<Single<Payload<Event>>> {
+    private fun whenEventServiceQuery(): OngoingStubbing<Single<Payload<Event>>> = runBlocking {
+        eventService.stub {
+            onBlocking {
+                .getEvents(
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+                anyOrNull(),
+            )
+        }
         return whenever(
             eventService.getEvents(
                 anyOrNull(),
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index ef278937f7..d8b9a37b11 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.trackedentity.search
 import androidx.paging.ItemKeyedDataSource
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
+import kotlinx.coroutines.runBlocking
 import java.util.*
 import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
@@ -103,41 +104,28 @@ class TrackedEntityInstanceQueryDataSourceShould {
 
         whenever(trackerParentCallFactory.getTrackedEntityCall()).doReturn(onlineCallFactory)
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(onlineObjects1, true) }
-        )
+        onlineCallFactory.stub {
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(onlineObjects1, true))
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(2, initialLoad, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(emptyList(), true) }
-        )
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(2, initialLoad, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(emptyList(), true))
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(4, 10, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(emptyList(), true) }
-        )
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(4, 10, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(emptyList(), true))
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.CURRENT)))
-        ).doReturn(
-            Callable { TrackerQueryResult(onlineObjects2, true) }
-        )
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.CURRENT))) }
+                .doReturn(TrackerQueryResult(onlineObjects2, true))
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(4, 10, AssignedUserMode.CURRENT)))
-        ).doReturn(
-            Callable { TrackerQueryResult(emptyList(), true) }
-        )
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(4, 10, AssignedUserMode.CURRENT))) }
+                .doReturn(TrackerQueryResult(emptyList(), true))
+        }
 
         whenever(childrenAppenders[anyString()]).doReturn(identityAppender())
     }
 
     @Test
-    fun get_initial_online_page() {
+    fun get_initial_online_page() = runBlocking {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -170,7 +158,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun query_online_when_offline_exhausted() {
+    fun query_online_when_offline_exhausted() = runBlocking {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -188,23 +176,20 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun query_online_again_if_not_exhausted_and_use_right_paging() {
+    fun query_online_again_if_not_exhausted_and_use_right_paging() = runBlocking {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
             onlineCache, onlineHelper, localQueryHelper
         )
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(1, 4, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(onlineObjects1, false) }
-        )
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(3, 2, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(emptyList(), true) }
-        )
+        onlineCallFactory.stub {
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(1, 4, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(onlineObjects1, false))
+
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(3, 2, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(emptyList(), true))
+        }
 
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, 4, false),
@@ -221,7 +206,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun get_initial_online_page_from_cache() {
+    fun get_initial_online_page_from_cache() = runBlocking {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).allowOnlineCache(true).build()
         val dataSource1 = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -245,7 +230,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun get_multiple_event_filter_queries() {
+    fun get_multiple_event_filter_queries() = runBlocking {
         val scope = multipleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -271,24 +256,20 @@ class TrackedEntityInstanceQueryDataSourceShould {
      values already returned offline (duplicates), so it is needed to do a second query.
      */
     @Test
-    fun get_second_online_page_if_needed_in_initial_load() {
+    fun get_second_online_page_if_needed_in_initial_load() = runBlocking {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
             onlineCache, onlineHelper, localQueryHelper
         )
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(1, 5, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(onlineObjects1, false) }
-        )
+        onlineCallFactory.stub {
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(1, 5, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(onlineObjects1, false))
 
-        whenever(
-            onlineCallFactory.getQueryCall(argThat(QueryPageUserModeMatcher(2, 5, AssignedUserMode.ANY)))
-        ).doReturn(
-            Callable { TrackerQueryResult(emptyList(), true) }
-        )
+            onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(2, 5, AssignedUserMode.ANY))) }
+                .doReturn(TrackerQueryResult(emptyList(), true))
+        }
 
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, 5, false),

From 4d1c5bcb00581e956599671c299d50fdd530e039 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 28 Jul 2023 11:18:42 +0200
Subject: [PATCH 129/478] [ANDROSDK-1731] Adapt unit tests

---
 core/build.gradle.kts                         |   1 +
 .../EventPostCallRealIntegrationShould.kt     |   2 +-
 .../TrackedEntityInstanceDownloadCall.kt      |  12 +-
 .../TrackedEntityInstanceQueryCallFactory.kt  |   7 +-
 .../TrackedEntityInstanceQueryDataFetcher.kt  |   2 +-
 .../TrackedEntityInstanceQueryOnlineHelper.kt |   2 +-
 .../CoroutineAPICallExecutorShould.kt         |   8 +-
 .../domain/metadata/MetadataCallShould.kt     |   2 +-
 .../event/internal/EventEndpointCallShould.kt |  36 ++--
 .../internal/SystemInfoCallShould.kt          |  16 +-
 .../TrackedEntityInstanceQueryCallShould.kt   | 198 ++++++++----------
 ...ckedEntityInstanceQueryDataSourceShould.kt |  17 +-
 12 files changed, 135 insertions(+), 168 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 3a08789eb2..a78919161f 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -209,6 +209,7 @@ dependencies {
     testImplementation("nl.jqno.equalsverifier:equalsverifier:$equalsVerifier")
     testImplementation("com.squareup.okhttp3:mockwebserver:$okHttp")
     testImplementation("androidx.test:runner:$testRunner")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines")
 
     // Android test dependencies
     androidTestImplementation("org.mockito:mockito-core:$mockito")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 63b5abd264..2f5c7c523a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.runBlocking
 import java.util.*
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.helpers.UidGenerator
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index 7e40cf08be..f28cf1ef8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -127,12 +127,12 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
         query: TrackerAPIQuery
     ): Result<TrackedEntityInstance?, D2Error> {
         return if (useEntityEndpoint) {
-                coroutineCallExecutor.wrap(
-                    storeError = true,
-                    errorCatcher = TrackedEntityInstanceCallErrorCatcher()
-                ) {
-                    trackerCallFactory.getTrackedEntityCall().getEntityCall(uid, query)
-                }
+            coroutineCallExecutor.wrap(
+                storeError = true,
+                errorCatcher = TrackedEntityInstanceCallErrorCatcher()
+            ) {
+                trackerCallFactory.getTrackedEntityCall().getEntityCall(uid, query)
+            }
         } else {
             val collectionQuery = query.copy(uids = listOf(uid))
             coroutineCallExecutor.wrap(storeError = true) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index 57d6408e28..f55b7f7f3a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.search
 import dagger.Reusable
 import java.text.ParseException
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventInternalAccessor
@@ -52,7 +51,6 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     private val trackedEntityService: TrackedEntityInstanceService,
     private val eventService: EventService,
     private val mapper: SearchGridMapper,
-    private val apiCallExecutor: APICallExecutor,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dhisVersionManager: DHISVersionManager
 ) {
@@ -98,7 +96,10 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
         }
     }
 
-    private suspend fun getEventQueryForOrgunit(query: TrackedEntityInstanceQueryOnline, orgunit: String?): List<Event> {
+    private suspend fun getEventQueryForOrgunit(
+        query: TrackedEntityInstanceQueryOnline,
+        orgunit: String?
+    ): List<Event> {
         return coroutineAPICallExecutor.wrap(storeError = false) {
             eventService.getEvents(
                 fields = EventFields.teiQueryFields,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index ce4e95851e..2b11d07dfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import kotlinx.coroutines.runBlocking
 import kotlin.collections.HashSet
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index d0a65d16a1..f3cb4ca0aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
index 343846c7eb..cbf689e63a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
@@ -29,7 +29,8 @@
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import com.nhaarman.mockitokotlin2.mock
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -41,6 +42,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class CoroutineAPICallExecutorShould {
 
     private val errorMapper: APIErrorMapper = mock()
@@ -63,7 +65,7 @@ class CoroutineAPICallExecutorShould {
     }
 
     @Test
-    fun `should return object when object api call succeed`() = runBlocking {
+    fun `should return object when object api call succeed`() = runTest {
         // Given suspend function returns an Int
         val expectedResult = Result.Success<Int, D2Error>(13)
         val block: suspend () -> Int = { 13 }
@@ -78,7 +80,7 @@ class CoroutineAPICallExecutorShould {
     }
 
     @Test
-    fun `should return D2Error when object api call fails`() = runBlocking {
+    fun `should return D2Error when object api call fails`() = runTest {
         // Given suspend function returns an error
         val d2Error = D2Error.builder()
             .errorCode(D2ErrorCode.API_UNSUCCESSFUL_RESPONSE)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 9576cc57dc..3815c25cce 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -165,7 +165,7 @@ class MetadataCallShould : BaseCallShould() {
     @Test
     fun fail_when_system_info_call_fail() {
         systemInfoDownloader.stub {
-            onBlocking { downloadWithProgressManager(any()) }.then { runBlocking { throw networkError } }
+            onBlocking { downloadWithProgressManager(any()) }.doAnswer { throw networkError }
         }
         downloadAndAssertError()
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
index d594e161df..17af2a911f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth.assertThat
-import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.api.testutils.RetrofitFactory
 import org.hisp.dhis.android.core.event.Event
@@ -42,6 +43,7 @@ import org.junit.BeforeClass
 import org.junit.Test
 import retrofit2.Retrofit
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class EventEndpointCallShould {
 
     private val orgunit = "orgunitUid"
@@ -49,24 +51,20 @@ class EventEndpointCallShould {
     private val startDateStr = "2021-01-01"
 
     @Test
-    fun realize_request_with_page_filters_when_included_in_query() {
-        val eventEndpointCall = givenAEventCallByPagination(2, 32)
-
+    fun realize_request_with_page_filters_when_included_in_query() = runTest {
         mockWebServer.enqueueMockResponse()
 
-        eventEndpointCall.blockingGet()
+        givenAEventCallByPagination(2, 32)
         val request = mockWebServer.takeRequest()
 
         assertThat(request.path).contains("paging=true&page=2&pageSize=32")
     }
 
     @Test
-    fun realize_request_with_orgUnit_program_filters_when_included_in_query() {
-        val eventEndpointCall = givenAEventCallByOrgUnitAndProgram(orgunit, program)
-
+    fun realize_request_with_orgUnit_program_filters_when_included_in_query() = runTest {
         mockWebServer.enqueueMockResponse()
 
-        eventEndpointCall.subscribe()
+        givenAEventCallByOrgUnitAndProgram(orgunit, program)
         val request = mockWebServer.takeRequest()
 
         assertThat(request.path).contains("orgUnit=$orgunit")
@@ -74,30 +72,26 @@ class EventEndpointCallShould {
     }
 
     @Test
-    fun include_start_date_if_program_is_defined() {
-        val eventEndpointCall = givenAEventCallByOrgUnitAndProgram(orgunit, program, startDateStr)
-
+    fun include_start_date_if_program_is_defined() = runTest {
         mockWebServer.enqueueMockResponse()
 
-        eventEndpointCall.blockingGet()
+        givenAEventCallByOrgUnitAndProgram(orgunit, program, startDateStr)
         val request = mockWebServer.takeRequest()
 
         assertThat(request.path).contains(startDateStr)
     }
 
     @Test
-    fun does_not_include_start_date_if_program_is_not_defined() {
-        val eventEndpointCall = givenAEventCallByOrgUnitAndProgram(program, null, startDateStr)
-
+    fun does_not_include_start_date_if_program_is_not_defined() = runTest {
         mockWebServer.enqueueMockResponse()
 
-        eventEndpointCall.blockingGet()
+        givenAEventCallByOrgUnitAndProgram(program, null, startDateStr)
         val request = mockWebServer.takeRequest()
 
         assertThat(request.path).doesNotContain(startDateStr)
     }
 
-    private fun givenAEventCallByPagination(page: Int, pageCount: Int): Single<Payload<Event>> {
+    private suspend fun givenAEventCallByPagination(page: Int, pageCount: Int): Payload<Event> {
         val eventQuery = TrackerAPIQuery(
             commonParams = get(),
             page = page,
@@ -107,17 +101,17 @@ class EventEndpointCallShould {
         return givenACallForQuery(eventQuery)
     }
 
-    private fun givenACallForQuery(eventQuery: TrackerAPIQuery): Single<Payload<Event>> {
+    private suspend fun givenACallForQuery(eventQuery: TrackerAPIQuery): Payload<Event> {
         return OldEventEndpointCallFactory(
             retrofit.create(EventService::class.java)
         ).getCollectionCall(eventQuery)
     }
 
-    private fun givenAEventCallByOrgUnitAndProgram(
+    private suspend fun givenAEventCallByOrgUnitAndProgram(
         orgUnit: String,
         program: String?,
         startDate: String? = null
-    ): Single<Payload<Event>> {
+    ): Payload<Event> {
         val eventQuery = TrackerAPIQuery(
             commonParams = TrackerQueryCommonParams(
                 listOf(),
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
index 3afd5dcae0..6c5774edb6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
@@ -30,7 +30,8 @@ package org.hisp.dhis.android.core.systeminfo.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import java.util.*
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
@@ -48,6 +49,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class SystemInfoCallShould {
     private val systemInfoService: SystemInfoService = mock()
     private val databaseAdapter: DatabaseAdapter = mock()
@@ -81,14 +83,14 @@ class SystemInfoCallShould {
     }
 
     @Test
-    fun pass_correct_fields_to_service() = runBlocking {
+    fun pass_correct_fields_to_service() = runTest {
         systemInfoSyncCall.download(true)
 
         assertThat(filterCaptor.firstValue).isEqualTo(SystemInfoFields.allFields)
     }
 
     @Test
-    fun emit_d2_error_when_api_call_executor_returns_error() = runBlocking {
+    fun emit_d2_error_when_api_call_executor_returns_error() = runTest {
         systemInfoService.stub {
             onBlocking { getSystemInfo(any()) }.doAnswer { throw d2Error }
         }
@@ -102,7 +104,7 @@ class SystemInfoCallShould {
     }
 
     @Test
-    fun never_invoke_handlers_on_call_exception() = runBlocking {
+    fun never_invoke_handlers_on_call_exception() = runTest {
         systemInfoService.stub {
             onBlocking { getSystemInfo(filterCaptor.capture()) }.doAnswer { throw d2Error }
         }
@@ -116,7 +118,7 @@ class SystemInfoCallShould {
     }
 
     @Test
-    fun invoke_handler_after_successful_call() = runBlocking {
+    fun invoke_handler_after_successful_call() = runTest {
         systemInfoSyncCall.download(true)
 
         verify(systemInfoHandler).handle(systemInfo)
@@ -124,7 +126,7 @@ class SystemInfoCallShould {
     }
 
     @Test
-    fun throw_d2_call_exception_when_system_version_not_supported() = runBlocking {
+    fun throw_d2_call_exception_when_system_version_not_supported() = runTest {
         whenever(systemInfo.version()).thenReturn("2.28")
 
         verifyThrowD2Error(
@@ -133,7 +135,7 @@ class SystemInfoCallShould {
     }
 
     @Test
-    fun not_call_handler_when_system_version_not_supported() = runBlocking {
+    fun not_call_handler_when_system_version_not_supported() = runTest {
         whenever(systemInfo.version()).thenReturn("2.28")
 
         verifyThrowD2Error(
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index 5519881886..9ce06430a9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import kotlinx.coroutines.runBlocking
 import java.text.ParseException
 import java.util.*
 import javax.net.ssl.HttpsURLConnection
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
@@ -60,21 +60,18 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.mockito.stubbing.OngoingStubbing
-import retrofit2.Call
+import org.mockito.invocation.InvocationOnMock
 
 @RunWith(JUnit4::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
 
     private val trackedEntityService: TrackedEntityInstanceService = mock()
     private val eventService: EventService = mock()
-    private val apiCallExecutor: APICallExecutor = mock()
-    private val rxAPICallExecutor: RxAPICallExecutor = mock()
     private val mapper: SearchGridMapper = mock()
+    private val coroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val dhisVersionManager: DHISVersionManager = mock()
     private val searchGrid: SearchGrid = mock()
-    private val searchGridCall: Call<SearchGrid> = mock()
-    private val eventCallSingle: Single<Payload<Event>> = mock()
     private val teis: List<TrackedEntityInstance> = mock()
     private val eventPayload: Payload<Event> = mock()
     private val attribute: List<RepositoryScopeFilterItem> = emptyList()
@@ -114,43 +111,41 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             pageSize = 33
         )
 
-        whenServiceQuery().thenReturn(searchGridCall)
-        whenEventServiceQuery().thenReturn(eventCallSingle)
-
-        whenever(apiCallExecutor.executeObjectCallWithErrorCatcher(eq(searchGridCall), any())).doReturn(searchGrid)
-        whenever(rxAPICallExecutor.wrapSingle(eq(eventCallSingle), any())).doReturn(eventCallSingle)
-        whenever(eventCallSingle.blockingGet()).doReturn(eventPayload)
+        whenServiceQuery { searchGrid }
+        whenEventServiceQuery { eventPayload }
 
         whenever(mapper.transform(any())).doReturn(teis)
         whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(true)
 
         // Metadata call
-        callFactory = getFactory()
+        callFactory = TrackedEntityInstanceQueryCallFactory(
+            trackedEntityService, eventService, mapper, coroutineAPICallExecutor, dhisVersionManager
+        )
     }
 
     @Test
-    fun succeed_when_endpoint_calls_succeed() = runBlocking {
+    fun succeed_when_endpoint_calls_succeed() = runTest {
         val teisResponse = callFactory.getCall(query)
         assertThat(teisResponse.trackedEntities).isEqualTo(teis)
     }
 
     @Test
-    fun call_mapper_with_search_grid() {
+    fun call_mapper_with_search_grid() = runTest {
         callFactory.getCall(query)
         verify(mapper).transform(searchGrid)
         verifyNoMoreInteractions(mapper)
     }
 
     @Test
-    fun call_service_with_query_parameters() {
+    fun call_service_with_query_parameters() = runTest {
         callFactory.getCall(query)
         verifyService(query)
         verifyNoMoreInteractions(trackedEntityService)
     }
 
     @Test
-    fun throw_D2CallException_when_service_call_returns_failed_response() {
-        whenever(apiCallExecutor.executeObjectCallWithErrorCatcher(eq(searchGridCall), any())).doThrow(d2Error)
+    fun throw_D2CallException_when_service_call_returns_failed_response() = runTest {
+        whenServiceQuery { throw d2Error }
         whenever(d2Error.errorCode()).doReturn(D2ErrorCode.MAX_TEI_COUNT_REACHED)
 
         try {
@@ -162,8 +157,8 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     }
 
     @Test
-    fun throw_too_many_org_units_exception_when_request_was_too_long() {
-        whenever(apiCallExecutor.executeObjectCallWithErrorCatcher(eq(searchGridCall), any())).doThrow(d2Error)
+    fun throw_too_many_org_units_exception_when_request_was_too_long() = runTest {
+        whenServiceQuery { throw d2Error }
         whenever(d2Error.errorCode()).doReturn(D2ErrorCode.TOO_MANY_ORG_UNITS)
         whenever(d2Error.httpErrorCode()).doReturn(HttpsURLConnection.HTTP_REQ_TOO_LONG)
 
@@ -176,13 +171,13 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     }
 
     @Test(expected = D2Error::class)
-    fun throw_D2CallException_when_mapper_throws_exception() {
+    fun throw_D2CallException_when_mapper_throws_exception() = runTest {
         whenever(mapper.transform(searchGrid)).thenThrow(ParseException::class.java)
         callFactory.getCall(query)
     }
 
     @Test
-    fun should_not_map_active_event_status_if_greater_than_2_33() {
+    fun should_not_map_active_event_status_if_greater_than_2_33() = runTest {
         whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(true)
         val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
 
@@ -192,7 +187,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     }
 
     @Test
-    fun should_map_active_event_status_if_not_greater_than_2_33() {
+    fun should_map_active_event_status_if_not_greater_than_2_33() = runTest {
         whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(false)
 
         val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
@@ -207,7 +202,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     }
 
     @Test
-    fun should_query_events_if_data_value_filter() {
+    fun should_query_events_if_data_value_filter() = runTest {
         val events = listOf(
             EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid1"), "tei1").build(),
             EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid2"), "tei2").build(),
@@ -233,7 +228,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     }
 
     @Test
-    fun should_query_events_for_multiple_orgunits() {
+    fun should_query_events_for_multiple_orgunits() = runTest {
         whenever(eventPayload.items()).doReturn(emptyList())
 
         val query = query.copy(
@@ -252,16 +247,10 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         verifyEventService(query)
     }
 
-    private fun getFactory(): TrackedEntityInstanceQueryCallFactory {
-        return TrackedEntityInstanceQueryCallFactory(
-            trackedEntityService, eventService, mapper, apiCallExecutor, rxAPICallExecutor, dhisVersionManager
-        )
-    }
-
     private fun verifyService(
         query: TrackedEntityInstanceQueryOnline,
         expectedStatus: EventStatus? = query.eventStatus
-    ) {
+    ) = runBlocking {
         verify(trackedEntityService).query(
             eq(query.uids?.joinToString(";")),
             eq(query.orgUnits.joinToString(";")),
@@ -326,90 +315,67 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         )
     }
 
-    private fun whenServiceQuery(): OngoingStubbing<Call<SearchGrid>?> {
-        return whenever(
-            trackedEntityService.query(
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull()
-            )
-        )
+    private fun whenServiceQuery(answer: (InvocationOnMock) -> SearchGrid?) {
+        trackedEntityService.stub {
+            onBlocking {
+                query(
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull()
+                )
+            }.doAnswer(answer)
+        }
     }
 
-    private fun whenEventServiceQuery(): OngoingStubbing<Single<Payload<Event>>> = runBlocking {
+    private fun whenEventServiceQuery(answer: (InvocationOnMock) -> Payload<Event>) {
         eventService.stub {
             onBlocking {
-                .getEvents(
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-            )
+                getEvents(
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                    anyOrNull(),
+                )
+            }.doAnswer(answer)
         }
-        return whenever(
-            eventService.getEvents(
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull(),
-            )
-        )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index d8b9a37b11..adb4d717cb 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -30,9 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.search
 import androidx.paging.ItemKeyedDataSource
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import kotlinx.coroutines.runBlocking
 import java.util.*
-import java.util.concurrent.Callable
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
@@ -53,6 +53,7 @@ import org.mockito.*
 import org.mockito.ArgumentMatchers.anyString
 
 @RunWith(JUnit4::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class TrackedEntityInstanceQueryDataSourceShould {
     private lateinit var singleEventFilterScope: TrackedEntityInstanceQueryRepositoryScope
     private lateinit var multipleEventFilterScope: TrackedEntityInstanceQueryRepositoryScope
@@ -125,7 +126,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun get_initial_online_page() = runBlocking {
+    fun get_initial_online_page() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -158,7 +159,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun query_online_when_offline_exhausted() = runBlocking {
+    fun query_online_when_offline_exhausted() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -176,7 +177,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun query_online_again_if_not_exhausted_and_use_right_paging() = runBlocking {
+    fun query_online_again_if_not_exhausted_and_use_right_paging() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -206,7 +207,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun get_initial_online_page_from_cache() = runBlocking {
+    fun get_initial_online_page_from_cache() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).allowOnlineCache(true).build()
         val dataSource1 = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -230,7 +231,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     @Test
-    fun get_multiple_event_filter_queries() = runBlocking {
+    fun get_multiple_event_filter_queries() = runTest {
         val scope = multipleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,
@@ -256,7 +257,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
      values already returned offline (duplicates), so it is needed to do a second query.
      */
     @Test
-    fun get_second_online_page_if_needed_in_initial_load() = runBlocking {
+    fun get_second_online_page_if_needed_in_initial_load() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
             store, trackerParentCallFactory, scope, childrenAppenders,

From 4553be1008ff9ae5a9af888f14b2b8d875a373f3 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 28 Jul 2023 11:23:46 +0200
Subject: [PATCH 130/478] [ANDROSDK-1731] Add coroutines test to
 instrumentation tests

---
 core/build.gradle.kts                                       | 1 +
 .../internal/DataValueEndpointCallRealIntegrationShould.kt  | 4 ++--
 .../internal/EventEndpointCallRealIntegrationShould.kt      | 6 +++---
 .../event/internal/EventPostCallRealIntegrationShould.kt    | 6 +++---
 .../core/user/internal/LogoutCallRealIntegrationShould.kt   | 4 ++--
 .../android/core/wipe/WipeDBCallRealIntegrationShould.kt    | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index a78919161f..5cbacc141f 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -221,6 +221,7 @@ dependencies {
     androidTestImplementation("com.google.truth:truth:$truth") {
         exclude(group = "junit") // Android has JUnit built in.
     }
+    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines")
 
     debugImplementation("com.facebook.flipper:flipper:$flipper")
     debugImplementation("com.facebook.soloader:soloader:$soloader")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
index 410a243937..6a930bfd1a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl
@@ -47,7 +47,7 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     // @Test
     @Throws(Exception::class)
     fun download_data_values() {
-        runBlocking {
+        runTest {
             if (!d2.userModule().isLogged().blockingGet()) {
                 d2.userModule().logIn(username, password, url).blockingGet()
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
index 69eaf0a680..306399ca1a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.event.internal.EventCallFactory.create
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
@@ -39,7 +39,7 @@ class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     // Uncomment in order to quickly test changes vs a real server, but keep it uncommented after.
     // @Test
     @Throws(Exception::class)
-    fun download_number_of_events_according_to_default_limit() = runBlocking {
+    fun download_number_of_events_according_to_default_limit() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
         val eventEndpointCall = create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
@@ -55,7 +55,7 @@ class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     @Throws(Exception::class)
-    fun download_event_with_category_combo_option() = runBlocking {
+    fun download_event_with_category_combo_option() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
         create(d2.retrofit(), "DiszpKrYNg8", 0, emptyList())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 2f5c7c523a..20b702ea17 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.event.internal
 import com.google.common.truth.Truth
 import com.google.common.truth.Truth.assertThat
 import java.util.*
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.helpers.UidGenerator
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
@@ -95,7 +95,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     // commented out since it is a flaky test that works against a real server.
     // @Test
     @Throws(Exception::class)
-    fun pull_event_with_correct_category_combo_after_be_pushed() = runBlocking {
+    fun pull_event_with_correct_category_combo_after_be_pushed() = runTest {
         downloadMetadata()
         createDummyDataToPost(eventUid1)
         pushDummyEvent()
@@ -119,7 +119,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     // commented out since it is a flaky test that works against a real server.
     // @Test
     @Throws(Exception::class)
-    fun pull_two_events_with_correct_category_combo_after_be_pushed() = runBlocking {
+    fun pull_two_events_with_correct_category_combo_after_be_pushed() = runTest {
         downloadMetadata()
         createDummyDataToPost(eventUid1)
         createDummyDataToPost(eventUid2)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
index 33c947fe12..318ec07b10 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.db.access.SqliteCheckerUtility
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
@@ -47,7 +47,7 @@ class LogoutCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     // @Test
-    fun delete_credentials_when_log_out_after_sync_data() = runBlocking {
+    fun delete_credentials_when_log_out_after_sync_data() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
index 60bd371235..a52b3ae8ef 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallRealIntegrationShould.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.wipe
 
 import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.data.database.DatabaseAssert.Companion.assertThatDatabase
 import org.hisp.dhis.android.core.event.internal.EventCallFactory.create
@@ -46,7 +46,7 @@ class WipeDBCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     @Throws(Exception::class)
-    fun have_empty_database_when_wipe_db_after_sync_data() = runBlocking {
+    fun have_empty_database_when_wipe_db_after_sync_data() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.metadataModule().blockingDownload()
 

From df88dd18f42010e422a3cb99510c17df1ab08d9b Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 28 Jul 2023 11:50:14 +0200
Subject: [PATCH 131/478] [ANDROSDK-1731] Modify runTest usage

---
 ...aValueEndpointCallRealIntegrationShould.kt | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
index 6a930bfd1a..4fdf496f14 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
@@ -37,6 +38,7 @@ import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedData
 import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataCallBundleKey
 import org.hisp.dhis.android.core.period.PeriodType
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     /**
@@ -46,19 +48,17 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     @Throws(Exception::class)
-    fun download_data_values() {
-        runTest {
-            if (!d2.userModule().isLogged().blockingGet()) {
-                d2.userModule().logIn(username, password, url).blockingGet()
-            }
-
-            /*  This test won't pass independently of the sync of metadata, as the foreign keys
-                constraints won't be satisfied.
-                To run the test, you will need to disable foreign key support in database in
-                DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
-                uncomment the @Test tag */
-            download()
+    fun download_data_values() = runTest {
+        if (!d2.userModule().isLogged().blockingGet()) {
+            d2.userModule().logIn(username, password, url).blockingGet()
         }
+
+        /*  This test won't pass independently of the sync of metadata, as the foreign keys
+            constraints won't be satisfied.
+            To run the test, you will need to disable foreign key support in database in
+            DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
+            uncomment the @Test tag */
+        download()
     }
 
     private suspend fun download(): List<DataValue> {

From e89b7c45e64cb4852134ca995e6df21ac441d5a5 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 28 Jul 2023 09:16:42 +0200
Subject: [PATCH 132/478] [ANDROSDK-1711] refactor: - Entry point of Values
 should remain untouched (public methods must not be changed)

---
 ...servedValueManagerRealIntegrationShould.kt |   6 +-
 ...ckedEntityAttributeReservedValueManager.kt | 224 ++++++++++--------
 2 files changed, 122 insertions(+), 108 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 31dce03cae..9dfb22986c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -68,16 +68,16 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
     private val programUid = "program_uid"
     private val categoryComboUid = "category_combo_uid"
     private val ownerUid = "xs8A6tQJY0s"
-    private var organisationUnit: OrganisationUnit? = null
+    private lateinit var organisationUnit: OrganisationUnit
     private var pattern: String? = null
 
     @Mock
-    var trackedEntityAttributeReservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
+    val trackedEntityAttributeReservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
         TrackedEntityAttributeReservedValueQuery>? =
         null
 
     @Mock
-    var trackedEntityAttributeReservedValueCall: Callable<List<TrackedEntityAttributeReservedValue>>? =
+    val trackedEntityAttributeReservedValueCall: Callable<List<TrackedEntityAttributeReservedValue>>? =
         null
 
     @Captor
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 48f90b6181..f2ad9e2029 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -28,15 +28,23 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.SingleEmitter
 import java.util.Date
 import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.rx2.asObservable
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
@@ -64,7 +72,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 
-@SuppressWarnings("LongParameterList", "TooManyFunctions")
+@Suppress("LongParameterList", "TooManyFunctions")
 @Reusable
 class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val store: TrackedEntityAttributeReservedValueStore,
@@ -80,6 +88,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         TrackedEntityAttributeReservedValueQuery>
 ) {
     private val d2ProgressManager = D2ProgressManager(null)
+    private val scope = CoroutineScope(Dispatchers.IO + Job())
 
     /**
      * @param attributeUid        Attribute uid
@@ -87,8 +96,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @return Value of tracked entity attribute
      * @see .getValue
      */
-    suspend fun blockingGetValue(attributeUid: String, organisationUnitUid: String): String {
-        return getValue(attributeUid, organisationUnitUid)!!
+    fun blockingGetValue(attributeUid: String, organisationUnitUid: String): String? {
+        return getValue(attributeUid, organisationUnitUid).blockingGet()
     }
 
     /**
@@ -99,20 +108,32 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param organisationUnitUid Organisation unit uid
      * @return Single with value of tracked entity attribute
      */
-
-    suspend fun getValue(attributeUid: String, organisationUnitUid: String): String? {
-
-        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
-
-        val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
-        val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
-        val reservedValue = store.popOne(attributeUid, attributeOrgunit)
-            ?: throw D2Error.builder()
-                .errorCode(D2ErrorCode.NO_RESERVED_VALUES)
-                .errorDescription("There are no reserved values")
-                .errorComponent(D2ErrorComponent.Database).build()
-
-        return reservedValue.value()
+    fun getValue(attributeUid: String, organisationUnitUid: String): Single<String?> {
+        return Single.create { emitter: SingleEmitter<String?> ->
+            scope.launch {
+                suspendCancellableCoroutine { continuation ->
+                    downloadValuesIfBelowThreshold(
+                        attributeUid, getOrganisationUnit(organisationUnitUid), null, false
+                    )
+                    continuation.resume(Unit)
+                }
+            }
+            scope.launch {
+                val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
+                val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
+                val reservedValue = store.popOne(attributeUid, attributeOrgunit)
+                if (reservedValue == null) {
+                    emitter.onError(
+                        D2Error.builder()
+                            .errorCode(D2ErrorCode.NO_RESERVED_VALUES)
+                            .errorDescription("There are no reserved values")
+                            .errorComponent(D2ErrorComponent.Database).build()
+                    )
+                } else {
+                    emitter.onSuccess(reservedValue.value() ?: "")
+                }
+            }
+        }
     }
 
     /**
@@ -120,11 +141,11 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @see .downloadReservedValues
      */
-    suspend fun blockingDownloadReservedValues(
+    fun blockingDownloadReservedValues(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
     ) {
-        downloadReservedValues(attributeUid, numberOfValuesToFillUp).collect()
+        downloadReservedValues(attributeUid, numberOfValuesToFillUp).blockingSubscribe()
     }
 
     /**
@@ -141,19 +162,19 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @return An Observable that notifies about the progress.
      */
-    private fun downloadReservedValues(
+    fun downloadReservedValues(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
-    ) = flow<D2Progress> {
-        downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp)
+    ): Observable<D2Progress> {
+        return downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp).asObservable()
     }
 
     /**
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
-     * @see .downloadAllReservedValues
+     * @see .downloadAllReservedValuesObservable
      */
-    suspend fun blockingDownloadAllReservedValues(numberOfValuesToFillUp: Int?) {
-        downloadAllReservedValues(numberOfValuesToFillUp)
+    fun blockingDownloadAllReservedValues(numberOfValuesToFillUp: Int?) {
+        downloadAllReservedValues(numberOfValuesToFillUp).blockingSubscribe()
     }
 
     /**
@@ -163,14 +184,13 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @return An Observable that notifies about the progress.
      */
-    private suspend fun downloadAllReservedValues(
-        numberOfValuesToFillUp: Int?
-    ): List<D2Progress> = coroutineScope {
-        val observables = generatedAttributes.map { attribute ->
-            async { downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp) }
+    fun downloadAllReservedValues(numberOfValuesToFillUp: Int?): Observable<D2Progress> {
+        val observables: MutableList<Observable<D2Progress>> = ArrayList()
+        val generatedAttributes = generatedAttributes
+        for (attribute in generatedAttributes) {
+            observables.add(downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp).asObservable())
         }
-
-        observables.awaitAll().flatten()
+        return Observable.merge(observables)
     }
 
     /**
@@ -181,8 +201,14 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param organisationUnitUid An optional organisation unit uid
      * @return Single with the reserved value count by attribute or by attribute and organisation unit.
      */
-    fun count(attributeUid: String, organisationUnitUid: String?): Int =
-        store.count(attributeUid, organisationUnitUid, null)
+    fun count(attributeUid: String, organisationUnitUid: String?): Single<Int> {
+        return Single.fromCallable {
+            blockingCount(
+                attributeUid,
+                organisationUnitUid
+            )
+        }
+    }
 
     /**
      * @param attributeUid        Attribute uid
@@ -190,23 +216,23 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @return The reserved value count by attribute or by attribute and organisation unit.
      * @see .count
      */
-    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int =
-        count(attributeUid, organisationUnitUid)
+    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int {
+        return store.count(attributeUid, organisationUnitUid, null)
+    }
 
     /**
      * Generate a list of reserved value summaries from the existing tracked entity attribute reserved values in the DB.
      *
      * @return Single with a list of the reserved value summaries
      */
-    val reservedValueSummaries: Flow<List<ReservedValueSummary>> = flow {
-        emit(blockingGetReservedValueSummaries())
-    }
+    val reservedValueSummaries: Single<List<ReservedValueSummary>>
+        get() = Single.just(blockingGetReservedValueSummaries())
 
     /**
      * @return List of the reserved value summaries
      * @see .getReservedValueSummaries
      */
-    suspend fun blockingGetReservedValueSummaries(): List<ReservedValueSummary> {
+    fun blockingGetReservedValueSummaries(): List<ReservedValueSummary> {
         val whereClause = WhereClauseBuilder()
             .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
         val orderByClause = OrderByClauseBuilder.orderByFromItems(
@@ -217,8 +243,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
             ),
             CoreColumns.ID
         )
-        val trackedEntityAttributes =
-            trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
+        val trackedEntityAttributes = trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
         val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
         for (trackedEntityAttribute in trackedEntityAttributes) {
             val builder = ReservedValueSummary.builder()
@@ -228,12 +253,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
                 for (organisationUnit in organisationUnits) {
                     builder.organisationUnit(organisationUnit)
                         .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
-                        .numberOfValuesToFillUp(
-                            getFillUpToValue(
-                                null,
-                                trackedEntityAttribute.uid()
-                            )
-                        )
+                        .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()))
                     reservedValueSummaries.add(builder.build())
                 }
             } else {
@@ -251,86 +271,79 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         )
     }
 
-    private suspend fun downloadValuesForOrgUnits(
+    private fun downloadValuesForOrgUnits(
         attribute: String,
         numberOfValuesToFillUp: Int?
-    ): List<D2Progress> = coroutineScope {
+    ): Flow<D2Progress> = flow {
         val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
-
         if (isOrgunitDependent(pattern)) {
             val organisationUnits = getOrgUnitsLinkedToAttribute(attribute)
-            val progressList = mutableListOf<D2Progress>()
-
             for (organisationUnit in organisationUnits) {
-                downloadValuesIfBelowThreshold(
-                    attribute,
-                    organisationUnit,
-                    numberOfValuesToFillUp,
-                    true
-                )
-                progressList.add(increaseProgress())
+                downloadValuesIfBelowThreshold(attribute, organisationUnit, numberOfValuesToFillUp, true)
+                emit(increaseProgress())
             }
-
-            progressList
         } else {
             downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
-
-            listOf(increaseProgress())
+            emit(increaseProgress())
         }
     }
 
-    private suspend fun downloadValuesIfBelowThreshold(
+    private fun downloadValuesIfBelowThreshold(
         attribute: String,
         organisationUnit: OrganisationUnit?,
         minNumberOfValuesToHave: Int?,
         storeError: Boolean
-    ): Unit = coroutineScope {
-        // Using local date. It's not worth it to make a system info call
-        store.deleteExpired(Date())
-        val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
-        val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
-        val remainingValues = store.count(
-            attribute,
-            if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
-            pattern
-        )
-
-        // If number of values is explicitly specified, we use that value as threshold.
-        val minNumberToTryFill = minNumberOfValuesToHave
-            ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
-
-        if (remainingValues < minNumberToTryFill) {
-            val numberToReserve = fillUpTo!! - remainingValues
-            downloadValues(
+    ) {
+        scope.launch {
+            // Using local date. It's not worth it to make a system info call
+            store.deleteExpired(Date())
+            val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
+            val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
+            val remainingValues = store.count(
                 attribute,
-                organisationUnit,
-                numberToReserve,
-                pattern,
-                storeError
+                if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
+                pattern
             )
+
+            // If the number of values is explicitly specified, we use that value as the threshold.
+            val minNumberToTryFill =
+                minNumberOfValuesToHave ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
+
+            if (remainingValues < minNumberToTryFill) {
+                val numberToReserve = fillUpTo!! - remainingValues
+                downloadValues(attribute, organisationUnit, numberToReserve, pattern, storeError)
+            }
         }
     }
 
-    suspend fun downloadValues(
+    private suspend fun downloadValues(
         trackedEntityAttributeUid: String,
         organisationUnit: OrganisationUnit?,
         numberToReserve: Int,
         pattern: String?,
         storeError: Boolean
-    ) {
-        return suspendCoroutine {
-            executor.executeD2Call(
-                reservedValueQueryCallFactory.create(
-                    TrackedEntityAttributeReservedValueQuery.create(
-                        trackedEntityAttributeUid, numberToReserve,
-                        organisationUnit, pattern
-                    )
-                ),
-                storeError
-            )
+    ) = suspendCoroutine { continuation ->
+
+        val deferred = CompletableDeferred<Unit>()
+
+        executor.executeD2Call(
+            reservedValueQueryCallFactory.create(
+                TrackedEntityAttributeReservedValueQuery.create(
+                    trackedEntityAttributeUid, numberToReserve,
+                    organisationUnit, pattern
+                )
+            ),
+            storeError
+        )
 
-            if (pattern != null) {
-                store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
+        deferred.invokeOnCompletion {
+            if (it == null) {
+                if (pattern != null) {
+                    store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
+                }
+                continuation.resume(Unit)
+            } else {
+                continuation.resumeWithException(it!!)
             }
         }
     }
@@ -353,6 +366,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         val captureOrgunits = userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(
             OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
         )
+
         linkedOrgunitUids.toMutableList().retainAll(captureOrgunits)
         return organisationUnitStore.selectWhere(
             WhereClauseBuilder().appendInKeyStringValues(

From 86cf624488d821bb204b82edc4aaa85df9130f2e Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 30 Jul 2023 20:29:24 +0200
Subject: [PATCH 133/478] [ANDROSDK-1713] refactor: - MapLayer from rxjava to
 coroutines/flow

---
 .../arch/handlers/internal/HandlerBaseImpl.kt |  2 -
 .../core/map/layer/MapLayerDownloader.kt      |  3 +-
 .../map/layer/internal/MapLayerCallFactory.kt | 11 ++--
 .../layer/internal/bing/BingCallFactory.kt    | 32 +++++------
 .../map/layer/internal/osm/OSMCallFactory.kt  | 55 +++++++++----------
 5 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt
index e4ae3de56f..ab409d4fa8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/HandlerBaseImpl.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.handlers.internal
 
-import java.util.ArrayList
-
 @Suppress("TooManyFunctions")
 internal abstract class HandlerBaseImpl<O> : HandlerWithTransformer<O> {
     override fun handle(o: O?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
index 1e7a66ca82..08f1435673 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.map.layer
 import dagger.Reusable
 import io.reactivex.Completable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerCallFactory
 
@@ -39,6 +40,6 @@ class MapLayerDownloader @Inject internal constructor(
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
-        return Completable.fromSingle(mapLayerCallFactory.downloadMetadata())
+        return rxCompletable { mapLayerCallFactory.downloadMetadata() }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
index 9ae319be68..74966e8a09 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
@@ -28,8 +28,9 @@
 package org.hisp.dhis.android.core.map.layer.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.toList
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.internal.bing.BingCallFactory
 import org.hisp.dhis.android.core.map.layer.internal.osm.OSMCallFactory
@@ -40,10 +41,8 @@ internal class MapLayerCallFactory @Inject constructor(
     private val bingCallFactory: BingCallFactory
 ) {
 
-    fun downloadMetadata(): Single<List<MapLayer>> {
-        return Single.merge(
-            osmCallFactory.download(),
-            bingCallFactory.download()
-        ).toList().map { it.flatten() }
+    suspend fun downloadMetadata(): List<MapLayer> {
+        return flowOf(osmCallFactory.download(), bingCallFactory.download()).toList()
+            .flatten()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
index 710d7b3916..c3946b37bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
@@ -29,11 +29,9 @@
 package org.hisp.dhis.android.core.map.layer.internal.bing
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.TimeoutCancellationException
-import kotlinx.coroutines.rx2.rxSingle
 import kotlinx.coroutines.withTimeout
 import org.hisp.dhis.android.core.D2Manager
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -57,27 +55,25 @@ internal class BingCallFactory @Inject constructor(
 ) {
 
     @Suppress("TooGenericExceptionCaught")
-    fun download(): Single<List<MapLayer>> {
-        return rxSingle {
-            if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_34)) {
-                try {
-                    val settings = coroutineAPICallExecutor.wrap(storeError = true) {
-                        settingsService.getSystemSettings(SystemSettingsFields.bingApiKey)
-                    }
+    suspend fun download(): List<MapLayer> {
+        return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_34)) {
+            try {
+                val settings = coroutineAPICallExecutor.wrap(storeError = true) {
+                    settingsService.getSystemSettings(SystemSettingsFields.bingApiKey)
+                }
 
-                    val mapLayers = settings.getOrNull()?.keyBingMapsApiKey
-                        ?.let { key -> downloadBingBasemaps(key) }
-                        ?: emptyList()
+                val mapLayers = settings.getOrNull()?.keyBingMapsApiKey
+                    ?.let { key -> downloadBingBasemaps(key) }
+                    ?: emptyList()
 
-                    mapLayers.also {
-                        mapLayerHandler.handleMany(it)
-                    }
-                } catch (e: Exception) {
-                    emptyList()
+                mapLayers.also {
+                    mapLayerHandler.handleMany(it)
                 }
-            } else {
+            } catch (e: Exception) {
                 emptyList()
             }
+        } else {
+            emptyList()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
index 4414c20aea..834ee95572 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.map.layer.internal.osm
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
@@ -41,38 +40,34 @@ internal class OSMCallFactory @Inject constructor(
     private val mapLayerHandler: MapLayerHandler
 ) {
 
-    fun download(): Single<List<MapLayer>> {
-        return Single.defer {
-            getOSMBaseMaps().map { mapLayers ->
-                mapLayerHandler.handleMany(mapLayers)
-                mapLayers
-            }
-        }
+    fun download(): List<MapLayer> {
+        val mapLayers = getOSMBaseMaps()
+        mapLayerHandler.handleMany(mapLayers)
+        return mapLayers
     }
 
-    private fun getOSMBaseMaps(): Single<List<MapLayer>> {
-        return Single.fromCallable {
-            OSMBaseMaps.list.map { basemap ->
-                MapLayer.builder()
-                    .uid(basemap.id)
-                    .name(basemap.name)
-                    .displayName(basemap.name)
-                    .style(basemap.style)
-                    .mapLayerPosition(MapLayerPosition.BASEMAP)
-                    .external(false)
-                    .imageUrl(basemap.imageUrl)
-                    .subdomains(basemap.subdomains)
-                    .subdomainPlaceholder(basemap.subdomainPlaceholder)
-                    .imageryProviders(
-                        listOf(
-                            MapLayerImageryProvider.builder()
-                                .mapLayer(basemap.id)
-                                .attribution(basemap.attribution)
-                                .build()
-                        )
+    // Function to get OSMBaseMaps
+    private fun getOSMBaseMaps(): List<MapLayer> {
+        return OSMBaseMaps.list.map { basemap ->
+            MapLayer.builder()
+                .uid(basemap.id)
+                .name(basemap.name)
+                .displayName(basemap.name)
+                .style(basemap.style)
+                .mapLayerPosition(MapLayerPosition.BASEMAP)
+                .external(false)
+                .imageUrl(basemap.imageUrl)
+                .subdomains(basemap.subdomains)
+                .subdomainPlaceholder(basemap.subdomainPlaceholder)
+                .imageryProviders(
+                    listOf(
+                        MapLayerImageryProvider.builder()
+                            .mapLayer(basemap.id)
+                            .attribution(basemap.attribution)
+                            .build()
                     )
-                    .build()
-            }
+                )
+                .build()
         }
     }
 }

From 59972f1384f02e986d35e33b820b3e7723816888 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 30 Jul 2023 21:02:19 +0200
Subject: [PATCH 134/478] Rename .java to .kt

---
 .../internal/{ListCallFactoryImpl.java => ListCallFactoryImpl.kt} | 0
 ...NoResourceCallFetcher.java => PayloadNoResourceCallFetcher.kt} | 0
 ...Processor.java => TransactionalNoResourceSyncCallProcessor.kt} | 0
 .../{TypedModuleDownloader.java => TypedModuleDownloader.kt}      | 0
 .../internal/{ConstantCallFactory.java => ConstantCallFactory.kt} | 0
 ...{ConstantModuleDownloader.java => ConstantModuleDownloader.kt} | 0
 .../internal/{ConstantService.java => ConstantService.kt}         | 0
 .../{UserModuleDownloader.java => UserModuleDownloader.kt}        | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{ListCallFactoryImpl.java => ListCallFactoryImpl.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{PayloadNoResourceCallFetcher.java => PayloadNoResourceCallFetcher.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/{TransactionalNoResourceSyncCallProcessor.java => TransactionalNoResourceSyncCallProcessor.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/{TypedModuleDownloader.java => TypedModuleDownloader.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantCallFactory.java => ConstantCallFactory.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantModuleDownloader.java => ConstantModuleDownloader.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantService.java => ConstantService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{UserModuleDownloader.java => UserModuleDownloader.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt

From b5bcbe7337392e30d232dab598072e96009d7ad2 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 30 Jul 2023 21:02:19 +0200
Subject: [PATCH 135/478] [ANDROSDK-1732] refactor: - ConstantModule related
 classes to Kotlin

---
 .../factories/internal/ListCallFactoryImpl.kt | 44 +++++-------
 .../internal/PayloadNoResourceCallFetcher.kt  | 35 ++++-----
 ...ransactionalNoResourceSyncCallProcessor.kt | 41 +++++------
 .../modules/internal/TypedModuleDownloader.kt |  9 ++-
 .../constant/internal/ConstantCallFactory.kt  | 72 ++++++++-----------
 .../internal/ConstantModuleDownloader.kt      | 34 ++++-----
 .../core/constant/internal/ConstantService.kt | 27 ++++---
 .../user/internal/UserModuleDownloader.kt     | 43 +++++------
 8 files changed, 120 insertions(+), 185 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
index 811b6fba35..aa71ac9a7e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
@@ -25,33 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public abstract class ListCallFactoryImpl<P> implements ListCallFactory<P> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected ListCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create() {
-        return new EndpointCall<>(fetcher(), processor());
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
+
+internal abstract class ListCallFactoryImpl<P> protected constructor(
+    protected val data: GenericCallData,
+    protected val apiCallExecutor: APICallExecutor
+) : ListCallFactory<P> {
+    override fun create(): Callable<List<P>> {
+        return EndpointCall(fetcher(), processor())
     }
 
-    protected abstract CallFetcher<P> fetcher();
-    protected abstract CallProcessor<P> processor();
+    protected abstract fun fetcher(): CallFetcher<P>?
+    protected abstract fun processor(): CallProcessor<P>?
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
index d874edab31..88d421f5d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
@@ -25,27 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.fetchers.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.List;
-
-public abstract class PayloadNoResourceCallFetcher<P> implements CallFetcher<P> {
-
-    private final APICallExecutor apiCallExecutor;
-
-    protected PayloadNoResourceCallFetcher(APICallExecutor apiCallExecutor) {
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    protected abstract retrofit2.Call<Payload<P>> getCall();
-
-    @Override
-    public final List<P> fetch() throws D2Error {
-        return apiCallExecutor.executePayloadCall(getCall());
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.maintenance.D2Error
+import retrofit2.Call
+
+abstract class PayloadNoResourceCallFetcher<P> protected constructor(private val apiCallExecutor: APICallExecutor) :
+    CallFetcher<P> {
+    protected abstract val call: Call<Payload<P>?>?
+    @Throws(D2Error::class)
+    override fun fetch(): List<P> {
+        return apiCallExecutor.executePayloadCall(call)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
index 03349efeba..40a29b70ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
@@ -25,33 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.processors.internal
 
-package org.hisp.dhis.android.core.arch.call.processors.internal;
+import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.List;
-
-public class TransactionalNoResourceSyncCallProcessor<O> implements CallProcessor<O> {
-    private final DatabaseAdapter databaseAdapter;
-    private final Handler<O> handler;
-
-    public TransactionalNoResourceSyncCallProcessor(DatabaseAdapter databaseAdapter,
-                                                    Handler<O> handler) {
-        this.databaseAdapter = databaseAdapter;
-        this.handler = handler;
-    }
-
-    @Override
-    public final void process(final List<O> objectList) throws D2Error {
-        if (objectList != null && !objectList.isEmpty()) {
-            D2CallExecutor.create(databaseAdapter).executeD2CallTransactionally(() -> {
-                handler.handleMany(objectList);
-                return null;
-            });
+internal class TransactionalNoResourceSyncCallProcessor<O>(
+    private val databaseAdapter: DatabaseAdapter,
+    private val handler: Handler<O>
+) : CallProcessor<O> {
+    @Throws(D2Error::class)
+    override fun process(objectList: List<O>) {
+        if (objectList.isNotEmpty()) {
+            D2CallExecutor.create(databaseAdapter).executeD2CallTransactionally<Any?> {
+                handler.handleMany(objectList)
+                null
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index 8a8d2b4190..fdcfd8514b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -25,11 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.modules.internal
 
-package org.hisp.dhis.android.core.arch.modules.internal;
+import io.reactivex.Single
 
-import io.reactivex.Single;
-
-public interface TypedModuleDownloader<O> {
-   Single<O> downloadMetadata();
+interface TypedModuleDownloader<O> {
+    fun downloadMetadata(): Single<O>?
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
index 5c032a9413..654dab13f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
@@ -25,54 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.constant.internal
 
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
+import org.hisp.dhis.android.core.constant.Constant
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class ConstantCallFactory extends ListCallFactoryImpl<Constant> {
-
-    private final ConstantService service;
-    private final ConstantHandler handler;
-
-    @Inject
-    ConstantCallFactory(GenericCallData data,
-                        APICallExecutor apiCallExecutor,
-                        ConstantService service,
-                        ConstantHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
-    }
-
-    @Override
-    protected CallFetcher<Constant> fetcher() {
-        return new PayloadNoResourceCallFetcher<Constant>(apiCallExecutor) {
-            @Override
-            protected retrofit2.Call<Payload<Constant>> getCall() {
-                return service.constants(ConstantFields.allFields, Boolean.FALSE);
+internal class ConstantCallFactory @Inject constructor(
+    data: GenericCallData?,
+    apiCallExecutor: APICallExecutor?,
+    private val service: ConstantService,
+    private val handler: ConstantHandler
+) : ListCallFactoryImpl<Constant?>(data, apiCallExecutor) {
+    override fun fetcher(): CallFetcher<Constant?>? {
+        return object : PayloadNoResourceCallFetcher<Constant?>(apiCallExecutor) {
+            override fun getCall(): Call<Payload<Constant?>>? {
+                return service.constants(ConstantFields.allFields, false)
             }
-        };
+        }
     }
 
-    @Override
-    protected CallProcessor<Constant> processor() {
-        return new TransactionalNoResourceSyncCallProcessor<>(
-                data.databaseAdapter(),
-                handler
-        );
+    override fun processor(): CallProcessor<Constant?> {
+        return TransactionalNoResourceSyncCallProcessor(
+            data.databaseAdapter(),
+            handler
+        )
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index a41354ebe7..bcc45ee0b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -25,30 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.constant.internal;
+package org.hisp.dhis.android.core.constant.internal
 
-import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
+import org.hisp.dhis.android.core.constant.Constant
+import javax.inject.Inject
 
 @Reusable
-public class ConstantModuleDownloader implements TypedModuleDownloader<List<Constant>> {
-
-    private final ConstantCallFactory constantCallFactory;
-
-    @Inject
-    ConstantModuleDownloader(ConstantCallFactory constantCallFactory) {
-        this.constantCallFactory = constantCallFactory;
-    }
-
-    @Override
-    public Single<List<Constant>> downloadMetadata() {
-        return Single.fromCallable(constantCallFactory.create());
+class ConstantModuleDownloader @Inject internal constructor(private val constantCallFactory: ConstantCallFactory) :
+    TypedModuleDownloader<List<Constant>?> {
+    override fun downloadMetadata(): Single<List<Constant>?> {
+        return Single.fromCallable(
+            constantCallFactory.create()
+        )
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index 458fe184ff..84d168cb45 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -25,21 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.constant.internal
 
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface ConstantService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.constant.Constant
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal interface ConstantService {
     @GET("constants")
-    Call<Payload<Constant>> constants(@Query("fields") @Which Fields<Constant> fields,
-                                      @Query("paging") boolean paging);
+    fun constants(
+        @Query("fields") @Which fields: Fields<Constant?>?,
+        @Query("paging") paging: Boolean
+    ): Call<Payload<Constant?>?>?
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 1de6e3092b..78b6912f83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -25,35 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user.internal
 
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader;
-import org.hisp.dhis.android.core.user.User;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
+import org.hisp.dhis.android.core.user.User
+import javax.inject.Inject
 
 @Reusable
-public class UserModuleDownloader implements TypedModuleDownloader<User> {
-
-    private final UserCall userCall;
-    private final AuthorityEndpointCallFactory authorityCallFactory;
-
-    @Inject
-    UserModuleDownloader(UserCall userCall, AuthorityEndpointCallFactory authorityCallFactory) {
-        this.userCall = userCall;
-        this.authorityCallFactory = authorityCallFactory;
-    }
-
-    @Override
-    public Single<User> downloadMetadata() {
-        return Single.fromCallable(() -> {
-            User user = userCall.call();
-            authorityCallFactory.create().call();
-            return user;
-        });
+internal class UserModuleDownloader @Inject internal constructor(
+    private val userCall: UserCall,
+    private val authorityCallFactory: AuthorityEndpointCallFactory
+) : TypedModuleDownloader<User?> {
+    override fun downloadMetadata(): Single<User> {
+        return Single.fromCallable {
+            val user = userCall.call()
+            authorityCallFactory.create().call()
+            user
+        }
     }
 }
\ No newline at end of file

From 0e6f146f229ed906ea6f8e1e7ebf5321025a7e69 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 31 Jul 2023 08:52:49 +0200
Subject: [PATCH 136/478] [ANDROSDK-1679] Refactor oldTracker upload call

---
 .../core/event/internal/EventService.kt       |   2 +-
 .../internal/RelationshipPostCall.kt          | 112 +++++-----
 .../internal/RelationshipService.kt           |   5 +-
 .../internal/OldTrackerImporterPostCall.kt    | 195 +++++++++---------
 .../internal/TrackedEntityInstanceService.kt  |   4 +-
 .../ownership/OwnershipManagerImpl.kt         |  76 ++++---
 .../ownership/OwnershipService.kt             |   9 +-
 .../ownership/ProgramOwnerPostCall.kt         |  48 +++--
 .../TrackerImporterBreakTheGlassHelper.kt     |   2 +-
 .../TrackerImporterProgramOwnerPostCall.kt    |  32 +--
 10 files changed, 253 insertions(+), 232 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index 9816fa888c..c98053de37 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -38,7 +38,7 @@ import retrofit2.http.*
 internal interface EventService {
 
     @POST(EVENTS)
-    fun postEvents(@Body events: EventPayload, @Query(STRATEGY) strategy: String): Call<EventWebResponse>
+    suspend fun postEvents(@Body events: EventPayload, @Query(STRATEGY) strategy: String): EventWebResponse
 
     @SuppressWarnings("LongParameterList")
     @GET(EVENTS)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
index 3ca19cba3e..c77f4714ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import java.net.HttpURLConnection.*
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.common.State
@@ -50,65 +50,79 @@ internal class RelationshipPostCall @Inject internal constructor(
     private val relationshipImportHandler: RelationshipImportHandler,
     private val dataStatePropagator: DataStatePropagator,
     private val trackerStateManager: TrackerPostStateManager,
-    private val apiCallExecutor: APICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) {
 
-    fun deleteRelationships(relationships: List<Relationship>): Observable<D2Progress> {
-        return Observable.create { emitter: ObservableEmitter<D2Progress> ->
-            for (relationship in relationships) {
-                val httpResponse = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-                    relationshipService.deleteRelationship(relationship.uid()!!),
-                    listOf(HTTP_NOT_FOUND),
-                    RelationshipDeleteWebResponse::class.java
-                )
-                val status = httpResponse.response()?.status()
+    fun deleteRelationships(relationships: List<Relationship>): Flow<D2Progress> = flow {
+        val progressManager = D2ProgressManager(null)
+        for (relationship in relationships) {
+            val response = coroutineAPICallExecutor.wrap(
+                storeError = true,
+                acceptedErrorCodes = listOf(HTTP_NOT_FOUND),
+                errorClass = RelationshipDeleteWebResponse::class.java
+            ) {
+                relationshipService.deleteRelationship(relationship.uid()!!)
+            }
 
-                if ((httpResponse.httpStatusCode() == HTTP_OK && ImportStatus.SUCCESS == status) ||
-                    httpResponse.httpStatusCode() == HTTP_NOT_FOUND
-                ) {
-                    relationshipStore.delete(relationship.uid()!!)
-                } else {
-                    // TODO Implement better handling
-                    // The relationship is marked as error, but there is no handling in the TEI. The TEI is being posted
-                    relationshipStore.setSyncState(relationship.uid()!!, State.ERROR)
+            response.fold(
+                onSuccess = { webResponse ->
+                    val httpCode = webResponse.httpStatusCode()
+                    val status = webResponse.response()?.status()
+
+                    if ((httpCode == HTTP_OK && status == ImportStatus.SUCCESS) || httpCode == HTTP_NOT_FOUND) {
+                        relationshipStore.delete(relationship.uid()!!)
+                    } else {
+                        handleDeleteRelationshipError(relationship.uid()!!)
+                    }
+                },
+                onFailure = {
+                    handleDeleteRelationshipError(relationship.uid()!!)
                 }
-                dataStatePropagator.propagateRelationshipUpdate(relationship)
-            }
-            emitter.onComplete()
+            )
+
+            dataStatePropagator.propagateRelationshipUpdate(relationship)
         }
+
+        emit(progressManager.increaseProgress(Relationship::class.java, false))
     }
 
     @Suppress("TooGenericExceptionCaught")
-    fun postRelationships(relationships: List<Relationship>): Observable<D2Progress> {
+    fun postRelationships(relationships: List<Relationship>): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
 
-        return if (relationships.isEmpty()) {
-            Observable.just<D2Progress>(progressManager.increaseProgress(Relationship::class.java, false))
+        if (relationships.isEmpty()) {
+            emit(progressManager.increaseProgress(Relationship::class.java, false))
         } else {
-            Observable.defer {
-                try {
-                    val payload = RelationshipPayload.builder().relationships(relationships).build()
-                    trackerStateManager.setPayloadStates(
-                        relationships = relationships,
-                        forcedState = State.UPLOADING
-                    )
-                    val httpResponse = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-                        relationshipService.postRelationship(payload),
-                        listOf(HTTP_CONFLICT),
-                        RelationshipWebResponse::class.java
-                    )
+            try {
+                val payload = RelationshipPayload.builder().relationships(relationships).build()
+                trackerStateManager.setPayloadStates(
+                    relationships = relationships,
+                    forcedState = State.UPLOADING
+                )
+                val httpResponse = coroutineAPICallExecutor.wrap(
+                    storeError = true,
+                    acceptedErrorCodes = listOf(HTTP_CONFLICT),
+                    errorClass = RelationshipWebResponse::class.java
+                ) {
+                    relationshipService.postRelationship(payload)
+                }.getOrThrow()
 
-                    relationshipImportHandler.handleRelationshipImportSummaries(
-                        importSummaries = httpResponse.response()?.importSummaries(),
-                        relationships = relationships
-                    )
-                    Observable.just<D2Progress>(progressManager.increaseProgress(Relationship::class.java, false))
-                } catch (e: Exception) {
-                    trackerStateManager.restorePayloadStates(relationships = relationships)
-                    relationships.forEach { dataStatePropagator.propagateRelationshipUpdate(it) }
-                    Observable.error<D2Progress>(e)
-                }
+                relationshipImportHandler.handleRelationshipImportSummaries(
+                    importSummaries = httpResponse.response()?.importSummaries(),
+                    relationships = relationships
+                )
+                emit(progressManager.increaseProgress(Relationship::class.java, false))
+            } catch (e: Exception) {
+                trackerStateManager.restorePayloadStates(relationships = relationships)
+                relationships.forEach { dataStatePropagator.propagateRelationshipUpdate(it) }
+                throw e
             }
         }
     }
+
+    private fun handleDeleteRelationshipError(relationshipUid: String) {
+        // TODO Implement better handling
+        // The relationship is marked as error, but there is no handling in the TEI. The TEI is being posted
+        relationshipStore.setSyncState(relationshipUid, State.ERROR)
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipService.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipService.kt
index a380412cd9..624afd400b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipService.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.relationship.internal
 
 import org.hisp.dhis.android.core.imports.internal.RelationshipDeleteWebResponse
 import org.hisp.dhis.android.core.imports.internal.RelationshipWebResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.POST
@@ -38,10 +37,10 @@ import retrofit2.http.Path
 internal interface RelationshipService {
 
     @DELETE("$RELATIONSHIPS/{uid}")
-    fun deleteRelationship(@Path("uid") relationship: String): Call<RelationshipDeleteWebResponse>
+    suspend fun deleteRelationship(@Path("uid") relationship: String): RelationshipDeleteWebResponse
 
     @POST(RELATIONSHIPS)
-    fun postRelationship(@Body payload: RelationshipPayload): Call<RelationshipWebResponse>
+    suspend fun postRelationship(@Body payload: RelationshipPayload): RelationshipWebResponse
 
     companion object {
         const val RELATIONSHIPS = "relationships"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
index e0ea169b9c..4dc936f99b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
@@ -28,11 +28,12 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.ObservableEmitter
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
 import java.net.HttpURLConnection.HTTP_CONFLICT
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.common.State
@@ -59,7 +60,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
     private val eventService: EventService,
     private val teiWebResponseHandler: TEIWebResponseHandler,
     private val eventImportHandler: EventImportHandler,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val relationshipPostCall: RelationshipPostCall,
     private val fileResourcePostCall: OldTrackerImporterFileResourcesPostCall,
     private val programOwnerPostCall: TrackerImporterProgramOwnerPostCall,
@@ -68,84 +69,71 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
 
     fun uploadTrackedEntityInstances(
         trackedEntityInstances: List<TrackedEntityInstance>
-    ): Observable<D2Progress> {
+    ): Flow<D2Progress> {
         val payload = trackerImporterPayloadGenerator.getTrackedEntityInstancePayload(trackedEntityInstances)
         return uploadPayload(payload)
     }
 
     fun uploadEvents(
         events: List<Event>
-    ): Observable<D2Progress> {
+    ): Flow<D2Progress> {
         val payload = trackerImporterPayloadGenerator.getEventPayload(events)
         return uploadPayload(payload)
     }
 
     private fun uploadPayload(
         payload: OldTrackerImporterPayload
-    ): Observable<D2Progress> {
-        return Observable.defer {
-            val partitionedRelationships = payload.relationships.partition { it.deleted()!! }
-
-            Observable.concatArray(
-                programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true),
-                relationshipPostCall.deleteRelationships(partitionedRelationships.first),
-                postTrackedEntityInstances(payload.trackedEntityInstances),
-                postEvents(payload.events),
-                relationshipPostCall.postRelationships(partitionedRelationships.second),
-                programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = false)
-            )
-        }
+    ): Flow<D2Progress> = flow {
+        val partitionedRelationships = payload.relationships.partition { it.deleted()!! }
+
+        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true))
+        emitAll(relationshipPostCall.deleteRelationships(partitionedRelationships.first))
+        emitAll(postTrackedEntityInstances(payload.trackedEntityInstances))
+        emitAll(postEvents(payload.events))
+        emitAll(relationshipPostCall.postRelationships(partitionedRelationships.second))
+        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = false))
     }
 
     @Suppress("TooGenericExceptionCaught")
     private fun postTrackedEntityInstances(
         trackedEntityInstances: List<TrackedEntityInstance>
-    ): Observable<D2Progress> {
-        return Observable.create { emitter: ObservableEmitter<D2Progress> ->
-            val progressManager = D2ProgressManager(null)
-            val teiPartitions = trackedEntityInstances
-                .chunked(TrackedEntityInstanceService.DEFAULT_PAGE_SIZE)
-                .map { partition -> fileResourcePostCall.uploadTrackedEntityFileResources(partition).blockingGet() }
-                .filter { it.items.isNotEmpty() }
-
-            for (partition in teiPartitions) {
-                try {
-                    val summary = postPartition(partition.items)
-                    val glassErrors = breakTheGlassHelper.getGlassErrors(summary, partition.items)
-
-                    if (glassErrors.isNotEmpty()) {
-                        breakTheGlassHelper.fakeBreakGlass(glassErrors)
-                        val breakGlassSummary = postPartition(glassErrors)
-
-                        summary.update(breakGlassSummary)
-                    }
-
-                    fileResourcePostCall.updateFileResourceStates(partition.fileResources)
-
-                    emitter.onNext(progressManager.increaseProgress(TrackedEntityInstance::class.java, false))
-                } catch (e: Exception) {
-                    trackerStateManager.restorePayloadStates(
-                        trackedEntityInstances = partition.items,
-                        fileResources = partition.fileResources
-                    )
-                    if (e is D2Error && e.isOffline) {
-                        emitter.onError(e)
-                        break
-                    } else {
-                        emitter.onNext(
-                            progressManager.increaseProgress(
-                                TrackedEntityInstance::class.java,
-                                false
-                            )
-                        )
-                    }
+    ): Flow<D2Progress> = flow {
+        val progressManager = D2ProgressManager(null)
+        val teiPartitions = trackedEntityInstances
+            .chunked(TrackedEntityInstanceService.DEFAULT_PAGE_SIZE)
+            .map { partition -> fileResourcePostCall.uploadTrackedEntityFileResources(partition).blockingGet() }
+            .filter { it.items.isNotEmpty() }
+
+        for (partition in teiPartitions) {
+            try {
+                val summary = postPartition(partition.items)
+                val glassErrors = breakTheGlassHelper.getGlassErrors(summary, partition.items)
+
+                if (glassErrors.isNotEmpty()) {
+                    breakTheGlassHelper.fakeBreakGlass(glassErrors)
+                    val breakGlassSummary = postPartition(glassErrors)
+
+                    summary.update(breakGlassSummary)
+                }
+
+                fileResourcePostCall.updateFileResourceStates(partition.fileResources)
+
+                emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, false))
+            } catch (e: Exception) {
+                trackerStateManager.restorePayloadStates(
+                    trackedEntityInstances = partition.items,
+                    fileResources = partition.fileResources
+                )
+                if (e is D2Error && e.isOffline) {
+                    throw e
+                } else {
+                    emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, false))
                 }
             }
-            emitter.onComplete()
         }
     }
 
-    private fun postPartition(
+    private suspend fun postPartition(
         trackedEntityInstances: List<TrackedEntityInstance>
     ): TEIWebResponseHandlerSummary {
         trackerStateManager.setPayloadStates(
@@ -153,60 +141,63 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
             forcedState = State.UPLOADING
         )
         val trackedEntityInstancePayload = TrackedEntityInstancePayload.create(trackedEntityInstances)
-        val webResponse = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService.postTrackedEntityInstances(
-                trackedEntityInstancePayload, "SYNC"
-            ),
-            @Suppress("MagicNumber")
-            listOf(HTTP_CONFLICT),
-            TEIWebResponse::class.java
-        )
-        return teiWebResponseHandler.handleWebResponse(webResponse, trackedEntityInstances)
+
+        val response = coroutineAPICallExecutor.wrap(
+            storeError = true,
+            acceptedErrorCodes = listOf(HTTP_CONFLICT),
+            errorClass = TEIWebResponse::class.java
+        ) {
+            trackedEntityInstanceService.postTrackedEntityInstances(trackedEntityInstancePayload, "SYNC")
+        }
+
+        return response.getOrThrow().let { webResponse ->
+            teiWebResponseHandler.handleWebResponse(webResponse, trackedEntityInstances)
+        }
     }
 
     @Suppress("TooGenericExceptionCaught")
     private fun postEvents(
         events: List<Event>
-    ): Observable<D2Progress> {
+    ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
 
-        return if (events.isEmpty()) {
-            Observable.just<D2Progress>(progressManager.increaseProgress(Event::class.java, true))
+        if (events.isEmpty()) {
+            emit(progressManager.increaseProgress(Event::class.java, true))
         } else {
-            Observable.defer {
-                val validEvents = fileResourcePostCall.uploadEventsFileResources(events).blockingGet()
+            val validEvents = fileResourcePostCall.uploadEventsFileResources(events).blockingGet()
 
-                val payload = EventPayload()
-                payload.events = validEvents.items
+            val payload = EventPayload()
+            payload.events = validEvents.items
 
-                trackerStateManager.setPayloadStates(
-                    events = payload.events,
-                    forcedState = State.UPLOADING
+            trackerStateManager.setPayloadStates(
+                events = payload.events,
+                forcedState = State.UPLOADING
+            )
+
+            val strategy = "SYNC"
+            try {
+                val webResponse = coroutineAPICallExecutor.wrap(
+                    storeError = true,
+                    acceptedErrorCodes = listOf(HTTP_CONFLICT),
+                    errorClass = EventWebResponse::class.java
+                ) {
+                    eventService.postEvents(payload, strategy)
+                }.getOrThrow()
+
+                eventImportHandler.handleEventImportSummaries(
+                    eventImportSummaries = webResponse.response()?.importSummaries(),
+                    events = payload.events
                 )
 
-                val strategy = "SYNC"
-                try {
-                    val webResponse = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-                        eventService.postEvents(payload, strategy),
-                        @Suppress("MagicNumber")
-                        listOf(HTTP_CONFLICT),
-                        EventWebResponse::class.java
-                    )
-                    eventImportHandler.handleEventImportSummaries(
-                        eventImportSummaries = webResponse?.response()?.importSummaries(),
-                        events = payload.events
-                    )
-
-                    fileResourcePostCall.updateFileResourceStates(validEvents.fileResources)
-
-                    Observable.just<D2Progress>(progressManager.increaseProgress(Event::class.java, true))
-                } catch (e: Exception) {
-                    trackerStateManager.restorePayloadStates(
-                        events = payload.events,
-                        fileResources = validEvents.fileResources
-                    )
-                    Observable.error<D2Progress>(e)
-                }
+                fileResourcePostCall.updateFileResourceStates(validEvents.fileResources)
+
+                emit(progressManager.increaseProgress(Event::class.java, true))
+            } catch (e: Exception) {
+                trackerStateManager.restorePayloadStates(
+                    events = payload.events,
+                    fileResources = validEvents.fileResources
+                )
+                throw e
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
index d3232ae84f..2bad2f0a9f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
@@ -39,10 +39,10 @@ import retrofit2.http.*
 @Suppress("LongParameterList")
 internal interface TrackedEntityInstanceService {
     @POST(TRACKED_ENTITY_INSTANCES)
-    fun postTrackedEntityInstances(
+    suspend fun postTrackedEntityInstances(
         @Body trackedEntityInstances: TrackedEntityInstancePayload?,
         @Query(STRATEGY) strategy: String?
-    ): Call<TEIWebResponse>
+    ): TEIWebResponse
 
     @GET(TRACKED_ENTITY_INSTANCES)
     suspend fun getTrackedEntityInstance(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
index 9a61d50f58..fcc2144234 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
@@ -29,10 +29,12 @@
 package org.hisp.dhis.android.core.trackedentity.ownership
 
 import io.reactivex.Completable
+import kotlinx.coroutines.runBlocking
 import java.util.*
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
@@ -42,7 +44,7 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
 internal class OwnershipManagerImpl @Inject constructor(
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val ownershipService: OwnershipService,
     private val dataStatePropagator: DataStatePropagator,
     private val programTempOwnerStore: ProgramTempOwnerStore,
@@ -54,30 +56,38 @@ internal class OwnershipManagerImpl @Inject constructor(
     }
 
     override fun blockingBreakGlass(trackedEntityInstance: String, program: String, reason: String) {
-        val breakGlassResponse: HttpMessageResponse = apiCallExecutor.executeObjectCall(
-            ownershipService.breakGlass(trackedEntityInstance, program, reason)
-        )
-
-        @Suppress("MagicNumber")
-        if (breakGlassResponse.httpStatusCode() == 200) {
-            programTempOwnerStore.insert(
-                ProgramTempOwner.builder()
-                    .program(program)
-                    .trackedEntityInstance(trackedEntityInstance)
-                    .reason(reason)
-                    .created(Date())
-                    .validUntil(getValidUntil())
+        runBlocking {
+            postBreakGlass(trackedEntityInstance, program, reason)
+        }.fold(
+            onSuccess = { breakGlassResponse ->
+                if (breakGlassResponse.httpStatusCode() == 200) {
+                    programTempOwnerStore.insert(
+                        ProgramTempOwner.builder()
+                            .program(program)
+                            .trackedEntityInstance(trackedEntityInstance)
+                            .reason(reason)
+                            .created(Date())
+                            .validUntil(getValidUntil())
+                            .build()
+                    )
+                } else {
+                    throw D2Error.builder()
+                        .errorCode(D2ErrorCode.API_RESPONSE_PROCESS_ERROR)
+                        .errorComponent(D2ErrorComponent.Server)
+                        .errorDescription(breakGlassResponse.message())
+                        .httpErrorCode(breakGlassResponse.httpStatusCode())
+                        .build()
+                }
+            },
+            onFailure = { e ->
+                throw D2Error.builder()
+                    .errorCode(D2ErrorCode.API_RESPONSE_PROCESS_ERROR)
+                    .errorComponent(D2ErrorComponent.Server)
+                    .errorDescription(e.errorDescription())
+                    .httpErrorCode(e.httpErrorCode())
                     .build()
-            )
-        } else {
-            @Suppress("TooGenericExceptionThrown")
-            throw D2Error.builder()
-                .errorCode(D2ErrorCode.API_RESPONSE_PROCESS_ERROR)
-                .errorComponent(D2ErrorComponent.Server)
-                .errorDescription(breakGlassResponse.message())
-                .httpErrorCode(breakGlassResponse.httpStatusCode())
-                .build()
-        }
+            }
+        )
     }
 
     override fun transfer(trackedEntityInstance: String, program: String, ownerOrgUnit: String): Completable {
@@ -96,7 +106,7 @@ internal class OwnershipManagerImpl @Inject constructor(
         dataStatePropagator.refreshTrackedEntityInstanceAggregatedSyncState(trackedEntityInstance)
     }
 
-    internal fun fakeBreakGlass(trackedEntityInstance: String, program: String) {
+    internal suspend fun fakeBreakGlass(trackedEntityInstance: String, program: String) {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(ProgramTempOwnerTableInfo.Columns.TRACKED_ENTITY_INSTANCE, trackedEntityInstance)
             .appendKeyStringValue(ProgramTempOwnerTableInfo.Columns.PROGRAM, program)
@@ -111,9 +121,17 @@ internal class OwnershipManagerImpl @Inject constructor(
         val previousReason = mostRecent.firstOrNull()?.reason() ?: "<Previous reason not found>"
         val fakeReason = "Android App sync: $previousReason"
 
-        apiCallExecutor.executeObjectCall(
-            ownershipService.breakGlass(trackedEntityInstance, program, fakeReason)
-        )
+        postBreakGlass(trackedEntityInstance, program, fakeReason)
+    }
+
+    private suspend fun postBreakGlass(
+        trackedEntityInstance: String,
+        program: String,
+        reason: String
+    ): Result<HttpMessageResponse, D2Error> {
+        return coroutineAPICallExecutor.wrap(storeError = true) {
+            ownershipService.breakGlass(trackedEntityInstance, program, reason)
+        }
     }
 
     private fun getValidUntil(): Date {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt
index f62543b3e5..4b3926a541 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.ownership
 
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
-import retrofit2.Call
 import retrofit2.http.POST
 import retrofit2.http.PUT
 import retrofit2.http.Query
@@ -36,18 +35,18 @@ import retrofit2.http.Query
 internal interface OwnershipService {
 
     @POST("$OWNERSHIP_URL/override")
-    fun breakGlass(
+    suspend fun breakGlass(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String,
         @Query(PROGRAM) program: String,
         @Query(REASON) reason: String
-    ): Call<HttpMessageResponse>
+    ): HttpMessageResponse
 
     @PUT("$OWNERSHIP_URL/transfer")
-    fun transfer(
+    suspend fun transfer(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String,
         @Query(PROGRAM) program: String,
         @Query(ORG_UNIT) ou: String
-    ): Call<HttpMessageResponse>
+    ): HttpMessageResponse
 
     companion object {
         const val OWNERSHIP_URL = "tracker/ownership"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
index fd329cfa56..33ba8a55f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
@@ -29,43 +29,41 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 
 import dagger.Reusable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
-import org.hisp.dhis.android.core.maintenance.D2Error
 
 @Reusable
 internal class ProgramOwnerPostCall @Inject constructor(
     private val ownershipService: OwnershipService,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val programOwnerStore: ProgramOwnerStore,
     private val dataStatePropagator: DataStatePropagator
 ) {
 
-    fun uploadProgramOwner(programOwner: ProgramOwner): Boolean {
-        return try {
-            val response = apiCallExecutor.executeObjectCall(
-                ownershipService.transfer(
-                    programOwner.trackedEntityInstance(),
-                    programOwner.program(),
-                    programOwner.ownerOrgUnit()
-                )
+    suspend fun uploadProgramOwner(programOwner: ProgramOwner) {
+        val response = coroutineAPICallExecutor.wrap(storeError = true) {
+            ownershipService.transfer(
+                programOwner.trackedEntityInstance(),
+                programOwner.program(),
+                programOwner.ownerOrgUnit()
             )
+        }
 
-            @Suppress("MagicNumber")
-            val isSuccessful = response.httpStatusCode() == 200
-
-            if (isSuccessful) {
-                val syncedProgramOwner = programOwner.toBuilder().syncState(State.SYNCED).build()
-                programOwnerStore.updateOrInsertWhere(syncedProgramOwner)
-                dataStatePropagator.refreshTrackedEntityInstanceAggregatedSyncState(
-                    programOwner.trackedEntityInstance()
-                )
+        response.fold(
+            onSuccess = { messageResponse ->
+                @Suppress("MagicNumber")
+                if (messageResponse.httpStatusCode() == 200) {
+                    val syncedProgramOwner = programOwner.toBuilder().syncState(State.SYNCED).build()
+                    programOwnerStore.updateOrInsertWhere(syncedProgramOwner)
+                    dataStatePropagator.refreshTrackedEntityInstanceAggregatedSyncState(
+                        programOwner.trackedEntityInstance()
+                    )
+                }
+            },
+            onFailure = {
+                // TODO Create a record in TEI
             }
-            isSuccessful
-        } catch (e: D2Error) {
-            // TODO Create a record in TEI
-            false
-        }
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
index 4faaab5c6d..03da4b608b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
@@ -133,7 +133,7 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
     /**
      * Fake break the glass for importer V1
      */
-    fun fakeBreakGlass(instances: List<TrackedEntityInstance>) {
+    suspend fun fakeBreakGlass(instances: List<TrackedEntityInstance>) {
         instances.forEach { instance ->
             TrackedEntityInstanceInternalAccessor.accessEnrollments(instance).forEach { enrollment ->
                 if (instance.uid() != null && enrollment.program() != null)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
index 65476baa8a..d3bb7c5085 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
@@ -28,9 +28,11 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
@@ -49,24 +51,24 @@ internal class TrackerImporterProgramOwnerPostCall @Inject constructor(
     fun uploadProgramOwners(
         programOwners: Map<String, List<ProgramOwner>>,
         onlyExistingTeis: Boolean = false
-    ): Observable<D2Progress> {
-        return Observable.create { emitter ->
-            programOwners.forEach { (tei, programOwners) ->
-                programOwners
-                    .filter {
-                        val unsyncedOwner by lazy { selectWhere(it)?.syncState() != State.SYNCED }
-                        val existingTei by lazy {
-                            trackedEntityInstanceStore.selectByUid(tei)?.syncState() != State.TO_POST
-                        }
+    ): Flow<D2Progress> = flow {
+        val progressManager = D2ProgressManager(null)
 
-                        unsyncedOwner && (!onlyExistingTeis || existingTei)
-                    }.forEach {
-                        programOwnerPostCall.uploadProgramOwner(it)
+        programOwners.forEach { (tei, programOwners) ->
+            programOwners
+                .filter {
+                    val unsyncedOwner by lazy { selectWhere(it)?.syncState() != State.SYNCED }
+                    val existingTei by lazy {
+                        trackedEntityInstanceStore.selectByUid(tei)?.syncState() != State.TO_POST
                     }
-            }
 
-            emitter.onComplete()
+                    unsyncedOwner && (!onlyExistingTeis || existingTei)
+                }.forEach {
+                    programOwnerPostCall.uploadProgramOwner(it)
+                }
         }
+
+        emit(progressManager.increaseProgress(ProgramOwner::class.java, false))
     }
 
     private fun selectWhere(o: ProgramOwner): ProgramOwner? {

From cf1453f03b70219a4c4190407fd0748ff2c2a830 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 31 Jul 2023 10:32:49 +0200
Subject: [PATCH 137/478] [ANDROSDK-1679] Refactor newTracker upload call

---
 .../event/internal/EventPostParentCall.kt     |   5 +-
 .../internal/RelationshipPostCall.kt          |   4 +-
 .../internal/OldTrackerImporterPostCall.kt    |   4 +-
 .../TrackedEntityInstancePostParentCall.kt    |   5 +-
 .../ownership/OwnershipManagerImpl.kt         |   3 +-
 .../tracker/importer/internal/JobQueryCall.kt | 107 ++++++++++--------
 .../internal/JobReportFileResourceHandler.kt  |  14 +--
 .../TrackerImporterBreakTheGlassHelper.kt     |   2 +-
 .../internal/TrackerImporterPostCall.kt       |  93 ++++++++-------
 .../TrackerImporterProgramOwnerPostCall.kt    |   2 +-
 .../internal/TrackerImporterService.kt        |  11 +-
 11 files changed, 127 insertions(+), 123 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
index 1c81219bd6..8c1f65221d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.event.internal
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.trackedentity.internal.OldTrackerImporterPostCall
@@ -48,9 +49,9 @@ internal class EventPostParentCall @Inject internal constructor(
             Observable.empty()
         } else {
             if (trackerParentCallHelper.useNewTrackerImporter()) {
-                trackerImporterCall.uploadEvents(events)
+                trackerImporterCall.uploadEvents(events).asObservable()
             } else {
-                oldTrackerImporterCall.uploadEvents(events)
+                oldTrackerImporterCall.uploadEvents(events).asObservable()
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
index c77f4714ae..93a0ca8038 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
 import java.net.HttpURLConnection.*
 import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
index 4dc936f99b..02c58032a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
+import java.net.HttpURLConnection.HTTP_CONFLICT
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
-import java.net.HttpURLConnection.HTTP_CONFLICT
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
index fe5ab995ca..705ad4812b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Reusable
 import io.reactivex.Observable
 import javax.inject.Inject
+import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
@@ -47,9 +48,9 @@ internal class TrackedEntityInstancePostParentCall @Inject internal constructor(
             Observable.empty()
         } else {
             if (trackerParentCallHelper.useNewTrackerImporter()) {
-                trackerImporterCall.uploadTrackedEntityInstances(trackedEntityInstances)
+                trackerImporterCall.uploadTrackedEntityInstances(trackedEntityInstances).asObservable()
             } else {
-                oldTrackerImporterCall.uploadTrackedEntityInstances(trackedEntityInstances)
+                oldTrackerImporterCall.uploadTrackedEntityInstances(trackedEntityInstances).asObservable()
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
index fcc2144234..ed9a7d320e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
@@ -29,9 +29,9 @@
 package org.hisp.dhis.android.core.trackedentity.ownership
 
 import io.reactivex.Completable
-import kotlinx.coroutines.runBlocking
 import java.util.*
 import javax.inject.Inject
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -60,6 +60,7 @@ internal class OwnershipManagerImpl @Inject constructor(
             postBreakGlass(trackedEntityInstance, program, reason)
         }.fold(
             onSuccess = { breakGlassResponse ->
+                @Suppress("MagicNumber")
                 if (breakGlassResponse.httpStatusCode() == 200) {
                     programTempOwnerStore.insert(
                         ProgramTempOwner.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
index cf3dd8a800..1423d41795 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
@@ -29,55 +29,57 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.rx2.asObservable
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterTrackedEntityPostStateManager
 
 internal const val ATTEMPTS_AFTER_UPLOAD = 90
 internal const val ATTEMPTS_WHEN_QUERYING = 1
-internal const val ATTEMPTS_INITIAL_DELAY = 1L
-internal const val ATTEMPTS_INTERVAL = 2L
+internal val ATTEMPTS_INITIAL_DELAY = 1.seconds
+internal val ATTEMPTS_INTERVAL = 2.seconds
 
 @Reusable
 internal class JobQueryCall @Inject internal constructor(
     private val service: TrackerImporterService,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val trackerJobObjectStore: TrackerJobObjectStore,
     private val handler: JobReportHandler,
     private val fileResourceHandler: JobReportFileResourceHandler,
     private val stateManager: NewTrackerImporterTrackedEntityPostStateManager
 ) {
 
-    fun queryPendingJobs(): Observable<D2Progress> {
-        return Observable.just(true)
-            .flatMapIterable {
-                val pendingJobs = trackerJobObjectStore.selectAll()
-                    .sortedBy { it.lastUpdated() }
-                    .groupBy { it.jobUid() }
-                    .toList()
+    fun queryPendingJobs(): Observable<D2Progress> = flow {
+        val pendingJobs = trackerJobObjectStore.selectAll()
+            .sortedBy { it.lastUpdated() }
+            .groupBy { it.jobUid() }
+            .toList()
 
-                pendingJobs.withIndex().map {
-                    Triple(it.value.first, it.value.second, it.index == pendingJobs.size - 1)
-                }
-            }
-            .flatMap {
-                queryJobInternal(it.first, it.second, it.third, ATTEMPTS_WHEN_QUERYING)
-                    .flatMap { _ -> updateFileResourceStates(it.second) }
-            }
-    }
+        pendingJobs.withIndex().map {
+            Triple(it.value.first, it.value.second, it.index == pendingJobs.size - 1)
+        }.forEach {
+            emitAll(queryJobInternal(it.first, it.second, it.third, ATTEMPTS_WHEN_QUERYING))
+            updateFileResourceStates(it.second)
+        }
+    }.asObservable()
 
-    fun queryJob(jobId: String): Observable<D2Progress> {
+    fun queryJob(jobId: String): Flow<D2Progress> {
         val jobObjects = trackerJobObjectStore.selectWhere(byJobIdClause(jobId))
         return queryJobInternal(jobId, jobObjects, true, ATTEMPTS_AFTER_UPLOAD)
     }
 
-    fun updateFileResourceStates(jobObjects: List<TrackerJobObject>): Observable<D2Progress> {
+    private fun updateFileResourceStates(jobObjects: List<TrackerJobObject>) {
         return fileResourceHandler.updateFileResourceStates(jobObjects)
     }
 
@@ -86,39 +88,46 @@ internal class JobQueryCall @Inject internal constructor(
         jobObjects: List<TrackerJobObject>,
         isLastJob: Boolean,
         attempts: Int
-    ): Observable<D2Progress> {
+    ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
-        @Suppress("TooGenericExceptionCaught")
-        return Observable.interval(ATTEMPTS_INITIAL_DELAY, ATTEMPTS_INTERVAL, TimeUnit.SECONDS)
-            .map {
-                try {
-                    downloadAndHandle(jobId, jobObjects)
+
+        delay(ATTEMPTS_INITIAL_DELAY)
+
+        @Suppress("TooGenericExceptionCaught", "UnusedPrivateMember")
+        for (i in 0..attempts) {
+            val isComplete = try {
+                downloadAndHandle(jobId, jobObjects)
+                true
+            } catch (e: Throwable) {
+                if (e is D2Error && e.errorCode() == D2ErrorCode.JOB_REPORT_NOT_AVAILABLE) {
+                    false
+                } else {
+                    handlerError(jobId, jobObjects)
                     true
-                } catch (e: Throwable) {
-                    if (e is D2Error && e.errorCode() == D2ErrorCode.JOB_REPORT_NOT_AVAILABLE) {
-                        false
-                    } else {
-                        handlerError(jobId, jobObjects)
-                        true
-                    }
                 }
             }
-            .takeUntil { it }
-            .take(attempts.toLong())
-            .map {
-                progressManager.increaseProgress(
-                    JobReport::class.java,
-                    it && isLastJob
-                )
+
+            emit(progressManager.increaseProgress(JobReport::class.java, isComplete && isLastJob))
+
+            if (isComplete) {
+                break
             }
-            .flatMap { updateFileResourceStates(jobObjects) }
+
+            delay(ATTEMPTS_INTERVAL)
+        }
+
+        updateFileResourceStates(jobObjects)
+        emit(progressManager.increaseProgress(FileResource::class.java, isLastJob))
     }
 
-    private fun downloadAndHandle(jobId: String, jobObjects: List<TrackerJobObject>) {
-        val jobReport = apiCallExecutor.executeObjectCallWithErrorCatcher(
-            service.getJobReport(jobId),
-            JobQueryErrorCatcher()
-        )
+    private suspend fun downloadAndHandle(jobId: String, jobObjects: List<TrackerJobObject>) {
+        val jobReport = coroutineAPICallExecutor.wrap(
+            storeError = false,
+            errorCatcher = JobQueryErrorCatcher()
+        ) {
+            service.getJobReport(jobId)
+        }.getOrThrow()
+
         trackerJobObjectStore.deleteWhere(byJobIdClause(jobId))
         handler.handle(jobReport, jobObjects)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
index 803fcdbafd..8668e903c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
@@ -28,9 +28,7 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
@@ -40,15 +38,13 @@ import org.hisp.dhis.android.core.fileresource.internal.FileResourceHelper
 internal class JobReportFileResourceHandler @Inject internal constructor(
     private val fileResourceHelper: FileResourceHelper
 ) {
-    fun updateFileResourceStates(jobObjects: List<TrackerJobObject>): Observable<D2Progress> {
-        return Observable.fromCallable {
-            val progress = D2ProgressManager(null)
+    fun updateFileResourceStates(jobObjects: List<TrackerJobObject>) {
+        val progress = D2ProgressManager(null)
 
-            val fileResources = jobObjects.flatMap { it.fileResources() }
+        val fileResources = jobObjects.flatMap { it.fileResources() }
 
-            fileResourceHelper.updateFileResourceStates(fileResources, FileResourceDomainType.TRACKER)
+        fileResourceHelper.updateFileResourceStates(fileResources, FileResourceDomainType.TRACKER)
 
-            progress.increaseProgress(FileResource::class.java, false)
-        }
+        progress.increaseProgress(FileResource::class.java, false)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
index 03da4b608b..60dddeaa1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
@@ -145,7 +145,7 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
     /**
      * Fake break the glass for importer V2
      */
-    fun fakeBreakGlass(payload: NewTrackerImporterPayload) {
+    suspend fun fakeBreakGlass(payload: NewTrackerImporterPayload) {
         val teiProgramForEnrollment = payload.enrollments.mapNotNull {
             if (it.trackedEntity() != null && it.program() != null) {
                 Pair(it.trackedEntity()!!, it.program()!!)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index 26c10ea23b..e4a41d94c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -28,15 +28,19 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.Single
 import java.util.Date
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayloadWrapper
@@ -54,56 +58,48 @@ internal class TrackerImporterPostCall @Inject internal constructor(
     private val service: TrackerImporterService,
     private val fileResourcesPostCall: TrackerImporterFileResourcesPostCall,
     private val programOwnerPostCall: TrackerImporterProgramOwnerPostCall,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val jobQueryCall: JobQueryCall,
     private val jobObjectHandler: TrackerJobObjectHandler,
     private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
 ) {
     fun uploadTrackedEntityInstances(
         filteredTrackedEntityInstances: List<TrackedEntityInstance>
-    ): Observable<D2Progress> {
-        return Observable.defer {
-            postPayloadWrapper(payloadGenerator.getTrackedEntityPayload(filteredTrackedEntityInstances))
-        }
+    ): Flow<D2Progress> {
+        return postPayloadWrapper(payloadGenerator.getTrackedEntityPayload(filteredTrackedEntityInstances))
     }
 
     fun uploadEvents(
         filteredEvents: List<Event>
-    ): Observable<D2Progress> {
-        return Observable.defer {
-            postPayloadWrapper(payloadGenerator.getEventPayload(filteredEvents))
-        }
+    ): Flow<D2Progress> {
+        return postPayloadWrapper(payloadGenerator.getEventPayload(filteredEvents))
     }
 
     private fun postPayloadWrapper(
         payloadWrapper: NewTrackerImporterPayloadWrapper
-    ): Observable<D2Progress> {
-        return fileResourcesPostCall.uploadFileResources(payloadWrapper).flatMapObservable { payload ->
-            Observable.concat(
-                programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true),
-                doPostCall(payload.deleted, IMPORT_STRATEGY_DELETE),
-                doPostCall(payload.updated, IMPORT_STRATEGY_CREATE_AND_UPDATE),
-                programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = false)
-            )
-        }
+    ): Flow<D2Progress> = flow {
+        val payload = fileResourcesPostCall.uploadFileResources(payloadWrapper).blockingGet()
+
+        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true))
+        emitAll(doPostCall(payload.deleted, IMPORT_STRATEGY_DELETE))
+        emitAll(doPostCall(payload.updated, IMPORT_STRATEGY_CREATE_AND_UPDATE))
+        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = false))
     }
 
     private fun doPostCall(
         payload: NewTrackerImporterPayload,
         importStrategy: String
-    ): Observable<D2Progress> {
-        return if (payload.isEmpty()) {
-            Observable.empty<D2Progress>()
+    ): Flow<D2Progress> = flow {
+        if (payload.isEmpty()) {
+            emit(D2ProgressManager(null).increaseProgress(NewTrackerImporterPayload::class.java, true))
         } else {
-            doPost(payload, importStrategy).flatMap { d2Progress ->
-                val glassErrors = breakTheGlassHelper.getGlassErrors(payload)
+            emitAll(doPost(payload, importStrategy))
+
+            val glassErrors = breakTheGlassHelper.getGlassErrors(payload)
 
-                if (glassErrors.isEmpty()) {
-                    Observable.just(d2Progress)
-                } else {
-                    breakTheGlassHelper.fakeBreakGlass(glassErrors)
-                    doPost(payload, importStrategy)
-                }
+            if (!glassErrors.isEmpty()) {
+                breakTheGlassHelper.fakeBreakGlass(glassErrors)
+                emitAll(doPost(payload, importStrategy))
             }
         }
     }
@@ -111,30 +107,31 @@ internal class TrackerImporterPostCall @Inject internal constructor(
     private fun doPost(
         payload: NewTrackerImporterPayload,
         importStrategy: String
-    ): Observable<D2Progress> {
-        return Observable.defer {
-            stateManager.setStates(payload, State.UPLOADING)
+    ): Flow<D2Progress> = flow {
+        stateManager.setStates(payload, State.UPLOADING)
 
-            Single.fromCallable {
-                doPostCallInternal(payload, importStrategy)
-            }.doOnError {
+        doPostCallInternal(payload, importStrategy).fold(
+            onSuccess = { jobId ->
+                emitAll(jobQueryCall.queryJob(jobId))
+            },
+            onFailure = {
                 stateManager.restoreStates(payload)
-            }.flatMapObservable {
-                jobQueryCall.queryJob(it)
+                throw it
             }
-        }
+        )
     }
 
-    private fun doPostCallInternal(
+    private suspend fun doPostCallInternal(
         payload: NewTrackerImporterPayload,
         importStrategy: String
-    ): String {
-        val res = apiCallExecutor.executeObjectCall(
+    ): Result<String, D2Error> {
+        return coroutineAPICallExecutor.wrap(storeError = true) {
             service.postTrackedEntityInstances(payload, ATOMIC_MODE_OBJECT, importStrategy)
-        )
-        val jobId = res.response().uid()
-        jobObjectHandler.handleMany(generateJobObjects(payload, jobId))
-        return jobId
+        }.map { res ->
+            val jobId = res.response().uid()
+            jobObjectHandler.handleMany(generateJobObjects(payload, jobId))
+            jobId
+        }
     }
 
     private fun generateJobObjects(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
index d3bb7c5085..c3148253b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
index 90b4f300d0..1e45775e6e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
 import org.hisp.dhis.android.core.trackedentity.internal.ObjectWithUidWebResponse
-import retrofit2.Call
 import retrofit2.http.*
 
 internal const val TRACKER_URL = "tracker"
@@ -46,19 +45,19 @@ internal const val JOB_ID = "jobId"
 internal interface TrackerImporterService {
 
     @POST(TRACKER_URL)
-    fun postTrackedEntityInstances(
+    suspend fun postTrackedEntityInstances(
         @Body payload: NewTrackerImporterPayload,
         @Query(ATOMIC_MODE) atomicMode: String,
         @Query(IMPORT_STRATEGY) importStrategy: String
-    ): Call<ObjectWithUidWebResponse>
+    ): ObjectWithUidWebResponse
 
     @POST(TRACKER_URL)
-    fun postEvents(
+    suspend fun postEvents(
         @Body events: NewTrackerImporterPayload,
         @Query(ATOMIC_MODE) atomicMode: String,
         @Query(IMPORT_STRATEGY) importStrategy: String
-    ): Call<ObjectWithUidWebResponse>
+    ): ObjectWithUidWebResponse
 
     @GET("$JOBS_URL{jobId}/report")
-    fun getJobReport(@Path(JOB_ID) jobId: String): Call<JobReport>
+    suspend fun getJobReport(@Path(JOB_ID) jobId: String): JobReport
 }

From c97cbd0af525c9cb7a3354817ce130d891235c1c Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 31 Jul 2023 11:22:37 +0200
Subject: [PATCH 138/478] [ANDROSDK-1679] Adapt instrumentation test

---
 .../core/event/internal/EventAPIRealShould.kt | 147 +++++----
 .../api/BreakTheGlassAPIShould.java           | 301 ------------------
 .../api/BreakTheGlassAPIShould.kt             | 278 ++++++++++++++++
 .../api/TrackedEntityInstanceAPIShould.kt     | 299 +++++------------
 .../java/org/hisp/dhis/android/core/D2.kt     |   6 +
 .../core/arch/d2/internal/D2DIComponent.kt    |   4 +
 .../core/event/internal/EventService.kt       |   4 +-
 .../internal/TrackedEntityInstanceService.kt  |   9 -
 8 files changed, 447 insertions(+), 601 deletions(-)
 delete mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
index 96049a80c3..39660f16dc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
@@ -28,10 +28,12 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import java.util.*
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.internal.EventWebResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -39,36 +41,36 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.junit.Assert
 import org.junit.Before
 
+@OptIn(ExperimentalCoroutinesApi::class)
 abstract class EventAPIRealShould internal constructor(
     // API version dependant parameters
     private val serverUrl: String,
     private val strategy: String
 ) : BaseRealIntegrationTest() {
     private val ouMode = OrganisationUnitMode.ACCESSIBLE.name
-    private lateinit var apiCallExecutor: APICallExecutor
+    private lateinit var apiCallExecutor: CoroutineAPICallExecutor
     private lateinit var eventService: EventService
 
     @Before
     override fun setUp() {
         super.setUp()
-        apiCallExecutor = APICallExecutorImpl.create(d2.databaseAdapter(), null)
+        apiCallExecutor = d2.coroutineAPICallExecutor()
         eventService = d2.retrofit().create(EventService::class.java)
     }
 
     // @Test
     @Throws(Exception::class)
-    fun valid_events() {
+    fun valid_events() = runTest {
         login()
         val validEvent1 = EventUtils.createValidEvent()
         val validEvent2 = EventUtils.createValidEvent()
         val payload = EventPayload()
         payload.events = listOf(validEvent1, validEvent2)
-        val response = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            eventService
-                .postEvents(payload, strategy),
-            listOf(409), EventWebResponse::class.java
-        )
+
+        val response = postPayload(payload).getOrThrow()
+
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validEvent1.uid() == importSummary.reference()) {
                 EventUtils.assertEvent(importSummary, ImportStatus.SUCCESS)
@@ -78,30 +80,31 @@ abstract class EventAPIRealShould internal constructor(
         }
 
         // Check server status
-        val serverValidEvent1 = apiCallExecutor.executeObjectCall(
+        val serverValidEvent1 = apiCallExecutor.wrap {
             eventService.getEvent(validEvent1.uid(), EventFields.allFields, ouMode)
-        )
-        val serverValidEvent2 = apiCallExecutor.executeObjectCall(
+        }.getOrThrow()
+
+        val serverValidEvent2 = apiCallExecutor.wrap {
             eventService.getEvent(validEvent2.uid(), EventFields.allFields, ouMode)
-        )
+        }.getOrThrow()
+
         assertThat(serverValidEvent1).isNotNull()
         assertThat(serverValidEvent2).isNotNull()
     }
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_invalid_orgunit() {
+    fun event_with_invalid_orgunit() = runTest {
         login()
         val validEvent = EventUtils.createValidEvent()
         val invalidEvent = EventUtils.createEventWithInvalidOrgunit()
         val payload = EventPayload()
         payload.events = listOf(validEvent, invalidEvent)
-        val response = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            eventService
-                .postEvents(payload, strategy),
-            listOf(409), EventWebResponse::class.java
-        )
+
+        val response = postPayload(payload).getOrThrow()
+
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.ERROR)
+
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validEvent.uid() == importSummary.reference()) {
                 EventUtils.assertEvent(importSummary, ImportStatus.SUCCESS)
@@ -111,18 +114,20 @@ abstract class EventAPIRealShould internal constructor(
         }
 
         // Check server status
-        val serverValidEvent = apiCallExecutor.executeObjectCall(
+        val serverValidEvent = apiCallExecutor.wrap {
             eventService.getEvent(validEvent.uid(), EventFields.allFields, ouMode)
-        )
+        }.getOrThrow()
+
         assertThat(serverValidEvent).isNotNull()
+
         try {
-            apiCallExecutor.executeObjectCall(
+            apiCallExecutor.wrap {
                 eventService.getEvent(
                     invalidEvent.uid(),
                     EventFields.allFields,
                     ouMode
                 )
-            )
+            }.getOrThrow()
             Assert.fail("Should not reach that line")
         } catch (e: D2Error) {
             assertThat(e.httpErrorCode()).isEqualTo(404)
@@ -131,18 +136,17 @@ abstract class EventAPIRealShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_invalid_attribute_option_combo() {
+    fun event_with_invalid_attribute_option_combo() = runTest {
         login()
         val validEvent = EventUtils.createValidEvent()
         val invalidEvent = EventUtils.createEventWithInvalidAttributeOptionCombo()
         val payload = EventPayload()
         payload.events = listOf(validEvent, invalidEvent)
-        val response = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            eventService
-                .postEvents(payload, strategy),
-            listOf(409), EventWebResponse::class.java
-        )
+
+        val response = postPayload(payload).getOrThrow()
+
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.ERROR)
+
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validEvent.uid() == importSummary.reference()) {
                 EventUtils.assertEvent(importSummary, ImportStatus.SUCCESS)
@@ -152,18 +156,20 @@ abstract class EventAPIRealShould internal constructor(
         }
 
         // Check server status
-        val serverValidEvent = apiCallExecutor.executeObjectCall(
+        val serverValidEvent = apiCallExecutor.wrap {
             eventService.getEvent(validEvent.uid(), EventFields.allFields, ouMode)
-        )
+        }.getOrThrow()
+
         assertThat(serverValidEvent).isNotNull()
+
         try {
-            apiCallExecutor.executeObjectCall(
+            apiCallExecutor.wrap {
                 eventService.getEvent(
                     invalidEvent.uid(),
                     EventFields.allFields,
                     ouMode
                 )
-            )
+            }.getOrThrow()
             Assert.fail("Should not reach that line")
         } catch (e: D2Error) {
             assertThat(e.httpErrorCode()).isEqualTo(404)
@@ -172,18 +178,17 @@ abstract class EventAPIRealShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_future_date_does_not_fail() {
+    fun event_with_future_date_does_not_fail() = runTest {
         login()
         val validEvent1 = EventUtils.createValidEvent()
         val validEvent2 = EventUtils.createEventWithFutureDate()
         val payload = EventPayload()
         payload.events = listOf(validEvent1, validEvent2)
-        val response = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            eventService
-                .postEvents(payload, strategy),
-            listOf(409), EventWebResponse::class.java
-        )
+
+        val response = postPayload(payload).getOrThrow()
+
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validEvent1.uid() == importSummary.reference()) {
                 EventUtils.assertEvent(importSummary, ImportStatus.SUCCESS)
@@ -193,30 +198,31 @@ abstract class EventAPIRealShould internal constructor(
         }
 
         // Check server status
-        val serverValidEvent1 = apiCallExecutor.executeObjectCall(
+        val serverValidEvent1 = apiCallExecutor.wrap {
             eventService.getEvent(validEvent1.uid(), EventFields.allFields, ouMode)
-        )
-        val serverValidEvent2 = apiCallExecutor.executeObjectCall(
+        }.getOrThrow()
+
+        val serverValidEvent2 = apiCallExecutor.wrap {
             eventService.getEvent(validEvent2.uid(), EventFields.allFields, ouMode)
-        )
+        }.getOrThrow()
+
         assertThat(serverValidEvent1).isNotNull()
         assertThat(serverValidEvent2).isNotNull()
     }
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_invalid_program() {
+    fun event_with_invalid_program() = runTest {
         login()
         val validEvent = EventUtils.createValidEvent()
         val invalidEvent = EventUtils.createEventWithInvalidProgram()
         val payload = EventPayload()
         payload.events = listOf(validEvent, invalidEvent)
-        val response = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            eventService
-                .postEvents(payload, strategy),
-            listOf(409), EventWebResponse::class.java
-        )
+
+        val response = postPayload(payload).getOrThrow()
+
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.ERROR)
+
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validEvent.uid() == importSummary.reference()) {
                 EventUtils.assertEvent(importSummary, ImportStatus.SUCCESS)
@@ -226,18 +232,20 @@ abstract class EventAPIRealShould internal constructor(
         }
 
         // Check server status
-        val serverValidEvent = apiCallExecutor.executeObjectCall(
+        val serverValidEvent = apiCallExecutor.wrap {
             eventService.getEvent(validEvent.uid(), EventFields.allFields, ouMode)
-        )
+        }.getOrThrow()
+
         assertThat(serverValidEvent).isNotNull()
+
         try {
-            apiCallExecutor.executeObjectCall(
+            apiCallExecutor.wrap {
                 eventService.getEvent(
                     invalidEvent.uid(),
                     EventFields.allFields,
                     ouMode
                 )
-            )
+            }.getOrThrow()
             Assert.fail("Should not reach that line")
         } catch (e: D2Error) {
             assertThat(e.httpErrorCode()).isEqualTo(404)
@@ -246,18 +254,17 @@ abstract class EventAPIRealShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_invalid_data_values() {
+    fun event_with_invalid_data_values() = runTest {
         login()
         val validEvent = EventUtils.createValidEvent()
         val invalidEvent = EventUtils.createEventWithInvalidDataValues()
         val payload = EventPayload()
         payload.events = listOf(validEvent, invalidEvent)
-        val response = apiCallExecutor.executeObjectCallWithAcceptedErrorCodes(
-            eventService
-                .postEvents(payload, strategy),
-            listOf(409), EventWebResponse::class.java
-        )
+
+        val response = postPayload(payload).getOrThrow()
+
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.WARNING)
+
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validEvent.uid() == importSummary.reference()) {
                 EventUtils.assertEvent(importSummary, ImportStatus.SUCCESS)
@@ -267,24 +274,36 @@ abstract class EventAPIRealShould internal constructor(
         }
 
         // Check server status
-        val serverValidEvent = apiCallExecutor.executeObjectCall(
+        val serverValidEvent = apiCallExecutor.wrap {
             eventService.getEvent(
                 validEvent.uid(),
                 EventFields.allFields, ouMode
             )
-        )
-        val serverInvalidEvent = apiCallExecutor.executeObjectCall(
+        }.getOrThrow()
+
+        val serverInvalidEvent = apiCallExecutor.wrap {
             eventService.getEvent(
                 invalidEvent.uid(),
                 EventFields.allFields, ouMode
             )
-        )
+        }.getOrThrow()
+
         assertThat(serverValidEvent).isNotNull()
         assertThat(serverValidEvent.trackedEntityDataValues()!!.size).isEqualTo(2)
         assertThat(serverInvalidEvent).isNotNull()
         assertThat(serverInvalidEvent.trackedEntityDataValues()).isNull()
     }
 
+    private suspend fun postPayload(payload: EventPayload): Result<EventWebResponse, D2Error> {
+        return apiCallExecutor.wrap(
+            storeError = false,
+            acceptedErrorCodes = listOf(409),
+            errorClass = EventWebResponse::class.java
+        ) {
+            eventService.postEvents(payload, strategy)
+        }
+    }
+
     private fun login() {
         d2.userModule().logIn(username, password, url).blockingGet()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java
deleted file mode 100644
index 73c0c53543..0000000000
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.api;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.hisp.dhis.android.core.imports.ImportStatus.ERROR;
-import static org.hisp.dhis.android.core.imports.ImportStatus.SUCCESS;
-import static org.hisp.dhis.android.core.trackedentity.api.TrackedEntityInstanceUtils.assertEnrollments;
-import static org.hisp.dhis.android.core.trackedentity.api.TrackedEntityInstanceUtils.assertEvents;
-import static org.hisp.dhis.android.core.trackedentity.api.TrackedEntityInstanceUtils.assertTei;
-
-import org.hisp.dhis.android.core.BaseRealIntegrationTest;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl;
-import org.hisp.dhis.android.core.arch.helpers.UidGenerator;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.data.server.RealServerMother;
-import org.hisp.dhis.android.core.enrollment.Enrollment;
-import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor;
-import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse;
-import org.hisp.dhis.android.core.imports.internal.TEIImportSummary;
-import org.hisp.dhis.android.core.imports.internal.TEIWebResponse;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePayload;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService;
-import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipService;
-import org.junit.Before;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class BreakTheGlassAPIShould extends BaseRealIntegrationTest {
-
-    /**
-     * Expected configuration to run these tests:
-     * - user: android
-     * - role: not a superuser
-     * - capture orgunit: DiszpKrYNg8 - Negelhun CHC
-     * - search orgunit: YuQRtpLP10I - Badja
-     * <p>
-     * - read/write access to PROTECTED program: IpHINAT79UW
-     */
-
-    private String captureOrgunit = "DiszpKrYNg8";      // Ngelehun CHC
-    private String searchOrgunit = "g8upMTyEZGZ";       // Njandama MCHP
-    private String outOfScopeOrgunit = "jNb63DIHuwU";   // Baoma Hospital
-
-    private String trackedEntityType = "nEenWmSyUEp";   // Person
-    private String attribute1 = "w75KJ2mc4zz";          // First name
-    private String attribute2 = "zDhUuAYrxNC";          // Last name
-
-
-    private String program = "IpHINAT79UW";             // Child programme
-    private String programStage1 = "A03MvHHogjR";       // Birth
-    private String programStage2 = "ZzYYXq4fJie";       // Baby Postnatal
-    private String attributeOptionCombo = "HllvX50cXC0";    // Default
-
-    // API version dependant parameters
-    private String serverUrl = RealServerMother.url2_30;
-    private String strategy = "SYNC";
-
-    private APICallExecutor executor;
-
-    private TrackedEntityInstanceService trackedEntityInstanceService;
-    private OwnershipService ownershipService;
-
-    private UidGenerator uidGenerator = new UidGeneratorImpl();
-
-    @Before
-    public void setUp() {
-        super.setUp();
-
-        executor = APICallExecutorImpl.create(d2.databaseAdapter(), null);
-
-        trackedEntityInstanceService = d2.retrofit().create(TrackedEntityInstanceService.class);
-        ownershipService = d2.retrofit().create(OwnershipService.class);
-
-        login();
-    }
-
-    //@Test
-    public void tei_with_event_in_search_scope_in_open_program() throws Exception {
-
-        TrackedEntityInstance tei = teiWithEventInSearchScope();
-
-        for (int i = 0; i < 2; i++) {
-            TEIWebResponse response =
-                    executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                                    .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                            TEIWebResponse.class);
-
-            assertThat(response.response().status()).isEqualTo(SUCCESS);
-
-            for (TEIImportSummary importSummary : response.response().importSummaries()) {
-                assertTei(importSummary, SUCCESS);
-                assertEnrollments(importSummary, SUCCESS);
-                assertEvents(importSummary, SUCCESS);
-            }
-        }
-    }
-
-    // Make program protected
-    //@Test
-    public void tei_with_event_in_search_scope_in_protected_program() throws Exception {
-
-        TrackedEntityInstance tei = teiWithEventInSearchScope();
-
-        TEIWebResponse response = executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                        .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                TEIWebResponse.class);
-
-        assertThat(response.response().status()).isEqualTo(SUCCESS);
-
-        for (TEIImportSummary importSummary : response.response().importSummaries()) {
-            assertTei(importSummary, SUCCESS);
-            assertEnrollments(importSummary, SUCCESS);
-            assertEvents(importSummary, SUCCESS);
-        }
-
-        TEIWebResponse response2 =
-                executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                                .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                        TEIWebResponse.class);
-
-        assertThat(response2.response().status()).isEqualTo(SUCCESS);
-
-        for (TEIImportSummary importSummary : response2.response().importSummaries()) {
-            assertTei(importSummary, SUCCESS);
-            assertEnrollments(importSummary, SUCCESS);
-            assertEvents(importSummary, SUCCESS);
-        }
-    }
-
-    // Make program protected
-    //@Test
-    public void tei_with_enrollment_in_search_scope_in_protected_program() throws Exception {
-
-        TrackedEntityInstance tei = teiWithEnrollmentInSearchScope();
-
-        TEIWebResponse response = executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                        .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                TEIWebResponse.class);
-
-        assertThat(response.response().status()).isEqualTo(SUCCESS);
-
-        for (TEIImportSummary importSummary : response.response().importSummaries()) {
-            assertTei(importSummary, SUCCESS);
-            assertEnrollments(importSummary, SUCCESS);  // Because it is the first upload.Ownership is not defined
-            assertEvents(importSummary, ERROR);         // It takes enrollment ownership
-        }
-
-        TEIWebResponse response2 = executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                        .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                TEIWebResponse.class);
-
-        assertThat(response2.response().status()).isEqualTo(SUCCESS);
-
-        for (TEIImportSummary importSummary : response2.response().importSummaries()) {
-            assertTei(importSummary, SUCCESS);
-            assertEnrollments(importSummary, ERROR);    // Because ownership was previously set
-        }
-    }
-
-    // Make program protected
-    // @Test
-    public void tei_with_enrollment_in_search_scope_in_protected_program_breaking_glass() throws Exception {
-
-        TrackedEntityInstance tei = teiWithEnrollmentInSearchScope();
-
-        TEIWebResponse response = executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                        .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                TEIWebResponse.class);
-
-        assertThat(response.response().status()).isEqualTo(SUCCESS);
-
-        for (TEIImportSummary importSummary : response.response().importSummaries()) {
-            assertTei(importSummary, SUCCESS);
-            assertEnrollments(importSummary, SUCCESS);  // Because it is the first upload.Ownership is not defined
-            assertEvents(importSummary, ERROR);         // It takes enrollment ownership
-        }
-
-        HttpMessageResponse glassResponse =
-                executor.executeObjectCall(ownershipService.breakGlass(tei.uid(), program, "Sync"));
-
-        TEIWebResponse response2 = executor.executeObjectCallWithAcceptedErrorCodes(trackedEntityInstanceService
-                        .postTrackedEntityInstances(wrapPayload(tei), this.strategy), Collections.singletonList(409),
-                TEIWebResponse.class);
-
-        assertThat(response2.response().status()).isEqualTo(SUCCESS);
-
-        for (TEIImportSummary importSummary : response2.response().importSummaries()) {
-            assertTei(importSummary, SUCCESS);
-            assertEnrollments(importSummary, SUCCESS);
-            assertEvents(importSummary, SUCCESS);
-
-        }
-    }
-
-    private TrackedEntityInstance validTei() {
-        return TrackedEntityInstanceInternalAccessor
-                .insertEnrollments(TrackedEntityInstance.builder(), Arrays.asList(validEnrollment()))
-                .uid(uidGenerator.generate())
-                .organisationUnit(captureOrgunit)
-                .trackedEntityType(trackedEntityType)
-                .trackedEntityAttributeValues(Arrays.asList(
-                        TrackedEntityAttributeValue.builder()
-                                .trackedEntityAttribute(attribute1)
-                                .value("Test")
-                                .build(),
-                        TrackedEntityAttributeValue.builder()
-                                .trackedEntityAttribute(attribute2)
-                                .value("TrackedEntity")
-                                .build()
-                ))
-                .build();
-    }
-
-    private Enrollment validEnrollment() {
-        return EnrollmentInternalAccessor.insertEvents(Enrollment.builder(), Arrays.asList(validEvent()))
-                .uid(uidGenerator.generate())
-                .organisationUnit(captureOrgunit)
-                .program(program)
-                .status(EnrollmentStatus.ACTIVE)
-                .build();
-    }
-
-    private Event validEvent() {
-        return Event.builder()
-                .uid(uidGenerator.generate())
-                .organisationUnit(captureOrgunit)
-                .programStage(programStage1)
-                .attributeOptionCombo(attributeOptionCombo)
-                .build();
-    }
-
-    private TrackedEntityInstancePayload wrapPayload(TrackedEntityInstance... instances) {
-        TrackedEntityInstancePayload payload = TrackedEntityInstancePayload.create(Arrays.asList(instances));
-        return payload;
-    }
-
-    private TrackedEntityInstance teiWithEventInSearchScope() {
-
-        return TrackedEntityInstanceInternalAccessor.insertEnrollments(validTei().toBuilder(),
-                Collections.singletonList(
-                        EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(),
-                                Collections.singletonList(validEvent().toBuilder()
-                                        .organisationUnit(searchOrgunit)
-                                        .build()))
-                                .build()))
-                .build();
-    }
-
-    private TrackedEntityInstance teiWithEnrollmentInSearchScope() {
-        return TrackedEntityInstanceInternalAccessor.insertEnrollments(validTei().toBuilder(), Collections.singletonList(
-                EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(),
-                        Collections.singletonList(validEvent()))
-                        .organisationUnit(searchOrgunit).build()))
-                .build();
-    }
-
-    private TrackedEntityInstance teiInSearchScope() {
-        return validTei().toBuilder()
-                .organisationUnit(searchOrgunit)
-                .build();
-    }
-
-    private void login() {
-        d2.userModule().logIn(username, password, serverUrl).blockingGet();
-    }
-}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
new file mode 100644
index 0000000000..a1b5283f15
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
@@ -0,0 +1,278 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.api
+
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.BaseRealIntegrationTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.UidGenerator
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.data.server.RealServerMother
+import org.hisp.dhis.android.core.enrollment.Enrollment
+import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
+import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.imports.ImportStatus
+import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
+import org.hisp.dhis.android.core.imports.internal.TEIWebResponse
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePayload
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
+import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipService
+import org.junit.Before
+import java.util.Arrays
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
+    /**
+     * Expected configuration to run these tests:
+     * - user: android
+     * - role: not a superuser
+     * - capture orgunit: DiszpKrYNg8 - Negelhun CHC
+     * - search orgunit: YuQRtpLP10I - Badja
+     *
+     *
+     * - read/write access to PROTECTED program: IpHINAT79UW
+     */
+    private val captureOrgunit = "DiszpKrYNg8" // Ngelehun CHC
+    private val searchOrgunit = "g8upMTyEZGZ" // Njandama MCHP
+    private val outOfScopeOrgunit = "jNb63DIHuwU" // Baoma Hospital
+    private val trackedEntityType = "nEenWmSyUEp" // Person
+    private val attribute1 = "w75KJ2mc4zz" // First name
+    private val attribute2 = "zDhUuAYrxNC" // Last name
+    private val program = "IpHINAT79UW" // Child programme
+    private val programStage1 = "A03MvHHogjR" // Birth
+    private val programStage2 = "ZzYYXq4fJie" // Baby Postnatal
+    private val attributeOptionCombo = "HllvX50cXC0" // Default
+
+    // API version dependant parameters
+    private val serverUrl = RealServerMother.url2_30
+    private val strategy = "SYNC"
+    private lateinit var executor: CoroutineAPICallExecutor
+    private lateinit var trackedEntityInstanceService: TrackedEntityInstanceService
+    private lateinit var ownershipService: OwnershipService
+    private val uidGenerator: UidGenerator = UidGeneratorImpl()
+    @Before
+    override fun setUp() {
+        super.setUp()
+        executor = d2.coroutineAPICallExecutor()
+        trackedEntityInstanceService = d2.retrofit().create(
+            TrackedEntityInstanceService::class.java
+        )
+        ownershipService = d2.retrofit().create(OwnershipService::class.java)
+        login()
+    }
+
+    //@Test
+    @Throws(Exception::class)
+    fun tei_with_event_in_search_scope_in_open_program() = runTest {
+        val tei = teiWithEventInSearchScope()
+        for (i in 0..1) {
+            val response = postTrackedEntities(tei)
+            assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+
+            for (importSummary in response.response()!!.importSummaries()!!) {
+                TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+                TrackedEntityInstanceUtils.assertEnrollments(importSummary, ImportStatus.SUCCESS)
+                TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
+            }
+        }
+    }
+
+    // Make program protected
+    //@Test
+    @Throws(Exception::class)
+    fun tei_with_event_in_search_scope_in_protected_program() = runTest {
+        val tei = teiWithEventInSearchScope()
+
+        val response = postTrackedEntities(tei)
+        assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+        for (importSummary in response.response()!!.importSummaries()!!) {
+            TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEnrollments(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
+        }
+
+        val response2 = postTrackedEntities(tei)
+        assertThat(response2.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+        for (importSummary in response2.response()!!.importSummaries()!!) {
+            TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEnrollments(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
+        }
+    }
+
+    // Make program protected
+    //@Test
+    @Throws(Exception::class)
+    fun tei_with_enrollment_in_search_scope_in_protected_program() = runTest {
+        val tei = teiWithEnrollmentInSearchScope()
+        val response = postTrackedEntities(tei)
+        assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+        for (importSummary in response.response()!!.importSummaries()!!) {
+            TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEnrollments(
+                importSummary,
+                ImportStatus.SUCCESS
+            ) // Because it is the first upload.Ownership is not defined
+            TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.ERROR) // It takes enrollment ownership
+        }
+
+        val response2 = postTrackedEntities(tei)
+        assertThat(response2.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+        for (importSummary in response2.response()!!.importSummaries()!!) {
+            TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEnrollments(
+                importSummary,
+                ImportStatus.ERROR
+            ) // Because ownership was previously set
+        }
+    }
+
+    // Make program protected
+    // @Test
+    @Throws(Exception::class)
+    fun tei_with_enrollment_in_search_scope_in_protected_program_breaking_glass() = runTest {
+        val tei = teiWithEnrollmentInSearchScope()
+        val response = postTrackedEntities(tei)
+        assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+        for (importSummary in response.response()!!.importSummaries()!!) {
+            TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEnrollments(
+                importSummary,
+                ImportStatus.SUCCESS
+            ) // Because it is the first upload.Ownership is not defined
+            TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.ERROR) // It takes enrollment ownership
+        }
+
+        val glassResponse: HttpMessageResponse =
+            executor.wrap { ownershipService.breakGlass(tei.uid(), program, "Sync") }.getOrThrow()
+
+        val response2 = postTrackedEntities(tei)
+        assertThat(response2.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
+        for (importSummary in response2.response()!!.importSummaries()!!) {
+            TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEnrollments(importSummary, ImportStatus.SUCCESS)
+            TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
+        }
+    }
+
+    private fun validTei(): TrackedEntityInstance {
+        return TrackedEntityInstanceInternalAccessor
+            .insertEnrollments(TrackedEntityInstance.builder(), Arrays.asList(validEnrollment()))
+            .uid(uidGenerator.generate())
+            .organisationUnit(captureOrgunit)
+            .trackedEntityType(trackedEntityType)
+            .trackedEntityAttributeValues(
+                Arrays.asList(
+                    TrackedEntityAttributeValue.builder()
+                        .trackedEntityAttribute(attribute1)
+                        .value("Test")
+                        .build(),
+                    TrackedEntityAttributeValue.builder()
+                        .trackedEntityAttribute(attribute2)
+                        .value("TrackedEntity")
+                        .build()
+                )
+            )
+            .build()
+    }
+
+    private fun validEnrollment(): Enrollment {
+        return EnrollmentInternalAccessor.insertEvents(Enrollment.builder(), Arrays.asList(validEvent()))
+            .uid(uidGenerator.generate())
+            .organisationUnit(captureOrgunit)
+            .program(program)
+            .status(EnrollmentStatus.ACTIVE)
+            .build()
+    }
+
+    private fun validEvent(): Event {
+        return Event.builder()
+            .uid(uidGenerator.generate())
+            .organisationUnit(captureOrgunit)
+            .programStage(programStage1)
+            .attributeOptionCombo(attributeOptionCombo)
+            .build()
+    }
+
+    private fun wrapPayload(vararg instances: TrackedEntityInstance): TrackedEntityInstancePayload {
+        return TrackedEntityInstancePayload.create(listOf(*instances))
+    }
+
+    private fun teiWithEventInSearchScope(): TrackedEntityInstance {
+        return TrackedEntityInstanceInternalAccessor.insertEnrollments(
+            validTei().toBuilder(), listOf(
+                EnrollmentInternalAccessor.insertEvents(
+                    validEnrollment().toBuilder(), listOf(
+                        validEvent().toBuilder()
+                            .organisationUnit(searchOrgunit)
+                            .build()
+                    )
+                )
+                    .build()
+            )
+        )
+            .build()
+    }
+
+    private fun teiWithEnrollmentInSearchScope(): TrackedEntityInstance {
+        return TrackedEntityInstanceInternalAccessor.insertEnrollments(
+            validTei().toBuilder(), listOf(
+                EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(), listOf(validEvent()))
+                    .organisationUnit(searchOrgunit).build()
+            )
+        )
+            .build()
+    }
+
+    private fun teiInSearchScope(): TrackedEntityInstance {
+        return validTei().toBuilder()
+            .organisationUnit(searchOrgunit)
+            .build()
+    }
+
+    private suspend fun postTrackedEntities(vararg instances: TrackedEntityInstance): TEIWebResponse {
+        return executor.wrap(
+            storeError = false,
+            acceptedErrorCodes = listOf(409),
+            errorClass = TEIWebResponse::class.java
+        ) {
+            trackedEntityInstanceService
+                .postTrackedEntityInstances(wrapPayload(*instances), strategy)
+        }.getOrThrow()
+    }
+
+    private fun login() {
+        d2.userModule().logIn(username, password, serverUrl).blockingGet()
+    }
+}
\ No newline at end of file
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
index 74c1949309..463b566cff 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
@@ -28,10 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.api
 
 import com.google.common.truth.Truth.assertThat
-import java.util.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
@@ -40,6 +41,7 @@ import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.internal.TEIWebResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
@@ -47,19 +49,21 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePa
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.junit.Assert
 import org.junit.Before
+import java.util.*
 
+@OptIn(ExperimentalCoroutinesApi::class)
 abstract class TrackedEntityInstanceAPIShould internal constructor(
     // API version dependant parameters
     private val serverUrl: String,
     private val strategy: String
 ) : BaseRealIntegrationTest() {
-    private lateinit var executor: APICallExecutor
+    private lateinit var executor: CoroutineAPICallExecutor
     private lateinit var trackedEntityInstanceService: TrackedEntityInstanceService
 
     @Before
     override fun setUp() {
         super.setUp()
-        executor = APICallExecutorImpl.create(d2.databaseAdapter(), null)
+        executor = d2.coroutineAPICallExecutor()
         trackedEntityInstanceService = d2.retrofit().create(
             TrackedEntityInstanceService::class.java
         )
@@ -67,16 +71,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun tei_with_invalid_tracked_entity_attribute() {
+    fun tei_with_invalid_tracked_entity_attribute() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstance()
         val invalidTEI = TrackedEntityInstanceUtils.createTrackedEntityInstanceWithInvalidAttribute()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
 
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.ERROR)
 
@@ -89,22 +89,9 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         }
 
         // Check server status
-        val serverValidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(),
-                    TrackedEntityInstanceFields.allFields,
-                    true,
-                    true
-                )
-        )
+        val serverValidTEI = getTrackedEntity(validTEI.uid())
         try {
-            executor.executeObjectCall(
-                trackedEntityInstanceService.getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(),
-                    TrackedEntityInstanceFields.allFields, true, true
-                )
-            )
+            getTrackedEntity(invalidTEI.uid())
             Assert.fail("Should not reach that line")
         } catch (e: D2Error) {
             assertThat(e.httpErrorCode()).isEqualTo(404)
@@ -114,16 +101,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun tei_with_invalid_orgunit() {
+    fun tei_with_invalid_orgunit() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstance()
         val invalidTEI = TrackedEntityInstanceUtils.createTrackedEntityInstanceWithInvalidOrgunit()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
 
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.ERROR)
 
@@ -136,20 +119,9 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         }
 
         // Check server status
-        val serverValidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI = getTrackedEntity(validTEI.uid())
         try {
-            executor.executeObjectCall(
-                trackedEntityInstanceService.getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(),
-                    TrackedEntityInstanceFields.allFields, true, true
-                )
-            )
+            getTrackedEntity(invalidTEI.uid())
             Assert.fail("Should not reach that line")
         } catch (e: D2Error) {
             assertThat(e.httpErrorCode()).isEqualTo(404)
@@ -159,16 +131,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun enrollment_with_valid_values() {
+    fun enrollment_with_valid_values() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstance()
         val invalidTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceAndEnrollment()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI.uid() == importSummary.reference()) {
@@ -179,34 +147,18 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         }
 
         // TODO Check server status
-        val serverValidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverInvalidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI = getTrackedEntity(validTEI.uid())
+        val serverInvalidTEI = getTrackedEntity(invalidTEI.uid())
     }
 
     // @Test
     @Throws(Exception::class)
-    fun enrollment_future_date() {
+    fun enrollment_future_date() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceAndEnrollment()
         val invalidTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceWithFutureEnrollment()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI.uid() == importSummary.reference()) {
@@ -217,36 +169,20 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEnrollments(importSummary, ImportStatus.ERROR)
             }
         }
-        val serverValidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverInvalidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI = getTrackedEntity(validTEI.uid())
+        val serverInvalidTEI = getTrackedEntity(invalidTEI.uid())
         assertThat(getEnrollments(serverValidTEI.items()[0])).isNotEmpty()
         assertThat(getEnrollments(serverInvalidTEI.items()[0])).isEmpty()
     }
 
     // @Test
     @Throws(Exception::class)
-    fun already_active_enrollment() {
+    fun already_active_enrollment() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceAndEnrollment()
         val invalidTEI = TrackedEntityInstanceUtils.createTrackedEntityInstanceAndTwoActiveEnrollment()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI.uid() == importSummary.reference()) {
@@ -259,36 +195,20 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 assertThat(importSummary.enrollments()!!.ignored()).isEqualTo(1)
             }
         }
-        val serverValidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverInvalidTEI = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI = getTrackedEntity(validTEI.uid())
+        val serverInvalidTEI = getTrackedEntity(invalidTEI.uid())
         assertThat(getEnrollments(serverValidTEI.items()[0]).size).isEqualTo(1)
         assertThat(getEnrollments(serverInvalidTEI.items()[0]).size).isEqualTo(1)
     }
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_valid_values() {
+    fun event_with_valid_values() = runTest {
         login()
         val validTEI1 = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceAndEnrollment()
         val validTEI2 = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceWithEnrollmentAndEvent()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI1, validTEI2))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI1.uid() == importSummary.reference()) {
@@ -300,20 +220,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
             }
         }
-        val serverValidTEI1 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI1.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverValidTEI2 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI2.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI1 = getTrackedEntity(validTEI1.uid())
+        val serverValidTEI2 = getTrackedEntity(validTEI2.uid())
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(getEnrollments(serverValidTEI2.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI2.items()[0])[0]).size).isEqualTo(1)
@@ -322,16 +230,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
     // IMPORTANT: check the programStage is set to "NO WRITE ACCESS" before running the test
     // @Test
     @Throws(Exception::class)
-    fun event_with_no_write_access() {
+    fun event_with_no_write_access() = runTest {
         login()
         val validTEI1 = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceAndEnrollment()
         val validTEI2 = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceWithEnrollmentAndEvent()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI1, validTEI2))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI1.uid() == importSummary.reference()) {
@@ -343,20 +247,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.ERROR)
             }
         }
-        val serverValidTEI1 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI1.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverValidTEI2 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI2.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI1 = getTrackedEntity(validTEI1.uid())
+        val serverValidTEI2 = getTrackedEntity(validTEI2.uid())
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0])).isEmpty()
         assertThat(getEnrollments(serverValidTEI2.items()[0]).size).isEqualTo(1)
@@ -365,16 +257,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_future_event_date_does_not_fail() {
+    fun event_with_future_event_date_does_not_fail() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceWithEnrollmentAndEvent()
         val invalidTEI = TrackedEntityInstanceUtils.createTrackedEntityInstanceWithEnrollmentAndFutureEvent()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI.uid() == importSummary.reference()) {
@@ -387,20 +275,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
             }
         }
-        val serverValidTEI1 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverValidTEI2 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI1 = getTrackedEntity(validTEI.uid())
+        val serverValidTEI2 = getTrackedEntity(invalidTEI.uid())
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0]).size).isEqualTo(1)
         assertThat(getEnrollments(serverValidTEI2.items()[0]).size).isEqualTo(1)
@@ -409,16 +285,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_invalid_data_element() {
+    fun event_with_invalid_data_element() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceWithEnrollmentAndEvent()
         val invalidTEI = TrackedEntityInstanceUtils.createTrackedEntityInstanceWithInvalidDataElement()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI.uid() == importSummary.reference()) {
@@ -431,20 +303,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.WARNING)
             }
         }
-        val serverValidTEI1 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverValidTEI2 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI1 = getTrackedEntity(validTEI.uid())
+        val serverValidTEI2 = getTrackedEntity(invalidTEI.uid())
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0]).size).isEqualTo(1)
         assertThat(
@@ -461,16 +321,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(Exception::class)
-    fun event_with_valid_and_invalid_data_value() {
+    fun event_with_valid_and_invalid_data_value() = runTest {
         login()
         val validTEI = TrackedEntityInstanceUtils.createValidTrackedEntityInstanceWithEnrollmentAndEvent()
         val invalidTEI = TrackedEntityInstanceUtils.createTrackedEntityInstanceWithValidAndInvalidDataValue()
         val payload = TrackedEntityInstancePayload.create(listOf(validTEI, invalidTEI))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (validTEI.uid() == importSummary.reference()) {
@@ -483,20 +339,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.WARNING)
             }
         }
-        val serverValidTEI1 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    validTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
-        val serverValidTEI2 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    invalidTEI.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI1 = getTrackedEntity(validTEI.uid())
+        val serverValidTEI2 = getTrackedEntity(invalidTEI.uid())
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0]).size).isEqualTo(1)
         assertThat(
@@ -514,16 +358,12 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
     // This test is failing
     // @Test
     @Throws(Exception::class)
-    fun event_in_completed_enrollment() {
+    fun event_in_completed_enrollment() = runTest {
         login()
         val completedEnrollment =
             TrackedEntityInstanceUtils.createTrackedEntityInstanceWithCompletedEnrollmentAndEvent()
         val payload = TrackedEntityInstancePayload.create(listOf(completedEnrollment))
-        val response = executor.executeObjectCallWithAcceptedErrorCodes(
-            trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+        val response = executePostCall(payload)
         assertThat(response.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (importSummary in response.response()!!.importSummaries()!!) {
             if (completedEnrollment.uid() == importSummary.reference()) {
@@ -532,13 +372,7 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                 TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.SUCCESS)
             }
         }
-        val serverValidTEI1 = executor.executeObjectCall(
-            trackedEntityInstanceService
-                .getTrackedEntityInstanceAsCall(
-                    completedEnrollment.uid(), TrackedEntityInstanceFields.allFields,
-                    true, true
-                )
-        )
+        val serverValidTEI1 = getTrackedEntity(completedEnrollment.uid())
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(
             getEnrollments(serverValidTEI1.items()[0])[0]!!
@@ -558,14 +392,14 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
 
     // @Test
     @Throws(D2Error::class)
-    fun tracked_entity_deletion_returns_deleted_equals_1() {
+    fun tracked_entity_deletion_returns_deleted_equals_1() = runTest {
         login()
         syncMetadata()
         d2.trackedEntityModule().trackedEntityInstanceDownloader().limit(100).blockingDownload()
         val instance = instanceWithOneEnrollmentAndOneEvent
         val deletedEvents = setEventsToDelete(instance)
         val deletedEventsPayload = TrackedEntityInstancePayload.create(listOf(deletedEvents))
-        val deletedEventsResponse = executePostCall(deletedEventsPayload, strategy)
+        val deletedEventsResponse = executePostCall(deletedEventsPayload)
         assertThat(deletedEventsResponse.response()!!.status()).isEqualTo(ImportStatus.SUCCESS)
         for (teiImportSummaries in deletedEventsResponse.response()!!.importSummaries()!!) {
             assertThat(teiImportSummaries.importCount().updated()).isEqualTo(1)
@@ -590,12 +424,27 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
     }
 
     @Throws(D2Error::class)
-    private fun executePostCall(payload: TrackedEntityInstancePayload, strategy: String): TEIWebResponse {
-        return executor.executeObjectCallWithAcceptedErrorCodes(
+    private suspend fun executePostCall(payload: TrackedEntityInstancePayload): TEIWebResponse {
+        return executor.wrap(
+            storeError = false,
+            acceptedErrorCodes = listOf(409),
+            errorClass = TEIWebResponse::class.java
+        ) {
+            trackedEntityInstanceService.postTrackedEntityInstances(payload, strategy)
+        }.getOrThrow()
+    }
+
+    private suspend fun getTrackedEntity(teiUid: String): Payload<TrackedEntityInstance> {
+        return executor.wrap {
             trackedEntityInstanceService
-                .postTrackedEntityInstances(payload, strategy),
-            listOf(409), TEIWebResponse::class.java
-        )
+                .getTrackedEntityInstance(
+                    teiUid,
+                    OrganisationUnitMode.ACCESSIBLE.name,
+                    TrackedEntityInstanceFields.allFields,
+                    includeAllAttributes = true,
+                    includeDeleted = true
+                )
+        }.getOrThrow()
     }
 
     private val instanceWithOneEnrollmentAndOneEvent: TrackedEntityInstance
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2.kt b/core/src/main/java/org/hisp/dhis/android/core/D2.kt
index 4a6663cf4d..5b5429ff1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core
 import android.content.Context
 import androidx.annotation.VisibleForTesting
 import org.hisp.dhis.android.core.analytics.AnalyticsModule
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.d2.internal.D2DIComponent
 import org.hisp.dhis.android.core.arch.d2.internal.D2Modules
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
@@ -76,6 +77,11 @@ class D2 internal constructor(internal val d2DIComponent: D2DIComponent) {
         return d2DIComponent.retrofit()
     }
 
+    @VisibleForTesting
+    internal fun coroutineAPICallExecutor(): CoroutineAPICallExecutor {
+        return d2DIComponent.coroutineApiCallExecutor()
+    }
+
     fun databaseAdapter(): DatabaseAdapter {
         return d2DIComponent.databaseAdapter()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index c505c95e7d..6f9dcd14a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -33,6 +33,7 @@ import dagger.Component
 import javax.inject.Singleton
 import org.hisp.dhis.android.core.D2Configuration
 import org.hisp.dhis.android.core.analytics.AnalyticsPackageDIModule
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
@@ -167,6 +168,9 @@ internal interface D2DIComponent {
     @VisibleForTesting
     fun retrofit(): Retrofit
 
+    @VisibleForTesting
+    fun coroutineApiCallExecutor(): CoroutineAPICallExecutor
+
     @VisibleForTesting
     fun internalModules(): D2InternalModules
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index c98053de37..dd21c469e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -68,11 +68,11 @@ internal interface EventService {
     ): Payload<Event>
 
     @GET("$EVENTS/{$EVENT_UID}")
-    fun getEvent(
+    suspend fun getEvent(
         @Path(EVENT_UID) eventUid: String,
         @Query(FIELDS) @Which fields: Fields<Event>,
         @Query(OU_MODE) orgUnitMode: String
-    ): Call<Event>
+    ): Event
 
     @GET(EVENTS)
     suspend fun getEventSingle(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
index 2bad2f0a9f..1b571383c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.imports.internal.TEIWebResponse
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.search.SearchGrid
-import retrofit2.Call
 import retrofit2.http.*
 
 @Suppress("LongParameterList")
@@ -53,14 +52,6 @@ internal interface TrackedEntityInstanceService {
         @Query(INCLUDE_DELETED) includeDeleted: Boolean
     ): Payload<TrackedEntityInstance>
 
-    @GET(TRACKED_ENTITY_INSTANCES)
-    fun getTrackedEntityInstanceAsCall(
-        @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String,
-        @Query(FIELDS) @Which fields: Fields<TrackedEntityInstance>,
-        @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean
-    ): Call<Payload<TrackedEntityInstance>>
-
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTACE}")
     suspend fun getSingleTrackedEntityInstance(
         @Path(TRACKED_ENTITY_INSTACE) trackedEntityInstanceUid: String,

From 2c07d8fbda76bc7e579448255ebf4f3c3131521b Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 31 Jul 2023 11:31:40 +0200
Subject: [PATCH 139/478] [ANDROSDK-1679] Adapt unit test

---
 .../core/event/internal/EventAPIRealShould.kt |  2 +-
 .../api/BreakTheGlassAPIShould.kt             | 19 +++++++++++--------
 .../api/TrackedEntityInstanceAPIShould.kt     |  2 +-
 .../core/event/internal/EventService.kt       |  1 -
 .../ownership/OwnershipManagerShould.kt       | 19 +++++++++++--------
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
index 39660f16dc..d39146b12e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth.assertThat
+import java.util.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import java.util.*
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
index a1b5283f15..307507282b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.trackedentity.api
 
 import com.google.common.truth.Truth.assertThat
+import java.util.Arrays
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
@@ -49,7 +50,6 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePa
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipService
 import org.junit.Before
-import java.util.Arrays
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
@@ -92,7 +92,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
         login()
     }
 
-    //@Test
+    // @Test
     @Throws(Exception::class)
     fun tei_with_event_in_search_scope_in_open_program() = runTest {
         val tei = teiWithEventInSearchScope()
@@ -109,7 +109,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
     }
 
     // Make program protected
-    //@Test
+    // @Test
     @Throws(Exception::class)
     fun tei_with_event_in_search_scope_in_protected_program() = runTest {
         val tei = teiWithEventInSearchScope()
@@ -132,7 +132,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
     }
 
     // Make program protected
-    //@Test
+    // @Test
     @Throws(Exception::class)
     fun tei_with_enrollment_in_search_scope_in_protected_program() = runTest {
         val tei = teiWithEnrollmentInSearchScope()
@@ -231,9 +231,11 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
 
     private fun teiWithEventInSearchScope(): TrackedEntityInstance {
         return TrackedEntityInstanceInternalAccessor.insertEnrollments(
-            validTei().toBuilder(), listOf(
+            validTei().toBuilder(),
+            listOf(
                 EnrollmentInternalAccessor.insertEvents(
-                    validEnrollment().toBuilder(), listOf(
+                    validEnrollment().toBuilder(),
+                    listOf(
                         validEvent().toBuilder()
                             .organisationUnit(searchOrgunit)
                             .build()
@@ -247,7 +249,8 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
 
     private fun teiWithEnrollmentInSearchScope(): TrackedEntityInstance {
         return TrackedEntityInstanceInternalAccessor.insertEnrollments(
-            validTei().toBuilder(), listOf(
+            validTei().toBuilder(),
+            listOf(
                 EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(), listOf(validEvent()))
                     .organisationUnit(searchOrgunit).build()
             )
@@ -275,4 +278,4 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
     private fun login() {
         d2.userModule().logIn(username, password, serverUrl).blockingGet()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
index 463b566cff..f772096c2b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.trackedentity.api
 
 import com.google.common.truth.Truth.assertThat
+import java.util.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
@@ -49,7 +50,6 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePa
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.junit.Assert
 import org.junit.Before
-import java.util.*
 
 @OptIn(ExperimentalCoroutinesApi::class)
 abstract class TrackedEntityInstanceAPIShould internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index dd21c469e1..d7c6ddaf25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -32,7 +32,6 @@ import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.imports.internal.EventWebResponse
-import retrofit2.Call
 import retrofit2.http.*
 
 internal interface EventService {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
index 25e2265653..e4ea301079 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
@@ -29,7 +29,10 @@ package org.hisp.dhis.android.core.trackedentity.ownership
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -38,29 +41,29 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import retrofit2.Call
 
 @RunWith(JUnit4::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class OwnershipManagerShould {
 
-    private val apiCallExecutor: APICallExecutor = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val ownershipService: OwnershipService = mock()
     private val dataStatePropagator: DataStatePropagator = mock()
     private val programTempOwnerStore: ProgramTempOwnerStore = mock()
     private val programOwnerStore: ProgramOwnerStore = mock()
 
     private val httpResponse: HttpMessageResponse = mock()
-    private val call: Call<HttpMessageResponse> = mock()
 
     private lateinit var ownershipManager: OwnershipManagerImpl
 
     @Before
     fun setUp() {
-        whenever(ownershipService.breakGlass(any(), any(), any())).doReturn(call)
-        whenever(apiCallExecutor.executeObjectCall(any<Call<HttpMessageResponse>>())).doReturn(httpResponse)
+        ownershipService.stub {
+            onBlocking { breakGlass(any(), any(), any()) }.doAnswer { httpResponse }
+        }
 
         ownershipManager = OwnershipManagerImpl(
-            apiCallExecutor, ownershipService, dataStatePropagator,
+            coroutineAPICallExecutor, ownershipService, dataStatePropagator,
             programTempOwnerStore, programOwnerStore
         )
     }
@@ -90,7 +93,7 @@ class OwnershipManagerShould {
     }
 
     @Test
-    fun do_not_persist_program_temp_owner_on_fake_break_glass() {
+    fun do_not_persist_program_temp_owner_on_fake_break_glass() = runTest {
         ownershipManager.fakeBreakGlass("tei_uid", "program_uid")
 
         verify(programTempOwnerStore).selectWhere(any(), any(), any())

From 30bbc9350474b018c2fe176a896d9a93230bb543 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 31 Jul 2023 11:33:40 +0200
Subject: [PATCH 140/478] [ANDROSDK-1679] Remove unsused method

---
 .../tracker/importer/internal/TrackerImporterPostCall.kt | 2 +-
 .../tracker/importer/internal/TrackerImporterService.kt  | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index e4a41d94c8..b621704064 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -126,7 +126,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
         importStrategy: String
     ): Result<String, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = true) {
-            service.postTrackedEntityInstances(payload, ATOMIC_MODE_OBJECT, importStrategy)
+            service.postTrackerPayload(payload, ATOMIC_MODE_OBJECT, importStrategy)
         }.map { res ->
             val jobId = res.response().uid()
             jobObjectHandler.handleMany(generateJobObjects(payload, jobId))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
index 1e45775e6e..c964a4b54b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
@@ -45,19 +45,12 @@ internal const val JOB_ID = "jobId"
 internal interface TrackerImporterService {
 
     @POST(TRACKER_URL)
-    suspend fun postTrackedEntityInstances(
+    suspend fun postTrackerPayload(
         @Body payload: NewTrackerImporterPayload,
         @Query(ATOMIC_MODE) atomicMode: String,
         @Query(IMPORT_STRATEGY) importStrategy: String
     ): ObjectWithUidWebResponse
 
-    @POST(TRACKER_URL)
-    suspend fun postEvents(
-        @Body events: NewTrackerImporterPayload,
-        @Query(ATOMIC_MODE) atomicMode: String,
-        @Query(IMPORT_STRATEGY) importStrategy: String
-    ): ObjectWithUidWebResponse
-
     @GET("$JOBS_URL{jobId}/report")
     suspend fun getJobReport(@Path(JOB_ID) jobId: String): JobReport
 }

From 2f9d76ebe1dd6c3d9d404a17960ce49e7a64ec95 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 1 Aug 2023 11:11:44 +0200
Subject: [PATCH 141/478] [ANDROSDK-1681] Refactor fileResourceDownloadCall to
 coroutines

---
 .../internal/FileResourcePostCall.kt          | 12 ++++++-----
 .../internal/FileResourceService.kt           |  3 +--
 .../core/systeminfo/internal/PingCall.kt      | 12 +++++++----
 .../core/systeminfo/internal/PingService.kt   |  3 +--
 ...ckerImporterFileResourcesPostCallShould.kt | 21 +++++++++++--------
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
index 9b7e67ad13..430847017d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 import okhttp3.MediaType
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
 import org.hisp.dhis.android.core.common.State
@@ -54,7 +54,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueS
 @Reusable
 internal class FileResourcePostCall @Inject constructor(
     private val fileResourceService: FileResourceService,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataValueStore: DataValueStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
@@ -66,10 +66,10 @@ internal class FileResourcePostCall @Inject constructor(
 
     private var alreadyPinged = false
 
-    fun uploadFileResource(fileResource: FileResource, value: FileResourceValue): String? {
+    suspend fun uploadFileResource(fileResource: FileResource, value: FileResourceValue): String? {
         // Workaround for ANDROSDK-1452 (see comments restricted to Contributors).
         if (!alreadyPinged) {
-            pingCall.getCompletable(true).blockingAwait()
+            pingCall.download(true)
             alreadyPinged = true
         }
 
@@ -77,7 +77,9 @@ internal class FileResourcePostCall @Inject constructor(
 
         return if (file != null) {
             val filePart = getFilePart(file)
-            val responseBody = apiCallExecutor.executeObjectCall(fileResourceService.uploadFile(filePart))
+            val responseBody = coroutineAPICallExecutor.wrap(storeError = true) {
+                fileResourceService.uploadFile(filePart)
+            }.getOrThrow()
             handleResponse(responseBody.string(), fileResource, file, value)
         } else {
             handleMissingFile(fileResource, value)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
index 04af383cef..6b519644ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
@@ -30,14 +30,13 @@ package org.hisp.dhis.android.core.fileresource.internal
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.fileresource.FileResource
-import retrofit2.Call
 import retrofit2.http.*
 
 internal interface FileResourceService {
 
     @Multipart
     @POST(FILE_RESOURCES)
-    fun uploadFile(@Part filePart: MultipartBody.Part): Call<ResponseBody>
+    suspend fun uploadFile(@Part filePart: MultipartBody.Part): ResponseBody
 
     @GET("$FILE_RESOURCES/{$FILE_RESOURCE}")
     suspend fun getFileResource(@Path(FILE_RESOURCE) fileResource: String): FileResource
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
index 359a8d9747..d509df2205 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
@@ -29,17 +29,21 @@ package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 
 @Reusable
 class PingCall @Inject internal constructor(
     private val pingService: PingService,
-    private val apiCallExecutor: RxAPICallExecutor
-) : CompletableProvider {
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : DownloadProvider {
 
-    override fun getCompletable(storeError: Boolean): Completable {
-        return apiCallExecutor.wrapCompletableTransactionally(pingService.getPing(), storeError)
+    override suspend fun download(storeError: Boolean) {
+        coroutineAPICallExecutor.wrap(storeError = storeError) {
+            pingService.getPing()
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt
index aae6f8cfcb..ab97b7b41a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import io.reactivex.Completable
 import retrofit2.http.GET
 
 internal interface PingService {
 
     @GET("system/ping")
-    fun getPing(): Completable
+    suspend fun getPing(): String
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
index 6975f36709..39b385c927 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
@@ -29,6 +29,8 @@ package org.hisp.dhis.android.core.tracker.importer
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollment
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceHelper
@@ -49,16 +51,9 @@ class TrackerImporterFileResourcesPostCallShould {
 
     private lateinit var fileResourcePostCall: TrackerImporterFileResourcesPostCall
 
-    @Before
-    fun setUp() {
-        fileResourcePostCall = TrackerImporterFileResourcesPostCall(
-            fileResourcesPostCall,
-            fileResourceHelper
-        )
-    }
-
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun `Should create a single post call for repeated attributes`() {
+    fun `Should create a single post call for repeated attributes`() = runTest {
         val resourceId = "resourceId"
         val attributeId = "attributeId"
 
@@ -103,4 +98,12 @@ class TrackerImporterFileResourcesPostCallShould {
         assertThat(entityValue).isEqualTo(enrollmentValue)
         assertThat(entityValue).isNotEqualTo(resourceId)
     }
+
+    @Before
+    fun setUp() {
+        fileResourcePostCall = TrackerImporterFileResourcesPostCall(
+            fileResourcesPostCall,
+            fileResourceHelper
+        )
+    }
 }

From ae09721582ee79b9afd7ddabbd266321a5f652e1 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 1 Aug 2023 11:22:00 +0200
Subject: [PATCH 142/478] [ANDROSDK-1681] Refactor fileResource
 aggregated/tracker calls

---
 .../internal/DataValueFileResourcePostCall.kt |  4 +-
 ...OldTrackerImporterFileResourcesPostCall.kt | 59 ++++++++-----------
 .../TrackerImporterFileResourcesPostCall.kt   | 37 +++++-------
 ...ckerImporterFileResourcesPostCallShould.kt |  2 +-
 4 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
index a86459048a..22fb7af1aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
@@ -40,7 +40,7 @@ internal class DataValueFileResourcePostCall @Inject constructor(
     private val fileResourceHelper: FileResourceHelper,
     private val fileResourcePostCall: FileResourcePostCall
 ) {
-    fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
+    suspend fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
         val fileResources = fileResourceHelper.getUploadableFileResources()
 
         return if (fileResources.isEmpty()) {
@@ -62,7 +62,7 @@ internal class DataValueFileResourcePostCall @Inject constructor(
         }
     }
 
-    suspend fun updateFileResourceStates(fileResources: List<String>) {
+    fun updateFileResourceStates(fileResources: List<String>) {
         fileResourceHelper.updateFileResourceStates(fileResources, FileResourceDomainType.AGGREGATED)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
index 4de076b41f..4bd4405923 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
@@ -49,45 +48,39 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
     private val fileResourceHelper: FileResourceHelper
 ) {
 
-    fun uploadTrackedEntityFileResources(
+    suspend fun uploadTrackedEntityFileResources(
         trackedEntityInstances: List<TrackedEntityInstance>
-    ): Single<ItemsWithFileResources<TrackedEntityInstance>> {
-        return Single.create { emitter ->
-            val fileResources = fileResourceHelper.getUploadableFileResources()
-
-            if (fileResources.isEmpty()) {
-                emitter.onSuccess(ItemsWithFileResources(trackedEntityInstances, emptyList()))
-            } else {
-                val successfulTeis = trackedEntityInstances.mapNotNull {
-                    catchErrorToNull { uploadTrackedEntityInstance(it, fileResources) }
-                }
-                emitter.onSuccess(
-                    ItemsWithFileResources(successfulTeis.map { it.first }, successfulTeis.flatMap { it.second })
-                )
+    ): ItemsWithFileResources<TrackedEntityInstance> {
+        val fileResources = fileResourceHelper.getUploadableFileResources()
+
+        return if (fileResources.isEmpty()) {
+            ItemsWithFileResources(trackedEntityInstances, emptyList())
+        } else {
+            val successfulTeis = trackedEntityInstances.mapNotNull {
+                catchErrorToNull { uploadTrackedEntityInstance(it, fileResources) }
             }
+
+            ItemsWithFileResources(successfulTeis.map { it.first }, successfulTeis.flatMap { it.second })
         }
     }
 
-    fun uploadEventsFileResources(
+    suspend fun uploadEventsFileResources(
         events: List<Event>
-    ): Single<ItemsWithFileResources<Event>> {
-        return Single.create { emitter ->
-            val fileResources = fileResourceHelper.getUploadableFileResources()
-
-            if (fileResources.isEmpty()) {
-                emitter.onSuccess(ItemsWithFileResources(events, emptyList()))
-            } else {
-                val successfulEvents = events.mapNotNull {
-                    catchErrorToNull { uploadEvent(it, fileResources) }
-                }
-                emitter.onSuccess(
-                    ItemsWithFileResources(successfulEvents.map { it.first }, successfulEvents.flatMap { it.second })
-                )
+    ): ItemsWithFileResources<Event> {
+        val fileResources = fileResourceHelper.getUploadableFileResources()
+
+        return if (fileResources.isEmpty()) {
+            ItemsWithFileResources(events, emptyList())
+        } else {
+            val successfulEvents = events.mapNotNull {
+                catchErrorToNull { uploadEvent(it, fileResources) }
             }
+
+            ItemsWithFileResources(successfulEvents.map { it.first }, successfulEvents.flatMap { it.second })
         }
     }
 
-    private fun uploadTrackedEntityInstance(
+    private suspend fun uploadTrackedEntityInstance(
         trackedEntityInstance: TrackedEntityInstance,
         fileResources: List<FileResource>
     ): Pair<TrackedEntityInstance, List<String>> {
@@ -118,7 +111,7 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
         )
     }
 
-    private fun uploadEnrollment(
+    private suspend fun uploadEnrollment(
         enrollment: Enrollment,
         fileResources: List<FileResource>
     ): Pair<Enrollment, List<String>> {
@@ -136,7 +129,7 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
         )
     }
 
-    private fun uploadEvent(
+    private suspend fun uploadEvent(
         event: Event,
         fileResources: List<FileResource>
     ): Pair<Event, List<String>> {
@@ -162,7 +155,7 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
     }
 
     @Suppress("TooGenericExceptionCaught")
-    private fun <T> catchErrorToNull(f: () -> T): T? {
+    private suspend fun <T> catchErrorToNull(f: suspend () -> T): T? {
         return try {
             f()
         } catch (e: java.lang.RuntimeException) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
index 385b208d7b..42b7c858b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollment
 import org.hisp.dhis.android.core.event.NewTrackerImporterEvent
@@ -48,26 +47,22 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
     private val fileResourceHelper: FileResourceHelper
 ) {
 
-    fun uploadFileResources(
+    suspend fun uploadFileResources(
         payloadWrapper: NewTrackerImporterPayloadWrapper
-    ): Single<NewTrackerImporterPayloadWrapper> {
-        return Single.create { emitter ->
-            val fileResources = fileResourceHelper.getUploadableFileResources()
-
-            if (fileResources.isEmpty()) {
-                emitter.onSuccess(payloadWrapper)
-            } else {
-                emitter.onSuccess(
-                    payloadWrapper.copy(
-                        deleted = uploadPayloadFileResources(payloadWrapper.deleted, fileResources),
-                        updated = uploadPayloadFileResources(payloadWrapper.updated, fileResources)
-                    )
-                )
-            }
+    ): NewTrackerImporterPayloadWrapper {
+        val fileResources = fileResourceHelper.getUploadableFileResources()
+
+        return if (fileResources.isEmpty()) {
+            payloadWrapper
+        } else {
+            payloadWrapper.copy(
+                deleted = uploadPayloadFileResources(payloadWrapper.deleted, fileResources),
+                updated = uploadPayloadFileResources(payloadWrapper.updated, fileResources)
+            )
         }
     }
 
-    private fun uploadPayloadFileResources(
+    private suspend fun uploadPayloadFileResources(
         payload: NewTrackerImporterPayload,
         fileResources: List<FileResource>
     ): NewTrackerImporterPayload {
@@ -82,7 +77,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
         )
     }
 
-    private fun uploadAttributes(
+    private suspend fun uploadAttributes(
         entities: List<NewTrackerImporterTrackedEntity>,
         enrollments: List<NewTrackerImporterEnrollment>,
         fileResources: List<FileResource>
@@ -122,7 +117,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
         return Triple(successfulEntities, successfulEnrollments, fileResourcesByEntity)
     }
 
-    private fun getUpdatedAttributes(
+    private suspend fun getUpdatedAttributes(
         entityUid: String,
         attributeValues: List<NewTrackerImporterTrackedEntityAttributeValue>?,
         fileResources: List<FileResource>,
@@ -154,7 +149,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
         return updatedAttributes
     }
 
-    private fun uploadDataValues(
+    private suspend fun uploadDataValues(
         events: List<NewTrackerImporterEvent>,
         fileResources: List<FileResource>
     ): Pair<List<NewTrackerImporterEvent>, Map<String, List<String>>> {
@@ -183,7 +178,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
     }
 
     @Suppress("TooGenericExceptionCaught")
-    private fun <T> catchErrorToNull(f: () -> T): T? {
+    private suspend fun <T> catchErrorToNull(f: suspend () -> T): T? {
         return try {
             f()
         } catch (e: java.lang.RuntimeException) {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
index 39b385c927..a08bfaf63c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
@@ -88,7 +88,7 @@ class TrackerImporterFileResourcesPostCallShould {
         whenever(fileResourcesPostCall.uploadFileResource(fileResource, fValue))
             .doReturn(Math.random().toString())
 
-        val result = fileResourcePostCall.uploadFileResources(payloadWrapper).blockingGet()
+        val result = fileResourcePostCall.uploadFileResources(payloadWrapper)
 
         verify(fileResourcesPostCall, times(1)).uploadFileResource(fileResource, fValue)
 

From 1c2b4cd22f42c76e04882452707fa2c0000b6b22 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 1 Aug 2023 12:51:27 +0200
Subject: [PATCH 143/478] [ANDROSDK-1681] Refactor fileResource tracker post
 call

---
 .../hisp/dhis/android/core/systeminfo/internal/PingCall.kt   | 5 +----
 .../trackedentity/internal/OldTrackerImporterPostCall.kt     | 4 ++--
 .../tracker/importer/internal/TrackerImporterPostCall.kt     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
index d509df2205..a6ef2c60d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
@@ -28,11 +28,8 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 
 @Reusable
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
index 02c58032a0..4a34a801ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
@@ -101,7 +101,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
         val progressManager = D2ProgressManager(null)
         val teiPartitions = trackedEntityInstances
             .chunked(TrackedEntityInstanceService.DEFAULT_PAGE_SIZE)
-            .map { partition -> fileResourcePostCall.uploadTrackedEntityFileResources(partition).blockingGet() }
+            .map { partition -> fileResourcePostCall.uploadTrackedEntityFileResources(partition) }
             .filter { it.items.isNotEmpty() }
 
         for (partition in teiPartitions) {
@@ -164,7 +164,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
         if (events.isEmpty()) {
             emit(progressManager.increaseProgress(Event::class.java, true))
         } else {
-            val validEvents = fileResourcePostCall.uploadEventsFileResources(events).blockingGet()
+            val validEvents = fileResourcePostCall.uploadEventsFileResources(events)
 
             val payload = EventPayload()
             payload.events = validEvents.items
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index b621704064..3f79acfea3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -78,7 +78,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
     private fun postPayloadWrapper(
         payloadWrapper: NewTrackerImporterPayloadWrapper
     ): Flow<D2Progress> = flow {
-        val payload = fileResourcesPostCall.uploadFileResources(payloadWrapper).blockingGet()
+        val payload = fileResourcesPostCall.uploadFileResources(payloadWrapper)
 
         emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true))
         emitAll(doPostCall(payload.deleted, IMPORT_STRATEGY_DELETE))

From 81c0058fd0874faecec9f51371e116de313af3fd Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 2 Aug 2023 09:18:18 +0200
Subject: [PATCH 144/478] [ANDROSDK-1711] refactor: - Kept original public
 classes(to kotlin) - Split rxjava calls to be just wrappers

---
 ...ckedEntityAttributeReservedValueManager.kt | 273 +++++++++---------
 1 file changed, 131 insertions(+), 142 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index f2ad9e2029..4b41d1a792 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -30,21 +30,17 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
-import io.reactivex.SingleEmitter
 import java.util.Date
 import javax.inject.Inject
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.asObservable
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
@@ -72,7 +68,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
 
-@Suppress("LongParameterList", "TooManyFunctions")
+@SuppressWarnings("LongParameterList", "TooManyFunctions")
 @Reusable
 class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val store: TrackedEntityAttributeReservedValueStore,
@@ -88,7 +84,6 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         TrackedEntityAttributeReservedValueQuery>
 ) {
     private val d2ProgressManager = D2ProgressManager(null)
-    private val scope = CoroutineScope(Dispatchers.IO + Job())
 
     /**
      * @param attributeUid        Attribute uid
@@ -96,8 +91,10 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @return Value of tracked entity attribute
      * @see .getValue
      */
-    fun blockingGetValue(attributeUid: String, organisationUnitUid: String): String? {
-        return getValue(attributeUid, organisationUnitUid).blockingGet()
+    fun blockingGetValue(attributeUid: String, organisationUnitUid: String): String {
+        return runBlocking {
+            getValueCoroutines(attributeUid, organisationUnitUid) ?: ""
+        }
     }
 
     /**
@@ -108,32 +105,22 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param organisationUnitUid Organisation unit uid
      * @return Single with value of tracked entity attribute
      */
-    fun getValue(attributeUid: String, organisationUnitUid: String): Single<String?> {
-        return Single.create { emitter: SingleEmitter<String?> ->
-            scope.launch {
-                suspendCancellableCoroutine { continuation ->
-                    downloadValuesIfBelowThreshold(
-                        attributeUid, getOrganisationUnit(organisationUnitUid), null, false
-                    )
-                    continuation.resume(Unit)
-                }
-            }
-            scope.launch {
-                val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
-                val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
-                val reservedValue = store.popOne(attributeUid, attributeOrgunit)
-                if (reservedValue == null) {
-                    emitter.onError(
-                        D2Error.builder()
-                            .errorCode(D2ErrorCode.NO_RESERVED_VALUES)
-                            .errorDescription("There are no reserved values")
-                            .errorComponent(D2ErrorComponent.Database).build()
-                    )
-                } else {
-                    emitter.onSuccess(reservedValue.value() ?: "")
-                }
-            }
-        }
+
+    fun getValue(attributeUid: String, organisationUnitUid: String): Single<String> {
+        return rxSingle { getValueCoroutines(attributeUid, organisationUnitUid) ?: "" }
+    }
+
+    private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String? {
+
+        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
+
+        val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
+        val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
+        val reservedValue = store.popOne(attributeUid, attributeOrgunit) ?: throw D2Error.builder()
+            .errorCode(D2ErrorCode.NO_RESERVED_VALUES).errorDescription("There are no reserved values")
+            .errorComponent(D2ErrorComponent.Database).build()
+
+        return reservedValue.value()
     }
 
     /**
@@ -145,7 +132,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
     ) {
-        downloadReservedValues(attributeUid, numberOfValuesToFillUp).blockingSubscribe()
+        runBlocking { downloadReservedValues(attributeUid, numberOfValuesToFillUp) }
     }
 
     /**
@@ -162,19 +149,29 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @return An Observable that notifies about the progress.
      */
+
     fun downloadReservedValues(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
     ): Observable<D2Progress> {
-        return downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp).asObservable()
+        return downloadReservedValuesFlow(attributeUid, numberOfValuesToFillUp).asObservable()
+    }
+
+    private fun downloadReservedValuesFlow(
+        attributeUid: String,
+        numberOfValuesToFillUp: Int?
+    ) = flow<D2Progress> {
+        downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp)
     }
 
     /**
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
-     * @see .downloadAllReservedValuesObservable
+     * @see .downloadAllReservedValues
      */
     fun blockingDownloadAllReservedValues(numberOfValuesToFillUp: Int?) {
-        downloadAllReservedValues(numberOfValuesToFillUp).blockingSubscribe()
+        runBlocking {
+            downloadAllReservedValues(numberOfValuesToFillUp)
+        }
     }
 
     /**
@@ -184,13 +181,14 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @return An Observable that notifies about the progress.
      */
-    fun downloadAllReservedValues(numberOfValuesToFillUp: Int?): Observable<D2Progress> {
-        val observables: MutableList<Observable<D2Progress>> = ArrayList()
-        val generatedAttributes = generatedAttributes
-        for (attribute in generatedAttributes) {
-            observables.add(downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp).asObservable())
+    private suspend fun downloadAllReservedValues(
+        numberOfValuesToFillUp: Int?
+    ): List<D2Progress> = coroutineScope {
+        val observables = generatedAttributes.map { attribute ->
+            async { downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp) }
         }
-        return Observable.merge(observables)
+
+        observables.awaitAll().flatten()
     }
 
     /**
@@ -201,14 +199,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param organisationUnitUid An optional organisation unit uid
      * @return Single with the reserved value count by attribute or by attribute and organisation unit.
      */
-    fun count(attributeUid: String, organisationUnitUid: String?): Single<Int> {
-        return Single.fromCallable {
-            blockingCount(
-                attributeUid,
-                organisationUnitUid
-            )
-        }
-    }
+    fun count(attributeUid: String, organisationUnitUid: String?): Int =
+        store.count(attributeUid, organisationUnitUid, null)
 
     /**
      * @param attributeUid        Attribute uid
@@ -216,8 +208,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @return The reserved value count by attribute or by attribute and organisation unit.
      * @see .count
      */
-    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int {
-        return store.count(attributeUid, organisationUnitUid, null)
+    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int = runBlocking {
+        count(attributeUid, organisationUnitUid)
     }
 
     /**
@@ -225,44 +217,50 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      *
      * @return Single with a list of the reserved value summaries
      */
-    val reservedValueSummaries: Single<List<ReservedValueSummary>>
-        get() = Single.just(blockingGetReservedValueSummaries())
+    val reservedValueSummaries: Flow<List<ReservedValueSummary>> = flow {
+        emit(blockingGetReservedValueSummaries())
+    }
 
     /**
      * @return List of the reserved value summaries
      * @see .getReservedValueSummaries
      */
     fun blockingGetReservedValueSummaries(): List<ReservedValueSummary> {
-        val whereClause = WhereClauseBuilder()
-            .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
-        val orderByClause = OrderByClauseBuilder.orderByFromItems(
-            listOf(
-                RepositoryScopeOrderByItem.builder()
-                    .column(IdentifiableColumns.DISPLAY_NAME)
-                    .direction(RepositoryScope.OrderByDirection.ASC).build()
-            ),
-            CoreColumns.ID
-        )
-        val trackedEntityAttributes = trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
-        val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
-        for (trackedEntityAttribute in trackedEntityAttributes) {
-            val builder = ReservedValueSummary.builder()
-                .trackedEntityAttribute(trackedEntityAttribute)
-            if (isOrgunitDependent(trackedEntityAttribute.pattern())) {
-                val organisationUnits = getOrgUnitsLinkedToAttribute(trackedEntityAttribute.uid())
-                for (organisationUnit in organisationUnits) {
-                    builder.organisationUnit(organisationUnit)
-                        .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
+        runBlocking {
+            val whereClause =
+                WhereClauseBuilder().appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
+            val orderByClause = OrderByClauseBuilder.orderByFromItems(
+                listOf(
+                    RepositoryScopeOrderByItem.builder().column(IdentifiableColumns.DISPLAY_NAME)
+                        .direction(RepositoryScope.OrderByDirection.ASC).build()
+                ),
+                CoreColumns.ID
+            )
+            val trackedEntityAttributes = trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
+            val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
+            for (trackedEntityAttribute in trackedEntityAttributes) {
+                val builder = ReservedValueSummary.builder().trackedEntityAttribute(trackedEntityAttribute)
+                if (isOrgunitDependent(trackedEntityAttribute.pattern())) {
+                    val organisationUnits = getOrgUnitsLinkedToAttribute(trackedEntityAttribute.uid())
+                    for (organisationUnit in organisationUnits) {
+                        builder.organisationUnit(organisationUnit)
+                            .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
+                            .numberOfValuesToFillUp(
+                                getFillUpToValue(
+                                    null, trackedEntityAttribute.uid()
+                                )
+                            )
+                        reservedValueSummaries.add(builder.build())
+                    }
+                } else {
+                    builder.count(blockingCount(trackedEntityAttribute.uid(), null))
                         .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()))
                     reservedValueSummaries.add(builder.build())
                 }
-            } else {
-                builder.count(blockingCount(trackedEntityAttribute.uid(), null))
-                    .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()))
-                reservedValueSummaries.add(builder.build())
             }
+            return@runBlocking reservedValueSummaries
         }
-        return reservedValueSummaries
+        return emptyList()
     }
 
     private fun increaseProgress(): D2Progress {
@@ -271,48 +269,53 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         )
     }
 
-    private fun downloadValuesForOrgUnits(
+    private suspend fun downloadValuesForOrgUnits(
         attribute: String,
         numberOfValuesToFillUp: Int?
-    ): Flow<D2Progress> = flow {
+    ): List<D2Progress> = coroutineScope {
         val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
+
         if (isOrgunitDependent(pattern)) {
             val organisationUnits = getOrgUnitsLinkedToAttribute(attribute)
+            val progressList = mutableListOf<D2Progress>()
+
             for (organisationUnit in organisationUnits) {
-                downloadValuesIfBelowThreshold(attribute, organisationUnit, numberOfValuesToFillUp, true)
-                emit(increaseProgress())
+                downloadValuesIfBelowThreshold(
+                    attribute, organisationUnit, numberOfValuesToFillUp, true
+                )
+                progressList.add(increaseProgress())
             }
+
+            progressList
         } else {
             downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
-            emit(increaseProgress())
+
+            listOf(increaseProgress())
         }
     }
 
-    private fun downloadValuesIfBelowThreshold(
+    private suspend fun downloadValuesIfBelowThreshold(
         attribute: String,
         organisationUnit: OrganisationUnit?,
         minNumberOfValuesToHave: Int?,
         storeError: Boolean
-    ) {
-        scope.launch {
-            // Using local date. It's not worth it to make a system info call
-            store.deleteExpired(Date())
-            val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
-            val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
-            val remainingValues = store.count(
-                attribute,
-                if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
-                pattern
-            )
+    ): Unit = coroutineScope {
+        // Using local date. It's not worth it to make a system info call
+        store.deleteExpired(Date())
+        val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
+        val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
+        val remainingValues = store.count(
+            attribute, if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null, pattern
+        )
 
-            // If the number of values is explicitly specified, we use that value as the threshold.
-            val minNumberToTryFill =
-                minNumberOfValuesToHave ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
+        // If number of values is explicitly specified, we use that value as threshold.
+        val minNumberToTryFill = minNumberOfValuesToHave ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
 
-            if (remainingValues < minNumberToTryFill) {
-                val numberToReserve = fillUpTo!! - remainingValues
-                downloadValues(attribute, organisationUnit, numberToReserve, pattern, storeError)
-            }
+        if (remainingValues < minNumberToTryFill) {
+            val numberToReserve = fillUpTo!! - remainingValues
+            downloadValues(
+                attribute, organisationUnit, numberToReserve, pattern, storeError
+            )
         }
     }
 
@@ -322,28 +325,19 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         numberToReserve: Int,
         pattern: String?,
         storeError: Boolean
-    ) = suspendCoroutine { continuation ->
-
-        val deferred = CompletableDeferred<Unit>()
-
-        executor.executeD2Call(
-            reservedValueQueryCallFactory.create(
-                TrackedEntityAttributeReservedValueQuery.create(
-                    trackedEntityAttributeUid, numberToReserve,
-                    organisationUnit, pattern
-                )
-            ),
-            storeError
-        )
+    ) {
+        return suspendCoroutine {
+            executor.executeD2Call(
+                reservedValueQueryCallFactory.create(
+                    TrackedEntityAttributeReservedValueQuery.create(
+                        trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
+                    )
+                ),
+                storeError
+            )
 
-        deferred.invokeOnCompletion {
-            if (it == null) {
-                if (pattern != null) {
-                    store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
-                }
-                continuation.resume(Unit)
-            } else {
-                continuation.resumeWithException(it!!)
+            if (pattern != null) {
+                store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
             }
         }
     }
@@ -352,34 +346,30 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         val linkedProgramUids = programTrackedEntityAttributeStore.selectStringColumnsWhereClause(
             ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
             WhereClauseBuilder().appendKeyStringValue(
-                ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                attribute
+                ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE, attribute
             ).build()
         )
         val linkedOrgunitUids = organisationUnitProgramLinkStore.selectStringColumnsWhereClause(
             OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
             WhereClauseBuilder().appendInKeyStringValues(
-                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
-                linkedProgramUids
+                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM, linkedProgramUids
             ).build()
         )
         val captureOrgunits = userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(
             OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
         )
-
         linkedOrgunitUids.toMutableList().retainAll(captureOrgunits)
         return organisationUnitStore.selectWhere(
             WhereClauseBuilder().appendInKeyStringValues(
-                IdentifiableColumns.UID,
-                linkedOrgunitUids
+                IdentifiableColumns.UID, linkedOrgunitUids
             ).build()
         )
     }
 
     private val generatedAttributes: List<TrackedEntityAttribute>
         private get() {
-            val whereClause = WhereClauseBuilder()
-                .appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
+            val whereClause =
+                WhereClauseBuilder().appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
             return trackedEntityAttributeStore.selectWhere(whereClause)
         }
 
@@ -406,8 +396,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
             }
         } else {
             reservedValueSettingStore.updateOrInsert(
-                ReservedValueSetting.builder()
-                    .uid(attribute).numberOfValuesToReserve(minNumberOfValuesToHave).build()
+                ReservedValueSetting.builder().uid(attribute).numberOfValuesToReserve(minNumberOfValuesToHave).build()
             )
             minNumberOfValuesToHave
         }

From 940aeef3c04f7783deb1694c93019e3d1c8e6aa8 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 2 Aug 2023 13:31:13 +0200
Subject: [PATCH 145/478] [ANDROSDK-1711] refactor: - Improvements to consumer
 class "TrackedEntityAttributeReservedValueManager" - Improvements to test
 "TrackedEntityAttributeReservedValueManagerRealIntegrationShould"

---
 ...servedValueManagerRealIntegrationShould.kt |   6 +-
 ...ckedEntityAttributeReservedValueManager.kt | 104 +++++++++---------
 2 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 9dfb22986c..132d88e64d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -63,7 +63,7 @@ import org.mockito.Mockito
 
 @SuppressWarnings("MaxLineLength")
 class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
-    private var store: TrackedEntityAttributeReservedValueStore? = null
+    private lateinit var store: TrackedEntityAttributeReservedValueStore
     private val organisationUnitUid = "org_unit_uid"
     private val programUid = "program_uid"
     private val categoryComboUid = "category_combo_uid"
@@ -114,7 +114,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
 
         organisationUnit =
             OrganisationUnit.builder().uid(organisationUnitUid).code("org_unit_code").build()
-        organisationUnitStore.insert(organisationUnit as OrganisationUnit)
+        organisationUnitStore.insert(organisationUnit)
 
         pattern = "CURRENT_DATE(YYYYMM) + \"-\" + CURRENT_DATE(ww) + ORG_UNIT_CODE(...)"
         trackedEntityAttributeStore.updateOrInsert(
@@ -324,7 +324,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
     }
 
     private fun selectAll(): List<TrackedEntityAttributeReservedValue> {
-        return store!!.selectAll()
+        return store.selectAll()
     }
 
     private fun login() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 4b41d1a792..70a77238d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -33,13 +33,14 @@ import io.reactivex.Single
 import java.util.Date
 import javax.inject.Inject
 import kotlin.coroutines.suspendCoroutine
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.asObservable
+import kotlinx.coroutines.rx2.rxObservable
 import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
@@ -93,7 +94,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      */
     fun blockingGetValue(attributeUid: String, organisationUnitUid: String): String {
         return runBlocking {
-            getValueCoroutines(attributeUid, organisationUnitUid) ?: ""
+            getValueCoroutines(attributeUid, organisationUnitUid)
         }
     }
 
@@ -110,17 +111,16 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         return rxSingle { getValueCoroutines(attributeUid, organisationUnitUid) ?: "" }
     }
 
-    private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String? {
+    private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
 
         downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
 
         val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
         val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
-        val reservedValue = store.popOne(attributeUid, attributeOrgunit) ?: throw D2Error.builder()
+
+        return store.popOne(attributeUid, attributeOrgunit)?.value() ?: throw D2Error.builder()
             .errorCode(D2ErrorCode.NO_RESERVED_VALUES).errorDescription("There are no reserved values")
             .errorComponent(D2ErrorComponent.Database).build()
-
-        return reservedValue.value()
     }
 
     /**
@@ -161,7 +161,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
     ) = flow<D2Progress> {
-        downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp)
+        downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp).collect()
     }
 
     /**
@@ -181,14 +181,18 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param numberOfValuesToFillUp An optional maximum number of values to reserve
      * @return An Observable that notifies about the progress.
      */
-    private suspend fun downloadAllReservedValues(
+
+    fun downloadAllReservedValues(numberOfValuesToFillUp: Int?): Observable<D2Progress> {
+        return rxObservable { downloadAllReservedValuesFlow(numberOfValuesToFillUp).collect() }
+    }
+
+    private suspend fun downloadAllReservedValuesFlow(
         numberOfValuesToFillUp: Int?
-    ): List<D2Progress> = coroutineScope {
-        val observables = generatedAttributes.map { attribute ->
-            async { downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp) }
+    ): Flow<D2Progress> {
+        val flows = generatedAttributes.map { attribute ->
+            downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp)
         }
-
-        observables.awaitAll().flatten()
+        return flows.merge()
     }
 
     /**
@@ -217,8 +221,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      *
      * @return Single with a list of the reserved value summaries
      */
-    val reservedValueSummaries: Flow<List<ReservedValueSummary>> = flow {
-        emit(blockingGetReservedValueSummaries())
+    fun getReservedValueSummaries(): Single<List<ReservedValueSummary>> {
+        return rxSingle { blockingGetReservedValueSummaries() }
     }
 
     /**
@@ -226,41 +230,38 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @see .getReservedValueSummaries
      */
     fun blockingGetReservedValueSummaries(): List<ReservedValueSummary> {
-        runBlocking {
-            val whereClause =
-                WhereClauseBuilder().appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
-            val orderByClause = OrderByClauseBuilder.orderByFromItems(
-                listOf(
-                    RepositoryScopeOrderByItem.builder().column(IdentifiableColumns.DISPLAY_NAME)
-                        .direction(RepositoryScope.OrderByDirection.ASC).build()
-                ),
-                CoreColumns.ID
-            )
-            val trackedEntityAttributes = trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
-            val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
-            for (trackedEntityAttribute in trackedEntityAttributes) {
-                val builder = ReservedValueSummary.builder().trackedEntityAttribute(trackedEntityAttribute)
-                if (isOrgunitDependent(trackedEntityAttribute.pattern())) {
-                    val organisationUnits = getOrgUnitsLinkedToAttribute(trackedEntityAttribute.uid())
-                    for (organisationUnit in organisationUnits) {
-                        builder.organisationUnit(organisationUnit)
-                            .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
-                            .numberOfValuesToFillUp(
-                                getFillUpToValue(
-                                    null, trackedEntityAttribute.uid()
-                                )
+        val whereClause =
+            WhereClauseBuilder().appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
+        val orderByClause = OrderByClauseBuilder.orderByFromItems(
+            listOf(
+                RepositoryScopeOrderByItem.builder().column(IdentifiableColumns.DISPLAY_NAME)
+                    .direction(RepositoryScope.OrderByDirection.ASC).build()
+            ),
+            CoreColumns.ID
+        )
+        val trackedEntityAttributes = trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
+        val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
+        for (trackedEntityAttribute in trackedEntityAttributes) {
+            val builder = ReservedValueSummary.builder().trackedEntityAttribute(trackedEntityAttribute)
+            if (isOrgunitDependent(trackedEntityAttribute.pattern())) {
+                val organisationUnits = getOrgUnitsLinkedToAttribute(trackedEntityAttribute.uid())
+                for (organisationUnit in organisationUnits) {
+                    builder.organisationUnit(organisationUnit)
+                        .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
+                        .numberOfValuesToFillUp(
+                            getFillUpToValue(
+                                null, trackedEntityAttribute.uid()
                             )
-                        reservedValueSummaries.add(builder.build())
-                    }
-                } else {
-                    builder.count(blockingCount(trackedEntityAttribute.uid(), null))
-                        .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()))
+                        )
                     reservedValueSummaries.add(builder.build())
                 }
+            } else {
+                builder.count(blockingCount(trackedEntityAttribute.uid(), null))
+                    .numberOfValuesToFillUp(getFillUpToValue(null, trackedEntityAttribute.uid()))
+                reservedValueSummaries.add(builder.build())
             }
-            return@runBlocking reservedValueSummaries
         }
-        return emptyList()
+        return reservedValueSummaries
     }
 
     private fun increaseProgress(): D2Progress {
@@ -272,25 +273,22 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private suspend fun downloadValuesForOrgUnits(
         attribute: String,
         numberOfValuesToFillUp: Int?
-    ): List<D2Progress> = coroutineScope {
+    ): Flow<D2Progress> = flow {
         val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
 
         if (isOrgunitDependent(pattern)) {
             val organisationUnits = getOrgUnitsLinkedToAttribute(attribute)
-            val progressList = mutableListOf<D2Progress>()
 
             for (organisationUnit in organisationUnits) {
                 downloadValuesIfBelowThreshold(
                     attribute, organisationUnit, numberOfValuesToFillUp, true
                 )
-                progressList.add(increaseProgress())
+                emit(increaseProgress())
             }
-
-            progressList
         } else {
             downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
 
-            listOf(increaseProgress())
+            emit(increaseProgress())
         }
     }
 
@@ -367,7 +365,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     }
 
     private val generatedAttributes: List<TrackedEntityAttribute>
-        private get() {
+        get() {
             val whereClause =
                 WhereClauseBuilder().appendKeyNumberValue(TrackedEntityAttributeTableInfo.Columns.GENERATED, 1).build()
             return trackedEntityAttributeStore.selectWhere(whereClause)

From c38630dd50436d0f334b450dc839cc76c93b43f3 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 2 Aug 2023 17:53:51 +0200
Subject: [PATCH 146/478] [ANDROSDK-1711] refactor: - some clean up - flows
 improved

---
 ...rackedEntityAttributeReservedValueManager.kt | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 70a77238d8..91cbcf1430 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -35,12 +35,11 @@ import javax.inject.Inject
 import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.asObservable
-import kotlinx.coroutines.rx2.rxObservable
 import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
@@ -108,7 +107,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      */
 
     fun getValue(attributeUid: String, organisationUnitUid: String): Single<String> {
-        return rxSingle { getValueCoroutines(attributeUid, organisationUnitUid) ?: "" }
+        return rxSingle { getValueCoroutines(attributeUid, organisationUnitUid) }
     }
 
     private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
@@ -160,8 +159,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private fun downloadReservedValuesFlow(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
-    ) = flow<D2Progress> {
-        downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp).collect()
+    ) = flow {
+        emitAll(downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp))
     }
 
     /**
@@ -183,16 +182,16 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      */
 
     fun downloadAllReservedValues(numberOfValuesToFillUp: Int?): Observable<D2Progress> {
-        return rxObservable { downloadAllReservedValuesFlow(numberOfValuesToFillUp).collect() }
+        return downloadAllReservedValuesFlow(numberOfValuesToFillUp).asObservable()
     }
 
-    private suspend fun downloadAllReservedValuesFlow(
+    private fun downloadAllReservedValuesFlow(
         numberOfValuesToFillUp: Int?
-    ): Flow<D2Progress> {
+    ) = flow {
         val flows = generatedAttributes.map { attribute ->
             downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp)
         }
-        return flows.merge()
+        emitAll(flows.merge())
     }
 
     /**

From dd2c4850b8b335a0f045509c92710d129383efce Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 3 Aug 2023 13:13:13 +0200
Subject: [PATCH 147/478] [ANDROSDK-1711] refactor: - revert "count()" - remove
 useless "runBlocking"

---
 ...ckedEntityAttributeReservedValueManager.kt | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 91cbcf1430..bdf8e2cdc3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -30,11 +30,9 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
-import java.util.Date
-import javax.inject.Inject
-import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.merge
@@ -67,6 +65,8 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import java.util.Date
+import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
 @Reusable
@@ -81,7 +81,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val reservedValueSettingStore: ReservedValueSettingStore,
     private val executor: D2CallExecutor,
     private val reservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
-        TrackedEntityAttributeReservedValueQuery>
+            TrackedEntityAttributeReservedValueQuery>
 ) {
     private val d2ProgressManager = D2ProgressManager(null)
 
@@ -131,7 +131,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         attributeUid: String,
         numberOfValuesToFillUp: Int?
     ) {
-        runBlocking { downloadReservedValues(attributeUid, numberOfValuesToFillUp) }
+        runBlocking { downloadReservedValuesFlow(attributeUid, numberOfValuesToFillUp).collect() }
     }
 
     /**
@@ -169,7 +169,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      */
     fun blockingDownloadAllReservedValues(numberOfValuesToFillUp: Int?) {
         runBlocking {
-            downloadAllReservedValues(numberOfValuesToFillUp)
+            downloadAllReservedValuesFlow(numberOfValuesToFillUp).collect()
         }
     }
 
@@ -202,8 +202,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @param organisationUnitUid An optional organisation unit uid
      * @return Single with the reserved value count by attribute or by attribute and organisation unit.
      */
-    fun count(attributeUid: String, organisationUnitUid: String?): Int =
-        store.count(attributeUid, organisationUnitUid, null)
+    fun count(attributeUid: String, organisationUnitUid: String?): Single<Int> =
+        rxSingle { blockingCount(attributeUid, organisationUnitUid) }
 
     /**
      * @param attributeUid        Attribute uid
@@ -211,8 +211,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      * @return The reserved value count by attribute or by attribute and organisation unit.
      * @see .count
      */
-    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int = runBlocking {
-        count(attributeUid, organisationUnitUid)
+    fun blockingCount(attributeUid: String, organisationUnitUid: String?): Int {
+        return store.count(attributeUid, organisationUnitUid, null)
     }
 
     /**
@@ -296,7 +296,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         organisationUnit: OrganisationUnit?,
         minNumberOfValuesToHave: Int?,
         storeError: Boolean
-    ): Unit = coroutineScope {
+    ) = coroutineScope {
         // Using local date. It's not worth it to make a system info call
         store.deleteExpired(Date())
         val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
@@ -323,19 +323,17 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         pattern: String?,
         storeError: Boolean
     ) {
-        return suspendCoroutine {
-            executor.executeD2Call(
-                reservedValueQueryCallFactory.create(
-                    TrackedEntityAttributeReservedValueQuery.create(
-                        trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
-                    )
-                ),
-                storeError
-            )
+        executor.executeD2Call(
+            reservedValueQueryCallFactory.create(
+                TrackedEntityAttributeReservedValueQuery.create(
+                    trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
+                )
+            ),
+            storeError
+        )
 
-            if (pattern != null) {
-                store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
-            }
+        if (pattern != null) {
+            store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
         }
     }
 

From 669a2b474d37a37abb0f98d4acdb7698d83c6662 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 21 Jul 2023 11:46:36 +0200
Subject: [PATCH 148/478] [ANDROSDK-1712] refactor: - User LogInCall.kt -
 UserModuleImpl.kt - UserCall.kt - UserService.java Remove RxJava, convert to
 Coroutines Tests still need conversion

---
 .../android/core/user/internal/LogInCall.kt   | 66 +++++++++----------
 .../android/core/user/internal/UserCall.kt    |  8 +--
 .../core/user/internal/UserModuleImpl.kt      |  5 +-
 .../core/user/internal/UserService.java       |  7 +-
 4 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 6a35de0c4c..88fcd24f87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -28,13 +28,10 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
@@ -42,38 +39,37 @@ import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
+import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
 internal class LogInCall @Inject internal constructor(
-    private val apiCallExecutor: APICallExecutor,
+    private val databaseAdapter: DatabaseAdapter,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val userIdStore: UserIdInMemoryStore,
     private val userHandler: UserHandler,
     private val authenticatedUserStore: AuthenticatedUserStore,
-    private val systemInfoCall: SystemInfoCall,
+    private val systemInfoRepository: SystemInfoObjectRepository,
     private val userStore: UserStore,
-    private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher,
     private val databaseManager: LogInDatabaseManager,
     private val exceptions: LogInExceptions,
     private val accountManager: AccountManagerImpl,
     private val versionManager: DHISVersionManager
 ) {
-    fun logIn(username: String?, password: String?, serverUrl: String?): Single<User> {
-        return Single.fromCallable {
-            blockingLogIn(username, password, serverUrl)
-        }
+    suspend fun logIn(username: String?, password: String?, serverUrl: String?): User {
+        return blockingLogIn(username, password, serverUrl)
+
     }
 
     @Throws(D2Error::class)
-    private fun blockingLogIn(username: String?, password: String?, serverUrl: String?): User {
+    private suspend fun blockingLogIn(username: String?, password: String?, serverUrl: String?): User {
         exceptions.throwExceptionIfUsernameNull(username)
         exceptions.throwExceptionIfPasswordNull(password)
         exceptions.throwExceptionIfAlreadyAuthenticated()
@@ -91,7 +87,7 @@ internal class LogInCall @Inject internal constructor(
         val credentials = Credentials(username, trimmedServerUrl!!, password, null)
 
         return try {
-            val user = apiCallExecutor.executeObjectCallWithErrorCatcher(authenticateCall, apiCallErrorCatcher)
+            val user = coroutineAPICallExecutor.wrap { authenticateCall }.getOrThrow()
             loginOnline(user, credentials)
         } catch (d2Error: D2Error) {
             if (d2Error.isOffline) {
@@ -127,25 +123,25 @@ internal class LogInCall @Inject internal constructor(
         credentialsSecureStore.set(credentials)
         userIdStore.set(user.uid())
         databaseManager.loadDatabaseOnline(credentials.serverUrl, credentials.username).blockingAwait()
-        return runBlocking {
-            coroutineAPICallExecutor.wrapTransactionally {
-                try {
-                    val authenticatedUser = AuthenticatedUser.builder()
-                        .user(user.uid())
-                        .hash(credentials.getHash())
-                        .build()
-
-                    authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
-                    systemInfoCall.download(storeError = true)
-                    userHandler.handle(user)
-                    user
-                } catch (e: Exception) {
-                    // Credentials are stored and then removed in case of error (required to download system info)
-                    credentialsSecureStore.remove()
-                    userIdStore.remove()
-                    throw e
-                }
-            }
+        val transaction = databaseAdapter.beginNewTransaction()
+        return try {
+            val authenticatedUser = AuthenticatedUser.builder()
+                .user(user.uid())
+                .hash(credentials.getHash())
+                .build()
+
+            authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
+            systemInfoRepository.download().blockingAwait()
+            userHandler.handle(user)
+            transaction.setSuccessful()
+            user
+        } catch (e: Exception) {
+            // Credentials are stored and then removed in case of error since they are required to download system info
+            credentialsSecureStore.remove()
+            userIdStore.remove()
+            throw e
+        } finally {
+            transaction.end()
         }
     }
 
@@ -168,7 +164,7 @@ internal class LogInCall @Inject internal constructor(
     }
 
     @Throws(D2Error::class)
-    fun blockingLogInOpenIDConnect(serverUrl: String, openIDConnectState: AuthState): User {
+    suspend fun blockingLogInOpenIDConnect(serverUrl: String, openIDConnectState: AuthState): User {
         val trimmedServerUrl = ServerUrlParser.trimAndRemoveTrailingSlash(serverUrl)
 
         val parsedServerUrl = ServerUrlParser.parse(trimmedServerUrl)
@@ -181,7 +177,7 @@ internal class LogInCall @Inject internal constructor(
 
         var credentials: Credentials? = null
         return try {
-            val user = apiCallExecutor.executeObjectCallWithErrorCatcher(authenticateCall, apiCallErrorCatcher)
+            val user = coroutineAPICallExecutor.wrap { authenticateCall }.getOrThrow()
             credentials = getOpenIdConnectCredentials(user, trimmedServerUrl!!, openIDConnectState)
             loginOnline(user, credentials)
         } catch (d2Error: D2Error) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index a22a0cf182..64860e9e3a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import dagger.Reusable
-import java.util.concurrent.Callable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
+import java.util.concurrent.Callable
+import javax.inject.Inject
 
 @Reusable
 internal class UserCall @Inject constructor(
@@ -48,9 +48,7 @@ internal class UserCall @Inject constructor(
 
     @Throws(D2Error::class)
     override fun call(): User {
-        val user = apiCallExecutor.executeObjectCall(
-            userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()))
-        )
+        val user = userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()))
 
         val transaction = genericCallData.databaseAdapter().beginNewTransaction()
         try {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index 6f660e28c4..4984e445da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -30,10 +30,11 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions", "LongParameterList")
@@ -72,7 +73,7 @@ internal class UserModuleImpl @Inject constructor(
     }
 
     override fun logIn(username: String, password: String, serverUrl: String): Single<User> {
-        return logInCall.logIn(username, password, serverUrl)
+        return Single.create { runBlocking { logInCall.logIn(username, password, serverUrl) } }
     }
 
     override fun blockingLogIn(username: String, password: String, serverUrl: String): User {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
index d3363fcf94..62e5965dc7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
@@ -32,7 +32,6 @@
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
 import org.hisp.dhis.android.core.user.User;
 
-import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Query;
@@ -40,10 +39,10 @@
 interface UserService {
 
     @GET("me")
-    Call<User> authenticate(@Header("Authorization") String credentials,
-                            @Query("fields") @Which Fields<User> fields);
+    User authenticate(@Header("Authorization") String credentials,
+                      @Query("fields") @Which Fields<User> fields);
 
     @GET("me")
-    Call<User> getUser(@Query("fields") @Which Fields<User> fields);
+    User getUser(@Query("fields") @Which Fields<User> fields);
 
 }

From 388f96a074711c091aa03d47130f96404f5643f5 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 3 Aug 2023 18:11:38 +0200
Subject: [PATCH 149/478] [ANDROSDK-1712] refactor: - Remove rxjava fromm
 LogInCallUnitShould.kt - Refactor some isolated calls to the new coroutines
 functions - Refactor UserService.kt to remove retrofit's "Call"

---
 .../android/core/user/internal/LogInCall.kt   |  44 +++----
 .../android/core/user/internal/UserCall.kt    |  13 +-
 .../{UserService.java => UserService.kt}      |  30 +++--
 .../user/openid/OpenIDConnectHandlerImpl.kt   |   3 +-
 .../core/user/internal/LogInCallUnitShould.kt | 113 +++++++++---------
 5 files changed, 105 insertions(+), 98 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{UserService.java => UserService.kt} (79%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 88fcd24f87..6119ad5682 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
+import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
@@ -40,6 +41,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
@@ -49,14 +51,13 @@ import javax.inject.Inject
 @Reusable
 @Suppress("LongParameterList")
 internal class LogInCall @Inject internal constructor(
-    private val databaseAdapter: DatabaseAdapter,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val userIdStore: UserIdInMemoryStore,
     private val userHandler: UserHandler,
     private val authenticatedUserStore: AuthenticatedUserStore,
-    private val systemInfoRepository: SystemInfoObjectRepository,
+    private val systemInfoCall: SystemInfoCall,
     private val userStore: UserStore,
     private val databaseManager: LogInDatabaseManager,
     private val exceptions: LogInExceptions,
@@ -65,7 +66,6 @@ internal class LogInCall @Inject internal constructor(
 ) {
     suspend fun logIn(username: String?, password: String?, serverUrl: String?): User {
         return blockingLogIn(username, password, serverUrl)
-
     }
 
     @Throws(D2Error::class)
@@ -123,25 +123,25 @@ internal class LogInCall @Inject internal constructor(
         credentialsSecureStore.set(credentials)
         userIdStore.set(user.uid())
         databaseManager.loadDatabaseOnline(credentials.serverUrl, credentials.username).blockingAwait()
-        val transaction = databaseAdapter.beginNewTransaction()
-        return try {
-            val authenticatedUser = AuthenticatedUser.builder()
-                .user(user.uid())
-                .hash(credentials.getHash())
-                .build()
-
-            authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
-            systemInfoRepository.download().blockingAwait()
-            userHandler.handle(user)
-            transaction.setSuccessful()
-            user
-        } catch (e: Exception) {
-            // Credentials are stored and then removed in case of error since they are required to download system info
-            credentialsSecureStore.remove()
-            userIdStore.remove()
-            throw e
-        } finally {
-            transaction.end()
+        return runBlocking {
+            coroutineAPICallExecutor.wrapTransactionally {
+                try {
+                    val authenticatedUser = AuthenticatedUser.builder()
+                        .user(user.uid())
+                        .hash(credentials.getHash())
+                        .build()
+
+                    authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
+                    systemInfoCall.download(storeError = true)
+                    userHandler.handle(user)
+                    user
+                } catch (e: Exception) {
+                    // Credentials are stored and then removed in case of error (required to download system info)
+                    credentialsSecureStore.remove()
+                    userIdStore.remove()
+                    throw e
+                }
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index 64860e9e3a..e6199f8fa0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -29,7 +29,9 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import dagger.Reusable
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
@@ -40,7 +42,7 @@ import javax.inject.Inject
 @Reusable
 internal class UserCall @Inject constructor(
     private val genericCallData: GenericCallData,
-    private val apiCallExecutor: APICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val userHandler: UserHandler,
     private val dhisVersionManager: DHISVersionManager
@@ -48,7 +50,14 @@ internal class UserCall @Inject constructor(
 
     @Throws(D2Error::class)
     override fun call(): User {
-        val user = userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()))
+
+        val user = runBlocking {
+            coroutineAPICallExecutor.wrap {
+                userService.getUser(
+                    UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion())
+                )
+            }.getOrThrow()
+        }
 
         val transaction = genericCallData.databaseAdapter().beginNewTransaction()
         try {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
index 62e5965dc7..95e239e9ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
@@ -25,24 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user.internal
 
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.user.User;
-
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Query;
-
-interface UserService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.user.User
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Query
 
+internal interface UserService {
     @GET("me")
-    User authenticate(@Header("Authorization") String credentials,
-                      @Query("fields") @Which Fields<User> fields);
+    suspend fun authenticate(
+        @Header("Authorization") credentials: String,
+        @Query("fields") @Which fields: Fields<User>
+    ): User
 
     @GET("me")
-    User getUser(@Query("fields") @Which Fields<User> fields);
-
-}
+    suspend fun getUser(@Query("fields") @Which fields: Fields<User>): User
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
index 181d294f7e..0be8fc3dcb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
@@ -34,6 +34,7 @@ import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.rx2.rxSingle
 import javax.inject.Inject
 import net.openid.appauth.*
 import org.hisp.dhis.android.core.user.User
@@ -75,7 +76,7 @@ internal class OpenIDConnectHandlerImpl @Inject constructor(
                 downloadToken(response.createTokenExchangeRequest())
                     .observeOn(Schedulers.io())
                     .map {
-                        logInCall.blockingLogInOpenIDConnect(serverUrl, it)
+                         logInCall.blockingLogInOpenIDConnect(serverUrl, it)
                     }
             }
         } else {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 79795261a8..8b626aef8a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -31,10 +31,15 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
 import io.reactivex.observers.TestObserver
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UserHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -57,7 +62,10 @@ import org.junit.runners.JUnit4
 import org.mockito.*
 import org.mockito.stubbing.OngoingStubbing
 import retrofit2.Call
+import retrofit2.HttpException
 
+
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class LogInCallUnitShould : BaseCallShould() {
     private val userService: UserService = mock()
@@ -67,7 +75,7 @@ class LogInCallUnitShould : BaseCallShould() {
     private val authenticatedUserStore: AuthenticatedUserStore = mock()
     private val credentialsSecureStore: CredentialsSecureStore = mock()
     private val userIdStore: UserIdInMemoryStore = mock()
-    private val authenticateAPICall: Call<User> = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
+    private val authenticateAPICall: User = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
 
     private val credentialsCaptor: KArgumentCaptor<String> = argumentCaptor()
     private val filterCaptor: KArgumentCaptor<Fields<User>> = argumentCaptor()
@@ -83,13 +91,9 @@ class LogInCallUnitShould : BaseCallShould() {
     private val systemInfoCall: SystemInfoCall = mock()
     private val multiUserDatabaseManager: MultiUserDatabaseManager = mock()
     private val generalSettingCall: GeneralSettingCall = mock()
-    private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher = mock()
     private val accountManager: AccountManagerImpl = mock()
     private val versionManager: DHISVersionManager = mock()
 
-    // call we are testing
-    private lateinit var logInSingle: Single<User>
-
     @Before
     @Throws(Exception::class)
     override fun setUp() {
@@ -104,7 +108,9 @@ class LogInCallUnitShould : BaseCallShould() {
         whenever(authenticatedUser.hash()).thenReturn(UserHelper.md5(USERNAME, PASSWORD))
         whenever(systemInfoFromAPI.contextPath()).thenReturn(baseEndpoint)
         whenever(systemInfoFromDb.contextPath()).thenReturn(baseEndpoint)
-        whenever<Call<*>?>(userService.authenticate(any(), any())).thenReturn(authenticateAPICall)
+        userService.stub {
+            onBlocking { authenticate(any(), any()) }.doReturn(authenticateAPICall)
+        }
         systemInfoCall.stub {
             onBlocking { download(any()) }.doReturn(Unit)
         }
@@ -116,76 +122,74 @@ class LogInCallUnitShould : BaseCallShould() {
         whenever(generalSettingCall.isDatabaseEncrypted()).thenReturn(Single.just(false))
         whenever(versionManager.getVersion()).thenReturn(DHISVersion.V2_39)
 
-        logInSingle = instantiateCall(USERNAME, PASSWORD, serverUrl)
     }
 
-    private fun instantiateCall(username: String?, password: String?, serverUrl: String?): Single<User> {
+    private suspend fun login() = instantiateCall(USERNAME, PASSWORD, serverUrl)
+
+    private suspend fun instantiateCall(username: String?, password: String?, serverUrl: String?): User {
         return LogInCall(
-            apiCallExecutor, coroutineAPICallExecutor,
-            userService, credentialsSecureStore, userIdStore, userHandler, authenticatedUserStore,
-            systemInfoCall, userStore, apiCallErrorCatcher,
+            coroutineAPICallExecutor, userService, credentialsSecureStore,
+            userIdStore, userHandler, authenticatedUserStore, systemInfoCall, userStore,
             LogInDatabaseManager(multiUserDatabaseManager, generalSettingCall),
             LogInExceptions(credentialsSecureStore), accountManager, versionManager
         ).logIn(username, password, serverUrl)
+
     }
 
-    private fun whenAPICall(): OngoingStubbing<User?> {
-        return whenever(apiCallExecutor.executeObjectCallWithErrorCatcher(same(authenticateAPICall), any()))
+    private fun whenAPICall(): OngoingStubbing<User?> = runBlocking{
+        return@runBlocking whenever(coroutineAPICallExecutor.wrap { same(authenticateAPICall) }.getOrThrow())
     }
 
     @Test
-    fun throw_d2_error_for_null_username() {
-        val testObserver = instantiateCall(null, PASSWORD, serverUrl).test()
-        assertD2Error(testObserver, D2ErrorCode.LOGIN_USERNAME_NULL)
+    fun throw_d2_error_for_null_username() = runTest {
+        assertD2Error(D2ErrorCode.LOGIN_USERNAME_NULL) { instantiateCall(null, PASSWORD, serverUrl) }
     }
 
     @Test
-    fun throw_d2_error_for_null_password() {
-        val testObserver = instantiateCall(USERNAME, null, serverUrl).test()
-        assertD2Error(testObserver, D2ErrorCode.LOGIN_PASSWORD_NULL)
+    fun throw_d2_error_for_null_password() = runTest {
+        assertD2Error(D2ErrorCode.LOGIN_PASSWORD_NULL) { instantiateCall(USERNAME, null, serverUrl) }
     }
 
     @Test
-    fun throw_d2_error_for_null_server_url() {
-        val testObserver = instantiateCall(USERNAME, PASSWORD, null).test()
-        assertD2Error(testObserver, D2ErrorCode.SERVER_URL_NULL)
+    fun throw_d2_error_for_null_server_url() = runTest {
+        assertD2Error(D2ErrorCode.SERVER_URL_NULL) { instantiateCall(USERNAME, PASSWORD, null) }
     }
 
     @Test
-    fun throw_d2_error_for_wrong_server_url() {
-        val testObserver = instantiateCall(USERNAME, PASSWORD, "this is no URL").test()
-        assertD2Error(testObserver, D2ErrorCode.SERVER_URL_MALFORMED)
+    fun throw_d2_error_for_wrong_server_url() = runTest {
+        assertD2Error(D2ErrorCode.SERVER_URL_MALFORMED) { instantiateCall(USERNAME, PASSWORD, "this is no URL") }
     }
 
-    private fun assertD2Error(testObserver: TestObserver<User>, code: D2ErrorCode) {
-        testObserver.awaitTerminalEvent()
-        val error = testObserver.errors()[0]
-        assertThat(error).isInstanceOf(D2Error::class.java)
-        assertThat((error as D2Error).errorCode()).isEqualTo(code)
-        testObserver.dispose()
+    private suspend fun <P> assertD2Error(
+        errorCode: D2ErrorCode,
+        block: suspend () -> P
+    ) {
+        try {
+            block.invoke()
+        } catch (responseError: D2Error) {
+            assertThat(responseError).isInstanceOf(D2Error::class.java)
+            assertThat(responseError.errorCode()).isEqualTo(errorCode)
+        }
     }
 
     @Test
-    fun invoke_server_with_correct_parameters_after_call() {
+    fun invoke_server_with_correct_parameters_after_call() = runTest {
         whenever(
             userService.authenticate(
                 credentialsCaptor.capture(), filterCaptor.capture()
             )
         ).thenReturn(authenticateAPICall)
-        logInSingle.blockingGet()
+        login()
         assertThat(okhttp3.Credentials.basic(USERNAME, PASSWORD)).isEqualTo(credentialsCaptor.firstValue)
     }
 
     @Test
     @Throws(D2Error::class)
-    fun not_invoke_stores_on_exception_on_call() {
+    fun not_invoke_stores_on_exception_on_call() = runTest {
         whenAPICall().thenThrow(d2Error)
         whenever(d2Error.errorCode()).thenReturn(D2ErrorCode.UNEXPECTED)
 
-        val testObserver = logInSingle.test()
-        testObserver.awaitTerminalEvent()
-        assertThat(testObserver.errorCount()).isEqualTo(1)
-        testObserver.dispose()
+        assertThat(login()).isInstanceOf(D2Error::class.java)
 
         // stores must not be invoked
         verify(authenticatedUserStore, never()).updateOrInsertWhere(any())
@@ -193,23 +197,22 @@ class LogInCallUnitShould : BaseCallShould() {
     }
 
     @Test
-    fun succeed_when_no_previous_user_or_system_info() {
-        logInSingle.blockingGet()
+    fun succeed_when_no_previous_user_or_system_info() = runTest {
+        login()
         verifySuccess()
     }
 
     @Test
-    fun throw_d2_error_if_user_already_signed_in() {
+    fun throw_d2_error_if_user_already_signed_in() = runTest {
         whenever(credentialsSecureStore.get()).thenReturn(credentials)
         whenever(userIdStore.get()).thenReturn("userId")
-        val testObserver = logInSingle.test()
-        assertD2Error(testObserver, D2ErrorCode.ALREADY_AUTHENTICATED)
+        assertD2Error(D2ErrorCode.ALREADY_AUTHENTICATED) { login() }
     }
 
     @Test
-    fun succeed_for_login_online_if_user_has_logged_out() {
+    fun succeed_for_login_online_if_user_has_logged_out() = runTest {
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
-        logInSingle.blockingGet()
+        login()
         verifySuccess()
     }
 
@@ -219,7 +222,7 @@ class LogInCallUnitShould : BaseCallShould() {
         whenAPICall().thenThrow(d2Error)
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
-        logInSingle.test().awaitTerminalEvent()
+        runBlocking { login() }
         verifySuccessOffline()
     }
 
@@ -228,36 +231,32 @@ class LogInCallUnitShould : BaseCallShould() {
         whenAPICall().thenThrow(d2Error)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
-        val loginCall = instantiateCall(USERNAME, PASSWORD, serverUrl + "/")
-        loginCall.test().awaitTerminalEvent()
+        runBlocking { login() }
         verifySuccessOffline()
     }
 
     @Test
-    fun throw_original_d2_error_if_no_previous_database_offline() {
+    fun throw_original_d2_error_if_no_previous_database_offline() = runTest {
         whenAPICall().thenThrow(d2Error)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(null)
-        val testObserver = logInSingle.test()
-        assertD2Error(testObserver, d2Error.errorCode())
+        assertD2Error(d2Error.errorCode()) { login() }
     }
 
     @Test
-    fun throw_d2_error_if_no_previous_authenticated_user_offline() {
+    fun throw_d2_error_if_no_previous_authenticated_user_offline() = runTest {
         whenAPICall().thenThrow(d2Error)
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(null)
-        val testObserver = logInSingle.test()
-        assertD2Error(testObserver, D2ErrorCode.NO_AUTHENTICATED_USER_OFFLINE)
+        assertD2Error(D2ErrorCode.NO_AUTHENTICATED_USER_OFFLINE) { login() }
     }
 
     @Test
-    fun throw_d2_error_if_logging_offline_with_bad_credentials() {
+    fun throw_d2_error_if_logging_offline_with_bad_credentials() = runTest {
         whenAPICall().thenThrow(d2Error)
         whenever(authenticatedUser.hash()).thenReturn("different_hash")
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
-        val testObserver = logInSingle.test()
-        assertD2Error(testObserver, D2ErrorCode.BAD_CREDENTIALS)
+        assertD2Error(D2ErrorCode.BAD_CREDENTIALS) { login() }
     }
 
     private fun verifySuccess() {

From 84aa7fad6892b7c40bd42f79bbbb89f915c6758c Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 3 Aug 2023 19:08:55 +0200
Subject: [PATCH 150/478] [ANDROSDK-1711] style: - Minor fixes for linter

---
 .../TrackedEntityAttributeReservedValueManager.kt           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index bdf8e2cdc3..12a0bf4dea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -30,6 +30,8 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
+import java.util.Date
+import javax.inject.Inject
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -65,8 +67,6 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import java.util.Date
-import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
 @Reusable
@@ -81,7 +81,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val reservedValueSettingStore: ReservedValueSettingStore,
     private val executor: D2CallExecutor,
     private val reservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
-            TrackedEntityAttributeReservedValueQuery>
+        TrackedEntityAttributeReservedValueQuery>
 ) {
     private val d2ProgressManager = D2ProgressManager(null)
 

From 5215499bda770d60e3fbe3da3fbf09da36d4f39e Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 4 Aug 2023 12:15:04 +0200
Subject: [PATCH 151/478] [ANDROSDK-1712] fix: - LogInCallUnitShould.kt to
 handle the refactor - CoroutineAPICallExecutorMock.kt now it handles D2Error
 gently refactor: - UserCallShould.kt - OpenIDConnectHandlerImpl.kt -
 LogInCall.kt

---
 .../OpenIdConnectRealIntegrationShould.kt     |  5 +-
 .../android/core/user/internal/LogInCall.kt   | 18 +++---
 .../android/core/user/internal/UserCall.kt    |  5 +-
 .../core/user/internal/UserModuleImpl.kt      |  2 +-
 .../android/core/user/internal/UserService.kt |  2 +-
 .../user/openid/OpenIDConnectHandlerImpl.kt   | 12 +++-
 .../internal/CoroutineAPICallExecutorMock.kt  | 16 +++--
 .../core/user/internal/LogInCallUnitShould.kt | 63 ++++++++-----------
 .../core/user/internal/UserCallShould.kt      | 29 +++++----
 9 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt
index 0cd1a75fb9..6b2f5eeb64 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.user
 
+import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 
@@ -35,6 +36,8 @@ class OpenIdConnectRealIntegrationShould : BaseRealIntegrationTest() {
     // @Test(expected = D2Error::class)
     fun throw_error_when_not_passing_token() {
         val logInCall = getD2DIComponent(d2).internalModules().user.logInCall
-        logInCall.blockingLogInOpenIDConnect(url, AuthState())
+        runBlocking {
+            logInCall.blockingLogInOpenIDConnect(url, AuthState())
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 6119ad5682..acba77690c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
+import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
@@ -40,13 +40,11 @@ import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
-import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -79,15 +77,15 @@ internal class LogInCall @Inject internal constructor(
         val parsedServerUrl = ServerUrlParser.parse(trimmedServerUrl)
         ServerURLWrapper.setServerUrl(parsedServerUrl.toString())
 
-        val authenticateCall = userService.authenticate(
-            okhttp3.Credentials.basic(username!!, password!!),
-            UserFields.allFieldsWithoutOrgUnit(null)
-        )
-
-        val credentials = Credentials(username, trimmedServerUrl!!, password, null)
+        val credentials = Credentials(username!!, trimmedServerUrl!!, password, null)
 
         return try {
-            val user = coroutineAPICallExecutor.wrap { authenticateCall }.getOrThrow()
+            val user = coroutineAPICallExecutor.wrap {
+                userService.authenticate(
+                    okhttp3.Credentials.basic(username, password!!),
+                    UserFields.allFieldsWithoutOrgUnit(null)
+                )
+            }.getOrThrow()
             loginOnline(user, credentials)
         } catch (d2Error: D2Error) {
             if (d2Error.isOffline) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index e6199f8fa0..958e33b248 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -29,15 +29,14 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import dagger.Reusable
+import java.util.concurrent.Callable
+import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
-import java.util.concurrent.Callable
-import javax.inject.Inject
 
 @Reusable
 internal class UserCall @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index 4984e445da..cf9198a4df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -30,11 +30,11 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
+import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
-import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions", "LongParameterList")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
index 95e239e9ae..14a70410e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
@@ -43,4 +43,4 @@ internal interface UserService {
 
     @GET("me")
     suspend fun getUser(@Query("fields") @Which fields: Fields<User>): User
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
index 0be8fc3dcb..e335d2e92b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
@@ -34,9 +34,13 @@ import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
-import kotlinx.coroutines.rx2.rxSingle
 import javax.inject.Inject
-import net.openid.appauth.*
+import kotlinx.coroutines.runBlocking
+import net.openid.appauth.AuthState
+import net.openid.appauth.AuthorizationException
+import net.openid.appauth.AuthorizationResponse
+import net.openid.appauth.AuthorizationService
+import net.openid.appauth.TokenRequest
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.LogInCall
 
@@ -76,7 +80,9 @@ internal class OpenIDConnectHandlerImpl @Inject constructor(
                 downloadToken(response.createTokenExchangeRequest())
                     .observeOn(Schedulers.io())
                     .map {
-                         logInCall.blockingLogInOpenIDConnect(serverUrl, it)
+                        runBlocking {
+                            logInCall.blockingLogInOpenIDConnect(serverUrl, it)
+                        }
                     }
             }
         } else {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
index 5f7079f495..553cf75971 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
@@ -43,12 +43,16 @@ internal class CoroutineAPICallExecutorMock : CoroutineAPICallExecutor {
         return try {
             Result.Success(block.invoke())
         } catch (e: Throwable) {
-            Result.Failure(
-                D2Error.builder()
-                    .errorCode(D2ErrorCode.UNEXPECTED)
-                    .errorDescription("Unexpected error")
-                    .build()
-            )
+            if (e is D2Error) {
+                Result.Failure(e)
+            } else {
+                Result.Failure(
+                    D2Error.builder()
+                        .errorCode(D2ErrorCode.UNEXPECTED)
+                        .errorDescription("Unexpected error")
+                        .build()
+                )
+            }
         }
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 8b626aef8a..ef5f2eb70b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -30,16 +30,12 @@ package org.hisp.dhis.android.core.user.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
-import io.reactivex.observers.TestObserver
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
-import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UserHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -60,29 +56,23 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.*
-import org.mockito.stubbing.OngoingStubbing
-import retrofit2.Call
-import retrofit2.HttpException
-
+import org.mockito.stubbing.Answer
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class LogInCallUnitShould : BaseCallShould() {
     private val userService: UserService = mock()
-    private val apiCallExecutor: APICallExecutor = mock()
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val userHandler: UserHandler = mock()
     private val authenticatedUserStore: AuthenticatedUserStore = mock()
     private val credentialsSecureStore: CredentialsSecureStore = mock()
     private val userIdStore: UserIdInMemoryStore = mock()
-    private val authenticateAPICall: User = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
 
     private val credentialsCaptor: KArgumentCaptor<String> = argumentCaptor()
     private val filterCaptor: KArgumentCaptor<Fields<User>> = argumentCaptor()
 
-    private val user: User = mock()
-    private val anotherUser: User = mock()
-    private val loggedUser: User = mock()
+    private val apiUser: User = mock()
+    private val dbUser: User = mock()
     private val systemInfoFromAPI: SystemInfo = mock()
     private val systemInfoFromDb: SystemInfo = mock()
     private val authenticatedUser: AuthenticatedUser = mock()
@@ -98,30 +88,26 @@ class LogInCallUnitShould : BaseCallShould() {
     @Throws(Exception::class)
     override fun setUp() {
         super.setUp()
-        whenever(user.uid()).thenReturn(UID)
-        whenever(loggedUser.uid()).thenReturn(UID)
+        whenever(apiUser.uid()).thenReturn(UID)
+        whenever(dbUser.uid()).thenReturn(UID)
         whenever(systemInfoFromAPI.serverDate()).thenReturn(serverDate)
-        whenever(anotherUser.uid()).thenReturn("anotherUserUid")
         whenever(credentials.username).thenReturn(USERNAME)
         whenever(credentials.password).thenReturn(PASSWORD)
         whenever(authenticatedUser.user()).thenReturn(UID)
         whenever(authenticatedUser.hash()).thenReturn(UserHelper.md5(USERNAME, PASSWORD))
         whenever(systemInfoFromAPI.contextPath()).thenReturn(baseEndpoint)
         whenever(systemInfoFromDb.contextPath()).thenReturn(baseEndpoint)
-        userService.stub {
-            onBlocking { authenticate(any(), any()) }.doReturn(authenticateAPICall)
-        }
         systemInfoCall.stub {
             onBlocking { download(any()) }.doReturn(Unit)
         }
-        whenAPICall().thenReturn(user)
-        whenever(userStore.selectFirst()).thenReturn(loggedUser)
+        whenAPICall { apiUser }
+        whenever(userStore.selectFirst()).thenReturn(dbUser)
+        whenever(userStore.selectByUid(any())).thenReturn(dbUser)
         whenever(databaseAdapter.beginNewTransaction()).thenReturn(transaction)
         whenever(d2Error.errorCode()).thenReturn(D2ErrorCode.SOCKET_TIMEOUT)
         whenever(d2Error.isOffline).thenReturn(true)
         whenever(generalSettingCall.isDatabaseEncrypted()).thenReturn(Single.just(false))
         whenever(versionManager.getVersion()).thenReturn(DHISVersion.V2_39)
-
     }
 
     private suspend fun login() = instantiateCall(USERNAME, PASSWORD, serverUrl)
@@ -133,11 +119,12 @@ class LogInCallUnitShould : BaseCallShould() {
             LogInDatabaseManager(multiUserDatabaseManager, generalSettingCall),
             LogInExceptions(credentialsSecureStore), accountManager, versionManager
         ).logIn(username, password, serverUrl)
-
     }
 
-    private fun whenAPICall(): OngoingStubbing<User?> = runBlocking{
-        return@runBlocking whenever(coroutineAPICallExecutor.wrap { same(authenticateAPICall) }.getOrThrow())
+    private fun whenAPICall(answer: Answer<User>) {
+        userService.stub {
+            onBlocking { authenticate(any(), any()) }.doAnswer(answer)
+        }
     }
 
     @Test
@@ -161,14 +148,14 @@ class LogInCallUnitShould : BaseCallShould() {
     }
 
     private suspend fun <P> assertD2Error(
-        errorCode: D2ErrorCode,
+        errorCode: D2ErrorCode? = null,
         block: suspend () -> P
     ) {
         try {
             block.invoke()
         } catch (responseError: D2Error) {
             assertThat(responseError).isInstanceOf(D2Error::class.java)
-            assertThat(responseError.errorCode()).isEqualTo(errorCode)
+            if (errorCode != null) assertThat(responseError.errorCode()).isEqualTo(errorCode)
         }
     }
 
@@ -178,7 +165,7 @@ class LogInCallUnitShould : BaseCallShould() {
             userService.authenticate(
                 credentialsCaptor.capture(), filterCaptor.capture()
             )
-        ).thenReturn(authenticateAPICall)
+        ).thenReturn(apiUser)
         login()
         assertThat(okhttp3.Credentials.basic(USERNAME, PASSWORD)).isEqualTo(credentialsCaptor.firstValue)
     }
@@ -186,10 +173,10 @@ class LogInCallUnitShould : BaseCallShould() {
     @Test
     @Throws(D2Error::class)
     fun not_invoke_stores_on_exception_on_call() = runTest {
-        whenAPICall().thenThrow(d2Error)
+        whenAPICall { throw d2Error }
         whenever(d2Error.errorCode()).thenReturn(D2ErrorCode.UNEXPECTED)
 
-        assertThat(login()).isInstanceOf(D2Error::class.java)
+        assertD2Error { login() }
 
         // stores must not be invoked
         verify(authenticatedUserStore, never()).updateOrInsertWhere(any())
@@ -218,17 +205,17 @@ class LogInCallUnitShould : BaseCallShould() {
 
     // Offline support
     @Test
-    fun succeed_for_login_offline_if_database_exists_and_authenticated_user_too() {
-        whenAPICall().thenThrow(d2Error)
+    fun succeed_for_login_offline_if_database_exists_and_authenticated_user_too() = runTest {
+        whenAPICall { throw d2Error }
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
-        runBlocking { login() }
+        login()
         verifySuccessOffline()
     }
 
     @Test
     fun succeed_for_login_offline_if_server_has_a_trailing_slash() {
-        whenAPICall().thenThrow(d2Error)
+        whenAPICall { throw d2Error }
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         runBlocking { login() }
@@ -237,14 +224,14 @@ class LogInCallUnitShould : BaseCallShould() {
 
     @Test
     fun throw_original_d2_error_if_no_previous_database_offline() = runTest {
-        whenAPICall().thenThrow(d2Error)
+        whenAPICall { throw d2Error }
         whenever(authenticatedUserStore.selectFirst()).thenReturn(null)
         assertD2Error(d2Error.errorCode()) { login() }
     }
 
     @Test
     fun throw_d2_error_if_no_previous_authenticated_user_offline() = runTest {
-        whenAPICall().thenThrow(d2Error)
+        whenAPICall { throw d2Error }
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(null)
         assertD2Error(D2ErrorCode.NO_AUTHENTICATED_USER_OFFLINE) { login() }
@@ -252,7 +239,7 @@ class LogInCallUnitShould : BaseCallShould() {
 
     @Test
     fun throw_d2_error_if_logging_offline_with_bad_credentials() = runTest {
-        whenAPICall().thenThrow(d2Error)
+        whenAPICall { throw d2Error }
         whenever(authenticatedUser.hash()).thenReturn("different_hash")
         whenever(multiUserDatabaseManager.loadExistingKeepingEncryption(serverUrl, USERNAME)).thenReturn(true)
         whenever(authenticatedUserStore.selectFirst()).thenReturn(authenticatedUser)
@@ -265,7 +252,7 @@ class LogInCallUnitShould : BaseCallShould() {
             .hash(UserHelper.md5(USERNAME, PASSWORD))
             .build()
         verify(authenticatedUserStore).updateOrInsertWhere(authenticatedUserModel)
-        verify(userHandler).handle(eq(user))
+        verify(userHandler).handle(eq(apiUser))
     }
 
     private fun verifySuccessOffline() {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 1799d957d0..0d63049035 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -25,11 +25,15 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package org.hisp.dhis.android.core.user.internal
 
 import com.nhaarman.mockitokotlin2.*
 import java.util.concurrent.Callable
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -40,15 +44,14 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import retrofit2.Call
 
 @RunWith(JUnit4::class)
 class UserCallShould : BaseCallShould() {
     private val userService: UserService = mock()
-    private val apiCallExecutor: APICallExecutor = mock()
     private val userHandler: UserHandler = mock()
-    private val userCall: Call<User> = mock()
+    private val userCall: User = mock()
     private val dhisVersionManager: DHISVersionManager = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = mock()
 
     private val user: User = mock()
 
@@ -57,14 +60,16 @@ class UserCallShould : BaseCallShould() {
     @Before
     override fun setUp() {
         super.setUp()
-        userSyncCall = UserCall(genericCallData, apiCallExecutor, userService, userHandler, dhisVersionManager)
-        whenever<Call<*>?>(userService.getUser(any())).thenReturn(userCall)
+        userSyncCall = UserCall(genericCallData, coroutineAPICallExecutor, userService, userHandler, dhisVersionManager)
+        userService.stub {
+            onBlocking { getUser(any()) }.doReturn(userCall)
+        }
         whenever(dhisVersionManager.getVersion()).thenReturn(DHISVersion.V2_39)
     }
 
     @Test
-    fun not_invoke_stores_on_call_io_exception() {
-        whenever(apiCallExecutor.executeObjectCall(userCall)).thenThrow(d2Error)
+    fun not_invoke_stores_on_call_io_exception() = runTest {
+        whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenThrow(d2Error)
         try {
             userSyncCall.call()
             Assert.fail("Exception was not thrown")
@@ -79,8 +84,8 @@ class UserCallShould : BaseCallShould() {
     }
 
     @Test
-    fun not_invoke_handler_after_call_failure() {
-        whenever(apiCallExecutor.executeObjectCall(userCall)).thenThrow(d2Error)
+    fun not_invoke_handler_after_call_failure() = runTest {
+        whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenThrow(d2Error)
         try {
             userSyncCall.call()
             Assert.fail("Call should't succeed")
@@ -94,8 +99,8 @@ class UserCallShould : BaseCallShould() {
     }
 
     @Test
-    fun invoke_handlers_on_success() {
-        whenever(apiCallExecutor.executeObjectCall(userCall)).thenReturn(user)
+    fun invoke_handlers_on_success() = runTest {
+        whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenReturn(user)
         userSyncCall.call()
         verify(userHandler).handle(eq(user))
     }

From 3966916b2d740d226c31f88db43c6e98925db902 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 8 Aug 2023 14:50:10 +0200
Subject: [PATCH 152/478] [ANDROSDK-1712] fix: - LogInCallUnitShould.kt to
 handle the refactor - CoroutineAPICallExecutorMock.kt now it handles D2Error
 gently refactor: to coroutines - UserCallShould.kt -
 OpenIDConnectHandlerImpl.kt - LogInCall.kt

---
 .../android/core/user/internal/LogInCall.kt   | 37 +++++++++----------
 .../core/user/internal/UserModuleImpl.kt      |  4 +-
 .../core/user/internal/UserCallShould.kt      |  3 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index acba77690c..e2e9db7bd3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
@@ -117,28 +116,26 @@ internal class LogInCall @Inject internal constructor(
     }
 
     @Suppress("TooGenericExceptionCaught")
-    private fun loginOnline(user: User, credentials: Credentials): User {
+    private suspend fun loginOnline(user: User, credentials: Credentials): User {
         credentialsSecureStore.set(credentials)
         userIdStore.set(user.uid())
         databaseManager.loadDatabaseOnline(credentials.serverUrl, credentials.username).blockingAwait()
-        return runBlocking {
-            coroutineAPICallExecutor.wrapTransactionally {
-                try {
-                    val authenticatedUser = AuthenticatedUser.builder()
-                        .user(user.uid())
-                        .hash(credentials.getHash())
-                        .build()
-
-                    authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
-                    systemInfoCall.download(storeError = true)
-                    userHandler.handle(user)
-                    user
-                } catch (e: Exception) {
-                    // Credentials are stored and then removed in case of error (required to download system info)
-                    credentialsSecureStore.remove()
-                    userIdStore.remove()
-                    throw e
-                }
+        return coroutineAPICallExecutor.wrapTransactionally {
+            try {
+                val authenticatedUser = AuthenticatedUser.builder()
+                    .user(user.uid())
+                    .hash(credentials.getHash())
+                    .build()
+
+                authenticatedUserStore.updateOrInsertWhere(authenticatedUser)
+                systemInfoCall.download(storeError = true)
+                userHandler.handle(user)
+                user
+            } catch (e: Exception) {
+                // Credentials are stored and then removed in case of error (required to download system info)
+                credentialsSecureStore.remove()
+                userIdStore.remove()
+                throw e
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index cf9198a4df..82d97900fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -31,7 +31,7 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
@@ -73,7 +73,7 @@ internal class UserModuleImpl @Inject constructor(
     }
 
     override fun logIn(username: String, password: String, serverUrl: String): Single<User> {
-        return Single.create { runBlocking { logInCall.logIn(username, password, serverUrl) } }
+        return rxSingle { logInCall.logIn(username, password, serverUrl) }
     }
 
     override fun blockingLogIn(username: String, password: String, serverUrl: String): User {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 0d63049035..467e70ab42 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -64,17 +64,18 @@ class UserCallShould : BaseCallShould() {
         userService.stub {
             onBlocking { getUser(any()) }.doReturn(userCall)
         }
+
         whenever(dhisVersionManager.getVersion()).thenReturn(DHISVersion.V2_39)
     }
 
     @Test
     fun not_invoke_stores_on_call_io_exception() = runTest {
         whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenThrow(d2Error)
+
         try {
             userSyncCall.call()
             Assert.fail("Exception was not thrown")
         } catch (ex: Exception) {
-
             // verify that handlers was not touched
             verify(databaseAdapter, never()).beginNewTransaction()
             verify(transaction, never()).setSuccessful()

From b1db0de8e2f803aac4c5b709e28cb970138dee9b Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 13:38:33 +0200
Subject: [PATCH 153/478] [ANDROSDK-1737] Refactor jacoco.gradle.kts

---
 core/build.gradle.kts          |   2 +-
 core/plugins/jacoco.gradle     | 114 -----------------------------
 core/plugins/jacoco.gradle.kts | 130 +++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 115 deletions(-)
 delete mode 100644 core/plugins/jacoco.gradle
 create mode 100644 core/plugins/jacoco.gradle.kts

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 5cbacc141f..81f5d792da 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -36,7 +36,7 @@ plugins {
 
 apply(from = project.file("plugins/android-checkstyle.gradle"))
 apply(from = project.file("plugins/android-pmd.gradle"))
-apply(from = project.file("plugins/jacoco.gradle"))
+apply(from = project.file("plugins/jacoco.gradle.kts"))
 apply(from = project.file("plugins/gradle-mvn-push.gradle"))
 
 repositories {
diff --git a/core/plugins/jacoco.gradle b/core/plugins/jacoco.gradle
deleted file mode 100644
index 9e2d54e8c4..0000000000
--- a/core/plugins/jacoco.gradle
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-apply plugin: 'jacoco'
-
-task jacocoReport(type: JacocoReport) {
-    group "Coverage"
-    description "Generate XML/HTML code coverage reports for coverage.ec"
-
-    sourceDirectories.setFrom("${project.projectDir}/src/main/java")
-
-    def excludes = [
-            // data binding
-            'android/databinding/**/*.class',
-            '**/android/databinding/*Binding.class',
-            '**/android/databinding/*',
-            '**/androidx/databinding/*',
-            '**/BR.*',
-            // android
-            '**/R.class',
-            '**/R$*.class',
-            '**/BuildConfig.*',
-            '**/Manifest*.*',
-            '**/*Test*.*',
-            'android/**/*.*',
-            // butterKnife
-            '**/*$ViewInjector*.*',
-            '**/*$ViewBinder*.*',
-            // dagger
-            '**/*_MembersInjector.class',
-            '**/Dagger*Component.class',
-            '**/Dagger*Component$Builder.class',
-            '**/*Module_*Factory.class',
-            '**/di/module/*',
-            '**/*_Factory*.*',
-            '**/*Dagger*.*',
-            '**/*Hilt*.*',
-            // kotlin
-            '**/*MapperImpl*.*',
-            '**/*$ViewInjector*.*',
-            '**/*$ViewBinder*.*',
-            '**/BuildConfig.*',
-            '**/*Component*.*',
-            '**/*BR*.*',
-            '**/Manifest*.*',
-            '**/*$Lambda$*.*',
-            '**/*Companion*.*',
-            '**/*Dagger*.*',
-            '**/*Hilt*.*',
-            '**/*MembersInjector*.*',
-            '**/*_MembersInjector.class',
-            '**/*_Factory*.*',
-            '**/*_Provide*Factory*.*',
-            '**/*Extensions*.*',
-            // sealed and data classes
-            '**/*$Result.*',
-            '**/*$Result$*.*',
-            // DHIS2 Android SDK fields
-            '**/*AutoValue_*.*'
-    ]
-
-    def javaClasses = fileTree(dir: "${buildDir}/intermediates/javac/debug", excludes: excludes)
-    def kotlinClasses = fileTree(dir: "${buildDir}/tmp/kotlin-classes/debug", excludes: excludes)
-
-    classDirectories.setFrom(files([
-            javaClasses,
-            kotlinClasses
-    ]))
-
-    def unitTestsData = fileTree(dir: "${buildDir}/jacoco", includes: ['*.exec'])
-    def androidTestsData = fileTree(dir: "${buildDir}/outputs/code_coverage", includes: ['**/*.ec'])
-
-    executionData.setFrom(files([
-            unitTestsData,
-            androidTestsData
-    ]))
-
-    reports {
-        csv.enabled false // change if needed
-        xml {
-            enabled true
-            destination file("${buildDir}/coverage-report/jacocoTestReport.xml")
-        }
-        html {
-            enabled true
-            destination file("${buildDir}/coverage-report")
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/plugins/jacoco.gradle.kts b/core/plugins/jacoco.gradle.kts
new file mode 100644
index 0000000000..98ea614d64
--- /dev/null
+++ b/core/plugins/jacoco.gradle.kts
@@ -0,0 +1,130 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+apply(plugin = "jacoco")
+
+tasks.register("jacocoReport", JacocoReport::class) {
+    group = "Coverage"
+    description = "Generate XML/HTML code coverage reports for coverage.ec"
+
+    sourceDirectories.setFrom("${project.projectDir}/src/main/java")
+
+    val excludes = mutableSetOf<String>(
+        // data binding
+        "android/databinding/**/*.class",
+        "**/android/databinding/*Binding.class",
+        "**/android/databinding/*",
+        "**/androidx/databinding/*",
+        "**/BR.*",
+        // android
+        "**/R.class",
+        "**/R$*.class",
+        "**/BuildConfig.*",
+        "**/Manifest*.*",
+        "**/*Test*.*",
+        "android/**/*.*",
+        // butterKnife
+        "**/*\$ViewInjector*.*",
+        "**/*\$ViewBinder*.*",
+        // dagger
+        "**/*_MembersInjector.class",
+        "**/Dagger*Component.class",
+        "**/Dagger*Component\$Builder.class",
+        "**/*Module_*Factory.class",
+        "**/di/module/*",
+        "**/*_Factory*.*",
+        "**/*Dagger*.*",
+        "**/*Hilt*.*",
+        // kotlin
+        "**/*MapperImpl*.*",
+        "**/*\$ViewInjector*.*",
+        "**/*\$ViewBinder*.*",
+        "**/BuildConfig.*",
+        "**/*Component*.*",
+        "**/*BR*.*",
+        "**/Manifest*.*",
+        "**/*\$Lambda$*.*",
+        "**/*Companion*.*",
+        "**/*Dagger*.*",
+        "**/*Hilt*.*",
+        "**/*MembersInjector*.*",
+        "**/*_MembersInjector.class",
+        "**/*_Factory*.*",
+        "**/*_Provide*Factory*.*",
+        "**/*Extensions*.*",
+        // sealed and data classes
+        "**/*\$Result.*",
+        "**/*\$Result$*.*",
+        // DHIS2 Android SDK fields
+        "**/*AutoValue_*.*"
+    )
+
+    val javaClasses = fileTree("${buildDir}/intermediates/javac/debug") {
+        exclude(excludes)
+    }
+    val kotlinClasses = fileTree("${buildDir}/tmp/kotlin-classes/debug") {
+        exclude(excludes)
+    }
+
+    classDirectories.setFrom(
+        files(
+            listOf(
+                javaClasses,
+                kotlinClasses
+            )
+        )
+    )
+
+    val unitTestsData = fileTree("${buildDir}/jacoco") {
+        include("*.exec")
+    }
+    val androidTestsData = fileTree("${buildDir}/outputs/code_coverage") {
+        include(listOf("**/*.ec"))
+    }
+
+    executionData.setFrom(
+        files(
+            listOf(
+                unitTestsData,
+                androidTestsData
+            )
+        )
+    )
+
+    fun JacocoReportsContainer.reports() {
+        xml.required.set(true)
+        xml.outputLocation.set(file("${buildDir}/coverage-report/jacocoTestReport.xml"))
+
+        html.required.set(true)
+        html.outputLocation.set(file("${buildDir}/coverage-report"))
+    }
+
+    reports {
+        reports()
+    }
+}
\ No newline at end of file

From 5f03ecb859e2021397248463ee9835e5f016e08f Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 13:39:53 +0200
Subject: [PATCH 154/478] [ANDROSDK-1737] Update gradle to 8.1.0

---
 build.gradle.kts                         | 2 +-
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 instrumented-test-app/build.gradle.kts   | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d2e72f7549..32a8753adc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.1")
+        classpath("com.android.tools.build:gradle:8.1.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
         classpath("org.jlleitschuh.gradle:ktlint-gradle:11.0.0")
         classpath("org.jacoco:org.jacoco.core:0.8.8")
diff --git a/gradle.properties b/gradle.properties
index 87c1fb1833..afb7a6b701 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,3 +16,6 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 # Enable parallel builds
 org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f0..da1db5f04e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/instrumented-test-app/build.gradle.kts b/instrumented-test-app/build.gradle.kts
index c7264fcc72..7849573848 100644
--- a/instrumented-test-app/build.gradle.kts
+++ b/instrumented-test-app/build.gradle.kts
@@ -31,11 +31,11 @@ plugins {
     kotlin("android")
 }
 
-apply(from = project.file("../core/plugins/jacoco.gradle"))
+apply(from = project.file("../core/plugins/jacoco.gradle.kts"))
 
 android {
     compileSdk = 33
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "33.0.1"
 
     defaultConfig {
         applicationId = "org.hisp.dhis.android.instrumentedTestApp"

From 97a83dd2bb7a76a619668fa30c86d1a35b323ff4 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 13:58:48 +0200
Subject: [PATCH 155/478] [ANDROSDK-1737] update java version to 17

---
 core/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 81f5d792da..e07d68f55e 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -108,8 +108,8 @@ android {
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     packagingOptions {

From 78a56f6feb38c0d33627ba0cdef732b34617b1e5 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 13:59:13 +0200
Subject: [PATCH 156/478] [ANDROSDK-1737] Remove MaxPermSize

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index afb7a6b701..40ac8f07e5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx8g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 # Enable AndroidX
 android.useAndroidX=true
 # Enable Gradle Daemon

From 3f300c69e6c2b6e07fe61c0a8652a9641d91352d Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 13:59:38 +0200
Subject: [PATCH 157/478] [ANDROSDK-1737] Update kotlin to 1.9.0

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 32a8753adc..1f960cff47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 buildscript {
-    val kotlinVersion = "1.7.21"
+    val kotlinVersion = "1.9.0"
 
     repositories {
         google()

From 56c770fc13107d21635c891d8e02c80760002df0 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 14:00:00 +0200
Subject: [PATCH 158/478] [ANDROSDK-1737] Update gradle wrapper to 8.2.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da1db5f04e..84a0b92f9a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From fd196079ff9f1b9bf5cbf261caaa3f7c5b214eb2 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 16:02:51 +0200
Subject: [PATCH 159/478] [ANDROSDK-1737] set java 17 in instrumentation

---
 .idea/gradle.xml                       |  2 +-
 build.gradle.kts                       |  2 +-
 core/build.gradle.kts                  | 10 +++++-----
 instrumented-test-app/build.gradle.kts |  5 +++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54c13a7a8b..fdc5465974 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 1f960cff47..756805647a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 buildscript {
-    val kotlinVersion = "1.9.0"
+    val kotlinVersion = "1.8.20"
 
     repositories {
         google()
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index e07d68f55e..83214a1b04 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -52,19 +52,19 @@ val VERSION_NAME: String by project
 /*
 ** Libraries
 */
-val libraryDesugaring = "1.2.2"
+val libraryDesugaring = "2.0.3"
 
 // android
-val annotation = "1.4.0"
+val annotation = "1.6.0"
 val paging = "2.1.2"
 
 // java
 val jackson = "2.13.4"
-val autoValue = "1.10.1"
+val autoValue = "1.10.2"
 val autoValueCursor = "2.0.1"
 val retrofit = "2.9.0"
 val okHttp = "3.14.9"
-val dagger = "2.44.2"
+val dagger = "2.47"
 val rxJava = "2.2.21"
 val rxAndroid = "2.1.1"
 val sqlCipher = "4.4.3"
@@ -112,7 +112,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    packagingOptions {
+    packaging {
         resources {
             excludes += listOf("META-INF/LICENSE", "META-INF/rxjava.properties")
         }
diff --git a/instrumented-test-app/build.gradle.kts b/instrumented-test-app/build.gradle.kts
index 7849573848..e9222c697b 100644
--- a/instrumented-test-app/build.gradle.kts
+++ b/instrumented-test-app/build.gradle.kts
@@ -45,6 +45,11 @@ android {
         versionName = "1.0"
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     buildTypes {
         getByName("debug") {
             enableAndroidTestCoverage = true

From 865a865ec0d14fbb25e2ec9ca91b048dd937712c Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 16:03:27 +0200
Subject: [PATCH 160/478] [ANDROSDK-1737] comment android pmd

---
 core/plugins/android-pmd.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/plugins/android-pmd.gradle b/core/plugins/android-pmd.gradle
index 3ead625dd1..75c5e9e74c 100644
--- a/core/plugins/android-pmd.gradle
+++ b/core/plugins/android-pmd.gradle
@@ -23,10 +23,10 @@ afterEvaluate {
 
             ignoreFailures = false
 
-            reports {
+            /*reports {
                 html.enabled = true
                 xml.enabled = true
-            }
+            }*/
 
             ruleSetFiles = project.files(
                     "plugins/pmd-rules.xml"

From 41e34b9c68831455c1ec29382a7eb5824a25263d Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 11 Aug 2023 17:16:39 +0200
Subject: [PATCH 161/478] [ANDROSDK-1737] set Java version to 17

---
 Jenkinsfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3ef3d75915..fe0e0853db 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,6 +4,15 @@ pipeline {
     }
 
     stages{
+        stage('Change to JAVA 17') {
+            steps {
+                script {
+                    echo 'Changing JAVA version to 17'
+                    sh 'sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java'
+                    env.JAVA_HOME = '/usr/lib/jvm/java-17-openjdk-amd64'
+                }
+            }
+        }
         stage('Checks') {
             steps {
                 script {

From fa638a3d367fe33e0ba3f063b89e9276ddb6000a Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Mon, 14 Aug 2023 09:25:46 +0200
Subject: [PATCH 162/478] [ANDROSDK-1737] update android-pmd.gradle

---
 core/plugins/android-pmd.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/plugins/android-pmd.gradle b/core/plugins/android-pmd.gradle
index 75c5e9e74c..63ea993f80 100644
--- a/core/plugins/android-pmd.gradle
+++ b/core/plugins/android-pmd.gradle
@@ -23,10 +23,10 @@ afterEvaluate {
 
             ignoreFailures = false
 
-            /*reports {
-                html.enabled = true
-                xml.enabled = true
-            }*/
+            reports {
+                xml.required.set(true)
+                html.required.set(true)
+            }
 
             ruleSetFiles = project.files(
                     "plugins/pmd-rules.xml"

From a1794b3a1ee8dfadbc53fcc9a3937b576eb8f4d6 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 15 Aug 2023 19:29:57 +0200
Subject: [PATCH 163/478] Rename .java to .kt

---
 .../arch/call/internal/{EndpointCall.java => EndpointCall.kt}     | 0
 ... => TrackedEntityAttributeReservedValueEndpointCallFactory.kt} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/{EndpointCall.java => EndpointCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeReservedValueEndpointCallFactory.java => TrackedEntityAttributeReservedValueEndpointCallFactory.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt

From 0d71b36e358b8059e1ce633f273c643c089e9607 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 15 Aug 2023 19:29:58 +0200
Subject: [PATCH 164/478] [ANDROSDK-1736] refactor: - ReservedValues network
 call to coroutines

---
 .idea/gradle.xml                              |   2 +-
 .../core/arch/call/internal/EndpointCall.kt   |  54 +++------
 ...tributeReservedValueEndpointCallFactory.kt | 103 ++++++++----------
 ...kedEntityAttributeReservedValueService.kt} |  38 +++----
 4 files changed, 82 insertions(+), 115 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeReservedValueService.java => TrackedEntityAttributeReservedValueService.kt} (68%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54c13a7a8b..fdc5465974 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
index 18c9ec7ff9..f7fc7cf572 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
@@ -25,42 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.internal;
-
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import androidx.annotation.VisibleForTesting;
-
-public final class EndpointCall<P> implements Callable<List<P>> {
-
-    private final CallFetcher<P> fetcher;
-    private final CallProcessor<P> processor;
-
-    public EndpointCall(CallFetcher<P> fetcher,
-                        CallProcessor<P> processor) {
-        this.fetcher = fetcher;
-        this.processor = processor;
-    }
-
-    @Override
-    public List<P> call() throws Exception {
-        List<P> objects = fetcher.fetch();
-        processor.process(objects);
-        return objects;
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public CallFetcher<P> getFetcher() {
-        return fetcher;
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public CallProcessor<P> getProcessor() {
-        return processor;
+package org.hisp.dhis.android.core.arch.call.internal
+
+import androidx.annotation.VisibleForTesting
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
+
+class EndpointCall<P>(
+    @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val fetcher: CallFetcher<P>,
+    @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val processor: CallProcessor<P>
+) {
+
+    @Throws(Exception::class)
+    fun call(): List<P> {
+        val objects = fetcher.fetch()
+        processor.process(objects)
+        return objects
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index bebddc8d1b..a255aef720 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -25,72 +25,59 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityAttributeReservedValueEndpointCallFactory
-        extends QueryCallFactoryImpl<TrackedEntityAttributeReservedValue,
-        TrackedEntityAttributeReservedValueQuery> {
-
-    private final TrackedEntityAttributeReservedValueService service;
-    private final TrackedEntityAttributeReservedValueHandler handler;
+class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
+    data: GenericCallData?,
+    apiCallExecutor: APICallExecutor?,
+    private val service: TrackedEntityAttributeReservedValueService,
+    private val handler: TrackedEntityAttributeReservedValueHandler
+) : QueryCallFactoryImpl<TrackedEntityAttributeReservedValue?, TrackedEntityAttributeReservedValueQuery?>(
+    data,
+    apiCallExecutor
+) {
 
-    @Inject
-    TrackedEntityAttributeReservedValueEndpointCallFactory(
-            GenericCallData data,
-            APICallExecutor apiCallExecutor,
-            TrackedEntityAttributeReservedValueService service,
-            TrackedEntityAttributeReservedValueHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
-    }
-
-    @Override
-    protected CallFetcher<TrackedEntityAttributeReservedValue> fetcher(
-            final TrackedEntityAttributeReservedValueQuery query) {
-
-        return new ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
-                apiCallExecutor, new TrackedEntityAttributeReservedValueCallErrorCatcher()) {
-            @Override
-            protected retrofit2.Call<List<TrackedEntityAttributeReservedValue>> getCall() {
-                if (query.organisationUnit() == null) {
-                    return service.generateAndReserve(
-                            query.trackedEntityAttributeUid(),
-                            query.numberToReserve());
+    override fun fetcher(query: TrackedEntityAttributeReservedValueQuery?): CallFetcher<TrackedEntityAttributeReservedValue?> {
+        return object: ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue?>(
+            apiCallExecutor, TrackedEntityAttributeReservedValueCallErrorCatcher()
+        ) {
+            override fun getCall(): Call<MutableList<TrackedEntityAttributeReservedValue?>>? {
+                return if (query!!.organisationUnit() == null) {
+                    service.generateAndReserve(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve()
+                    )
                 } else {
-                    return service.generateAndReserveWithOrgUnitCode(
-                            query.trackedEntityAttributeUid(),
-                            query.numberToReserve(),
-                            query.organisationUnit().code());
+                    service.generateAndReserveWithOrgUnitCode(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve(),
+                        query.organisationUnit()!!.code()
+                    )
                 }
             }
-        };
+        }
     }
 
-    @Override
-    protected CallProcessor<TrackedEntityAttributeReservedValue> processor(
-            final TrackedEntityAttributeReservedValueQuery query) {
-        return new TrackedEntityAttributeReservedValueCallProcessor(
-                data.databaseAdapter(),
-                handler,
-                query.organisationUnit(),
-                query.trackedEntityAttributePattern()
-        );
+    override fun processor(query: TrackedEntityAttributeReservedValueQuery?): CallProcessor<TrackedEntityAttributeReservedValue?> {
+        return TrackedEntityAttributeReservedValueCallProcessor(
+            data.databaseAdapter(),
+            handler,
+            query!!.organisationUnit(),
+            query.trackedEntityAttributePattern()
+        )
     }
+
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 18785b09da..42c64270dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -25,28 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-
-import java.util.List;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-public interface TrackedEntityAttributeReservedValueService {
-    String TRACKED_ENTITY_ATTRIBUTE_UID = "trackedEntityAttributeUid";
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
 
+interface TrackedEntityAttributeReservedValueService {
     @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
-    Call<List<TrackedEntityAttributeReservedValue>> generateAndReserve(
-            @Path(TRACKED_ENTITY_ATTRIBUTE_UID) String trackedEntityAttributeUid,
-            @Query("numberToReserve") Integer numberToReserve);
+    suspend fun generateAndReserve(
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
+        @Query("numberToReserve") numberToReserve: Int?
+    ): List<TrackedEntityAttributeReservedValue?>?
 
     @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
-    Call<List<TrackedEntityAttributeReservedValue>> generateAndReserveWithOrgUnitCode(
-            @Path(TRACKED_ENTITY_ATTRIBUTE_UID) String trackedEntityAttributeUid,
-            @Query("numberToReserve") Integer numberToReserve,
-            @Query("ORG_UNIT_CODE") String orgUnitCode);
+    suspend fun generateAndReserveWithOrgUnitCode(
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
+        @Query("numberToReserve") numberToReserve: Int?,
+        @Query("ORG_UNIT_CODE") orgUnitCode: String?
+    ): List<TrackedEntityAttributeReservedValue?>?
+
+    companion object {
+        const val TRACKED_ENTITY_ATTRIBUTE_UID = "trackedEntityAttributeUid"
+    }
 }
\ No newline at end of file

From c222f442288456c2660daae1bd4566820c36183d Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 16 Aug 2023 10:42:39 +0200
Subject: [PATCH 165/478] [ANDROSDK-1737] Update Kotlin to 1.9.0

---
 build.gradle.kts                                      |  2 +-
 .../{WhereStatementBinder.java => StatementBinder.kt} | 11 ++++-------
 .../{StatementBinder.java => WhereStatementBinder.kt} | 11 ++++-------
 3 files changed, 9 insertions(+), 15 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/{WhereStatementBinder.java => StatementBinder.kt} (91%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/{StatementBinder.java => WhereStatementBinder.kt} (91%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 756805647a..1f960cff47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 buildscript {
-    val kotlinVersion = "1.8.20"
+    val kotlinVersion = "1.9.0"
 
     repositories {
         google()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.kt
similarity index 91%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.kt
index 9cf795b2cf..90d6b7b222 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.kt
@@ -25,11 +25,8 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.db.stores.binders.internal
 
-package org.hisp.dhis.android.core.arch.db.stores.binders.internal;
-
-import androidx.annotation.NonNull;
-
-public interface WhereStatementBinder<M> {
-    void bindWhereStatement(@NonNull M m, @NonNull StatementWrapper w);
-}
\ No newline at end of file
+internal fun interface StatementBinder<O> {
+    fun bindToStatement(o: O, w: StatementWrapper)
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.kt
similarity index 91%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.kt
index e9295ff111..41439475b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/StatementBinder.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/binders/internal/WhereStatementBinder.kt
@@ -25,11 +25,8 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.db.stores.binders.internal
 
-package org.hisp.dhis.android.core.arch.db.stores.binders.internal;
-
-import androidx.annotation.NonNull;
-
-public interface StatementBinder<O> {
-    void bindToStatement(@NonNull O object, @NonNull StatementWrapper wrapper);
-}
\ No newline at end of file
+internal fun interface WhereStatementBinder<M> {
+    fun bindWhereStatement(m: M, w: StatementWrapper)
+}

From eae97280ce312fe57e8644e70a6afdd7f1f800eb Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 16 Aug 2023 11:58:59 +0200
Subject: [PATCH 166/478] [ANDROSDK-1732] refactor: - ConstantModule network
 call to coroutines

---
 .../internal/PayloadNoResourceCallFetcher.kt    |  2 +-
 .../constant/internal/ConstantCallFactory.kt    | 17 ++++++++---------
 .../internal/ConstantModuleDownloader.kt        |  1 +
 .../core/constant/internal/ConstantService.kt   |  4 ++--
 .../core/user/internal/UserModuleDownloader.kt  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
index 88d421f5d8..59659ec1a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
@@ -34,7 +34,7 @@ import retrofit2.Call
 
 abstract class PayloadNoResourceCallFetcher<P> protected constructor(private val apiCallExecutor: APICallExecutor) :
     CallFetcher<P> {
-    protected abstract val call: Call<Payload<P>?>?
+    protected abstract val call: Call<Payload<P>?>
     @Throws(D2Error::class)
     override fun fetch(): List<P> {
         return apiCallExecutor.executePayloadCall(call)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
index 654dab13f8..3951ea57cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
@@ -42,20 +42,19 @@ import javax.inject.Inject
 
 @Reusable
 internal class ConstantCallFactory @Inject constructor(
-    data: GenericCallData?,
-    apiCallExecutor: APICallExecutor?,
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
     private val service: ConstantService,
     private val handler: ConstantHandler
-) : ListCallFactoryImpl<Constant?>(data, apiCallExecutor) {
-    override fun fetcher(): CallFetcher<Constant?>? {
-        return object : PayloadNoResourceCallFetcher<Constant?>(apiCallExecutor) {
-            override fun getCall(): Call<Payload<Constant?>>? {
-                return service.constants(ConstantFields.allFields, false)
-            }
+) : ListCallFactoryImpl<Constant>(data, apiCallExecutor) {
+    override fun fetcher(): CallFetcher<Constant> {
+        return object : PayloadNoResourceCallFetcher<Constant>(apiCallExecutor) {
+            override val call: Call<Payload<Constant>?>
+                get() = service.constants(ConstantFields.allFields, false)
         }
     }
 
-    override fun processor(): CallProcessor<Constant?> {
+    override fun processor(): CallProcessor<Constant> {
         return TransactionalNoResourceSyncCallProcessor(
             data.databaseAdapter(),
             handler
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index bcc45ee0b3..b6bcfc204d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -37,6 +37,7 @@ import javax.inject.Inject
 class ConstantModuleDownloader @Inject internal constructor(private val constantCallFactory: ConstantCallFactory) :
     TypedModuleDownloader<List<Constant>?> {
     override fun downloadMetadata(): Single<List<Constant>?> {
+        // TODO : rxSingle
         return Single.fromCallable(
             constantCallFactory.create()
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index 84d168cb45..73a6fa9da0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -38,7 +38,7 @@ import retrofit2.http.Query
 internal interface ConstantService {
     @GET("constants")
     fun constants(
-        @Query("fields") @Which fields: Fields<Constant?>?,
+        @Query("fields") @Which fields: Fields<Constant>,
         @Query("paging") paging: Boolean
-    ): Call<Payload<Constant?>?>?
+    ): Call<Payload<Constant>?>
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 78b6912f83..962878da74 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 internal class UserModuleDownloader @Inject internal constructor(
     private val userCall: UserCall,
     private val authorityCallFactory: AuthorityEndpointCallFactory
-) : TypedModuleDownloader<User?> {
+) : TypedModuleDownloader<User> {
     override fun downloadMetadata(): Single<User> {
         return Single.fromCallable {
             val user = userCall.call()

From 9600c2ab1e7fe03c7c7fb6c2a79c79fa3c370007 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 17 Aug 2023 09:44:27 +0200
Subject: [PATCH 167/478] Rename .java to .kt

---
 .../{RepositoryDataSource.java => RepositoryDataSource.kt}        | 0
 .../{RepositoryPagingConfig.java => RepositoryPagingConfig.kt}    | 0
 .../core/arch/repositories/scope/{BaseScope.java => BaseScope.kt} | 0
 .../scope/internal/{BaseScopeFactory.java => BaseScopeFactory.kt} | 0
 .../scope/internal/{RepositoryMode.java => RepositoryMode.kt}     | 0
 .../{RepositoryScopeHelper.java => RepositoryScopeHelper.kt}      | 0
 ...KeyOrderExtractor.java => RepositoryScopeKeyOrderExtractor.kt} | 0
 ...ClauseFromScopeBuilder.java => WhereClauseFromScopeBuilder.kt} | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/{RepositoryDataSource.java => RepositoryDataSource.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/{RepositoryPagingConfig.java => RepositoryPagingConfig.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/{BaseScope.java => BaseScope.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/{BaseScopeFactory.java => BaseScopeFactory.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/{RepositoryMode.java => RepositoryMode.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/{RepositoryScopeHelper.java => RepositoryScopeHelper.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/{RepositoryScopeKeyOrderExtractor.java => RepositoryScopeKeyOrderExtractor.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/{WhereClauseFromScopeBuilder.java => WhereClauseFromScopeBuilder.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt

From 3e00cdbe963a6c69bd02c900d0aa27f7fe4453ed Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 17 Aug 2023 09:44:28 +0200
Subject: [PATCH 168/478] [ANDROSDK-1717] refactor: - Repositories to Kotlin
 (still need work, specially FileResourceDownloader)

---
 .idea/gradle.xml                              |   2 +-
 .../linelist/EventLineListServiceImpl.kt      |   2 +-
 .../children/internal/ChildrenAppender.kt     |   2 +-
 .../internal/BaseRepositoryFactory.kt         |   2 +-
 ...nlyIdentifiableCollectionRepositoryImpl.kt |   2 +
 ...eadOnlyNameableCollectionRepositoryImpl.kt |   1 +
 ...dAndTransformerCollectionRepositoryImpl.kt |   2 +-
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |   2 +-
 ...nector.java => AbstractFilterConnector.kt} | 104 +++++-----
 ...or.java => BaseAbstractFilterConnector.kt} |  99 +++++-----
 ...ctor.java => BaseStringFilterConnector.kt} |  28 ++-
 ...or.java => BaseSubQueryFilterConnector.kt} |  48 ++---
 .../filters/internal/BoolFilterConnector.java |  56 ------
 ...rConnector.java => BoolFilterConnector.kt} |  50 ++---
 ...nnector.java => BooleanFilterConnector.kt} |  71 ++++---
 .../filters/internal/DateFilterConnector.kt   |   4 +-
 .../internal/DeletedFilterConnector.java      |  70 -------
 .../internal/DeletedFilterConnector.kt        |  63 ++++++
 ...onnector.java => DoubleFilterConnector.kt} |  43 ++---
 ...rConnector.java => EnumFilterConnector.kt} |  31 ++-
 ...terConnector.java => EqFilterConnector.kt} |  22 +--
 .../internal/FilterConnectorFactory.java      | 180 ------------------
 .../internal/FilterConnectorFactory.kt        | 173 +++++++++++++++++
 ...bleFilters.java => IdentifiableFilters.kt} |  20 +-
 ...nnector.java => IntegerFilterConnector.kt} |  39 ++--
 .../filters/internal/ListFilterConnector.kt   |  47 +++++
 ...rConnector.java => LongFilterConnector.kt} |  39 ++--
 ...ameableFilters.java => NameableFilters.kt} |  16 +-
 ...ava => OrganisationUnitFilterConnector.kt} |  60 +++---
 ...onnector.java => PeriodFilterConnector.kt} |  70 +++----
 ...nnector.java => PeriodsFilterConnector.kt} |  91 +++++----
 .../internal/ScopedFilterConnectorFactory.kt  |   2 +-
 ...onnector.java => StringFilterConnector.kt} |  37 ++--
 .../internal/SubQueryFilterConnector.java     |  96 ----------
 .../internal/SubQueryFilterConnector.kt       | 126 ++++++++++++
 ...r.java => UnwrappedEqInFilterConnector.kt} |  84 ++++----
 ...r.java => ValueSubQueryFilterConnector.kt} |  97 ++++------
 .../paging/internal/RepositoryDataSource.kt   | 106 +++++------
 .../paging/internal/RepositoryPagingConfig.kt |  11 +-
 .../core/arch/repositories/scope/BaseScope.kt |   6 +-
 .../scope/internal/BaseScopeFactory.kt        |   9 +-
 .../scope/internal/RepositoryMode.kt          |   7 +-
 .../scope/internal/RepositoryScopeHelper.kt   |  72 ++++---
 .../RepositoryScopeKeyOrderExtractor.kt       |  12 +-
 .../internal/WhereClauseFromScopeBuilder.kt   |  37 ++--
 .../internal/EnrollmentServiceImpl.kt         |  10 +-
 .../EventCollectionRepositoryAdapter.kt       |   4 +-
 .../core/fileresource/FileResourceRoutine.kt  |   2 +-
 .../internal/ProgramIndicatorEngineImpl.kt    |   2 +-
 49 files changed, 1024 insertions(+), 1135 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{AbstractFilterConnector.java => AbstractFilterConnector.kt} (54%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{BaseAbstractFilterConnector.java => BaseAbstractFilterConnector.kt} (69%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{EnumFilterConnector.java => BaseStringFilterConnector.kt} (79%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{BaseSubQueryFilterConnector.java => BaseSubQueryFilterConnector.kt} (69%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.java
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{ListFilterConnector.java => BoolFilterConnector.kt} (70%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{BooleanFilterConnector.java => BooleanFilterConnector.kt} (62%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{DoubleFilterConnector.java => DoubleFilterConnector.kt} (83%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{BaseStringFilterConnector.java => EnumFilterConnector.kt} (78%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{EqFilterConnector.java => EqFilterConnector.kt} (81%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{IdentifiableFilters.java => IdentifiableFilters.kt} (82%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{LongFilterConnector.java => IntegerFilterConnector.kt} (82%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{IntegerFilterConnector.java => LongFilterConnector.kt} (82%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{NameableFilters.java => NameableFilters.kt} (83%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{OrganisationUnitFilterConnector.java => OrganisationUnitFilterConnector.kt} (66%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{PeriodFilterConnector.java => PeriodFilterConnector.kt} (66%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{PeriodsFilterConnector.java => PeriodsFilterConnector.kt} (62%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{StringFilterConnector.java => StringFilterConnector.kt} (78%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{UnwrappedEqInFilterConnector.java => UnwrappedEqInFilterConnector.kt} (58%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{ValueSubQueryFilterConnector.java => ValueSubQueryFilterConnector.kt} (71%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54c13a7a8b..fdc5465974 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
index 3721f9ec1e..498f1041cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
@@ -147,7 +147,7 @@ internal class EventLineListServiceImpl @Inject constructor(
 
     private fun getEvents(params: EventLineListParams): List<Event> {
         var repoBuilder = eventRepository
-            .byProgramStageUid().eq(params.programStage)
+            .byProgramStageUid().eq(params.programStage!!)
             .orderByTimeline(RepositoryScope.OrderByDirection.ASC)
             .byDeleted().isFalse
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
index 0d11a36638..d45098fe7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.children.internal
 
-internal abstract class ChildrenAppender<M> {
+abstract class ChildrenAppender<M> {
     open fun prepareChildren(collection: Collection<M>) {
         /* Method is not abstract since empty action is the default action and we don't want it to
          * be unnecessarily written in every child.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
index a068dcdd8c..5941857da0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
@@ -30,6 +30,6 @@ package org.hisp.dhis.android.core.arch.repositories.collection.internal
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-internal fun interface BaseRepositoryFactory<R : BaseRepository> {
+fun interface BaseRepositoryFactory<R : BaseRepository> {
     fun updated(updatedScope: RepositoryScope): R
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 9c1446f2dc..4a7ee669b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -72,6 +72,8 @@ open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectio
         return cf.date(IdentifiableColumns.LAST_UPDATED)
     }
 
+    // TODO: should direction be nullable and thus, use a default value?
+
     fun orderByUid(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.UID, direction)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 6ece628960..533b163a24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -64,6 +64,7 @@ internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyColl
         return cf.string(NameableColumns.DISPLAY_DESCRIPTION)
     }
 
+    // TODO: should direction be nullable and thus, use a default value?
     fun orderByShortName(direction: OrderByDirection?): R {
         return cf.withOrderBy(NameableColumns.SHORT_NAME, direction)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index f7db5e0712..e70373cc7a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -82,7 +82,7 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
      * @param uid to compare
      * @return the ReadOnlyObjectRepository
      */
-    override fun uid(uid: String?): ReadOnlyObjectRepository<T> {
+    override fun uid(uid: String): ReadOnlyObjectRepository<T> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
         return ReadOnlyWithTransformerObjectRepositoryImpl(store, childrenAppenders, updatedScope, transformer)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index 6596774b78..ec41a31ffa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -51,7 +51,7 @@ open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepo
      * @param uid to compare
      * @return the ReadOnlyObjectRepository
      */
-    override fun uid(uid: String?): ReadOnlyOneObjectRepositoryFinalImpl<M> {
+    override fun uid(uid: String): ReadOnlyOneObjectRepositoryFinalImpl<M> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
         return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, updatedScope)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
similarity index 54%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
index 91be6d46a7..c7455e5066 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
@@ -25,75 +25,69 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeComplexFilterItem;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-abstract class AbstractFilterConnector<R extends BaseRepository, V> {
-
-    private final BaseRepositoryFactory<R> repositoryFactory;
-    private final RepositoryScope scope;
-    final String key;
-
-    AbstractFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                            RepositoryScope scope,
-                            String key) {
-        this.repositoryFactory = repositoryFactory;
-        this.scope = scope;
-        this.key = key;
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeComplexFilterItem
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper
+
+abstract class AbstractFilterConnector<R : BaseRepository, V>(
+    private val repositoryFactory: BaseRepositoryFactory<R>,
+    private val scope: RepositoryScope,
+    val key: String
+) {
+    abstract fun wrapValue(value: V?): String?
+    fun updatedUnwrappedScope(operator: FilterItemOperator?, valueStr: String?): RepositoryScope {
+        return RepositoryScopeHelper.withFilterItem(
+            scope,
+            RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build()
+        )
     }
 
-    abstract String wrapValue(V value);
-
-    RepositoryScope updatedUnwrappedScope(FilterItemOperator operator, String valueStr) {
-        return RepositoryScopeHelper.withFilterItem(scope,
-                RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build());
+    fun newWithWrappedScope(operator: FilterItemOperator?, value: V): R {
+        return repositoryFactory.updated(updatedUnwrappedScope(operator, wrapValue(value)))
     }
 
-    R newWithWrappedScope(FilterItemOperator operator, V value) {
-        return repositoryFactory.updated(updatedUnwrappedScope(operator, wrapValue(value)));
+    fun updatePassedScope(
+        operator: FilterItemOperator,
+        valueStr: String,
+        scope: RepositoryScope
+    ): RepositoryScope {
+        return RepositoryScopeHelper.withFilterItem(
+            scope,
+            RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build()
+        )
     }
 
-    RepositoryScope updatePassedScope(FilterItemOperator operator, String valueStr, RepositoryScope scope) {
-        return RepositoryScopeHelper.withFilterItem(scope,
-                RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build());
+    fun newWithPassedScope(operator: FilterItemOperator, value: V, scope: RepositoryScope): R {
+        return repositoryFactory.updated(updatePassedScope(operator, wrapValue(value)!!, scope))
     }
 
-    R newWithPassedScope(FilterItemOperator operator, V value, RepositoryScope scope) {
-        return repositoryFactory.updated(updatePassedScope(operator, wrapValue(value), scope));
+    private fun updatedUnwrappedScope(whereClause: String): RepositoryScope {
+        return RepositoryScopeHelper.withComplexFilterItem(
+            scope,
+            RepositoryScopeComplexFilterItem.builder().whereQuery(whereClause).build()
+        )
     }
 
-    private RepositoryScope updatedUnwrappedScope(String whereClause) {
-        return RepositoryScopeHelper.withComplexFilterItem(scope,
-                RepositoryScopeComplexFilterItem.builder().whereQuery(whereClause).build());
+    fun newWithWrappedScope(whereClause: String): R {
+        return repositoryFactory.updated(updatedUnwrappedScope(whereClause))
     }
 
-    R newWithWrappedScope(String whereClause) {
-        return repositoryFactory.updated(updatedUnwrappedScope(whereClause));
-    }
-
-    String getCommaSeparatedValues(Collection<V> values) {
-        List<String> wrappedValues = new ArrayList<>();
-        for (V v: values) {
-            wrappedValues.add(wrapValue(v));
+    fun getCommaSeparatedValues(values: Collection<V>): String {
+        val wrappedValues: MutableList<String?> = ArrayList()
+        for (v in values) {
+            wrappedValues.add(wrapValue(v))
         }
-        return CollectionsHelper.commaAndSpaceSeparatedCollectionValues(wrappedValues);
+        return CollectionsHelper.commaAndSpaceSeparatedCollectionValues(wrappedValues)
     }
 
-    R newWithUnwrappedScope(FilterItemOperator operator, String value) {
-        return repositoryFactory.updated(updatedUnwrappedScope(operator, value));
-
+    fun newWithUnwrappedScope(operator: FilterItemOperator?, value: String?): R {
+        return repositoryFactory.updated(updatedUnwrappedScope(operator, value))
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
index 9ed79bb2cf..fee00582e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
@@ -25,44 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-public abstract class BaseAbstractFilterConnector<R extends BaseRepository, V> extends AbstractFilterConnector<R, V> {
-
-    BaseAbstractFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                                RepositoryScope scope,
-                                String key) {
-        super(repositoryFactory, scope, key);
-    }
+import java.util.Arrays
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
+abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope?,
+    key: String?
+) : AbstractFilterConnector<R, V>(
+    repositoryFactory, scope!!, key!!
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The eq filter checks if the given field has a value which is equal to the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R eq(V value) {
-        return newWithWrappedScope(FilterItemOperator.EQ, value);
+    fun eq(value: V): R {
+        return newWithWrappedScope(FilterItemOperator.EQ, value)
     }
 
-
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The neq filter checks if the given field has a value which is not equal to the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R neq(V value) {
-        return newWithWrappedScope(FilterItemOperator.NOT_EQ, value);
+    fun neq(value: V): R {
+        return newWithWrappedScope(FilterItemOperator.NOT_EQ, value)
     }
 
     /**
@@ -71,8 +66,11 @@ public R neq(V value) {
      * @param values list of values to compare with the target field
      * @return the new repository
      */
-    public R in(Collection<V> values) {
-        return newWithUnwrappedScope(FilterItemOperator.IN, "(" + getCommaSeparatedValues(values) + ")");
+    fun `in`(values: Collection<V>?): R {
+        return newWithUnwrappedScope(
+            FilterItemOperator.IN,
+            "(" + getCommaSeparatedValues(values!!) + ")"
+        )
     }
 
     /**
@@ -82,8 +80,8 @@ public R in(Collection<V> values) {
      * @return the new repository
      */
     @SafeVarargs
-    public final R in(V... values) {
-        return in(Arrays.asList(values));
+    fun `in`(vararg values: V): R {
+        return `in`(Arrays.asList(*values))
     }
 
     /**
@@ -92,8 +90,11 @@ public final R in(V... values) {
      * @param values list of values to compare with the target field
      * @return the new repository
      */
-    public R notIn(Collection<V> values) {
-        return newWithUnwrappedScope(FilterItemOperator.NOT_IN, "(" + getCommaSeparatedValues(values) + ")");
+    fun notIn(values: Collection<V>?): R {
+        return newWithUnwrappedScope(
+            FilterItemOperator.NOT_IN,
+            "(" + getCommaSeparatedValues(values!!) + ")"
+        )
     }
 
     /**
@@ -103,29 +104,29 @@ public R notIn(Collection<V> values) {
      * @return the new repository
      */
     @SafeVarargs
-    public final R notIn(V... values) {
-        return notIn(Arrays.asList(values));
+    fun notIn(vararg values: V): R {
+        return notIn(Arrays.asList(*values))
     }
 
-    /**
-     * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
-     * The isNull filter checks if the given field has a null value.
-     * @return the new repository
-     */
-    public final R isNull() {
-        return newWithUnwrappedScope(FilterItemOperator.VOID, "IS NULL");
-    }
-
-    /**
-     * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
-     * The isNotNull filter checks if the given field has a non-null value.
-     * @return the new repository
-     */
-    public final R isNotNull() {
-        return newWithUnwrappedScope(FilterItemOperator.VOID, "IS NOT NULL");
-    }
+    val isNull: R
+        /**
+         * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
+         * The isNull filter checks if the given field has a null value.
+         * @return the new repository
+         */
+        get() = newWithUnwrappedScope(FilterItemOperator.VOID, "IS NULL")
+    val isNotNull: R
+        /**
+         * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
+         * The isNotNull filter checks if the given field has a non-null value.
+         * @return the new repository
+         */
+        get() = newWithUnwrappedScope(FilterItemOperator.VOID, "IS NOT NULL")
 
-    static String escapeQuotes(String value) {
-        return value.replaceAll("'", "''");
+    companion object {
+        @JvmStatic
+        fun escapeQuotes(value: String): String {
+            return value.replace("'".toRegex(), "''")
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
index e4aa8b52d1..d5ee885833 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
@@ -25,23 +25,21 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+class BaseStringFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, String?>(
+    repositoryFactory, scope, key
+) {
 
-public final class EnumFilterConnector<R extends BaseRepository, E extends Enum<E>>
-        extends BaseAbstractFilterConnector<R, E> {
-
-    EnumFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                        RepositoryScope scope,
-                        String key) {
-        super(repositoryFactory, scope, key);
-    }
-
-    String wrapValue(E value) {
-        return "'" + value.name() + "'";
+    override fun wrapValue(value: String?): String {
+        return escapeQuotes(value!!)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
index 0fb9c671aa..8ac3ccfef8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
@@ -25,33 +25,27 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-public abstract class BaseSubQueryFilterConnector<R extends BaseRepository>
-        extends AbstractFilterConnector<R, String> {
-
-    private final String linkTable;
-    private final String linkParent;
-
-    BaseSubQueryFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                                RepositoryScope scope,
-                                String key,
-                                String linkTable,
-                                String linkParent) {
-        super(repositoryFactory, scope, key);
-        this.linkTable = linkTable;
-        this.linkParent = linkParent;
-    }
-
-    protected R inTableWhere(WhereClauseBuilder clauseBuilder) {
-        return newWithUnwrappedScope(FilterItemOperator.IN, "(" + String.format(
-                "SELECT DISTINCT %s FROM %s WHERE %s", linkParent, linkTable, clauseBuilder.build()) + ")");
+abstract class BaseSubQueryFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String,
+    private val linkTable: String,
+    private val linkParent: String
+) : AbstractFilterConnector<R, String?>(repositoryFactory, scope, key) {
+    protected fun inTableWhere(clauseBuilder: WhereClauseBuilder): R {
+        return newWithUnwrappedScope(
+            FilterItemOperator.IN,
+            "(" + String.format(
+                "SELECT DISTINCT %s FROM %s WHERE %s", linkParent, linkTable, clauseBuilder.build()
+            ) + ")"
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.java
deleted file mode 100644
index 94497c7876..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-
-public final class BoolFilterConnector<R  extends BaseRepository> {
-
-    private final ScopedRepositoryFilterFactory<R, Boolean> repositoryFactory;
-
-    BoolFilterConnector(ScopedRepositoryFilterFactory<R, Boolean> repositoryFactory) {
-        this.repositoryFactory = repositoryFactory;
-    }
-
-    /**
-     * Returns a new repository whose scope that checks if the given field has a true value.
-     * @return the new repository
-     */
-    public R isTrue() {
-        return repositoryFactory.updated(true);
-    }
-
-    /**
-     * Returns a new repository whose scope that checks if the given field has a false value.
-     * @return the new repository
-     */
-    public R isFalse() {
-        return repositoryFactory.updated(false);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt
index 3f3a834f89..6b847c6141 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt
@@ -25,33 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public final class ListFilterConnector<R  extends BaseRepository, T> {
-
-    private final ScopedRepositoryFilterFactory<R, List<T>> repositoryFactory;
-
-    ListFilterConnector(ScopedRepositoryFilterFactory<R, List<T>> repositoryFactory) {
-        this.repositoryFactory = repositoryFactory;
-    }
-
-    public R eq(T value) {
-        return repositoryFactory.updated(Collections.singletonList(value));
-    }
-
-    public R in(List<T> values) {
-        return repositoryFactory.updated(values);
-    }
-
-    @SafeVarargs
-    public final R in(T... values) {
-        return in(Arrays.asList(values));
-    }
-}
\ No newline at end of file
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+
+class BoolFilterConnector<R : BaseRepository> internal constructor(
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, Boolean>
+) {
+    val isTrue: R
+        /**
+         * Returns a new repository whose scope that checks if the given field has a true value.
+         * @return the new repository
+         */
+        get() = repositoryFactory.updated(true)
+    val isFalse: R
+        /**
+         * Returns a new repository whose scope that checks if the given field has a false value.
+         * @return the new repository
+         */
+        get() = repositoryFactory.updated(false)
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
index 9defa2b44c..2091234851 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
@@ -25,46 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-public final class BooleanFilterConnector<R extends BaseRepository> extends BaseAbstractFilterConnector<R, Boolean> {
-
-    BooleanFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                           RepositoryScope scope,
-                           String key) {
-        super(repositoryFactory, scope, key);
-    }
-
-    /**
-     * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
-     * The isTrue filter checks if the given field has a true value.
-     * @return the new repository
-     */
-    public R isTrue() {
-        return eq(true);
-    }
-
-
-    /**
-     * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
-     * The isFalse filter checks if the given field has a false value.
-     * @return the new repository
-     */
-    public R isFalse() {
-        return eq(false);
-    }
-
-    @Override
-    String wrapValue(Boolean value) {
-        if (value) {
-            return "1";
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+
+class BooleanFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, Boolean?>(
+    repositoryFactory, scope, key
+) {
+    val isTrue: R
+        /**
+         * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
+         * The isTrue filter checks if the given field has a true value.
+         * @return the new repository
+         */
+        get() = eq(true)
+    val isFalse: R
+        /**
+         * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
+         * The isFalse filter checks if the given field has a false value.
+         * @return the new repository
+         */
+        get() = eq(false)
+
+    override fun wrapValue(value: Boolean?): String {
+        return if (value!!) {
+            "1"
         } else {
-            return "0";
+            "0"
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
index 2b68c3402c..dee804a2c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
@@ -110,7 +110,7 @@ abstract class DateFilterConnector<R : BaseRepository> internal constructor(
         return inDatePeriods(datePeriods)
     }
 
-    override fun wrapValue(value: Date): String {
-        return "'${formatter.format(value)}'"
+    override fun wrapValue(value: Date?): String {
+        return "'${formatter.format(value!!)}'"
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.java
deleted file mode 100644
index 1f332294f6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-public final class DeletedFilterConnector<R extends BaseRepository> extends BaseAbstractFilterConnector<R, String> {
-
-    DeletedFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                           RepositoryScope scope,
-                           String key) {
-        super(repositoryFactory, scope, key);
-    }
-
-    /**
-     * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
-     * The isFalse filter checks if the given field has a value distinct of null.
-     * @return the new repository
-     */
-    public R isFalse() {
-        return isNotNull();
-    }
-
-
-    /**
-     * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
-     * The isTrue filter checks if the given field has a null value.
-     * @return the new repository
-     */
-    public R isTrue() {
-        return isNull();
-    }
-
-    @Override
-    String wrapValue(String value) {
-        if (value == null) {
-            return null;
-        } else {
-            return "'" + escapeQuotes(value) + "'";
-        }
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
new file mode 100644
index 0000000000..dfc5143626
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+
+class DeletedFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, String>(
+    repositoryFactory, scope, key
+) {
+    val isFalse: R
+        /**
+         * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
+         * The isFalse filter checks if the given field has a value distinct of null.
+         * @return the new repository
+         */
+        get() = isNotNull
+    val isTrue: R
+        /**
+         * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
+         * The isTrue filter checks if the given field has a null value.
+         * @return the new repository
+         */
+        get() = isNull
+
+    override fun wrapValue(value: String?): String? {
+        return if (value == null) {
+            null
+        } else {
+            "'" + escapeQuotes(value) + "'"
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
similarity index 83%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
index 380f13b919..889eb9afe1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
@@ -25,31 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-public final class DoubleFilterConnector<R extends BaseRepository>
-        extends BaseAbstractFilterConnector<R, Double> {
-
-    DoubleFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                          RepositoryScope scope,
-                          String key) {
-        super(repositoryFactory, scope, key);
-    }
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
+class DoubleFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, Double?>(
+    repositoryFactory, scope, key
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The smallerThan filter checks if the given field has a value which is smaller than the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R smallerThan(double value) {
-        return newWithWrappedScope(FilterItemOperator.LT, value);
+    fun smallerThan(value: Double): R {
+        return newWithWrappedScope(FilterItemOperator.LT, value)
     }
 
     /**
@@ -58,8 +55,8 @@ public R smallerThan(double value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R biggerThan(double value) {
-        return newWithWrappedScope(FilterItemOperator.GT, value);
+    fun biggerThan(value: Double): R {
+        return newWithWrappedScope(FilterItemOperator.GT, value)
     }
 
     /**
@@ -68,11 +65,11 @@ public R biggerThan(double value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R biggerOrEqualTo(double value) {
-        return newWithWrappedScope(FilterItemOperator.GE, value);
+    fun biggerOrEqualTo(value: Double): R {
+        return newWithWrappedScope(FilterItemOperator.GE, value)
     }
 
-    String wrapValue(Double value) {
-        return value.toString();
+    override fun wrapValue(value: Double?): String {
+        return value.toString()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
index f0e17cbbee..f1313010aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
@@ -25,23 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-public final class BaseStringFilterConnector<R extends BaseRepository>
-        extends BaseAbstractFilterConnector<R, String> {
-
-    BaseStringFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                              RepositoryScope scope,
-                              String key) {
-        super(repositoryFactory, scope, key);
-    }
-
-    String wrapValue(String value) {
-        return escapeQuotes(value);
+class EnumFilterConnector<R : BaseRepository, E : Enum<E>> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, E>(
+    repositoryFactory, scope, key
+) {
+    override fun wrapValue(value: E?): String {
+        return "'" + value!!.name + "'"
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
similarity index 81%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
index 5c643c57bf..d76933f2f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
@@ -25,20 +25,14 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-
-public final class EqFilterConnector<R  extends BaseRepository, T> {
-
-    private final ScopedRepositoryFilterFactory<R, T> repositoryFactory;
-
-    EqFilterConnector(ScopedRepositoryFilterFactory<R, T> repositoryFactory) {
-        this.repositoryFactory = repositoryFactory;
-    }
-
-    public R eq(T value) {
-        return repositoryFactory.updated(value);
+class EqFilterConnector<R : BaseRepository, T> internal constructor(
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, T>
+) {
+    fun eq(value: T): R {
+        return repositoryFactory.updated(value)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java
deleted file mode 100644
index f525a821bb..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeKeyOrderExtractor;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem;
-
-public class FilterConnectorFactory<R extends BaseRepository> {
-
-    private final RepositoryScope scope;
-    public final BaseRepositoryFactory<R> repositoryFactory;
-
-    public FilterConnectorFactory(RepositoryScope scope,
-                                  BaseRepositoryFactory<R> repositoryFactory) {
-        this.scope = scope;
-        this.repositoryFactory = repositoryFactory;
-    }
-
-    public StringFilterConnector<R> string(String key) {
-        return new StringFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public BaseStringFilterConnector<R> baseString(String key) {
-        return new BaseStringFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public DateFilterConnector<R> date(String key) {
-        return new DateTimeFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public DateFilterConnector<R> simpleDate(String key) {
-        return new SimpleDateFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public BooleanFilterConnector<R> bool(String key) {
-        return new BooleanFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public IntegerFilterConnector<R> integer(String key) {
-        return new IntegerFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public DeletedFilterConnector<R> deleted(String key) {
-        return new DeletedFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public LongFilterConnector<R> longC(String key) {
-        return new LongFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public DoubleFilterConnector<R> doubleC(String key) {
-        return new DoubleFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public <E extends Enum<E>> EnumFilterConnector<R, E> enumC(String key) {
-        return new EnumFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public UnwrappedEqInFilterConnector<R> unwrappedEqIn(String key) {
-        return new UnwrappedEqInFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public SubQueryFilterConnector<R> subQuery(String key) {
-        return new SubQueryFilterConnector<>(repositoryFactory, scope, key);
-    }
-
-    public ValueSubQueryFilterConnector<R> valueSubQuery(String key, String linkTable,
-                                                         String linkParent, String linkChild,
-                                                         String dataElementColumn, String dataElementId) {
-        return new ValueSubQueryFilterConnector<>(repositoryFactory, scope, key, linkTable, linkParent, linkChild,
-                dataElementColumn, dataElementId);
-    }
-
-    public R withChild(String child) {
-        return repositoryFactory.updated(RepositoryScopeHelper.withChild(scope, child));
-    }
-
-    public R withOrderBy(String column, RepositoryScope.OrderByDirection direction) {
-        RepositoryScopeOrderByItem item = RepositoryScopeOrderByItem.builder().column(column)
-                .direction(direction).build();
-        return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item));
-    }
-
-    public R withExternalOrderBy(String externalTable,
-                                 String externalColumn,
-                                 String externalLink,
-                                 String ownLink,
-                                 RepositoryScope.OrderByDirection direction) {
-        return withExternalOrderBy(externalTable, externalColumn, externalLink, ownLink, direction, null);
-    }
-
-    public R withExternalOrderBy(String externalTable,
-                                 String externalColumn,
-                                 String externalLink,
-                                 String ownLink,
-                                 RepositoryScope.OrderByDirection direction,
-                                 String additionalWhereClause) {
-
-        String connectedAdditionalWhere = additionalWhereClause == null ? "" :
-                " AND " + additionalWhereClause;
-
-        String column = String.format("(SELECT %s FROM %s WHERE %s = %s %s)",
-                externalColumn,
-                externalTable,
-                externalLink,
-                ownLink,
-                connectedAdditionalWhere);
-
-        RepositoryScopeKeyOrderExtractor extractor = (contentValues, column1) -> {
-            String ownLinkKey = contentValues.getAsString(ownLink);
-            return String.format("(SELECT %s FROM %s WHERE %s = '%s' %s)",
-                    externalColumn,
-                    externalTable,
-                    externalLink,
-                    ownLinkKey,
-                    connectedAdditionalWhere);
-        };
-
-        RepositoryScopeOrderByItem item = RepositoryScopeOrderByItem.builder().column(column)
-                .direction(direction).keyExtractor(extractor).build();
-        return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item));
-    }
-
-    public R withConditionalOrderBy(String conditionalColumn,
-                                    String condition,
-                                    String ifTrueColumn,
-                                    String ifFalseColumn,
-                                    RepositoryScope.OrderByDirection direction) {
-        String column = String.format("(CASE WHEN %s %s THEN %s ELSE %s END)",
-                conditionalColumn,
-                condition,
-                ifTrueColumn,
-                ifFalseColumn);
-
-        RepositoryScopeKeyOrderExtractor extractor = (contentValues, column1) -> {
-            String conditionalValue = contentValues.getAsString(conditionalColumn);
-            String ifTrueValue = contentValues.getAsString(ifTrueColumn);
-            String ifFalseValue = contentValues.getAsString(ifFalseColumn);
-            return String.format("(CASE WHEN '%s' %s THEN '%s' ELSE '%s' END)",
-                    conditionalValue,
-                    condition,
-                    ifTrueValue,
-                    ifFalseValue);
-        };
-
-        RepositoryScopeOrderByItem item = RepositoryScopeOrderByItem.builder().column(column)
-                .direction(direction).keyExtractor(extractor).build();
-        return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item));
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
new file mode 100644
index 0000000000..f96f4f0b68
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -0,0 +1,173 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import android.content.ContentValues
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeKeyOrderExtractor
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem
+
+@SuppressWarnings("TooManyFunctions")
+
+class FilterConnectorFactory<R : BaseRepository>(
+    private val scope: RepositoryScope,
+    val repositoryFactory: BaseRepositoryFactory<R>
+) {
+    fun string(key: String): StringFilterConnector<R> {
+        return StringFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun baseString(key: String): BaseStringFilterConnector<R> {
+        return BaseStringFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun date(key: String): DateFilterConnector<R> {
+        return DateTimeFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun simpleDate(key: String): DateFilterConnector<R> {
+        return SimpleDateFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun bool(key: String): BooleanFilterConnector<R> {
+        return BooleanFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun integer(key: String): IntegerFilterConnector<R> {
+        return IntegerFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun deleted(key: String): DeletedFilterConnector<R> {
+        return DeletedFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun longC(key: String): LongFilterConnector<R> {
+        return LongFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun doubleC(key: String): DoubleFilterConnector<R> {
+        return DoubleFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun <E : Enum<E>> enumC(key: String): EnumFilterConnector<R, E> {
+        return EnumFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun unwrappedEqIn(key: String): UnwrappedEqInFilterConnector<R> {
+        return UnwrappedEqInFilterConnector(repositoryFactory, scope, key)
+    }
+
+    fun subQuery(key: String): SubQueryFilterConnector<R> {
+        return SubQueryFilterConnector(repositoryFactory, scope, key)
+    }
+
+    @SuppressWarnings("LongParameterList")
+    fun valueSubQuery(
+        key: String,
+        linkTable: String,
+        linkParent: String,
+        linkChild: String,
+        dataElementColumn: String,
+        dataElementId: String
+    ): ValueSubQueryFilterConnector<R> {
+        return ValueSubQueryFilterConnector(
+            repositoryFactory, scope, key, linkTable, linkParent, linkChild, dataElementColumn, dataElementId
+        )
+    }
+
+    fun withChild(child: String): R {
+        return repositoryFactory.updated(RepositoryScopeHelper.withChild(scope, child))
+    }
+
+    fun withOrderBy(column: String, direction: OrderByDirection): R {
+        val item = RepositoryScopeOrderByItem.builder().column(column).direction(direction).build()
+        return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item))
+    }
+
+    @SuppressWarnings("LongParameterList")
+    @JvmOverloads
+    fun withExternalOrderBy(
+        externalTable: String,
+        externalColumn: String,
+        externalLink: String,
+        ownLink: String,
+        direction: OrderByDirection,
+        additionalWhereClause: String?
+    ): R {
+        val connectedAdditionalWhere = if (additionalWhereClause == null) "" else " AND $additionalWhereClause"
+        val column = String.format(
+            "(SELECT %s FROM %s WHERE %s = %s %s)",
+            externalColumn,
+            externalTable,
+            externalLink,
+            ownLink,
+            connectedAdditionalWhere
+        )
+        val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, column1: String ->
+            val ownLinkKey = contentValues.getAsString(ownLink)
+            String.format(
+                "(SELECT %s FROM %s WHERE %s = '%s' %s)",
+                externalColumn,
+                externalTable,
+                externalLink,
+                ownLinkKey,
+                connectedAdditionalWhere
+            )
+        }
+        val item =
+            RepositoryScopeOrderByItem.builder().column(column).direction(direction).keyExtractor(extractor).build()
+        return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item))
+    }
+
+    fun withConditionalOrderBy(
+        conditionalColumn: String?,
+        condition: String?,
+        ifTrueColumn: String?,
+        ifFalseColumn: String?,
+        direction: OrderByDirection?
+    ): R {
+        val column = String.format(
+            "(CASE WHEN %s %s THEN %s ELSE %s END)", conditionalColumn, condition, ifTrueColumn, ifFalseColumn
+        )
+        val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, column1: String ->
+            val conditionalValue = contentValues.getAsString(conditionalColumn)
+            val ifTrueValue = contentValues.getAsString(ifTrueColumn)
+            val ifFalseValue = contentValues.getAsString(ifFalseColumn)
+            String.format(
+                "(CASE WHEN '%s' %s THEN '%s' ELSE '%s' END)", conditionalValue, condition, ifTrueValue, ifFalseValue
+            )
+        }
+        val item =
+            RepositoryScopeOrderByItem.builder().column(column).direction(direction).keyExtractor(extractor).build()
+        return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item))
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.kt
index ba0a4ea8b5..06362b6911 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IdentifiableFilters.kt
@@ -25,15 +25,15 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 
-public interface IdentifiableFilters<R extends ReadOnlyCollectionRepository<?>>  {
-    StringFilterConnector<R> byUid();
-    StringFilterConnector<R> byCode();
-    StringFilterConnector<R> byName();
-    StringFilterConnector<R> byDisplayName();
-    DateFilterConnector<R> byCreated();
-    DateFilterConnector<R> byLastUpdated();
-}
\ No newline at end of file
+interface IdentifiableFilters<R : ReadOnlyCollectionRepository<*>> {
+    fun byUid(): StringFilterConnector<R>
+    fun byCode(): StringFilterConnector<R>
+    fun byName(): StringFilterConnector<R>
+    fun byDisplayName(): StringFilterConnector<R>
+    fun byCreated(): DateFilterConnector<R>
+    fun byLastUpdated(): DateFilterConnector<R>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
index 24a1457cd0..f59fd5d0c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
@@ -25,31 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-public final class LongFilterConnector<R extends BaseRepository>
-        extends BaseAbstractFilterConnector<R, Long> {
-
-    LongFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                        RepositoryScope scope,
-                        String key) {
-        super(repositoryFactory, scope, key);
-    }
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
+class IntegerFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, Int>(
+    repositoryFactory, scope, key
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The smallerThan filter checks if the given field has a value which is smaller than the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R smallerThan(long value) {
-        return newWithWrappedScope(FilterItemOperator.LT, value);
+    fun smallerThan(value: Int): R {
+        return newWithWrappedScope(FilterItemOperator.LT, value)
     }
 
     /**
@@ -58,11 +55,11 @@ public R smallerThan(long value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R biggerThan(long value) {
-        return newWithWrappedScope(FilterItemOperator.GT, value);
+    fun biggerThan(value: Int): R {
+        return newWithWrappedScope(FilterItemOperator.GT, value)
     }
 
-    String wrapValue(Long value) {
-        return value.toString();
+    override fun wrapValue(value: Int?): String {
+        return value.toString()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
new file mode 100644
index 0000000000..d8a8c34528
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import java.util.Arrays
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+
+class ListFilterConnector<R : BaseRepository, T>
+internal constructor(private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<T>>) {
+    fun eq(value: T): R {
+        return repositoryFactory.updated(listOf(value))
+    }
+
+    fun `in`(values: List<T>): R {
+        return repositoryFactory.updated(values)
+    }
+
+    @SafeVarargs
+    fun `in`(vararg values: T): R {
+        return `in`(Arrays.asList(*values))
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
index 02af4405f5..191d24f071 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
@@ -25,31 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-public final class IntegerFilterConnector<R extends BaseRepository>
-        extends BaseAbstractFilterConnector<R, Integer> {
-
-    IntegerFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                           RepositoryScope scope,
-                           String key) {
-        super(repositoryFactory, scope, key);
-    }
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
+class LongFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, Long>(
+    repositoryFactory, scope, key
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The smallerThan filter checks if the given field has a value which is smaller than the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R smallerThan(int value) {
-        return newWithWrappedScope(FilterItemOperator.LT, value);
+    fun smallerThan(value: Long): R {
+        return newWithWrappedScope(FilterItemOperator.LT, value)
     }
 
     /**
@@ -58,11 +55,11 @@ public R smallerThan(int value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R biggerThan(int value) {
-        return newWithWrappedScope(FilterItemOperator.GT, value);
+    fun biggerThan(value: Long): R {
+        return newWithWrappedScope(FilterItemOperator.GT, value)
     }
 
-    String wrapValue(Integer value) {
-        return value.toString();
+    override fun wrapValue(value: Long?): String {
+        return value.toString()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.kt
similarity index 83%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.kt
index 74a463e0d9..b0321fdb91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/NameableFilters.kt
@@ -25,13 +25,13 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 
-public interface NameableFilters<R extends ReadOnlyCollectionRepository<?>> extends IdentifiableFilters<R> {
-    StringFilterConnector<R> byShortName();
-    StringFilterConnector<R> byDisplayShortName();
-    StringFilterConnector<R> byDescription();
-    StringFilterConnector<R> byDisplayDescription();
-}
\ No newline at end of file
+interface NameableFilters<R : ReadOnlyCollectionRepository<*>> : IdentifiableFilters<R> {
+    fun byShortName(): StringFilterConnector<R>
+    fun byDisplayShortName(): StringFilterConnector<R>
+    fun byDescription(): StringFilterConnector<R>
+    fun byDisplayDescription(): StringFilterConnector<R>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt
index c1c79cbce6..6269254e46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt
@@ -25,36 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.common.OrganisationUnitFilter;
-import org.hisp.dhis.android.core.common.RelativeOrganisationUnit;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public final class OrganisationUnitFilterConnector<R extends BaseRepository> {
-
-    private final ScopedRepositoryFilterFactory<R, List<OrganisationUnitFilter>> repositoryFactory;
-
-    OrganisationUnitFilterConnector(ScopedRepositoryFilterFactory<R, List<OrganisationUnitFilter>> repositoryFactory) {
-        this.repositoryFactory = repositoryFactory;
-    }
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.common.OrganisationUnitFilter
+import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
 
+class OrganisationUnitFilterConnector<R : BaseRepository> internal constructor(
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<OrganisationUnitFilter>>
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The eq filter checks if the given field has the same the orgunit as the one provided.
      * @param orgunitUid value to compare with the target field
      * @return the new repository
      */
-    public R eq(@NonNull String orgunitUid) {
-        OrganisationUnitFilter filter = new OrganisationUnitFilter(orgunitUid, null);
-        return repositoryFactory.updated(Collections.singletonList(filter));
+    fun eq(orgunitUid: String): R {
+        val filter = OrganisationUnitFilter(orgunitUid, null)
+        return repositoryFactory.updated(listOf(filter))
     }
 
     /**
@@ -63,9 +51,9 @@ public R eq(@NonNull String orgunitUid) {
      * @param relative value to compare with the target field
      * @return the new repository
      */
-    public R eq(@NonNull RelativeOrganisationUnit relative) {
-        OrganisationUnitFilter filter = new OrganisationUnitFilter(null, relative);
-        return repositoryFactory.updated(Collections.singletonList(filter));
+    fun eq(relative: RelativeOrganisationUnit): R {
+        val filter = OrganisationUnitFilter(null, relative)
+        return repositoryFactory.updated(listOf(filter))
     }
 
     /**
@@ -74,12 +62,12 @@ public R eq(@NonNull RelativeOrganisationUnit relative) {
      * @param orgunitUids list of uids organisation units to compare
      * @return the new repository
      */
-    public R in(@NonNull String...orgunitUids) {
-        List<OrganisationUnitFilter> filters = new ArrayList<>();
-        for (String uid : orgunitUids) {
-            filters.add(new OrganisationUnitFilter(uid, null));
+    fun `in`(vararg orgunitUids: String): R {
+        val filters: MutableList<OrganisationUnitFilter> = ArrayList()
+        for (uid in orgunitUids) {
+            filters.add(OrganisationUnitFilter(uid, null))
         }
-        return repositoryFactory.updated(filters);
+        return repositoryFactory.updated(filters)
     }
 
     /**
@@ -88,11 +76,11 @@ public R in(@NonNull String...orgunitUids) {
      * @param relatives list of relative organisation units to compare
      * @return the new repository
      */
-    public R in(@NonNull RelativeOrganisationUnit...relatives) {
-        List<OrganisationUnitFilter> filters = new ArrayList<>();
-        for (RelativeOrganisationUnit relative : relatives) {
-            filters.add(new OrganisationUnitFilter(null, relative));
+    fun `in`(vararg relatives: RelativeOrganisationUnit): R {
+        val filters: MutableList<OrganisationUnitFilter> = ArrayList()
+        for (relative in relatives) {
+            filters.add(OrganisationUnitFilter(null, relative))
         }
-        return repositoryFactory.updated(filters);
+        return repositoryFactory.updated(filters)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt
index c66f559025..c2ebb326d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt
@@ -25,37 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.common.DateFilterPeriod;
-import org.hisp.dhis.android.core.common.DatePeriodType;
-import org.hisp.dhis.android.core.common.RelativePeriod;
-import org.hisp.dhis.android.core.period.DatePeriod;
-import org.hisp.dhis.android.core.period.Period;
-
-import java.util.Date;
-
-public final class PeriodFilterConnector<R extends BaseRepository> {
-
-    private final ScopedRepositoryFilterFactory<R, DateFilterPeriod> repositoryFactory;
-
-    PeriodFilterConnector(ScopedRepositoryFilterFactory<R, DateFilterPeriod> repositoryFactory) {
-        this.repositoryFactory = repositoryFactory;
-    }
+import java.util.Date
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.common.DateFilterPeriod
+import org.hisp.dhis.android.core.common.DatePeriodType
+import org.hisp.dhis.android.core.common.RelativePeriod
+import org.hisp.dhis.android.core.period.DatePeriod
+import org.hisp.dhis.android.core.period.Period
 
+class PeriodFilterConnector<R : BaseRepository> internal constructor(
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, DateFilterPeriod>
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The before filter checks if the given field has a date value which is before or equal to the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R beforeOrEqual(Date value) {
-        DateFilterPeriod filter = DateFilterPeriod.builder().endDate(value).type(DatePeriodType.ABSOLUTE).build();
-        return repositoryFactory.updated(filter);
+    fun beforeOrEqual(value: Date): R {
+        val filter = DateFilterPeriod.builder().endDate(value).type(DatePeriodType.ABSOLUTE).build()
+        return repositoryFactory.updated(filter)
     }
 
     /**
@@ -64,9 +55,10 @@ public R beforeOrEqual(Date value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R afterOrEqual(Date value) {
-        DateFilterPeriod filter = DateFilterPeriod.builder().startDate(value).type(DatePeriodType.ABSOLUTE).build();
-        return repositoryFactory.updated(filter);
+    fun afterOrEqual(value: Date): R {
+        val filter =
+            DateFilterPeriod.builder().startDate(value).type(DatePeriodType.ABSOLUTE).build()
+        return repositoryFactory.updated(filter)
     }
 
     /**
@@ -75,8 +67,8 @@ public R afterOrEqual(Date value) {
      * @param datePeriod date period to compare with the target field
      * @return the new repository
      */
-    public R inDatePeriod(@NonNull DatePeriod datePeriod) {
-        return inPeriod(datePeriod.startDate(), datePeriod.endDate());
+    fun inDatePeriod(datePeriod: DatePeriod): R {
+        return inPeriod(datePeriod.startDate(), datePeriod.endDate())
     }
 
     /**
@@ -85,14 +77,14 @@ public R inDatePeriod(@NonNull DatePeriod datePeriod) {
      * @param period period to compare with the target field
      * @return the new repository
      */
-    public R inPeriod(@NonNull Period period) {
-        return inPeriod(period.startDate(), period.endDate());
+    fun inPeriod(period: Period): R {
+        return inPeriod(period.startDate()!!, period.endDate()!!)
     }
 
-    private R inPeriod(@NonNull Date startDate, @NonNull Date endDate) {
-        DateFilterPeriod filter = DateFilterPeriod.builder()
-                .startDate(startDate).endDate(endDate).type(DatePeriodType.ABSOLUTE).build();
-        return repositoryFactory.updated(filter);
+    private fun inPeriod(startDate: Date, endDate: Date): R {
+        val filter = DateFilterPeriod.builder()
+            .startDate(startDate).endDate(endDate).type(DatePeriodType.ABSOLUTE).build()
+        return repositoryFactory.updated(filter)
     }
 
     /**
@@ -102,9 +94,9 @@ private R inPeriod(@NonNull Date startDate, @NonNull Date endDate) {
      * @param relativePeriod relative period to compare with the target field
      * @return the new repository
      */
-    public R inPeriod(@NonNull RelativePeriod relativePeriod) {
-        DateFilterPeriod filter = DateFilterPeriod.builder()
-                .period(relativePeriod).type(DatePeriodType.RELATIVE).build();
-        return repositoryFactory.updated(filter);
+    fun inPeriod(relativePeriod: RelativePeriod): R {
+        val filter = DateFilterPeriod.builder()
+            .period(relativePeriod).type(DatePeriodType.RELATIVE).build()
+        return repositoryFactory.updated(filter)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt
index ddaa4dcbc5..60d685baf2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt
@@ -25,40 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.common.DateFilterPeriod;
-import org.hisp.dhis.android.core.common.DatePeriodType;
-import org.hisp.dhis.android.core.common.RelativePeriod;
-import org.hisp.dhis.android.core.period.DatePeriod;
-import org.hisp.dhis.android.core.period.Period;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-public final class PeriodsFilterConnector<R extends BaseRepository> {
-
-    private final ScopedRepositoryFilterFactory<R, List<DateFilterPeriod>> repositoryFactory;
-
-    PeriodsFilterConnector(ScopedRepositoryFilterFactory<R, List<DateFilterPeriod>> repositoryFactory) {
-        this.repositoryFactory = repositoryFactory;
-    }
+import java.util.Date
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.common.DateFilterPeriod
+import org.hisp.dhis.android.core.common.DatePeriodType
+import org.hisp.dhis.android.core.common.RelativePeriod
+import org.hisp.dhis.android.core.period.DatePeriod
+import org.hisp.dhis.android.core.period.Period
 
+class PeriodsFilterConnector<R : BaseRepository> internal constructor(
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<DateFilterPeriod>>
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The before filter checks if the given field has a date value which is before or equal to the one provided.
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R beforeOrEqual(Date value) {
-        DateFilterPeriod filter = DateFilterPeriod.builder().endDate(value).type(DatePeriodType.ABSOLUTE).build();
-        return repositoryFactory.updated(Collections.singletonList(filter));
+    fun beforeOrEqual(value: Date): R {
+        val filter = DateFilterPeriod.builder().endDate(value).type(DatePeriodType.ABSOLUTE).build()
+        return repositoryFactory.updated(listOf(filter))
     }
 
     /**
@@ -67,9 +55,10 @@ public R beforeOrEqual(Date value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R afterOrEqual(Date value) {
-        DateFilterPeriod filter = DateFilterPeriod.builder().startDate(value).type(DatePeriodType.ABSOLUTE).build();
-        return repositoryFactory.updated(Collections.singletonList(filter));
+    fun afterOrEqual(value: Date): R {
+        val filter =
+            DateFilterPeriod.builder().startDate(value).type(DatePeriodType.ABSOLUTE).build()
+        return repositoryFactory.updated(listOf(filter))
     }
 
     /**
@@ -78,13 +67,16 @@ public R afterOrEqual(Date value) {
      * @param datePeriods date period to compare with the target field
      * @return the new repository
      */
-    public R inDatePeriods(@NonNull DatePeriod...datePeriods) {
-        List<DateFilterPeriod> filters = new ArrayList<>();
-        for (DatePeriod period : datePeriods) {
-            filters.add(DateFilterPeriod.builder()
-                    .startDate(period.startDate()).endDate(period.endDate()).type(DatePeriodType.ABSOLUTE).build());
+    fun inDatePeriods(vararg datePeriods: DatePeriod): R {
+        val filters: MutableList<DateFilterPeriod> = ArrayList()
+        for (period in datePeriods) {
+            filters.add(
+                DateFilterPeriod.builder()
+                    .startDate(period.startDate()).endDate(period.endDate())
+                    .type(DatePeriodType.ABSOLUTE).build()
+            )
         }
-        return repositoryFactory.updated(filters);
+        return repositoryFactory.updated(filters)
     }
 
     /**
@@ -93,13 +85,16 @@ public R inDatePeriods(@NonNull DatePeriod...datePeriods) {
      * @param periods periods to compare with the target field
      * @return the new repository
      */
-    public R inPeriods(@NonNull Period...periods) {
-        List<DateFilterPeriod> filters = new ArrayList<>();
-        for (Period period : periods) {
-            filters.add(DateFilterPeriod.builder()
-                    .startDate(period.startDate()).endDate(period.endDate()).type(DatePeriodType.ABSOLUTE).build());
+    fun inPeriods(vararg periods: Period): R {
+        val filters: MutableList<DateFilterPeriod> = ArrayList()
+        for (period in periods) {
+            filters.add(
+                DateFilterPeriod.builder()
+                    .startDate(period.startDate()).endDate(period.endDate())
+                    .type(DatePeriodType.ABSOLUTE).build()
+            )
         }
-        return repositoryFactory.updated(filters);
+        return repositoryFactory.updated(filters)
     }
 
     /**
@@ -109,11 +104,13 @@ public R inPeriods(@NonNull Period...periods) {
      * @param relativePeriods relative periods to compare with the target field
      * @return the new repository
      */
-    public R inPeriods(@NonNull RelativePeriod...relativePeriods) {
-        List<DateFilterPeriod> filters = new ArrayList<>();
-        for (RelativePeriod relative : relativePeriods) {
-            filters.add(DateFilterPeriod.builder().period(relative).type(DatePeriodType.RELATIVE).build());
+    fun inPeriods(vararg relativePeriods: RelativePeriod): R {
+        val filters: MutableList<DateFilterPeriod> = ArrayList()
+        for (relative in relativePeriods) {
+            filters.add(
+                DateFilterPeriod.builder().period(relative).type(DatePeriodType.RELATIVE).build()
+            )
         }
-        return repositoryFactory.updated(filters);
+        return repositoryFactory.updated(filters)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
index bcc02a1e9c..2509ff0be0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
@@ -44,7 +44,7 @@ internal class ScopedFilterConnectorFactory<R : BaseRepository, S : BaseScope>(
     }
 
     fun <T> listConnector(baseScopeFactory: BaseScopeFactory<S, List<T>>): ListFilterConnector<R, T> {
-        return ListFilterConnector { list: List<T>? -> repositoryFactory.updated(baseScopeFactory.updated(list)) }
+        return ListFilterConnector { list: List<T>? -> repositoryFactory.updated(baseScopeFactory.updated(list!!)) }
     }
 
     fun booleanConnector(baseScopeFactory: BaseScopeFactory<S, Boolean>): BoolFilterConnector<R> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
index 8b726343a9..0fa21f2d49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
@@ -25,23 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-public final class StringFilterConnector<R extends BaseRepository>
-        extends BaseAbstractFilterConnector<R, String> {
-
-    StringFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                          RepositoryScope scope,
-                          String key) {
-        super(repositoryFactory, scope, key);
-    }
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
+class StringFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, String>(
+    repositoryFactory, scope, key
+) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
      * The like filter checks if the given field has a value which contains the value provided. The comparison
@@ -49,11 +46,11 @@ public final class StringFilterConnector<R extends BaseRepository>
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R like(String value) {
-        return newWithWrappedScope(FilterItemOperator.LIKE, "%" + value + "%");
+    fun like(value: String): R {
+        return newWithWrappedScope(FilterItemOperator.LIKE, "%$value%")
     }
 
-    String wrapValue(String value) {
-        return "'" + escapeQuotes(value) + "'";
+    override fun wrapValue(value: String?): String {
+        return "'" + escapeQuotes(value!!) + "'"
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java
deleted file mode 100644
index b64a7a634e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-import java.util.List;
-
-public final class SubQueryFilterConnector<R extends BaseRepository>
-        extends BaseAbstractFilterConnector<R, String> {
-
-    SubQueryFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                            RepositoryScope scope,
-                            String key) {
-        super(repositoryFactory, scope, key);
-    }
-
-    String wrapValue(String value) {
-        return value;
-    }
-
-    public R inLinkTable(String linkTable, String linkParent, String linkChild, List<String> children) {
-        WhereClauseBuilder clauseBuilder = new WhereClauseBuilder().appendInKeyStringValues(linkChild, children);
-
-        return inTableWhere(linkTable, linkParent, clauseBuilder);
-    }
-
-    public R inTableWhere(String linkTable, String linkParent, WhereClauseBuilder clauseBuilder) {
-        return newWithWrappedScope(FilterItemOperator.IN, "(" + String.format(
-                "SELECT DISTINCT %s FROM %s WHERE %s", linkParent, linkTable, clauseBuilder.build()) + ")");
-    }
-
-    public R inTwoLinkTable(String linkTable1, String linkParent1, String linkChild1,
-                            String linkTable2, String linkParent2, String linkChild2,
-                            List<String> children) {
-        WhereClauseBuilder innerClauseBuilder = new WhereClauseBuilder().appendInKeyStringValues(linkChild2, children);
-        String innerClause = String.format("SELECT DISTINCT %s FROM %s WHERE %s",
-                linkParent2, linkTable2, innerClauseBuilder.build());
-
-        String whereClause = linkChild1 + " IN (" + innerClause + ")";
-        return newWithWrappedScope(FilterItemOperator.IN, String.format(
-                "( SELECT DISTINCT %s FROM %s WHERE %s )", linkParent1, linkTable1, whereClause
-        ));
-    }
-
-    @SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"})
-    public R withThoseChildrenExactly(String linkTable, String linkParent, String linkChild, List<String> children) {
-        RepositoryScope repositoryScope = null;
-
-        for (String child : children) {
-            String clause = new WhereClauseBuilder().appendKeyStringValue(linkChild, child).build();
-            String value = "(" + String.format("SELECT %s FROM %s WHERE %s ", linkParent, linkTable, clause) + ")";
-
-            repositoryScope = repositoryScope == null ? updatedUnwrappedScope(FilterItemOperator.IN, value) :
-                    updatePassedScope(FilterItemOperator.IN, value, repositoryScope);
-        }
-
-        return newWithPassedScope(FilterItemOperator.IN, "(" + String.format(
-                "SELECT %s FROM %s WHERE 1 GROUP BY %s HAVING COUNT(*) = %s ",
-                linkParent, linkTable, linkParent, children.size()) + ")", repositoryScope);
-    }
-
-    public R rawSubQuery(FilterItemOperator operator, String subQuery) {
-        return newWithWrappedScope(operator, "(" + subQuery + ")");
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
new file mode 100644
index 0000000000..a7cbbc7f18
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
@@ -0,0 +1,126 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
+
+class SubQueryFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : BaseAbstractFilterConnector<R, String>(
+    repositoryFactory, scope, key
+) {
+    override fun wrapValue(value: String?): String? {
+        return value
+    }
+
+    fun inLinkTable(
+        linkTable: String?,
+        linkParent: String?,
+        linkChild: String?,
+        children: List<String?>?
+    ): R {
+        val clauseBuilder = WhereClauseBuilder().appendInKeyStringValues(linkChild, children)
+        return inTableWhere(linkTable, linkParent, clauseBuilder)
+    }
+
+    fun inTableWhere(
+        linkTable: String?,
+        linkParent: String?,
+        clauseBuilder: WhereClauseBuilder
+    ): R {
+        return newWithWrappedScope(
+            FilterItemOperator.IN,
+            "(" + String.format(
+                "SELECT DISTINCT %s FROM %s WHERE %s", linkParent, linkTable, clauseBuilder.build()
+            ) + ")"
+        )
+    }
+    @SuppressWarnings("LongParameterList")
+    fun inTwoLinkTable(
+        linkTable1: String,
+        linkParent1: String,
+        linkChild1: String,
+        linkTable2: String,
+        linkParent2: String,
+        linkChild2: String,
+        children: List<String>
+    ): R {
+        val innerClauseBuilder = WhereClauseBuilder().appendInKeyStringValues(linkChild2, children)
+        val innerClause = String.format(
+            "SELECT DISTINCT %s FROM %s WHERE %s",
+            linkParent2, linkTable2, innerClauseBuilder.build()
+        )
+        val whereClause = "$linkChild1 IN ($innerClause)"
+        return newWithWrappedScope(
+            FilterItemOperator.IN,
+            String.format(
+                "( SELECT DISTINCT %s FROM %s WHERE %s )", linkParent1, linkTable1, whereClause
+            )
+        )
+    }
+
+    fun withThoseChildrenExactly(
+        linkTable: String,
+        linkParent: String,
+        linkChild: String,
+        children: List<String>
+    ): R {
+        var repositoryScope: RepositoryScope? = null
+        for (child in children) {
+            val clause = WhereClauseBuilder().appendKeyStringValue(linkChild, child).build()
+            val value = "(" + String.format(
+                "SELECT %s FROM %s WHERE %s ",
+                linkParent,
+                linkTable,
+                clause
+            ) + ")"
+            repositoryScope = if (repositoryScope == null) updatedUnwrappedScope(
+                FilterItemOperator.IN,
+                value
+            ) else updatePassedScope(FilterItemOperator.IN, value, repositoryScope)
+        }
+        return newWithPassedScope(
+            FilterItemOperator.IN,
+            "(" + String.format(
+                "SELECT %s FROM %s WHERE 1 GROUP BY %s HAVING COUNT(*) = %s ",
+                linkParent, linkTable, linkParent, children.size
+            ) + ")",
+            repositoryScope
+        )
+    }
+
+    fun rawSubQuery(operator: FilterItemOperator, subQuery: String): R {
+        return newWithWrappedScope(operator, "($subQuery)")
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
index c6ca8b6c6e..12bcc097ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
@@ -25,60 +25,58 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+import java.util.Arrays
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-public final class UnwrappedEqInFilterConnector<R extends BaseRepository>
-        extends AbstractFilterConnector<R, String> {
-
-    UnwrappedEqInFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                                 RepositoryScope scope,
-                                 String key) {
-        super(repositoryFactory, scope, key);
-    }
-
-    String wrapValue(String value) {
-        return value;
+class UnwrappedEqInFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String
+) : AbstractFilterConnector<R, String>(
+    repositoryFactory, scope, key
+) {
+    override fun wrapValue(value: String?): String? {
+        return value
     }
 
-    public R eq(String value) {
-        return newWithWrappedScope(FilterItemOperator.EQ, value);
+    fun eq(value: String): R {
+        return newWithWrappedScope(FilterItemOperator.EQ, value)
     }
 
-    public R in(Collection<String> values) {
-        return newWithUnwrappedScope(FilterItemOperator.IN, "(" + getCommaSeparatedValues(values) + ")");
+    fun `in`(values: Collection<String>): R {
+        return newWithUnwrappedScope(
+            FilterItemOperator.IN,
+            "(" + getCommaSeparatedValues(values) + ")"
+        )
     }
 
-    public R in(String... values) {
-        return in(Arrays.asList(values));
+    fun `in`(vararg values: String): R {
+        return `in`(Arrays.asList(*values))
     }
 
-    public static List<String> getValueList(String value) {
-        if (value.charAt(0) == '(') {
-            String[] values = value
-                    .substring(1, value.length() - 1)
-                    .split(",");
-            List<String> list = new ArrayList<>(value.length());
-            for (String v : values) {
-                String trimmed = v.trim();
-                if (!trimmed.isEmpty()) {
-                    list.add(trimmed);
+    companion object {
+        @JvmStatic
+        fun getValueList(value: String): List<String> {
+            return if (value[0] == '(') {
+                val values = value
+                    .substring(1, value.length - 1)
+                    .split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                val list: MutableList<String> = ArrayList(value.length)
+                for (v in values) {
+                    val trimmed = v.trim { it <= ' ' }
+                    if (!trimmed.isEmpty()) {
+                        list.add(trimmed)
+                    }
                 }
+                list
+            } else {
+                listOf(value)
             }
-            return list;
-        } else {
-            return Collections.singletonList(value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
similarity index 71%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
index 22bc5d5a70..c6d94f19f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
@@ -25,41 +25,27 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
-
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-
-import java.util.Collection;
-
-import static org.hisp.dhis.android.core.arch.repositories.filters.internal.BaseAbstractFilterConnector.escapeQuotes;
-
-public final class ValueSubQueryFilterConnector<R extends BaseRepository> extends BaseSubQueryFilterConnector<R> {
-
-    private final String linkChild;
-    private final String dataElementColumn;
-    private final String dataElementId;
-
-    ValueSubQueryFilterConnector(BaseRepositoryFactory<R> repositoryFactory,
-                                 RepositoryScope scope,
-                                 String key,
-                                 String linkTable,
-                                 String linkParent,
-                                 String linkChild,
-                                 String dataElementColumn,
-                                 String dataElementId) {
-        super(repositoryFactory, scope, key, linkTable, linkParent);
-        this.linkChild = linkChild;
-        this.dataElementColumn = dataElementColumn;
-        this.dataElementId = dataElementId;
-    }
-
-    String wrapValue(String value) {
-        return "'" + escapeQuotes(value) + "'";
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
+
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BaseAbstractFilterConnector.Companion.escapeQuotes
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
+
+class ValueSubQueryFilterConnector<R : BaseRepository> internal constructor(
+    repositoryFactory: BaseRepositoryFactory<R>,
+    scope: RepositoryScope,
+    key: String,
+    linkTable: String,
+    linkParent: String,
+    private val linkChild: String,
+    private val dataElementColumn: String,
+    private val dataElementId: String
+) : BaseSubQueryFilterConnector<R>(repositoryFactory, scope, key, linkTable, linkParent) {
+    override fun wrapValue(value: String?): String {
+        return "'" + escapeQuotes(value!!) + "'"
     }
 
     /**
@@ -68,8 +54,8 @@ String wrapValue(String value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R eq(String value) {
-        return inLinkTable(FilterItemOperator.EQ, wrapValue(value));
+    fun eq(value: String): R {
+        return inLinkTable(FilterItemOperator.EQ, wrapValue(value))
     }
 
     /**
@@ -78,8 +64,8 @@ public R eq(String value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R le(String value) {
-        return inLinkTable(FilterItemOperator.LE, wrapValue(value));
+    fun le(value: String): R {
+        return inLinkTable(FilterItemOperator.LE, wrapValue(value))
     }
 
     /**
@@ -88,8 +74,8 @@ public R le(String value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R lt(String value) {
-        return inLinkTable(FilterItemOperator.LT, wrapValue(value));
+    fun lt(value: String): R {
+        return inLinkTable(FilterItemOperator.LT, wrapValue(value))
     }
 
     /**
@@ -98,8 +84,8 @@ public R lt(String value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R ge(String value) {
-        return inLinkTable(FilterItemOperator.GE, wrapValue(value));
+    fun ge(value: String): R {
+        return inLinkTable(FilterItemOperator.GE, wrapValue(value))
     }
 
     /**
@@ -108,8 +94,8 @@ public R ge(String value) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R gt(String value) {
-        return inLinkTable(FilterItemOperator.GT, wrapValue(value));
+    fun gt(value: String): R {
+        return inLinkTable(FilterItemOperator.GT, wrapValue(value))
     }
 
     /**
@@ -118,8 +104,8 @@ public R gt(String value) {
      * @param values value list to compare with the target field
      * @return the new repository
      */
-    public R in(Collection<String> values) {
-        return inLinkTable(FilterItemOperator.IN, "(" + getCommaSeparatedValues(values) + ")");
+    fun `in`(values: Collection<String>): R {
+        return inLinkTable(FilterItemOperator.IN, "(" + getCommaSeparatedValues(values) + ")")
     }
 
     /**
@@ -129,15 +115,14 @@ public R in(Collection<String> values) {
      * @param value value to compare with the target field
      * @return the new repository
      */
-    public R like(String value) {
-        return inLinkTable(FilterItemOperator.LIKE, wrapValue("%" + value + "%"));
+    fun like(value: String): R {
+        return inLinkTable(FilterItemOperator.LIKE, wrapValue("%$value%"))
     }
 
-    private R inLinkTable(FilterItemOperator operator, String value) {
-        WhereClauseBuilder clauseBuilder = new WhereClauseBuilder()
-                .appendKeyOperatorValue(linkChild, operator.getSqlOperator(), value)
-                .appendKeyStringValue(dataElementColumn, dataElementId);
-
-        return inTableWhere(clauseBuilder);
+    private fun inLinkTable(operator: FilterItemOperator, value: String): R {
+        val clauseBuilder = WhereClauseBuilder()
+            .appendKeyOperatorValue(linkChild, operator.sqlOperator, value)
+            .appendKeyStringValue(dataElementColumn, dataElementId)
+        return inTableWhere(clauseBuilder)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
index 06e1435d57..f036a370b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
@@ -25,73 +25,65 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.paging.internal;
+package org.hisp.dhis.android.core.arch.repositories.paging.internal
 
-import androidx.annotation.NonNull;
-import androidx.paging.ItemKeyedDataSource;
+import androidx.paging.ItemKeyedDataSource
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor.appendInObjectCollection
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
+import org.hisp.dhis.android.core.common.CoreObject
 
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder;
-import org.hisp.dhis.android.core.common.CoreObject;
-
-import java.util.List;
-import java.util.Map;
-
-public final class RepositoryDataSource<M extends CoreObject> extends ItemKeyedDataSource<M, M> {
-
-    private final ReadableStore<M> store;
-    private final RepositoryScope scope;
-    private final Map<String, ChildrenAppender<M>> childrenAppenders;
-
-    public RepositoryDataSource(ReadableStore<M> store,
-                                RepositoryScope scope,
-                                Map<String, ChildrenAppender<M>> childrenAppenders) {
-        this.store = store;
-        this.scope = scope;
-        this.childrenAppenders = childrenAppenders;
-    }
-
-    @Override
-    public void loadInitial(@NonNull LoadInitialParams<M> params, @NonNull LoadInitialCallback<M> callback) {
-        String whereClause = new WhereClauseFromScopeBuilder(new WhereClauseBuilder()).getWhereClause(scope);
-        List<M> withoutChildren = store.selectWhere(whereClause,
-                OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()), params.requestedLoadSize);
-        callback.onResult(appendChildren(withoutChildren));
+class RepositoryDataSource<M : CoreObject>(
+    private val store: ReadableStore<M>,
+    private val scope: RepositoryScope,
+    private val childrenAppenders: Map<String, ChildrenAppender<M>>
+) : ItemKeyedDataSource<M, M>() {
+    override fun loadInitial(params: LoadInitialParams<M>, callback: LoadInitialCallback<M>) {
+        val whereClause = WhereClauseFromScopeBuilder(WhereClauseBuilder()).getWhereClause(
+            scope
+        )
+        val withoutChildren = store.selectWhere(
+            whereClause,
+            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+            params.requestedLoadSize
+        )
+        callback.onResult(appendChildren(withoutChildren))
     }
 
-    @Override
-    public void loadAfter(@NonNull LoadParams<M> params, @NonNull LoadCallback<M> callback) {
-        loadPages(params, callback, false);
+    override fun loadAfter(params: LoadParams<M>, callback: LoadCallback<M>) {
+        loadPages(params, callback, false)
     }
 
-    @Override
-    public void loadBefore(@NonNull LoadParams<M> params, @NonNull LoadCallback<M> callback) {
-        loadPages(params, callback, true);
+    override fun loadBefore(params: LoadParams<M>, callback: LoadCallback<M>) {
+        loadPages(params, callback, true)
     }
 
-    private void loadPages(@NonNull LoadParams<M> params, @NonNull LoadCallback<M> callback, boolean reversed) {
-        WhereClauseBuilder whereClauseBuilder = new WhereClauseBuilder();
-        OrderByClauseBuilder.addSortingClauses(whereClauseBuilder, scope.orderBy(),
-                params.key.toContentValues(), reversed, scope.pagingKey());
-        String whereClause = new WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope);
-        List<M> withoutChildren = store.selectWhere(whereClause,
-                OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-                params.requestedLoadSize);
-        callback.onResult(appendChildren(withoutChildren));
+    private fun loadPages(params: LoadParams<M>, callback: LoadCallback<M>, reversed: Boolean) {
+        val whereClauseBuilder = WhereClauseBuilder()
+        OrderByClauseBuilder.addSortingClauses(
+            whereClauseBuilder, scope.orderBy(),
+            params.key.toContentValues(), reversed, scope.pagingKey()
+        )
+        val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(
+            scope
+        )
+        val withoutChildren = store.selectWhere(
+            whereClause,
+            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+            params.requestedLoadSize
+        )
+        callback.onResult(appendChildren(withoutChildren))
     }
 
-    @NonNull
-    @Override
-    public M getKey(@NonNull M item) {
-        return item;
+    override fun getKey(item: M): M {
+        return item
     }
 
-    private List<M> appendChildren(List<M> withoutChildren) {
-        return ChildrenAppenderExecutor.appendInObjectCollection(withoutChildren, childrenAppenders, scope.children());
+    private fun appendChildren(withoutChildren: List<M>): List<M> {
+        return appendInObjectCollection(withoutChildren, childrenAppenders, scope.children())
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
index a2dca59aa7..a15b6502cc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
@@ -25,13 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.paging.internal;
+package org.hisp.dhis.android.core.arch.repositories.paging.internal
 
-import org.hisp.dhis.android.core.common.CoreColumns;
+import org.hisp.dhis.android.core.common.CoreColumns
 
-public final class RepositoryPagingConfig {
-    public static final String PAGING_KEY = CoreColumns.ID;
-
-    private RepositoryPagingConfig() {
-    }
+object RepositoryPagingConfig {
+    const val PAGING_KEY = CoreColumns.ID
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.kt
index da8a3d117d..4c021b2cfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/BaseScope.kt
@@ -25,8 +25,6 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.arch.repositories.scope;
+package org.hisp.dhis.android.core.arch.repositories.scope
 
-public interface BaseScope {
-
-}
\ No newline at end of file
+interface BaseScope
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
index e4dcb950bc..13d7f91959 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
@@ -25,11 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
-package org.hisp.dhis.android.core.arch.repositories.scope.internal;
+import org.hisp.dhis.android.core.arch.repositories.scope.BaseScope
 
-import org.hisp.dhis.android.core.arch.repositories.scope.BaseScope;
-
-public interface BaseScopeFactory<S extends BaseScope, I> {
-    S updated(I item);
+interface BaseScopeFactory<S : BaseScope, I> {
+    fun updated(item: I): S
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.kt
index 35cf5f333a..0c9fa068d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryMode.kt
@@ -25,9 +25,8 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
-package org.hisp.dhis.android.core.arch.repositories.scope.internal;
-
-public enum RepositoryMode {
-        ONLINE_ONLY, OFFLINE_ONLY, ONLINE_FIRST, OFFLINE_FIRST
+enum class RepositoryMode {
+    ONLINE_ONLY, OFFLINE_ONLY, ONLINE_FIRST, OFFLINE_FIRST
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
index 509f15c0b1..25a6ae100b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
@@ -25,54 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
-package org.hisp.dhis.android.core.arch.repositories.scope.internal;
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.IdentifiableColumns
 
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class RepositoryScopeHelper {
-
-    private RepositoryScopeHelper() {
+object RepositoryScopeHelper {
+    @JvmStatic
+    fun withFilterItem(scope: RepositoryScope, item: RepositoryScopeFilterItem): RepositoryScope {
+        val copiedItems: MutableList<RepositoryScopeFilterItem> = ArrayList(scope.filters())
+        copiedItems.add(item)
+        return scope.toBuilder().filters(copiedItems).build()
     }
 
-    public static RepositoryScope withFilterItem(RepositoryScope scope, RepositoryScopeFilterItem item) {
-        List<RepositoryScopeFilterItem> copiedItems = new ArrayList<>(scope.filters());
-        copiedItems.add(item);
-        return scope.toBuilder().filters(copiedItems).build();
-    }
-
-    public static RepositoryScope withUidFilterItem(RepositoryScope scope, String uid) {
-        RepositoryScopeFilterItem filterItem = RepositoryScopeFilterItem.builder()
-                .key(IdentifiableColumns.UID)
-                .operator(FilterItemOperator.EQ)
-                .value("'" + uid + "'")
-                .build();
-
-        return RepositoryScopeHelper.withFilterItem(scope, filterItem);
+    @JvmStatic
+    fun withUidFilterItem(scope: RepositoryScope, uid: String): RepositoryScope {
+        val filterItem = RepositoryScopeFilterItem.builder()
+            .key(IdentifiableColumns.UID)
+            .operator(FilterItemOperator.EQ)
+            .value("'$uid'")
+            .build()
+        return withFilterItem(scope, filterItem)
     }
 
-    public static RepositoryScope withComplexFilterItem(RepositoryScope scope, RepositoryScopeComplexFilterItem item) {
-        List<RepositoryScopeComplexFilterItem> copiedItems = new ArrayList<>(scope.complexFilters());
-        copiedItems.add(item);
-        return scope.toBuilder().complexFilters(copiedItems).build();
+    fun withComplexFilterItem(
+        scope: RepositoryScope,
+        item: RepositoryScopeComplexFilterItem
+    ): RepositoryScope {
+        val copiedItems: MutableList<RepositoryScopeComplexFilterItem> =
+            ArrayList(scope.complexFilters())
+        copiedItems.add(item)
+        return scope.toBuilder().complexFilters(copiedItems).build()
     }
 
-    public static RepositoryScope withChild(RepositoryScope scope, String child) {
-        return scope.toBuilder().children(scope.children().withChild(child)).build();
+    fun withChild(scope: RepositoryScope, child: String?): RepositoryScope {
+        return scope.toBuilder().children(scope.children().withChild(child!!)).build()
     }
 
-    public static RepositoryScope withOrderBy(RepositoryScope scope, RepositoryScopeOrderByItem item) {
-        List<RepositoryScopeOrderByItem> newItems = new ArrayList<>(scope.orderBy().size() + 1);
-        for (RepositoryScopeOrderByItem i: scope.orderBy()) {
-            if (!i.column().equals(item.column())) {
-                newItems.add(i);
+    @JvmStatic
+    fun withOrderBy(scope: RepositoryScope, item: RepositoryScopeOrderByItem): RepositoryScope {
+        val newItems: MutableList<RepositoryScopeOrderByItem> = ArrayList(scope.orderBy().size + 1)
+        for (i in scope.orderBy()) {
+            if (i.column() != item.column()) {
+                newItems.add(i)
             }
         }
-        newItems.add(item);
-        return scope.toBuilder().orderBy(newItems).build();
+        newItems.add(item)
+        return scope.toBuilder().orderBy(newItems).build()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
index 7a37dabff2..157e2a9996 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
@@ -25,14 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
-package org.hisp.dhis.android.core.arch.repositories.scope.internal;
-
-import android.content.ContentValues;
-
-@FunctionalInterface
-public interface RepositoryScopeKeyOrderExtractor {
-
-    String extractKey(ContentValues contentValues, String column);
+import android.content.ContentValues
 
+fun interface RepositoryScopeKeyOrderExtractor {
+    fun extractKey(contentValues: ContentValues, column: String): String
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt
index 666b931255..6b28c83b03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/WhereClauseFromScopeBuilder.kt
@@ -25,33 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
-package org.hisp.dhis.android.core.arch.repositories.scope.internal;
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-public class WhereClauseFromScopeBuilder {
-
-    private final WhereClauseBuilder builder;
-
-    public WhereClauseFromScopeBuilder(WhereClauseBuilder builder) {
-        this.builder = builder;
-    }
-
-    public String getWhereClause(RepositoryScope scope) {
-        if (!scope.hasFilters() && builder.isEmpty()) {
-            return "1";
+class WhereClauseFromScopeBuilder(private val builder: WhereClauseBuilder) {
+    fun getWhereClause(scope: RepositoryScope): String {
+        if (!scope.hasFilters() && builder.isEmpty) {
+            return "1"
         }
-
-        for (RepositoryScopeFilterItem item: scope.filters()) {
-            builder.appendKeyOperatorValue(item.key(), item.operator().getSqlOperator(), item.value());
+        for (item in scope.filters()) {
+            builder.appendKeyOperatorValue(item.key(), item.operator().sqlOperator, item.value())
         }
-
-        for (RepositoryScopeComplexFilterItem item: scope.complexFilters()) {
-            builder.appendComplexQuery(item.whereQuery());
+        for (item in scope.complexFilters()) {
+            builder.appendComplexQuery(item.whereQuery())
         }
-
-        return builder.build();
+        return builder.build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index 97440a0dfd..287b4bd3f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -109,11 +109,13 @@ internal class EnrollmentServiceImpl @Inject constructor(
             .map { event: Event -> event.programStage() }
             .toList()
             .flatMap { currentProgramStagesUids: List<String?> ->
-                val repository = programStagesCollectionRepository.byProgramUid().eq(
-                    enrollmentRepository.uid(enrollmentUid).blockingGet()?.program()
-                ).byAccessDataWrite().isTrue
+                val repository = enrollmentRepository.uid(enrollmentUid).blockingGet()?.program()?.let {
+                    programStagesCollectionRepository.byProgramUid().eq(
+                        it
+                    ).byAccessDataWrite().isTrue
+                }
 
-                repository.get().toFlowable()
+                repository!!.get().toFlowable()
                     .flatMapIterable { stages: List<ProgramStage>? -> stages }
                     .filter { programStage: ProgramStage ->
                         !currentProgramStagesUids.contains(programStage.uid()) ||
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
index 8ff63f8c0d..78d3c53d2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
@@ -112,7 +112,7 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
             filter.lt()?.let { filterRepo = filterRepo.byDataValue(deId).lt(it) }
             filter.like()?.let { filterRepo = filterRepo.byDataValue(deId).like(it) }
             if (!filter.`in`().isNullOrEmpty()) {
-                filterRepo = filterRepo.byDataValue(deId).`in`(filter.`in`())
+                filterRepo = filterRepo.byDataValue(deId).`in`(filter.`in`()!!)
             }
             filter.dateFilter()?.let { period ->
                 datePeriodHelper.getStartDate(period)?.let {
@@ -183,7 +183,7 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
         mode: AssignedUserMode
     ): EventCollectionRepository {
         return when (mode) {
-            AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet()?.user())
+            AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet()?.user()!!)
             AssignedUserMode.ANY -> repository.byAssignedUser().isNotNull
             AssignedUserMode.NONE -> repository.byAssignedUser().isNull
             // TODO Not implemented yet
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
index c925f6b477..617dafbb61 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
@@ -93,7 +93,7 @@ internal class FileResourceRoutine @Inject constructor(
             add(Calendar.HOUR_OF_DAY, -2)
         }
         val fileResources = fileResourceCollectionRepository
-            .byUid().notIn(fileResourceUids)
+            .byUid().notIn(fileResourceUids.toString())
             .byDomain().eq(FileResourceDomain.DATA_VALUE)
             .byLastUpdated().before(after ?: calendar.time)
             .blockingGet()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
index bb83843808..1ec01477e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
@@ -139,7 +139,7 @@ internal class ProgramIndicatorEngineImpl @Inject constructor(
     }
 
     private fun getEnrollmentEvents(enrollment: Enrollment): Map<String, List<Event>> {
-        val programStageUids = programRepository.byProgramUid().eq(enrollment.program()).blockingGetUids()
+        val programStageUids = programRepository.byProgramUid().eq(enrollment.program()!!).blockingGetUids()
 
         return programStageUids.map { programStageUid ->
             val programStageEvents = eventRepository

From b8e922392705a38c2ff1818f7af37fd9fc2a14e7 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 22 Aug 2023 09:18:11 +0200
Subject: [PATCH 169/478] [ANDROSDK-1737-DEFECT] Update dokka; remove explicit
 sources in publish

---
 core/build.gradle.kts               | 2 +-
 core/plugins/gradle-mvn-push.gradle | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 83214a1b04..c58fd8968b 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -31,7 +31,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("io.gitlab.arturbosch.detekt") version "1.21.0"
-    id("org.jetbrains.dokka") version "1.7.20" apply false
+    id("org.jetbrains.dokka") version "1.8.20" apply false
 }
 
 apply(from = project.file("plugins/android-checkstyle.gradle"))
diff --git a/core/plugins/gradle-mvn-push.gradle b/core/plugins/gradle-mvn-push.gradle
index 3647f0d520..78056fbda0 100644
--- a/core/plugins/gradle-mvn-push.gradle
+++ b/core/plugins/gradle-mvn-push.gradle
@@ -62,6 +62,7 @@ gradle.taskGraph.whenReady { taskGraph ->
 }
 
 tasks.named("dokkaJavadoc") {
+    dependsOn("kaptReleaseKotlin")
     outputDirectory = file("$buildDir/dokkaJavadoc")
 
     dokkaSourceSets {
@@ -79,11 +80,6 @@ task androidJavadocsJar(type: Jar, dependsOn: dokkaJavadoc) {
     from dokkaJavadoc.outputDirectory
 }
 
-task androidSourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
     publishing {
         publications {
@@ -92,7 +88,6 @@ afterEvaluate {
 
                 // Artifacts
                 artifact androidJavadocsJar
-                artifact androidSourcesJar
 
                 groupId = GROUP
                 artifactId = POM_ARTIFACT_ID

From de25949a0519377f04fc85fbf8a01ee38f6c6785 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 22 Aug 2023 13:02:25 +0200
Subject: [PATCH 170/478] [ANDROSDK-1731-DEFECT] Instantiate username for tests

---
 core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
index 3a43b10930..82073cb76a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
@@ -179,6 +179,7 @@ object D2Manager {
             throw NoSuchFieldException("No testing Server Url")
         }
         d2DIComponent.credentialsSecureStore().set(Credentials(username, testingServerUrl!!, password, null))
+        d2DIComponent.userIdInMemoryStore().set(username)
     }
 
     private fun wantToImportDBForExternalTesting(): Boolean {

From 333ed434c791914bc2dda564707fba7797645403 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 22 Aug 2023 13:02:51 +0200
Subject: [PATCH 171/478] [ANDROSDK-1731-DEFECT] Wrap TEI query call in old
 tracker endpoints

---
 .../TrackedEntityInstanceQueryCallFactory.kt  | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index f55b7f7f3a..b47c779a15 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -130,39 +130,37 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     private suspend fun getTrackedEntityQuery(query: TrackedEntityInstanceQueryOnline): List<TrackedEntityInstance> {
         val uidsStr = query.uids?.joinToString(";")
 
-        val searchGridCall = trackedEntityService.query(
-            trackedEntityInstance = uidsStr,
-            orgUnit = getOrgunits(query.orgUnits),
-            orgUnitMode = query.orgUnitMode?.toString(),
-            program = query.program,
-            programStage = query.programStage,
-            programStartDate = query.programStartDate.simpleDateFormat(),
-            programEndDate = query.programEndDate.simpleDateFormat(),
-            enrollmentStatus = query.enrollmentStatus?.toString(),
-            programIncidentStartDate = query.incidentStartDate.simpleDateFormat(),
-            programIncidentEndDate = query.incidentEndDate.simpleDateFormat(),
-            followUp = query.followUp,
-            eventStartDate = query.eventStartDate.simpleDateFormat(),
-            eventEndDate = query.eventEndDate.simpleDateFormat(),
-            eventStatus = getEventStatus(query),
-            trackedEntityType = query.trackedEntityType,
-            query = query.query,
-            filter = toAPIFilterFormat(query.attributeFilter, upper = true),
-            assignedUserMode = query.assignedUserMode?.toString(),
-            lastUpdatedStartDate = query.lastUpdatedStartDate.simpleDateFormat(),
-            lastUpdatedEndDate = query.lastUpdatedEndDate.simpleDateFormat(),
-            order = query.order,
-            paging = query.paging,
-            pageSize = query.pageSize,
-            page = query.page,
-        )
-
         return try {
             coroutineAPICallExecutor.wrap(
                 storeError = false,
                 errorCatcher = TrackedEntityInstanceQueryErrorCatcher()
             ) {
-                searchGridCall
+                trackedEntityService.query(
+                    trackedEntityInstance = uidsStr,
+                    orgUnit = getOrgunits(query.orgUnits),
+                    orgUnitMode = query.orgUnitMode?.toString(),
+                    program = query.program,
+                    programStage = query.programStage,
+                    programStartDate = query.programStartDate.simpleDateFormat(),
+                    programEndDate = query.programEndDate.simpleDateFormat(),
+                    enrollmentStatus = query.enrollmentStatus?.toString(),
+                    programIncidentStartDate = query.incidentStartDate.simpleDateFormat(),
+                    programIncidentEndDate = query.incidentEndDate.simpleDateFormat(),
+                    followUp = query.followUp,
+                    eventStartDate = query.eventStartDate.simpleDateFormat(),
+                    eventEndDate = query.eventEndDate.simpleDateFormat(),
+                    eventStatus = getEventStatus(query),
+                    trackedEntityType = query.trackedEntityType,
+                    query = query.query,
+                    filter = toAPIFilterFormat(query.attributeFilter, upper = true),
+                    assignedUserMode = query.assignedUserMode?.toString(),
+                    lastUpdatedStartDate = query.lastUpdatedStartDate.simpleDateFormat(),
+                    lastUpdatedEndDate = query.lastUpdatedEndDate.simpleDateFormat(),
+                    order = query.order,
+                    paging = query.paging,
+                    pageSize = query.pageSize,
+                    page = query.page,
+                )
             }.getOrThrow().let { mapper.transform(it) }
         } catch (pe: ParseException) {
             throw D2Error.builder()

From bdea004f5e4734ca3ea423e38e85118c4c9aac5c Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 23 Aug 2023 09:00:17 +0200
Subject: [PATCH 172/478] [ANDROSDK-1731-DEFECT] Adapt mock coroutine executer

---
 .../internal/CoroutineAPICallExecutorMock.kt   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
index 5f7079f495..b906b04e07 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
@@ -43,12 +43,18 @@ internal class CoroutineAPICallExecutorMock : CoroutineAPICallExecutor {
         return try {
             Result.Success(block.invoke())
         } catch (e: Throwable) {
-            Result.Failure(
-                D2Error.builder()
-                    .errorCode(D2ErrorCode.UNEXPECTED)
-                    .errorDescription("Unexpected error")
-                    .build()
-            )
+            when (e) {
+                is D2Error ->
+                    Result.Failure(e)
+
+                else ->
+                    Result.Failure(
+                        D2Error.builder()
+                            .errorCode(D2ErrorCode.UNEXPECTED)
+                            .errorDescription("Unexpected error")
+                            .build()
+                    )
+            }
         }
     }
 

From fad124e89b8bdbf6ef824892ee59d47b3603d51c Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 23 Aug 2023 12:10:10 +0200
Subject: [PATCH 173/478] [ANDROSDK-1717] Fix compilation errors; checks

---
 ...alAnalyticsTrackerMockIntegrationShould.kt |   6 +-
 ...nlyIdentifiableCollectionRepositoryImpl.kt |  14 +-
 ...eadOnlyNameableCollectionRepositoryImpl.kt |   9 +-
 ...dAndTransformerCollectionRepositoryImpl.kt |   2 +-
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |   2 +-
 .../internal/AbstractFilterConnector.kt       |   4 +-
 .../internal/BaseAbstractFilterConnector.kt   |  10 +-
 .../filters/internal/EqFilterConnector.kt     |   2 +-
 .../internal/FilterConnectorFactory.kt        |   2 +-
 .../internal/ScopedFilterConnectorFactory.kt  |   6 +-
 .../internal/SubQueryFilterConnector.kt       |  54 +++-----
 .../scope/internal/BaseScopeFactory.kt        |   2 +-
 .../scope/internal/RepositoryScopeHelper.kt   |  17 ++-
 .../core/datastore/DataStoreDownloader.kt     |   2 +-
 .../core/fileresource/FileResourceRoutine.kt  |   2 +-
 .../WhereClauseFromScopeBuilderShould.java    | 122 ------------------
 .../WhereClauseFromScopeBuilderShould.kt      | 120 +++++++++++++++++
 17 files changed, 176 insertions(+), 200 deletions(-)
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt
index fae486d3c2..7686d9ce47 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTrackerMockIntegrationShould.kt
@@ -190,7 +190,7 @@ internal abstract class BaseLocalAnalyticsTrackerMockIntegrationShould : BaseLoc
         val events = getEventRepositoryByTEDV(tedvCount)
             .byEnrollmentUid().isNotNull
             .blockingGet()
-        val enrollmentUids = events.groupBy { it.enrollment() }.keys
+        val enrollmentUids = events.groupBy { it.enrollment() }.keys.mapNotNull { it }
 
         val enrollments = d2.enrollmentModule().enrollments()
             .byUid().`in`(enrollmentUids)
@@ -229,7 +229,7 @@ internal abstract class BaseLocalAnalyticsTrackerMockIntegrationShould : BaseLoc
                 .byValue().like("a")
                 .blockingGet()
             tedv.map { it.event() }
-        }
+        }.mapNotNull { it }
 
         return d2.eventModule().events()
             .byUid().`in`(eventsList.toSet())
@@ -246,7 +246,7 @@ internal abstract class BaseLocalAnalyticsTrackerMockIntegrationShould : BaseLoc
                 .byValue().like("a")
                 .blockingGet()
             teav.map { it.trackedEntityInstance() }
-        }
+        }.mapNotNull { it }
 
         return d2.trackedEntityModule().trackedEntityInstances()
             .byUid().`in`(teisList.toSet())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 4a7ee669b2..5c5f194f41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -72,29 +72,27 @@ open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectio
         return cf.date(IdentifiableColumns.LAST_UPDATED)
     }
 
-    // TODO: should direction be nullable and thus, use a default value?
-
-    fun orderByUid(direction: OrderByDirection?): R {
+    fun orderByUid(direction: OrderByDirection): R {
         return cf.withOrderBy(IdentifiableColumns.UID, direction)
     }
 
-    fun orderByCode(direction: OrderByDirection?): R {
+    fun orderByCode(direction: OrderByDirection): R {
         return cf.withOrderBy(IdentifiableColumns.CODE, direction)
     }
 
-    fun orderByName(direction: OrderByDirection?): R {
+    fun orderByName(direction: OrderByDirection): R {
         return cf.withOrderBy(IdentifiableColumns.NAME, direction)
     }
 
-    fun orderByDisplayName(direction: OrderByDirection?): R {
+    fun orderByDisplayName(direction: OrderByDirection): R {
         return cf.withOrderBy(IdentifiableColumns.DISPLAY_NAME, direction)
     }
 
-    fun orderByCreated(direction: OrderByDirection?): R {
+    fun orderByCreated(direction: OrderByDirection): R {
         return cf.withOrderBy(IdentifiableColumns.CREATED, direction)
     }
 
-    fun orderByLastUpdated(direction: OrderByDirection?): R {
+    fun orderByLastUpdated(direction: OrderByDirection): R {
         return cf.withOrderBy(IdentifiableColumns.LAST_UPDATED, direction)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 533b163a24..530242cd90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -64,20 +64,19 @@ internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyColl
         return cf.string(NameableColumns.DISPLAY_DESCRIPTION)
     }
 
-    // TODO: should direction be nullable and thus, use a default value?
-    fun orderByShortName(direction: OrderByDirection?): R {
+    fun orderByShortName(direction: OrderByDirection): R {
         return cf.withOrderBy(NameableColumns.SHORT_NAME, direction)
     }
 
-    fun orderByShortDisplayName(direction: OrderByDirection?): R {
+    fun orderByShortDisplayName(direction: OrderByDirection): R {
         return cf.withOrderBy(NameableColumns.DISPLAY_SHORT_NAME, direction)
     }
 
-    fun orderByDescription(direction: OrderByDirection?): R {
+    fun orderByDescription(direction: OrderByDirection): R {
         return cf.withOrderBy(NameableColumns.DESCRIPTION, direction)
     }
 
-    fun orderByDisplayDescription(direction: OrderByDirection?): R {
+    fun orderByDisplayDescription(direction: OrderByDirection): R {
         return cf.withOrderBy(NameableColumns.DISPLAY_DESCRIPTION, direction)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index e70373cc7a..f7db5e0712 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -82,7 +82,7 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
      * @param uid to compare
      * @return the ReadOnlyObjectRepository
      */
-    override fun uid(uid: String): ReadOnlyObjectRepository<T> {
+    override fun uid(uid: String?): ReadOnlyObjectRepository<T> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
         return ReadOnlyWithTransformerObjectRepositoryImpl(store, childrenAppenders, updatedScope, transformer)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index ec41a31ffa..6596774b78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -51,7 +51,7 @@ open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepo
      * @param uid to compare
      * @return the ReadOnlyObjectRepository
      */
-    override fun uid(uid: String): ReadOnlyOneObjectRepositoryFinalImpl<M> {
+    override fun uid(uid: String?): ReadOnlyOneObjectRepositoryFinalImpl<M> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
         return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, updatedScope)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
index c7455e5066..51dc5475d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 
 abstract class AbstractFilterConnector<R : BaseRepository, V>(
     private val repositoryFactory: BaseRepositoryFactory<R>,
-    private val scope: RepositoryScope,
+    protected val scope: RepositoryScope,
     val key: String
 ) {
     abstract fun wrapValue(value: V?): String?
@@ -49,7 +49,7 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
         )
     }
 
-    fun newWithWrappedScope(operator: FilterItemOperator?, value: V): R {
+    fun newWithWrappedScope(operator: FilterItemOperator?, value: V?): R {
         return repositoryFactory.updated(updatedUnwrappedScope(operator, wrapValue(value)))
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
index fee00582e4..8ee3005128 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
@@ -35,10 +35,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 
 abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
-    scope: RepositoryScope?,
-    key: String?
+    scope: RepositoryScope,
+    key: String
 ) : AbstractFilterConnector<R, V>(
-    repositoryFactory, scope!!, key!!
+    repositoryFactory, scope, key
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
@@ -46,7 +46,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      * @param value value to compare with the target field
      * @return the new repository
      */
-    fun eq(value: V): R {
+    fun eq(value: V?): R {
         return newWithWrappedScope(FilterItemOperator.EQ, value)
     }
 
@@ -56,7 +56,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      * @param value value to compare with the target field
      * @return the new repository
      */
-    fun neq(value: V): R {
+    fun neq(value: V?): R {
         return newWithWrappedScope(FilterItemOperator.NOT_EQ, value)
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
index d76933f2f9..d4acc6a86b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 class EqFilterConnector<R : BaseRepository, T> internal constructor(
     private val repositoryFactory: ScopedRepositoryFilterFactory<R, T>
 ) {
-    fun eq(value: T): R {
+    fun eq(value: T?): R {
         return repositoryFactory.updated(value)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
index f96f4f0b68..4622e20c29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -121,7 +121,7 @@ class FilterConnectorFactory<R : BaseRepository>(
         externalLink: String,
         ownLink: String,
         direction: OrderByDirection,
-        additionalWhereClause: String?
+        additionalWhereClause: String? = null
     ): R {
         val connectedAdditionalWhere = if (additionalWhereClause == null) "" else " AND $additionalWhereClause"
         val column = String.format(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
index 2509ff0be0..8a44551ad5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
@@ -39,12 +39,12 @@ import org.hisp.dhis.android.core.event.EventDataFilter
 internal class ScopedFilterConnectorFactory<R : BaseRepository, S : BaseScope>(
     private val repositoryFactory: ScopedRepositoryFactory<R, S>
 ) {
-    fun <T> eqConnector(baseScopeFactory: BaseScopeFactory<S, T>): EqFilterConnector<R, T> {
-        return EqFilterConnector { value: T -> repositoryFactory.updated(baseScopeFactory.updated(value)) }
+    fun <T> eqConnector(baseScopeFactory: BaseScopeFactory<S, T?>): EqFilterConnector<R, T> {
+        return EqFilterConnector { value: T? -> repositoryFactory.updated(baseScopeFactory.updated(value)) }
     }
 
     fun <T> listConnector(baseScopeFactory: BaseScopeFactory<S, List<T>>): ListFilterConnector<R, T> {
-        return ListFilterConnector { list: List<T>? -> repositoryFactory.updated(baseScopeFactory.updated(list!!)) }
+        return ListFilterConnector { list: List<T> -> repositoryFactory.updated(baseScopeFactory.updated(list)) }
     }
 
     fun booleanConnector(baseScopeFactory: BaseScopeFactory<S, Boolean>): BoolFilterConnector<R> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
index a7cbbc7f18..33cc58a437 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
@@ -45,25 +45,23 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
     }
 
     fun inLinkTable(
-        linkTable: String?,
-        linkParent: String?,
-        linkChild: String?,
-        children: List<String?>?
+        linkTable: String,
+        linkParent: String,
+        linkChild: String,
+        children: List<String>
     ): R {
         val clauseBuilder = WhereClauseBuilder().appendInKeyStringValues(linkChild, children)
         return inTableWhere(linkTable, linkParent, clauseBuilder)
     }
 
     fun inTableWhere(
-        linkTable: String?,
-        linkParent: String?,
+        linkTable: String,
+        linkParent: String,
         clauseBuilder: WhereClauseBuilder
     ): R {
         return newWithWrappedScope(
             FilterItemOperator.IN,
-            "(" + String.format(
-                "SELECT DISTINCT %s FROM %s WHERE %s", linkParent, linkTable, clauseBuilder.build()
-            ) + ")"
+            "(SELECT DISTINCT $linkParent FROM $linkTable WHERE ${clauseBuilder.build()})"
         )
     }
     @SuppressWarnings("LongParameterList")
@@ -77,16 +75,11 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
         children: List<String>
     ): R {
         val innerClauseBuilder = WhereClauseBuilder().appendInKeyStringValues(linkChild2, children)
-        val innerClause = String.format(
-            "SELECT DISTINCT %s FROM %s WHERE %s",
-            linkParent2, linkTable2, innerClauseBuilder.build()
-        )
+        val innerClause = "SELECT DISTINCT $linkParent2 FROM $linkTable2 WHERE ${innerClauseBuilder.build()}"
         val whereClause = "$linkChild1 IN ($innerClause)"
         return newWithWrappedScope(
             FilterItemOperator.IN,
-            String.format(
-                "( SELECT DISTINCT %s FROM %s WHERE %s )", linkParent1, linkTable1, whereClause
-            )
+            "(SELECT DISTINCT $linkParent1 FROM $linkTable1 WHERE $whereClause)"
         )
     }
 
@@ -96,28 +89,17 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
         linkChild: String,
         children: List<String>
     ): R {
-        var repositoryScope: RepositoryScope? = null
-        for (child in children) {
+        val repositoryScope = children.foldRight(scope) { child: String, scope: RepositoryScope ->
             val clause = WhereClauseBuilder().appendKeyStringValue(linkChild, child).build()
-            val value = "(" + String.format(
-                "SELECT %s FROM %s WHERE %s ",
-                linkParent,
-                linkTable,
-                clause
-            ) + ")"
-            repositoryScope = if (repositoryScope == null) updatedUnwrappedScope(
-                FilterItemOperator.IN,
-                value
-            ) else updatePassedScope(FilterItemOperator.IN, value, repositoryScope)
+            val subClause = "(SELECT $linkParent FROM $linkTable WHERE $clause)"
+
+            updatePassedScope(FilterItemOperator.IN, subClause, scope)
         }
-        return newWithPassedScope(
-            FilterItemOperator.IN,
-            "(" + String.format(
-                "SELECT %s FROM %s WHERE 1 GROUP BY %s HAVING COUNT(*) = %s ",
-                linkParent, linkTable, linkParent, children.size
-            ) + ")",
-            repositoryScope
-        )
+
+        val exactCountSubClause =
+            "(SELECT $linkParent FROM $linkTable WHERE 1 GROUP BY $linkParent HAVING COUNT(*) = ${children.size})"
+
+        return newWithPassedScope(FilterItemOperator.IN, exactCountSubClause, repositoryScope)
     }
 
     fun rawSubQuery(operator: FilterItemOperator, subQuery: String): R {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
index 13d7f91959..9b543a065b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/BaseScopeFactory.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
 import org.hisp.dhis.android.core.arch.repositories.scope.BaseScope
 
-interface BaseScopeFactory<S : BaseScope, I> {
+internal fun interface BaseScopeFactory<S : BaseScope, I> {
     fun updated(item: I): S
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
index 25a6ae100b..108675be8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
@@ -30,16 +30,16 @@ package org.hisp.dhis.android.core.arch.repositories.scope.internal
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 
-object RepositoryScopeHelper {
+internal object RepositoryScopeHelper {
     @JvmStatic
     fun withFilterItem(scope: RepositoryScope, item: RepositoryScopeFilterItem): RepositoryScope {
-        val copiedItems: MutableList<RepositoryScopeFilterItem> = ArrayList(scope.filters())
-        copiedItems.add(item)
-        return scope.toBuilder().filters(copiedItems).build()
+        return scope.toBuilder()
+            .filters(scope.filters() + item)
+            .build()
     }
 
     @JvmStatic
-    fun withUidFilterItem(scope: RepositoryScope, uid: String): RepositoryScope {
+    fun withUidFilterItem(scope: RepositoryScope, uid: String?): RepositoryScope {
         val filterItem = RepositoryScopeFilterItem.builder()
             .key(IdentifiableColumns.UID)
             .operator(FilterItemOperator.EQ)
@@ -52,10 +52,9 @@ object RepositoryScopeHelper {
         scope: RepositoryScope,
         item: RepositoryScopeComplexFilterItem
     ): RepositoryScope {
-        val copiedItems: MutableList<RepositoryScopeComplexFilterItem> =
-            ArrayList(scope.complexFilters())
-        copiedItems.add(item)
-        return scope.toBuilder().complexFilters(copiedItems).build()
+        return scope.toBuilder()
+            .complexFilters(scope.complexFilters() + item)
+            .build()
     }
 
     fun withChild(scope: RepositoryScope, child: String?): RepositoryScope {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
index 4e59b0b7fd..914ee6e33b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
@@ -60,6 +60,6 @@ class DataStoreDownloader @Inject internal constructor(
     }
 
     fun byNamespace(): ListFilterConnector<DataStoreDownloader, String> {
-        return connectorFactory.listConnector { list -> params.copy(namespaces = list) }
+        return connectorFactory.listConnector { list -> params.copy(namespaces = list ?: emptyList()) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
index 617dafbb61..d6fc51801b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
@@ -93,7 +93,7 @@ internal class FileResourceRoutine @Inject constructor(
             add(Calendar.HOUR_OF_DAY, -2)
         }
         val fileResources = fileResourceCollectionRepository
-            .byUid().notIn(fileResourceUids.toString())
+            .byUid().notIn(fileResourceUids.mapNotNull { it })
             .byDomain().eq(FileResourceDomain.DATA_VALUE)
             .byLastUpdated().before(after ?: calendar.time)
             .blockingGet()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java
deleted file mode 100644
index ca3cd6ca1c..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.scope;
-
-import com.google.common.collect.Lists;
-
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Collections;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(JUnit4.class)
-public class WhereClauseFromScopeBuilderShould {
-
-    @Mock
-    private WhereClauseBuilder builder;
-
-    private RepositoryScopeFilterItem eqItem = RepositoryScopeFilterItem.builder().key("k1").operator(FilterItemOperator.EQ).value("v1").build();
-    private RepositoryScopeFilterItem likeItem = RepositoryScopeFilterItem.builder().key("k2").operator(FilterItemOperator.LIKE).value("v2").build();
-
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void build_where_statement_for_equals_key_value() {
-        WhereClauseFromScopeBuilder scopeBuilder = new WhereClauseFromScopeBuilder(builder);
-        List<RepositoryScopeFilterItem> filterItems = Collections.singletonList(eqItem);
-        scopeBuilder.getWhereClause(scopeForItems(filterItems));
-        verify(builder).appendKeyOperatorValue(eqItem.key(), eqItem.operator().getSqlOperator(), eqItem.value());
-        verify(builder).build();
-        verifyNoMoreInteractions(builder);
-    }
-
-    @Test
-    public void build_where_statement_for_like_key_value() {
-        WhereClauseFromScopeBuilder scopeBuilder = new WhereClauseFromScopeBuilder(builder);
-        List<RepositoryScopeFilterItem> filterItems = Collections.singletonList(likeItem);
-        scopeBuilder.getWhereClause(scopeForItems(filterItems));
-        verify(builder).appendKeyOperatorValue(likeItem.key(), likeItem.operator().getSqlOperator(), likeItem.value());
-        verify(builder).build();
-        verifyNoMoreInteractions(builder);
-    }
-
-    @Test
-    public void build_where_statement_for_eq_and_like_key_value() {
-        WhereClauseFromScopeBuilder scopeBuilder = new WhereClauseFromScopeBuilder(builder);
-        List<RepositoryScopeFilterItem> filterItems = Lists.newArrayList(eqItem, likeItem);
-        scopeBuilder.getWhereClause(scopeForItems(filterItems));
-        verify(builder).appendKeyOperatorValue(eqItem.key(), eqItem.operator().getSqlOperator(), eqItem.value());
-        verify(builder).appendKeyOperatorValue(likeItem.key(), likeItem.operator().getSqlOperator(), likeItem.value());
-        verify(builder).build();
-        verifyNoMoreInteractions(builder);
-    }
-
-
-    @Test
-    public void build_where_statement_when_no_filters_on_empty_builder() {
-        WhereClauseFromScopeBuilder scopeBuilder = new WhereClauseFromScopeBuilder(builder);
-        when(builder.isEmpty()).thenReturn(true);
-        String result = scopeBuilder.getWhereClause(scopeForItems(Collections.emptyList()));
-        assertThat(result).isEqualTo("1");
-        verify(builder).isEmpty();
-        verifyNoMoreInteractions(builder);
-    }
-
-    @Test
-    public void build_where_statement_when_no_filters_on_non_empty_builder() {
-        WhereClauseFromScopeBuilder scopeBuilder = new WhereClauseFromScopeBuilder(builder);
-        when(builder.isEmpty()).thenReturn(false);
-        scopeBuilder.getWhereClause(scopeForItems(Collections.emptyList()));
-        verify(builder).isEmpty();
-        verify(builder).build();
-        verifyNoMoreInteractions(builder);
-    }
-
-    private RepositoryScope scopeForItems(List<RepositoryScopeFilterItem> items) {
-        return RepositoryScope.empty().toBuilder().filters(items).build();
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.kt
new file mode 100644
index 0000000000..b110b93789
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/scope/WhereClauseFromScopeBuilderShould.kt
@@ -0,0 +1,120 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.repositories.scope
+
+import com.google.common.collect.Lists
+import com.google.common.truth.Truth.assertThat
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class WhereClauseFromScopeBuilderShould {
+    private val builder: WhereClauseBuilder = mock()
+
+    private val eqItem =
+        RepositoryScopeFilterItem.builder().key("k1").operator(FilterItemOperator.EQ).value("v1").build()
+    private val likeItem =
+        RepositoryScopeFilterItem.builder().key("k2").operator(FilterItemOperator.LIKE).value("v2").build()
+
+    @Test
+    fun build_where_statement_for_equals_key_value() {
+        val scopeBuilder = WhereClauseFromScopeBuilder(builder)
+        val filterItems = listOf(eqItem)
+        whenever(builder.build()).doReturn("1")
+
+        scopeBuilder.getWhereClause(scopeForItems(filterItems))
+        verify(builder).appendKeyOperatorValue(eqItem.key(), eqItem.operator().sqlOperator, eqItem.value())
+        verify(builder).build()
+        verifyNoMoreInteractions(builder)
+    }
+
+    @Test
+    fun build_where_statement_for_like_key_value() {
+        val scopeBuilder = WhereClauseFromScopeBuilder(builder)
+        val filterItems = listOf(likeItem)
+        whenever(builder.build()).doReturn("1")
+
+        scopeBuilder.getWhereClause(scopeForItems(filterItems))
+        verify(builder)
+            .appendKeyOperatorValue(likeItem.key(), likeItem.operator().sqlOperator, likeItem.value())
+        verify(builder).build()
+        verifyNoMoreInteractions(builder)
+    }
+
+    @Test
+    fun build_where_statement_for_eq_and_like_key_value() {
+        val scopeBuilder = WhereClauseFromScopeBuilder(builder)
+        val filterItems: List<RepositoryScopeFilterItem> = Lists.newArrayList(eqItem, likeItem)
+        whenever(builder.build()).doReturn("1")
+
+        scopeBuilder.getWhereClause(scopeForItems(filterItems))
+        verify(builder).appendKeyOperatorValue(eqItem.key(), eqItem.operator().sqlOperator, eqItem.value())
+        verify(builder)
+            .appendKeyOperatorValue(likeItem.key(), likeItem.operator().sqlOperator, likeItem.value())
+        verify(builder).build()
+        verifyNoMoreInteractions(builder)
+    }
+
+    @Test
+    fun build_where_statement_when_no_filters_on_empty_builder() {
+        val scopeBuilder = WhereClauseFromScopeBuilder(builder)
+        whenever(builder.isEmpty).doReturn(true)
+        whenever(builder.build()).doReturn("1")
+
+        val result = scopeBuilder.getWhereClause(scopeForItems(emptyList()))
+        assertThat(result).isEqualTo("1")
+        verify(builder).isEmpty
+        verifyNoMoreInteractions(builder)
+    }
+
+    @Test
+    fun build_where_statement_when_no_filters_on_non_empty_builder() {
+        val scopeBuilder = WhereClauseFromScopeBuilder(builder)
+        whenever(builder.isEmpty).doReturn(false)
+        whenever(builder.build()).doReturn("1")
+
+        scopeBuilder.getWhereClause(scopeForItems(emptyList()))
+        verify(builder).isEmpty
+        verify(builder).build()
+        verifyNoMoreInteractions(builder)
+    }
+
+    private fun scopeForItems(items: List<RepositoryScopeFilterItem>): RepositoryScope {
+        return RepositoryScope.empty().toBuilder().filters(items).build()
+    }
+}

From 4e0a749c26d7863ec1f366a7f711fcee25be7f02 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 12:38:59 +0200
Subject: [PATCH 174/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections to ProgramConfigurationSetting pojo

---
 .../core/settings/ProgramConfigurationSetting.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
index bf376b6ccf..e4d289dfdd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
@@ -52,6 +52,12 @@ public abstract class ProgramConfigurationSetting implements CoreObject, ObjectW
     @Nullable
     public abstract  Boolean optionalSearch();
 
+    @Nullable
+    public abstract  Boolean disableReferrals();
+
+    @Nullable
+    public abstract  Boolean collapsibleSections();
+
     public static ProgramConfigurationSetting create(Cursor cursor) {
         return AutoValue_ProgramConfigurationSetting.createFromCursor(cursor);
     }
@@ -74,6 +80,10 @@ public abstract static class Builder {
 
         public abstract Builder optionalSearch(Boolean optionalSearch);
 
+        public abstract Builder disableReferrals(Boolean disableReferrals);
+
+        public abstract Builder collapsibleSections(Boolean collapsibleSections);
+
         public abstract ProgramConfigurationSetting build();
     }
 }

From f74ed56d077b8d737a1545b4faa7b2adceea11ef Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 12:41:26 +0200
Subject: [PATCH 175/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections to ProgramConfigurationSetting table info

---
 .../core/settings/ProgramConfigurationSettingTableInfo.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
index afb3d80c68..fdc43c7fbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
@@ -54,13 +54,17 @@ public static class Columns extends CoreColumns {
         public static final String UID = IdentifiableColumns.UID;
         public static final String COMPLETION_SPINNER = "completionSpinner";
         public static final String OPTIONAL_SEARCH = "optionalSearch";
+        public static final String DISABLE_REFERRALS = "disableReferrals";
+        public static final String COLLAPSIBLE_SECTIONS = "collapsibleSections";
 
         @Override
         public String[] all() {
             return CollectionsHelper.appendInNewArray(super.all(),
                     UID,
                     COMPLETION_SPINNER,
-                    OPTIONAL_SEARCH
+                    OPTIONAL_SEARCH,
+                    DISABLE_REFERRALS,
+                    COLLAPSIBLE_SECTIONS
             );
         }
     }

From f8591fa73576786d2f3aab14b3e6b7f95413f585 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 12:41:33 +0200
Subject: [PATCH 176/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections to ProgramConfigurationSetting store

---
 .../internal/ProgramConfigurationSettingStoreImpl.kt      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
index 54043d1f61..baec168926 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
@@ -52,18 +52,20 @@ internal class ProgramConfigurationSettingStoreImpl(
 
     companion object {
         private val BINDER =
-            StatementBinder<ProgramConfigurationSetting> { o: ProgramConfigurationSetting, w: StatementWrapper ->
+            StatementBinder { o: ProgramConfigurationSetting, w: StatementWrapper ->
                 w.bind(1, o.uid())
                 w.bind(2, o.completionSpinner())
                 w.bind(3, o.optionalSearch())
+                w.bind(4, o.disableReferrals())
+                w.bind(5, o.collapsibleSections())
             }
 
         private val WHERE_UPDATE_BINDER =
-            WhereStatementBinder<ProgramConfigurationSetting> { _: ProgramConfigurationSetting, _: StatementWrapper ->
+            WhereStatementBinder { _: ProgramConfigurationSetting, _: StatementWrapper ->
             }
 
         private val WHERE_DELETE_BINDER =
-            WhereStatementBinder<ProgramConfigurationSetting> { _: ProgramConfigurationSetting, _: StatementWrapper ->
+            WhereStatementBinder { _: ProgramConfigurationSetting, _: StatementWrapper ->
             }
     }
 }

From 84ea7490ac73b681d7fddf28f4c49383f0c837d9 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 12:43:46 +0200
Subject: [PATCH 177/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections to appearance_settings_v2.json

---
 .../resources/settings/appearance_settings_v2.json   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/sharedTest/resources/settings/appearance_settings_v2.json b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
index 7e8a30f49a..02c60f565a 100644
--- a/core/src/sharedTest/resources/settings/appearance_settings_v2.json
+++ b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
@@ -129,16 +129,22 @@
   },
   "programConfiguration": {
     "globalSettings": {
-      "completionSpinner": "true"
+      "completionSpinner": "true",
+      "disableReferrals": "true",
+      "collapsibleSections": "false"
     },
     "specificSettings": {
       "IpHINAT79UW": {
         "completionSpinner": "true",
-        "optionalSearch": "true"
+        "optionalSearch": "true",
+        "disableReferrals": "true",
+        "collapsibleSections": "false"
       },
       "IpHINAT79UQ": {
         "completionSpinner": "true",
-        "optionalSearch": "true"
+        "optionalSearch": "true",
+        "disableReferrals": "false",
+        "collapsibleSections": "true"
       }
     }
   }

From 37b192ed5b3073962491e1cfe8a71f1e6beadbe7 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 12:44:17 +0200
Subject: [PATCH 178/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections to ProgramConfigurationSettingSamples

---
 .../core/data/settings/ProgramConfigurationSettingSamples.java  | 2 ++
 .../android/core/settings/ProgramConfigurationSettingSamples.kt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java
index 6572b29fe2..fa6bf8fcb9 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java
@@ -38,6 +38,8 @@ public static ProgramConfigurationSetting get() {
                 .uid("aBcDeFg")
                 .completionSpinner(true)
                 .optionalSearch(true)
+                .disableReferrals(true)
+                .collapsibleSections(true)
                 .build();
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
index 028267c5ad..e0da682d71 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
@@ -35,6 +35,8 @@ object ProgramConfigurationSettingSamples {
             .uid("aBcDeFg")
             .completionSpinner(true)
             .optionalSearch(true)
+            .disableReferrals(true)
+            .collapsibleSections(true)
             .build()
     }
 }

From b54b0f875201b2af956350056f7f360371db67cd Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 12:48:31 +0200
Subject: [PATCH 179/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections migration and snapshot

---
 core/src/main/assets/migrations/149.sql                       | 4 ++++
 core/src/main/assets/snapshots/snapshot.sql                   | 2 +-
 .../core/arch/db/access/internal/BaseDatabaseOpenHelper.kt    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 core/src/main/assets/migrations/149.sql

diff --git a/core/src/main/assets/migrations/149.sql b/core/src/main/assets/migrations/149.sql
new file mode 100644
index 0000000000..a4cf763523
--- /dev/null
+++ b/core/src/main/assets/migrations/149.sql
@@ -0,0 +1,4 @@
+# Add disableReferrals and collapsibleSections in ProgramConfigurationSetting table (ANDROSDK-1723 and ANDROSDK-1724)
+
+ALTER TABLE ProgramConfigurationSetting ADD COLUMN disableReferrals INTEGER;
+ALTER TABLE ProgramConfigurationSetting ADD COLUMN collapsibleSections INTEGER;
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index 85c8346ead..d211884d76 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -84,7 +84,7 @@ CREATE TABLE DataSetSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNI
 CREATE TABLE ProgramSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNIQUE, name TEXT, lastUpdated TEXT, teiDownload INTEGER, teiDBTrimming INTEGER, eventsDownload INTEGER, eventsDBTrimming INTEGER, updateDownload TEXT, updateDBTrimming TEXT, settingDownload TEXT, settingDBTrimming TEXT, enrollmentDownload TEXT, enrollmentDBTrimming TEXT, eventDateDownload TEXT, eventDateDBTrimming TEXT, enrollmentDateDownload TEXT, enrollmentDateDBTrimming TEXT, FOREIGN KEY (uid) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE SynchronizationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSync TEXT, metadataSync TEXT, trackerImporterVersion TEXT, trackerExporterVersion TEXT, fileMaxLengthBytes INTEGER);
 CREATE TABLE FilterSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, scope TEXT, filterType TEXT, uid TEXT, sort INTEGER, filter INTEGER);
-CREATE TABLE ProgramConfigurationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, completionSpinner INTEGER, optionalSearch INTEGER);
+CREATE TABLE ProgramConfigurationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, completionSpinner INTEGER, optionalSearch INTEGER, disableReferrals INTEGER, collapsibleSections INTEGER);
 CREATE TABLE AnalyticsTeiSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, name TEXT NOT NULL, shortName TEXT NOT NULL, program TEXT NOT NULL, programStage TEXT, period TEXT, type TEXT NOT NULL, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE AnalyticsTeiDataElement (_id INTEGER PRIMARY KEY AUTOINCREMENT, teiSetting TEXT NOT NULL, whoComponent TEXT, programStage TEXT, dataElement TEXT NOT NULL, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (teiSetting) REFERENCES AnalyticsTeiSetting (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE AnalyticsTeiIndicator (_id INTEGER PRIMARY KEY AUTOINCREMENT, teiSetting TEXT NOT NULL, whoComponent TEXT, programStage TEXT, indicator TEXT NOT NULL, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (indicator) REFERENCES ProgramIndicator (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (teiSetting) REFERENCES AnalyticsTeiSetting (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index 5c6147a93d..eb16508388 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -59,6 +59,6 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     }
 
     companion object {
-        const val VERSION = 148
+        const val VERSION = 149
     }
 }

From a98a5dfd7823a501c61077885cbb0609b81de161 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 13:21:12 +0200
Subject: [PATCH 180/478] [ANDROSDK-1723-1724] Add disableReferrals and
 collapsibleSections mock integration tests

---
 ...ObjectRepositoryMockIntegrationShould.java | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
index 635722db0c..636aa8f739 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
@@ -109,4 +109,32 @@ public void should_return_completion_spinner_settings_for_specific_uid() {
         assertThat(completionSpinner.uid()).isEqualTo(UID);
         assertThat(completionSpinner.visible()).isEqualTo(true);
     }
+
+    @Test
+    public void should_return_disable_referrals_settings() {
+        ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting();
+        assertThat(setting.disableReferrals()).isEqualTo(true);
+
+        String UID = "IpHINAT79UW";
+        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
+        assertThat(setting.disableReferrals()).isEqualTo(true);
+
+        UID = "IpHINAT79UQ";
+        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
+        assertThat(setting.disableReferrals()).isEqualTo(false);
+    }
+
+    @Test
+    public void should_return_collapsibleSections_settings() {
+        ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting();
+        assertThat(setting.collapsibleSections()).isEqualTo(false);
+
+        String UID = "IpHINAT79UW";
+        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
+        assertThat(setting.collapsibleSections()).isEqualTo(false);
+
+        UID = "IpHINAT79UQ";
+        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
+        assertThat(setting.collapsibleSections()).isEqualTo(true);
+    }
 }

From c6eb860d205eaa88c924c21c1c484f227b170b68 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 23 Aug 2023 13:54:48 +0200
Subject: [PATCH 181/478] [ANDROSDK-1717_REFACTOR_REPOSITORIES] Adjust
 nullability

---
 .../ReadOnlyIdentifiableCollectionRepositoryImpl.kt  | 12 ++++++------
 .../ReadOnlyNameableCollectionRepositoryImpl.kt      |  8 ++++----
 .../filters/internal/AbstractFilterConnector.kt      |  9 +++------
 .../filters/internal/BaseAbstractFilterConnector.kt  | 12 ++++++------
 .../filters/internal/BaseStringFilterConnector.kt    |  4 ++--
 .../filters/internal/BaseSubQueryFilterConnector.kt  |  6 ++----
 .../filters/internal/BooleanFilterConnector.kt       |  2 +-
 .../filters/internal/DateFilterConnector.kt          |  4 ++--
 .../filters/internal/DeletedFilterConnector.kt       |  6 +-----
 .../filters/internal/DoubleFilterConnector.kt        |  4 ++--
 .../filters/internal/EnumFilterConnector.kt          |  4 ++--
 .../filters/internal/FilterConnectorFactory.kt       |  2 +-
 .../filters/internal/IntegerFilterConnector.kt       |  4 ++--
 .../filters/internal/LongFilterConnector.kt          |  4 ++--
 .../filters/internal/StringFilterConnector.kt        |  2 +-
 .../filters/internal/ValueSubQueryFilterConnector.kt |  4 ++--
 .../paging/internal/RepositoryPagingConfig.kt        |  2 +-
 .../internal/RepositoryScopeKeyOrderExtractor.kt     |  2 +-
 .../android/core/datastore/DataStoreDownloader.kt    |  2 +-
 .../enrollment/internal/EnrollmentServiceImpl.kt     | 10 ++++------
 .../event/search/EventCollectionRepositoryAdapter.kt |  4 ++--
 .../internal/ProgramIndicatorEngineImpl.kt           |  2 +-
 22 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 5c5f194f41..9c1446f2dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -72,27 +72,27 @@ open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectio
         return cf.date(IdentifiableColumns.LAST_UPDATED)
     }
 
-    fun orderByUid(direction: OrderByDirection): R {
+    fun orderByUid(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.UID, direction)
     }
 
-    fun orderByCode(direction: OrderByDirection): R {
+    fun orderByCode(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.CODE, direction)
     }
 
-    fun orderByName(direction: OrderByDirection): R {
+    fun orderByName(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.NAME, direction)
     }
 
-    fun orderByDisplayName(direction: OrderByDirection): R {
+    fun orderByDisplayName(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.DISPLAY_NAME, direction)
     }
 
-    fun orderByCreated(direction: OrderByDirection): R {
+    fun orderByCreated(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.CREATED, direction)
     }
 
-    fun orderByLastUpdated(direction: OrderByDirection): R {
+    fun orderByLastUpdated(direction: OrderByDirection?): R {
         return cf.withOrderBy(IdentifiableColumns.LAST_UPDATED, direction)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 530242cd90..6ece628960 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -64,19 +64,19 @@ internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyColl
         return cf.string(NameableColumns.DISPLAY_DESCRIPTION)
     }
 
-    fun orderByShortName(direction: OrderByDirection): R {
+    fun orderByShortName(direction: OrderByDirection?): R {
         return cf.withOrderBy(NameableColumns.SHORT_NAME, direction)
     }
 
-    fun orderByShortDisplayName(direction: OrderByDirection): R {
+    fun orderByShortDisplayName(direction: OrderByDirection?): R {
         return cf.withOrderBy(NameableColumns.DISPLAY_SHORT_NAME, direction)
     }
 
-    fun orderByDescription(direction: OrderByDirection): R {
+    fun orderByDescription(direction: OrderByDirection?): R {
         return cf.withOrderBy(NameableColumns.DESCRIPTION, direction)
     }
 
-    fun orderByDisplayDescription(direction: OrderByDirection): R {
+    fun orderByDisplayDescription(direction: OrderByDirection?): R {
         return cf.withOrderBy(NameableColumns.DISPLAY_DESCRIPTION, direction)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
index 51dc5475d0..b97c7e9d16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
@@ -55,7 +55,7 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
 
     fun updatePassedScope(
         operator: FilterItemOperator,
-        valueStr: String,
+        valueStr: String?,
         scope: RepositoryScope
     ): RepositoryScope {
         return RepositoryScopeHelper.withFilterItem(
@@ -65,7 +65,7 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
     }
 
     fun newWithPassedScope(operator: FilterItemOperator, value: V, scope: RepositoryScope): R {
-        return repositoryFactory.updated(updatePassedScope(operator, wrapValue(value)!!, scope))
+        return repositoryFactory.updated(updatePassedScope(operator, wrapValue(value), scope))
     }
 
     private fun updatedUnwrappedScope(whereClause: String): RepositoryScope {
@@ -80,10 +80,7 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
     }
 
     fun getCommaSeparatedValues(values: Collection<V>): String {
-        val wrappedValues: MutableList<String?> = ArrayList()
-        for (v in values) {
-            wrappedValues.add(wrapValue(v))
-        }
+        val wrappedValues = values.map { wrapValue(it) }
         return CollectionsHelper.commaAndSpaceSeparatedCollectionValues(wrappedValues)
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
index 8ee3005128..97fb0d0d4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
@@ -66,10 +66,10 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      * @param values list of values to compare with the target field
      * @return the new repository
      */
-    fun `in`(values: Collection<V>?): R {
+    fun `in`(values: Collection<V>): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
-            "(" + getCommaSeparatedValues(values!!) + ")"
+            "(" + getCommaSeparatedValues(values) + ")"
         )
     }
 
@@ -90,10 +90,10 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      * @param values list of values to compare with the target field
      * @return the new repository
      */
-    fun notIn(values: Collection<V>?): R {
+    fun notIn(values: Collection<V>): R {
         return newWithUnwrappedScope(
             FilterItemOperator.NOT_IN,
-            "(" + getCommaSeparatedValues(values!!) + ")"
+            "(" + getCommaSeparatedValues(values) + ")"
         )
     }
 
@@ -125,8 +125,8 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
 
     companion object {
         @JvmStatic
-        fun escapeQuotes(value: String): String {
-            return value.replace("'".toRegex(), "''")
+        fun escapeQuotes(value: String?): String? {
+            return value?.replace("'".toRegex(), "''")
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
index d5ee885833..73a84abe38 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
@@ -39,7 +39,7 @@ class BaseStringFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory, scope, key
 ) {
 
-    override fun wrapValue(value: String?): String {
-        return escapeQuotes(value!!)
+    override fun wrapValue(value: String?): String? {
+        return escapeQuotes(value)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
index 8ac3ccfef8..c4d61bcb29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
@@ -39,13 +39,11 @@ abstract class BaseSubQueryFilterConnector<R : BaseRepository> internal construc
     key: String,
     private val linkTable: String,
     private val linkParent: String
-) : AbstractFilterConnector<R, String?>(repositoryFactory, scope, key) {
+) : AbstractFilterConnector<R, String>(repositoryFactory, scope, key) {
     protected fun inTableWhere(clauseBuilder: WhereClauseBuilder): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
-            "(" + String.format(
-                "SELECT DISTINCT %s FROM %s WHERE %s", linkParent, linkTable, clauseBuilder.build()
-            ) + ")"
+            "(SELECT DISTINCT $linkParent FROM $linkTable WHERE ${clauseBuilder.build()})"
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
index 2091234851..eaea258108 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
@@ -54,7 +54,7 @@ class BooleanFilterConnector<R : BaseRepository> internal constructor(
         get() = eq(false)
 
     override fun wrapValue(value: Boolean?): String {
-        return if (value!!) {
+        return if (value == true) {
             "1"
         } else {
             "0"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
index dee804a2c5..a447e0063c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
@@ -110,7 +110,7 @@ abstract class DateFilterConnector<R : BaseRepository> internal constructor(
         return inDatePeriods(datePeriods)
     }
 
-    override fun wrapValue(value: Date?): String {
-        return "'${formatter.format(value!!)}'"
+    override fun wrapValue(value: Date?): String? {
+        return value?.let { "'${formatter.format(it)}'" }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
index dfc5143626..ef2f3d5c6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
@@ -54,10 +54,6 @@ class DeletedFilterConnector<R : BaseRepository> internal constructor(
         get() = isNull
 
     override fun wrapValue(value: String?): String? {
-        return if (value == null) {
-            null
-        } else {
-            "'" + escapeQuotes(value) + "'"
-        }
+        return value?.let { "'" + escapeQuotes(it) + "'" }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
index 889eb9afe1..e86ae81039 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
@@ -69,7 +69,7 @@ class DoubleFilterConnector<R : BaseRepository> internal constructor(
         return newWithWrappedScope(FilterItemOperator.GE, value)
     }
 
-    override fun wrapValue(value: Double?): String {
-        return value.toString()
+    override fun wrapValue(value: Double?): String? {
+        return value?.toString()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
index f1313010aa..d164239269 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
@@ -38,7 +38,7 @@ class EnumFilterConnector<R : BaseRepository, E : Enum<E>> internal constructor(
 ) : BaseAbstractFilterConnector<R, E>(
     repositoryFactory, scope, key
 ) {
-    override fun wrapValue(value: E?): String {
-        return "'" + value!!.name + "'"
+    override fun wrapValue(value: E?): String? {
+        return value?.let { "'" + it.name + "'" }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
index 4622e20c29..e6a7759b23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -108,7 +108,7 @@ class FilterConnectorFactory<R : BaseRepository>(
         return repositoryFactory.updated(RepositoryScopeHelper.withChild(scope, child))
     }
 
-    fun withOrderBy(column: String, direction: OrderByDirection): R {
+    fun withOrderBy(column: String, direction: OrderByDirection?): R {
         val item = RepositoryScopeOrderByItem.builder().column(column).direction(direction).build()
         return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item))
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
index f59fd5d0c5..96401adb19 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
@@ -59,7 +59,7 @@ class IntegerFilterConnector<R : BaseRepository> internal constructor(
         return newWithWrappedScope(FilterItemOperator.GT, value)
     }
 
-    override fun wrapValue(value: Int?): String {
-        return value.toString()
+    override fun wrapValue(value: Int?): String? {
+        return value?.toString()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
index 191d24f071..7afbb65fb5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
@@ -59,7 +59,7 @@ class LongFilterConnector<R : BaseRepository> internal constructor(
         return newWithWrappedScope(FilterItemOperator.GT, value)
     }
 
-    override fun wrapValue(value: Long?): String {
-        return value.toString()
+    override fun wrapValue(value: Long?): String? {
+        return value?.toString()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
index 0fa21f2d49..4cc573aec5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
@@ -51,6 +51,6 @@ class StringFilterConnector<R : BaseRepository> internal constructor(
     }
 
     override fun wrapValue(value: String?): String {
-        return "'" + escapeQuotes(value!!) + "'"
+        return "'" + escapeQuotes(value) + "'"
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
index c6d94f19f6..9de154b7ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
@@ -45,7 +45,7 @@ class ValueSubQueryFilterConnector<R : BaseRepository> internal constructor(
     private val dataElementId: String
 ) : BaseSubQueryFilterConnector<R>(repositoryFactory, scope, key, linkTable, linkParent) {
     override fun wrapValue(value: String?): String {
-        return "'" + escapeQuotes(value!!) + "'"
+        return "'" + escapeQuotes(value) + "'"
     }
 
     /**
@@ -119,7 +119,7 @@ class ValueSubQueryFilterConnector<R : BaseRepository> internal constructor(
         return inLinkTable(FilterItemOperator.LIKE, wrapValue("%$value%"))
     }
 
-    private fun inLinkTable(operator: FilterItemOperator, value: String): R {
+    private fun inLinkTable(operator: FilterItemOperator, value: String?): R {
         val clauseBuilder = WhereClauseBuilder()
             .appendKeyOperatorValue(linkChild, operator.sqlOperator, value)
             .appendKeyStringValue(dataElementColumn, dataElementId)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
index a15b6502cc..109998b4b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingConfig.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.repositories.paging.internal
 
 import org.hisp.dhis.android.core.common.CoreColumns
 
-object RepositoryPagingConfig {
+internal object RepositoryPagingConfig {
     const val PAGING_KEY = CoreColumns.ID
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
index 157e2a9996..4a7cd04189 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeKeyOrderExtractor.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.repositories.scope.internal
 
 import android.content.ContentValues
 
-fun interface RepositoryScopeKeyOrderExtractor {
+internal fun interface RepositoryScopeKeyOrderExtractor {
     fun extractKey(contentValues: ContentValues, column: String): String
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
index 914ee6e33b..4e59b0b7fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
@@ -60,6 +60,6 @@ class DataStoreDownloader @Inject internal constructor(
     }
 
     fun byNamespace(): ListFilterConnector<DataStoreDownloader, String> {
-        return connectorFactory.listConnector { list -> params.copy(namespaces = list ?: emptyList()) }
+        return connectorFactory.listConnector { list -> params.copy(namespaces = list) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index 287b4bd3f5..97440a0dfd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -109,13 +109,11 @@ internal class EnrollmentServiceImpl @Inject constructor(
             .map { event: Event -> event.programStage() }
             .toList()
             .flatMap { currentProgramStagesUids: List<String?> ->
-                val repository = enrollmentRepository.uid(enrollmentUid).blockingGet()?.program()?.let {
-                    programStagesCollectionRepository.byProgramUid().eq(
-                        it
-                    ).byAccessDataWrite().isTrue
-                }
+                val repository = programStagesCollectionRepository.byProgramUid().eq(
+                    enrollmentRepository.uid(enrollmentUid).blockingGet()?.program()
+                ).byAccessDataWrite().isTrue
 
-                repository!!.get().toFlowable()
+                repository.get().toFlowable()
                     .flatMapIterable { stages: List<ProgramStage>? -> stages }
                     .filter { programStage: ProgramStage ->
                         !currentProgramStagesUids.contains(programStage.uid()) ||
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
index 78d3c53d2d..0d695f94d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
@@ -61,7 +61,7 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
         scope.assignedUserMode()?.let { repository = applyUserAssignedMode(repository, it) }
         scope.dataFilters().forEach { filter -> repository = applyDataFilter(repository, filter) }
         if (!scope.events().isNullOrEmpty()) {
-            repository = repository.byUid().`in`(scope.events())
+            repository = repository.byUid().`in`(scope.events()!!)
         }
         scope.eventStatus()?.let { repository = repository.byStatus().`in`(it) }
         scope.eventDate()?.let { period ->
@@ -183,7 +183,7 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
         mode: AssignedUserMode
     ): EventCollectionRepository {
         return when (mode) {
-            AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet()?.user()!!)
+            AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet()?.user())
             AssignedUserMode.ANY -> repository.byAssignedUser().isNotNull
             AssignedUserMode.NONE -> repository.byAssignedUser().isNull
             // TODO Not implemented yet
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
index 1ec01477e1..bb83843808 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
@@ -139,7 +139,7 @@ internal class ProgramIndicatorEngineImpl @Inject constructor(
     }
 
     private fun getEnrollmentEvents(enrollment: Enrollment): Map<String, List<Event>> {
-        val programStageUids = programRepository.byProgramUid().eq(enrollment.program()!!).blockingGetUids()
+        val programStageUids = programRepository.byProgramUid().eq(enrollment.program()).blockingGetUids()
 
         return programStageUids.map { programStageUid ->
             val programStageEvents = eventRepository

From d699c3f18cf9adc05eca86066c826d1f58e2c336 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 23 Aug 2023 14:33:22 +0200
Subject: [PATCH 182/478] [ANDROSDK-1723-1724] Adapt AppearanceSettingsV2Should
 test

---
 .../android/core/settings/AppearanceSettingsV2Should.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
index eadd0204a8..90e56d884d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
@@ -81,12 +81,17 @@ public void map_from_json_string() throws IOException, ParseException {
 
         ProgramConfigurationSettings programConfiguration = appearanceSettings.programConfiguration();
         assertThat(programConfiguration.globalSettings().uid()).isNull();
+        assertThat(programConfiguration.globalSettings().completionSpinner()).isEqualTo(true);
+        assertThat(programConfiguration.globalSettings().disableReferrals()).isEqualTo(true);
+        assertThat(programConfiguration.globalSettings().collapsibleSections()).isEqualTo(false);
 
         Map<String, ProgramConfigurationSetting> speficicProgramConfiguration = programConfiguration.specificSettings();
         ProgramConfigurationSetting specificProgramConfiguration = speficicProgramConfiguration.get("IpHINAT79UW");
         assertThat(specificProgramConfiguration.uid()).isNull();
         assertThat(specificProgramConfiguration.completionSpinner()).isEqualTo(true);
         assertThat(specificProgramConfiguration.optionalSearch()).isEqualTo(true);
+        assertThat(specificProgramConfiguration.disableReferrals()).isEqualTo(true);
+        assertThat(specificProgramConfiguration.collapsibleSections()).isEqualTo(false);
 
         // Compatibility backwards
         CompletionSpinnerSetting completionSpinnerSetting = appearanceSettings.completionSpinner();

From 0e4a08d83ddedccc8be2f71899ae573f00d37bb1 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 24 Aug 2023 10:14:51 +0200
Subject: [PATCH 183/478] [ANDROSDK-1717] Remove unnecessary changes

---
 .../core/analytics/linelist/EventLineListServiceImpl.kt     | 2 +-
 .../arch/repositories/children/internal/ChildrenAppender.kt | 2 +-
 .../filters/internal/AbstractFilterConnector.kt             | 6 +++---
 .../filters/internal/BaseAbstractFilterConnector.kt         | 5 ++---
 .../repositories/filters/internal/ListFilterConnector.kt    | 3 +--
 .../repositories/paging/internal/RepositoryDataSource.kt    | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
index 498f1041cd..3721f9ec1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
@@ -147,7 +147,7 @@ internal class EventLineListServiceImpl @Inject constructor(
 
     private fun getEvents(params: EventLineListParams): List<Event> {
         var repoBuilder = eventRepository
-            .byProgramStageUid().eq(params.programStage!!)
+            .byProgramStageUid().eq(params.programStage)
             .orderByTimeline(RepositoryScope.OrderByDirection.ASC)
             .byDeleted().isFalse
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
index d45098fe7b..0d11a36638 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppender.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.children.internal
 
-abstract class ChildrenAppender<M> {
+internal abstract class ChildrenAppender<M> {
     open fun prepareChildren(collection: Collection<M>) {
         /* Method is not abstract since empty action is the default action and we don't want it to
          * be unnecessarily written in every child.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
index b97c7e9d16..fc732cfc35 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
@@ -42,14 +42,14 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
     val key: String
 ) {
     abstract fun wrapValue(value: V?): String?
-    fun updatedUnwrappedScope(operator: FilterItemOperator?, valueStr: String?): RepositoryScope {
+    fun updatedUnwrappedScope(operator: FilterItemOperator, valueStr: String?): RepositoryScope {
         return RepositoryScopeHelper.withFilterItem(
             scope,
             RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build()
         )
     }
 
-    fun newWithWrappedScope(operator: FilterItemOperator?, value: V?): R {
+    fun newWithWrappedScope(operator: FilterItemOperator, value: V?): R {
         return repositoryFactory.updated(updatedUnwrappedScope(operator, wrapValue(value)))
     }
 
@@ -84,7 +84,7 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
         return CollectionsHelper.commaAndSpaceSeparatedCollectionValues(wrappedValues)
     }
 
-    fun newWithUnwrappedScope(operator: FilterItemOperator?, value: String?): R {
+    fun newWithUnwrappedScope(operator: FilterItemOperator, value: String?): R {
         return repositoryFactory.updated(updatedUnwrappedScope(operator, value))
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
index 97fb0d0d4a..7d18b3564f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.Arrays
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -81,7 +80,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      */
     @SafeVarargs
     fun `in`(vararg values: V): R {
-        return `in`(Arrays.asList(*values))
+        return `in`(listOf(*values))
     }
 
     /**
@@ -105,7 +104,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      */
     @SafeVarargs
     fun notIn(vararg values: V): R {
-        return notIn(Arrays.asList(*values))
+        return notIn(listOf(*values))
     }
 
     val isNull: R
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
index d8a8c34528..2988e4531a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.Arrays
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
 class ListFilterConnector<R : BaseRepository, T>
@@ -42,6 +41,6 @@ internal constructor(private val repositoryFactory: ScopedRepositoryFilterFactor
 
     @SafeVarargs
     fun `in`(vararg values: T): R {
-        return `in`(Arrays.asList(*values))
+        return `in`(listOf(*values))
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
index f036a370b5..a1a3a7dd0b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
 
-class RepositoryDataSource<M : CoreObject>(
+class RepositoryDataSource<M : CoreObject> internal constructor(
     private val store: ReadableStore<M>,
     private val scope: RepositoryScope,
     private val childrenAppenders: Map<String, ChildrenAppender<M>>

From bceafaa95f488b445ca9ac90c18831872c9e8e1d Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 24 Aug 2023 11:35:02 +0200
Subject: [PATCH 184/478] [ANDROSDK-1717_REFACTOR_REPOSITORIES] Adjust
 connector nullability

---
 .../collection/internal/BaseRepositoryFactory.kt       |  2 +-
 .../filters/internal/AbstractFilterConnector.kt        | 10 ++++++----
 .../filters/internal/BaseAbstractFilterConnector.kt    |  4 ++--
 .../repositories/filters/internal/EqFilterConnector.kt |  2 +-
 .../filters/internal/EqLikeItemFilterConnector.kt      |  2 +-
 .../filters/internal/FilterConnectorFactory.kt         |  4 ++--
 .../filters/internal/ListFilterConnector.kt            |  4 ++--
 ...erFactory.java => ScopedRepositoryFilterFactory.kt} |  9 ++++-----
 .../filters/internal/StringFilterConnector.kt          |  2 +-
 .../filters/internal/UnwrappedEqInFilterConnector.kt   |  7 +++----
 10 files changed, 23 insertions(+), 23 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/{ScopedRepositoryFilterFactory.java => ScopedRepositoryFilterFactory.kt} (93%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
index 5941857da0..a068dcdd8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryFactory.kt
@@ -30,6 +30,6 @@ package org.hisp.dhis.android.core.arch.repositories.collection.internal
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
-fun interface BaseRepositoryFactory<R : BaseRepository> {
+internal fun interface BaseRepositoryFactory<R : BaseRepository> {
     fun updated(updatedScope: RepositoryScope): R
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
index fc732cfc35..4360cce2c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper
 
-abstract class AbstractFilterConnector<R : BaseRepository, V>(
+abstract class AbstractFilterConnector<R : BaseRepository, V> internal constructor(
     private val repositoryFactory: BaseRepositoryFactory<R>,
     protected val scope: RepositoryScope,
     val key: String
@@ -79,9 +79,11 @@ abstract class AbstractFilterConnector<R : BaseRepository, V>(
         return repositoryFactory.updated(updatedUnwrappedScope(whereClause))
     }
 
-    fun getCommaSeparatedValues(values: Collection<V>): String {
-        val wrappedValues = values.map { wrapValue(it) }
-        return CollectionsHelper.commaAndSpaceSeparatedCollectionValues(wrappedValues)
+    fun getCommaSeparatedValues(values: Collection<V>?): String {
+        return values?.let {
+            val wrappedValues = values.map { wrapValue(it) }
+            CollectionsHelper.commaAndSpaceSeparatedCollectionValues(wrappedValues)
+        } ?: ""
     }
 
     fun newWithUnwrappedScope(operator: FilterItemOperator, value: String?): R {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
index 7d18b3564f..1d34d48e83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
@@ -65,7 +65,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      * @param values list of values to compare with the target field
      * @return the new repository
      */
-    fun `in`(values: Collection<V>): R {
+    fun `in`(values: Collection<V>?): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
             "(" + getCommaSeparatedValues(values) + ")"
@@ -89,7 +89,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
      * @param values list of values to compare with the target field
      * @return the new repository
      */
-    fun notIn(values: Collection<V>): R {
+    fun notIn(values: Collection<V>?): R {
         return newWithUnwrappedScope(
             FilterItemOperator.NOT_IN,
             "(" + getCommaSeparatedValues(values) + ")"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
index d4acc6a86b..0bfc9127f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
 class EqFilterConnector<R : BaseRepository, T> internal constructor(
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, T>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, T?>
 ) {
     fun eq(value: T?): R {
         return repositoryFactory.updated(value)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt
index da08f887ed..1c0e22b5ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
 
-class EqLikeItemFilterConnector<R : BaseRepository?> internal constructor(
+class EqLikeItemFilterConnector<R : BaseRepository> internal constructor(
     private val key: String,
     private val repositoryFactory: ScopedRepositoryFilterFactory<R, RepositoryScopeFilterItem>
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
index e6a7759b23..f932c60d43 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -38,9 +38,9 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 
 @SuppressWarnings("TooManyFunctions")
 
-class FilterConnectorFactory<R : BaseRepository>(
+class FilterConnectorFactory<R : BaseRepository> internal constructor(
     private val scope: RepositoryScope,
-    val repositoryFactory: BaseRepositoryFactory<R>
+    private val repositoryFactory: BaseRepositoryFactory<R>
 ) {
     fun string(key: String): StringFilterConnector<R> {
         return StringFilterConnector(repositoryFactory, scope, key)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
index 2988e4531a..7f3e36be6e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ListFilterConnector.kt
@@ -31,8 +31,8 @@ import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
 class ListFilterConnector<R : BaseRepository, T>
 internal constructor(private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<T>>) {
-    fun eq(value: T): R {
-        return repositoryFactory.updated(listOf(value))
+    fun eq(value: T?): R {
+        return repositoryFactory.updated(value?.let { listOf(it) } ?: emptyList())
     }
 
     fun `in`(values: List<T>): R {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedRepositoryFilterFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedRepositoryFilterFactory.kt
similarity index 93%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedRepositoryFilterFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedRepositoryFilterFactory.kt
index 8d937da229..6dbfee5515 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedRepositoryFilterFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedRepositoryFilterFactory.kt
@@ -25,11 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-package org.hisp.dhis.android.core.arch.repositories.filters.internal;
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
-import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository;
-
-public interface ScopedRepositoryFilterFactory<R extends BaseRepository, T> {
-    R updated(T value);
+internal fun interface ScopedRepositoryFilterFactory<R : BaseRepository, T> {
+    fun updated(value: T): R
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
index 4cc573aec5..9f98f57faa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
@@ -46,7 +46,7 @@ class StringFilterConnector<R : BaseRepository> internal constructor(
      * @param value value to compare with the target field
      * @return the new repository
      */
-    fun like(value: String): R {
+    fun like(value: String?): R {
         return newWithWrappedScope(FilterItemOperator.LIKE, "%$value%")
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
index 12bcc097ad..86957e61db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.Arrays
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -44,11 +43,11 @@ class UnwrappedEqInFilterConnector<R : BaseRepository> internal constructor(
         return value
     }
 
-    fun eq(value: String): R {
+    fun eq(value: String?): R {
         return newWithWrappedScope(FilterItemOperator.EQ, value)
     }
 
-    fun `in`(values: Collection<String>): R {
+    fun `in`(values: Collection<String>?): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
             "(" + getCommaSeparatedValues(values) + ")"
@@ -56,7 +55,7 @@ class UnwrappedEqInFilterConnector<R : BaseRepository> internal constructor(
     }
 
     fun `in`(vararg values: String): R {
-        return `in`(Arrays.asList(*values))
+        return `in`(listOf(*values))
     }
 
     companion object {

From d96b7ff811914797ae97ccd4b31b7841ea1a9ed9 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 24 Aug 2023 13:15:41 +0200
Subject: [PATCH 185/478] [ANDROSDK-1717_REFACTOR_REPOSITORIES] Code smells

---
 .../repositories/filters/internal/FilterConnectorFactory.kt   | 4 ++--
 .../filters/internal/UnwrappedEqInFilterConnector.kt          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
index f932c60d43..68fe6eba2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -132,7 +132,7 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
             ownLink,
             connectedAdditionalWhere
         )
-        val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, column1: String ->
+        val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, _: String ->
             val ownLinkKey = contentValues.getAsString(ownLink)
             String.format(
                 "(SELECT %s FROM %s WHERE %s = '%s' %s)",
@@ -158,7 +158,7 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
         val column = String.format(
             "(CASE WHEN %s %s THEN %s ELSE %s END)", conditionalColumn, condition, ifTrueColumn, ifFalseColumn
         )
-        val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, column1: String ->
+        val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, _: String ->
             val conditionalValue = contentValues.getAsString(conditionalColumn)
             val ifTrueValue = contentValues.getAsString(ifTrueColumn)
             val ifFalseValue = contentValues.getAsString(ifFalseColumn)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
index 86957e61db..82482ea65d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
@@ -68,7 +68,7 @@ class UnwrappedEqInFilterConnector<R : BaseRepository> internal constructor(
                 val list: MutableList<String> = ArrayList(value.length)
                 for (v in values) {
                     val trimmed = v.trim { it <= ' ' }
-                    if (!trimmed.isEmpty()) {
+                    if (trimmed.isNotEmpty()) {
                         list.add(trimmed)
                     }
                 }

From 9c894c279b0a84b456068cb91e85e12a84f34f46 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 23 Aug 2023 17:01:03 +0200
Subject: [PATCH 186/478] [ANDROSDK-1740] update okhttp library

---
 .editorconfig                                 |   2 +-
 build.gradle.kts                              |   8 +-
 core/build.gradle.kts                         |   2 +-
 .../android/core/BaseRealIntegrationTest.kt   |   6 +-
 .../core/MultiUserMockIntegrationShould.kt    |   6 +-
 ...ntDataItemSQLEvaluatorIntegrationShould.kt |  48 ++++-
 ...IndicatorEvaluatorIntegrationBaseShould.kt |   4 +-
 ...gramIndicatorEvaluatorIntegrationShould.kt |  12 +-
 .../AnalyticExpressionEngineFactoryHelper.kt  |   2 +-
 .../EventLineListIntegrationShould.kt         |   2 +-
 ...CategoryComboLinkStoreIntegrationShould.kt |   3 +-
 .../DataStatePropagatorIntegrationShould.kt   |  16 +-
 ...ConfigurationMigrationIntegrationShould.kt |   9 +-
 ...ataObjectStoreAbstractIntegrationShould.kt |   4 +-
 ...bleObjectStoreAbstractIntegrationShould.kt |   4 +-
 ...tionIndicatorLinkStoreIntegrationShould.kt |   3 +-
 .../MetadataCallMockIntegrationShould.kt      |   2 +-
 .../core/event/internal/EventAPIRealShould.kt |   6 +-
 .../core/event/internal/EventCallFactory.kt   |   1 -
 .../EventFilterStoreIntegrationShould.kt      |   3 +-
 .../EventPostCallRealIntegrationShould.kt     |   5 +-
 .../FileResourceCallRealIntegrationShould.kt  |  14 +-
 .../FileResourceStoreIntegrationShould.kt     |   3 +-
 ...mentLegendSetLinkStoreIntegrationShould.kt |   3 +-
 ...icsPeriodBoundaryStoreIntegrationShould.kt |   3 +-
 .../ProgramSectionStoreIntegrationShould.kt   |   3 +-
 ...rBoundariesSQLExecutorIntegrationShould.kt | 124 ++++++++++--
 ...ProgramIndicatorEngineIntegrationShould.kt |  36 ++--
 ...amIndicatorSQLExecutorIntegrationShould.kt | 188 ++++++++++++++----
 .../api/BreakTheGlassAPIShould.kt             |   1 +
 .../api/TrackedEntityInstanceAPIShould.kt     |   4 +-
 .../BasePayloadGeneratorMockIntegration.kt    |   3 +-
 ...tyInstanceCallBaseMockIntegrationShould.kt |  10 +-
 ...ityInstanceFilterStoreIntegrationShould.kt |   3 +-
 .../StockUseCaseStoreIntegrationShould.kt     |   3 +-
 ...seTransactionLinkStoreIntegrationShould.kt |   3 +-
 ...anisationUnitLinkStoreIntegrationShould.kt |   3 +-
 .../UserRoleStoreIntegrationShould.kt         |   3 +-
 .../internal/UserStoreIntegrationShould.kt    |   3 +-
 .../mock/BaseMockIntegrationTest.kt           |   3 +
 .../BaseMockIntegrationTestEmptyDispatcher.kt |   3 +-
 .../BaseMockIntegrationTestEmptyEnqueable.kt  |   3 +-
 ...nTestLocalAnalyticsSuperLargeDispatcher.kt |   3 +-
 ...seMockIntegrationTestMetadataDispatcher.kt |   3 +-
 ...aseMockIntegrationTestMetadataEnqueable.kt |   3 +-
 .../LocalAnalyticsDataGenerator.kt            |  30 ++-
 .../LocalAnalyticsDatabaseFiller.kt           |  10 +-
 .../LocalAnalyticsMetadataGenerator.kt        |  21 +-
 .../tests/BaseLocalAnalyticsTest.kt           |   3 +-
 .../android/realservertests/EnumTestHelper.kt |   4 +-
 .../realservertests/OutsideRetrofitFactory.kt |   4 +-
 ...llectionRepositoryMockIntegrationShould.kt |   7 +-
 ...ueObjectRepositoryMockIntegrationShould.kt |  21 +-
 .../android/core/analytics/LegendEvaluator.kt | 119 ++++++-----
 .../AnalyticsServiceEvaluatorHelper.kt        |   2 +-
 .../AnalyticsVisualizationsService.kt         |   9 +-
 .../evaluator/DataElementSQLEvaluator.kt      |   8 +-
 .../evaluator/EventDataItemSQLEvaluator.kt    |  10 +-
 .../ExpressionDimensionItemEvaluator.kt       |   4 +-
 .../internal/evaluator/IndicatorEvaluator.kt  |   4 +-
 .../evaluator/IndicatorSQLEvaluator.kt        |   4 +-
 .../evaluator/ProgramIndicatorEvaluator.kt    |  11 +-
 .../ProgramIndicatorEvaluatorHelper.kt        |   6 +-
 .../evaluator/ProgramIndicatorSQLEvaluator.kt |   4 +-
 .../AnalyticExpressionEngine.kt               |   2 +-
 .../AnalyticExpressionParserUtils.kt          |   2 +-
 .../linelist/EventLineListServiceImpl.kt      |  13 +-
 .../internal/OpenIDConnectAuthenticator.kt    |   2 +-
 .../api/executors/internal/APIDownloader.kt   |   2 +-
 .../executors/internal/APIDownloaderImpl.kt   |   2 +-
 .../api/executors/internal/APIErrorMapper.kt  |   8 +-
 .../internal/CoroutineAPICallExecutorImpl.kt  |   5 +-
 .../internal/RxAPICallExecutorImpl.kt         |   7 +-
 .../internal/DynamicServerURLInterceptor.kt   |   4 +-
 .../api/paging/internal/ApiPagingEngine.kt    |  20 +-
 .../internal/DatabaseImportExportImpl.kt      |   3 +-
 .../db/stores/internal/LinkChildStoreImpl.kt  |   4 +-
 .../core/arch/db/stores/internal/LinkStore.kt |   1 +
 .../internal/ObjectWithoutUidStoreImpl.kt     |   3 +-
 .../arch/db/stores/internal/ReadableStore.kt  |   3 +-
 .../internal/IdentifiableDataHandlerImpl.kt   |   5 +-
 .../core/arch/helpers/FileResizerHelper.kt    |  29 ++-
 .../helpers/FileResourceDirectoryHelper.kt    |   8 +-
 ...eadOnlyNameableCollectionRepositoryImpl.kt |   5 +-
 ...WithTransformerCollectionRepositoryImpl.kt |   8 +-
 ...dAndTransformerCollectionRepositoryImpl.kt |  10 +-
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |   5 +-
 ...eadWriteWithUidCollectionRepositoryImpl.kt |   5 +-
 .../ReadOnlyOneObjectRepositoryFinalImpl.kt   |   4 +-
 .../internal/ReadOnlyObjectRepositoryImpl.kt  |   3 +-
 ...OnlyWithTransformerObjectRepositoryImpl.kt |   4 +-
 .../RepositoryDataSourceWithTransformer.kt    |  14 +-
 .../category/CategoryOptionComboService.kt    |   2 +-
 .../category/internal/CategoryComboHandler.kt |   3 +-
 ...yOptionOrganisationUnitChildrenAppender.kt |   3 +-
 .../CategoryOptionOrganisationUnitsCall.kt    |   1 -
 .../android/core/common/RelativePeriod.kt     | 179 ++++++++++++-----
 .../internal/DatabaseConfigurationHelper.kt   |   3 +-
 .../internal/MultiUserDatabaseManager.kt      |   5 +-
 .../MultiUserDatabaseManagerForD2Manager.kt   |   4 +-
 .../configuration/internal/ServerUrlParser.kt |   3 +-
 .../internal/DataElementHandler.kt            |   6 +-
 ...ompleteRegistrationCollectionRepository.kt |  22 +-
 .../core/dataset/DataSetNonEditableReason.kt  |   2 +-
 .../internal/DataInputPeriodStoreImpl.kt      |   3 +-
 ...ataSetCompleteRegistrationCallProcessor.kt |   4 +-
 .../DataSetCompleteRegistrationPostCall.kt    |   4 +-
 .../DataSetCompleteRegistrationQuery.kt       |   2 +-
 .../internal/DataSetElementStoreImpl.kt       |   3 +-
 .../core/dataset/internal/DataSetHandler.kt   |   6 +-
 .../internal/DataSetInstanceServiceImpl.kt    |   2 +-
 .../DataSetOrganisationUnitLinkStoreImpl.kt   |   3 +-
 .../SectionDataElementLinkStoreImpl.kt        |   3 +-
 .../SectionGreyedFieldsLinkStoreImpl.kt       |   3 +-
 .../core/dataset/internal/SectionHandler.kt   |   9 +-
 .../core/datastore/DataStoreEntryTableInfo.kt |   2 +-
 .../DataValueCollectionRepository.kt          |  10 +-
 .../AggregatedDataCallBundleFactory.kt        |   5 +-
 .../core/domain/metadata/MetadataCall.kt      |   9 +-
 .../enrollment/internal/EnrollmentHandler.kt  |   4 +-
 .../internal/EnrollmentImportHandler.kt       |  14 +-
 .../internal/EnrollmentServiceImpl.kt         |  21 +-
 .../core/event/internal/EventHandler.kt       |   4 +-
 .../core/event/internal/EventImportHandler.kt |   2 +-
 .../event/internal/EventQueryBundleFactory.kt |   4 +-
 .../EventQueryBundleInternalFactory.kt        |  12 +-
 .../core/event/internal/EventService.kt       |   2 +-
 .../core/event/internal/EventServiceImpl.kt   |   7 +-
 .../core/event/internal/EventStoreImpl.kt     |   3 +-
 .../internal/FileResourceDownloadCall.kt      |   2 -
 .../internal/FileResourcePostCall.kt          |  11 +-
 .../fileresource/internal/FileResourceUtil.kt |   7 +-
 .../imports/internal/TEIWebResponseHandler.kt |   3 +-
 .../InvalidAttributeValueTypeConflict.kt      |   1 -
 .../conflicts/InvalidDataValueConflict.kt     |   1 -
 .../conflicts/MissingAttributeConflict.kt     |   1 -
 .../conflicts/MissingDataElementConflict.kt   |   1 -
 .../conflicts/NonUniqueAttributeConflict.kt   |   1 -
 .../IndicatorLegendSetLinkTableInfo.kt        |   4 +-
 .../DataSetIndicatorEvaluator.kt              |   8 +-
 .../core/legendset/internal/LegendSetCall.kt  |   2 +-
 .../legendset/internal/LegendSetUidsSeeker.kt |   2 +-
 .../legendset/internal/LegendStoreImpl.kt     |   6 +-
 .../core/map/internal/MapPackageDIModule.kt   |   2 +-
 .../core/note/internal/NoteStoreImpl.kt       |   6 +-
 .../dhis/android/core/option/OptionService.kt |   4 +-
 .../android/core/option/OptionServiceImpl.kt  |   4 +-
 .../option/internal/OptionGroupHandler.kt     |   3 +-
 .../internal/OrganisationUnitCall.kt          |  11 +-
 .../internal/OrganisationUnitHandler.kt       |  12 +-
 .../CommonExpressionVisitorScope.kt           |   2 +-
 .../parser/internal/expression/ParserUtils.kt |   2 +-
 .../parser/internal/expression/QueryMods.kt   |   2 +-
 .../internal/service/ExpressionService.kt     |   4 +-
 .../service/ExpressionServiceContext.kt       |   2 +-
 .../core/program/internal/ProgramHandler.kt   |   3 +-
 .../internal/ProgramIndicatorService.kt       |   2 +-
 .../internal/ProgramIndicatorStoreImpl.kt     |   3 +-
 .../internal/ProgramModuleDownloader.kt       |   3 +-
 .../internal/ProgramRuleActionStoreImpl.kt    |   3 +-
 .../program/internal/ProgramRuleStoreImpl.kt  |   3 +-
 .../internal/ProgramRuleVariableStoreImpl.kt  |   3 +-
 .../program/internal/ProgramSectionHandler.kt |   3 +-
 .../internal/ProgramSectionStoreImpl.kt       |   3 +-
 .../ProgramStageDataElementHandler.kt         |   3 +-
 .../program/internal/ProgramStageHandler.kt   |   3 +-
 .../program/internal/ProgramStageStoreImpl.kt |   3 +-
 .../ProgramTrackedEntityAttributeHandler.kt   |   3 +-
 .../ProgramTrackedEntityAttributeStoreImpl.kt |   3 +-
 .../internal/ProgramExpressionItem.kt         |   4 +-
 .../internal/ProgramIndicatorSQLExecutor.kt   |   4 +-
 .../internal/ProgramIndicatorSQLUtils.kt      |   5 +-
 .../internal/function/D2RelationshipCount.kt  |   1 -
 .../internal/function/D2Split.kt              |   4 +-
 .../relationship/RelationshipServiceImpl.kt   |   1 -
 .../RelationshipTypeCollectionRepository.kt   |  11 +-
 .../internal/RelationshipHandler.kt           |   3 +-
 .../internal/RelationshipImportHandler.kt     |   1 -
 .../RelationshipItemChildrenAppender.kt       |   6 +-
 .../internal/RelationshipItemStoreImpl.kt     |   8 +-
 .../AnalyticsDhisVisualizationsHelper.kt      |   1 -
 .../internal/AppearanceSettingCall.kt         |   1 -
 .../settings/internal/SettingsAppHelper.kt    |   2 -
 .../settings/internal/SettingsAppInfoCall.kt  |   3 +-
 .../internal/LocalDbRepositoryImpl.kt         |  12 +-
 .../internal/OngoingSubmissionsStore.kt       |  26 ++-
 ...ckedEntityAttributeReservedValueManager.kt |  36 +++-
 .../NewTrackedEntityEndpointCallFactory.kt    |   7 +-
 .../OldTrackerImporterPayloadGenerator.kt     |   6 +-
 .../internal/TrackedEntityAttributeHandler.kt |   3 +-
 ...ntityAttributeLegendSetChildrenAppender.kt |   2 +-
 .../TrackedEntityAttributeValueStoreImpl.kt   |   3 +-
 .../TrackedEntityDataValueStoreImpl.kt        |   3 +-
 ...ackedEntityInstanceEventFilterStoreImpl.kt |   4 +-
 ...kedEntityInstancePersistenceCallFactory.kt |   4 +-
 .../internal/TrackedEntityTypeHandler.kt      |   3 +-
 .../internal/TrackerQueryBundleFactory.kt     |   4 +-
 .../TrackerQueryBundleInternalFactory.kt      |  12 +-
 .../TrackerQueryFactoryCommonHelper.kt        |   8 +-
 .../internal/TrackerSyncLastUpdatedManager.kt |   7 +-
 .../TrackedEntityInstanceLocalQueryHelper.kt  |  42 ++--
 .../TrackedEntityInstanceQueryCallFactory.kt  |  11 +-
 .../TrackedEntityInstanceQueryDataFetcher.kt  |   6 +-
 .../TrackedEntityInstanceQueryDataSource.kt   |   9 +-
 ...ckedEntityInstanceQueryDataSourceResult.kt |   9 +-
 .../TrackedEntityInstanceQueryOnline.kt       |   2 +-
 .../TrackedEntityInstanceQueryOnlineHelper.kt |  10 +-
 ...ntityInstanceQueryRepositoryScopeHelper.kt |   7 +-
 .../tracker/exporter/TrackerDownloadCall.kt   |  15 +-
 .../internal/JobReportEnrollmentHandler.kt    |   3 +-
 .../internal/JobReportEventHandler.kt         |   3 +-
 .../importer/internal/JobReportHandler.kt     |   4 +-
 .../TrackerImporterBreakTheGlassHelper.kt     |   3 +-
 .../internal/UseCasePackageDIModule.kt        |   2 +-
 .../stock/StockUseCaseCollectionRepository.kt |   2 +-
 .../usecase/stock/StockUseCaseTransaction.kt  |   4 +-
 .../stock/internal/StockUseCaseCall.kt        |   2 +-
 .../stock/internal/StockUseCaseHandler.kt     |   2 +-
 .../StockUseCaseTransactionLinkStoreImpl.kt   |   3 +-
 .../user/internal/AccountManagerHelper.kt     |   2 +-
 .../user/internal/LogInDatabaseManager.kt     |   8 +-
 .../dhis/android/core/util/StringUtils.kt     |  21 +-
 .../engine/internal/ValidationEngineImpl.kt   |   6 +-
 .../engine/internal/ValidationExecutor.kt     |   8 +-
 .../core/visualization/VisualizationAPI36.kt  |   2 +-
 .../VisualizationDimensionItemTableInfo.kt    |   4 +-
 .../internal/VisualizationDimensionFields.kt  |   2 +-
 .../VisualizationDimensionItemFields.kt       |   2 +-
 .../internal/VisualizationFields.kt           |   2 +-
 .../internal/VisualizationModuleWiper.kt      |   2 +-
 .../core/data/datavalue/DataValueSamples.kt   |   1 -
 .../TrackerQueryCommonParamsSamples.kt        |  10 +-
 .../data/utils/FillPropertiesTestUtils.kt     |   3 +
 .../internal/ChunkedSecureStoreShould.kt      |   2 +-
 .../internal/CategoryComboHandlerShould.kt    |   6 +-
 .../internal/TrackerDataManagerShould.kt      |   9 +-
 ...erDatabaseManagerForD2ManagerUnitShould.kt |   5 +-
 .../MultiUserDatabaseManagerUnitShould.kt     |   8 +-
 .../internal/ServerUrlParserShould.kt         |   4 +-
 .../AggregatedDataCallBundleFactoryShould.kt  |  18 +-
 .../domain/metadata/MetadataCallShould.kt     |   2 +-
 .../enrollment/EnrollmentServiceShould.kt     |   2 -
 .../internal/EnrollmentImportHandlerShould.kt |  12 +-
 .../android/core/event/EventServiceShould.kt  |  10 +-
 .../event/internal/EventDateUtilsShould.kt    |   3 +-
 .../event/internal/EventEndpointCallShould.kt |   3 +-
 .../core/event/internal/EventHandlerShould.kt |   9 +-
 .../internal/EventImportHandlerShould.kt      |   6 +-
 .../internal/EventQueryBundleFactoryShould.kt |   3 +-
 .../OrganisationUnitCallUnitShould.kt         |   9 +-
 .../internal/OrganisationUnitHandlerShould.kt |   7 +-
 .../internal/expression/ParserUtilsShould.kt  |   4 +-
 .../service/utils/ExpressionHelperShould.kt   |  14 +-
 .../internal/ProgramModuleDownloaderShould.kt |   4 +-
 .../internal/RelationshipHandlerShould.kt     |   9 +-
 .../RelationshipImportHandlerShould.kt        |   9 +-
 .../AnalyticsTeiSettingHandlerShould.kt       |   7 +-
 ...alyticsTeiWHONutritionDataHandlerShould.kt |   3 +-
 .../SynchronizationSettingCallShould.kt       |   9 +-
 .../SynchronizationSettingsHandlerShould.kt   |   3 +-
 .../internal/WebApiRepositoryImplShould.kt    |  18 +-
 .../internal/SystemInfoCallShould.kt          |   5 +-
 .../TrackedEntityInstanceHandlerShould.kt     |   8 +-
 ...rackedEntityInstanceImportHandlerShould.kt |  22 +-
 ...TrackedEntityInstanceQueryFactoryShould.kt |   9 +-
 .../TrackerQueryCommonParamsSamples.kt        |  10 +-
 .../ownership/OwnershipManagerShould.kt       |   7 +-
 .../TrackedEntityInstanceQueryCallShould.kt   |  12 +-
 ...ckedEntityInstanceQueryDataSourceShould.kt |  72 +++++--
 ...edEntityInstanceQueryOnlineHelperShould.kt |   2 +-
 ...nstanceQueryRepositoryScopeHelperShould.kt |   2 +-
 .../internal/AuthorityEndpointCallShould.kt   |   4 +-
 .../core/user/internal/LogInCallUnitShould.kt |   3 +-
 .../core/user/internal/UserCallShould.kt      |   1 -
 274 files changed, 1621 insertions(+), 698 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index ac530d6325..b0bb4cb9cf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,3 @@
 [*.{kt,kts}]
 max_line_length = 120
-disabled_rules=no-wildcard-imports,no-unit-return
+ktlint_disabled_rules=no-wildcard-imports,no-unit-return
diff --git a/build.gradle.kts b/build.gradle.kts
index 1f960cff47..562907e72e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,10 +11,10 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("com.android.tools.build:gradle:8.1.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-        classpath("org.jlleitschuh.gradle:ktlint-gradle:11.0.0")
-        classpath("org.jacoco:org.jacoco.core:0.8.8")
+        classpath("org.jlleitschuh.gradle:ktlint-gradle:11.5.1")
+        classpath("org.jacoco:org.jacoco.core:0.8.10")
     }
 }
 
@@ -66,7 +66,7 @@ subprojects {
     //version = VERSION_NAME
 
     configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
-        version.set("0.45.2")
+//        version.set("0.45.2")
         android.set(true)
         outputColorName.set("RED")
         reporters {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index c58fd8968b..1400ad0581 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -63,7 +63,7 @@ val jackson = "2.13.4"
 val autoValue = "1.10.2"
 val autoValueCursor = "2.0.1"
 val retrofit = "2.9.0"
-val okHttp = "3.14.9"
+val okHttp = "4.10.0"
 val dagger = "2.47"
 val rxJava = "2.2.21"
 val rxAndroid = "2.1.1"
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt
index 2c0555e2f7..46b6ca3a46 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt
@@ -37,8 +37,10 @@ import org.junit.Before
 abstract class BaseRealIntegrationTest {
     @JvmField
     protected var username: String = RealServerMother.username
+
     @JvmField
     protected var password: String = RealServerMother.password
+
     @JvmField
     protected var url: String = RealServerMother.url
 
@@ -56,7 +58,9 @@ abstract class BaseRealIntegrationTest {
 
     internal fun getGenericCallData(d2: D2): GenericCallData {
         return GenericCallData.create(
-            d2.databaseAdapter(), d2.retrofit(), ResourceHandler.create(d2.databaseAdapter()),
+            d2.databaseAdapter(),
+            d2.retrofit(),
+            ResourceHandler.create(d2.databaseAdapter()),
             d2.systemInfoModule().versionManager()
         )
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
index 9dad0dd160..9c44f79179 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
@@ -47,7 +47,8 @@ class MultiUserMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
         dhis2MockServer.enqueueLoginResponses()
         d2.userModule().blockingLogIn("u1", "p1", dhis2MockServer.baseEndpoint)
         d2.databaseAdapter().insert(
-            CategoryOptionTableInfo.TABLE_INFO.name(), null,
+            CategoryOptionTableInfo.TABLE_INFO.name(),
+            null,
             CategoryOptionSamples.getCategoryOption().toContentValues()
         )
         assertThat(d2.categoryModule().categoryOptions().blockingCount()).isEqualTo(1)
@@ -71,7 +72,8 @@ class MultiUserMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
         dhis2MockServer.enqueueLoginResponses()
         d2.userModule().blockingLogIn("u1", "p1", dhis2MockServer.baseEndpoint)
         d2.databaseAdapter().insert(
-            CategoryOptionTableInfo.TABLE_INFO.name(), null,
+            CategoryOptionTableInfo.TABLE_INFO.name(),
+            null,
             CategoryOptionSamples.getCategoryOption().toContentValues()
         )
         assertThat(d2.categoryModule().categoryOptions().blockingCount()).isEqualTo(1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
index 4e48128908..9db2a5339d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
@@ -69,7 +69,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -78,7 +82,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid())
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -100,7 +108,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -109,7 +121,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild2.uid())
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild2.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild2.uid(),
             eventDate = day20191102
         )
 
@@ -165,7 +181,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -174,7 +194,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild2.uid())
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild2.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild2.uid(),
             eventDate = day20191102
         )
 
@@ -230,7 +254,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -239,7 +267,11 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid())
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt
index 55d31d5ffd..3dc42949d8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt
@@ -216,7 +216,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         mapOf(
             "${de(dataElement1.uid())}.minDate(2019-10-05)" to "12.0",
             "${de(dataElement1.uid())}.maxDate(2019-12-01)" to "6.0",
-            "${de(dataElement1.uid())}.minDate(2019-10-05).maxDate(2019-12-01)" to "4.0",
+            "${de(dataElement1.uid())}.minDate(2019-10-05).maxDate(2019-12-01)" to "4.0"
         ).forEach { (numerator, expected) ->
             val indicator = createIndicator(numerator = numerator)
             val result = evaluateForAbsolute(indicator, periodId = period2019Q4.periodId()!!)
@@ -265,7 +265,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
             period201910 to "2.0",
             period201911 to "6.0",
             period201912 to "14.0",
-            period202001 to "16.0",
+            period202001 to "16.0"
         ).forEach { (period, expected) ->
             val result = evaluateForAbsolute(indicator, periodId = period.periodId()!!)
             assertThat(result).isEqualTo(expected)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
index 7d70077865..36559e834b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
@@ -112,7 +112,11 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -121,7 +125,11 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid())
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
index ccc7207d22..cbd6ca400f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
@@ -67,7 +67,7 @@ internal object AnalyticExpressionEngineFactoryHelper {
             dataElementEvaluator,
             programIndicatorEvaluator,
             eventDataItemEvaluator,
-            ConstantStoreImpl(databaseAdapter),
+            ConstantStoreImpl(databaseAdapter)
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
index 53c2455ba3..1590c6e78f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
@@ -133,7 +133,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             programIndicatorRepository = d2.programModule().programIndicators(),
             legendRepository = d2.legendSetModule().legends(),
             indicatorRepository = d2.indicatorModule().indicators(),
-            trackedEntityAttributeCollectionRepository = d2.trackedEntityModule().trackedEntityAttributes(),
+            trackedEntityAttributeCollectionRepository = d2.trackedEntityModule().trackedEntityAttributes()
         )
     )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
index 0b84041e5d..d84f518cd1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
@@ -40,7 +40,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class CategoryCategoryComboLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<CategoryCategoryComboLink>(
     CategoryCategoryComboLinkStoreImpl(TestDatabaseAdapterFactory.get()),
-    CategoryCategoryComboLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    CategoryCategoryComboLinkTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun addMasterUid(): String {
         return CategoryCategoryComboLinkSamples.getCategoryCategoryComboLink().categoryCombo()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
index 3b157e0b2a..b317e5a6af 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
@@ -81,8 +81,13 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
         programOwnerStore = ProgramOwnerStoreImpl(d2.databaseAdapter())
 
         propagator = DataStatePropagatorImpl(
-            trackedEntityInstanceStore, enrollmentStore, eventStore,
-            relationshipStore, relationshipItemStore, relationshipTypeStore, programOwnerStore
+            trackedEntityInstanceStore,
+            enrollmentStore,
+            eventStore,
+            relationshipStore,
+            relationshipItemStore,
+            relationshipTypeStore,
+            programOwnerStore
         )
     }
 
@@ -460,8 +465,11 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
 
     private fun sampleEventProjection(enrollmentUid: String?): EventCreateProjection {
         return EventCreateProjection.create(
-            enrollmentUid, "lxAQ7Zs9VYR", "dBwrot7S420",
-            "DiszpKrYNg8", "bRowv6yZOF2"
+            enrollmentUid,
+            "lxAQ7Zs9VYR",
+            "dBwrot7S420",
+            "DiszpKrYNg8",
+            "bRowv6yZOF2"
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
index e29ea12e96..41f2a6d0c8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
@@ -76,8 +76,13 @@ class DatabaseConfigurationMigrationIntegrationShould {
         credentialsSecureStore = CredentialsSecureStoreImpl(chunkedSecureStore)
 
         migration = DatabaseConfigurationMigration(
-            context, databasesConfigurationStore,
-            credentialsSecureStore, insecureStore, nameGenerator, renamer, databaseAdapterFactory
+            context,
+            databasesConfigurationStore,
+            credentialsSecureStore,
+            insecureStore,
+            nameGenerator,
+            renamer,
+            databaseAdapterFactory
         )
 
         FileResourceDirectoryHelper.deleteRootFileResourceDirectory(context)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt
index d8da22510f..57f41bbf9c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt
@@ -45,7 +45,9 @@ abstract class IdentifiableDataObjectStoreAbstractIntegrationShould<M> internal
     tableInfo: TableInfo,
     databaseAdapter: DatabaseAdapter
 ) : IdentifiableObjectStoreAbstractIntegrationShould<M>(
-    store, tableInfo, databaseAdapter
+    store,
+    tableInfo,
+    databaseAdapter
 ) where M : ObjectWithUidInterface, M : CoreObject, M : DataObject, M : ObjectWithDeleteInterface {
 
     private val objectWithToDeleteState: M
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt
index 47d394d7dd..372971b34d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt
@@ -45,7 +45,9 @@ abstract class IdentifiableObjectStoreAbstractIntegrationShould<M> internal cons
     tableInfo: TableInfo,
     databaseAdapter: DatabaseAdapter?
 ) : ObjectStoreAbstractIntegrationShould<M>(
-    store, tableInfo, databaseAdapter!!
+    store,
+    tableInfo,
+    databaseAdapter!!
 ) where M : ObjectWithUidInterface, M : CoreObject {
     private val objectToUpdate: M
     protected abstract fun buildObjectToUpdate(): M
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
index 434782eaf6..04a0f5f756 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
@@ -37,7 +37,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class SectionIndicatorLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<SectionIndicatorLink>(
     SectionIndicatorLinkStoreImpl(TestDatabaseAdapterFactory.get()),
-    SectionIndicatorLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    SectionIndicatorLinkTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
 
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
index 19946e176a..0d02a30f5a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
@@ -89,7 +89,7 @@ class MetadataCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher
                 ProgramIndicator::class,
                 Indicator::class,
                 LegendSet::class,
-                ExpressionDimensionItem::class,
+                ExpressionDimensionItem::class
             ).map { it.java.simpleName }
         )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
index d39146b12e..ef643074d6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
@@ -277,14 +277,16 @@ abstract class EventAPIRealShould internal constructor(
         val serverValidEvent = apiCallExecutor.wrap {
             eventService.getEvent(
                 validEvent.uid(),
-                EventFields.allFields, ouMode
+                EventFields.allFields,
+                ouMode
             )
         }.getOrThrow()
 
         val serverInvalidEvent = apiCallExecutor.wrap {
             eventService.getEvent(
                 invalidEvent.uid(),
-                EventFields.allFields, ouMode
+                EventFields.allFields,
+                ouMode
             )
         }.getOrThrow()
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
index 5f1ac0ddfe..a6202eab27 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
@@ -42,7 +42,6 @@ object EventCallFactory {
         pageSize: Int,
         uids: Collection<String> = emptyList()
     ): Payload<Event> {
-
         val eventQuery = TrackerAPIQuery(
             commonParams = TrackerQueryCommonParams(
                 program = null,
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
index 159c3629c8..4abe32c7ab 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 internal class EventFilterStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<EventFilter>(
     EventFilterStoreImpl(TestDatabaseAdapterFactory.get()),
-    EventFilterTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    EventFilterTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): EventFilter {
         return EventFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 20b702ea17..e8158e3783 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -159,7 +159,10 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     @Throws(Exception::class)
     private suspend fun downloadEvents() {
         val eventPayload = EventCallFactory.create(
-            d2.retrofit(), orgUnitUid, 50, emptyList()
+            d2.retrofit(),
+            orgUnitUid,
+            50,
+            emptyList()
         )
         val events = eventPayload.items()
         for (event in events) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
index 73c60a985e..042283a609 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
@@ -138,8 +138,11 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
 
         val newEventUid = d2.eventModule().events().blockingAdd(
             EventCreateProjection.create(
-                existingEvent.enrollment(), existingEvent.program(),
-                existingEvent.programStage(), existingEvent.organisationUnit(), existingEvent.attributeOptionCombo()
+                existingEvent.enrollment(),
+                existingEvent.program(),
+                existingEvent.programStage(),
+                existingEvent.organisationUnit(),
+                existingEvent.attributeOptionCombo()
             )
         )
         d2.eventModule().events().uid(newEventUid).setEventDate(Date())
@@ -197,8 +200,11 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
 
         d2.dataValueModule().dataValues()
             .value(
-                nextPeriod.periodId()!!, dataValue.organisationUnit()!!, dataValue.dataElement()!!,
-                dataValue.categoryOptionCombo()!!, dataValue.attributeOptionCombo()!!
+                nextPeriod.periodId()!!,
+                dataValue.organisationUnit()!!,
+                dataValue.dataElement()!!,
+                dataValue.categoryOptionCombo()!!,
+                dataValue.attributeOptionCombo()!!
             )
             .blockingSet(uid)
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
index 0d76bd8988..9c8b857f6e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class FileResourceStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<FileResource>(
     FileResourceStoreImpl(TestDatabaseAdapterFactory.get()),
-    FileResourceTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    FileResourceTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): FileResource {
         return FileResourceSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
index 8f6dc370fc..928a83cc46 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 class DataElementLegendSetLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<DataElementLegendSetLink>(
         DataElementLegendSetLinkStoreImpl(TestDatabaseAdapterFactory.get()),
-        DataElementLegendSetLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+        DataElementLegendSetLinkTableInfo.TABLE_INFO,
+        TestDatabaseAdapterFactory.get()
     ) {
     override fun addMasterUid(): String {
         return DataElementLegendSetLinkSamples.getDataElementLegendSetLink().dataElement()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
index 7bed782a68..dbd523746f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 internal class AnalyticsPeriodBoundaryStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<AnalyticsPeriodBoundary>(
-        AnalyticsPeriodBoundaryStoreImpl(TestDatabaseAdapterFactory.get()), AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
+        AnalyticsPeriodBoundaryStoreImpl(TestDatabaseAdapterFactory.get()),
+        AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
         TestDatabaseAdapterFactory.get()
     ) {
     override fun buildObject(): AnalyticsPeriodBoundary {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
index fb9694b7b6..d97cf78ac7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class ProgramSectionStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<ProgramSection>(
     ProgramSectionStoreImpl(TestDatabaseAdapterFactory.get()),
-    ProgramSectionTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    ProgramSectionTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): ProgramSection {
         return ProgramSectionSamples.programSection
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt
index 5a3e14d12f..6677369c8b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt
@@ -69,24 +69,38 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191102
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment2 = generator.generate()
         helper.createEnrollment(
-            trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid(),
+            trackedEntity2.uid(),
+            enrollment2,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191102
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20201202
         )
 
@@ -158,17 +172,28 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191102
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment1, program.uid(), programStage2.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment1,
+            program.uid(),
+            programStage2.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
 
@@ -219,15 +244,26 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191102
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage2.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage2.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191110
         )
 
@@ -277,30 +313,52 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191101
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20201202
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment2 = generator.generate()
         helper.createEnrollment(
-            trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid(),
+            trackedEntity2.uid(),
+            enrollment2,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191102
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment2, program.uid(), programStage2.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment2,
+            program.uid(),
+            programStage2.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191110
         )
 
@@ -361,30 +419,52 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191101
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20201202
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment2 = generator.generate()
         helper.createEnrollment(
-            trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid(),
+            trackedEntity2.uid(),
+            enrollment2,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191201
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191201
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment2, program.uid(), programStage2.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment2,
+            program.uid(),
+            programStage2.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191110
         )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
index 9810926386..46dca04b79 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
@@ -192,16 +192,22 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
     fun evaluate_last_value_in_repeatable_stages() {
         createEnrollment()
         createTrackerEvent(
-            eventUid = event1, programStageUid = programStage1,
-            eventDate = twoDaysBefore(), lastUpdated = today()
+            eventUid = event1,
+            programStageUid = programStage1,
+            eventDate = twoDaysBefore(),
+            lastUpdated = today()
         )
         createTrackerEvent(
-            eventUid = event2, programStageUid = programStage1,
-            eventDate = today(), lastUpdated = today()
+            eventUid = event2,
+            programStageUid = programStage1,
+            eventDate = today(),
+            lastUpdated = today()
         )
         createTrackerEvent(
-            eventUid = event3, programStageUid = programStage1,
-            eventDate = twoDaysBefore(), lastUpdated = today()
+            eventUid = event3,
+            programStageUid = programStage1,
+            eventDate = twoDaysBefore(),
+            lastUpdated = today()
         )
         insertTrackedEntityDataValue(event1, dataElement1, "1")
         insertTrackedEntityDataValue(event2, dataElement1, "2") // Expected as last value
@@ -216,16 +222,22 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
         createEnrollment()
         val eventDate = twoDaysBefore()
         createTrackerEvent(
-            eventUid = event1, programStageUid = programStage1,
-            eventDate = eventDate, lastUpdated = twoDaysBefore()
+            eventUid = event1,
+            programStageUid = programStage1,
+            eventDate = eventDate,
+            lastUpdated = twoDaysBefore()
         )
         createTrackerEvent(
-            eventUid = event2, programStageUid = programStage1,
-            eventDate = eventDate, lastUpdated = today()
+            eventUid = event2,
+            programStageUid = programStage1,
+            eventDate = eventDate,
+            lastUpdated = today()
         )
         createTrackerEvent(
-            eventUid = event3, programStageUid = programStage1,
-            eventDate = eventDate, lastUpdated = twoDaysBefore()
+            eventUid = event3,
+            programStageUid = programStage1,
+            eventDate = eventDate,
+            lastUpdated = twoDaysBefore()
         )
         insertTrackedEntityDataValue(event1, dataElement1, "1")
         insertTrackedEntityDataValue(event2, dataElement1, "2") // Expected as last value
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt
index 14cf20daa3..889eadf6dd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt
@@ -72,7 +72,11 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -81,7 +85,11 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild1.uid())
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment2, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -125,7 +133,11 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -168,10 +180,18 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         val enrollment2 = generator.generate()
         helper.createEnrollment(trackedEntity1.uid(), enrollment2, program.uid(), orgunitChild1.uid())
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid()
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid()
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid()
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid()
         )
 
         assertThat(
@@ -229,11 +249,18 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191101
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20201202
         )
 
@@ -285,15 +312,26 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191101
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage2.uid(), orgunitChild1.uid(),
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage2.uid(),
+            orgunitChild1.uid(),
             eventDate = day20201202
         )
 
@@ -442,14 +480,22 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         val event1 = generator.generate()
         val eventDate1 = DateUtils.SIMPLE_DATE_FORMAT.parse("2023-02-03")
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = eventDate1
         )
 
         val event2 = generator.generate()
         val eventDate2 = DateUtils.SIMPLE_DATE_FORMAT.parse("2023-02-06")
         helper.createTrackerEvent(
-            event2, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event2,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = eventDate2
         )
 
@@ -472,7 +518,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             Triple("d2:minValue(${de(programStage1.uid(), dataElement3.uid())})", AnalyticsType.EVENT, "500"),
             Triple("d2:minValue(${de(programStage1.uid(), dataElement1.uid())})", AnalyticsType.ENROLLMENT, "1"),
             Triple("d2:minValue(${de(programStage1.uid(), dataElement2.uid())})", AnalyticsType.ENROLLMENT, "10"),
-            Triple("d2:minValue(${de(programStage1.uid(), dataElement3.uid())})", AnalyticsType.ENROLLMENT, "500"),
+            Triple("d2:minValue(${de(programStage1.uid(), dataElement3.uid())})", AnalyticsType.ENROLLMENT, "500")
         ).forEach {
             assertThat(
                 evaluateProgramIndicator(
@@ -612,21 +658,35 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             status = EnrollmentStatus.COMPLETED
         )
         val enrollment2 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment2, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment2,
+            program.uid(),
+            orgunitChild1.uid(),
             status = EnrollmentStatus.ACTIVE
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(),
-            orgunitChild1.uid(), status = EventStatus.COMPLETED
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
+            status = EventStatus.COMPLETED
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage2.uid(),
-            orgunitChild1.uid(), status = EventStatus.ACTIVE
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage2.uid(),
+            orgunitChild1.uid(),
+            status = EventStatus.ACTIVE
         )
 
         assertThat(
@@ -906,7 +966,11 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
 
@@ -952,12 +1016,19 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
             enrollmentDate = day20191102
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191110
         )
 
@@ -997,12 +1068,20 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
             eventDate = day20191101
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment1, program.uid(), programStage1.uid(), orgunitChild2.uid(),
+            event2,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild2.uid(),
             eventDate = day20191101
         )
 
@@ -1029,17 +1108,29 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         val enrollment1 = generator.generate()
         helper.createEnrollment(trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid())
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid()
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid()
         )
         helper.createTrackerEvent(
-            generator.generate(), enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid()
+            generator.generate(),
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid()
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild2.uid(), trackedEntityType.uid())
         val enrollment2 = generator.generate()
         helper.createEnrollment(trackedEntity2.uid(), enrollment2, program.uid(), orgunitChild2.uid())
         helper.createTrackerEvent(
-            generator.generate(), enrollment2, program.uid(), programStage1.uid(), orgunitChild2.uid()
+            generator.generate(),
+            enrollment2,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild2.uid()
         )
 
         helper.createRelationship(relationshipType.uid(), trackedEntity1.uid(), trackedEntity2.uid())
@@ -1082,13 +1173,22 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
-            created = day20191101, lastUpdated = day20191102
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
+            created = day20191101,
+            lastUpdated = day20191102
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
-            created = day20191101, lastUpdated = day20191110
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
+            created = day20191101,
+            lastUpdated = day20191110
         )
 
         assertThat(
@@ -1113,18 +1213,32 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         helper.createTrackedEntity(trackedEntity1.uid(), orgunitChild1.uid(), trackedEntityType.uid())
         val enrollment1 = generator.generate()
         helper.createEnrollment(
-            trackedEntity1.uid(), enrollment1, program.uid(), orgunitChild1.uid(),
-            created = day20191101, lastUpdated = day20191102
+            trackedEntity1.uid(),
+            enrollment1,
+            program.uid(),
+            orgunitChild1.uid(),
+            created = day20191101,
+            lastUpdated = day20191102
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
-            event1, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
-            created = day20191101, lastUpdated = day20191110
+            event1,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
+            created = day20191101,
+            lastUpdated = day20191110
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
-            event2, enrollment1, program.uid(), programStage1.uid(), orgunitChild1.uid(),
-            created = day20191101, lastUpdated = day20191110
+            event2,
+            enrollment1,
+            program.uid(),
+            programStage1.uid(),
+            orgunitChild1.uid(),
+            created = day20191101,
+            lastUpdated = day20191110
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "4")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
index 307507282b..1f7188d7e3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
@@ -81,6 +81,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
     private lateinit var trackedEntityInstanceService: TrackedEntityInstanceService
     private lateinit var ownershipService: OwnershipService
     private val uidGenerator: UidGenerator = UidGeneratorImpl()
+
     @Before
     override fun setUp() {
         super.setUp()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
index f772096c2b..d2b47b8cd3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
@@ -404,8 +404,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         for (teiImportSummaries in deletedEventsResponse.response()!!.importSummaries()!!) {
             assertThat(teiImportSummaries.importCount().updated()).isEqualTo(1)
             for (
-                enrollmentImportSummary in teiImportSummaries.enrollments()!!
-                    .importSummaries()!!
+            enrollmentImportSummary in teiImportSummaries.enrollments()!!
+                .importSummaries()!!
             ) {
                 assertThat(enrollmentImportSummary.importCount().updated()).isEqualTo(1)
                 for (eventImportSummary in enrollmentImportSummary.events()!!.importSummaries()!!) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
index 3ee445650b..0d566b7228 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
@@ -150,7 +150,8 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
             .build()
 
         val tei = TrackedEntityInstanceInternalAccessor.insertEnrollments(
-            TrackedEntityInstance.builder(), listOf(enrollment1, enrollment2, enrollment3)
+            TrackedEntityInstance.builder(),
+            listOf(enrollment1, enrollment2, enrollment3)
         )
             .uid(teiId)
             .trackedEntityType(teiType.uid())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
index 85922c620b..b6f4972303 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
@@ -242,8 +242,11 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
         val downloadedValues = dataValueList.groupBy { it.event() }
 
         return createTei(
-            downloadedTei, attValuesWithoutIdAndTEI, downloadedEnrollmentsWithoutIdAndDeleteFalse,
-            downloadedEventsWithoutValuesAndDeleteFalse, downloadedValues
+            downloadedTei,
+            attValuesWithoutIdAndTEI,
+            downloadedEnrollmentsWithoutIdAndDeleteFalse,
+            downloadedEventsWithoutValuesAndDeleteFalse,
+            downloadedValues
         )
     }
 
@@ -275,7 +278,8 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
 
         return TrackedEntityInstanceInternalAccessor.insertEnrollments(
             TrackedEntityInstanceInternalAccessor.insertRelationships(
-                downloadedTei!!.toBuilder(), relationships
+                downloadedTei!!.toBuilder(),
+                relationships
             ),
             downloadedEnrollments
         )
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
index 9948bbacb0..920fba05f7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
@@ -39,7 +39,8 @@ import org.junit.runner.RunWith
 class TrackedEntityInstanceFilterStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<TrackedEntityInstanceFilter>(
         TrackedEntityInstanceFilterStoreImpl(TestDatabaseAdapterFactory.get()),
-        TrackedEntityInstanceFilterTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+        TrackedEntityInstanceFilterTableInfo.TABLE_INFO,
+        TestDatabaseAdapterFactory.get()
     ) {
     override fun buildObject(): TrackedEntityInstanceFilter {
         return TrackedEntityInstanceFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
index b8c1db00c9..ecf03fd21d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
@@ -37,7 +37,8 @@ import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
 class StockUseCaseStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<InternalStockUseCase>(
-    StockUseCaseStoreImpl(TestDatabaseAdapterFactory.get()), StockUseCaseTableInfo.TABLE_INFO,
+    StockUseCaseStoreImpl(TestDatabaseAdapterFactory.get()),
+    StockUseCaseTableInfo.TABLE_INFO,
     TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): InternalStockUseCase {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
index 476e5cec2a..f17ef3ab3a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
@@ -41,7 +41,8 @@ import org.junit.runner.RunWith
 class StockUseCaseTransactionLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<InternalStockUseCaseTransaction>(
         StockUseCaseTransactionLinkStoreImpl(TestDatabaseAdapterFactory.get()),
-        StockUseCaseTransactionTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+        StockUseCaseTransactionTableInfo.TABLE_INFO,
+        TestDatabaseAdapterFactory.get()
     ) {
     override fun addMasterUid(): String {
         return InternalStockUseCaseTransactionSamples.get().programUid()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
index 46566f3286..f7a2031888 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
@@ -41,7 +41,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class UserOrganisationUnitLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<UserOrganisationUnitLink>(
     UserOrganisationUnitLinkStoreImpl(TestDatabaseAdapterFactory.get()),
-    UserOrganisationUnitLinkTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    UserOrganisationUnitLinkTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     private var linkStore: UserOrganisationUnitLinkStore = store as UserOrganisationUnitLinkStore
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
index 850e70ae6b..44a639052e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class UserRoleStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<UserRole>(
     UserRoleStoreImpl(TestDatabaseAdapterFactory.get()),
-    UserRoleTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    UserRoleTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): UserRole {
         return UserRoleSamples.getUserRole()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
index 7346f79a21..71e7522d66 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith
 @RunWith(D2JunitRunner::class)
 class UserStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<User>(
     UserStoreImpl(TestDatabaseAdapterFactory.get()),
-    UserTableInfo.TABLE_INFO, TestDatabaseAdapterFactory.get()
+    UserTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get()
 ) {
     override fun buildObject(): User {
         return UserSamples.getUser()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt
index 338a7bc17a..cfabf56b5f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt
@@ -44,10 +44,13 @@ abstract class BaseMockIntegrationTest {
     companion object {
         @JvmStatic
         lateinit var objects: MockIntegrationTestObjects
+
         @JvmStatic
         lateinit var d2: D2
+
         @JvmStatic
         lateinit var dhis2MockServer: Dhis2MockServer
+
         @JvmStatic
         lateinit var databaseAdapter: DatabaseAdapter
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
index cb2b4fd3f0..d4e14d907e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
@@ -39,7 +39,8 @@ abstract class BaseMockIntegrationTestEmptyDispatcher : BaseMockIntegrationTest(
             if (isNewInstance) {
                 objects.dhis2MockServer.setRequestDispatcher()
                 objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username, RealServerMother.password,
+                    RealServerMother.username,
+                    RealServerMother.password,
                     objects.dhis2MockServer.baseEndpoint
                 )
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
index 1f7f3cf0dd..976b93bf6c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
@@ -39,7 +39,8 @@ abstract class BaseMockIntegrationTestEmptyEnqueable : BaseMockIntegrationTest()
             if (isNewInstance) {
                 dhis2MockServer.enqueueLoginResponses()
                 objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username, RealServerMother.password,
+                    RealServerMother.username,
+                    RealServerMother.password,
                     objects.dhis2MockServer.baseEndpoint
                 )
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
index 3ec035242e..3a38c84196 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
@@ -47,7 +47,8 @@ abstract class BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher : BaseM
             if (isNewInstance) {
                 objects.dhis2MockServer.setRequestDispatcher()
                 objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username, RealServerMother.password,
+                    RealServerMother.username,
+                    RealServerMother.password,
                     objects.dhis2MockServer.baseEndpoint!!
                 )
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
index 8644450b6d..12dc7380c1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
@@ -40,7 +40,8 @@ abstract class BaseMockIntegrationTestMetadataDispatcher : BaseMockIntegrationTe
             if (isNewInstance) {
                 objects.dhis2MockServer.setRequestDispatcher()
                 objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username, RealServerMother.password,
+                    RealServerMother.username,
+                    RealServerMother.password,
                     objects.dhis2MockServer.baseEndpoint
                 )
                 objects.d2.metadataModule().blockingDownload()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
index 29d98e3e77..b39f629a00 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
@@ -38,7 +38,8 @@ abstract class BaseMockIntegrationTestMetadataEnqueable : BaseMockIntegrationTes
             if (isNewInstance) {
                 objects.dhis2MockServer.enqueueLoginResponses()
                 objects.d2.userModule().blockingLogIn(
-                    "android", "Android123",
+                    "android",
+                    "Android123",
                     objects.dhis2MockServer.baseEndpoint
                 )
                 objects.dhis2MockServer.enqueueMetadataResponses()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt
index 9031930b93..11a0c34d49 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt
@@ -74,8 +74,12 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
                     (0 until iterations).map {
                         val (period, ou) = periodOrgUnits[it]
                         DataValueSamples.getDataValue(
-                            ou.uid(), dataElement.uid(), period.periodId()!!, categoryOptionCombo.uid(),
-                            metadata.categoryOptionCombos.first().uid(), random.nextDouble().toString()
+                            ou.uid(),
+                            dataElement.uid(),
+                            period.periodId()!!,
+                            categoryOptionCombo.uid(),
+                            metadata.categoryOptionCombos.first().uid(),
+                            random.nextDouble().toString()
                         )
                     }
                 }
@@ -94,7 +98,10 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
     fun generateEnrollments(teis: List<TrackedEntityInstance>, program: Program): List<Enrollment> {
         return teis.map { tei ->
             EnrollmentSamples.get(
-                uidGenerator.generate(), tei.organisationUnit(), program.uid(), tei.uid(),
+                uidGenerator.generate(),
+                tei.organisationUnit(),
+                program.uid(),
+                tei.uid(),
                 getRandomDateInLastYear()
             )
         }
@@ -109,8 +116,13 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
             val ou = level3OrgUnits[i % level3OrgUnits.size]
             val programStage = programStages[i % programStages.size]
             EventSamples.get(
-                uidGenerator.generate(), null, ou.uid(), programStage.program()!!.uid(), programStage.uid(),
-                metadata.categoryOptionCombos.first().uid(), getRandomDateInLastYear()
+                uidGenerator.generate(),
+                null,
+                ou.uid(),
+                programStage.program()!!.uid(),
+                programStage.uid(),
+                metadata.categoryOptionCombos.first().uid(),
+                getRandomDateInLastYear()
             )
         }
     }
@@ -123,8 +135,12 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
             programStages.flatMap { ps ->
                 (1..params.eventsWithRegistrationPerEnrollmentAndPS).map {
                     EventSamples.get(
-                        uidGenerator.generate(), enrollment.uid(), enrollment.organisationUnit(),
-                        enrollment.program(), ps.uid(), metadata.categoryOptionCombos.first().uid(),
+                        uidGenerator.generate(),
+                        enrollment.uid(),
+                        enrollment.organisationUnit(),
+                        enrollment.program(),
+                        ps.uid(),
+                        metadata.categoryOptionCombos.first().uid(),
                         getRandomDateInLastYear()
                     )
                 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
index ec2b80f57e..c82add6d15 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
@@ -105,8 +105,14 @@ internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
         val periods = d2.periodModule().periods().byPeriodType().eq(PeriodType.Daily).blockingGet()
 
         return MetadataForDataFilling(
-            organisationUnits, periods, categoryOptionCombos, aggregatedDataElements,
-            trackerDataElements, programs, programStages, trackedEntityAttributes
+            organisationUnits,
+            periods,
+            categoryOptionCombos,
+            aggregatedDataElements,
+            trackerDataElements,
+            programs,
+            programStages,
+            trackedEntityAttributes
         )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt
index 171f2b7c1a..e6f4016313 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt
@@ -56,7 +56,8 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
     private fun getOrganisationUnitChildren(parent: OrganisationUnit): List<OrganisationUnit> {
         return (1..params.organisationUnitChildren).map { i ->
             OrganisationUnitSamples.getOrganisationUnit(
-                "${parent.name()} $i", parent.level()!! + 1,
+                "${parent.name()} $i",
+                parent.level()!! + 1,
                 parent
             )
         }
@@ -86,8 +87,10 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
         return categoryCombos.flatMap { categoryCombo ->
             (1..params.dataElementsAggregated).map { i ->
                 DataElementSamples.getDataElement(
-                    "DE Aggr $i", null,
-                    ObjectWithUid.create(categoryCombo.uid()), "AGGREGATE"
+                    "DE Aggr $i",
+                    null,
+                    ObjectWithUid.create(categoryCombo.uid()),
+                    "AGGREGATE"
                 )
             }
         }
@@ -96,8 +99,10 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
     fun getDataElementsTracker(categoryCombo: CategoryCombo): List<DataElement> {
         return (1..params.dataElementsTracker).map { i ->
             DataElementSamples.getDataElement(
-                "DE Tracker $i", null,
-                ObjectWithUid.create(categoryCombo.uid()), "TRACKER"
+                "DE Tracker $i",
+                null,
+                ObjectWithUid.create(categoryCombo.uid()),
+                "TRACKER"
             )
         }
     }
@@ -105,11 +110,13 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
     fun getPrograms(categoryCombo: CategoryCombo): List<Program> {
         val withReg = ProgramSamples.getProgram(
             "Program with registration",
-            ProgramType.WITH_REGISTRATION, categoryCombo
+            ProgramType.WITH_REGISTRATION,
+            categoryCombo
         )
         val withoutReg = ProgramSamples.getProgram(
             "Program without registration",
-            ProgramType.WITHOUT_REGISTRATION, categoryCombo
+            ProgramType.WITHOUT_REGISTRATION,
+            categoryCombo
         )
         return listOf(withReg, withoutReg)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt
index 7c44efcabb..9a4ce99cb6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt
@@ -48,7 +48,8 @@ abstract class BaseLocalAnalyticsTest : BaseMockIntegrationTest() {
             if (isNewInstance) {
                 objects.dhis2MockServer.setRequestDispatcher()
                 objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username, RealServerMother.password,
+                    RealServerMother.username,
+                    RealServerMother.password,
                     objects.dhis2MockServer.baseEndpoint!!
                 )
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt
index 04277240f2..256d39c53f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt
@@ -52,7 +52,9 @@ internal class EnumTestHelper {
             return if (notContainedValues.isNotEmpty()) {
                 "Constants ${notContainedValues.joinToString()} from enum " +
                     "$enumKey does not exist in the $containerKey"
-            } else null
+            } else {
+                null
+            }
         }
 
         inline fun <reified E : Enum<E>> entry(apiKey: String): Pair<String, List<String>> {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/OutsideRetrofitFactory.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/OutsideRetrofitFactory.kt
index dbd48bf4ec..083fa17b1c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/OutsideRetrofitFactory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/OutsideRetrofitFactory.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.realservertests
 
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import org.hisp.dhis.android.core.arch.api.fields.internal.FieldsConverterFactory
 import org.hisp.dhis.android.core.arch.api.filters.internal.FilterConverterFactory
@@ -41,7 +41,7 @@ class OutsideRetrofitFactory {
     companion object {
         fun retrofit(baseUrl: String, okHttpClient: OkHttpClient): Retrofit {
             return Retrofit.Builder()
-                .baseUrl(HttpUrl.parse(baseUrl)!!)
+                .baseUrl(baseUrl.toHttpUrlOrNull()!!)
                 .client(okHttpClient)
                 .addConverterFactory(JacksonConverterFactory.create(objectMapper()))
                 .addConverterFactory(FilterConverterFactory.create())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
index e446a7744d..a2c9e4f56c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
@@ -186,8 +186,11 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
     fun return_data_value_object_repository() {
         val objectRepository = d2.dataValueModule().dataValues()
             .value(
-                "2018", "DiszpKrYNg8", "g9eOBujte1U",
-                "Gmbgme7z9BF", "bRowv6yZOF2"
+                "2018",
+                "DiszpKrYNg8",
+                "g9eOBujte1U",
+                "Gmbgme7z9BF",
+                "bRowv6yZOF2"
             )
 
         assertThat(objectRepository.blockingExists()).isTrue()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
index 3e913c2cd6..af2aa0b800 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
@@ -116,16 +116,22 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
         assertThat(
             d2.dataValueModule().dataValues()
                 .value(
-                    "no_period", "no_org_unit", "no_data_element",
-                    "no_category", "no_attribute"
+                    "no_period",
+                    "no_org_unit",
+                    "no_data_element",
+                    "no_category",
+                    "no_attribute"
                 ).blockingExists()
         ).isFalse()
 
         assertThat(
             d2.dataValueModule().dataValues()
                 .value(
-                    "2018", "DiszpKrYNg8", "g9eOBujte1U",
-                    "Gmbgme7z9BF", "bRowv6yZOF2"
+                    "2018",
+                    "DiszpKrYNg8",
+                    "g9eOBujte1U",
+                    "Gmbgme7z9BF",
+                    "bRowv6yZOF2"
                 ).blockingExists()
         ).isTrue()
     }
@@ -133,8 +139,11 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
     private fun objectRepository(): DataValueObjectRepository {
         return d2.dataValueModule().dataValues()
             .value(
-                "201905", "DiszpKrYNg8", "g9eOBujte1U",
-                "Gmbgme7z9BF", "bRowv6yZOF2"
+                "201905",
+                "DiszpKrYNg8",
+                "g9eOBujte1U",
+                "Gmbgme7z9BF",
+                "bRowv6yZOF2"
             )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
index a1d2981202..4ed2c8649c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
@@ -41,7 +41,7 @@ internal class LegendEvaluator @Inject constructor(
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     private val indicatorRepository: IndicatorCollectionRepository,
     private val legendRepository: LegendCollectionRepository,
-    private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository,
+    private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository
 ) {
     fun getLegendByProgramIndicator(
         programIndicatorUid: String,
@@ -49,17 +49,19 @@ internal class LegendEvaluator @Inject constructor(
     ): String? {
         return if (value == null) {
             null
-        } else try {
-            val programIndicator = programIndicatorRepository
-                .byUid().eq(programIndicatorUid)
-                .withLegendSets()
-                .one().blockingGet()
-
-            val legendSet = programIndicator?.legendSets()!![0]
-
-            return getLegendByLegendSet(legendSet.uid(), value)
-        } catch (e: Exception) {
-            null
+        } else {
+            try {
+                val programIndicator = programIndicatorRepository
+                    .byUid().eq(programIndicatorUid)
+                    .withLegendSets()
+                    .one().blockingGet()
+
+                val legendSet = programIndicator?.legendSets()!![0]
+
+                return getLegendByLegendSet(legendSet.uid(), value)
+            } catch (e: Exception) {
+                null
+            }
         }
     }
 
@@ -69,17 +71,19 @@ internal class LegendEvaluator @Inject constructor(
     ): String? {
         return if (value == null) {
             null
-        } else try {
-            val dataElement = dataElementRepository
-                .byUid().eq(dataElementUid)
-                .withLegendSets()
-                .one().blockingGet()
-
-            val legendSet = dataElement?.legendSets()!![0]
-
-            return getLegendByLegendSet(legendSet.uid(), value)
-        } catch (e: Exception) {
-            null
+        } else {
+            try {
+                val dataElement = dataElementRepository
+                    .byUid().eq(dataElementUid)
+                    .withLegendSets()
+                    .one().blockingGet()
+
+                val legendSet = dataElement?.legendSets()!![0]
+
+                return getLegendByLegendSet(legendSet.uid(), value)
+            } catch (e: Exception) {
+                null
+            }
         }
     }
 
@@ -89,17 +93,19 @@ internal class LegendEvaluator @Inject constructor(
     ): String? {
         return if (value == null) {
             null
-        } else try {
-            val trackedEntityAttribute = trackedEntityAttributeCollectionRepository
-                .byUid().eq(trackedEntityAttributeUid)
-                .withLegendSets()
-                .one().blockingGet()
-
-            val legendSet = trackedEntityAttribute?.legendSets()!![0]
-
-            return getLegendByLegendSet(legendSet.uid(), value)
-        } catch (e: Exception) {
-            null
+        } else {
+            try {
+                val trackedEntityAttribute = trackedEntityAttributeCollectionRepository
+                    .byUid().eq(trackedEntityAttributeUid)
+                    .withLegendSets()
+                    .one().blockingGet()
+
+                val legendSet = trackedEntityAttribute?.legendSets()!![0]
+
+                return getLegendByLegendSet(legendSet.uid(), value)
+            } catch (e: Exception) {
+                null
+            }
         }
     }
 
@@ -109,17 +115,19 @@ internal class LegendEvaluator @Inject constructor(
     ): String? {
         return if (value == null) {
             null
-        } else try {
-            val indicator = indicatorRepository
-                .byUid().eq(indicatorUid)
-                .withLegendSets()
-                .one().blockingGet()
-
-            val legendSet = indicator?.legendSets()!![0]
-
-            return getLegendByLegendSet(legendSet.uid(), value)
-        } catch (e: Exception) {
-            null
+        } else {
+            try {
+                val indicator = indicatorRepository
+                    .byUid().eq(indicatorUid)
+                    .withLegendSets()
+                    .one().blockingGet()
+
+                val legendSet = indicator?.legendSets()!![0]
+
+                return getLegendByLegendSet(legendSet.uid(), value)
+            } catch (e: Exception) {
+                null
+            }
         }
     }
 
@@ -127,18 +135,19 @@ internal class LegendEvaluator @Inject constructor(
         legendSetUid: String,
         value: String?
     ): String? {
-
         return if (value == null || value.toDouble().isNaN()) {
             null
-        } else try {
-            return legendRepository
-                .byStartValue().smallerThan(value.toDouble())
-                .byEndValue().biggerOrEqualTo(value.toDouble())
-                .byLegendSet().eq(legendSetUid)
-                .one()
-                .blockingGet()?.uid()
-        } catch (e: Exception) {
-            null
+        } else {
+            try {
+                return legendRepository
+                    .byStartValue().smallerThan(value.toDouble())
+                    .byEndValue().biggerOrEqualTo(value.toDouble())
+                    .byLegendSet().eq(legendSetUid)
+                    .one()
+                    .blockingGet()?.uid()
+            } catch (e: Exception) {
+                null
+            }
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
index 038c92caed..414d7be79f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
@@ -53,7 +53,7 @@ internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
     fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        legendStrategy: AnalyticsLegendStrategy,
+        legendStrategy: AnalyticsLegendStrategy
     ): DimensionalValue {
         val evaluator = getEvaluator(evaluationItem)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
index 1e2c8f583c..63ac80fa5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
@@ -75,7 +75,6 @@ internal class AnalyticsVisualizationsService @Inject constructor(
         visualization: Visualization,
         params: AnalyticsVisualizationsRepositoryParams
     ): Result<DimensionalResponse, AnalyticsException> {
-
         var queryAnalyticsRepository = analyticsRepository
 
         val queryDimensions =
@@ -116,8 +115,11 @@ internal class AnalyticsVisualizationsService @Inject constructor(
 
         val legendStrategy = when (visualizationLegendStrategy) {
             LegendStrategy.FIXED ->
-                if (legendSetUId != null) AnalyticsLegendStrategy.Fixed(legendSetUId)
-                else AnalyticsLegendStrategy.None
+                if (legendSetUId != null) {
+                    AnalyticsLegendStrategy.Fixed(legendSetUId)
+                } else {
+                    AnalyticsLegendStrategy.None
+                }
             LegendStrategy.BY_DATA_ITEM, null -> AnalyticsLegendStrategy.ByDataItem
         }
 
@@ -137,7 +139,6 @@ internal class AnalyticsVisualizationsService @Inject constructor(
         visualization: Visualization,
         dimensionalResponse: DimensionalResponse
     ): GridAnalyticsResponse {
-
         val gridDimension = dimensionHelper.getGridDimensions(visualization)
 
         val rowIndexes = gridDimension.rows.map { dimensionalResponse.dimensions.indexOf(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
index 62f312f8a2..cad64bb0b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
@@ -50,7 +50,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         val sqlQuery = getSql(evaluationItem, metadata, queryMods)
 
@@ -64,7 +64,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -189,7 +189,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
         builder: WhereClauseBuilder,
         metadata: Map<String, MetadataItem>,
         aggregationType: AggregationType,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): WhereClauseBuilder {
         val reportingPeriods = AnalyticsEvaluatorHelper.getReportingPeriods(items, metadata, queryMods)
         val periods = AnalyticsEvaluatorHelper.getReportingPeriodsForAggregationType(reportingPeriods, aggregationType)
@@ -243,7 +243,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
     private fun getAggregator(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): AggregationType {
         val itemList: List<DimensionItem.DataItem> = AnalyticsDimensionHelper.getSingleItemByDimension(evaluationItem)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
index d741e198d5..eecd3ef1e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
@@ -52,7 +52,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         val sqlQuery = getSql(evaluationItem, metadata, queryMods)
 
@@ -66,7 +66,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -233,7 +233,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
         builder: WhereClauseBuilder,
         metadata: Map<String, MetadataItem>,
         aggregation: AggregationType,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): WhereClauseBuilder {
         val reportingPeriods = AnalyticsEvaluatorHelper.getReportingPeriods(items, metadata, queryMods)
 
@@ -285,7 +285,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
     }
 
     private fun getEventDataItems(
-        evaluationItem: AnalyticsServiceEvaluationItem,
+        evaluationItem: AnalyticsServiceEvaluationItem
     ): List<DimensionItem.DataItem.EventDataItem> {
         return AnalyticsDimensionHelper.getSingleItemByDimension(evaluationItem)
     }
@@ -294,7 +294,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
         evaluationItem: AnalyticsServiceEvaluationItem,
         item: DimensionItem.DataItem.EventDataItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): AggregationType {
         return if (queryMods?.aggregationType?.let { it != AggregationType.DEFAULT } == true) {
             queryMods.aggregationType!!
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
index f9005f17a6..b809e7f39b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
@@ -41,7 +41,7 @@ internal class ExpressionDimensionItemEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         val item = ExpressionDimensionItemEvaluatorHelper.getItem(evaluationItem, metadata)
         val contextEvaluationItem = ExpressionDimensionItemEvaluatorHelper
@@ -57,7 +57,7 @@ internal class ExpressionDimensionItemEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         throw AnalyticsException.SQLException("Method getSql not implemented for ExpressionDimensionItemEvaluator")
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
index 6479d4baee..d4c42cc7a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
@@ -41,7 +41,7 @@ internal class IndicatorEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         val indicator = IndicatorEvaluatorHelper.getIndicator(evaluationItem, metadata)
         val contextEvaluationItem = IndicatorEvaluatorHelper.getContextEvaluationItem(evaluationItem, indicator)
@@ -56,7 +56,7 @@ internal class IndicatorEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         throw AnalyticsException.SQLException("Method getSql not implemented for ProgramIndicatorEvaluator")
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
index 8817581cbf..5d409da792 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
@@ -40,7 +40,7 @@ internal class IndicatorSQLEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         val indicator = IndicatorEvaluatorHelper.getIndicator(evaluationItem, metadata)
         val contextEvaluationItem = IndicatorEvaluatorHelper.getContextEvaluationItem(evaluationItem, indicator)
@@ -55,7 +55,7 @@ internal class IndicatorSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         val indicator = IndicatorEvaluatorHelper.getIndicator(evaluationItem, metadata)
         val contextEvaluationItem = IndicatorEvaluatorHelper.getContextEvaluationItem(evaluationItem, indicator)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
index 962742db73..ceb116625f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
@@ -53,9 +53,8 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
-
         val programIndicator = ProgramIndicatorEvaluatorHelper.getProgramIndicator(evaluationItem, metadata)
 
         val aggregationType = ProgramIndicatorEvaluatorHelper.getAggregator(evaluationItem, programIndicator, queryMods)
@@ -73,7 +72,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         throw AnalyticsException.SQLException("Method getSql not implemented for ProgramIndicatorEvaluator")
     }
@@ -82,7 +81,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): List<String?> {
         return getFilteredEventUids(programIndicator, evaluationItem, metadata, queryMods).map {
             programIndicatorEngine.getEventProgramIndicatorValue(it, programIndicator.uid())
@@ -93,7 +92,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): List<String> {
         val whereClause = ProgramIndicatorEvaluatorHelper
             .getEventWhereClause(programIndicator, evaluationItem, metadata, queryMods)
@@ -117,7 +116,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): List<String> {
         val whereClause =
             ProgramIndicatorEvaluatorHelper.getEnrollmentWhereClause(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt
index 438e58a0af..e36e2775f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt
@@ -111,7 +111,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -167,7 +167,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -389,7 +389,7 @@ internal object ProgramIndicatorEvaluatorHelper {
     fun getAggregator(
         evaluationItem: AnalyticsServiceEvaluationItem,
         programIndicator: ProgramIndicator,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): AggregationType {
         val aggregationType =
             if (queryMods?.aggregationType?.let { it != AggregationType.DEFAULT } == true) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
index 6099a06537..f3a11bfa0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
@@ -41,7 +41,7 @@ internal class ProgramIndicatorSQLEvaluator @Inject constructor(
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         return programIndicatorSQLExecutor.getProgramIndicatorValue(evaluationItem, metadata, queryMods)
     }
@@ -49,7 +49,7 @@ internal class ProgramIndicatorSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         return programIndicatorSQLExecutor.getProgramIndicatorSQL(evaluationItem, metadata, queryMods)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
index 19624bdfd6..c04d67d355 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
@@ -36,7 +36,7 @@ internal class AnalyticExpressionEngine @Inject constructor(
 ) {
 
     fun evaluate(
-        expression: String,
+        expression: String
     ): Any? {
         return CommonParser.visit(expression, visitor)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt
index 8b95968d87..ffad989d7a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt
@@ -119,7 +119,7 @@ internal object AnalyticExpressionParserUtils {
             ExpressionParser.MIN_DATE to FunctionMinDate(),
             ExpressionParser.MAX_DATE to FunctionMaxDate(),
             ExpressionParser.PERIOD_OFFSET to PeriodOffset(),
-            ExpressionParser.YEAR_TO_DATE to FunctionYearToDate(),
+            ExpressionParser.YEAR_TO_DATE to FunctionYearToDate()
         )
 
     fun getDays(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
index 3721f9ec1e..5a7c099aef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
@@ -66,12 +66,12 @@ internal class EventLineListServiceImpl @Inject constructor(
 
     @Suppress("LongMethod", "ComplexMethod")
     private fun evaluateEvents(params: EventLineListParams): List<LineListResponse> {
-
         val events = getEvents(params)
         val programStage = programStageRepository.uid(params.programStage).blockingGet()
 
         val metadataMap = getMetadataMap(
-            params.dataElements, params.programIndicators,
+            params.dataElements,
+            params.programIndicators,
             events.map { it.organisationUnit()!! }.toHashSet()
         )
 
@@ -95,7 +95,8 @@ internal class EventLineListServiceImpl @Inject constructor(
                     val legend = when (params.analyticsLegendStrategy) {
                         is AnalyticsLegendStrategy.None -> null
                         is AnalyticsLegendStrategy.ByDataItem -> legendEvaluator.getLegendByDataElement(
-                            de.uid, dv?.value()
+                            de.uid,
+                            dv?.value()
                         )
                         is AnalyticsLegendStrategy.Fixed -> legendEvaluator.getLegendByLegendSet(
                             params.analyticsLegendStrategy.legendSetUid,
@@ -118,10 +119,12 @@ internal class EventLineListServiceImpl @Inject constructor(
                     val legend = when (params.analyticsLegendStrategy) {
                         is AnalyticsLegendStrategy.None -> null
                         is AnalyticsLegendStrategy.ByDataItem -> legendEvaluator.getLegendByProgramIndicator(
-                            pi.uid, value
+                            pi.uid,
+                            value
                         )
                         is AnalyticsLegendStrategy.Fixed -> legendEvaluator.getLegendByLegendSet(
-                            params.analyticsLegendStrategy.legendSetUid, value
+                            params.analyticsLegendStrategy.legendSetUid,
+                            value
                         )
                     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
index f77c0b0ee4..2a24b213f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
@@ -51,7 +51,7 @@ internal class OpenIDConnectAuthenticator @Inject constructor(
         val builder = userIdHelper.builderWithUserId(chain)
         val builderWithAuthentication = addTokenHeader(builder, getUpdatedToken(credentials))
         val res = chain.proceed(builderWithAuthentication.build())
-        if (res.code() == UNAUTHORIZED) {
+        if (res.code == UNAUTHORIZED) {
             logoutHandler.logOut()
         }
         return res
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index 31eed8ab08..4a5f74407c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -54,7 +54,7 @@ internal interface APIDownloader {
     fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>
     ): Single<List<P>>
 
     fun <K, V> downloadPartitionedMap(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 89d985af1d..0595507e2e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -78,7 +78,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
     override fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>
     ): Single<List<P>> {
         return downloadPartitionedWithoutHandling(
             uids = uids,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
index eac2dfb8c0..cbd2ea7f01 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
@@ -104,7 +104,7 @@ internal class APIErrorMapper @Inject constructor() {
 
     private fun httpException(errorBuilder: D2Error.Builder, e: HttpException): D2Error {
         return logAndAppendOriginal(errorBuilder, e)
-            .url(e.response()?.raw()?.request()?.url()?.toString())
+            .url(e.response()?.raw()?.request?.url?.toString())
             .httpErrorCode(e.response()!!.code())
             .errorCode(D2ErrorCode.API_RESPONSE_PROCESS_ERROR)
             .errorDescription("API call threw HttpException")
@@ -125,7 +125,7 @@ internal class APIErrorMapper @Inject constructor() {
 
     fun getBaseErrorBuilder(response: Response<*>): D2Error.Builder {
         return getBaseErrorBuilder()
-            .url(getUrl(response.raw().request()))
+            .url(getUrl(response.raw().request))
     }
 
     fun getBaseErrorBuilder(): D2Error.Builder {
@@ -134,7 +134,7 @@ internal class APIErrorMapper @Inject constructor() {
     }
 
     private fun getUrl(request: Request?): String? {
-        return request?.url()?.toString()?.let {
+        return request?.url?.toString()?.let {
             DynamicServerURLInterceptor.transformUrl(it)
         }
     }
@@ -156,7 +156,7 @@ internal class APIErrorMapper @Inject constructor() {
     }
 
     private fun getIfNotEmpty(message: String?): String? {
-        return if (message != null && message.isNotEmpty()) message else null
+        return if (!message.isNullOrEmpty()) message else null
     }
 
     private fun getServerMessage(response: Response<*>): String {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
index 7b3aa25500..20cc139170 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
@@ -47,7 +47,7 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher,
     private val errorStore: D2ErrorStore,
     private val databaseAdapter: DatabaseAdapter,
-    private val foreignKeyCleaner: ForeignKeyCleaner,
+    private val foreignKeyCleaner: ForeignKeyCleaner
 ) : CoroutineAPICallExecutor {
 
     @OptIn(DelicateCoroutinesApi::class)
@@ -85,7 +85,8 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
                 } else {
                     Result.Failure(
                         storeAndReturn(
-                            errorMapper.responseException(errorBuilder, response, null, errorBody), storeError
+                            errorMapper.responseException(errorBuilder, response, null, errorBody),
+                            storeError
                         )
                     )
                 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
index 025c50b609..65936aac64 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
@@ -89,8 +89,11 @@ internal class RxAPICallExecutorImpl @Inject constructor(
 
     private fun mapAndStore(throwable: Throwable, storeError: Boolean): D2Error {
         var d2Error =
-            if (throwable is D2Error) throwable
-            else errorMapper.mapRetrofitException(throwable, errorMapper.getBaseErrorBuilder())
+            if (throwable is D2Error) {
+                throwable
+            } else {
+                errorMapper.mapRetrofitException(throwable, errorMapper.getBaseErrorBuilder())
+            }
         if (userAccountDisabledErrorCatcher.isUserAccountLocked(throwable)) {
             val errorCode = userAccountDisabledErrorCatcher.catchError(throwable)
             d2Error = d2Error.toBuilder().errorCode(errorCode).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt
index 5c97b0457e..951524006c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.arch.api.internal
 
 import java.io.IOException
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -42,7 +42,7 @@ internal class DynamicServerURLInterceptor : Interceptor {
 
     companion object {
         fun transformRequest(request: Request): Request {
-            val transformedUrl = transformUrl(request.url().toString())?.let { HttpUrl.parse(it) }
+            val transformedUrl = transformUrl(request.url.toString())?.let { it.toHttpUrlOrNull() }
             return transformedUrl?.let { request.newBuilder().url(it).build() } ?: request
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt
index 0164541d5f..cbd506bb32 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt
@@ -47,7 +47,10 @@ object ApiPagingEngine {
         if (floor(numberOfCallsDone) != numberOfCallsDone) {
             pagingList.add(
                 calculateFirstPagination(
-                    currentPageSize, numberOfFullCallsDone, requiredItemsCount, itemsSkippedCount
+                    currentPageSize,
+                    numberOfFullCallsDone,
+                    requiredItemsCount,
+                    itemsSkippedCount
                 )
             )
         }
@@ -61,7 +64,9 @@ object ApiPagingEngine {
         if (numberOfFullCallsDone + pagingList.size + 1 == numberOfCalls) {
             pagingList.add(
                 calculateLastPagination(
-                    currentPageSize, requiredItemsCount + itemsSkippedCount, numberOfCalls
+                    currentPageSize,
+                    requiredItemsCount + itemsSkippedCount,
+                    numberOfCalls
                 )
             )
         }
@@ -77,7 +82,6 @@ object ApiPagingEngine {
         requiredItemsCount: Int,
         itemsSkippedCount: Int
     ): Paging {
-
         val upperLimit = minOf(itemsSkippedCount + requiredItemsCount, (numberOfFullCallsDone + 1) * maxPageSize)
         val minimumPageSize = upperLimit - itemsSkippedCount
 
@@ -105,14 +109,18 @@ object ApiPagingEngine {
         val itemsToRequest = requiredItemsCount - requestedItems
         for (pageSize in itemsToRequest..currentPageSize) {
             for (
-                page in floor(requiredItemsCount.toDouble() / pageSize)
-                    .toInt()..floor(requestedItems.toDouble() / pageSize).toInt() + 1
+            page in floor(requiredItemsCount.toDouble() / pageSize)
+                .toInt()..floor(requestedItems.toDouble() / pageSize).toInt() + 1
             ) {
                 val previousItemsToSkipCount = requestedItems - pageSize * (page - 1)
                 val posteriorItemsToSkipCount = pageSize * page - requiredItemsCount
                 if (previousItemsToSkipCount >= 0 && posteriorItemsToSkipCount >= 0) {
                     return Paging.create(
-                        page, pageSize, previousItemsToSkipCount, posteriorItemsToSkipCount, true
+                        page,
+                        pageSize,
+                        previousItemsToSkipCount,
+                        posteriorItemsToSkipCount,
+                        true
                     )
                 }
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
index 1549e8d462..50008821f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
@@ -133,7 +133,8 @@ internal class DatabaseImportExportImpl @Inject constructor(
         val databasesConfiguration = databaseConfigurationSecureStore.get()
         val userConfiguration = DatabaseConfigurationHelper.getLoggedAccount(
             databasesConfiguration,
-            credentials.serverUrl, credentials.username
+            credentials.serverUrl,
+            credentials.username
         )
 
         if (userConfiguration.encrypted()) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt
index fa26ad361c..fdf8c5712a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt
@@ -46,7 +46,9 @@ internal class LinkChildStoreImpl<P : ObjectWithUidInterface, C : ObjectWithUidI
 
     override fun getChildrenWhere(p: P, whereClause: String?): List<C> {
         val selectStatement = statementBuilder.selectChildrenWithLinkTable(
-            linkTableChildProjection, p.uid(), whereClause
+            linkTableChildProjection,
+            p.uid(),
+            whereClause
         )
         return cursorExecutor.getObjects(databaseAdapter.rawQuery(selectStatement))
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStore.kt
index 104bad9fb8..a4519fbb93 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStore.kt
@@ -32,6 +32,7 @@ import org.hisp.dhis.android.core.common.CoreObject
 
 internal interface LinkStore<O : CoreObject> : ObjectStore<O> {
     fun insertIfNotExists(o: O): HandleAction
+
     @Throws(RuntimeException::class)
     fun deleteLinksForMasterUid(masterUid: String)
     fun deleteAllLinks(): Int
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
index e6b70d8eb9..fdf8236e08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
@@ -58,7 +58,8 @@ internal open class ObjectWithoutUidStoreImpl<O : CoreObject>(
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(
-            tableInfo.name(), tableInfo.columns().all(),
+            tableInfo.name(),
+            tableInfo.columns().all(),
             tableInfo.columns().whereUpdate()
         ),
         binder,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt
index 9a3ac80e7f..76bfe6c3d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStore.kt
@@ -29,7 +29,8 @@ package org.hisp.dhis.android.core.arch.db.stores.internal
 
 import org.hisp.dhis.android.core.arch.db.sqlorder.internal.SQLOrderType
 
-@Suppress("TooManyFunctions") interface ReadableStore<O> {
+@Suppress("TooManyFunctions")
+interface ReadableStore<O> {
     fun selectAll(): List<O>
     fun selectWhere(whereClause: String): List<O>
     fun selectWhere(filterWhereClause: String, orderByClause: String): List<O>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt
index 24b6563c13..67f45ee595 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt
@@ -138,7 +138,10 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
 
         if (relatives != null) {
             relationshipVersionManager.saveRelativesIfNotExist(
-                ownedRelationships, parent.uid(), relatives, relationshipHandler
+                ownedRelationships,
+                parent.uid(),
+                relatives,
+                relationshipHandler
             )
         }
         relationshipHandler.handleMany(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
index ff22a89b72..69b527d1ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
@@ -61,20 +61,27 @@ object FileResizerHelper {
         return if (scaleFactor > 1) {
             if (width < dimension.dimension) {
                 fileToResize
-            } else resize(
-                fileToResize, bitmap,
-                dimension.dimension, (dimension.dimension / scaleFactor).toInt(), dimension
-            )
+            } else {
+                resize(
+                    fileToResize,
+                    bitmap,
+                    dimension.dimension,
+                    (dimension.dimension / scaleFactor).toInt(),
+                    dimension
+                )
+            }
         } else {
             if (height < dimension.dimension) {
                 fileToResize
-            } else resize(
-                fileToResize,
-                bitmap,
-                (scaleFactor * dimension.dimension).toInt(),
-                dimension.dimension,
-                dimension
-            )
+            } else {
+                resize(
+                    fileToResize,
+                    bitmap,
+                    (scaleFactor * dimension.dimension).toInt(),
+                    dimension.dimension,
+                    dimension
+                )
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
index f4ea305ee3..c33bfe26e7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
@@ -59,7 +59,9 @@ object FileResourceDirectoryHelper {
         val file = File(context.filesDir, childPath)
         return if (!file.exists() && file.mkdirs()) {
             file
-        } else file
+        } else {
+            file
+        }
     }
 
     internal fun deleteRootFileResourceDirectory(context: Context) {
@@ -92,7 +94,9 @@ object FileResourceDirectoryHelper {
         val file = File(context.cacheDir, childPath)
         return if (!file.exists() && file.mkdirs()) {
             file
-        } else file
+        } else {
+            file
+        }
     }
 
     internal fun getSubfolderName(databaseName: String): String {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 6ece628960..80393ede3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -45,7 +45,10 @@ internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyColl
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<M, R>(
-    store, childrenAppenders, scope, cf
+    store,
+    childrenAppenders,
+    scope,
+    cf
 ),
     ReadOnlyNameableCollectionRepository<M, R> where M : CoreObject, M : NameableObject {
     override fun byShortName(): StringFilterConnector<R> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index 22530cfdd9..3c052b368c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -47,8 +47,9 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
 
-internal open class ReadOnlyWithTransformerCollectionRepositoryImpl
-<M : CoreObject, T : Any, R : ReadOnlyCollectionRepository<T>> internal constructor(
+internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
+    M : CoreObject, T : Any, R : ReadOnlyCollectionRepository<T>
+    > internal constructor(
     private val store: ReadableStore<M>,
     val childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
@@ -84,7 +85,8 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl
     override fun blockingGet(): List<T> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
             blockingGetWithoutChildren(),
-            childrenAppenders, scope.children()
+            childrenAppenders,
+            scope.children()
         ).map { transformer.transform(it) }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index f7db5e0712..8e85d0d3a2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -42,8 +42,9 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
-internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
-<M, T, R : ReadOnlyCollectionRepository<T>> internal constructor(
+internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
+    M, T, R : ReadOnlyCollectionRepository<T>
+    > internal constructor(
     private val store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
@@ -51,7 +52,7 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
     override val transformer: TwoWayTransformer<M, T>
 ) : ReadOnlyWithTransformerCollectionRepositoryImpl<M, T, R>(store, childrenAppenders, scope, cf, transformer),
     ReadOnlyWithUidCollectionRepository<T>
-        where M : CoreObject, M : ObjectWithUidInterface, T : ObjectWithUidInterface {
+    where M : CoreObject, M : ObjectWithUidInterface, T : ObjectWithUidInterface {
     /**
      * Get the list of uids of objects in scope in an asynchronous way, returning a `Single<List<String>>`.
      *
@@ -71,7 +72,8 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
         return store.selectUidsWhere(
             whereClause,
             OrderByClauseBuilder.orderByFromItems(
-                scope.orderBy(), scope.pagingKey()
+                scope.orderBy(),
+                scope.pagingKey()
             )
         )
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index 6596774b78..78d9805aa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -43,7 +43,10 @@ open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepo
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
-    store, childrenAppenders, scope, cf
+    store,
+    childrenAppenders,
+    scope,
+    cf
 ) where M : CoreObject, M : ObjectWithUidInterface {
     /**
      * Returns a new [ReadOnlyObjectRepository] whose scope is the one of the current repository plus the
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index a33c758c84..e33100e1c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -49,7 +49,10 @@ internal abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadO
     @JvmField protected val transformer: Transformer<P, M>,
     cf: FilterConnectorFactory<R>
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
-    store, childrenAppenders, scope, cf
+    store,
+    childrenAppenders,
+    scope,
+    cf
 ),
     ReadWriteWithUidCollectionRepository<M, P> where M : CoreObject, M : ObjectWithUidInterface {
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
index a395a46931..03e4c3a1d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
@@ -38,7 +38,9 @@ class ReadOnlyOneObjectRepositoryFinalImpl<M> internal constructor(
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope
 ) : ReadOnlyOneObjectRepositoryImpl<M, ReadOnlyOneObjectRepositoryFinalImpl<M>>(
-    store, childrenAppenders, scope,
+    store,
+    childrenAppenders,
+    scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         ReadOnlyOneObjectRepositoryFinalImpl(
             store,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
index c353955855..51f3af8e88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
@@ -58,7 +58,8 @@ abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>>
      */
     override fun blockingGet(): M? {
         return ChildrenAppenderExecutor.appendInObject(
-            blockingGetWithoutChildren(), childrenAppenders,
+            blockingGetWithoutChildren(),
+            childrenAppenders,
             scope.children()
         )
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
index 74e8eb566d..82891dcfae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
@@ -65,7 +65,9 @@ internal constructor(
      */
     override fun blockingGet(): T? {
         val item = ChildrenAppenderExecutor.appendInObject(
-            blockingGetWithoutChildren(), childrenAppenders, scope.children()
+            blockingGetWithoutChildren(),
+            childrenAppenders,
+            scope.children()
         )
 
         return item?.let { transformer.transform(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
index ab62903efb..423b615284 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
@@ -49,7 +49,8 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
         val whereClause = WhereClauseFromScopeBuilder(WhereClauseBuilder()).getWhereClause(scope)
         val withoutChildren = store.selectWhere(
             whereClause,
-            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()), params.requestedLoadSize
+            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+            params.requestedLoadSize
         )
         callback.onResult(appendChildren(withoutChildren))
     }
@@ -65,8 +66,11 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
     private fun loadPages(params: LoadParams<M>, callback: LoadCallback<T>, reversed: Boolean) {
         val whereClauseBuilder = WhereClauseBuilder()
         OrderByClauseBuilder.addSortingClauses(
-            whereClauseBuilder, scope.orderBy(),
-            params.key.toContentValues(), reversed, scope.pagingKey()
+            whereClauseBuilder,
+            scope.orderBy(),
+            params.key.toContentValues(),
+            reversed,
+            scope.pagingKey()
         )
         val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope)
         val withoutChildren = store.selectWhere(
@@ -83,7 +87,9 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
 
     private fun appendChildren(withoutChildren: List<M>): List<T> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
-            withoutChildren, childrenAppenders, scope.children()
+            withoutChildren,
+            childrenAppenders,
+            scope.children()
         ).map { transformer.transform(it) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
index a3809829bd..920b16d6c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
@@ -48,7 +48,7 @@ class CategoryOptionComboService @Inject constructor(
     }
 
     fun blockingHasWriteAccess(
-        categoryOptions: List<CategoryOption>,
+        categoryOptions: List<CategoryOption>
     ): Boolean {
         return categoryOptions.none { it.access().data().write() == false }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
index c9e840e832..e8775fe809 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
@@ -53,7 +53,8 @@ internal class CategoryComboHandler constructor(
                 .build()
         }
         categoryCategoryComboLinkHandler.handleMany(
-            o.uid(), o.categories()
+            o.uid(),
+            o.categories()
         ) { category: Category, sortOrder: Int? ->
             CategoryCategoryComboLink.builder()
                 .categoryCombo(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
index 63584afcee..5bbcf1ec26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
@@ -46,7 +46,8 @@ internal class CategoryOptionOrganisationUnitChildrenAppender private constructo
         val builder = categoryOption.toBuilder()
         val whereClause = WhereClauseBuilder().apply {
             appendKeyStringValue(
-                CategoryOptionOrganisationUnitLinkTableInfo.Columns.CATEGORY_OPTION, categoryOption.uid()
+                CategoryOptionOrganisationUnitLinkTableInfo.Columns.CATEGORY_OPTION,
+                categoryOption.uid()
             )
         }.build()
         val links = childStore.selectWhere(whereClause)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
index dc0de40542..aa1acd9293 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
@@ -70,7 +70,6 @@ internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
         uids: Set<String>,
         data: Map<String, List<String?>>
     ): Map<String, List<CategoryOptionRestriction>> {
-
         val updatedEntries = mutableMapOf<String, List<CategoryOptionRestriction>>()
         for (uid in uids) {
             if (!data.keys.contains(uid)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt b/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt
index b7f268730e..ae9bc772e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt
@@ -38,49 +38,138 @@ enum class RelativePeriod constructor(
     internal val periodsThisYear: Boolean = false,
     internal val periodsLastYear: Boolean = false
 ) {
-    @JsonAlias("today", "thisDay") TODAY(PeriodType.Daily, 0, 1),
-    @JsonAlias("yesterday") YESTERDAY(PeriodType.Daily, -1, 0),
-    @JsonAlias("last3Days") LAST_3_DAYS(PeriodType.Daily, -3, 0),
-    @JsonAlias("last7Days") LAST_7_DAYS(PeriodType.Daily, -7, 0),
-    @JsonAlias("last14Days") LAST_14_DAYS(PeriodType.Daily, -14, 0),
-    @JsonAlias("last30Days") LAST_30_DAYS(PeriodType.Daily, -30, 0),
-    @JsonAlias("last60Days") LAST_60_DAYS(PeriodType.Daily, -60, 0),
-    @JsonAlias("last90Days") LAST_90_DAYS(PeriodType.Daily, -90, 0),
-    @JsonAlias("last180Days") LAST_180_DAYS(PeriodType.Daily, -180, 0),
-    @JsonAlias("thisMonth") THIS_MONTH(PeriodType.Monthly, 0, 1),
-    @JsonAlias("lastMonth") LAST_MONTH(PeriodType.Monthly, -1, 0),
-    @JsonAlias("thisBimonth") THIS_BIMONTH(PeriodType.BiMonthly, 0, 1),
-    @JsonAlias("lastBimonth") LAST_BIMONTH(PeriodType.BiMonthly, -1, 0),
-    @JsonAlias("thisQuarter") THIS_QUARTER(PeriodType.Quarterly, 0, 1),
-    @JsonAlias("lastQuarter") LAST_QUARTER(PeriodType.Quarterly, -1, 0),
-    @JsonAlias("thisSixMonth") THIS_SIX_MONTH(PeriodType.SixMonthly, 0, 1),
-    @JsonAlias("lastSixMonth") LAST_SIX_MONTH(PeriodType.SixMonthly, -1, 0),
-    @JsonAlias("weeksThisYear") WEEKS_THIS_YEAR(PeriodType.Weekly, null, null, true, false),
-    @JsonAlias("monthsThisYear") MONTHS_THIS_YEAR(PeriodType.Monthly, null, null, true, false),
-    @JsonAlias("biMonthsThisYear") BIMONTHS_THIS_YEAR(PeriodType.BiMonthly, null, null, true, false),
-    @JsonAlias("quartersThisYear") QUARTERS_THIS_YEAR(PeriodType.Quarterly, null, null, true, false),
-    @JsonAlias("thisYear") THIS_YEAR(PeriodType.Yearly, 0, 1),
-    @JsonAlias("monthsLastYear") MONTHS_LAST_YEAR(PeriodType.Monthly, null, null, false, true),
-    @JsonAlias("quartersLastYear") QUARTERS_LAST_YEAR(PeriodType.Quarterly, null, null, false, true),
-    @JsonAlias("lastYear") LAST_YEAR(PeriodType.Yearly, -1, 0),
-    @JsonAlias("last5Years") LAST_5_YEARS(PeriodType.Yearly, -5, 0),
-    @JsonAlias("last10Years") LAST_10_YEARS(PeriodType.Yearly, -10, 0),
-    @JsonAlias("last12Months") LAST_12_MONTHS(PeriodType.Monthly, -12, 0),
-    @JsonAlias("last6Months") LAST_6_MONTHS(PeriodType.Monthly, -6, 0),
-    @JsonAlias("last3Months") LAST_3_MONTHS(PeriodType.Monthly, -3, 0),
-    @JsonAlias("last6BiMonths") LAST_6_BIMONTHS(PeriodType.BiMonthly, -6, 0),
-    @JsonAlias("last4Quarters") LAST_4_QUARTERS(PeriodType.Quarterly, -4, 0),
-    @JsonAlias("last2SixMonths") LAST_2_SIXMONTHS(PeriodType.SixMonthly, -2, 0),
-    @JsonAlias("thisFinancialYear") THIS_FINANCIAL_YEAR(PeriodType.FinancialApril, 0, 1),
-    @JsonAlias("lastFinancialYear") LAST_FINANCIAL_YEAR(PeriodType.FinancialApril, -1, 0),
-    @JsonAlias("last5FinancialYears") LAST_5_FINANCIAL_YEARS(PeriodType.FinancialApril, -5, 0),
-    @JsonAlias("last10FinancialYears") LAST_10_FINANCIAL_YEARS(PeriodType.FinancialApril, -10, 0),
-    @JsonAlias("thisWeek") THIS_WEEK(PeriodType.Weekly, 0, 1),
-    @JsonAlias("lastWeek") LAST_WEEK(PeriodType.Weekly, -1, 0),
-    @JsonAlias("thisBiWeek") THIS_BIWEEK(PeriodType.BiWeekly, 0, 1),
-    @JsonAlias("lastBiWeek") LAST_BIWEEK(PeriodType.BiWeekly, -1, 0),
-    @JsonAlias("last4Weeks") LAST_4_WEEKS(PeriodType.Weekly, -4, 0),
-    @JsonAlias("last4BiWeeks") LAST_4_BIWEEKS(PeriodType.BiWeekly, -4, 0),
-    @JsonAlias("last12Weeks") LAST_12_WEEKS(PeriodType.Weekly, -12, 0),
-    @JsonAlias("last52Weeks") LAST_52_WEEKS(PeriodType.Weekly, -52, 0)
+    @JsonAlias("today", "thisDay")
+    TODAY(PeriodType.Daily, 0, 1),
+
+    @JsonAlias("yesterday")
+    YESTERDAY(PeriodType.Daily, -1, 0),
+
+    @JsonAlias("last3Days")
+    LAST_3_DAYS(PeriodType.Daily, -3, 0),
+
+    @JsonAlias("last7Days")
+    LAST_7_DAYS(PeriodType.Daily, -7, 0),
+
+    @JsonAlias("last14Days")
+    LAST_14_DAYS(PeriodType.Daily, -14, 0),
+
+    @JsonAlias("last30Days")
+    LAST_30_DAYS(PeriodType.Daily, -30, 0),
+
+    @JsonAlias("last60Days")
+    LAST_60_DAYS(PeriodType.Daily, -60, 0),
+
+    @JsonAlias("last90Days")
+    LAST_90_DAYS(PeriodType.Daily, -90, 0),
+
+    @JsonAlias("last180Days")
+    LAST_180_DAYS(PeriodType.Daily, -180, 0),
+
+    @JsonAlias("thisMonth")
+    THIS_MONTH(PeriodType.Monthly, 0, 1),
+
+    @JsonAlias("lastMonth")
+    LAST_MONTH(PeriodType.Monthly, -1, 0),
+
+    @JsonAlias("thisBimonth")
+    THIS_BIMONTH(PeriodType.BiMonthly, 0, 1),
+
+    @JsonAlias("lastBimonth")
+    LAST_BIMONTH(PeriodType.BiMonthly, -1, 0),
+
+    @JsonAlias("thisQuarter")
+    THIS_QUARTER(PeriodType.Quarterly, 0, 1),
+
+    @JsonAlias("lastQuarter")
+    LAST_QUARTER(PeriodType.Quarterly, -1, 0),
+
+    @JsonAlias("thisSixMonth")
+    THIS_SIX_MONTH(PeriodType.SixMonthly, 0, 1),
+
+    @JsonAlias("lastSixMonth")
+    LAST_SIX_MONTH(PeriodType.SixMonthly, -1, 0),
+
+    @JsonAlias("weeksThisYear")
+    WEEKS_THIS_YEAR(PeriodType.Weekly, null, null, true, false),
+
+    @JsonAlias("monthsThisYear")
+    MONTHS_THIS_YEAR(PeriodType.Monthly, null, null, true, false),
+
+    @JsonAlias("biMonthsThisYear")
+    BIMONTHS_THIS_YEAR(PeriodType.BiMonthly, null, null, true, false),
+
+    @JsonAlias("quartersThisYear")
+    QUARTERS_THIS_YEAR(PeriodType.Quarterly, null, null, true, false),
+
+    @JsonAlias("thisYear")
+    THIS_YEAR(PeriodType.Yearly, 0, 1),
+
+    @JsonAlias("monthsLastYear")
+    MONTHS_LAST_YEAR(PeriodType.Monthly, null, null, false, true),
+
+    @JsonAlias("quartersLastYear")
+    QUARTERS_LAST_YEAR(PeriodType.Quarterly, null, null, false, true),
+
+    @JsonAlias("lastYear")
+    LAST_YEAR(PeriodType.Yearly, -1, 0),
+
+    @JsonAlias("last5Years")
+    LAST_5_YEARS(PeriodType.Yearly, -5, 0),
+
+    @JsonAlias("last10Years")
+    LAST_10_YEARS(PeriodType.Yearly, -10, 0),
+
+    @JsonAlias("last12Months")
+    LAST_12_MONTHS(PeriodType.Monthly, -12, 0),
+
+    @JsonAlias("last6Months")
+    LAST_6_MONTHS(PeriodType.Monthly, -6, 0),
+
+    @JsonAlias("last3Months")
+    LAST_3_MONTHS(PeriodType.Monthly, -3, 0),
+
+    @JsonAlias("last6BiMonths")
+    LAST_6_BIMONTHS(PeriodType.BiMonthly, -6, 0),
+
+    @JsonAlias("last4Quarters")
+    LAST_4_QUARTERS(PeriodType.Quarterly, -4, 0),
+
+    @JsonAlias("last2SixMonths")
+    LAST_2_SIXMONTHS(PeriodType.SixMonthly, -2, 0),
+
+    @JsonAlias("thisFinancialYear")
+    THIS_FINANCIAL_YEAR(PeriodType.FinancialApril, 0, 1),
+
+    @JsonAlias("lastFinancialYear")
+    LAST_FINANCIAL_YEAR(PeriodType.FinancialApril, -1, 0),
+
+    @JsonAlias("last5FinancialYears")
+    LAST_5_FINANCIAL_YEARS(PeriodType.FinancialApril, -5, 0),
+
+    @JsonAlias("last10FinancialYears")
+    LAST_10_FINANCIAL_YEARS(PeriodType.FinancialApril, -10, 0),
+
+    @JsonAlias("thisWeek")
+    THIS_WEEK(PeriodType.Weekly, 0, 1),
+
+    @JsonAlias("lastWeek")
+    LAST_WEEK(PeriodType.Weekly, -1, 0),
+
+    @JsonAlias("thisBiWeek")
+    THIS_BIWEEK(PeriodType.BiWeekly, 0, 1),
+
+    @JsonAlias("lastBiWeek")
+    LAST_BIWEEK(PeriodType.BiWeekly, -1, 0),
+
+    @JsonAlias("last4Weeks")
+    LAST_4_WEEKS(PeriodType.Weekly, -4, 0),
+
+    @JsonAlias("last4BiWeeks")
+    LAST_4_BIWEEKS(PeriodType.BiWeekly, -4, 0),
+
+    @JsonAlias("last12Weeks")
+    LAST_12_WEEKS(PeriodType.Weekly, -12, 0),
+
+    @JsonAlias("last52Weeks")
+    LAST_52_WEEKS(PeriodType.Weekly, -52, 0)
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
index e39cb6f092..23a2dfba7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
@@ -41,7 +41,8 @@ internal class DatabaseConfigurationHelper @Inject constructor(
             .encrypted(!account.encrypted())
             .databaseName(
                 databaseNameGenerator.getDatabaseName(
-                    serverUrl!!, account.username(),
+                    serverUrl!!,
+                    account.username(),
                     !account.encrypted()
                 )
             )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
index 273efa1eb9..c8676cd2b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
@@ -177,7 +177,10 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
         encrypt: Boolean
     ): DatabaseAccount {
         val updatedAccount = configurationHelper.addAccount(
-            databaseConfigurationSecureStore.get(), serverUrl, username, encrypt
+            databaseConfigurationSecureStore.get(),
+            serverUrl,
+            username,
+            encrypt
         )
         databaseConfigurationSecureStore.set(updatedAccount)
         return DatabaseConfigurationHelper.getLoggedAccount(updatedAccount, username, serverUrl)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
index 9961b3a1da..1540a2996c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
@@ -48,7 +48,9 @@ internal class MultiUserDatabaseManagerForD2Manager @Inject constructor(
         if (databaseConfiguration != null && credentials != null) {
             ServerURLWrapper.setServerUrl(credentials.serverUrl)
             val account = DatabaseConfigurationHelper.getLoggedAccount(
-                databaseConfiguration, credentials.username, credentials.serverUrl
+                databaseConfiguration,
+                credentials.username,
+                credentials.serverUrl
             )
             databaseAdapterFactory.createOrOpenDatabase(databaseAdapter, account)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParser.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParser.kt
index 5be9dd00e0..94bb905b33 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParser.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.configuration.internal
 
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
@@ -44,7 +45,7 @@ internal object ServerUrlParser {
                 .build()
         }
         val urlWithSlashAndAPI = appendSlashAndAPI(url)
-        val httpUrl = HttpUrl.parse(appendSlashAndAPI(urlWithSlashAndAPI))
+        val httpUrl = appendSlashAndAPI(urlWithSlashAndAPI).toHttpUrlOrNull()
 
         return httpUrl
             ?: throw D2Error.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
index c990b21c10..6309dfad31 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
@@ -51,7 +51,8 @@ internal class DataElementHandler constructor(
             val attributes = AttributeValueUtils.extractAttributes(o.attributeValues())
             attributeHandler.handleMany(attributes)
             dataElementAttributeLinkHandler.handleMany(
-                o.uid(), attributes
+                o.uid(),
+                attributes
             ) { attribute: Attribute ->
                 DataElementAttributeValueLink.builder()
                     .dataElement(o.uid())
@@ -62,7 +63,8 @@ internal class DataElementHandler constructor(
         }
         if (o.legendSets() != null) {
             dataElementLegendSetLinkHandler.handleMany(
-                o.uid(), o.legendSets()
+                o.uid(),
+                o.legendSets()
             ) { legendSet: ObjectWithUid, sortOrder: Int? ->
                 DataElementLegendSetLink.builder()
                     .dataElement(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
index e9457b7f63..7fe3d18803 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -60,13 +60,19 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     private val postCall: DataSetCompleteRegistrationPostCall,
     private val credentialsRepository: UserCredentialsObjectRepository
 ) : ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationCollectionRepository>(
-    dataSetCompleteRegistrationStore, childrenAppenders, scope,
+    dataSetCompleteRegistrationStore,
+    childrenAppenders,
+    scope,
     FilterConnectorFactory(
         scope
     ) { s: RepositoryScope ->
         DataSetCompleteRegistrationCollectionRepository(
-            dataSetCompleteRegistrationStore, childrenAppenders,
-            s, handler, postCall, credentialsRepository
+            dataSetCompleteRegistrationStore,
+            childrenAppenders,
+            s,
+            handler,
+            postCall,
+            credentialsRepository
         )
     }
 ),
@@ -82,8 +88,14 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
             .byDataSetUid().eq(dataSet)
             .byAttributeOptionComboUid().eq(attributeOptionCombo).scope
         return DataSetCompleteRegistrationObjectRepository(
-            dataSetCompleteRegistrationStore, credentialsRepository, childrenAppenders,
-            updatedScope, period, organisationUnit, dataSet, attributeOptionCombo
+            dataSetCompleteRegistrationStore,
+            credentialsRepository,
+            childrenAppenders,
+            updatedScope,
+            period,
+            organisationUnit,
+            dataSet,
+            attributeOptionCombo
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt
index d3244fff46..6d278ecf61 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt
@@ -36,5 +36,5 @@ enum class DataSetNonEditableReason {
     PERIOD_IS_NOT_IN_ORGUNIT_RANGE,
     PERIOD_IS_NOT_IN_ATTRIBUTE_OPTION_RANGE,
     CLOSED,
-    EXPIRED,
+    EXPIRED
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
index 80814a776a..5d8da36d64 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
@@ -55,7 +55,8 @@ internal class DataInputPeriodStoreImpl(
             w.bind(4, dataInputPeriod.closingDate())
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
-            DataInputPeriodTableInfo.TABLE_INFO, DataInputPeriodTableInfo.Columns.DATA_SET
+            DataInputPeriodTableInfo.TABLE_INFO,
+            DataInputPeriodTableInfo.Columns.DATA_SET
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
index 6171390482..11517323c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
@@ -56,7 +56,9 @@ internal class DataSetCompleteRegistrationCallProcessor @Inject internal constru
     private fun removeExistingRegistersForQuery(query: DataSetCompleteRegistrationQuery) {
         for (rootOrgUnitUid in query.rootOrgUnitUids) {
             dataSetCompleteRegistrationStore.removeNotPresentAndSynced(
-                query.dataSetUids, query.periodIds, rootOrgUnitUid
+                query.dataSetUids,
+                query.periodIds,
+                rootOrgUnitUid
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 8fcc47e762..1e38446373 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -127,7 +127,9 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
             )
         }
         dataSetCompleteRegistrationImportHandler.handleImportSummary(
-            payload, dataValueImportSummary, deletedDataSetCompleteRegistrations,
+            payload,
+            dataValueImportSummary,
+            deletedDataSetCompleteRegistrations,
             withErrorDataSetCompleteRegistrations
         )
         emit(progressManager.increaseProgress(DataSetCompleteRegistration::class.java, true))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
index ffe380d65d..572183be8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
@@ -33,7 +33,7 @@ internal data class DataSetCompleteRegistrationQuery(
     val dataSetUids: Collection<String>,
     val periodIds: Collection<String>,
     val rootOrgUnitUids: Collection<String>,
-    val lastUpdatedStr: String?,
+    val lastUpdatedStr: String?
 ) : BaseQueryKt(
     page = 1,
     pageSize = DEFAULT_PAGE_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
index 564f84f6ba..58f50f4a9c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
@@ -40,7 +40,8 @@ internal class DataSetElementStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : DataSetElementStore,
     LinkStoreImpl<DataSetElement>(
-        databaseAdapter, DataSetElementLinkTableInfo.TABLE_INFO,
+        databaseAdapter,
+        DataSetElementLinkTableInfo.TABLE_INFO,
         DataSetElementLinkTableInfo.Columns.DATA_SET,
         BINDER,
         { cursor: Cursor -> DataSetElement.create(cursor) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index fafb958715..8dc41db529 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -71,12 +71,14 @@ internal class DataSetHandler constructor(
             dataInputPeriod.toBuilder().dataSet(ObjectWithUid.create(o.uid())).build()
         }
         dataSetElementLinkHandler.handleMany(
-            o.uid(), o.dataSetElements()
+            o.uid(),
+            o.dataSetElements()
         ) { dataSetElement: DataSetElement ->
             dataSetElement.toBuilder().dataSet(ObjectWithUid.create(o.uid())).build()
         }
         dataSetIndicatorLinkHandler.handleMany(
-            o.uid(), o.indicators()
+            o.uid(),
+            o.indicators()
         ) { indicator: Indicator ->
             DataSetIndicatorLink.builder().dataSet(o.uid()).indicator(indicator.uid()).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index 39ffccc7e0..b4ac99c86f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -54,7 +54,7 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
     private val organisationUnitService: OrganisationUnitService,
     private val periodHelper: PeriodHelper,
     private val categoryOptionComboService: CategoryOptionComboService,
-    private val periodGenerator: ParentPeriodGenerator,
+    private val periodGenerator: ParentPeriodGenerator
 ) : DataSetInstanceService {
 
     override fun getEditableStatus(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
index 9f8709f4f7..d59f7bad26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
@@ -39,7 +39,8 @@ internal class DataSetOrganisationUnitLinkStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : DataSetOrganisationUnitLinkStore,
     LinkStoreImpl<DataSetOrganisationUnitLink>(
-        databaseAdapter, DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
+        databaseAdapter,
+        DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
         DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
         BINDER,
         { cursor: Cursor -> DataSetOrganisationUnitLink.create(cursor) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
index c3a0b4be17..987b643027 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
@@ -39,7 +39,8 @@ internal class SectionDataElementLinkStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : SectionDataElementLinkStore,
     LinkStoreImpl<SectionDataElementLink>(
-        databaseAdapter, SectionDataElementLinkTableInfo.TABLE_INFO,
+        databaseAdapter,
+        SectionDataElementLinkTableInfo.TABLE_INFO,
         SectionDataElementLinkTableInfo.Columns.SECTION,
         BINDER,
         { cursor: Cursor -> SectionDataElementLink.create(cursor) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
index 10664a4b13..9637c545bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
@@ -39,7 +39,8 @@ internal class SectionGreyedFieldsLinkStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : SectionGreyedFieldsLinkStore,
     LinkStoreImpl<SectionGreyedFieldsLink>(
-        databaseAdapter, SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
+        databaseAdapter,
+        SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
         SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
         BINDER,
         { cursor: Cursor -> SectionGreyedFieldsLink.create(cursor) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
index bef9c9db9e..44ee0f5989 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
@@ -53,7 +53,8 @@ internal class SectionHandler @Inject constructor(
 
     override fun afterObjectHandled(o: Section, action: HandleAction) {
         sectionDataElementLinkHandler.handleMany(
-            o.uid(), o.dataElements()
+            o.uid(),
+            o.dataElements()
         ) { dataElement: DataElement, sortOrder: Int ->
             SectionDataElementLink.builder()
                 .section(o.uid())
@@ -63,7 +64,8 @@ internal class SectionHandler @Inject constructor(
         }
 
         sectionIndicatorLinkHandler.handleMany(
-            o.uid(), o.indicators()
+            o.uid(),
+            o.indicators()
         ) {
             SectionIndicatorLink.builder()
                 .section(o.uid())
@@ -81,7 +83,8 @@ internal class SectionHandler @Inject constructor(
         )
 
         sectionGreyedFieldsLinkHandler.handleMany(
-            o.uid(), o.greyedFields()
+            o.uid(),
+            o.greyedFields()
         ) { dataElementOperand: DataElementOperand ->
             SectionGreyedFieldsLink.builder()
                 .section(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt
index 6ac7002eba..fd80854f44 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt
@@ -62,7 +62,7 @@ object DataStoreEntryTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 NAMESPACE,
-                KEY,
+                KEY
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
index 26929cc626..6e6d8fd6bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
@@ -86,8 +86,14 @@ class DataValueCollectionRepository @Inject internal constructor(
             .byCategoryOptionComboUid().eq(categoryOptionCombo)
             .byAttributeOptionComboUid().eq(attributeOptionCombo).scope
         return DataValueObjectRepository(
-            store, childrenAppenders, updatedScope, period, organisationUnit,
-            dataElement, categoryOptionCombo, attributeOptionCombo
+            store,
+            childrenAppenders,
+            updatedScope,
+            period,
+            organisationUnit,
+            dataElement,
+            categoryOptionCombo,
+            attributeOptionCombo
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
index 40bba6d127..71d650148f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
@@ -118,7 +118,10 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
             pastPeriods = pastPeriods,
             futurePeriods = futurePeriods,
             lastUpdated = lastUpdatedCalculator.getLastUpdated(
-                syncValue, dataSet, pastPeriods, futurePeriods,
+                syncValue,
+                dataSet,
+                pastPeriods,
+                futurePeriods,
                 organisationUnitsHash
             )
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 91f1c56e56..5f32e421c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -95,7 +95,7 @@ internal class MetadataCall @Inject constructor(
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val legendSetModuleDownloader: LegendSetModuleDownloader,
-    private val expressionDimensionItemModuleDownloader: ExpressionDimensionItemModuleDownloader,
+    private val expressionDimensionItemModuleDownloader: ExpressionDimensionItemModuleDownloader
 ) {
 
     companion object {
@@ -112,8 +112,11 @@ internal class MetadataCall @Inject constructor(
                 executeIndependentCalls(progressManager).collect { send(it) }
                 executeUserCallAndChildren(progressManager).collect { send(it) }
             } catch (e: Exception) {
-                if (e !is D2Error && e.cause is D2Error) throw e.cause!!
-                else throw e
+                if (e !is D2Error && e.cause is D2Error) {
+                    throw e.cause!!
+                } else {
+                    throw e
+                }
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
index f8082a20fd..0d72509ab7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
@@ -101,7 +101,9 @@ internal class EnrollmentHandler constructor(
                     noteVersionManager.transform(Note.NoteType.ENROLLMENT_NOTE, o.uid(), note)
                 }
                 val notesToSync = noteUniquenessManager.buildUniqueCollection(
-                    transformed, Note.NoteType.ENROLLMENT_NOTE, o.uid()
+                    transformed,
+                    Note.NoteType.ENROLLMENT_NOTE,
+                    o.uid()
                 )
                 noteHandler.handleMany(notesToSync)
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
index 98c581f3bf..bef2ea26b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
@@ -159,15 +159,21 @@ internal class EnrollmentImportHandler @Inject constructor(
             // Tracker importer does not notify about enrollments already deleted in the server.
             // This is a workaround to accept as SUCCESS a missing enrollment only if it was deleted in the device.
             val state =
-                if (teiState == State.SYNCED && enrollment.deleted() == true) State.SYNCED
-                else State.TO_UPDATE
+                if (teiState == State.SYNCED && enrollment.deleted() == true) {
+                    State.SYNCED
+                } else {
+                    State.TO_UPDATE
+                }
 
             trackerImportConflictStore.deleteEnrollmentConflicts(enrollment.uid())
             enrollmentStore.setSyncStateOrDelete(enrollment.uid(), state)
             resetNestedDataStates(enrollment)
 
-            if (state == State.SYNCED) null
-            else enrollment
+            if (state == State.SYNCED) {
+                null
+            } else {
+                enrollment
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index 97440a0dfd..791cd3f76a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -74,16 +74,25 @@ internal class EnrollmentServiceImpl @Inject constructor(
         val program = programRepository.uid(programUid).blockingGet() ?: return EnrollmentAccess.NO_ACCESS
 
         val dataAccess =
-            if (program.access()?.data()?.write() == true) EnrollmentAccess.WRITE_ACCESS
-            else EnrollmentAccess.READ_ACCESS
+            if (program.access()?.data()?.write() == true) {
+                EnrollmentAccess.WRITE_ACCESS
+            } else {
+                EnrollmentAccess.READ_ACCESS
+            }
 
         return when (program.accessLevel()) {
             AccessLevel.PROTECTED ->
-                if (hasTempOwnership(trackedEntityInstanceUid, programUid)) dataAccess
-                else EnrollmentAccess.PROTECTED_PROGRAM_DENIED
+                if (hasTempOwnership(trackedEntityInstanceUid, programUid)) {
+                    dataAccess
+                } else {
+                    EnrollmentAccess.PROTECTED_PROGRAM_DENIED
+                }
             AccessLevel.CLOSED ->
-                if (isTeiInCaptureScope(trackedEntityInstanceUid)) dataAccess
-                else EnrollmentAccess.CLOSED_PROGRAM_DENIED
+                if (isTeiInCaptureScope(trackedEntityInstanceUid)) {
+                    dataAccess
+                } else {
+                    EnrollmentAccess.CLOSED_PROGRAM_DENIED
+                }
             else ->
                 dataAccess
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
index ac9104bfcc..7642681d66 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
@@ -93,7 +93,9 @@ internal class EventHandler @Inject constructor(
                     noteVersionManager.transform(Note.NoteType.EVENT_NOTE, o.uid(), note)
                 }
                 val notesToSync = noteUniquenessManager.buildUniqueCollection(
-                    transformed, Note.NoteType.EVENT_NOTE, o.uid()
+                    transformed,
+                    Note.NoteType.EVENT_NOTE,
+                    o.uid()
                 )
                 noteHandler.handleMany(notesToSync)
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
index 7e4243e189..c91af40a89 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
@@ -52,7 +52,7 @@ internal class EventImportHandler @Inject constructor(
     private val trackerImportConflictStore: TrackerImportConflictStore,
     private val trackerImportConflictParser: TrackerImportConflictParser,
     private val jobReportEventHandler: JobReportEventHandler,
-    private val dataStatePropagator: DataStatePropagator,
+    private val dataStatePropagator: DataStatePropagator
 ) {
 
     @Suppress("NestedBlockDepth")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
index 337b5e33f6..6baab4ce7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
@@ -44,7 +44,9 @@ internal class EventQueryBundleFactory @Inject constructor(
     lastUpdatedManager: EventLastUpdatedManager,
     commonHelper: TrackerQueryFactoryCommonHelper
 ) : TrackerQueryFactory<EventQueryBundle, EventSync>(
-    programStore, programSettingsObjectRepository, lastUpdatedManager,
+    programStore,
+    programSettingsObjectRepository,
+    lastUpdatedManager,
     commonHelper,
     ProgramType.WITHOUT_REGISTRATION,
     { params: ProgramDataDownloadParams,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt
index 08112773aa..67acf8397c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt
@@ -45,14 +45,20 @@ internal class EventQueryBundleInternalFactory constructor(
         orgUnitByLimitExtractor: () -> List<String>
     ): List<EventQueryBundle> {
         val limit = commonHelper.getLimit(
-            params, programSettings, programUid
+            params,
+            programSettings,
+            programUid
         ) { it?.eventsDownload() }
         if (limit == 0 || programs.isEmpty()) {
             return emptyList()
         }
         val commonParams: TrackerQueryCommonParams = commonHelper.getCommonParams(
-            params, programSettings,
-            programs, programUid, limit, orgUnitByLimitExtractor
+            params,
+            programSettings,
+            programs,
+            programUid,
+            limit,
+            orgUnitByLimitExtractor
         ) { it?.eventDateDownload() }
 
         val builder = EventQueryBundle.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index d7c6ddaf25..bef914a8eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -63,7 +63,7 @@ internal interface EventService {
         @Query(LAST_UPDATED_START_DATE) lastUpdatedStartDate: String? = null,
         @Query(LAST_UPDATED_END_DATE) lastUpdatedEndDate: String? = null,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean,
-        @Query(EVENT) eventUid: String? = null,
+        @Query(EVENT) eventUid: String? = null
     ): Payload<Event>
 
     @GET("$EVENTS/{$EVENT_UID}")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
index ea5b963e8f..e4c5b39d0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
@@ -146,8 +146,11 @@ internal class EventServiceImpl @Inject constructor(
         val isActiveEnrollment = enrollment.status() == EnrollmentStatus.ACTIVE
 
         val acceptMoreEvents =
-            if (programStage.repeatable() == true) true
-            else getEventCount(enrollmentUid, programStageUid) == 0
+            if (programStage.repeatable() == true) {
+                true
+            } else {
+                getEventCount(enrollmentUid, programStageUid) == 0
+            }
 
         return isActiveEnrollment && acceptMoreEvents
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
index 34254225e5..e90fc211fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
@@ -60,7 +60,8 @@ internal class EventStoreImpl(
         val eventsAttachedToEnrollmentsQuery = WhereClauseBuilder()
             .appendIsNotNullValue(EventTableInfo.Columns.ENROLLMENT)
             .appendInKeyStringValues(
-                EventTableInfo.Columns.AGGREGATED_SYNC_STATE, asStringList(uploadableStatesIncludingError().toList())
+                EventTableInfo.Columns.AGGREGATED_SYNC_STATE,
+                asStringList(uploadableStatesIncludingError().toList())
             ).build()
         val eventList = selectWhere(eventsAttachedToEnrollmentsQuery)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index 6fcde65e73..99cb0086f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -158,7 +158,6 @@ internal class FileResourceDownloadCall @Inject constructor(
         download: suspend (V) -> ResponseBody?,
         getUid: (V) -> String?
     ) {
-
         val fileResources = values.mapNotNull { downloadFile(it, maxContentLength, download, getUid) }
 
         handler.handleMany(fileResources) { fileResource: FileResource ->
@@ -175,7 +174,6 @@ internal class FileResourceDownloadCall @Inject constructor(
         download: suspend (V) -> ResponseBody?,
         getUid: (V) -> String?
     ): FileResource? {
-
         return getUid(value)?.let { uid ->
             try {
                 val fileResource =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
index 430847017d..25ccf1cba9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
@@ -34,7 +34,7 @@ import dagger.Reusable
 import java.io.File
 import java.io.IOException
 import javax.inject.Inject
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -92,7 +92,7 @@ internal class FileResourcePostCall @Inject constructor(
         val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) ?: "image/*"
 
         return MultipartBody.Part
-            .createFormData("file", file.name, RequestBody.create(MediaType.parse(type), file))
+            .createFormData("file", file.name, RequestBody.create(type.toMediaTypeOrNull(), file))
     }
 
     private fun handleResponse(
@@ -153,8 +153,11 @@ internal class FileResourcePostCall @Inject constructor(
 
         dataValueStore.selectOneWhere(whereClause)?.let { dataValue ->
             val newValue =
-                if (newUid == null) dataValue.toBuilder().deleted(true).build()
-                else dataValue.toBuilder().value(newUid).build()
+                if (newUid == null) {
+                    dataValue.toBuilder().deleted(true).build()
+                } else {
+                    dataValue.toBuilder().value(newUid).build()
+                }
 
             dataValueStore.updateWhere(newValue)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt
index 308ff1c0a5..f1eccac22d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt
@@ -136,8 +136,11 @@ internal object FileResourceUtil {
     @JvmStatic
     fun getExtension(fileName: String): String? {
         return fileName.split(".").let { tokens ->
-            if (tokens.size > 1) tokens.last()
-            else null
+            if (tokens.size > 1) {
+                tokens.last()
+            } else {
+                null
+            }
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
index 47c95d442e..1f410e22eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
@@ -43,7 +43,8 @@ internal class TEIWebResponseHandler @Inject constructor(
     ): TEIWebResponseHandlerSummary {
         return webResponse?.response()?.let { response ->
             trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-                response.importSummaries(), instances
+                response.importSummaries(),
+                instances
             )
         } ?: TEIWebResponseHandlerSummary()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt
index abd400b594..1c84617673 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt
@@ -58,7 +58,6 @@ internal object InvalidAttributeValueTypeConflict : TrackerImportConflictItem {
         conflict: ImportConflict,
         context: TrackerImportConflictItemContext
     ): String {
-
         return getTrackedEntityAttribute(conflict)?.let { attributeUid ->
             context.attributeStore.selectByUid(attributeUid)?.let { attribute ->
                 val name = attribute.displayFormName() ?: attribute.displayName() ?: attributeUid
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt
index fc8d8f1e54..8912e4b3a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt
@@ -64,7 +64,6 @@ internal object InvalidDataValueConflict : TrackerImportConflictItem {
         conflict: ImportConflict,
         context: TrackerImportConflictItemContext
     ): String {
-
         return getDataElement(conflict)?.let { dataElementUid ->
             context.dataElementStore.selectByUid(dataElementUid)?.let { dataElement ->
                 val name = dataElement.displayFormName() ?: dataElement.displayName() ?: dataElementUid
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt
index 7bf7405d9e..b46412eb83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt
@@ -48,7 +48,6 @@ internal object MissingAttributeConflict : TrackerImportConflictItem {
         conflict: ImportConflict,
         context: TrackerImportConflictItemContext
     ): String {
-
         return getTrackedEntityAttribute(conflict)?.let { attributeUid ->
             context.attributeStore.selectByUid(attributeUid)?.let { attribute ->
                 val name = attribute.displayFormName() ?: attribute.displayName() ?: attributeUid
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt
index d508ddb427..5fb632729d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt
@@ -49,7 +49,6 @@ internal object MissingDataElementConflict : TrackerImportConflictItem {
         conflict: ImportConflict,
         context: TrackerImportConflictItemContext
     ): String {
-
         return getDataElement(conflict)?.let { dataElementUid ->
             context.dataElementStore.selectByUid(dataElementUid)?.let { dataElement ->
                 val name = dataElement.displayFormName() ?: dataElement.displayName() ?: dataElementUid
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt
index 24996d0318..ac846acb12 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt
@@ -48,7 +48,6 @@ internal object NonUniqueAttributeConflict : TrackerImportConflictItem {
         conflict: ImportConflict,
         context: TrackerImportConflictItemContext
     ): String {
-
         return getTrackedEntityAttribute(conflict)?.let { attributeUid ->
             context.attributeStore.selectByUid(attributeUid)?.let { attribute ->
                 val name = attribute.displayFormName() ?: attribute.displayName() ?: attributeUid
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt
index b8179477d3..5093e16237 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt
@@ -58,7 +58,9 @@ class IndicatorLegendSetLinkTableInfo {
         override fun all(): Array<String> {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
-                INDICATOR, LEGEND_SET, SORT_ORDER
+                INDICATOR,
+                LEGEND_SET,
+                SORT_ORDER
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
index 09da048e19..64db2bc81c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
@@ -45,11 +45,15 @@ internal class DataSetIndicatorEvaluator @Inject constructor(private val express
         context: ExpressionServiceContext
     ): Double {
         val numerator = expressionService.getExpressionValue(
-            indicator.numerator(), context, MissingValueStrategy.NEVER_SKIP
+            indicator.numerator(),
+            context,
+            MissingValueStrategy.NEVER_SKIP
         ) as Double
 
         val denominator = expressionService.getExpressionValue(
-            indicator.denominator(), context, MissingValueStrategy.NEVER_SKIP
+            indicator.denominator(),
+            context,
+            MissingValueStrategy.NEVER_SKIP
         ) as Double
 
         val formula = "$numerator * ${indicatorType.factor() ?: 1} / $denominator"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
index 2de206b22c..503ea18e9c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.legendset.LegendSet
 internal class LegendSetCall @Inject constructor(
     private val service: LegendSetService,
     private val handler: LegendSetHandler,
-    private val apiDownloader: APIDownloader,
+    private val apiDownloader: APIDownloader
 ) : UidsCall<LegendSet> {
     override fun download(uids: Set<String>): Single<List<LegendSet>> {
         return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler) { partitionUids ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
index 28e3114e44..d74f6e1de0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
@@ -49,7 +49,7 @@ internal class LegendSetUidsSeeker @Inject constructor(
             ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO.name(),
             IndicatorLegendSetLinkTableInfo.TABLE_INFO.name(),
             DataElementLegendSetLinkTableInfo.TABLE_INFO.name(),
-            TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO.name(),
+            TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO.name()
         )
         val query = MultipleTableQueryBuilder()
             .generateQuery(ProgramIndicatorLegendSetLinkTableInfo.Columns.LEGEND_SET, tableNames)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
index 8ba51b83c3..e07ab74715 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
@@ -43,7 +43,8 @@ internal class LegendStoreImpl(
     databaseAdapter: DatabaseAdapter
 ) : LegendStore,
     IdentifiableObjectStoreImpl<Legend>(
-        databaseAdapter, LegendTableInfo.TABLE_INFO,
+        databaseAdapter,
+        LegendTableInfo.TABLE_INFO,
         BINDER,
         { cursor: Cursor -> Legend.create(cursor) }
     ) {
@@ -60,7 +61,8 @@ internal class LegendStoreImpl(
         }
 
         val CHILD_PROJECTION = SingleParentChildProjection(
-            LegendTableInfo.TABLE_INFO, LegendTableInfo.Columns.LEGEND_SET
+            LegendTableInfo.TABLE_INFO,
+            LegendTableInfo.Columns.LEGEND_SET
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
index 1499c96639..aa3369fea8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.map.layer.internal.bing.BingEntityDIModule
     includes = [
         MapLayerEntityDIModule::class,
         MapLayerImageryProviderEntityDIModule::class,
-        BingEntityDIModule::class,
+        BingEntityDIModule::class
     ]
 )
 internal class MapPackageDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
index 72be1a48a0..abf32dec79 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
@@ -59,10 +59,12 @@ internal class NoteStoreImpl(
             w.bind(9, o.deleted())
         }
         val ENROLLMENT_CHILD_PROJECTION = SingleParentChildProjection(
-            NoteTableInfo.TABLE_INFO, NoteTableInfo.Columns.ENROLLMENT
+            NoteTableInfo.TABLE_INFO,
+            NoteTableInfo.Columns.ENROLLMENT
         )
         val EVENT_CHILD_PROJECTION = SingleParentChildProjection(
-            NoteTableInfo.TABLE_INFO, NoteTableInfo.Columns.EVENT
+            NoteTableInfo.TABLE_INFO,
+            NoteTableInfo.Columns.EVENT
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt
index 3f50c19cf5..3418a50e3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt
@@ -35,13 +35,13 @@ interface OptionService {
         optionSetUid: String,
         searchText: String? = null,
         optionToHideUids: List<String>? = null,
-        optionToShowUids: List<String>? = null,
+        optionToShowUids: List<String>? = null
     ): List<Option>
 
     fun searchForOptions(
         optionSetUid: String,
         searchText: String? = null,
         optionToHideUids: List<String>? = null,
-        optionToShowUids: List<String>? = null,
+        optionToShowUids: List<String>? = null
     ): Single<List<Option>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
index e7985bcb93..12480d308d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
@@ -42,7 +42,7 @@ class OptionServiceImpl @Inject constructor(
         optionSetUid: String,
         searchText: String?,
         optionToHideUids: List<String>?,
-        optionToShowUids: List<String>?,
+        optionToShowUids: List<String>?
     ): List<Option> {
         var repository = optionRepository
             .byOptionSetUid().eq(optionSetUid)
@@ -64,7 +64,7 @@ class OptionServiceImpl @Inject constructor(
         optionSetUid: String,
         searchText: String?,
         optionToHideUids: List<String>?,
-        optionToShowUids: List<String>?,
+        optionToShowUids: List<String>?
     ): Single<List<Option>> {
         return Single.fromCallable {
             blockingSearchForOptions(optionSetUid, searchText, optionToHideUids, optionToShowUids)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
index 39f5981626..aa3aa6dfb8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
@@ -42,7 +42,8 @@ internal class OptionGroupHandler(
 
     override fun afterObjectHandled(o: OptionGroup, action: HandleAction) {
         optionGroupOptionLinkHandler.handleMany(
-            o.uid(), o.options()
+            o.uid(),
+            o.options()
         ) { option: ObjectWithUid ->
             OptionGroupOptionLink.builder().optionGroup(o.uid()).option(option.uid()).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index a89fe00214..fbda0f36c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -104,7 +104,8 @@ internal class OrganisationUnitCall @Inject constructor(
         )
         return downloadOrgUnits(
             getUids(rootCaptureOrgUnitsOutsideSearchScope),
-            user, OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
+            user,
+            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
         )
     }
 
@@ -138,8 +139,12 @@ internal class OrganisationUnitCall @Inject constructor(
     private fun downloadPage(orgUnit: String, page: AtomicInteger): Single<List<OrganisationUnit>> {
         return Single.defer {
             organisationUnitService.getOrganisationUnits(
-                OrganisationUnitFields.allFields, OrganisationUnitFields.path.like(orgUnit),
-                OrganisationUnitFields.ASC_ORDER, true, PAGE_SIZE, page.getAndIncrement()
+                OrganisationUnitFields.allFields,
+                OrganisationUnitFields.path.like(orgUnit),
+                OrganisationUnitFields.ASC_ORDER,
+                true,
+                PAGE_SIZE,
+                page.getAndIncrement()
             )
                 .map { obj -> obj.items() }
                 .doOnSuccess { items -> handler.handleMany(items, pathTransformer) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
index d241efecd8..52c4dcf951 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
@@ -95,7 +95,8 @@ internal class OrganisationUnitHandler constructor(
         val orgUnitPrograms = organisationUnit.programs()
         if (orgUnitPrograms != null) {
             organisationUnitProgramLinkHandler.handleMany(
-                organisationUnit.uid(), orgUnitPrograms
+                organisationUnit.uid(),
+                orgUnitPrograms
             ) { program ->
                 OrganisationUnitProgramLink.builder()
                     .organisationUnit(organisationUnit.uid())
@@ -109,7 +110,8 @@ internal class OrganisationUnitHandler constructor(
         val orgUnitDataSets = organisationUnit.dataSets()
         if (orgUnitDataSets != null) {
             dataSetOrganisationUnitLinkHandler.handleMany(
-                organisationUnit.uid(), orgUnitDataSets
+                organisationUnit.uid(),
+                orgUnitDataSets
             ) { dataSet ->
                 DataSetOrganisationUnitLink.builder()
                     .dataSet(dataSet.uid())
@@ -122,7 +124,8 @@ internal class OrganisationUnitHandler constructor(
     private fun addOrganisationUnitOrganisationUnitGroupLink(organisationUnit: OrganisationUnit) {
         organisationUnit.organisationUnitGroups()?.let { orgunitGroups ->
             organisationUnitGroupLinkHandler.handleMany(
-                organisationUnit.uid(), orgunitGroups
+                organisationUnit.uid(),
+                orgunitGroups
             ) { organisationUnitGroup ->
                 OrganisationUnitOrganisationUnitGroupLink.builder()
                     .organisationUnit(organisationUnit.uid())
@@ -140,7 +143,8 @@ internal class OrganisationUnitHandler constructor(
         // TODO MasterUid set to "" to avoid cleaning link table. Orgunits are paged, so the whole orguntit list is
         //  not available in the handler. Maybe the store should not be a linkStore.
         userOrganisationUnitLinkHandler.handleMany(
-            "", organisationUnits
+            "",
+            organisationUnits
         ) { orgUnit: OrganisationUnit ->
             builder
                 .organisationUnit(orgUnit.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt
index 54860c754f..36096b4573 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt
@@ -62,7 +62,7 @@ internal sealed class CommonExpressionVisitorScope(
         dataElementStore: IdentifiableObjectStore<DataElement>,
         categoryOptionComboStore: IdentifiableObjectStore<CategoryOptionCombo>,
         organisationUnitGroupStore: IdentifiableObjectStore<OrganisationUnitGroup>,
-        programStageStore: IdentifiableObjectStore<ProgramStage>,
+        programStageStore: IdentifiableObjectStore<ProgramStage>
     ) : CommonExpressionVisitorScope(
         constantMap,
         itemMap,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
index feee620c06..f33528d034 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
@@ -99,7 +99,7 @@ internal object ParserUtils {
         ExpressionParser.C_BRACE to ItemConstant(),
 
         // Literals
-        ExpressionParser.NULL to NullLiteral(),
+        ExpressionParser.NULL to NullLiteral()
     )
 
     @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt
index c81a78dee7..4edabc39b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt
@@ -36,5 +36,5 @@ internal data class QueryMods(
     var minDate: LocalDate? = null,
     var maxDate: LocalDate? = null,
     var periodOffset: Int? = null,
-    var yearToDate: Boolean = false,
+    var yearToDate: Boolean = false
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
index e992f7c386..1b77ae7ec5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
@@ -104,7 +104,9 @@ internal class ExpressionService @Inject constructor(
 
     fun getExpressionValue(expression: String?): Any? {
         return getExpressionValue(
-            expression, ExpressionServiceContext(), MissingValueStrategy.NEVER_SKIP
+            expression,
+            ExpressionServiceContext(),
+            MissingValueStrategy.NEVER_SKIP
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt
index 9ca38505a5..1f8cec301d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt
@@ -35,5 +35,5 @@ internal data class ExpressionServiceContext(
     val valueMap: Map<DimensionalItemObject, Double> = emptyMap(),
     val constantMap: Map<String, Constant> = emptyMap(),
     val orgUnitCountMap: Map<String, Int> = emptyMap(),
-    val days: Int? = 0,
+    val days: Int? = 0
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index 0598de54a4..3b6dc5aea1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -68,7 +68,8 @@ internal class ProgramHandler @Inject constructor(
             val attributes = AttributeValueUtils.extractAttributes(o.attributeValues())
             attributeHandler.handleMany(attributes)
             programAttributeLinkHandler.handleMany(
-                o.uid(), attributes
+                o.uid(),
+                attributes
             ) { attribute: Attribute ->
                 ProgramAttributeValueLink.builder()
                     .program(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
index ce0cfabf46..5a99087545 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
@@ -45,6 +45,6 @@ internal interface ProgramIndicatorService {
         @Query("filter") @Where displayInForm: Filter<ProgramIndicator, Boolean>?,
         @Query("filter") program: String?,
         @Query("filter") @Where uids: Filter<ProgramIndicator, String>?,
-        @Query("paging") paging: Boolean,
+        @Query("paging") paging: Boolean
     ): Single<Payload<ProgramIndicator>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
index 81438dea85..aa5375ec86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
@@ -51,7 +51,8 @@ internal class ProgramIndicatorStoreImpl(
 
     companion object {
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramIndicatorTableInfo.TABLE_INFO, ProgramIndicatorTableInfo.Columns.PROGRAM
+            ProgramIndicatorTableInfo.TABLE_INFO,
+            ProgramIndicatorTableInfo.Columns.PROGRAM
         )
         private val BINDER: StatementBinder<ProgramIndicator> = object : NameableStatementBinder<ProgramIndicator>() {
             override fun bindToStatement(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 1a3098c848..2f7e869d62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -82,7 +82,8 @@ internal class ProgramModuleDownloader @Inject constructor(
                             }
                             .flatMapCompletable { attributes ->
                                 val optionSetUids = ProgramParentUidsHelper.getAssignedOptionSetUids(
-                                    attributes, programStages
+                                    attributes,
+                                    programStages
                                 )
                                 Single.merge(
                                     listOf(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
index 43e45d809c..5ee0d488dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
@@ -69,7 +69,8 @@ internal class ProgramRuleActionStoreImpl(
             }
 
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramRuleActionTableInfo.TABLE_INFO, ProgramRuleActionTableInfo.Columns.PROGRAM_RULE
+            ProgramRuleActionTableInfo.TABLE_INFO,
+            ProgramRuleActionTableInfo.Columns.PROGRAM_RULE
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
index 0367a463ef..f3afab11bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
@@ -60,7 +60,8 @@ internal class ProgramRuleStoreImpl(
             }
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramRuleTableInfo.TABLE_INFO, ProgramRuleTableInfo.Columns.PROGRAM
+            ProgramRuleTableInfo.TABLE_INFO,
+            ProgramRuleTableInfo.Columns.PROGRAM
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
index d57ce2b44f..82586d92c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
@@ -64,7 +64,8 @@ internal class ProgramRuleVariableStoreImpl(
             }
 
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramRuleVariableTableInfo.TABLE_INFO, ProgramRuleVariableTableInfo.Columns.PROGRAM
+            ProgramRuleVariableTableInfo.TABLE_INFO,
+            ProgramRuleVariableTableInfo.Columns.PROGRAM
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
index a532d0c49e..c13eb0a761 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
@@ -43,7 +43,8 @@ internal class ProgramSectionHandler @Inject constructor(
 
     override fun afterObjectHandled(o: ProgramSection, action: HandleAction) {
         programSectionAttributeLinkHandler.handleMany(
-            o.uid(), o.attributes()
+            o.uid(),
+            o.attributes()
         ) { trackedEntityAttribute: TrackedEntityAttribute, sortOrder: Int ->
             ProgramSectionAttributeLink.builder()
                 .programSection(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
index 2f6859fb68..d08b5eab8b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
@@ -64,7 +64,8 @@ internal class ProgramSectionStoreImpl(
             }
 
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramSectionTableInfo.TABLE_INFO, ProgramSectionTableInfo.Columns.PROGRAM
+            ProgramSectionTableInfo.TABLE_INFO,
+            ProgramSectionTableInfo.Columns.PROGRAM
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
index e56319809b..80eb5fd303 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
@@ -48,7 +48,8 @@ internal class ProgramStageDataElementHandler @Inject constructor(
             dataElementHandler.handle(o.dataElement()!!)
         }
         valueTypeRenderingHandler.handle(
-            o.renderType(), o.uid(),
+            o.renderType(),
+            o.uid(),
             ProgramStageDataElementTableInfo.TABLE_INFO.name()
         )
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index da4a7f4dc7..7fc63e6bae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -80,7 +80,8 @@ internal class ProgramStageHandler @Inject constructor(
             val attributes = AttributeValueUtils.extractAttributes(o.attributeValues())
             attributeHandler.handleMany(attributes)
             programStageAttributeValueLinkHandler.handleMany(
-                o.uid(), attributes
+                o.uid(),
+                attributes
             ) { attribute: Attribute ->
                 ProgramStageAttributeValueLink.builder()
                     .programStage(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
index eaa2affebf..ec47e5757b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
@@ -81,7 +81,8 @@ internal class ProgramStageStoreImpl(
                 }
             }
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramStageTableInfo.TABLE_INFO, ProgramStageTableInfo.Columns.PROGRAM
+            ProgramStageTableInfo.TABLE_INFO,
+            ProgramStageTableInfo.Columns.PROGRAM
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
index f9fe504062..53f28f9b80 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
@@ -43,7 +43,8 @@ internal class ProgramTrackedEntityAttributeHandler @Inject constructor(
     override fun afterObjectHandled(o: ProgramTrackedEntityAttribute, action: HandleAction) {
         if (action !== HandleAction.Delete) {
             renderTypeHandler.handle(
-                o.renderType(), o.uid(),
+                o.renderType(),
+                o.uid(),
                 ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name()
             )
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
index 8279353fbe..42e16b2470 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
@@ -67,7 +67,8 @@ internal class ProgramTrackedEntityAttributeStoreImpl(
             }
 
         val CHILD_PROJECTION = SingleParentChildProjection(
-            ProgramTrackedEntityAttributeTableInfo.TABLE_INFO, ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM
+            ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
+            ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramExpressionItem.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramExpressionItem.kt
index 7742327291..b717dbf640 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramExpressionItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramExpressionItem.kt
@@ -59,6 +59,8 @@ internal abstract class ProgramExpressionItem : ExpressionItem {
     protected fun formatValue(value: String?, valueType: ValueType?): String? {
         return if (valueType === ValueType.BOOLEAN) {
             if ("true" == value) "1" else "0"
-        } else value
+        } else {
+            value
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
index 2d430916ba..f8d5667f29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
@@ -65,7 +65,7 @@ internal class ProgramIndicatorSQLExecutor @Inject constructor(
     fun getProgramIndicatorValue(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String? {
         val sqlQuery = getProgramIndicatorSQL(evaluationItem, metadata, queryMods)
 
@@ -78,7 +78,7 @@ internal class ProgramIndicatorSQLExecutor @Inject constructor(
     fun getProgramIndicatorSQL(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?,
+        queryMods: QueryMods?
     ): String {
         val programIndicator = ProgramIndicatorEvaluatorHelper.getProgramIndicator(evaluationItem, metadata)
         val periodItems = evaluationItem.allDimensionItems.filterIsInstance<DimensionItem.PeriodItem>()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt
index 1bb2d60f52..5143e09874 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt
@@ -144,10 +144,11 @@ internal object ProgramIndicatorSQLUtils {
     fun getDefaultValue(
         valueType: ValueType?
     ): String {
-        return if (valueType?.isNumeric == true || valueType?.isBoolean == true)
+        return if (valueType?.isNumeric == true || valueType?.isBoolean == true) {
             "CAST(0 AS NUMERIC)"
-        else
+        } else {
             "''"
+        }
     }
 
     fun valueCountExpression(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt
index 77620eeceb..a53fad81d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt
@@ -45,7 +45,6 @@ internal class D2RelationshipCount : ExpressionItem {
     private val rAlias = "r"
 
     override fun getSql(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
-
         val rTypeUid = ctx.uid0?.text
 
         val queries = getQueries(visitor.programIndicatorSQLContext!!.programIndicator)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Split.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Split.kt
index 03dd61414f..497d97330c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Split.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Split.kt
@@ -46,7 +46,9 @@ internal class D2Split : ExpressionItem {
 
             if (tokens.size > index && index >= 0) {
                 wrap(tokens[index])
-            } else ""
+            } else {
+                ""
+            }
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
index 8219a408eb..395a54b14c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
@@ -41,7 +41,6 @@ internal class RelationshipServiceImpl @Inject constructor(
     private val trackedEntityTypeRepository: TrackedEntityTypeCollectionRepository
 ) : RelationshipService {
     override fun hasAccessPermission(relationshipType: RelationshipType): Boolean {
-
         val fromAccess = relationshipType.fromConstraint()?.let { constraintAccess(it) } ?: false
         val toAccess = relationshipType.toConstraint()?.let { constraintAccess(it) } ?: false
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
index 70373a4ee8..b50eca75f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
@@ -60,8 +60,12 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
         RelationshipTypeCollectionRepository(
-            store, teiStore, enrollmentStore, eventStore,
-            childrenAppenders, s
+            store,
+            teiStore,
+            enrollmentStore,
+            eventStore,
+            childrenAppenders,
+            s
         )
     }
 ) {
@@ -138,7 +142,8 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
     ): WhereClauseBuilder {
         return WhereClauseBuilder()
             .appendKeyStringValue(
-                RelationshipConstraintTableInfo.Columns.RELATIONSHIP_ENTITY, relationshipEntityType
+                RelationshipConstraintTableInfo.Columns.RELATIONSHIP_ENTITY,
+                relationshipEntityType
             )
             .appendKeyStringValue(getRelationshipEntityColumn(relationshipEntityType), relationshipEntityUid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
index 560a5e3641..945d65f476 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
@@ -74,7 +74,8 @@ internal class RelationshipHandler @Inject constructor(
 
     private fun getExistingRelationshipUid(relationship: Relationship): String? {
         val existingRelationshipUidsForPair = relationshipItemStore.getRelationshipUidsForItems(
-            relationship.from()!!, relationship.to()!!
+            relationship.from()!!,
+            relationship.to()!!
         )
         for (existingRelationshipUid in existingRelationshipUidsForPair) {
             val existingRelationship = store.selectByUid(existingRelationshipUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
index aeadda9327..e38ab5bfd1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
@@ -47,7 +47,6 @@ import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
         importSummaries: List<RelationshipImportSummary?>?,
         relationships: List<Relationship>
     ) {
-
         importSummaries?.filterNotNull()?.forEach { importSummary ->
             importSummary.reference()?.let { relationshipUid ->
                 val relationship = relationshipRepository.withItems().uid(relationshipUid).blockingGet()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
index d472a5c4c5..e6751c3f60 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
@@ -40,10 +40,12 @@ internal class RelationshipItemChildrenAppender @Inject constructor(
 
     override fun appendChildren(relationship: Relationship): Relationship {
         val fromItem = store.getForRelationshipUidAndConstraintType(
-            relationship.uid()!!, RelationshipConstraintType.FROM
+            relationship.uid()!!,
+            RelationshipConstraintType.FROM
         )
         val toItem = store.getForRelationshipUidAndConstraintType(
-            relationship.uid()!!, RelationshipConstraintType.TO
+            relationship.uid()!!,
+            RelationshipConstraintType.TO
         )
         return relationship.toBuilder()
             .from(fromItem)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
index 8838b5534d..a32092b3e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
@@ -158,8 +158,12 @@ internal class RelationshipItemStoreImpl(
 
     companion object {
         private val BINDER = StatementBinder { o: RelationshipItem, w: StatementWrapper ->
-            val trackedEntityInstance = if (o.trackedEntityInstance() == null) null else o.trackedEntityInstance()!!
-                .trackedEntityInstance()
+            val trackedEntityInstance = if (o.trackedEntityInstance() == null) {
+                null
+            } else {
+                o.trackedEntityInstance()!!
+                    .trackedEntityInstance()
+            }
             val enrollment = if (o.enrollment() == null) null else o.enrollment()!!.enrollment()
             val event = if (o.event() == null) null else o.event()!!.event()
             w.bind(1, getUidOrNull(o.relationship()))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
index ceabc6ed1e..31c9b1eb0a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationScope.PROGR
 fun generateGroups(
     analyticsDhisVisualizations: List<AnalyticsDhisVisualization>
 ): AnalyticsDhisVisualizationsSetting {
-
     val visualizationsByScope: Map<AnalyticsDhisVisualizationScope?, List<AnalyticsDhisVisualization>> =
         analyticsDhisVisualizations.groupBy { it.scope() }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index 1a54de20fe..8580738b9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -66,7 +66,6 @@ internal class AppearanceSettingCall @Inject constructor(
     }
 
     override fun process(item: AppearanceSettings?) {
-
         val filterSettingsList = item?.let {
             SettingsAppHelper.getFilterSettingsList(it)
         } ?: emptyList()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt
index 4d7234e3cd..5ef7fabbb6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt
@@ -60,7 +60,6 @@ internal object SettingsAppHelper {
     }
 
     private fun getDataSetFilters(dataSetScope: DataSetFilters): List<FilterSetting> {
-
         val globalFilters = dataSetScope.globalSettings().map { entry ->
             entry.value.toBuilder()
                 .scope(DataSetFilter::class.simpleName)
@@ -82,7 +81,6 @@ internal object SettingsAppHelper {
     }
 
     private fun getProgramFilters(programScope: ProgramFilters): List<FilterSetting> {
-
         val globalFilters = programScope.globalSettings().map { entry ->
             entry.value.toBuilder()
                 .scope(ProgramFilter::class.simpleName)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
index 048678e46d..8be2469e24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
@@ -67,7 +67,8 @@ internal class SettingsAppInfoCall @Inject constructor(
 
     private fun fetchV1GeneralSettings(storeError: Boolean): Single<SettingsAppVersion> {
         return apiCallExecutor.wrapSingle(
-            settingAppService.generalSettings(SettingsAppDataStoreVersion.V1_1), storeError
+            settingAppService.generalSettings(SettingsAppDataStoreVersion.V1_1),
+            storeError
         )
             .map<SettingsAppVersion> {
                 SettingsAppVersion.Valid(SettingsAppDataStoreVersion.V1_1, unknown)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
index f2dbedd284..7f92e3eee4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
@@ -311,10 +311,18 @@ internal class LocalDbRepositoryImpl @Inject constructor(
     ): Completable {
         return Completable.mergeArray(
             dataSetsStore.updateDataSetValuesState(
-                dataSetId, orgUnit, period, attributeOptionComboUid, state
+                dataSetId,
+                orgUnit,
+                period,
+                attributeOptionComboUid,
+                state
             ),
             dataSetsStore.updateDataSetCompleteRegistrationState(
-                dataSetId, orgUnit, period, attributeOptionComboUid, state
+                dataSetId,
+                orgUnit,
+                period,
+                attributeOptionComboUid,
+                state
             )
         )
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
index 69e3754977..40c77a32d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
@@ -64,14 +64,16 @@ internal class OngoingSubmissionsStore @Inject constructor(
         }
         return if (type == null) {
             Completable.error(IllegalArgumentException("Wrong submission type"))
-        } else getOngoingSubmissions().flatMapCompletable { submissions: Map<Int, SubmissionType> ->
-            if (submissions.containsKey(id)) {
-                Completable.error(IllegalArgumentException("Submission id already exists"))
-            } else {
-                Completable.fromCallable {
-                    val ongoingSubmission = SMSOngoingSubmission.builder().submissionId(id).type(type).build()
-                    smsOngoingSubmissionStore.insert(ongoingSubmission)
-                    updateOngoingSubmissions()
+        } else {
+            getOngoingSubmissions().flatMapCompletable { submissions: Map<Int, SubmissionType> ->
+                if (submissions.containsKey(id)) {
+                    Completable.error(IllegalArgumentException("Submission id already exists"))
+                } else {
+                    Completable.fromCallable {
+                        val ongoingSubmission = SMSOngoingSubmission.builder().submissionId(id).type(type).build()
+                        smsOngoingSubmissionStore.insert(ongoingSubmission)
+                        updateOngoingSubmissions()
+                    }
                 }
             }
         }
@@ -101,10 +103,12 @@ internal class OngoingSubmissionsStore @Inject constructor(
     private fun getLastGeneratedSubmissionId(): Single<Int> {
         return if (lastGeneratedSubmissionId != null) {
             Single.just(lastGeneratedSubmissionId)
-        } else Single.fromCallable {
-            smsConfigStore.get(SMSConfigKey.LAST_SUBMISSION_ID)?.toInt() ?: 0
+        } else {
+            Single.fromCallable {
+                smsConfigStore.get(SMSConfigKey.LAST_SUBMISSION_ID)?.toInt() ?: 0
+            }
+                .doOnSuccess { lastGeneratedSubmissionId = it }
         }
-            .doOnSuccess { lastGeneratedSubmissionId = it }
     }
 
     private fun saveLastGeneratedSubmissionId(id: Int) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 12a0bf4dea..d05f9c148c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -111,7 +111,6 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     }
 
     private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
-
         downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
 
         val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
@@ -249,7 +248,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
                         .count(blockingCount(trackedEntityAttribute.uid(), organisationUnit.uid()))
                         .numberOfValuesToFillUp(
                             getFillUpToValue(
-                                null, trackedEntityAttribute.uid()
+                                null,
+                                trackedEntityAttribute.uid()
                             )
                         )
                     reservedValueSummaries.add(builder.build())
@@ -265,7 +265,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
     private fun increaseProgress(): D2Progress {
         return d2ProgressManager.increaseProgress(
-            TrackedEntityAttributeReservedValue::class.java, false
+            TrackedEntityAttributeReservedValue::class.java,
+            false
         )
     }
 
@@ -280,7 +281,10 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
             for (organisationUnit in organisationUnits) {
                 downloadValuesIfBelowThreshold(
-                    attribute, organisationUnit, numberOfValuesToFillUp, true
+                    attribute,
+                    organisationUnit,
+                    numberOfValuesToFillUp,
+                    true
                 )
                 emit(increaseProgress())
             }
@@ -302,7 +306,9 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
         val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
         val remainingValues = store.count(
-            attribute, if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null, pattern
+            attribute,
+            if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
+            pattern
         )
 
         // If number of values is explicitly specified, we use that value as threshold.
@@ -311,7 +317,11 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         if (remainingValues < minNumberToTryFill) {
             val numberToReserve = fillUpTo!! - remainingValues
             downloadValues(
-                attribute, organisationUnit, numberToReserve, pattern, storeError
+                attribute,
+                organisationUnit,
+                numberToReserve,
+                pattern,
+                storeError
             )
         }
     }
@@ -326,7 +336,10 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         executor.executeD2Call(
             reservedValueQueryCallFactory.create(
                 TrackedEntityAttributeReservedValueQuery.create(
-                    trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
+                    trackedEntityAttributeUid,
+                    numberToReserve,
+                    organisationUnit,
+                    pattern
                 )
             ),
             storeError
@@ -341,13 +354,15 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         val linkedProgramUids = programTrackedEntityAttributeStore.selectStringColumnsWhereClause(
             ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
             WhereClauseBuilder().appendKeyStringValue(
-                ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE, attribute
+                ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
+                attribute
             ).build()
         )
         val linkedOrgunitUids = organisationUnitProgramLinkStore.selectStringColumnsWhereClause(
             OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
             WhereClauseBuilder().appendInKeyStringValues(
-                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM, linkedProgramUids
+                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
+                linkedProgramUids
             ).build()
         )
         val captureOrgunits = userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(
@@ -356,7 +371,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         linkedOrgunitUids.toMutableList().retainAll(captureOrgunits)
         return organisationUnitStore.selectWhere(
             WhereClauseBuilder().appendInKeyStringValues(
-                IdentifiableColumns.UID, linkedOrgunitUids
+                IdentifiableColumns.UID,
+                linkedOrgunitUids
             ).build()
         )
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index 01304e1015..b8a4366278 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -234,7 +234,10 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
     }
 
     private fun getOrgunits(orgUnits: List<String>): String? {
-        return if (orgUnits.isEmpty()) null
-        else orgUnits.joinToString(";")
+        return if (orgUnits.isEmpty()) {
+            null
+        } else {
+            orgUnits.joinToString(";")
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
index 4d0a96d074..1e86e86d23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
@@ -245,7 +245,8 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
             notes = noteStore.selectWhere(
                 WhereClauseBuilder()
                     .appendInKeyStringValues(
-                        DataColumns.SYNC_STATE, State.uploadableStatesIncludingError().map { it.name }
+                        DataColumns.SYNC_STATE,
+                        State.uploadableStatesIncludingError().map { it.name }
                     )
                     .build()
             ),
@@ -346,7 +347,8 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
                     payload.trackedEntityInstances.map { it.uid() }
                 )
                 .appendInKeyEnumValues(
-                    DataColumns.SYNC_STATE, State.uploadableStatesIncludingError().toList()
+                    DataColumns.SYNC_STATE,
+                    State.uploadableStatesIncludingError().toList()
                 )
                 .build()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
index f822e870b2..feae290c23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
@@ -54,7 +54,8 @@ internal class TrackedEntityAttributeHandler @Inject constructor(
     override fun afterObjectHandled(o: TrackedEntityAttribute, action: HandleAction) {
         if (o.legendSets() != null) {
             trackedEntityAttributeLegendSetLinkHandler.handleMany(
-                o.uid(), o.legendSets()
+                o.uid(),
+                o.legendSets()
             ) { legendSet: ObjectWithUid, sortOrder: Int? ->
                 TrackedEntityAttributeLegendSetLink.builder()
                     .legendSet(legendSet.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt
index 5d7e676286..c5f5b60d10 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt
@@ -51,7 +51,7 @@ internal class TrackedEntityAttributeLegendSetChildrenAppender(
                 StoreFactory.objectWithUidChildStore(
                     databaseAdapter,
                     TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO,
-                    TrackedEntityAttributeLegendSetLinkTableInfo.CHILD_PROJECTION,
+                    TrackedEntityAttributeLegendSetLinkTableInfo.CHILD_PROJECTION
                 )
             )
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
index cbb7e2b884..cd8954779f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
@@ -80,7 +80,8 @@ internal class TrackedEntityAttributeValueStoreImpl(
 
     override fun queryByTrackedEntityInstance(trackedEntityInstanceUid: String): List<TrackedEntityAttributeValue> {
         val selectByTrackedEntityInstanceQuery = WhereClauseBuilder().appendKeyStringValue(
-            TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE, trackedEntityInstanceUid
+            TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
+            trackedEntityInstanceUid
         ).build()
         return selectWhere(selectByTrackedEntityInstanceQuery)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
index 70e64241cf..0dc225afe2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
@@ -175,7 +175,8 @@ internal class TrackedEntityDataValueStoreImpl(
             w.bind(2, o.dataElement())
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
-            TrackedEntityDataValueTableInfo.TABLE_INFO, TrackedEntityDataValueTableInfo.Columns.EVENT
+            TrackedEntityDataValueTableInfo.TABLE_INFO,
+            TrackedEntityDataValueTableInfo.Columns.EVENT
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
index d06c6d8471..e4269cdc49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
@@ -43,7 +43,9 @@ internal class TrackedEntityInstanceEventFilterStoreImpl(
     ObjectWithoutUidStoreImpl<TrackedEntityInstanceEventFilter>(
         databaseAdapter,
         TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
-        BINDER, WHERE_UPDATE_BINDER, WHERE_DELETE_BINDER,
+        BINDER,
+        WHERE_UPDATE_BINDER,
+        WHERE_DELETE_BINDER,
         { TrackedEntityInstanceEventFilter.create(it) }
     ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
index eec6122be3..81acca8744 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
@@ -65,7 +65,9 @@ internal class TrackedEntityInstancePersistenceCallFactory @Inject constructor(
     ): Completable {
         return Completable.defer {
             trackedEntityInstanceHandler.handleMany(
-                trackedEntityInstances, params, relatives
+                trackedEntityInstances,
+                params,
+                relatives
             )
             if (uidsHelper.hasMissingOrganisationUnitUids(trackedEntityInstances)) {
                 organisationUnitDownloader.refreshOrganisationUnits()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
index 6512971c68..20fcb38606 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
@@ -42,7 +42,8 @@ internal class TrackedEntityTypeHandler @Inject constructor(
 ) : IdentifiableHandlerImpl<TrackedEntityType>(trackedEntityTypeStore) {
     override fun afterObjectHandled(o: TrackedEntityType, action: HandleAction) {
         attributeHandler.handleMany(
-            o.uid(), o.trackedEntityTypeAttributes()
+            o.uid(),
+            o.trackedEntityTypeAttributes()
         ) { trackedEntityTypeAttribute: TrackedEntityTypeAttribute, sortOrder: Int? ->
             trackedEntityTypeAttribute.toBuilder().sortOrder(sortOrder).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
index 6fc0b32f85..a80272d192 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
@@ -42,7 +42,9 @@ internal class TrackerQueryBundleFactory @Inject constructor(
     lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager,
     commonHelper: TrackerQueryFactoryCommonHelper
 ) : TrackerQueryFactory<TrackerQueryBundle, TrackedEntityInstanceSync>(
-    programStore, programSettingsObjectRepository, lastUpdatedManager,
+    programStore,
+    programSettingsObjectRepository,
+    lastUpdatedManager,
     commonHelper,
     ProgramType.WITH_REGISTRATION,
     { params: ProgramDataDownloadParams,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt
index 88f0b32cd0..99bb56a2bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt
@@ -44,14 +44,20 @@ internal class TrackerQueryBundleInternalFactory constructor(
         orgUnitByLimitExtractor: () -> List<String>
     ): List<TrackerQueryBundle> {
         val limit = commonHelper.getLimit(
-            params, programSettings, programUid
+            params,
+            programSettings,
+            programUid
         ) { it?.teiDownload() }
         if (limit == 0 || programs.isEmpty()) {
             return emptyList()
         }
         val commonParams: TrackerQueryCommonParams = commonHelper.getCommonParams(
-            params, programSettings, programs,
-            programUid, limit, orgUnitByLimitExtractor
+            params,
+            programSettings,
+            programs,
+            programUid,
+            limit,
+            orgUnitByLimitExtractor
         ) { it?.enrollmentDateDownload() }
 
         val programStatus = getProgramStatus(params, programSettings, programUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
index 01286654ca..a30936c1cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
@@ -138,7 +138,9 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
             when {
                 isGlobal(params, programUid) -> {
                     val download = params.limit()!! - specificEvents(
-                        params, programSettings, downloadExtractor
+                        params,
+                        programSettings,
+                        downloadExtractor
                     )
                     return if (download > 0) download else 0
                 }
@@ -249,7 +251,9 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     ): TrackerQueryCommonParams {
         val hasLimitByOrgUnit = hasLimitByOrgUnit(params, programSettings, programUid)
         val (ouMode, orgUnits) = getOrganisationUnits(
-            params, hasLimitByOrgUnit, orgUnitByLimitExtractor
+            params,
+            hasLimitByOrgUnit,
+            orgUnitByLimitExtractor
         )
 
         return TrackerQueryCommonParams(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt
index f16b59cb8d..caa75c1d80 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt
@@ -109,8 +109,11 @@ internal open class TrackerSyncLastUpdatedManager<S : TrackerBaseSync>(private v
             sync.organisationUnitIdsHash()
         )
         val finalBuilder =
-            if (sync.program() == null) builder.appendIsNullValue(Columns.PROGRAM)
-            else builder.appendKeyStringValue(Columns.PROGRAM, sync.program())
+            if (sync.program() == null) {
+                builder.appendIsNullValue(Columns.PROGRAM)
+            } else {
+                builder.appendKeyStringValue(Columns.PROGRAM, sync.program())
+            }
         store.deleteWhere(finalBuilder.build())
         store.insert(sync)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
index 7cadcb86b1..580c6c6a36 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
@@ -124,7 +124,8 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             if (hasEvent(scope)) {
                 queryStr += String.format(
                     " JOIN %s %s ON %s = %s",
-                    EventTableInfo.TABLE_INFO.name(), eventAlias,
+                    EventTableInfo.TABLE_INFO.name(),
+                    eventAlias,
                     dot(enrollmentAlias, IdentifiableColumns.UID),
                     dot(eventAlias, EventTableInfo.Columns.ENROLLMENT)
                 )
@@ -134,12 +135,16 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
 
         if (hasOrgunits(scope)) {
             val joinOrgunitColum =
-                if (hasProgram(scope)) dot(ownerAlias, ProgramOwnerTableInfo.Columns.OWNER_ORGUNIT)
-                else dot(teiAlias, TrackedEntityInstanceTableInfo.Columns.ORGANISATION_UNIT)
+                if (hasProgram(scope)) {
+                    dot(ownerAlias, ProgramOwnerTableInfo.Columns.OWNER_ORGUNIT)
+                } else {
+                    dot(teiAlias, TrackedEntityInstanceTableInfo.Columns.ORGANISATION_UNIT)
+                }
 
             queryStr += String.format(
                 " JOIN %s %s ON %s = %s",
-                OrganisationUnitTableInfo.TABLE_INFO.name(), orgunitAlias,
+                OrganisationUnitTableInfo.TABLE_INFO.name(),
+                orgunitAlias,
                 joinOrgunitColum,
                 dot(orgunitAlias, IdentifiableColumns.UID)
             )
@@ -298,7 +303,8 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             }
             OrganisationUnitMode.CHILDREN -> scope.orgUnits().forEach { orgUnit ->
                 inner.appendOrKeyStringValue(
-                    dot(orgunitAlias, OrganisationUnitTableInfo.Columns.PARENT), escapeQuotes(orgUnit)
+                    dot(orgunitAlias, OrganisationUnitTableInfo.Columns.PARENT),
+                    escapeQuotes(orgUnit)
                 )
 
                 // TODO Include orgunit?
@@ -331,15 +337,21 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             val tokens = query.value().split(" ".toRegex()).toTypedArray()
             for (token in tokens) {
                 val valueStr =
-                    if (query.operator() == FilterItemOperator.LIKE) "%${escapeQuotes(token)}%"
-                    else escapeQuotes(token)
+                    if (query.operator() == FilterItemOperator.LIKE) {
+                        "%${escapeQuotes(token)}%"
+                    } else {
+                        escapeQuotes(token)
+                    }
 
                 val sub = String.format(
                     "SELECT 1 FROM %s %s WHERE %s = %s AND %s %s '%s'",
-                    TrackedEntityAttributeValueTableInfo.TABLE_INFO.name(), teavAlias,
-                    dot(teavAlias, trackedEntityInstance), dot(teiAlias, IdentifiableColumns.UID),
+                    TrackedEntityAttributeValueTableInfo.TABLE_INFO.name(),
+                    teavAlias,
+                    dot(teavAlias, trackedEntityInstance),
+                    dot(teiAlias, IdentifiableColumns.UID),
                     dot(teavAlias, TrackedEntityAttributeValueTableInfo.Columns.VALUE),
-                    query.operator().sqlOperator, valueStr
+                    query.operator().sqlOperator,
+                    valueStr
                 )
 
                 where.appendExistsSubQuery(sub)
@@ -451,7 +463,8 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                             listOf(EventStatus.SCHEDULE, EventStatus.OVERDUE)
                         )
                         statusWhere.appendKeyGreaterOrEqStringValue(
-                            "date(${dot(eventAlias, EventTableInfo.Columns.DUE_DATE)})", nowStr
+                            "date(${dot(eventAlias, EventTableInfo.Columns.DUE_DATE)})",
+                            nowStr
                         )
                     }
                     EventStatus.OVERDUE -> {
@@ -462,7 +475,8 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                             listOf(EventStatus.SCHEDULE, EventStatus.OVERDUE)
                         )
                         statusWhere.appendKeyLessThanStringValue(
-                            "date(${dot(eventAlias, EventTableInfo.Columns.DUE_DATE)})", nowStr
+                            "date(${dot(eventAlias, EventTableInfo.Columns.DUE_DATE)})",
+                            nowStr
                         )
                     }
                     EventStatus.SKIPPED -> {
@@ -595,7 +609,9 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
 
                 TrackedEntityInstanceQueryScopeOrderColumn.Type.INCIDENT_DATE ->
                     orderByEnrollmentField(
-                        scope.program(), EnrollmentTableInfo.Columns.INCIDENT_DATE, item.direction()
+                        scope.program(),
+                        EnrollmentTableInfo.Columns.INCIDENT_DATE,
+                        item.direction()
                     )
 
                 TrackedEntityInstanceQueryScopeOrderColumn.Type.ENROLLMENT_STATUS ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index b47c779a15..5eda2b0c04 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -159,7 +159,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
                     order = query.order,
                     paging = query.paging,
                     pageSize = query.pageSize,
-                    page = query.page,
+                    page = query.page
                 )
             }.getOrThrow().let { mapper.transform(it) }
         } catch (pe: ParseException) {
@@ -183,8 +183,11 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     }
 
     private fun getOrgunits(orgUnits: List<String>): String? {
-        return if (orgUnits.isEmpty()) null
-        else orgUnits.joinToString(";")
+        return if (orgUnits.isEmpty()) {
+            null
+        } else {
+            orgUnits.joinToString(";")
+        }
     }
 
     companion object {
@@ -200,7 +203,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
                 eventEndDate = null,
                 dueStartDate = null,
                 dueEndDate = null,
-                programStage = null,
+                programStage = null
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 2b11d07dfa..99edcc9353 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -97,7 +97,8 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
 
     private fun queryOffline(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
         val sqlQuery = localQueryHelper.getSqlQuery(
-            scope, returnedUidsOffline,
+            scope,
+            returnedUidsOffline,
             requestedLoadSize
         )
         val instances = store.selectRawQuery(sqlQuery)
@@ -188,7 +189,8 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
 
     private fun appendAttributes(withoutChildren: List<TrackedEntityInstance>): List<TrackedEntityInstance> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
-            withoutChildren, childrenAppenders,
+            withoutChildren,
+            childrenAppenders,
             ChildrenSelection(
                 setOf(
                     TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
index c4f934609d..4bc2ba80d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
@@ -46,8 +46,13 @@ internal class TrackedEntityInstanceQueryDataSource constructor(
 ) : ItemKeyedDataSource<TrackedEntityInstance, TrackedEntityInstance>() {
 
     private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
-        store, trackerParentCallFactory, scope, childrenAppenders,
-        onlineCache, onlineHelper, localQueryHelper
+        store,
+        trackerParentCallFactory,
+        scope,
+        childrenAppenders,
+        onlineCache,
+        onlineHelper,
+        localQueryHelper
     )
 
     override fun loadInitial(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
index 5ac606e5c0..6f4281c3bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
@@ -48,8 +48,13 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
     TrackedEntityInstance, Result<@JvmSuppressWildcards TrackedEntityInstance, @JvmSuppressWildcards D2Error>>() {
 
     private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
-        store, trackerParentCallFactory, scope, childrenAppenders,
-        onlineCache, onlineHelper, localQueryHelper
+        store,
+        trackerParentCallFactory,
+        scope,
+        childrenAppenders,
+        onlineCache,
+        onlineHelper,
+        localQueryHelper
     )
 
     override fun loadInitial(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
index bff1649010..15c13a05c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
@@ -63,5 +63,5 @@ internal data class TrackedEntityInstanceQueryOnline(
     val uids: List<String>? = null,
     val lastUpdatedStartDate: Date? = null,
     val lastUpdatedEndDate: Date? = null,
-    val order: String? = null,
+    val order: String? = null
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index f3cb4ca0aa..2b3d7ff6e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -99,7 +99,6 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
     private fun getBaseQuery(
         scope: TrackedEntityInstanceQueryRepositoryScope
     ): TrackedEntityInstanceQueryOnline {
-
         val query = scope.query()?.let { query -> query.operator().apiUpperOperator + ":" + query.value() }
 
         // EnrollmentStatus does not accepts a list of status but a single value in web API.
@@ -121,7 +120,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
             followUp = scope.followUp(),
             includeDeleted = scope.includeDeleted(),
             trackedEntityType = scope.trackedEntityType(),
-            order = toAPIOrderFormat(scope.order()),
+            order = toAPIOrderFormat(scope.order())
         ).run {
             scope.program()?.let {
                 copy(
@@ -135,7 +134,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
                     eventStartDate = scope.eventDate()?.let { dateFilterPeriodHelper.getStartDate(it) },
                     eventEndDate = scope.eventDate()?.let { dateFilterPeriodHelper.getEndDate(it) },
                     dueStartDate = scope.dueDate()?.let { dateFilterPeriodHelper.getStartDate(it) },
-                    dueEndDate = scope.dueDate()?.let { dateFilterPeriodHelper.getEndDate(it) },
+                    dueEndDate = scope.dueDate()?.let { dateFilterPeriodHelper.getEndDate(it) }
                 )
             } ?: this
         }
@@ -147,7 +146,9 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
         val hasEventDate = eventDate?.startDate() != null && eventDate.endDate() != null
         return if (eventStatus.isNotEmpty() && hasEventDate) {
             eventStatus[0]
-        } else null
+        } else {
+            null
+        }
     }
 
     private fun toAPIOrderFormat(orders: List<TrackedEntityInstanceQueryScopeOrderByItem>): String? {
@@ -178,7 +179,6 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
         }
 
         private fun getAPIValue(item: RepositoryScopeFilterItem): String {
-
             return if (item.operator() == FilterItemOperator.IN) {
                 val list = FilterOperatorsHelper.strToList(item.value()).map { escapeChars(it) }
                 list.joinToString(";")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
index 05b1e98138..9ed2f409b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
@@ -245,8 +245,11 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
             if (column != null) {
                 val direction =
-                    if (directionStr == "desc") RepositoryScope.OrderByDirection.DESC
-                    else RepositoryScope.OrderByDirection.ASC
+                    if (directionStr == "desc") {
+                        RepositoryScope.OrderByDirection.DESC
+                    } else {
+                        RepositoryScope.OrderByDirection.ASC
+                    }
 
                 TrackedEntityInstanceQueryScopeOrderByItem.builder()
                     .column(column)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 9fcdc0271d..af6f0b583f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -200,8 +200,11 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                     iterationResult.successfulSync = iterationResult.successfulSync && result.successfulSync
 
                     val syncStatus =
-                        if (result.successfulSync) D2ProgressSyncStatus.SUCCESS
-                        else D2ProgressSyncStatus.ERROR
+                        if (result.successfulSync) {
+                            D2ProgressSyncStatus.SUCCESS
+                        } else {
+                            D2ProgressSyncStatus.ERROR
+                        }
 
                     progressManager.updateProgramSyncStatus(bundleProgram.program, syncStatus)
 
@@ -236,8 +239,11 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 val numOfCombinations = bundleResult.bundleOrgUnitPrograms.values.sumOf { it.size }
                 val pendingTeis = bundle.commonParams().limit - bundleResult.bundleCount
 
-                if (numOfCombinations == 0 || pendingTeis == 0) 0
-                else ceil(pendingTeis.toDouble() / numOfCombinations.toDouble()).roundToInt()
+                if (numOfCombinations == 0 || pendingTeis == 0) {
+                    0
+                } else {
+                    ceil(pendingTeis.toDouble() / numOfCombinations.toDouble()).roundToInt()
+                }
             }
 
             else -> bundle.commonParams().limit - bundleResult.bundleCount
@@ -267,7 +273,6 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         overwrite: Boolean,
         relatives: RelationshipItemRelatives
     ): ItemsWithPagingResult {
-
         var downloadedItemsForCombination = 0
         var emptyProgram = false
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
index 926b0f1a0c..2c8e7b7212 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
@@ -54,7 +54,8 @@ internal class JobReportEnrollmentHandler @Inject internal constructor(
         val newNoteState = if (state == State.SYNCED) State.SYNCED else State.TO_POST
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
-                DataColumns.SYNC_STATE, State.uploadableStatesIncludingError().map { it.name }
+                DataColumns.SYNC_STATE,
+                State.uploadableStatesIncludingError().map { it.name }
             )
             .appendKeyStringValue(NoteTableInfo.Columns.ENROLLMENT, enrollmentUid).build()
         for (note in noteStore.selectWhere(whereClause)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
index 9f52680d47..a14a344392 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
@@ -99,7 +99,8 @@ internal class JobReportEventHandler @Inject internal constructor(
         val newNoteState = if (state == State.SYNCED) State.SYNCED else State.TO_POST
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
-                DataColumns.SYNC_STATE, State.uploadableStatesIncludingError().map { it.name }
+                DataColumns.SYNC_STATE,
+                State.uploadableStatesIncludingError().map { it.name }
             )
             .appendKeyStringValue(NoteTableInfo.Columns.EVENT, eventUid).build()
         for (note in noteStore.selectWhere(whereClause)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
index 524a191105..ee911524ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
@@ -81,7 +81,9 @@ internal class JobReportHandler @Inject internal constructor(
         o: JobReport,
         jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>
     ) {
-        val presentSuccesses = if (o.bundleReport == null) emptySet<Pair<TrackerImporterObjectType, String>>() else {
+        val presentSuccesses = if (o.bundleReport == null) {
+            emptySet<Pair<TrackerImporterObjectType, String>>()
+        } else {
             val tm = o.bundleReport.typeReportMap
             setOf(tm.event, tm.trackedEntity, tm.enrollment, tm.relationship).flatMap {
                 it.objectReports
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
index 60dddeaa1d..904319b30d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
@@ -136,8 +136,9 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
     suspend fun fakeBreakGlass(instances: List<TrackedEntityInstance>) {
         instances.forEach { instance ->
             TrackedEntityInstanceInternalAccessor.accessEnrollments(instance).forEach { enrollment ->
-                if (instance.uid() != null && enrollment.program() != null)
+                if (instance.uid() != null && enrollment.program() != null) {
                     ownershipManagerImpl.fakeBreakGlass(instance.uid()!!, enrollment.program()!!)
+                }
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
index c8c3ff2e24..da07ebcf17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
@@ -39,7 +39,7 @@ import retrofit2.Retrofit
 @Module(
     includes = [
         StockUseCaseEntityDIModule::class,
-        StockUseCaseTransactionEntityDIModule::class,
+        StockUseCaseTransactionEntityDIModule::class
     ]
 )
 internal class UseCasePackageDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index 6339789424..cf61360c8f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -42,7 +42,7 @@ class StockUseCaseCollectionRepository @Inject internal constructor(
     store: StockUseCaseStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<InternalStockUseCase>>,
     scope: RepositoryScope,
-    transformer: StockUseCaseTransformer,
+    transformer: StockUseCaseTransformer
 ) : ReadOnlyWithUidCollectionRepository<StockUseCase> by
 ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<InternalStockUseCase, StockUseCase,
     StockUseCaseCollectionRepository>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt
index e4264726a7..1a3fcd089f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt
@@ -61,7 +61,9 @@ sealed class StockUseCaseTransaction {
             return when (val type = TransactionType.valueOf(t.transactionType())) {
                 TransactionType.DISTRIBUTED ->
                     Distributed(
-                        t.sortOrder(), type, t.distributedTo()!!,
+                        t.sortOrder(),
+                        type,
+                        t.distributedTo()!!,
                         t.stockDistributed()!!
                     )
                 TransactionType.DISCARDED -> Discarded(t.sortOrder(), type, t.stockDiscarded()!!)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index 7a92e91111..e050e45468 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 internal class StockUseCaseCall @Inject constructor(
     private val stockUseCaseHandler: StockUseCaseHandler,
     private val stockUseCaseService: StockUseCaseService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    private val apiCallExecutor: RxAPICallExecutor
 ) : BaseSettingCall<List<InternalStockUseCase>>() {
 
     override fun fetch(storeError: Boolean): Single<List<InternalStockUseCase>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
index f19a3f4e5c..3ff4114b87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 @Reusable
 internal class StockUseCaseHandler @Inject constructor(
     store: StockUseCaseStore,
-    private val transactionLinkHandler: StockUseCaseTransactionLinkHandler,
+    private val transactionLinkHandler: StockUseCaseTransactionLinkHandler
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<InternalStockUseCase>(store) {
 
     override fun beforeCollectionHandled(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
index 96cd373088..a358b56176 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
@@ -62,7 +62,8 @@ internal class StockUseCaseTransactionLinkStoreImpl(
             }
 
         val CHILD_PROJECTION: SingleParentChildProjection = SingleParentChildProjection(
-            StockUseCaseTransactionTableInfo.TABLE_INFO, StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID
+            StockUseCaseTransactionTableInfo.TABLE_INFO,
+            StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt
index 752008b7a8..b6777ecf93 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt
@@ -54,7 +54,7 @@ internal object AccountManagerHelper {
         NoteTableInfo.TABLE_INFO,
         ProgramOwnerTableInfo.TABLE_INFO,
         RelationshipTableInfo.TABLE_INFO,
-        DataStoreEntryTableInfo.TABLE_INFO,
+        DataStoreEntryTableInfo.TABLE_INFO
     )
 
     private val syncStateQuery =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
index 7006099cd6..1e84467be9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
@@ -43,12 +43,16 @@ internal class LogInDatabaseManager @Inject internal constructor(
         return generalSettingCall.isDatabaseEncrypted()
             .doOnSuccess { encrypt: Boolean ->
                 multiUserDatabaseManager.loadExistingChangingEncryptionIfRequiredOtherwiseCreateNew(
-                    serverUrl, username, encrypt
+                    serverUrl,
+                    username,
+                    encrypt
                 )
             }
             .doOnError {
                 multiUserDatabaseManager.loadExistingKeepingEncryptionOtherwiseCreateNew(
-                    serverUrl, username, false
+                    serverUrl,
+                    username,
+                    false
                 )
             }
             .ignoreElement()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/util/StringUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/util/StringUtils.kt
index 56534912ca..419edef5fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/util/StringUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/util/StringUtils.kt
@@ -35,18 +35,27 @@ object StringUtils {
         return str?.let {
             val positiveEnd = end
                 .run {
-                    if (this < 0) this + str.length
-                    else this
+                    if (this < 0) {
+                        this + str.length
+                    } else {
+                        this
+                    }
                 }
                 .run {
-                    if (this > str.length) str.length
-                    else this
+                    if (this > str.length) {
+                        str.length
+                    } else {
+                        this
+                    }
                 }
 
             val positiveStart = start
                 .run {
-                    if (this < 0) this + str.length
-                    else this
+                    if (this < 0) {
+                        this + str.length
+                    } else {
+                        this
+                    }
                 }
 
             if (positiveStart > positiveEnd) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
index ef57cec9b2..d7d3b95371 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
@@ -77,8 +77,10 @@ internal class ValidationEngineImpl @Inject constructor(
         val violations = if (rules.isNotEmpty()) {
             val constantMap = constantMap
             val valueMap = getValueMap(
-                dataSetUid, attributeOptionComboUid,
-                orgUnitUid, periodId
+                dataSetUid,
+                attributeOptionComboUid,
+                orgUnitUid,
+                periodId
             )
             val orgunitGroupMap = orgunitGroupMap
             val organisationUnit = getOrganisationUnit(orgUnitUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
index 177333f6c5..7e896730eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
@@ -53,10 +53,14 @@ internal class ValidationExecutor @Inject constructor(private val expressionServ
             null
         } else {
             val leftSideValue = expressionService.getExpressionValue(
-                rule.leftSide().expression(), context, rule.leftSide().missingValueStrategy()
+                rule.leftSide().expression(),
+                context,
+                rule.leftSide().missingValueStrategy()
             ) as Double?
             val rightSideValue = expressionService.getExpressionValue(
-                rule.rightSide().expression(), context, rule.rightSide().missingValueStrategy()
+                rule.rightSide().expression(),
+                context,
+                rule.rightSide().missingValueStrategy()
             ) as Double?
 
             if (isViolation(rule, leftSideValue, rightSideValue)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt
index 9561258c4c..39161b055b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt
@@ -71,7 +71,7 @@ internal data class VisualizationAPI36(
     val aggregationType: AggregationType?,
     val columns: List<VisualizationDimension>,
     val rows: List<VisualizationDimension>,
-    val filters: List<VisualizationDimension>,
+    val filters: List<VisualizationDimension>
 ) {
     fun toVisualization(): Visualization =
         Visualization.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt
index 8a835b99da..0efb35d8f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt
@@ -53,7 +53,7 @@ object VisualizationDimensionItemTableInfo {
                 POSITION,
                 DIMENSION,
                 DIMENSION_ITEM,
-                DIMENSION_ITEM_TYPE,
+                DIMENSION_ITEM_TYPE
             )
         }
 
@@ -64,7 +64,7 @@ object VisualizationDimensionItemTableInfo {
                 POSITION,
                 DIMENSION,
                 DIMENSION_ITEM,
-                DIMENSION_ITEM_TYPE,
+                DIMENSION_ITEM_TYPE
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt
index 6ba17c9850..bf77f22aec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt
@@ -43,7 +43,7 @@ internal object VisualizationDimensionFields {
             .fields(
                 fh.field<String>(BaseIdentifiableObject.UID),
                 fh.nestedField<VisualizationDimensionItem>(ITEMS)
-                    .with(VisualizationDimensionItemFields.allFields),
+                    .with(VisualizationDimensionItemFields.allFields)
             )
             .build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt
index 8f99d66df2..b332ee3d16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt
@@ -41,7 +41,7 @@ internal object VisualizationDimensionItemFields {
         Fields.builder<VisualizationDimensionItem>()
             .fields(
                 fh.field<String>(DIMENSION_ITEM),
-                fh.field<String>(DIMENSION_ITEM_TYPE),
+                fh.field<String>(DIMENSION_ITEM_TYPE)
             )
             .build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt
index db9e653689..8efd06d828 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt
@@ -98,6 +98,6 @@ internal object VisualizationFields {
                 fh.field<DigitGroupSeparator>(VisualizationTableInfo.Columns.DIGIT_GROUP_SEPARATOR),
                 fh.nestedField<VisualizationDimension>(COLUMNS).with(VisualizationDimensionFields.allFields),
                 fh.nestedField<VisualizationDimension>(ROWS).with(VisualizationDimensionFields.allFields),
-                fh.nestedField<VisualizationDimension>(FILTERS).with(VisualizationDimensionFields.allFields),
+                fh.nestedField<VisualizationDimension>(FILTERS).with(VisualizationDimensionFields.allFields)
             )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
index 8bcd0adb95..e465bac131 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
@@ -39,7 +39,7 @@ class VisualizationModuleWiper @Inject internal constructor(private val tableWip
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             VisualizationTableInfo.TABLE_INFO,
-            VisualizationDimensionItemTableInfo.TABLE_INFO,
+            VisualizationDimensionItemTableInfo.TABLE_INFO
         )
     }
 
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt
index 551a0d2f41..5ceb71a50c 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt
@@ -42,7 +42,6 @@ object DataValueSamples {
         attributeOptionCombo: String,
         value: String
     ): DataValue {
-
         return DataValue.builder()
             .id(1L)
             .syncState(State.TO_POST)
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
index 1717d40a0a..ee7b8ff702 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
@@ -35,8 +35,14 @@ internal object TrackerQueryCommonParamsSamples {
     @JvmStatic
     fun get(): TrackerQueryCommonParams {
         return TrackerQueryCommonParams(
-            listOf(), listOf(), null, "start-date", false,
-            OrganisationUnitMode.ACCESSIBLE, listOf(), 50
+            listOf(),
+            listOf(),
+            null,
+            "start-date",
+            false,
+            OrganisationUnitMode.ACCESSIBLE,
+            listOf(),
+            50
         )
     }
 }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt
index 9cbe143cdb..1d9afc8cc2 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt
@@ -41,9 +41,11 @@ object FillPropertiesTestUtils {
     const val NAME = "test_name"
     const val DISPLAY_NAME = "test_display_name"
     private const val CREATED_STR = "2012-10-20T18:20:27.132"
+
     @JvmField
     val CREATED = parseDate(CREATED_STR)
     const val LAST_UPDATED_STR = "2017-12-20T15:08:27.882"
+
     @JvmField
     val LAST_UPDATED = parseDate(LAST_UPDATED_STR)
     private const val SHORT_NAME = "test_short_name"
@@ -52,6 +54,7 @@ object FillPropertiesTestUtils {
     private const val DISPLAY_DESCRIPTION = "test_display_description"
     const val TABLE = "test_table"
     private const val FUTURE_DATE_STR = "3000-12-20T15:08:27.882"
+
     @JvmField
     val FUTURE_DATE = parseDate(FUTURE_DATE_STR)
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt
index 508e950bb3..ab52462d96 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt
@@ -56,7 +56,7 @@ class ChunkedSecureStoreShould {
                 "otherKey_[LEN]_",
                 "otherKey_[1]_",
                 "sampleKey_[3]",
-                "OTHER_CONFIG",
+                "OTHER_CONFIG"
             )
         )
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
index 1a25721b78..13b0955a2c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
@@ -68,8 +68,10 @@ class CategoryComboHandlerShould {
         whenever(categoryComboStore.updateOrInsert(any())).doReturn(HandleAction.Insert)
 
         categoryComboHandler = CategoryComboHandler(
-            categoryComboStore, optionComboHandler,
-            categoryCategoryComboLinkHandler, categoryOptionCleaner
+            categoryComboStore,
+            optionComboHandler,
+            categoryCategoryComboLinkHandler,
+            categoryOptionCleaner
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
index a2539d9374..4aa2fed087 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
@@ -79,8 +79,13 @@ class TrackerDataManagerShould {
         whenever(relationshipStore.getRelationshipsByItem(any())).doReturn(listOf(relationship))
 
         trackerDataManager = TrackerDataManagerImpl(
-            trackedEntityStore, enrollmentStore, eventStore, relationshipStore,
-            relationshipChildrenAppender, dataStatePropagator, programOwnerStore
+            trackedEntityStore,
+            enrollmentStore,
+            eventStore,
+            relationshipStore,
+            relationshipChildrenAppender,
+            dataStatePropagator,
+            programOwnerStore
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
index dcb35b85d3..0144b80bbc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
@@ -67,7 +67,10 @@ class MultiUserDatabaseManagerForD2ManagerUnitShould : BaseCallShould() {
     override fun setUp() {
         super.setUp()
         manager = MultiUserDatabaseManagerForD2Manager(
-            databaseAdapter, migration, databaseAdapterFactory, databaseConfigurationStore
+            databaseAdapter,
+            migration,
+            databaseAdapterFactory,
+            databaseConfigurationStore
         )
         whenever(databaseConfigurationStore.get()).doReturn(databasesConfiguration)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
index 0f974ad21b..5db9094e8e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
@@ -84,8 +84,12 @@ class MultiUserDatabaseManagerUnitShould : BaseCallShould() {
     override fun setUp() {
         super.setUp()
         manager = MultiUserDatabaseManager(
-            context, databaseAdapter, databaseConfigurationSecureStore, configurationHelper,
-            databaseAdapterFactory, databaseExport
+            context,
+            databaseAdapter,
+            databaseConfigurationSecureStore,
+            configurationHelper,
+            databaseAdapterFactory,
+            databaseExport
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParserShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParserShould.kt
index 97b039898c..093556c06d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParserShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/ServerUrlParserShould.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.configuration.internal
 
 import com.google.common.truth.Truth.assertThat
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser.parse
 import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser.removeTrailingApi
 import org.hisp.dhis.android.core.configuration.internal.ServerUrlParser.trimAndRemoveTrailingSlash
@@ -39,7 +39,7 @@ import org.junit.runners.JUnit4
 
 @RunWith(JUnit4::class)
 class ServerUrlParserShould {
-    private val expected = HttpUrl.parse("http://dhis2.org/api/")
+    private val expected = "http://dhis2.org/api/".toHttpUrlOrNull()
 
     @Test(expected = D2Error::class)
     fun return_error_empty_string() {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
index 0ea9d1ac65..ef59977a20 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
@@ -80,8 +80,12 @@ class AggregatedDataCallBundleFactoryShould {
         whenever(periodManager.getPeriodsInRange(any(), any(), any())).doReturn(periods)
 
         bundleFactory = AggregatedDataCallBundleFactory(
-            dataSetRepository, organisationUnitRepository,
-            dataSetSettingsObjectRepository, periodManager, aggregatedDataSyncStore, lastUpdatedCalculator
+            dataSetRepository,
+            organisationUnitRepository,
+            dataSetSettingsObjectRepository,
+            periodManager,
+            aggregatedDataSyncStore,
+            lastUpdatedCalculator
         )
     }
 
@@ -94,7 +98,10 @@ class AggregatedDataCallBundleFactoryShould {
 
         val bundles = bundleFactory.getBundlesInternal(
             listOf(dataSet1, dataSet2),
-            dataSetSettings, rootOrgUnits, allOrgUnits, emptyMap()
+            dataSetSettings,
+            rootOrgUnits,
+            allOrgUnits,
+            emptyMap()
         )
 
         assertThat(bundles.size).isEqualTo(1)
@@ -110,7 +117,10 @@ class AggregatedDataCallBundleFactoryShould {
 
         val bundles = bundleFactory.getBundlesInternal(
             listOf(dataSet1, dataSet2),
-            dataSetSettings, rootOrgUnits, allOrgUnits, emptyMap()
+            dataSetSettings,
+            rootOrgUnits,
+            allOrgUnits,
+            emptyMap()
         )
 
         assertThat(bundles.size).isEqualTo(2)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 3815c25cce..9ad3613f72 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -153,7 +153,7 @@ class MetadataCallShould : BaseCallShould() {
             multiUserDatabaseManager,
             credentialsSecureStore,
             legendSetModuleDownloader,
-            expressionDimensIndicatorModuleDownloader,
+            expressionDimensIndicatorModuleDownloader
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
index 420c7a4de3..dd5c776fbd 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
@@ -198,7 +198,6 @@ class EnrollmentServiceShould {
 
     @Test
     fun `Enrollment has any events that allows events creation`() {
-
         whenever(enrollmentRepository.uid(enrollmentUid).blockingGet()) doReturn enrollment
         whenever(enrollment.program()) doReturn programUid
 
@@ -225,7 +224,6 @@ class EnrollmentServiceShould {
 
     @Test
     fun `Enrollment has not any events that allows events creation`() {
-
         whenever(enrollmentRepository.uid(enrollmentUid).blockingGet()) doReturn enrollment
         whenever(enrollment.program()) doReturn programUid
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt
index ccd38c3c53..1c55e17cdc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt
@@ -80,8 +80,12 @@ class EnrollmentImportHandlerShould {
     @Throws(Exception::class)
     fun setUp() {
         enrollmentImportHandler = EnrollmentImportHandler(
-            enrollmentStore, eventImportHandler, trackerImportConflictStore, trackerImportConflictParser,
-            jobReportEnrollmentHandler, dataStatePropagator
+            enrollmentStore,
+            eventImportHandler,
+            trackerImportConflictStore,
+            trackerImportConflictParser,
+            jobReportEnrollmentHandler,
+            dataStatePropagator
         )
 
         whenever(enrollment.trackedEntityInstance()).thenReturn("tei_uid")
@@ -147,7 +151,9 @@ class EnrollmentImportHandlerShould {
         whenever(missingEnrollment.uid()).thenReturn("missing_enrollment_uid")
 
         val response = enrollmentImportHandler.handleEnrollmentImportSummary(
-            listOf(importSummary), enrollments, teiState
+            listOf(importSummary),
+            enrollments,
+            teiState
         )
 
         assertThat(response.enrollments.ignored.size).isEqualTo(1)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt
index cac7f99bf8..9dd1c2f08b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt
@@ -76,8 +76,14 @@ class EventServiceShould {
     private val eventDateUtils: EventDateUtils = mock()
 
     private val eventService: EventService = EventServiceImpl(
-        enrollmentRepository, eventRepository, programRepository, programStageRepository,
-        enrollmentService, organisationUnitService, categoryOptionComboService, eventDateUtils
+        enrollmentRepository,
+        eventRepository,
+        programRepository,
+        programStageRepository,
+        enrollmentService,
+        organisationUnitService,
+        categoryOptionComboService,
+        eventDateUtils
     )
 
     private val firstJanuary = BaseIdentifiableObject.DATE_FORMAT.parse("2020-01-01T00:00:00.000")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt
index 663730455a..402b2004c7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt
@@ -59,7 +59,8 @@ class EventDateUtilsShould {
         whenever(periodHelper.calendar) doReturn getCalendar()
         whenever(
             periodHelper.blockingGetPeriodForPeriodTypeAndDate(
-                PeriodType.Monthly, thirdJanuary,
+                PeriodType.Monthly,
+                thirdJanuary,
                 1
             )
         ) doReturn february
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
index 17af2a911f..c9754ccf35 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
@@ -119,7 +119,8 @@ class EventEndpointCallShould {
                 program,
                 startDate,
                 false,
-                OrganisationUnitMode.SELECTED, listOf(orgUnit),
+                OrganisationUnitMode.SELECTED,
+                listOf(orgUnit),
                 10
             ),
             orgUnit = orgUnit
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
index 7158163e29..ef5c91fcbc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
@@ -81,8 +81,13 @@ class EventHandlerShould {
         whenever(eventBuilder.build()).doReturn(event)
 
         eventHandler = EventHandler(
-            relationshipVersionManager, relationshipHandler, eventStore,
-            trackedEntityDataValueHandler, noteHandler, noteVersionManager, noteUniquenessManager,
+            relationshipVersionManager,
+            relationshipHandler,
+            eventStore,
+            trackedEntityDataValueHandler,
+            noteHandler,
+            noteVersionManager,
+            noteUniquenessManager,
             relationshipOrphanCleaner
         )
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt
index a4cfc0a6e6..4598b2e949 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt
@@ -72,7 +72,11 @@ class EventImportHandlerShould {
         whenever(importSummary.status()).thenReturn(ImportStatus.SUCCESS)
 
         eventImportHandler = EventImportHandler(
-            eventStore, enrollmentStore, trackerImportConflictStore, trackerImportConflictParser, jobReportEventHandler,
+            eventStore,
+            enrollmentStore,
+            trackerImportConflictStore,
+            trackerImportConflictParser,
+            jobReportEventHandler,
             dataStatePropagator
         )
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
index d0a4d80891..b68217b201 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
@@ -84,7 +84,8 @@ class EventQueryBundleFactoryShould {
         whenever(programSettingsObjectRepository.blockingGet()).thenReturn(programSettings)
 
         val commonHelper = TrackerQueryFactoryCommonHelper(
-            userOrganisationUnitLinkStore, organisationUnitProgramLinkLinkStore
+            userOrganisationUnitLinkStore,
+            organisationUnitProgramLinkLinkStore
         )
         bundleFactory = EventQueryBundleFactory(
             programStore,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
index ac4f6af274..a0e6523684 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
@@ -71,6 +71,7 @@ class OrganisationUnitCallUnitShould {
     private lateinit var lastUpdated: Date
     private lateinit var organisationUnitCall: Completable
 
+    @Suppress("LongMethod")
     @Before
     @Throws(IOException::class)
     fun setUp() {
@@ -128,8 +129,12 @@ class OrganisationUnitCallUnitShould {
         whenever(UserInternalAccessor.accessOrganisationUnits(user)).doReturn(organisationUnits)
         whenever(
             organisationUnitService.getOrganisationUnits(
-                fieldsCaptor.capture(), filtersCaptor.capture(), orderCaptor.capture(), pagingCaptor.capture(),
-                pageSizeCaptor.capture(), pageCaptor.capture()
+                fieldsCaptor.capture(),
+                filtersCaptor.capture(),
+                orderCaptor.capture(),
+                pagingCaptor.capture(),
+                pageSizeCaptor.capture(),
+                pageCaptor.capture()
             )
         ).doReturn(Single.just(organisationUnitPayload))
         whenever(organisationUnitPayload.items()).doReturn(organisationUnits)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
index 5b14de8a5f..b7127b1e20 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
@@ -65,8 +65,11 @@ class OrganisationUnitHandlerShould {
         val programUid = "test_program_uid"
         pathTransformer = OrganisationUnitDisplayPathTransformer()
         organisationUnitHandler = OrganisationUnitHandler(
-            organisationUnitStore, userOrganisationUnitLinkHandler, organisationUnitProgramLinkHandler,
-            dataSetDataSetOrganisationUnitLinkHandler, organisationUnitGroupHandler,
+            organisationUnitStore,
+            userOrganisationUnitLinkHandler,
+            organisationUnitProgramLinkHandler,
+            dataSetDataSetOrganisationUnitLinkHandler,
+            organisationUnitGroupHandler,
             organisationUnitGroupLinkHandler
         )
         whenever(user.uid()).doReturn("test_user_uid")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt
index f988535b27..2d4e3146b3 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt
@@ -39,7 +39,7 @@ class ParserUtilsShould {
         mapOf(
             "2022-12-10" to listOf(2022, 12, 10, "2022-12-10"),
             "2022-05-08" to listOf(2022, 5, 8, "2022-05-08"),
-            "2022-5-8" to listOf(2022, 5, 8, "2022-05-08"),
+            "2022-5-8" to listOf(2022, 5, 8, "2022-05-08")
         ).forEach { (str, tokens) ->
             val date = ParserUtils.parseExpressionDate(str)
             assertThat(date.year).isEqualTo(tokens[0])
@@ -55,7 +55,7 @@ class ParserUtilsShould {
             "",
             "null",
             "2022-08",
-            "2022-13-35",
+            "2022-13-35"
         ).forEach {
             assertThrows(ParserExceptionWithoutContext::class.java) { ParserUtils.parseExpressionDate(it) }
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt
index c97759a2f8..0f76555fa9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt
@@ -113,8 +113,11 @@ class ExpressionHelperShould {
         value: Double
     ) {
         val key =
-            if (categoryOptionComboId == null) DataElementObject(dataElementId)
-            else DataElementOperandObject(dataElementId, categoryOptionComboId)
+            if (categoryOptionComboId == null) {
+                DataElementObject(dataElementId)
+            } else {
+                DataElementOperandObject(dataElementId, categoryOptionComboId)
+            }
 
         val entry = valueMap.entries.find { it.key == key }
 
@@ -128,8 +131,11 @@ class ExpressionHelperShould {
         categoryOptionComboId: String?
     ) {
         val key =
-            if (categoryOptionComboId == null) DataElementObject(dataElementId)
-            else DataElementOperandObject(dataElementId, categoryOptionComboId)
+            if (categoryOptionComboId == null) {
+                DataElementObject(dataElementId)
+            } else {
+                DataElementOperandObject(dataElementId, categoryOptionComboId)
+            }
 
         valueMap.entries.none { it.key == key }
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index 87f728abf4..a63d63260a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -32,7 +32,7 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
 import javax.net.ssl.HttpsURLConnection
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.BaseCallShould
@@ -84,7 +84,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         super.setUp()
         errorResponse = Response.error<Any>(
             HttpsURLConnection.HTTP_CLIENT_TIMEOUT,
-            ResponseBody.create(MediaType.parse("application/json"), "{}")
+            ResponseBody.create("application/json".toMediaTypeOrNull(), "{}")
         )
 
         // Calls
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
index a4f0dd99f7..c5a6c27a08 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
@@ -68,8 +68,10 @@ class RelationshipHandlerShould {
     @Before
     fun setUp() {
         relationshipHandler = RelationshipHandler(
-            relationshipStore, relationshipItemStore,
-            relationshipItemHandler, storeSelector
+            relationshipStore,
+            relationshipItemStore,
+            relationshipItemHandler,
+            storeSelector
         )
         whenever(storeSelector.getElementStore(any())).thenReturn(itemElementStore)
         whenever(itemElementStore.exists(RelationshipSamples.FROM_UID)).thenReturn(true)
@@ -78,7 +80,8 @@ class RelationshipHandlerShould {
         whenever(itemElementStore.exists(TEI_4_UID)).thenReturn(true)
         whenever(
             relationshipItemStore.getRelationshipUidsForItems(
-                RelationshipSamples.fromItem, RelationshipSamples.toItem
+                RelationshipSamples.fromItem,
+                RelationshipSamples.toItem
             )
         ).thenReturn(listOf(RelationshipSamples.UID))
         whenever(relationshipItemStore.getRelationshipUidsForItems(tei3Item, tei4Item)).thenReturn(emptyList())
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt
index 85ae421d1a..38956fe74e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt
@@ -86,7 +86,8 @@ class RelationshipImportHandlerShould {
         whenever(importSummary.reference()).doReturn("test_uid")
 
         relationshipImportHandler.handleRelationshipImportSummaries(
-            listOf(importSummary), relationships
+            listOf(importSummary),
+            relationships
         )
 
         verify(relationshipStore, times(1)).setSyncStateOrDelete("test_uid", State.SYNCED)
@@ -99,7 +100,8 @@ class RelationshipImportHandlerShould {
         whenever(importSummary.reference()).doReturn("test_uid")
 
         relationshipImportHandler.handleRelationshipImportSummaries(
-            listOf(importSummary), relationships
+            listOf(importSummary),
+            relationships
         )
 
         verify(relationshipStore, times(1)).setSyncStateOrDelete("test_uid", State.TO_UPDATE)
@@ -115,7 +117,8 @@ class RelationshipImportHandlerShould {
         whenever(relationship.uid()).doReturn("missing_uid")
 
         relationshipImportHandler.handleRelationshipImportSummaries(
-            listOf(importSummary), relationships
+            listOf(importSummary),
+            relationships
         )
 
         verify(relationshipStore, times(1)).setSyncStateOrDelete("test_uid", State.SYNCED)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
index df76dd10ce..778b25b4c9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
@@ -56,8 +56,11 @@ class AnalyticsTeiSettingHandlerShould {
         whenever(analyticsTeiSetting.uid()) doReturn "tei_setting_uid"
 
         analyticsTeiSettingHandler = AnalyticsTeiSettingHandler(
-            analyticsTeiSettingStore, teiDataElementHandler,
-            teiIndicatorHandler, teiAttributeHandler, whoDataHandler
+            analyticsTeiSettingStore,
+            teiDataElementHandler,
+            teiIndicatorHandler,
+            teiAttributeHandler,
+            whoDataHandler
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
index 22121fa05c..0030953726 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
@@ -51,7 +51,8 @@ class AnalyticsTeiWHONutritionDataHandlerShould {
         whenever(whoData.teiSetting()) doReturn "tei_setting"
 
         analyticsTeiSettingHandler = AnalyticsTeiWHONutritionDataHandler(
-            store, teiDataElementHandler,
+            store,
+            teiDataElementHandler,
             teiIndicatorHandler
         )
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
index f355d3d11d..af71d4ba24 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
@@ -59,8 +59,13 @@ class SynchronizationSettingCallShould {
         whenever(service.synchronizationSettings(any())) doReturn synchronizationSettingSingle
         whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
         synchronizationSettingCall = SynchronizationSettingCall(
-            handler, service, apiCallExecutor,
-            generalSettingCall, dataSetSettingCall, programSettingCall, appVersionManager
+            handler,
+            service,
+            apiCallExecutor,
+            generalSettingCall,
+            dataSetSettingCall,
+            programSettingCall,
+            appVersionManager
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
index c833dad34d..e3dfce3563 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
@@ -53,7 +53,8 @@ class SynchronizationSettingsHandlerShould {
         whenever(synchronizationSettingStore.updateOrInsertWhere(any())) doReturn HandleAction.Insert
         synchronizationSettingsHandler = SynchronizationSettingHandler(
             synchronizationSettingStore,
-            dataSetSettingHandler, programSettingHandler
+            dataSetSettingHandler,
+            programSettingHandler
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt b/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt
index aeebafff6e..cc297ab90e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt
@@ -57,8 +57,13 @@ class WebApiRepositoryImplShould {
 
         testWebRepository.metadataCall(defalutMetadataConfig)
         verify(apiService).getMetadataIds(
-            notNull(), notNull(), notNull(), notNull(), notNull(),
-            notNull(), notNull()
+            notNull(),
+            notNull(),
+            notNull(),
+            notNull(),
+            notNull(),
+            notNull(),
+            notNull()
         )
     }
 
@@ -68,8 +73,13 @@ class WebApiRepositoryImplShould {
 
         testWebRepository.metadataCall(defalutMetadataConfig)
         verify(apiService).getMetadataIds(
-            notNull(), notNull(), notNull(), isNull(), notNull(),
-            notNull(), notNull()
+            notNull(),
+            notNull(),
+            notNull(),
+            isNull(),
+            notNull(),
+            notNull(),
+            notNull()
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
index 6c5774edb6..98d30aa7c3 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
@@ -70,7 +70,10 @@ class SystemInfoCallShould {
     @Before
     fun setUp() {
         systemInfoSyncCall = SystemInfoCall(
-            systemInfoHandler, systemInfoService, resourceHandler, versionManager,
+            systemInfoHandler,
+            systemInfoService,
+            resourceHandler,
+            versionManager,
             coroutineAPICallExecutor
         )
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
index fd274690eb..eb91831a43 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
@@ -194,7 +194,9 @@ class TrackedEntityInstanceHandlerShould {
 
         verify(relationshipHandler, times(1)).handleMany(any(), any())
         verify(relationshipVersionManager, times(1)).saveRelativesIfNotExist(
-            listOf(relationship), TEI_UID, relatives,
+            listOf(relationship),
+            TEI_UID,
+            relatives,
             relationshipHandler
         )
     }
@@ -229,7 +231,9 @@ class TrackedEntityInstanceHandlerShould {
         verify(trackedEntityInstanceStore, never()).deleteIfExists(any())
         verify(trackedEntityAttributeValueHandler, times(1)).handleMany(any(), any())
         verify(trackedEntityAttributeValueStore, times(1)).deleteByInstanceAndNotInProgramAttributes(
-            any(), any(), any()
+            any(),
+            any(),
+            any()
         )
         verifyNoMoreInteractions(trackedEntityAttributeValueStore)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt
index 9a00e54476..fc50143e07 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt
@@ -105,7 +105,8 @@ class TrackedEntityInstanceImportHandlerShould {
         whenever(importSummary.reference()).doReturn(sampleTeiUid)
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-            listOf(importSummary), instances
+            listOf(importSummary),
+            instances
         )
 
         verify(trackedEntityInstanceStore, times(1))
@@ -118,7 +119,8 @@ class TrackedEntityInstanceImportHandlerShould {
         whenever(importSummary.reference()).doReturn(sampleTeiUid)
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-            listOf(importSummary), instances
+            listOf(importSummary),
+            instances
         )
 
         verify(trackedEntityInstanceStore, times(1))
@@ -135,12 +137,15 @@ class TrackedEntityInstanceImportHandlerShould {
         whenever(importEnrollment.importSummaries()).doReturn(enrollmentSummaries)
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-            listOf(importSummary), instances
+            listOf(importSummary),
+            instances
         )
 
         verify(trackedEntityInstanceStore, times(1)).setSyncStateOrDelete(sampleTeiUid, State.SYNCED)
         verify(enrollmentImportHandler, times(1)).handleEnrollmentImportSummary(
-            eq(enrollmentSummaries), anyList(), eq(State.SYNCED)
+            eq(enrollmentSummaries),
+            anyList(),
+            eq(State.SYNCED)
         )
     }
 
@@ -153,7 +158,8 @@ class TrackedEntityInstanceImportHandlerShould {
         whenever(trackedEntityInstance.uid()).thenReturn("missing_tei_uid")
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-            listOf(importSummary), instances
+            listOf(importSummary),
+            instances
         )
 
         verify(trackedEntityInstanceStore, times(1)).setSyncStateOrDelete(sampleTeiUid, State.SYNCED)
@@ -169,7 +175,8 @@ class TrackedEntityInstanceImportHandlerShould {
         whenever(trackedEntityInstance.uid()).thenReturn("missing_tei_uid")
 
         val response = trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-            listOf(importSummary), instances
+            listOf(importSummary),
+            instances
         )
 
         assertThat(response.teis.ignored.size).isEqualTo(1)
@@ -189,7 +196,8 @@ class TrackedEntityInstanceImportHandlerShould {
         val teis = listOf(sampleTei(sampleTeiUid, emptyList()))
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
-            listOf(importSummary), teis
+            listOf(importSummary),
+            teis
         )
 
         verify(trackedEntityInstanceStore, times(1)).setSyncStateOrDelete(sampleTeiUid, State.SYNCED)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
index 16a05ac9f7..2c50ad1e3f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
@@ -72,6 +72,7 @@ class TrackedEntityInstanceQueryFactoryShould {
 
     // Object to test
     private lateinit var queryFactory: TrackerQueryBundleFactory
+
     @Before
     @Throws(Exception::class)
     fun setUp() {
@@ -86,10 +87,14 @@ class TrackedEntityInstanceQueryFactoryShould {
         whenever(programSettingsObjectRepository.blockingGet()).thenReturn(programSettings)
 
         val commonHelper = TrackerQueryFactoryCommonHelper(
-            userOrganisationUnitLinkStore, organisationUnitProgramLinkLinkStore
+            userOrganisationUnitLinkStore,
+            organisationUnitProgramLinkLinkStore
         )
         queryFactory = TrackerQueryBundleFactory(
-            programStore, programSettingsObjectRepository, lastUpdatedManager, commonHelper
+            programStore,
+            programSettingsObjectRepository,
+            lastUpdatedManager,
+            commonHelper
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
index b67e135c0d..c65d46db18 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
@@ -34,8 +34,14 @@ internal object TrackerQueryCommonParamsSamples {
     @JvmStatic
     fun get(): TrackerQueryCommonParams {
         return TrackerQueryCommonParams(
-            listOf(), listOf(), null, "start-date", false,
-            OrganisationUnitMode.ACCESSIBLE, listOf(), 50
+            listOf(),
+            listOf(),
+            null,
+            "start-date",
+            false,
+            OrganisationUnitMode.ACCESSIBLE,
+            listOf(),
+            50
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
index e4ea301079..70a8e8d11a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
@@ -63,8 +63,11 @@ class OwnershipManagerShould {
         }
 
         ownershipManager = OwnershipManagerImpl(
-            coroutineAPICallExecutor, ownershipService, dataStatePropagator,
-            programTempOwnerStore, programOwnerStore
+            coroutineAPICallExecutor,
+            ownershipService,
+            dataStatePropagator,
+            programTempOwnerStore,
+            programOwnerStore
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index 9ce06430a9..c94c683bb2 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -119,7 +119,11 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
 
         // Metadata call
         callFactory = TrackedEntityInstanceQueryCallFactory(
-            trackedEntityService, eventService, mapper, coroutineAPICallExecutor, dhisVersionManager
+            trackedEntityService,
+            eventService,
+            mapper,
+            coroutineAPICallExecutor,
+            dhisVersionManager
         )
     }
 
@@ -205,7 +209,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     fun should_query_events_if_data_value_filter() = runTest {
         val events = listOf(
             EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid1"), "tei1").build(),
-            EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid2"), "tei2").build(),
+            EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid2"), "tei2").build()
         )
         whenever(eventPayload.items()).doReturn(events)
 
@@ -311,7 +315,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             eq(query.lastUpdatedStartDate.simpleDateFormat()),
             eq(query.lastUpdatedEndDate.simpleDateFormat()),
             eq(query.includeDeleted),
-            eq(null),
+            eq(null)
         )
     }
 
@@ -373,7 +377,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
                     anyOrNull(),
                     anyOrNull(),
                     anyOrNull(),
-                    anyOrNull(),
+                    anyOrNull()
                 )
             }.doAnswer(answer)
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index adb4d717cb..35c94cd174 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -129,8 +129,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun get_initial_online_page() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
@@ -146,8 +151,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun get_initial_offline_page() {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_ONLY).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
@@ -162,8 +172,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun query_online_when_offline_exhausted() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
@@ -180,8 +195,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun query_online_again_if_not_exhausted_and_use_right_paging() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
 
         onlineCallFactory.stub {
@@ -210,8 +230,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun get_initial_online_page_from_cache() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).allowOnlineCache(true).build()
         val dataSource1 = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
         dataSource1.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
@@ -220,8 +245,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
         verify(onlineCallFactory).getQueryCall(any())
 
         val dataSource2 = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
         dataSource2.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
@@ -234,8 +264,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun get_multiple_event_filter_queries() = runTest {
         val scope = multipleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
@@ -260,8 +295,13 @@ class TrackedEntityInstanceQueryDataSourceShould {
     fun get_second_online_page_if_needed_in_initial_load() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
         val dataSource = TrackedEntityInstanceQueryDataSource(
-            store, trackerParentCallFactory, scope, childrenAppenders,
-            onlineCache, onlineHelper, localQueryHelper
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
         )
 
         onlineCallFactory.stub {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt
index edf86876a3..523a5a6a8e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt
@@ -100,7 +100,7 @@ class TrackedEntityInstanceQueryOnlineHelperShould {
             "filterItemIN:in:nom/,app;nom/:app;nom/;app",
             "filterItemLIKE1:like:nom/,app",
             "filterItemLIKE2:like:nom/:app",
-            "filterItemLIKE3:like:nom/;app",
+            "filterItemLIKE3:like:nom/;app"
         )
 
         val scope = queryBuilder
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt
index 8742771397..84fcb0cbe5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt
@@ -179,7 +179,7 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
                             AttributeValueFilter.builder()
                                 .attribute("attribute2")
                                 .eq("eq_str")
-                                .build(),
+                                .build()
                         )
                     )
                     .build()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
index 212b2ce223..298ca6a8fc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
@@ -57,7 +57,9 @@ class AuthorityEndpointCallShould : BaseCallShould() {
         super.setUp()
         val apiCallExecutor = APICallExecutorImpl.create(databaseAdapter, userAccountDisabledErrorCatcher)
         endpointCall = AuthorityEndpointCallFactory(
-            genericCallData, apiCallExecutor, handler,
+            genericCallData,
+            apiCallExecutor,
+            handler,
             retrofit.create(AuthorityService::class.java)
         ).create()
         whenever(retrofitCall.execute()).thenReturn(Response.success(payload))
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 79795261a8..4a0bf9f2f7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -169,7 +169,8 @@ class LogInCallUnitShould : BaseCallShould() {
     fun invoke_server_with_correct_parameters_after_call() {
         whenever(
             userService.authenticate(
-                credentialsCaptor.capture(), filterCaptor.capture()
+                credentialsCaptor.capture(),
+                filterCaptor.capture()
             )
         ).thenReturn(authenticateAPICall)
         logInSingle.blockingGet()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 1799d957d0..24e088c772 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -69,7 +69,6 @@ class UserCallShould : BaseCallShould() {
             userSyncCall.call()
             Assert.fail("Exception was not thrown")
         } catch (ex: Exception) {
-
             // verify that handlers was not touched
             verify(databaseAdapter, never()).beginNewTransaction()
             verify(transaction, never()).setSuccessful()

From 85fef7881a90ddc1ec64cfb7b84552bd448d4974 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 24 Aug 2023 08:43:24 +0200
Subject: [PATCH 187/478] [ANDROSDK-1740] sonarlint check

---
 .../arch/helpers/FileResourceDirectoryHelper.kt    | 14 ++------------
 .../fileresource/internal/FileResourcePostCall.kt  |  4 ++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
index c33bfe26e7..26c0908932 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
@@ -56,12 +56,7 @@ object FileResourceDirectoryHelper {
 
     internal fun getFileResourceDirectory(context: Context, subfolder: String?): File {
         val childPath = subfolder?.let { "$FilesDir/$it" } ?: FilesDir
-        val file = File(context.filesDir, childPath)
-        return if (!file.exists() && file.mkdirs()) {
-            file
-        } else {
-            file
-        }
+        return File(context.filesDir, childPath)
     }
 
     internal fun deleteRootFileResourceDirectory(context: Context) {
@@ -91,12 +86,7 @@ object FileResourceDirectoryHelper {
 
     private fun getFileCacheResourceDirectory(context: Context, subfolder: String?): File {
         val childPath = subfolder?.let { "$CacheDir/$it" } ?: CacheDir
-        val file = File(context.cacheDir, childPath)
-        return if (!file.exists() && file.mkdirs()) {
-            file
-        } else {
-            file
-        }
+        return File(context.cacheDir, childPath)
     }
 
     internal fun getSubfolderName(databaseName: String): String {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
index 25ccf1cba9..4b0128ff70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
@@ -36,7 +36,7 @@ import java.io.IOException
 import javax.inject.Inject
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
-import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
@@ -92,7 +92,7 @@ internal class FileResourcePostCall @Inject constructor(
         val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) ?: "image/*"
 
         return MultipartBody.Part
-            .createFormData("file", file.name, RequestBody.create(type.toMediaTypeOrNull(), file))
+            .createFormData("file", file.name, file.asRequestBody(type.toMediaTypeOrNull()))
     }
 
     private fun handleResponse(

From 4d4844d686cefd49da8ee34910dee15320593486 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 24 Aug 2023 15:35:49 +0200
Subject: [PATCH 188/478] [ANDROSDK-1740] update ktlint to 0.50.0

---
 .editorconfig    | 3 ++-
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b0bb4cb9cf..48292c58eb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,4 @@
 [*.{kt,kts}]
 max_line_length = 120
-ktlint_disabled_rules=no-wildcard-imports,no-unit-return
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_package-name = disabled
diff --git a/build.gradle.kts b/build.gradle.kts
index 562907e72e..d2ef050236 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,7 +66,7 @@ subprojects {
     //version = VERSION_NAME
 
     configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
-//        version.set("0.45.2")
+        version.set("0.50.0")
         android.set(true)
         outputColorName.set("RED")
         reporters {

From 752db3756547140fceaca05340f7df435dc99506 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 24 Aug 2023 15:36:06 +0200
Subject: [PATCH 189/478] [ANDROSDK-1740] apply ktlintFormat

---
 .../android/core/BaseRealIntegrationTest.kt   |   2 +-
 .../org/hisp/dhis/android/core/D2Factory.kt   |   2 +-
 .../core/MockIntegrationTestObjects.kt        |   6 +-
 .../core/MultiUserMockIntegrationShould.kt    |   4 +-
 ...isualizationRepositoryIntegrationShould.kt |  20 +-
 .../BaseEvaluatorIntegrationShould.kt         |  26 +-
 ...ataElementSQLEvaluatorIntegrationShould.kt | 150 +++----
 ...ntDataItemSQLEvaluatorIntegrationShould.kt |  82 ++--
 ...nsionItemEvaluatorIntegrationBaseShould.kt |  12 +-
 ...IndicatorEvaluatorIntegrationBaseShould.kt |  40 +-
 .../IndicatorEvaluatorIntegrationShould.kt    |   2 +-
 .../IndicatorSQLEvaluatorIntegrationShould.kt |   2 +-
 ...gramIndicatorEvaluatorIntegrationShould.kt |  36 +-
 .../AnalyticExpressionEngineFactoryHelper.kt  |   6 +-
 .../EventLineListIntegrationShould.kt         |  50 +--
 .../eventlinelist/EventLineListSamples.kt     |  10 +-
 ...llectionRepositoryImplIntegrationShould.kt |  12 +-
 ...tialsSecureStorageMockIntegrationShould.kt |   4 +-
 .../AttributeStoreIntegrationShould.kt        |   2 +-
 ...CategoryComboLinkStoreIntegrationShould.kt |   2 +-
 ...yComboEndpointCallRealIntegrationShould.kt |   4 +-
 ...tegoryEndpointCallRealIntegrationShould.kt |   2 +-
 .../internal/CategoryEndpointCallShould.kt    |   2 +-
 ...anisationUnitLinkStoreIntegrationShould.kt |   2 +-
 .../DataStatePropagatorIntegrationShould.kt   |  22 +-
 ...ConfigurationMigrationIntegrationShould.kt |  14 +-
 .../core/data/database/DatabaseAssert.kt      |   2 +-
 ...ataObjectStoreAbstractIntegrationShould.kt |   8 +-
 ...bleObjectStoreAbstractIntegrationShould.kt |   6 +-
 .../LinkStoreAbstractIntegrationShould.kt     |   4 +-
 .../ObjectStoreAbstractIntegrationShould.kt   |   6 +-
 ...ithoutUidStoreAbstractIntegrationShould.kt |   2 +-
 ...lementEndpointCallRealIntegrationShould.kt |   4 +-
 ...gistrationPostCallMockIntegrationShould.kt |   6 +-
 ...ataSetEndpointCallRealIntegrationShould.kt |   2 +-
 .../DataSetInstanceStoreIntegrationShould.kt  |   6 +-
 ...tionIndicatorLinkStoreIntegrationShould.kt |   2 +-
 .../DataStoreEntryStoreIntegrationShould.kt   |   2 +-
 .../LocalDataStoreStoreIntegrationShould.kt   |   2 +-
 ...DataValueConflictStoreIntegrationShould.kt |   2 +-
 ...aValueEndpointCallRealIntegrationShould.kt |   4 +-
 .../DataValuePostCallMockIntegrationShould.kt |   4 +-
 ...ggregatedDataSyncStoreIntegrationShould.kt |   2 +-
 .../MetadataCallMockIntegrationShould.kt      |   4 +-
 .../core/event/internal/EventAPIRealShould.kt |  16 +-
 .../core/event/internal/EventCallFactory.kt   |   8 +-
 .../EventDataFilterStoreIntegrationShould.kt  |   2 +-
 ...ntEndpointCallBaseMockIntegrationShould.kt |   2 +-
 .../EventEndpointCallRealIntegrationShould.kt |   2 +-
 .../EventFilterStoreIntegrationShould.kt      |   2 +-
 .../EventPostCallRealIntegrationShould.kt     |   8 +-
 .../EventPostNewMockIntegrationShould.kt      |   4 +-
 ...sionDimensionItemStoreIntegrationShould.kt |   2 +-
 .../FileResourceCallRealIntegrationShould.kt  |  10 +-
 .../internal/FileResourceRoutineSamples.kt    |   6 +-
 .../internal/FileResourceRoutineShould.kt     |   4 +-
 .../FileResourceStoreIntegrationShould.kt     |   2 +-
 .../IndicatorStoreIntegrationShould.kt        |   2 +-
 ...mentLegendSetLinkStoreIntegrationShould.kt |   2 +-
 ...atorLegendSetLinkStoreIntegrationShould.kt |   2 +-
 .../internal/ForeignKeyCleanerShould.kt       |   2 +-
 ...erImageryProviderStoreIntegrationShould.kt |   2 +-
 .../MapLayerStoreIntegrationShould.kt         |   2 +-
 ...ganisationUnitCallMockIntegrationShould.kt |   8 +-
 .../internal/PeriodHelperIntegrationShould.kt |   2 +-
 ...icsPeriodBoundaryStoreIntegrationShould.kt |   2 +-
 .../ProgramSectionStoreIntegrationShould.kt   |   2 +-
 ...ogramStageSectionStoreIntegrationShould.kt |   2 +-
 ...amIndicatorSQLExecutorIntegrationShould.kt |  24 +-
 .../BaseTrackerDataIntegrationHelper.kt       |  22 +-
 ...rBoundariesSQLExecutorIntegrationShould.kt | 140 +++----
 ...ProgramIndicatorEngineIntegrationShould.kt |  34 +-
 ...amIndicatorSQLExecutorIntegrationShould.kt | 378 +++++++++---------
 ...ributeValueFilterStoreIntegrationShould.kt |   2 +-
 ...stEventDataFilterStoreIntegrationShould.kt |   2 +-
 ...mStageWorkingListStoreIntegrationShould.kt |   2 +-
 .../RelationshipItemStoreIntegrationShould.kt |   2 +-
 ...DhisVisualizationStoreIntegrationShould.kt |   2 +-
 ...yticsTeiAttributeStoreIntegrationShould.kt |   2 +-
 ...icsTeiDataElementStoreIntegrationShould.kt |   2 +-
 ...yticsTeiIndicatorStoreIntegrationShould.kt |   2 +-
 ...alyticsTeiSettingStoreIntegrationShould.kt |   2 +-
 ...iWHONutritionDataStoreIntegrationShould.kt |   2 +-
 .../FilterSettingStoreIntegrationShould.kt    |   2 +-
 .../GeneralSettingsStoreIntegrationShould.kt  |   2 +-
 .../LatestAppVersionStoreIntegrationShould.kt |   2 +-
 ...figurationSettingStoreIntegrationShould.kt |   2 +-
 ...onizationSettingsStoreIntegrationShould.kt |   2 +-
 .../SMSConfigStoreIntegrationShould.kt        |   2 +-
 .../SMSMetadataIdStoreIntegrationShould.kt    |   2 +-
 ...OngoingSubmissionStoreIntegrationShould.kt |   2 +-
 ...servedValueManagerRealIntegrationShould.kt |  27 +-
 .../api/BreakTheGlassAPIShould.kt             |  28 +-
 .../api/TrackedEntityInstanceAPIShould.kt     |  26 +-
 ...ributeValueFilterStoreIntegrationShould.kt |   2 +-
 .../BasePayloadGeneratorMockIntegration.kt    |  14 +-
 ...erPayloadGeneratorMockIntegrationShould.kt |  12 +-
 ...tyInstanceCallBaseMockIntegrationShould.kt |  16 +-
 ...ityInstanceFilterStoreIntegrationShould.kt |   2 +-
 .../ProgramOwnerStoreIntegrationShould.kt     |   2 +-
 .../ProgramTempOwnerStoreIntegrationShould.kt |   2 +-
 ...ceLocalQueryHelperMockIntegrationShould.kt |  24 +-
 ...yInstanceQueryCallRealIntegrationShould.kt |   4 +-
 .../TrackerJobObjectStoreIntegrationShould.kt |   2 +-
 .../StockUseCaseStoreIntegrationShould.kt     |   2 +-
 ...seTransactionLinkStoreIntegrationShould.kt |   2 +-
 .../user/UserDisabledMockIntegrationShould.kt |   2 +-
 .../internal/UserCallMockIntegrationShould.kt |   2 +-
 ...anisationUnitLinkStoreIntegrationShould.kt |  10 +-
 .../UserRoleStoreIntegrationShould.kt         |   2 +-
 .../internal/UserStoreIntegrationShould.kt    |   2 +-
 .../BaseMockIntegrationTestEmptyDispatcher.kt |   2 +-
 .../BaseMockIntegrationTestEmptyEnqueable.kt  |   2 +-
 .../BaseMockIntegrationTestFullDispatcher.kt  |  14 +-
 ...nTestLocalAnalyticsSuperLargeDispatcher.kt |   2 +-
 ...seMockIntegrationTestMetadataDispatcher.kt |   2 +-
 ...aseMockIntegrationTestMetadataEnqueable.kt |   2 +-
 .../mock/MockIntegrationTestObjectsFactory.kt |   2 +-
 ...tionDimensionItemStoreIntegrationShould.kt |   2 +-
 .../VisualizationEndpointCallShould.kt        |   4 +-
 .../VisualizationStoreIntegrationShould.kt    |   2 +-
 .../wipe/WipeDBCallMockIntegrationShould.kt   |  10 +-
 .../LocalAnalyticsDataGenerator.kt            |  16 +-
 .../LocalAnalyticsDatabaseFiller.kt           |   8 +-
 .../LocalAnalyticsMetadataGenerator.kt        |  10 +-
 .../dbgeneration/LocalAnalyticsParams.kt      |   8 +-
 ...SuperLargeDatabaseMockIntegrationShould.kt |   2 +-
 .../tests/BaseLocalAnalyticsTest.kt           |   2 +-
 ...regatedDefaultDataMockIntegrationShould.kt |   2 +-
 ...ggregatedLargeDataMockIntegrationShould.kt |   2 +-
 ...atedSuperLargeDataMockIntegrationShould.kt |   2 +-
 ...ticsTrackerDefaultMockIntegrationShould.kt |   2 +-
 ...lyticsTrackerLargeMockIntegrationShould.kt |   2 +-
 ...sTrackerSuperLargeMockIntegrationShould.kt |   2 +-
 .../android/realservertests/EnumTestHelper.kt |   4 +-
 .../realservertests/apischema/ApiSchema.kt    |   4 +-
 .../apischema/ApiSchemaCall.kt                |   2 +-
 .../apischema/ApiSchemaFields.kt              |   6 +-
 .../apischema/ApiSchemaService.kt             |   2 +-
 .../apischema/tests/ApiSchemaShould.kt        |   4 +-
 ...hemaUpdatesCheckerRealIntegrationShould.kt |   2 +-
 .../generatedschema/GeneratedSchema.kt        |   2 +-
 .../generatedschema/GeneratedSchemaCall.kt    |   2 +-
 .../generatedschema/GeneratedSchemaService.kt |   2 +-
 ...hemaUpdatesCheckerRealIntegrationShould.kt |   2 +-
 .../arch/helpers/FileResizerHelperShould.kt   |  10 +-
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 ...ueObjectRepositoryMockIntegrationShould.kt |  10 +-
 .../FileResourceAddMockIntegrationShould.kt   |   4 +-
 ...llectionRepositoryMockIntegrationShould.kt |   2 +-
 .../testapp/option/OptionServiceShould.kt     |   2 +-
 ...aseTrackerConflictMockIntegrationShould.kt |   4 +-
 ...ckerConflictHelperMockIntegrationShould.kt |  12 +-
 .../AccountManagerMockIntegrationShould.kt    |   2 +-
 .../java/org/hisp/dhis/android/core/D2.kt     |   4 +-
 .../android/core/D2ConfigurationValidator.kt  |   2 +-
 .../org/hisp/dhis/android/core/D2Manager.kt   |   2 +-
 .../android/core/NotClosedObjectsDetector.kt  |   2 +-
 .../core/analytics/AnalyticsException.kt      |   2 +-
 .../core/analytics/AnalyticsModuleImpl.kt     |   4 +-
 .../analytics/AnalyticsPackageDIModule.kt     |   4 +-
 .../android/core/analytics/LegendEvaluator.kt |  14 +-
 .../analytics/aggregated/AnalyticsModel.kt    |   8 +-
 .../aggregated/DimensionalResponse.kt         |   4 +-
 .../aggregated/GridAnalyticsResponse.kt       |  10 +-
 .../AnalyticsOrganisationUnitHelper.kt        |  12 +-
 .../internal/AnalyticsRepositoryImpl.kt       |   6 +-
 .../internal/AnalyticsRepositoryParams.kt     |   2 +-
 .../aggregated/internal/AnalyticsService.kt   |   8 +-
 .../AnalyticsServiceDimensionHelper.kt        |  10 +-
 .../AnalyticsServiceEvaluationItem.kt         |   2 +-
 .../AnalyticsServiceEvaluatorHelper.kt        |  22 +-
 .../AnalyticsServiceMetadataHelper.kt         |  16 +-
 .../AnalyticsVisualizationsRepositoryImpl.kt  |   8 +-
 ...AnalyticsVisualizationsRepositoryParams.kt |   2 +-
 .../AnalyticsVisualizationsService.kt         |  12 +-
 ...icsVisualizationsServiceDimensionHelper.kt |   6 +-
 .../evaluator/AnalyticsDimensionHelper.kt     |   2 +-
 .../internal/evaluator/AnalyticsEvaluator.kt  |   4 +-
 .../evaluator/AnalyticsEvaluatorHelper.kt     |  41 +-
 .../evaluator/DataElementSQLEvaluator.kt      |  42 +-
 .../evaluator/EventDataItemSQLEvaluator.kt    |  62 +--
 .../ExpressionDimensionItemEvaluator.kt       |  10 +-
 .../ExpressionDimensionItemEvaluatorHelper.kt |   6 +-
 .../internal/evaluator/IndicatorEvaluator.kt  |  10 +-
 .../evaluator/IndicatorEvaluatorHelper.kt     |   6 +-
 .../evaluator/IndicatorSQLEvaluator.kt        |  12 +-
 .../evaluator/ProgramIndicatorEvaluator.kt    |  24 +-
 .../ProgramIndicatorEvaluatorHelper.kt        |  76 ++--
 .../evaluator/ProgramIndicatorSQLEvaluator.kt |   8 +-
 .../AnalyticExpressionEngine.kt               |   6 +-
 .../AnalyticExpressionEngineFactory.kt        |  14 +-
 .../AnalyticExpressionParserUtils.kt          |   4 +-
 .../ExpressionDimensionItemEngine.kt          |   8 +-
 .../indicatorengine/IndicatorContext.kt       |   2 +-
 .../indicatorengine/IndicatorEngine.kt        |   8 +-
 .../indicatorengine/IndicatorSQLEngine.kt     |  10 +-
 .../dataitem/IndicatorDataItem.kt             |  12 +-
 .../dataitem/ProgramIndicatorItem.kt          |   2 +-
 .../mock/DimensionalResponseSamples.kt        |  32 +-
 .../mock/GridAnalyticsResponseSamples.kt      |  50 +--
 .../mock/MockAnalyticsRepository.kt           |   2 +-
 .../MockAnalyticsVisualizationsRepository.kt  |   4 +-
 .../analytics/linelist/EventLineListParams.kt |   4 +-
 .../linelist/EventLineListRepositoryImpl.kt   |  10 +-
 .../linelist/EventLineListServiceImpl.kt      |  22 +-
 .../analytics/linelist/LineListResponse.kt    |   6 +-
 .../internal/CookieAuthenticatorHelper.kt     |   4 +-
 .../internal/OpenIDConnectAuthenticator.kt    |   4 +-
 .../internal/ParentAuthenticator.kt           |   6 +-
 .../PasswordAndCookieAuthenticator.kt         |   4 +-
 .../internal/UserIdAuthenticatorHelper.kt     |   4 +-
 .../executors/internal/APICallErrorCatcher.kt |   4 +-
 .../api/executors/internal/APIDownloader.kt   |  14 +-
 .../executors/internal/APIDownloaderImpl.kt   |  32 +-
 .../api/executors/internal/APIErrorMapper.kt  |  14 +-
 .../internal/CoroutineAPICallExecutor.kt      |   4 +-
 .../internal/CoroutineAPICallExecutorImpl.kt  |  22 +-
 .../internal/RxAPICallExecutorImpl.kt         |   6 +-
 .../executors/internal/RxCoroutineWrapper.kt  |   2 +-
 .../internal/DynamicServerURLInterceptor.kt   |   2 +-
 .../ServerURLVersionRedirectionInterceptor.kt |   2 +-
 .../api/paging/internal/ApiPagingEngine.kt    |  16 +-
 .../arch/api/payload/internal/NTIPayload.kt   |   2 +-
 .../arch/cache/internal/ExpirableCache.kt     |   2 +-
 .../core/arch/call/D2ProgressStatus.kt        |   4 +-
 .../arch/call/queries/internal/BaseQueryKt.kt |   2 +-
 .../internal/CollectionCleanerImpl.kt         |   2 +-
 .../cleaners/internal/DataOrphanCleaner.kt    |   2 +-
 .../arch/cleaners/internal/LinkCleanerImpl.kt |   2 +-
 .../cleaners/internal/OrphanCleanerImpl.kt    |   2 +-
 .../internal/SubCollectionCleanerImpl.kt      |   2 +-
 .../arch/d2/internal/AppContextDIModule.kt    |   2 +-
 .../core/arch/d2/internal/D2DIComponent.kt    |   8 +-
 .../arch/d2/internal/D2InternalModules.kt     |   4 +-
 .../core/arch/d2/internal/D2Modules.kt        |   4 +-
 .../internal/DatabaseImportExportImpl.kt      |   8 +-
 .../internal/DatabaseMigrationExecutor.kt     |   2 +-
 .../internal/DatabaseMigrationParser.kt       |   6 +-
 .../migrations/DatabaseCodeMigration133.kt    |   4 +-
 .../migrations/DatabaseCodeMigrations.kt      |   2 +-
 ...yticsTeiWHONutritionGenderColumnAdapter.kt |   2 +-
 .../internal/SectionRenderingColumnAdapter.kt |   2 +-
 .../custom/internal/StringSetColumnAdapter.kt |   2 +-
 .../IdentifiableDataObjectStoreImpl.kt        |   8 +-
 ...dentifiableDeletableDataObjectStoreImpl.kt |   6 +-
 .../internal/IdentifiableObjectStoreImpl.kt   |   6 +-
 .../db/stores/internal/LinkChildStoreImpl.kt  |   4 +-
 .../arch/db/stores/internal/LinkStoreImpl.kt  |   8 +-
 .../db/stores/internal/ObjectStoreImpl.kt     |   6 +-
 .../internal/ObjectWithUidChildStoreImpl.kt   |   2 +-
 .../internal/ObjectWithoutUidStoreImpl.kt     |   8 +-
 .../db/stores/internal/ReadableStoreImpl.kt   |   6 +-
 .../internal/SingleParentChildStoreImpl.kt    |   2 +-
 .../arch/db/stores/internal/StoreFactory.kt   |  12 +-
 .../core/arch/fields/internal/FieldsHelper.kt |   4 +-
 .../internal/IdentifiableDataHandler.kt       |   2 +-
 .../internal/IdentifiableDataHandlerImpl.kt   |  26 +-
 .../internal/IdentifiableDataHandlerParams.kt |   2 +-
 ...fiableWithoutDeleteInterfaceHandlerImpl.kt |   2 +-
 .../internal/OrderedLinkHandlerImpl.kt        |   2 +-
 .../android/core/arch/helpers/DateUtils.kt    |  11 +-
 .../core/arch/helpers/FileResizerHelper.kt    |  12 +-
 .../helpers/FileResourceDirectoryHelper.kt    |   2 +-
 .../android/core/arch/helpers/UidsHelper.kt   |   6 +-
 .../internal/MultiDimensionalPartitioner.kt   |   4 +-
 .../AnalyticsTEIAttributeDeserializer.kt      |   5 +-
 .../AnalyticsTEIDataElementDeserializer.kt    |   5 +-
 .../AnalyticsTEIIndicatorDeserializer.kt      |   5 +-
 .../internal/DateMultiFormatDeserializer.kt   |   3 +-
 .../arch/json/internal/ObjectMapperFactory.kt |   2 +-
 .../internal/ChildrenAppenderExecutor.kt      |   6 +-
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |   6 +-
 .../collection/internal/BaseRepositoryImpl.kt |   2 +-
 .../ReadOnlyCollectionRepositoryImpl.kt       |   8 +-
 ...nlyIdentifiableCollectionRepositoryImpl.kt |   2 +-
 ...eadOnlyNameableCollectionRepositoryImpl.kt |   4 +-
 ...WithTransformerCollectionRepositoryImpl.kt |  12 +-
 ...dAndTransformerCollectionRepositoryImpl.kt |  10 +-
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |   4 +-
 ...eadWriteWithUidCollectionRepositoryImpl.kt |   4 +-
 .../filters/internal/DateFilterConnector.kt   |   4 +-
 .../internal/DateTimeFilterConnector.kt       |   2 +-
 .../internal/EqLikeItemFilterConnector.kt     |   2 +-
 .../internal/EventDataFilterConnector.kt      |   4 +-
 .../internal/ScopedFilterConnectorFactory.kt  |  22 +-
 .../internal/SimpleDateFilterConnector.kt     |   2 +-
 .../ReadOnlyOneObjectRepositoryFinalImpl.kt   |   6 +-
 ...OnlyAnyObjectWithDownloadRepositoryImpl.kt |   2 +-
 ...lyFirstObjectWithDownloadRepositoryImpl.kt |   2 +-
 .../internal/ReadOnlyObjectRepositoryImpl.kt  |   4 +-
 .../ReadOnlyOneObjectRepositoryImpl.kt        |   2 +-
 ...OnlyWithTransformerObjectRepositoryImpl.kt |   4 +-
 ...eadWriteWithUidDataObjectRepositoryImpl.kt |   4 +-
 .../ReadWriteWithUidObjectRepositoryImpl.kt   |   6 +-
 .../ReadWriteWithValueObjectRepositoryImpl.kt |   2 +-
 .../RepositoryDataSourceWithTransformer.kt    |  10 +-
 .../scope/internal/FilterItemOperator.kt      |   2 +-
 .../core/arch/storage/internal/Credentials.kt |   2 +-
 .../internal/CredentialsSecureStoreImpl.kt    |   2 +-
 .../attribute/internal/AttributeHandler.kt    |   2 +-
 .../attribute/internal/AttributeStoreImpl.kt  |   2 +-
 .../DataElementAttributeValueLinkHandler.kt   |   2 +-
 .../DataElementAttributeValueLinkStoreImpl.kt |   4 +-
 .../ProgramAttributeValueLinkHandler.kt       |   2 +-
 .../ProgramAttributeValueLinkStoreImpl.kt     |   4 +-
 .../ProgramStageAttributeValueLinkHandler.kt  |   2 +-
 ...ProgramStageAttributeValueLinkStoreImpl.kt |   4 +-
 .../category/CategoryDataDimensionType.kt     |   2 +-
 .../category/CategoryOptionComboService.kt    |   6 +-
 .../core/category/internal/CategoryCall.kt    |   8 +-
 .../CategoryCategoryComboChildrenAppender.kt  |   8 +-
 .../CategoryCategoryComboEntityDIModule.kt    |   2 +-
 .../CategoryCategoryComboLinkHandler.kt       |   2 +-
 .../CategoryCategoryComboLinkStoreImpl.kt     |   4 +-
 .../CategoryCategoryOptionChildrenAppender.kt |   8 +-
 .../CategoryCategoryOptionEntityDIModule.kt   |   2 +-
 .../CategoryCategoryOptionLinkHandler.kt      |   2 +-
 .../CategoryCategoryOptionLinkPersistor.kt    |   6 +-
 .../CategoryCategoryOptionLinkStoreImpl.kt    |   4 +-
 .../category/internal/CategoryComboCall.kt    |   6 +-
 .../internal/CategoryComboEntityDIModule.kt   |   2 +-
 .../category/internal/CategoryComboFields.kt  |   2 +-
 .../category/internal/CategoryComboHandler.kt |   6 +-
 .../category/internal/CategoryComboService.kt |   2 +-
 .../internal/CategoryComboStoreImpl.kt        |   4 +-
 .../internal/CategoryComboUidsSeeker.kt       |   6 +-
 .../internal/CategoryEntityDIModule.kt        |   2 +-
 .../core/category/internal/CategoryFields.kt  |   2 +-
 .../core/category/internal/CategoryHandler.kt |   2 +-
 .../internal/CategoryInternalModule.kt        |   2 +-
 .../internal/CategoryModuleDownloader.kt      |   4 +-
 .../category/internal/CategoryModuleImpl.kt   |   4 +-
 .../category/internal/CategoryModuleWiper.kt  |   6 +-
 .../category/internal/CategoryOptionCall.kt   |   8 +-
 ...tionComboCategoryOptionChildrenAppender.kt |   8 +-
 ...OptionComboCategoryOptionEntityDIModule.kt |   2 +-
 ...ategoryOptionComboCategoryOptionHandler.kt |   2 +-
 ...yOptionComboCategoryOptionLinkStoreImpl.kt |   4 +-
 .../CategoryOptionComboEntityDIModule.kt      |   4 +-
 .../internal/CategoryOptionComboFields.kt     |   2 +-
 .../internal/CategoryOptionComboHandler.kt    |   4 +-
 .../CategoryOptionComboIntegrityChecker.kt    |   6 +-
 .../CategoryOptionComboOrphanCleaner.kt       |   6 +-
 .../internal/CategoryOptionComboStoreImpl.kt  |   4 +-
 .../internal/CategoryOptionEntityDIModule.kt  |   4 +-
 .../category/internal/CategoryOptionFields.kt |   2 +-
 .../internal/CategoryOptionHandler.kt         |   2 +-
 ...yOptionOrganisationUnitChildrenAppender.kt |   6 +-
 ...tegoryOptionOrganisationUnitLinkHandler.kt |   4 +-
 ...goryOptionOrganisationUnitLinkStoreImpl.kt |   4 +-
 .../CategoryOptionOrganisationUnitsCall.kt    |  16 +-
 .../internal/CategoryOptionService.kt         |   4 +-
 .../internal/CategoryOptionStoreImpl.kt       |   4 +-
 .../internal/CategoryPackageDIModule.kt       |   4 +-
 .../core/category/internal/CategoryService.kt |   2 +-
 .../category/internal/CategoryStoreImpl.kt    |   4 +-
 .../android/core/common/AggregationType.kt    |   2 +-
 .../core/common/DateFilterPeriodHelper.kt     |   6 +-
 .../core/common/OrganisationUnitFilter.kt     |   2 +-
 .../core/common/RelativeOrganisationUnit.kt   |   2 +-
 .../android/core/common/RelativePeriod.kt     |   4 +-
 .../hisp/dhis/android/core/common/State.kt    |   4 +-
 .../android/core/common/ValidationStrategy.kt |   2 +-
 .../dhis/android/core/common/ValueType.kt     | 195 ++++-----
 .../common/internal/CommonPackageDIModule.kt  |   8 +-
 .../common/internal/DataStatePropagator.kt    |   2 +-
 .../internal/DataStatePropagatorImpl.kt       |  14 +-
 .../common/internal/DataStateUidHolder.kt     |   2 +-
 .../common/internal/TrackerDataManagerImpl.kt |   8 +-
 .../ValueTypeDeviceRenderingHandler.kt        |   2 +-
 .../ValueTypeDeviceRenderingStoreImpl.kt      |   4 +-
 .../internal/ValueTypeRenderingHandler.kt     |   6 +-
 .../internal/ConfigurationPackageDIModule.kt  |   2 +-
 .../internal/ConfigurationStoreImpl.kt        |   4 +-
 .../internal/DatabaseConfigurationHelper.kt   |  14 +-
 .../DatabaseConfigurationInsecureStoreImpl.kt |   2 +-
 .../DatabaseConfigurationMigration.kt         |   6 +-
 .../DatabaseConfigurationTransformer.kt       |   6 +-
 .../internal/MultiUserDatabaseManager.kt      |  26 +-
 .../MultiUserDatabaseManagerForD2Manager.kt   |   8 +-
 .../internal/migration/Migration260.kt        |   6 +-
 .../internal/ConstantCollectionCleaner.kt     |   6 +-
 .../core/constant/internal/ConstantHandler.kt |   2 +-
 .../internal/ConstantPackageDIModule.kt       |   2 +-
 .../constant/internal/ConstantStoreImpl.kt    |   4 +-
 .../dataapproval/internal/DataApprovalCall.kt |   8 +-
 .../internal/DataApprovalHandler.kt           |   2 +-
 .../internal/DataApprovalQuery.kt             |   4 +-
 .../internal/DataApprovalService.kt           |   2 +-
 .../internal/DataApprovalStoreImpl.kt         |   4 +-
 ...DataElementAttributeValueEntityDIModule.kt |   2 +-
 .../internal/DataElementEntityDIModule.kt     |   8 +-
 .../internal/DataElementHandler.kt            |   6 +-
 .../DataElementLegendSetChildrenAppender.kt   |   6 +-
 .../DataElementLegendSetEntityDIModule.kt     |   2 +-
 .../internal/DataElementOperandHandler.kt     |   2 +-
 .../internal/DataElementOperandStoreImpl.kt   |   4 +-
 .../internal/DataElementPackageDIModule.kt    |   4 +-
 .../internal/DataElementStoreImpl.kt          |   4 +-
 ...ompleteRegistrationCollectionRepository.kt |  14 +-
 .../core/dataset/DataSetInstanceService.kt    |   4 +-
 .../core/dataset/DataSetNonEditableReason.kt  |   2 +-
 .../DataInputPeriodChildrenAppender.kt        |   6 +-
 .../internal/DataInputPeriodHandler.kt        |   2 +-
 .../internal/DataInputPeriodStoreImpl.kt      |   6 +-
 .../internal/DataSetCollectionCleaner.kt      |   6 +-
 .../DataSetCompleteRegistrationCall.kt        |   8 +-
 ...ataSetCompleteRegistrationCallProcessor.kt |   6 +-
 .../DataSetCompleteRegistrationHandler.kt     |   2 +-
 .../DataSetCompleteRegistrationPostCall.kt    |  24 +-
 .../DataSetCompleteRegistrationQuery.kt       |   4 +-
 .../DataSetCompleteRegistrationService.kt     |   8 +-
 .../DataSetCompleteRegistrationStore.kt       |   2 +-
 .../DataSetCompleteRegistrationStoreImpl.kt   |  12 +-
 ...lsoryDataElementOperandChildrenAppender.kt |   8 +-
 ...pulsoryDataElementOperandEntityDIModule.kt |   2 +-
 ...aSetCompulsoryDataElementOperandHandler.kt |   2 +-
 ...mpulsoryDataElementOperandLinkStoreImpl.kt |   4 +-
 .../DataSetElementChildrenAppender.kt         |   8 +-
 .../dataset/internal/DataSetElementHandler.kt |   2 +-
 .../internal/DataSetElementStoreImpl.kt       |   4 +-
 .../dataset/internal/DataSetEntityDIModule.kt |   6 +-
 .../core/dataset/internal/DataSetHandler.kt   |  10 +-
 .../internal/DataSetInstanceServiceImpl.kt    |  20 +-
 .../internal/DataSetInstanceStoreImpl.kt      |   4 +-
 .../DataSetInstanceSummaryStoreImpl.kt        |   4 +-
 .../internal/DataSetModuleDownloader.kt       |   6 +-
 .../DataSetOrganisationUnitLinkCleaner.kt     |   6 +-
 .../DataSetOrganisationUnitLinkHandler.kt     |   2 +-
 .../DataSetOrganisationUnitLinkStoreImpl.kt   |   4 +-
 .../internal/DataSetPackageDIModule.kt        |   4 +-
 .../core/dataset/internal/DataSetStoreImpl.kt |   4 +-
 .../SectionDataElementChildrenAppender.kt     |   8 +-
 .../internal/SectionDataElementLinkHandler.kt |   2 +-
 .../SectionDataElementLinkStoreImpl.kt        |   4 +-
 .../dataset/internal/SectionEntityDIModule.kt |   2 +-
 .../SectionGreyedFieldsChildrenAppender.kt    |   8 +-
 .../SectionGreyedFieldsLinkHandler.kt         |   2 +-
 .../SectionGreyedFieldsLinkStoreImpl.kt       |   4 +-
 .../core/dataset/internal/SectionHandler.kt   |  14 +-
 .../internal/SectionIndicatorLinkHandler.kt   |   2 +-
 .../internal/SectionIndicatorLinkStoreImpl.kt |   4 +-
 .../SectionIndicatorsChildrenAppender.kt      |   8 +-
 .../dataset/internal/SectionOrphanCleaner.kt  |   6 +-
 .../core/dataset/internal/SectionStoreImpl.kt |   4 +-
 .../DataStoreCollectionRepository.kt          |   6 +-
 .../core/datastore/DataStoreDownloader.kt     |   4 +-
 .../core/datastore/DataStoreEntryTableInfo.kt |   4 +-
 .../datastore/DataStoreObjectRepository.kt    |   6 +-
 .../core/datastore/LocalDataStoreTableInfo.kt |   4 +-
 .../internal/DataStoreDownloadCall.kt         |  10 +-
 .../internal/DataStoreDownloadParams.kt       |   2 +-
 .../internal/DataStoreEntryStoreImpl.kt       |   4 +-
 .../datastore/internal/DataStoreHandler.kt    |  10 +-
 .../internal/DataStoreImportHandler.kt        |   4 +-
 .../datastore/internal/DataStoreModuleImpl.kt |   4 +-
 .../internal/DataStoreModuleWiper.kt          |   4 +-
 .../internal/DataStorePackageDIModule.kt      |   4 +-
 .../datastore/internal/DataStorePagedEntry.kt |   2 +-
 .../datastore/internal/DataStorePostCall.kt   |  14 +-
 .../datastore/internal/DataStoreService.kt    |  12 +-
 .../internal/LocalDataStoreStoreImpl.kt       |   4 +-
 .../DataValueByDataSetQueryHelper.kt          |   6 +-
 .../DataValueCollectionRepository.kt          |  12 +-
 .../datavalue/DataValueConflictTableInfo.kt   |   2 +-
 .../core/datavalue/internal/DataValueCall.kt  |   6 +-
 .../internal/DataValueConflictParser.kt       |   8 +-
 .../internal/DataValueConflictStoreImpl.kt    |   4 +-
 .../internal/DataValueFileResourcePostCall.kt |   6 +-
 .../datavalue/internal/DataValueHandler.kt    |   6 +-
 .../internal/DataValueImportHandler.kt        |  24 +-
 .../internal/DataValueModuleWiper.kt          |   4 +-
 .../datavalue/internal/DataValuePostCall.kt   |  10 +-
 .../core/datavalue/internal/DataValueQuery.kt |   4 +-
 .../datavalue/internal/DataValueService.kt    |   2 +-
 .../datavalue/internal/DataValueStoreImpl.kt  |   6 +-
 .../conflicts/DataValueImportConflictItem.kt  |   4 +-
 .../conflicts/IndexedDataValueConflict.kt     |   2 +-
 .../InvalidDataElementType37Conflict.kt       |  10 +-
 .../InvalidDataElementTypeConflict.kt         |   8 +-
 .../conflicts/PastExpiryDateConflict.kt       |   8 +-
 .../PeriodAfterLatestOpenFutureConflict.kt    |   8 +-
 .../data/internal/AggregatedDataCall.kt       |  24 +-
 .../data/internal/AggregatedDataCallBundle.kt |   2 +-
 .../AggregatedDataCallBundleFactory.kt        |  18 +-
 .../internal/AggregatedDataCallBundleKey.kt   |   4 +-
 .../internal/AggregatedDataDownloaderImpl.kt  |   4 +-
 .../internal/AggregatedDataSyncHashHelper.kt  |   2 +-
 ...AggregatedDataSyncLastUpdatedCalculator.kt |   6 +-
 .../internal/AggregatedDataSyncStoreImpl.kt   |   4 +-
 .../internal/AggregatedModuleImpl.kt          |   4 +-
 .../core/domain/metadata/MetadataCall.kt      |   4 +-
 .../metadata/internal/MetadataModuleImpl.kt   |   4 +-
 .../core/enrollment/EnrollmentAccess.kt       |   2 +-
 ...NewTrackerImporterEnrollmentTransformer.kt |   6 +-
 .../internal/EnrollmentEntityDIModule.kt      |   6 +-
 .../enrollment/internal/EnrollmentFields.kt   |   4 +-
 .../enrollment/internal/EnrollmentHandler.kt  |  10 +-
 .../internal/EnrollmentImportHandler.kt       |  24 +-
 .../internal/EnrollmentModuleImpl.kt          |   4 +-
 .../EnrollmentPersistenceCallFactory.kt       |   8 +-
 .../EnrollmentProjectionTransformer.kt        |   4 +-
 .../enrollment/internal/EnrollmentService.kt  |   2 +-
 .../internal/EnrollmentServiceImpl.kt         |   8 +-
 .../internal/EnrollmentStoreImpl.kt           |  10 +-
 .../enrollment/internal/EventOrphanCleaner.kt |   6 +-
 .../NewEnrollmentEndpointCallFactory.kt       |   6 +-
 .../internal/NewEnrollmentFields.kt           |   4 +-
 .../OldEnrollmentEndpointCallFactory.kt       |   6 +-
 .../android/core/event/EventDownloader.kt     |   6 +-
 .../core/event/EventInternalAccessor.kt       |   4 +-
 .../core/event/EventNonEditableReason.kt      |   2 +-
 .../NewTrackerImporterEventTransformer.kt     |   4 +-
 .../event/internal/EventDataFilterHandler.kt  |   2 +-
 .../internal/EventDataFilterStoreImpl.kt      |   6 +-
 .../core/event/internal/EventDateUtils.kt     |  10 +-
 .../core/event/internal/EventDownloadCall.kt  |  22 +-
 .../event/internal/EventEntityDIModule.kt     |   6 +-
 .../core/event/internal/EventFields.kt        |   4 +-
 .../internal/EventFilterEntityDIModule.kt     |   6 +-
 ...ntFilterEventDataFilterChildrenAppender.kt |   6 +-
 .../core/event/internal/EventFilterHandler.kt |   4 +-
 .../event/internal/EventFilterStoreImpl.kt    |   4 +-
 .../core/event/internal/EventHandler.kt       |  10 +-
 .../core/event/internal/EventImportHandler.kt |  18 +-
 .../event/internal/EventLastUpdatedManager.kt |   4 +-
 .../core/event/internal/EventModuleImpl.kt    |   4 +-
 .../event/internal/EventPackageDIModule.kt    |   4 +-
 .../internal/EventPersistenceCallFactory.kt   |   8 +-
 .../event/internal/EventPostParentCall.kt     |   4 +-
 .../event/internal/EventPostStateManager.kt   |   4 +-
 .../internal/EventProjectionTransformer.kt    |   4 +-
 .../event/internal/EventQueryBundleFactory.kt |   9 +-
 .../EventQueryBundleInternalFactory.kt        |   8 +-
 .../core/event/internal/EventService.kt       |   6 +-
 .../core/event/internal/EventServiceImpl.kt   |   6 +-
 .../android/core/event/internal/EventStore.kt |   2 +-
 .../core/event/internal/EventStoreImpl.kt     |  12 +-
 .../core/event/internal/EventSyncStoreImpl.kt |   4 +-
 .../internal/NewEventEndpointCallFactory.kt   |   8 +-
 .../core/event/internal/NewEventFields.kt     |   4 +-
 .../internal/OldEventEndpointCallFactory.kt   |   8 +-
 .../EventCollectionRepositoryAdapter.kt       |  19 +-
 .../search/EventQueryRepositoryScopeHelper.kt |   2 +-
 .../ExpressionDimensionItemTableInfo.kt       |   2 +-
 .../internal/ExpressionDimensionItemCall.kt   |   8 +-
 .../ExpressionDimensionItemHandler.kt         |   2 +-
 ...ExpressionDimensionItemModuleDownloader.kt |   4 +-
 .../ExpressionDimensionItemModuleImpl.kt      |   4 +-
 .../ExpressionDimensionItemModuleWiper.kt     |   4 +-
 .../ExpressionDimensionItemPackageDIModule.kt |   4 +-
 .../ExpressionDimensionItemService.kt         |   2 +-
 .../ExpressionDimensionItemStoreImpl.kt       |   4 +-
 .../ExpressionDimensionItemUidsSeeker.kt      |   4 +-
 .../core/fileresource/FileResourceDomain.kt   |   2 +-
 .../fileresource/FileResourceDownloadConst.kt |   6 +-
 .../fileresource/FileResourceDownloader.kt    |   4 +-
 .../core/fileresource/FileResourceModule.kt   |   8 +-
 .../core/fileresource/FileResourceRoutine.kt  |  10 +-
 .../fileresource/FileResourceStorageStatus.kt |   2 +-
 .../internal/FileResourceDownloadCall.kt      |  26 +-
 .../FileResourceDownloadCallHelper.kt         |  14 +-
 .../internal/FileResourceDownloadParams.kt    |   2 +-
 .../internal/FileResourceHandler.kt           |   2 +-
 .../internal/FileResourceHelper.kt            |  22 +-
 .../internal/FileResourceModuleImpl.kt        |  12 +-
 .../internal/FileResourceModuleWiper.kt       |   4 +-
 .../internal/FileResourcePackageDIModule.kt   |   4 +-
 .../internal/FileResourcePostCall.kt          |  22 +-
 .../FileResourceProjectionTransformer.kt      |   6 +-
 .../internal/FileResourceService.kt           |   8 +-
 .../internal/FileResourceStoreImpl.kt         |   4 +-
 .../fileresource/internal/FileResourceUtil.kt |   8 +-
 .../internal/MissingTrackerAttributeValue.kt  |   2 +-
 .../android/core/imports/TrackerJobManager.kt |   4 +-
 .../DataValueImportSummaryWebResponse.kt      |   2 +-
 .../internal/ItemsWithFileResources.kt        |   2 +-
 .../imports/internal/TEIWebResponseHandler.kt |   8 +-
 .../internal/TEIWebResponseHandlerSummary.kt  |   4 +-
 .../internal/TrackerImportConflictParser.kt   |  20 +-
 .../TrackerImportConflictStoreImpl.kt         |  12 +-
 .../conflicts/BadAttributePatternConflict.kt  |   2 +-
 .../EnrollmentHasInvalidProgramConflict.kt    |   2 +-
 .../conflicts/EnrollmentNotFoundConflict.kt   |   2 +-
 .../EventHasInvalidProgramConflict.kt         |   2 +-
 .../EventHasInvalidProgramStageConflict.kt    |   2 +-
 .../conflicts/EventNotFoundConflict.kt        |   2 +-
 .../FileResourceAlreadyAssignedConflict.kt    |   4 +-
 .../FileResourceReferenceNotFoundConflict.kt  |   2 +-
 .../InvalidAttributeValueTypeConflict.kt      |   4 +-
 .../conflicts/InvalidDataValueConflict.kt     |   4 +-
 .../InvalidTrackedEntityTypeConflict.kt       |   2 +-
 ...nrollmentCascadeDeleteAuthorityConflict.kt |   4 +-
 ...ackingTEICascadeDeleteAuthorityConflict.kt |   4 +-
 .../conflicts/MissingAttributeConflict.kt     |   2 +-
 .../conflicts/MissingDataElementConflict.kt   |   2 +-
 .../conflicts/NonUniqueAttributeConflict.kt   |   2 +-
 .../TrackedEntityInstanceNotFoundConflict.kt  |   2 +-
 .../conflicts/TrackerImportConflictItem.kt    |   2 +-
 .../TrackerImportConflictItemContext.kt       |   2 +-
 .../IndicatorLegendSetLinkTableInfo.kt        |   4 +-
 .../core/indicator/IndicatorTableInfo.kt      |   2 +-
 .../core/indicator/IndicatorTypeTableInfo.kt  |   2 +-
 .../DataSetIndicatorEngine.kt                 |   4 +-
 .../DataSetIndicatorEngineImpl.kt             |  16 +-
 .../DataSetIndicatorEvaluator.kt              |   8 +-
 .../DataSetIndicatorChildrenAppender.kt       |   8 +-
 .../internal/DataSetIndicatorLinkHandler.kt   |   4 +-
 .../internal/DataSetIndicatorLinkStoreImpl.kt |   4 +-
 .../internal/IndicatorEntityDIModule.kt       |   2 +-
 .../indicator/internal/IndicatorHandler.kt    |   4 +-
 .../IndicatorLegendSetChildrenAppender.kt     |   6 +-
 .../internal/IndicatorModuleDownloader.kt     |   4 +-
 .../internal/IndicatorPackageDIModule.kt      |   4 +-
 .../indicator/internal/IndicatorStoreImpl.kt  |   4 +-
 .../internal/IndicatorTypeHandler.kt          |   4 +-
 .../internal/IndicatorTypeStoreImpl.kt        |   4 +-
 .../indicator/internal/IndicatorUidsSeeker.kt |   6 +-
 .../DataElementLegendSetLinkHandler.kt        |   2 +-
 .../DataElementLegendSetLinkStoreImpl.kt      |   4 +-
 .../internal/IndicatorLegendSetLinkHandler.kt |   2 +-
 .../IndicatorLegendSetLinkStoreImpl.kt        |   4 +-
 .../internal/LegendChildrenAppender.kt        |   6 +-
 .../core/legendset/internal/LegendHandler.kt  |   2 +-
 .../internal/LegendPackageDIModule.kt         |   4 +-
 .../core/legendset/internal/LegendSetCall.kt  |   4 +-
 .../internal/LegendSetEntityDIModule.kt       |   6 +-
 .../legendset/internal/LegendSetHandler.kt    |   4 +-
 .../internal/LegendSetLegendOrphanCleaner.kt  |   6 +-
 .../internal/LegendSetModuleDownloader.kt     |   4 +-
 .../legendset/internal/LegendSetService.kt    |   2 +-
 .../legendset/internal/LegendSetStoreImpl.kt  |   4 +-
 .../legendset/internal/LegendSetUidsSeeker.kt |   6 +-
 .../legendset/internal/LegendStoreImpl.kt     |   6 +-
 .../ProgramIndicatorLegendSetLinkHandler.kt   |   2 +-
 .../ProgramIndicatorLegendSetLinkStoreImpl.kt |   4 +-
 .../maintenance/internal/D2ErrorStoreImpl.kt  |   4 +-
 .../internal/ForeignKeyViolationStoreImpl.kt  |   4 +-
 .../internal/MaintenancePackageDIModule.kt    |   6 +-
 .../core/map/internal/MapModuleImpl.kt        |   4 +-
 .../core/map/internal/MapModuleWiper.kt       |   6 +-
 .../core/map/internal/MapPackageDIModule.kt   |   4 +-
 .../map/layer/MapLayerCollectionRepository.kt |   8 +-
 .../core/map/layer/MapLayerDownloader.kt      |   4 +-
 .../layer/MapLayerImageryProviderTableInfo.kt |   2 +-
 .../core/map/layer/MapLayerTableInfo.kt       |   2 +-
 .../map/layer/internal/MapLayerCallFactory.kt |   4 +-
 .../layer/internal/MapLayerEntityDIModule.kt  |   6 +-
 .../map/layer/internal/MapLayerHandler.kt     |   2 +-
 .../MapLayerImagerProviderChildrenAppender.kt |   2 +-
 .../MapLayerImageryProviderHandler.kt         |   2 +-
 .../MapLayerImageryProviderStoreImpl.kt       |   4 +-
 .../map/layer/internal/MapLayerStoreImpl.kt   |   4 +-
 .../map/layer/internal/bing/BingBasemap.kt    |   2 +-
 .../map/layer/internal/bing/BingBasemaps.kt   |  10 +-
 .../layer/internal/bing/BingCallFactory.kt    |  16 +-
 .../layer/internal/bing/BingServerResponse.kt |  10 +-
 .../map/layer/internal/bing/BingService.kt    |   2 +-
 .../core/map/layer/internal/osm/OSMBaseMap.kt |   2 +-
 .../map/layer/internal/osm/OSMBaseMaps.kt     |   6 +-
 .../map/layer/internal/osm/OSMCallFactory.kt  |   8 +-
 .../core/note/internal/NewNoteFields.kt       |   2 +-
 .../android/core/note/internal/NoteFields.kt  |   2 +-
 .../NoteForEnrollmentChildrenAppender.kt      |   6 +-
 .../internal/NoteForEventChildrenAppender.kt  |   6 +-
 .../android/core/note/internal/NoteHandler.kt |   2 +-
 .../internal/NoteProjectionTransformer.kt     |   6 +-
 .../core/note/internal/NoteStoreImpl.kt       |   8 +-
 .../dhis/android/core/option/OptionService.kt |   4 +-
 .../android/core/option/OptionServiceImpl.kt  |   8 +-
 .../core/option/internal/OptionCall.kt        |   6 +-
 .../option/internal/OptionEntityDIModule.kt   |   4 +-
 .../internal/OptionGroupCollectionCleaner.kt  |   6 +-
 .../internal/OptionGroupEntityDIModule.kt     |   6 +-
 .../option/internal/OptionGroupHandler.kt     |   4 +-
 .../OptionGroupOptionChildrenAppender.kt      |   8 +-
 .../internal/OptionGroupOptionLinkHandler.kt  |   2 +-
 .../OptionGroupOptionLinkStoreImpl.kt         |   4 +-
 .../option/internal/OptionGroupStoreImpl.kt   |   4 +-
 .../core/option/internal/OptionHandler.kt     |   2 +-
 .../option/internal/OptionPackageDIModule.kt  |   4 +-
 .../core/option/internal/OptionService.kt     |   2 +-
 .../core/option/internal/OptionSetCall.kt     |   4 +-
 .../core/option/internal/OptionSetHandler.kt  |   2 +-
 .../option/internal/OptionSetStoreImpl.kt     |   4 +-
 .../core/option/internal/OptionStoreImpl.kt   |   4 +-
 .../internal/OptionSubCollectionCleaner.kt    |   6 +-
 .../OrganisationUnitService.kt                |   2 +-
 .../internal/OrganisationUnitCall.kt          |  26 +-
 .../OrganisationUnitCollectionCleaner.kt      |   6 +-
 ...OrganisationUnitDataSetChildrenAppender.kt |   8 +-
 .../OrganisationUnitEntityDIModule.kt         |   6 +-
 .../internal/OrganisationUnitGroupHandler.kt  |   2 +-
 .../OrganisationUnitGroupStoreImpl.kt         |   4 +-
 .../internal/OrganisationUnitHandler.kt       |  12 +-
 .../internal/OrganisationUnitLevelHandler.kt  |   2 +-
 .../OrganisationUnitLevelStoreImpl.kt         |   6 +-
 .../OrganisationUnitModuleDownloader.kt       |   6 +-
 ...OrganisationUnitGroupLinkEntityDIModule.kt |   2 +-
 ...ionUnitOrganisationUnitGroupLinkHandler.kt |   2 +-
 ...nUnitOrganisationUnitGroupLinkStoreImpl.kt |   4 +-
 ...isationUnitGroupProgramChildrenAppender.kt |   8 +-
 .../OrganisationUnitPackageDIModule.kt        |   4 +-
 ...OrganisationUnitProgramChildrenAppender.kt |   8 +-
 .../OrganisationUnitProgramLinkHandler.kt     |   2 +-
 .../OrganisationUnitProgramLinkStoreImpl.kt   |   4 +-
 .../internal/OrganisationUnitStoreImpl.kt     |   4 +-
 .../expression/CommonExpressionVisitor.kt     |   4 +-
 .../CommonExpressionVisitorScope.kt           |  18 +-
 .../parser/internal/expression/ParserUtils.kt |  18 +-
 .../parser/internal/expression/QueryMods.kt   |   2 +-
 .../function/FunctionGreatestOrLeast.kt       |   2 +-
 .../internal/service/ExpressionService.kt     |  20 +-
 .../service/ExpressionServiceContext.kt       |   2 +-
 .../dataitem/DimItemDataElementAndOperand.kt  |   4 +-
 .../service/dataitem/DimensionalItemId.kt     |   2 +-
 .../service/dataitem/DimensionalItemType.kt   |   2 +-
 .../internal/service/dataitem/ItemConstant.kt |   2 +-
 .../service/dataitem/ItemOrgUnitGroup.kt      |   2 +-
 .../service/dataitem/ItemYearlyPeriodCount.kt |   9 +-
 .../dataobject/DataElementOperandObject.kt    | 112 +++---
 .../service/utils/ExpressionHelper.kt         |   4 +-
 .../dhis/android/core/period/PeriodType.kt    |   5 +-
 .../period/internal/ParentPeriodGenerator.kt  |   2 +-
 .../internal/ParentPeriodGeneratorImpl.kt     |   6 +-
 .../core/period/internal/PeriodStore.kt       |   2 +-
 .../core/period/internal/PeriodStoreImpl.kt   |  10 +-
 .../AnalyticsPeriodBoundaryTableInfo.kt       |   2 +-
 .../program/AnalyticsPeriodBoundaryType.kt    |   2 +-
 .../core/program/ProgramIndicatorTableInfo.kt |   2 +-
 .../internal/AnalyticsPeriodBoundaryFields.kt |   2 +-
 .../AnalyticsPeriodBoundaryHandler.kt         |   2 +-
 .../AnalyticsPeriodBoundaryStoreImpl.kt       |   4 +-
 ...ementValueTypeRenderingChildrenAppender.kt |   4 +-
 .../internal/ProgramCollectionCleaner.kt      |   6 +-
 .../program/internal/ProgramEntityDIModule.kt |   4 +-
 .../core/program/internal/ProgramHandler.kt   |   8 +-
 ...AnalyticsPeriodBoundaryChildrenAppender.kt |   8 +-
 .../program/internal/ProgramIndicatorCall.kt  |  12 +-
 .../ProgramIndicatorEntityDIModule.kt         |   2 +-
 .../internal/ProgramIndicatorFields.kt        |   2 +-
 .../internal/ProgramIndicatorHandler.kt       |   4 +-
 ...ogramIndicatorLegendSetChildrenAppender.kt |   6 +-
 .../ProgramIndicatorModuleDownloader.kt       |   4 +-
 .../internal/ProgramIndicatorService.kt       |   2 +-
 .../internal/ProgramIndicatorStoreImpl.kt     |   8 +-
 .../internal/ProgramIndicatorUidsSeeker.kt    |   4 +-
 .../internal/ProgramModuleDownloader.kt       |  16 +-
 .../program/internal/ProgramModuleImpl.kt     |   4 +-
 .../ProgramOrganisationUnitLinkCleaner.kt     |   6 +-
 .../program/internal/ProgramOrphanCleaner.kt  |   6 +-
 .../internal/ProgramPackageDIModule.kt        |   4 +-
 .../ProgramRuleActionChildrenAppender.kt      |   6 +-
 .../internal/ProgramRuleActionHandler.kt      |   2 +-
 .../ProgramRuleActionOrphanCleaner.kt         |   6 +-
 .../internal/ProgramRuleActionStoreImpl.kt    |   6 +-
 .../internal/ProgramRuleEntityDIModule.kt     |   2 +-
 .../program/internal/ProgramRuleHandler.kt    |   6 +-
 .../program/internal/ProgramRuleStoreImpl.kt  |   6 +-
 .../ProgramRuleSubCollectionCleaner.kt        |   6 +-
 .../internal/ProgramRuleVariableHandler.kt    |   2 +-
 .../ProgramRuleVariableOrphanCleaner.kt       |   6 +-
 .../internal/ProgramRuleVariableStoreImpl.kt  |   6 +-
 ...ProgramSectionAttributeChildrenAppender.kt |   8 +-
 .../ProgramSectionAttributeLinkHandler.kt     |   2 +-
 .../ProgramSectionAttributeLinkStoreImpl.kt   |   4 +-
 .../internal/ProgramSectionEntityDIModule.kt  |   2 +-
 .../program/internal/ProgramSectionHandler.kt |   6 +-
 .../internal/ProgramSectionOrphanCleaner.kt   |   6 +-
 .../internal/ProgramSectionStoreImpl.kt       |   6 +-
 .../ProgramStageDataElementEntityDIModule.kt  |   4 +-
 .../ProgramStageDataElementHandler.kt         |   6 +-
 .../ProgramStageDataElementOrphanCleaner.kt   |   6 +-
 .../ProgramStageDataElementStoreImpl.kt       |   6 +-
 .../program/internal/ProgramStageHandler.kt   |  14 +-
 ...StageSectionDataElementChildrenAppender.kt |   8 +-
 ...ogramStageSectionDataElementLinkHandler.kt |   2 +-
 ...ramStageSectionDataElementLinkStoreImpl.kt |   4 +-
 .../ProgramStageSectionEntityDIModule.kt      |   2 +-
 .../internal/ProgramStageSectionHandler.kt    |   8 +-
 .../ProgramStageSectionOrphanCleaner.kt       |   6 +-
 ...SectionProgramIndicatorChildrenAppender.kt |   8 +-
 ...geSectionProgramIndicatorEntityDIModule.kt |   2 +-
 ...StageSectionProgramIndicatorLinkHandler.kt |   2 +-
 ...ageSectionProgramIndicatorLinkStoreImpl.kt |   4 +-
 .../internal/ProgramStageSectionStoreImpl.kt  |   4 +-
 .../program/internal/ProgramStageStoreImpl.kt |   6 +-
 .../ProgramStageSubCollectionCleaner.kt       |   6 +-
 .../core/program/internal/ProgramStoreImpl.kt |   4 +-
 ...ramTrackedEntityAttributeEntityDIModule.kt |   4 +-
 .../ProgramTrackedEntityAttributeHandler.kt   |   6 +-
 ...gramTrackedEntityAttributeOrphanCleaner.kt |   6 +-
 .../ProgramTrackedEntityAttributeStoreImpl.kt |   8 +-
 ...ibuteValueTypeRenderingChildrenAppender.kt |   4 +-
 ...rogramTrackedEntityTypeChildrenAppender.kt |   4 +-
 .../ValueTypeRenderingChildrenAppender.kt     |   2 +-
 .../internal/ProgramIndicatorContext.kt       |   2 +-
 .../internal/ProgramIndicatorEngineImpl.kt    |  14 +-
 .../internal/ProgramIndicatorExecutor.kt      |   6 +-
 .../ProgramIndicatorItemIdsCollector.kt       |   8 +-
 .../internal/ProgramIndicatorParserUtils.kt   |   4 +-
 .../internal/ProgramIndicatorSQLContext.kt    |   2 +-
 .../internal/ProgramIndicatorSQLExecutor.kt   |  20 +-
 .../internal/ProgramIndicatorSQLUtils.kt      |  10 +-
 .../internal/dataitem/ProgramItemAttribute.kt |   8 +-
 .../dataitem/ProgramItemPsEventdate.kt        |   2 +-
 .../dataitem/ProgramItemStageElement.kt       |   8 +-
 .../internal/function/D2Ceil.kt               |   2 +-
 .../internal/function/D2Floor.kt              |   2 +-
 .../internal/function/D2HasValue.kt           |   4 +-
 .../internal/function/D2Modulus.kt            |   2 +-
 .../internal/function/D2RelationshipCount.kt  |   6 +-
 .../internal/function/D2Round.kt              |   2 +-
 .../internal/function/ProgramCountFunction.kt |   4 +-
 .../internal/variable/ProgramVariableItem.kt  |   2 +-
 .../internal/variable/VCurrentDate.kt         |   2 +-
 .../internal/variable/VDueDate.kt             |   2 +-
 .../internal/variable/VEnrollmentDate.kt      |   2 +-
 .../internal/variable/VEnrollmentStatus.kt    |   2 +-
 .../internal/variable/VEventDate.kt           |   2 +-
 .../internal/variable/VEventStatus.kt         |   2 +-
 .../internal/variable/VIncidentDate.kt        |   2 +-
 .../internal/variable/VProgramStageId.kt      |   2 +-
 .../internal/variable/VProgramStageName.kt    |   2 +-
 .../internal/variable/VTeiCount.kt            |   2 +-
 .../internal/variable/VValueCount.kt          |   2 +-
 .../internal/variable/VZeroPosValueCount.kt   |   2 +-
 .../ProgramStageQueryCriteriaFields.kt        |   2 +-
 ...istAttributeValueFilterChildrenAppender.kt |   7 +-
 ...gListAttributeValueFilterEntityDIModule.kt |   2 +-
 ...geWorkingListAttributeValueFilterFields.kt |   2 +-
 ...eWorkingListAttributeValueFilterHandler.kt |   2 +-
 ...orkingListAttributeValueFilterStoreImpl.kt |   6 +-
 .../internal/ProgramStageWorkingListCall.kt   |   8 +-
 ...geWorkingListDataFilterChildrenAppender.kt |   6 +-
 .../ProgramStageWorkingListEntityDIModule.kt  |   4 +-
 ...amStageWorkingListEventDataFilterFields.kt |   2 +-
 ...mStageWorkingListEventDataFilterHandler.kt |   2 +-
 ...tageWorkingListEventDataFilterStoreImpl.kt |   6 +-
 .../internal/ProgramStageWorkingListFields.kt |   2 +-
 .../ProgramStageWorkingListHandler.kt         |  10 +-
 .../ProgramStageWorkingListModuleWiper.kt     |   6 +-
 .../ProgramStageWorkingListPackageDIModule.kt |   4 +-
 .../ProgramStageWorkingListService.kt         |   2 +-
 .../ProgramStageWorkingListStoreImpl.kt       |  12 +-
 .../ProgramStageWorkingListTableInfo.kt       |   2 +-
 ...wTrackerImporterRelationshipTransformer.kt |  12 +-
 .../core/relationship/RelationshipFields.kt   |   2 +-
 .../relationship/RelationshipServiceImpl.kt   |   6 +-
 .../RelationshipTypeCollectionRepository.kt   |  24 +-
 .../EnrollmentRelationshipOrphanCleaner.kt    |   4 +-
 .../EventRelationshipOrphanCleaner.kt         |   4 +-
 .../internal/NewRelationshipFields.kt         |   2 +-
 .../internal/NewRelationshipItemFields.kt     |   2 +-
 .../internal/RelationshipConstraintHandler.kt |   2 +-
 .../RelationshipConstraintStoreImpl.kt        |   4 +-
 ...lationshipDownloadAndPersistCallFactory.kt |  16 +-
 .../internal/RelationshipEntityDIModule.kt    |   4 +-
 .../internal/RelationshipHandler.kt           |  10 +-
 .../internal/RelationshipImportHandler.kt     |   8 +-
 .../RelationshipItemChildrenAppender.kt       |   8 +-
 ...elationshipItemElementStoreSelectorImpl.kt |   2 +-
 .../RelationshipItemEntityDIModule.kt         |   4 +-
 .../internal/RelationshipItemFields.kt        |   4 +-
 .../internal/RelationshipItemHandler.kt       |   2 +-
 .../internal/RelationshipItemStore.kt         |   2 +-
 .../internal/RelationshipItemStoreImpl.kt     |  14 +-
 .../internal/RelationshipManager.kt           |   6 +-
 .../internal/RelationshipOrphanCleaner.kt     |   4 +-
 .../internal/RelationshipPackageDIModule.kt   |   4 +-
 .../internal/RelationshipPostCall.kt          |  16 +-
 .../internal/RelationshipStore.kt             |   2 +-
 .../internal/RelationshipStoreImpl.kt         |  12 +-
 ...ationshipTypeCollectionRepositoryHelper.kt |   6 +-
 .../RelationshipTypeEntityDIModule.kt         |   8 +-
 .../internal/RelationshipTypeHandler.kt       |   4 +-
 .../internal/RelationshipTypeStoreImpl.kt     |   4 +-
 .../internal/TEIRelationshipOrphanCleaner.kt  |   4 +-
 .../core/resource/internal/ResourceHandler.kt |   2 +-
 .../resource/internal/ResourceStoreImpl.kt    |   4 +-
 .../AnalyticsDhisVisualizationScope.kt        |   2 +-
 .../AnalyticsDhisVisualizationTableInfo.kt    |   2 +-
 .../AnalyticsDhisVisualizationsHelper.kt      |   2 +-
 .../dhis/android/core/settings/ChartType.kt   |   2 +-
 .../LatestAppVersionObjectRepository.kt       |   4 +-
 .../settings/LatestAppVersionTableInfo.kt     |   2 +-
 .../android/core/settings/SystemSettings.kt   |   2 +-
 .../core/settings/WHONutritionChartType.kt    |   2 +-
 .../core/settings/WHONutritionComponent.kt    |   2 +-
 ...nalyticsDhisVisualizationSettingHandler.kt |   6 +-
 .../AnalyticsDhisVisualizationStoreImpl.kt    |   4 +-
 .../settings/internal/AnalyticsSettingCall.kt |   8 +-
 .../internal/AnalyticsTeiAttributeHandler.kt  |   4 +-
 .../AnalyticsTeiAttributeStoreImpl.kt         |   4 +-
 .../AnalyticsTeiDataChildrenAppender.kt       |   6 +-
 .../AnalyticsTeiDataElementHandler.kt         |   4 +-
 .../AnalyticsTeiDataElementStoreImpl.kt       |   4 +-
 .../internal/AnalyticsTeiIndicatorHandler.kt  |   4 +-
 .../AnalyticsTeiIndicatorStoreImpl.kt         |   4 +-
 .../internal/AnalyticsTeiSettingHandler.kt    |   6 +-
 .../internal/AnalyticsTeiSettingStoreImpl.kt  |   4 +-
 .../AnalyticsTeiWHONutritionDataHandler.kt    |   8 +-
 .../AnalyticsTeiWHONutritionDataStoreImpl.kt  |   4 +-
 .../internal/AppearanceSettingCall.kt         |   8 +-
 .../core/settings/internal/BaseSettingCall.kt |   2 +-
 .../settings/internal/DataSetSettingCall.kt   |   4 +-
 .../internal/DataSetSettingHandler.kt         |   4 +-
 .../internal/DataSetSettingStoreImpl.kt       |   4 +-
 .../settings/internal/FilterSettingHandler.kt |   4 +-
 .../internal/FilterSettingStoreImpl.kt        |   4 +-
 .../settings/internal/GeneralSettingCall.kt   |   4 +-
 .../internal/GeneralSettingHandler.kt         |   2 +-
 .../internal/GeneralSettingStoreImpl.kt       |   4 +-
 .../settings/internal/LatestAppVersionCall.kt |   4 +-
 .../internal/LatestAppVersionHandler.kt       |   2 +-
 .../internal/LatestAppVersionStoreImpl.kt     |   4 +-
 .../ProgramConfigurationSettingHandler.kt     |   6 +-
 .../ProgramConfigurationSettingStoreImpl.kt   |   4 +-
 .../settings/internal/ProgramSettingCall.kt   |   4 +-
 .../internal/ProgramSettingHandler.kt         |   2 +-
 .../internal/ProgramSettingStoreImpl.kt       |   4 +-
 .../settings/internal/SettingAppService.kt    |   4 +-
 .../internal/SettingModuleDownloader.kt       |   4 +-
 .../internal/SettingPackageDIModule.kt        |   4 +-
 .../internal/SettingsAppDataStoreVersion.kt   |   2 +-
 .../settings/internal/SettingsAppHelper.kt    |  14 +-
 .../settings/internal/SettingsAppInfoCall.kt  |   8 +-
 .../internal/SettingsAppInfoManagerImpl.kt    |   6 +-
 .../internal/SynchronizationSettingCall.kt    |  10 +-
 .../internal/SynchronizationSettingHandler.kt |   6 +-
 .../SynchronizationSettingStoreImpl.kt        |   4 +-
 .../settings/internal/SystemSettingCall.kt    |   6 +-
 .../settings/internal/SystemSettingHandler.kt |   4 +-
 .../internal/SystemSettingStoreImpl.kt        |   4 +-
 .../settings/internal/SystemSettingsFields.kt |   4 +-
 .../internal/SystemSettingsSplitter.kt        |   2 +-
 .../settings/internal/UserSettingsCall.kt     |   4 +-
 .../settings/internal/UserSettingsHandler.kt  |   4 +-
 .../internal/UserSettingsStoreImpl.kt         |   4 +-
 .../internal/LocalDbRepositoryImpl.kt         |  20 +-
 .../internal/MetadataIdsStore.kt              |   6 +-
 .../internal/OngoingSubmissionsStore.kt       |   6 +-
 .../internal/SMSConfigKey.kt                  |   2 +-
 .../internal/SMSConfigStoreImpl.kt            |   4 +-
 .../internal/SMSConfigTableInfo.kt            |   4 +-
 .../internal/SMSMetadataIdStoreImpl.kt        |   4 +-
 .../internal/SMSMetadataIdTableInfo.kt        |   4 +-
 .../internal/SMSOngoingSubmissionStoreImpl.kt |   4 +-
 .../internal/SMSOngoingSubmissionTableInfo.kt |   4 +-
 .../webapirepository/internal/ApiService.kt   |   2 +-
 .../internal/WebApiRepositoryImpl.kt          |   6 +-
 .../core/sms/internal/SMSModuleWiper.kt       |   6 +-
 .../core/systeminfo/DHISPatchVersion.kt       |   3 +-
 .../android/core/systeminfo/DHISVersion.kt    |   3 +-
 .../android/core/systeminfo/SMSVersion.kt     |   3 +-
 .../internal/DHISVersionManagerImpl.kt        |   6 +-
 .../core/systeminfo/internal/PingCall.kt      |   4 +-
 .../systeminfo/internal/SystemInfoCall.kt     |   8 +-
 .../systeminfo/internal/SystemInfoHandler.kt  |   4 +-
 .../internal/SystemInfoModuleDownloader.kt    |   4 +-
 .../internal/SystemInfoModuleImpl.kt          |   4 +-
 .../internal/SystemInfoPackageDIModule.kt     |   4 +-
 .../systeminfo/internal/SystemInfoService.kt  |   2 +-
 .../internal/SystemInfoStoreImpl.kt           |   4 +-
 ...TrackerImporterTrackedEntityTransformer.kt |   4 +-
 ...edEntityAttributeLegendSetLinkTableInfo.kt |   6 +-
 ...ckedEntityAttributeReservedValueManager.kt |  62 +--
 .../TrackedEntityInstanceFilterAPI37.kt       |   8 +-
 .../TrackedEntityPackageDIModule.kt           |   6 +-
 .../internal/AttributeValueFilterHandler.kt   |   4 +-
 .../internal/AttributeValueFilterStoreImpl.kt |   6 +-
 .../internal/EntityQueryCriteriaFields.kt     |   2 +-
 .../NewTrackedEntityAttributeValueFields.kt   |   4 +-
 .../NewTrackedEntityDataValueFields.kt        |   4 +-
 .../NewTrackedEntityEndpointCallFactory.kt    |  28 +-
 .../NewTrackedEntityInstanceFields.kt         |   6 +-
 .../internal/NewTrackerImporterPayload.kt     |   2 +-
 .../NewTrackerImporterPayloadWrapper.kt       |   2 +-
 ...porterTrackedEntityPostPayloadGenerator.kt |  18 +-
 ...erImporterTrackedEntityPostStateManager.kt |   4 +-
 .../OldTrackedEntityEndpointCallFactory.kt    |  10 +-
 ...OldTrackerImporterFileResourcesPostCall.kt |  20 +-
 .../internal/OldTrackerImporterPayload.kt     |   4 +-
 .../OldTrackerImporterPayloadGenerator.kt     |  44 +-
 .../internal/OldTrackerImporterPostCall.kt    |  32 +-
 .../internal/ProgramOwnerChildrenAppender.kt  |   4 +-
 .../internal/ReservedValueSettingStoreImpl.kt |   4 +-
 .../internal/StatePersistorHelper.kt          |   6 +-
 .../internal/TrackedEntityAttributeHandler.kt |   6 +-
 ...ntityAttributeLegendSetChildrenAppender.kt |   6 +-
 ...TrackedEntityAttributeLegendSetDIModule.kt |   2 +-
 ...ckedEntityAttributeLegendSetLinkHandler.kt |   4 +-
 ...edEntityAttributeLegendSetLinkStoreImpl.kt |   4 +-
 ...ckedEntityAttributeReservedValueHandler.kt |   4 +-
 ...rackedEntityAttributeReservedValueStore.kt |   2 +-
 ...edEntityAttributeReservedValueStoreImpl.kt |  10 +-
 .../TrackedEntityAttributeStoreImpl.kt        |   4 +-
 ...kedEntityAttributeValueChildrenAppender.kt |   6 +-
 .../TrackedEntityAttributeValueFields.kt      |   4 +-
 .../TrackedEntityAttributeValueHandler.kt     |   4 +-
 .../TrackedEntityAttributeValueStore.kt       |   6 +-
 .../TrackedEntityAttributeValueStoreImpl.kt   |  36 +-
 .../TrackedEntityDataValueChildrenAppender.kt |   6 +-
 .../internal/TrackedEntityDataValueFields.kt  |   4 +-
 .../internal/TrackedEntityDataValueHandler.kt |   4 +-
 .../TrackedEntityDataValueStoreImpl.kt        |  16 +-
 .../TrackedEntityEnrollmentOrphanCleaner.kt   |  10 +-
 .../TrackedEntityInstanceCallErrorCatcher.kt  |   4 +-
 .../TrackedEntityInstanceDownloadCall.kt      |  24 +-
 .../TrackedEntityInstanceDownloader.kt        |   8 +-
 .../TrackedEntityInstanceEntityDIModule.kt    |   4 +-
 ...TrackedEntityInstanceEventFilterHandler.kt |   4 +-
 ...ackedEntityInstanceEventFilterStoreImpl.kt |   6 +-
 .../internal/TrackedEntityInstanceFields.kt   |   6 +-
 ...terAttributeValueFilterChildrenAppender.kt |   6 +-
 .../TrackedEntityInstanceFilterCall.kt        |  12 +-
 ...ackedEntityInstanceFilterEntityDIModule.kt |   4 +-
 ...nstanceFilterEvenFilterChildrenAppender.kt |   6 +-
 .../TrackedEntityInstanceFilterFields.kt      |   6 +-
 .../TrackedEntityInstanceFilterHandler.kt     |   6 +-
 .../TrackedEntityInstanceFilterStoreImpl.kt   |   4 +-
 .../internal/TrackedEntityInstanceHandler.kt  |  20 +-
 .../TrackedEntityInstanceImportHandler.kt     |  20 +-
 ...TrackedEntityInstanceLastUpdatedManager.kt |   4 +-
 ...kedEntityInstancePersistenceCallFactory.kt |  12 +-
 .../TrackedEntityInstancePostParentCall.kt    |   4 +-
 ...ckedEntityInstanceProjectionTransformer.kt |   4 +-
 .../internal/TrackedEntityInstanceService.kt  |  10 +-
 .../TrackedEntityInstanceStoreImpl.kt         |   4 +-
 .../TrackedEntityInstanceSyncStoreImpl.kt     |   4 +-
 .../TrackedEntityInstanceUidHelperImpl.kt     |   8 +-
 .../internal/TrackedEntityModuleImpl.kt       |   4 +-
 .../internal/TrackedEntityModuleWiper.kt      |   6 +-
 ...ckedEntityTypeAttributeChildrenAppender.kt |   6 +-
 .../TrackedEntityTypeAttributeHandler.kt      |   4 +-
 .../TrackedEntityTypeAttributeStoreImpl.kt    |   6 +-
 .../TrackedEntityTypeCollectionCleaner.kt     |   6 +-
 .../TrackedEntityTypeEntityDIModule.kt        |   2 +-
 .../internal/TrackedEntityTypeHandler.kt      |   6 +-
 .../internal/TrackedEntityTypeStoreImpl.kt    |   4 +-
 .../internal/TrackerParentCallFactory.kt      |   4 +-
 .../internal/TrackerPostStateManager.kt       |   8 +-
 .../internal/TrackerQueryBundleFactory.kt     |   9 +-
 .../TrackerQueryBundleInternalFactory.kt      |  12 +-
 .../internal/TrackerQueryCommonParams.kt      |   2 +-
 .../internal/TrackerQueryFactory.kt           |   4 +-
 .../TrackerQueryFactoryCommonHelper.kt        |  28 +-
 .../internal/TrackerQueryInternalFactory.kt   |   8 +-
 .../internal/TrackerSyncLastUpdatedManager.kt |   4 +-
 .../ownership/OwnershipManagerImpl.kt         |  14 +-
 .../ownership/OwnershipService.kt             |   4 +-
 .../ownership/ProgramOwnerHandler.kt          |   4 +-
 .../ownership/ProgramOwnerPostCall.kt         |  10 +-
 .../ownership/ProgramOwnerStoreImpl.kt        |   4 +-
 .../ownership/ProgramOwnerTableInfo.kt        |   4 +-
 .../ownership/ProgramTempOwnerStoreImpl.kt    |   4 +-
 .../ownership/ProgramTempOwnerTableInfo.kt    |   4 +-
 .../TrackedEntityInstanceLocalQueryHelper.kt  |  74 ++--
 .../TrackedEntityInstanceOnlineResult.kt      |   2 +-
 .../TrackedEntityInstanceQueryCallFactory.kt  |  24 +-
 .../TrackedEntityInstanceQueryDataFetcher.kt  |  24 +-
 .../TrackedEntityInstanceQueryDataSource.kt   |  10 +-
 ...ckedEntityInstanceQueryDataSourceResult.kt |  14 +-
 ...rackedEntityInstanceQueryEntityDIModule.kt |   2 +-
 .../TrackedEntityInstanceQueryErrorCatcher.kt |   4 +-
 .../TrackedEntityInstanceQueryOnline.kt       |   4 +-
 .../TrackedEntityInstanceQueryOnlineHelper.kt |  14 +-
 ...ntityInstanceQueryRepositoryScopeHelper.kt |  22 +-
 .../search/TrackerQueryResult.kt              |   2 +-
 .../core/tracker/TrackerExporterVersion.kt    |   2 +-
 .../core/tracker/TrackerImporterVersion.kt    |   2 +-
 .../tracker/TrackerPostParentCallHelper.kt    |   4 +-
 .../core/tracker/exporter/TrackerAPIQuery.kt  |   4 +-
 .../exporter/TrackerD2ProgressManager.kt      |   2 +-
 .../tracker/exporter/TrackerDownloadCall.kt   |  48 +--
 .../exporter/TrackerExporterService.kt        |  12 +-
 .../importer/internal/ImporterError.kt        |  38 +-
 .../tracker/importer/internal/JobQueryCall.kt |  10 +-
 .../importer/internal/JobQueryErrorCatcher.kt |   2 +-
 .../tracker/importer/internal/JobReport.kt    |  16 +-
 .../internal/JobReportEnrollmentHandler.kt    |   8 +-
 .../internal/JobReportEventHandler.kt         |   8 +-
 .../internal/JobReportFileResourceHandler.kt  |   4 +-
 .../importer/internal/JobReportHandler.kt     |  14 +-
 .../internal/JobReportRelationshipHandler.kt  |   4 +-
 .../internal/JobReportTrackedEntityHandler.kt |   6 +-
 .../importer/internal/JobReportTypeHandler.kt |   2 +-
 .../internal/TrackerConflictHelper.kt         |   6 +-
 .../TrackerImporterBreakTheGlassHelper.kt     |  10 +-
 .../TrackerImporterFileResourcesPostCall.kt   |  22 +-
 .../internal/TrackerImporterObjectType.kt     |   2 +-
 .../internal/TrackerImporterPostCall.kt       |  24 +-
 .../TrackerImporterProgramOwnerPostCall.kt    |   6 +-
 .../internal/TrackerImporterService.kt        |   2 +-
 .../internal/TrackerJobModuleWiper.kt         |   4 +-
 .../internal/TrackerJobObjectHandler.kt       |   4 +-
 .../internal/TrackerJobObjectStoreImpl.kt     |   4 +-
 .../interpreters/DefaultInterpreter.kt        |   2 +-
 .../internal/interpreters/E1000Interpreter.kt |   2 +-
 .../internal/interpreters/E1001Interpreter.kt |   2 +-
 .../internal/interpreters/E1002Interpreter.kt |   6 +-
 .../internal/interpreters/E1003Interpreter.kt |   2 +-
 .../internal/interpreters/E1005Interpreter.kt |   2 +-
 .../internal/interpreters/E1006Interpreter.kt |   2 +-
 .../internal/interpreters/E1007Interpreter.kt |   2 +-
 .../internal/interpreters/E1008Interpreter.kt |   2 +-
 .../internal/interpreters/E1009Interpreter.kt |   2 +-
 .../internal/interpreters/E1032Interpreter.kt |   4 +-
 .../internal/interpreters/E1063Interpreter.kt |   4 +-
 .../internal/interpreters/E1064Interpreter.kt |   4 +-
 .../internal/interpreters/E1069Interpreter.kt |   2 +-
 .../internal/interpreters/E1081Interpreter.kt |   2 +-
 .../internal/interpreters/E1084Interpreter.kt |   2 +-
 .../internal/interpreters/E1100Interpreter.kt |   4 +-
 .../internal/interpreters/E1103Interpreter.kt |   2 +-
 .../interpreters/InterpreterHelper.kt         |   4 +-
 .../interpreters/InterpreterSelector.kt       |   4 +-
 .../core/usecase/UseCaseModuleDownloader.kt   |   4 +-
 .../usecase/internal/UseCaseModuleImpl.kt     |   4 +-
 .../usecase/internal/UseCaseModuleWiper.kt    |   6 +-
 .../internal/UseCasePackageDIModule.kt        |   4 +-
 .../core/usecase/stock/StockUseCase.kt        |   2 +-
 .../stock/StockUseCaseCollectionRepository.kt |  13 +-
 .../usecase/stock/StockUseCaseTableInfo.kt    |   2 +-
 .../usecase/stock/StockUseCaseTransaction.kt  |  10 +-
 .../stock/StockUseCaseTransactionTableInfo.kt |   2 +-
 .../stock/internal/StockUseCaseCall.kt        |   4 +-
 .../stock/internal/StockUseCaseHandler.kt     |   6 +-
 .../stock/internal/StockUseCaseStoreImpl.kt   |   4 +-
 ...StockUseCaseTransactionChildrenAppender.kt |   2 +-
 .../StockUseCaseTransactionLinkHandler.kt     |   4 +-
 .../StockUseCaseTransactionLinkStoreImpl.kt   |   9 +-
 .../stock/internal/StockUseCaseTransformer.kt |   4 +-
 .../core/user/AccountDeletionReason.kt        |   2 +-
 .../dhis/android/core/user/AccountManager.kt  |   2 +-
 .../user/UserCredentialsObjectRepository.kt   |   6 +-
 .../user/internal/AccountManagerHelper.kt     |   2 +-
 .../core/user/internal/AccountManagerImpl.kt  |   6 +-
 .../internal/AuthenticatedUserStoreImpl.kt    |   4 +-
 .../core/user/internal/AuthorityHandler.kt    |   4 +-
 .../core/user/internal/AuthorityStoreImpl.kt  |   4 +-
 .../android/core/user/internal/LogInCall.kt   |   8 +-
 .../user/internal/LogInDatabaseManager.kt     |  10 +-
 .../core/user/internal/LogInExceptions.kt     |   4 +-
 .../android/core/user/internal/LogOutCall.kt  |   4 +-
 .../UserAccountDisabledErrorCatcher.kt        |   6 +-
 .../UserAuthenticateCallErrorCatcher.kt       |   6 +-
 .../android/core/user/internal/UserCall.kt    |   8 +-
 .../core/user/internal/UserEntityDIModule.kt  |   2 +-
 .../android/core/user/internal/UserFields.kt  |   4 +-
 .../android/core/user/internal/UserHandler.kt |   4 +-
 .../core/user/internal/UserInternalModule.kt  |   2 +-
 .../core/user/internal/UserModuleImpl.kt      |   4 +-
 .../UserOrganisationUnitLinkHandler.kt        |   4 +-
 .../internal/UserOrganisationUnitLinkStore.kt |   4 +-
 .../UserOrganisationUnitLinkStoreImpl.kt      |  18 +-
 .../core/user/internal/UserPackageDIModule.kt |   4 +-
 .../user/internal/UserRoleChildrenAppender.kt |   4 +-
 .../internal/UserRoleCollectionCleaner.kt     |   6 +-
 .../core/user/internal/UserRoleHandler.kt     |   4 +-
 .../core/user/internal/UserRoleStoreImpl.kt   |   4 +-
 .../core/user/internal/UserStoreImpl.kt       |   4 +-
 .../UserUserCredentialsTransformer.kt         |   2 +-
 .../core/user/openid/IntentWithRequestCode.kt |   2 +-
 .../core/user/openid/OpenIDConnectConfig.kt   |   2 +-
 .../user/openid/OpenIDConnectHandlerImpl.kt   |  10 +-
 .../user/openid/OpenIDConnectLogoutHandler.kt |   4 +-
 .../user/openid/OpenIDConnectRequestHelper.kt |  10 +-
 .../openid/OpenIDConnectTokenRefresher.kt     |   4 +-
 .../dhis/android/core/util/DateExtensions.kt  |   2 +-
 .../validation/engine/ValidationEngine.kt     |   4 +-
 .../engine/internal/ValidationEngineImpl.kt   |  14 +-
 .../engine/internal/ValidationExecutor.kt     |  14 +-
 .../DataSetValidationRuleLinkHandler.kt       |   4 +-
 .../DataSetValidationRuleLinkStoreImpl.kt     |   4 +-
 .../internal/ValidationPackageDIModule.kt     |   4 +-
 .../ValidationRuleCollectionCleaner.kt        |   6 +-
 .../internal/ValidationRuleHandler.kt         |   4 +-
 .../internal/ValidationRuleStoreImpl.kt       |   4 +-
 .../visualization/DataDimensionItemType.kt    |   2 +-
 .../core/visualization/DigitGroupSeparator.kt |   2 +-
 .../core/visualization/DimensionItemType.kt   |   2 +-
 .../core/visualization/DisplayDensity.kt      |   2 +-
 .../visualization/HideEmptyItemStrategy.kt    |   3 +-
 .../core/visualization/LayoutPosition.kt      |   2 +-
 .../core/visualization/LegendStrategy.kt      |   2 +-
 .../android/core/visualization/LegendStyle.kt |   2 +-
 .../core/visualization/VisualizationAPI36.kt  |   6 +-
 .../VisualizationDimensionItemTableInfo.kt    |   4 +-
 .../visualization/VisualizationTableInfo.kt   |   2 +-
 .../core/visualization/VisualizationType.kt   |   2 +-
 .../internal/VisualizationCall.kt             |  12 +-
 .../VisualizationCollectionCleaner.kt         |   6 +-
 ...ationColumnsRowsFiltersChildrenAppender.kt |   8 +-
 .../internal/VisualizationDimensionFields.kt  |   2 +-
 .../VisualizationDimensionItemFields.kt       |   2 +-
 .../VisualizationDimensionItemHandler.kt      |   4 +-
 .../VisualizationDimensionItemStoreImpl.kt    |   4 +-
 .../internal/VisualizationEntityDIModule.kt   |   2 +-
 .../internal/VisualizationFields.kt           |   6 +-
 .../internal/VisualizationHandler.kt          |   8 +-
 .../internal/VisualizationInternalModule.kt   |   2 +-
 .../internal/VisualizationModuleDownloader.kt |   4 +-
 .../internal/VisualizationModuleImpl.kt       |   4 +-
 .../internal/VisualizationModuleWiper.kt      |   4 +-
 .../internal/VisualizationPackageDIModule.kt  |   4 +-
 .../internal/VisualizationService.kt          |   4 +-
 .../internal/VisualizationStoreImpl.kt        |   4 +-
 .../core/wipe/internal/D2ModuleWipers.kt      |   6 +-
 .../android/core/wipe/internal/TableWiper.kt  |   2 +-
 .../core/wipe/internal/WipeDIModule.kt        |   2 +-
 .../core/wipe/internal/WipeModuleImpl.kt      |   2 +-
 .../datavalue/DataValueConflictSamples.kt     |   4 +-
 .../core/data/datavalue/DataValueSamples.kt   |   2 +-
 .../core/data/datavalue/DataValueUtils.kt     |   2 +-
 .../core/data/event/EventDataFilterSamples.kt |  12 +-
 .../core/data/event/EventFilterSamples.kt     |  14 +-
 .../data/fileresource/FileResourceSamples.kt  |   4 +-
 .../maps/MapLayerImageryProviderSamples.kt    |   4 +-
 .../data/program/ProgramSectionSamples.kt     |   8 +-
 .../program/ProgramStageSectionSamples.kt     |   8 +-
 ...eWorkingListAttributeValueFilterSamples.kt |   2 +-
 ...mStageWorkingListEventDataFilterSamples.kt |   2 +-
 .../ProgramStageWorkingListSamples.kt         |  16 +-
 .../relationship/RelationshipTypeSamples.kt   |   2 +-
 .../data/settings/AnalyticsSettingsSamples.kt |   4 +-
 .../data/settings/LatestAppVersionSamples.kt  |   2 +-
 .../AttributeValueFilterSamples.kt            |  12 +-
 .../TrackerQueryCommonParamsSamples.kt        |   2 +-
 .../ownership/ProgramTempOwnerSamples.kt      |   2 +-
 .../data/utils/FillPropertiesTestUtils.kt     |   4 +-
 .../visualization/VisualizationSamples.kt     |  30 +-
 .../AnalyticsOrganisationUnitHelperShould.kt  |   6 +-
 .../AnalyticsServiceDimensionHelperShould.kt  |  42 +-
 .../AnalyticsServiceMetadataHelperShould.kt   |  10 +-
 ...ualizationsServiceDimensionHelperShould.kt |  80 ++--
 .../AnalyticsDimensionHelperShould.kt         |  14 +-
 .../internal/CoroutineAPICallExecutorMock.kt  |   4 +-
 .../CoroutineAPICallExecutorShould.kt         |   2 +-
 .../core/arch/helpers/DateUtilsShould.kt      |   2 +-
 .../android/core/arch/helpers/ResultShould.kt | 150 +++----
 .../MultiDimensionalPartitionerShould.kt      |  18 +-
 .../internal/ObjectMapperFactoryShould.kt     |   4 +-
 .../internal/ChunkedSecureStoreShould.kt      |   4 +-
 .../CategoryOptionComboServiceShould.kt       |   2 +-
 .../internal/CategoryComboHandlerShould.kt    |   2 +-
 .../internal/TrackerDataManagerShould.kt      |   2 +-
 .../DatabasesConfigurationHelperShould.kt     |   8 +-
 .../internal/DatabasesConfigurationUtil.kt    |   2 +-
 ...erDatabaseManagerForD2ManagerUnitShould.kt |   2 +-
 .../MultiUserDatabaseManagerUnitShould.kt     |   6 +-
 .../DatabasesConfigurationOldShould.kt        |   2 +-
 .../internal/DataElementHandlerShould.kt      |   4 +-
 .../dataset/DataSetInstanceServiceShould.kt   |  12 +-
 .../DataValueImportConflictSamples.kt         |   8 +-
 .../IndexedDataValueConflictShould.kt         |   2 +-
 ...riodAfterLatestOpenFutureConflictShould.kt |   2 +-
 .../AggregatedDataCallBundleFactoryShould.kt  |   6 +-
 ...atedDataSyncLastUpdatedCalculatorShould.kt |  14 +-
 .../domain/metadata/MetadataCallShould.kt     |  10 +-
 .../enrollment/EnrollmentServiceShould.kt     |  34 +-
 .../internal/EnrollmentHandlerShould.kt       |   2 +-
 .../internal/EnrollmentImportHandlerShould.kt |   4 +-
 .../android/core/event/EventFilterShould.kt   |   8 +-
 .../android/core/event/EventServiceShould.kt  |   2 +-
 .../event/internal/EventDateUtilsShould.kt    |   6 +-
 .../event/internal/EventEndpointCallShould.kt |  10 +-
 .../core/event/internal/EventHandlerShould.kt |   2 +-
 .../internal/EventImportHandlerShould.kt      |   2 +-
 .../internal/EventQueryBundleFactoryShould.kt |   8 +-
 .../EventCollectionRepositoryAdapterShould.kt |   6 +-
 ...InvalidAttributeValueTypeConflictShould.kt |   2 +-
 .../conflicts/TrackedImportConflictSamples.kt |  30 +-
 .../android/core/indicator/IndicatorShould.kt |  12 +-
 .../DataSetIndicatorEvaluatorShould.kt        |  40 +-
 .../OrganisationUnitCallUnitShould.kt         |  10 +-
 .../internal/OrganisationUnitHandlerShould.kt |   2 +-
 .../expression/ExpressionServiceShould.kt     |  44 +-
 .../internal/expression/ParserUtilsShould.kt  |   6 +-
 .../service/utils/ExpressionHelperShould.kt   |  12 +-
 .../internal/InPeriodQueryHelperShould.kt     |   8 +-
 .../period/internal/PeriodGeneratorShould.kt  |   2 +-
 .../RelativePeriodGeneratorImplShould.kt      |  30 +-
 .../core/program/ProgramIndicatorShould.kt    |   4 +-
 .../internal/ProgramModuleDownloaderShould.kt |   6 +-
 .../internal/AnalyticsBoundaryParserShould.kt |   2 +-
 .../ProgramIndicatorExecutorShould.kt         |  12 +-
 .../ProgramStageWorkingListHandlerShould.kt   |   4 +-
 .../NewTrackerImporterRelationshipShould.kt   |   4 +-
 .../relationship/RelationshipServiceShould.kt |  40 +-
 .../internal/RelationshipHandlerShould.kt     |  18 +-
 .../RelationshipImportHandlerShould.kt        |   6 +-
 ...hipTypeCollectionRepositoryHelperShould.kt |   2 +-
 .../core/settings/AnalyticsSettingV1Should.kt |  10 +-
 .../core/settings/AnalyticsSettingV2Should.kt |   4 +-
 .../LatestAppVersionSettingsShould.kt         |   2 +-
 .../internal/AnalyticsSettingCallShould.kt    |   2 +-
 .../AnalyticsTeiSettingHandlerShould.kt       |   2 +-
 ...alyticsTeiWHONutritionDataHandlerShould.kt |   2 +-
 .../internal/AppearanceSettingsCallShould.kt  |   2 +-
 .../SynchronizationSettingCallShould.kt       |   2 +-
 .../SynchronizationSettingsHandlerShould.kt   |   2 +-
 .../internal/SystemSettingSplitterShould.kt   |   2 +-
 .../internal/WebApiRepositoryImplShould.kt    |   4 +-
 .../internal/SystemInfoCallShould.kt          |  10 +-
 .../TrackedEntityInstanceFilterAPI37Should.kt |   6 +-
 .../TrackedEntityInstanceShould.kt            |   4 +-
 .../TrackedEntityInstanceHandlerShould.kt     |  10 +-
 ...rackedEntityInstanceImportHandlerShould.kt |  16 +-
 ...TrackedEntityInstanceQueryFactoryShould.kt |   8 +-
 .../TrackerQueryCommonParamsSamples.kt        |   2 +-
 .../ownership/OwnershipManagerShould.kt       |   2 +-
 .../search/QueryPageUserModeMatcher.kt        |   2 +-
 .../search/QueryUserModeMatcher.kt            |   2 +-
 ...kedEntityInstanceLocalQueryHelperShould.kt |  20 +-
 .../TrackedEntityInstanceQueryCallShould.kt   |  30 +-
 ...ckedEntityInstanceQueryDataSourceShould.kt |  44 +-
 ...edEntityInstanceQueryErrorCatcherShould.kt |   2 +-
 ...edEntityInstanceQueryOnlineHelperShould.kt |  16 +-
 ...nstanceQueryRepositoryScopeHelperShould.kt |  26 +-
 .../tracker/importer/JobReportErrorShould.kt  |   8 +-
 .../importer/JobReportSuccessShould.kt        |  20 +-
 .../importer/TrackerConflictHelperShould.kt   |   2 +-
 ...ckerImporterFileResourcesPostCallShould.kt |  10 +-
 .../stock/InternalStockUseCaseShould.kt       |   2 +-
 .../internal/AuthorityEndpointCallShould.kt   |   4 +-
 .../core/user/internal/LogInCallUnitShould.kt |   6 +-
 .../core/user/internal/UserCallShould.kt      |   2 +-
 .../visualization/VisualizationAPI36Should.kt |   4 +-
 .../internal/VisualizationHandlerShould.kt    |   2 +-
 1331 files changed, 4838 insertions(+), 4774 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt
index 46b6ca3a46..07f4eb0d55 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/BaseRealIntegrationTest.kt
@@ -61,7 +61,7 @@ abstract class BaseRealIntegrationTest {
             d2.databaseAdapter(),
             d2.retrofit(),
             ResourceHandler.create(d2.databaseAdapter()),
-            d2.systemInfoModule().versionManager()
+            d2.systemInfoModule().versionManager(),
         )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/D2Factory.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/D2Factory.kt
index c373dcf63d..9b8aaa4cdf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/D2Factory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/D2Factory.kt
@@ -56,7 +56,7 @@ internal object D2Factory {
     private fun forNewDatabaseInternal(
         secureStore: SecureStore,
         insecureStore: InsecureStore,
-        isRealIntegration: Boolean
+        isRealIntegration: Boolean,
     ): D2 {
         val context = InstrumentationRegistry.getInstrumentation().context
         val d2Configuration = d2Configuration(context)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
index 3784d637bb..bc4b583e16 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
@@ -28,9 +28,6 @@
 package org.hisp.dhis.android.core
 
 import android.util.Log
-import java.io.IOException
-import java.util.*
-import kotlin.Throws
 import org.hisp.dhis.android.core.D2Factory.clear
 import org.hisp.dhis.android.core.D2Factory.forNewDatabase
 import org.hisp.dhis.android.core.arch.d2.internal.D2DIComponent
@@ -39,6 +36,9 @@ import org.hisp.dhis.android.core.mockwebserver.Dhis2MockServer
 import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.utils.integration.mock.MockIntegrationTestDatabaseContent
+import java.io.IOException
+import java.util.*
+import kotlin.Throws
 
 class MockIntegrationTestObjects(val content: MockIntegrationTestDatabaseContent) {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
index 9c44f79179..ad860a8e2e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
@@ -49,7 +49,7 @@ class MultiUserMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
         d2.databaseAdapter().insert(
             CategoryOptionTableInfo.TABLE_INFO.name(),
             null,
-            CategoryOptionSamples.getCategoryOption().toContentValues()
+            CategoryOptionSamples.getCategoryOption().toContentValues(),
         )
         assertThat(d2.categoryModule().categoryOptions().blockingCount()).isEqualTo(1)
         d2.userModule().blockingLogOut()
@@ -74,7 +74,7 @@ class MultiUserMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
         d2.databaseAdapter().insert(
             CategoryOptionTableInfo.TABLE_INFO.name(),
             null,
-            CategoryOptionSamples.getCategoryOption().toContentValues()
+            CategoryOptionSamples.getCategoryOption().toContentValues(),
         )
         assertThat(d2.categoryModule().categoryOptions().blockingCount()).isEqualTo(1)
         d2.userModule().blockingLogOut()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsVisualizationRepositoryIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsVisualizationRepositoryIntegrationShould.kt
index 2b02b542d3..6388cf4295 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsVisualizationRepositoryIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsVisualizationRepositoryIntegrationShould.kt
@@ -69,8 +69,8 @@ class AnalyticsVisualizationRepositoryIntegrationShould : BaseMockIntegrationTes
         assertThat(result.dimensionItems[Dimension.OrganisationUnit]!!.size).isEqualTo(1)
         assertThat(result.dimensionItems[Dimension.Period]).isEqualTo(
             listOf(
-                DimensionItem.PeriodItem.Absolute("2018")
-            )
+                DimensionItem.PeriodItem.Absolute("2018"),
+            ),
         )
         assertThat(result.metadata).isNotEmpty()
         assertThat(result.values.size).isEqualTo(1)
@@ -84,8 +84,8 @@ class AnalyticsVisualizationRepositoryIntegrationShould : BaseMockIntegrationTes
                 listOf(
                     DimensionItem.PeriodItem.Absolute("2022"),
                     DimensionItem.PeriodItem.Absolute("2022"),
-                    DimensionItem.PeriodItem.Absolute("2021")
-                )
+                    DimensionItem.PeriodItem.Absolute("2021"),
+                ),
             )
             .blockingEvaluate()
             .getOrThrow()
@@ -93,8 +93,8 @@ class AnalyticsVisualizationRepositoryIntegrationShould : BaseMockIntegrationTes
         assertThat(result.dimensionItems[Dimension.Period]).isEqualTo(
             listOf(
                 DimensionItem.PeriodItem.Absolute("2021"),
-                DimensionItem.PeriodItem.Absolute("2022")
-            )
+                DimensionItem.PeriodItem.Absolute("2022"),
+            ),
         )
         assertThat(result.values.size).isEqualTo(2)
     }
@@ -105,8 +105,8 @@ class AnalyticsVisualizationRepositoryIntegrationShould : BaseMockIntegrationTes
             .withVisualization(visualizationUid)
             .withOrganisationUnits(
                 listOf(
-                    DimensionItem.OrganisationUnitItem.Relative(RelativeOrganisationUnit.USER_ORGUNIT)
-                )
+                    DimensionItem.OrganisationUnitItem.Relative(RelativeOrganisationUnit.USER_ORGUNIT),
+                ),
             )
             .blockingEvaluate()
             .getOrThrow()
@@ -116,8 +116,8 @@ class AnalyticsVisualizationRepositoryIntegrationShould : BaseMockIntegrationTes
         assertThat(result.dimensionItems[Dimension.Data]!!.size).isEqualTo(3)
         assertThat(result.dimensionItems[Dimension.OrganisationUnit]).isEqualTo(
             listOf(
-                DimensionItem.OrganisationUnitItem.Relative(RelativeOrganisationUnit.USER_ORGUNIT)
-            )
+                DimensionItem.OrganisationUnitItem.Relative(RelativeOrganisationUnit.USER_ORGUNIT),
+            ),
         )
         assertThat(result.dimensionItems[Dimension.Period]!!.size).isEqualTo(3)
         assertThat(result.metadata).isNotEmpty()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
index 4e3dc5606d..698200d415 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
@@ -128,7 +128,7 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
     protected val categoryOptionComboStore = CategoryOptionComboStoreImpl(databaseAdapter)
     protected val categoryCategoryComboLinkStore = CategoryCategoryComboLinkStoreImpl(databaseAdapter)
     protected val categoryOptionComboCategoryOptionLinkStore = CategoryOptionComboCategoryOptionLinkStoreImpl(
-        databaseAdapter
+        databaseAdapter,
     )
     protected val dataElementStore = DataElementStoreImpl(databaseAdapter)
     protected val organisationUnitStore = OrganisationUnitStoreImpl(databaseAdapter)
@@ -155,7 +155,7 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
         dataElementStore,
         categoryOptionComboStore,
         organisationUnitGroupStore,
-        programStageStore
+        programStageStore,
     )
 
     protected val metadata: Map<String, MetadataItem> = mapOf(
@@ -165,18 +165,18 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
         level1.uid() to MetadataItem.OrganisationUnitLevelItem(level1, listOf(orgunitParent.uid())),
         level2.uid() to MetadataItem.OrganisationUnitLevelItem(
             level2,
-            listOf(orgunitChild1.uid(), orgunitChild2.uid())
+            listOf(orgunitChild1.uid(), orgunitChild2.uid()),
         ),
         organisationUnitGroup.uid() to MetadataItem.OrganisationUnitGroupItem(
             organisationUnitGroup,
-            listOf(orgunitParent.uid())
+            listOf(orgunitParent.uid()),
         ),
         dataElement1.uid() to MetadataItem.DataElementItem(dataElement1),
         dataElement2.uid() to MetadataItem.DataElementItem(dataElement2),
         dataElementOperand.uid()!! to MetadataItem.DataElementOperandItem(
             dataElementOperand,
             dataElement1.displayName()!!,
-            categoryOptionCombo.displayName()
+            categoryOptionCombo.displayName(),
         ),
         period2019SunW25.periodId()!! to MetadataItem.PeriodItem(period2019SunW25),
         period201910.periodId()!! to MetadataItem.PeriodItem(period201910),
@@ -187,24 +187,24 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
         period2019Q4.periodId()!! to MetadataItem.PeriodItem(period2019Q4),
         RelativeOrganisationUnit.USER_ORGUNIT.name to MetadataItem.OrganisationUnitRelativeItem(
             RelativeOrganisationUnit.USER_ORGUNIT,
-            listOf(orgunitParent.uid())
+            listOf(orgunitParent.uid()),
         ),
         RelativeOrganisationUnit.USER_ORGUNIT_CHILDREN.name to MetadataItem.OrganisationUnitRelativeItem(
             RelativeOrganisationUnit.USER_ORGUNIT_CHILDREN,
-            listOf(orgunitChild1.uid(), orgunitChild2.uid())
+            listOf(orgunitChild1.uid(), orgunitChild2.uid()),
         ),
         RelativePeriod.THIS_MONTH.name to MetadataItem.RelativePeriodItem(
             RelativePeriod.THIS_MONTH,
-            listOf(period201912)
+            listOf(period201912),
         ),
         RelativePeriod.LAST_MONTH.name to MetadataItem.RelativePeriodItem(
             RelativePeriod.LAST_MONTH,
-            listOf(period201911)
+            listOf(period201911),
         ),
         category.uid() to MetadataItem.CategoryItem(category),
         categoryOption.uid() to MetadataItem.CategoryOptionItem(categoryOption),
         attribute.uid() to MetadataItem.CategoryItem(attribute),
-        attributeOption.uid() to MetadataItem.CategoryOptionItem(attributeOption)
+        attributeOption.uid() to MetadataItem.CategoryOptionItem(attributeOption),
     )
 
     @Before
@@ -293,7 +293,7 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
         orgunitUid: String = orgunitParent.uid(),
         periodId: String = period201912.periodId()!!,
         categoryOptionComboUid: String = categoryOptionCombo.uid(),
-        attributeOptionComboUid: String = attributeOptionCombo.uid()
+        attributeOptionComboUid: String = attributeOptionCombo.uid(),
     ) {
         val dataValue = DataValue.builder()
             .value(value)
@@ -310,7 +310,7 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
     protected fun createEventAndValue(
         value: String,
         dataElementUid: String,
-        enrollmentUid: String? = null
+        enrollmentUid: String? = null,
     ) {
         val event = Event.builder()
             .uid(BaseEvaluatorSamples.generator.generate())
@@ -335,7 +335,7 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
 
     protected fun createTEIAndAttribute(
         value: String?,
-        attributeUid: String
+        attributeUid: String,
     ) {
         val tei = TrackedEntityInstance.builder()
             .uid(BaseEvaluatorSamples.generator.generate())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluatorIntegrationShould.kt
index 7581c6e41e..4e4528c40d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluatorIntegrationShould.kt
@@ -69,11 +69,11 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(period201912.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period201912.periodId()!!),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -89,11 +89,11 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(period2019Q4.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period2019Q4.periodId()!!),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -108,13 +108,13 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.DataElementItem(dataElement1.uid())
+                DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
                 DimensionItem.PeriodItem.Relative(RelativePeriod.LAST_MONTH),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -129,13 +129,13 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
             ),
             filters = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
                 DimensionItem.DataItem.DataElementItem(dataElement2.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -150,12 +150,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.DataElementItem(dataElement2.uid())
+                DimensionItem.DataItem.DataElementItem(dataElement2.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -171,12 +171,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.CategoryItem(category.uid(), categoryOption.uid())
+                DimensionItem.CategoryItem(category.uid(), categoryOption.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -192,12 +192,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.CategoryItem(attribute.uid(), attributeOption.uid())
+                DimensionItem.CategoryItem(attribute.uid(), attributeOption.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -212,12 +212,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.CategoryItem(category.uid(), categoryOption = "non-existing-co")
+                DimensionItem.CategoryItem(category.uid(), categoryOption = "non-existing-co"),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -231,12 +231,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.DataElementOperandItem(dataElement1.uid(), categoryOptionCombo.uid())
+                DimensionItem.DataItem.DataElementOperandItem(dataElement1.uid(), categoryOptionCombo.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -251,12 +251,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.DataElementItem(dataElement1.uid())
+                DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Relative(RelativeOrganisationUnit.USER_ORGUNIT),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -271,12 +271,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.DataElementItem(dataElement1.uid())
+                DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Relative(RelativeOrganisationUnit.USER_ORGUNIT_CHILDREN),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -292,11 +292,11 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Level(level1.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Level(level1.uid()),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -312,11 +312,11 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Group(organisationUnitGroup.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Group(organisationUnitGroup.uid()),
+            ),
         )
 
         val value = dataElementEvaluator.evaluate(evaluationItem, metadata)
@@ -333,92 +333,92 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.AVERAGE_SUM_ORG_UNIT
-            )
+                aggregator = AggregationType.AVERAGE_SUM_ORG_UNIT,
+            ),
         ).isEqualTo("12")
 
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.FIRST
-            )
+                aggregator = AggregationType.FIRST,
+            ),
         ).isEqualTo("11")
 
         assertThat(
             evaluateAggregation(
                 periodId = period202012.periodId()!!,
-                aggregator = AggregationType.FIRST
-            )
+                aggregator = AggregationType.FIRST,
+            ),
         ).isEqualTo("11")
 
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.FIRST_AVERAGE_ORG_UNIT
-            )
+                aggregator = AggregationType.FIRST_AVERAGE_ORG_UNIT,
+            ),
         ).isEqualTo("5.5")
 
         assertThat(
             evaluateAggregation(
                 periodId = period202012.periodId()!!,
-                aggregator = AggregationType.FIRST_AVERAGE_ORG_UNIT
-            )
+                aggregator = AggregationType.FIRST_AVERAGE_ORG_UNIT,
+            ),
         ).isEqualTo("5.5")
 
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.LAST
-            )
+                aggregator = AggregationType.LAST,
+            ),
         ).isEqualTo("13")
 
         assertThat(
             evaluateAggregation(
                 periodId = period202012.periodId()!!,
-                aggregator = AggregationType.LAST
-            )
+                aggregator = AggregationType.LAST,
+            ),
         ).isEqualTo("13")
 
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.LAST_AVERAGE_ORG_UNIT
-            )
+                aggregator = AggregationType.LAST_AVERAGE_ORG_UNIT,
+            ),
         ).isEqualTo("6.5")
 
         assertThat(
             evaluateAggregation(
                 periodId = period202012.periodId()!!,
-                aggregator = AggregationType.LAST_AVERAGE_ORG_UNIT
-            )
+                aggregator = AggregationType.LAST_AVERAGE_ORG_UNIT,
+            ),
         ).isEqualTo("6.5")
 
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.LAST_IN_PERIOD
-            )
+                aggregator = AggregationType.LAST_IN_PERIOD,
+            ),
         ).isEqualTo("13")
 
         assertThat(
             evaluateAggregation(
                 periodId = period202012.periodId()!!,
-                aggregator = AggregationType.LAST_IN_PERIOD
-            )
+                aggregator = AggregationType.LAST_IN_PERIOD,
+            ),
         ).isEqualTo(null)
 
         assertThat(
             evaluateAggregation(
                 periodId = period2019Q4.periodId()!!,
-                aggregator = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT
-            )
+                aggregator = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
+            ),
         ).isEqualTo("6.5")
 
         assertThat(
             evaluateAggregation(
                 periodId = period202012.periodId()!!,
-                aggregator = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT
-            )
+                aggregator = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
+            ),
         ).isEqualTo(null)
     }
 
@@ -430,11 +430,11 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val defaultEvaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
+            ),
         )
 
         assertThat(dataElementEvaluator.evaluate(defaultEvaluationItem, metadata)).isEqualTo("11")
@@ -442,12 +442,12 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
         val overrideEvaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period201911.periodId()!!),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
             ),
-            aggregationType = AggregationType.AVERAGE
+            aggregationType = AggregationType.AVERAGE,
         )
 
         assertThat(dataElementEvaluator.evaluate(overrideEvaluationItem, metadata)).isEqualTo("5.5")
@@ -455,16 +455,16 @@ internal class DataElementSQLEvaluatorIntegrationShould : BaseEvaluatorIntegrati
 
     private fun evaluateAggregation(
         periodId: String,
-        aggregator: AggregationType
+        aggregator: AggregationType,
     ): String? {
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.PeriodItem.Absolute(periodId)
+                DimensionItem.PeriodItem.Absolute(periodId),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
+            ),
         )
 
         val updatedDataElement = dataElement1.toBuilder().aggregationType(aggregator.name).build()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
index 9db2a5339d..d25f01337d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluatorIntegrationShould.kt
@@ -74,7 +74,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -87,7 +87,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10")
@@ -113,7 +113,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild2.uid(), trackedEntityType.uid())
@@ -126,7 +126,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild2.uid(),
-            eventDate = day20191102
+            eventDate = day20191102,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10")
@@ -134,43 +134,49 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
         // Event data values
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.FIRST)
+            evaluateEventDataElement(deAggregation = AggregationType.FIRST),
         ).isEqualTo("30")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.FIRST_AVERAGE_ORG_UNIT)
+            evaluateEventDataElement(deAggregation = AggregationType.FIRST_AVERAGE_ORG_UNIT),
         ).isEqualTo("15")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST, pe = period2019Q4)
+            evaluateEventDataElement(deAggregation = AggregationType.LAST, pe = period2019Q4),
         ).isEqualTo("30")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST, pe = period202001)
+            evaluateEventDataElement(deAggregation = AggregationType.LAST, pe = period202001),
         ).isEqualTo("30")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period2019Q4)
+            evaluateEventDataElement(deAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period2019Q4),
         ).isEqualTo("15")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period202001)
+            evaluateEventDataElement(deAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period202001),
         ).isEqualTo("15")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST_IN_PERIOD, pe = period2019Q4)
+            evaluateEventDataElement(deAggregation = AggregationType.LAST_IN_PERIOD, pe = period2019Q4),
         ).isEqualTo("30")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST_IN_PERIOD, pe = period202001)
+            evaluateEventDataElement(deAggregation = AggregationType.LAST_IN_PERIOD, pe = period202001),
         ).isEqualTo(null)
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT, pe = period2019Q4)
+            evaluateEventDataElement(
+                deAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
+                pe = period2019Q4,
+            ),
         ).isEqualTo("15")
 
         assertThat(
-            evaluateEventDataElement(deAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT, pe = period202001)
+            evaluateEventDataElement(
+                deAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
+                pe = period202001,
+            ),
         ).isEqualTo(null)
     }
 
@@ -186,7 +192,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild2.uid(), trackedEntityType.uid())
@@ -199,7 +205,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild2.uid(),
-            eventDate = day20191102
+            eventDate = day20191102,
         )
 
         helper.insertTrackedEntityAttributeValue(trackedEntity1.uid(), attribute1.uid(), "5")
@@ -207,43 +213,43 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
         // Event data values
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.FIRST)
+            evaluateEventAttribute(atAggregation = AggregationType.FIRST),
         ).isEqualTo("8")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.FIRST_AVERAGE_ORG_UNIT)
+            evaluateEventAttribute(atAggregation = AggregationType.FIRST_AVERAGE_ORG_UNIT),
         ).isEqualTo("4")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST, pe = period2019Q4)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST, pe = period2019Q4),
         ).isEqualTo("8")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST, pe = period202001)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST, pe = period202001),
         ).isEqualTo("8")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period2019Q4)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period2019Q4),
         ).isEqualTo("4")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period202001)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST_AVERAGE_ORG_UNIT, pe = period202001),
         ).isEqualTo("4")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD, pe = period2019Q4)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD, pe = period2019Q4),
         ).isEqualTo("8")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD, pe = period202001)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD, pe = period202001),
         ).isEqualTo(null)
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT, pe = period2019Q4)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT, pe = period2019Q4),
         ).isEqualTo("4")
 
         assertThat(
-            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT, pe = period202001)
+            evaluateEventAttribute(atAggregation = AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT, pe = period202001),
         ).isEqualTo(null)
     }
 
@@ -259,7 +265,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -272,7 +278,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10")
@@ -295,17 +301,17 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         dataElement: DataElement = dataElement1,
         deAggregation: AggregationType = AggregationType.SUM,
         pe: Period = period2019Q4,
-        overrideAggregationType: AggregationType = AggregationType.DEFAULT
+        overrideAggregationType: AggregationType = AggregationType.DEFAULT,
     ): String? {
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.EventDataItem.DataElement(program.uid(), dataElement.uid())
+                DimensionItem.DataItem.EventDataItem.DataElement(program.uid(), dataElement.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(BaseEvaluatorSamples.orgunitParent.uid()),
-                DimensionItem.PeriodItem.Absolute(pe.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(pe.periodId()!!),
             ),
-            aggregationType = overrideAggregationType
+            aggregationType = overrideAggregationType,
         )
 
         val aggDataElement = dataElement.toBuilder().aggregationType(deAggregation.name).build()
@@ -313,7 +319,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
         return eventDataItemEvaluator.evaluate(
             evaluationItem,
-            metadata + (metadataItem.id to metadataItem)
+            metadata + (metadataItem.id to metadataItem),
         )
     }
 
@@ -322,17 +328,17 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
         attribute: TrackedEntityAttribute = attribute1,
         atAggregation: AggregationType = AggregationType.SUM,
         pe: Period = period2019Q4,
-        overrideAggregationType: AggregationType = AggregationType.DEFAULT
+        overrideAggregationType: AggregationType = AggregationType.DEFAULT,
     ): String? {
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.EventDataItem.Attribute(program.uid(), attribute.uid())
+                DimensionItem.DataItem.EventDataItem.Attribute(program.uid(), attribute.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(BaseEvaluatorSamples.orgunitParent.uid()),
-                DimensionItem.PeriodItem.Absolute(pe.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(pe.periodId()!!),
             ),
-            aggregationType = overrideAggregationType
+            aggregationType = overrideAggregationType,
         )
 
         val aggAttribute = attribute.toBuilder().aggregationType(atAggregation).build()
@@ -340,7 +346,7 @@ internal class EventDataItemSQLEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
         return eventDataItemEvaluator.evaluate(
             evaluationItem,
-            metadata + (metadataItem.id to metadataItem)
+            metadata + (metadataItem.id to metadataItem),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorIntegrationBaseShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorIntegrationBaseShould.kt
index 38697ff550..4d499ac3d0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorIntegrationBaseShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorIntegrationBaseShould.kt
@@ -56,7 +56,7 @@ internal class ExpressionDimensionItemEvaluatorIntegrationBaseShould : BaseEvalu
     fun setup() {
         val engine = ExpressionDimensionItemEngine(
             AnalyticExpressionEngineFactoryHelper.getFactory(d2),
-            expressionService
+            expressionService,
         )
 
         evaluator = ExpressionDimensionItemEvaluator(engine)
@@ -125,7 +125,7 @@ internal class ExpressionDimensionItemEvaluatorIntegrationBaseShould : BaseEvalu
     }
 
     private fun createExpression(
-        item: String
+        item: String,
     ): ExpressionDimensionItem {
         val expressionDimensionItem = ExpressionDimensionItem.builder()
             .uid(generator.generate())
@@ -142,17 +142,17 @@ internal class ExpressionDimensionItemEvaluatorIntegrationBaseShould : BaseEvalu
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.ExpressionDimensionItem(expressionDimensionItem.uid()),
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
             ),
             filters = listOf(
-                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
-            )
+                DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
+            ),
         )
 
         return evaluator.evaluate(
             evaluationItem,
             metadata +
-                (expressionDimensionItem.uid() to MetadataItem.ExpressionDimensionItemItem(expressionDimensionItem))
+                (expressionDimensionItem.uid() to MetadataItem.ExpressionDimensionItemItem(expressionDimensionItem)),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt
index 3dc42949d8..f3772c6894 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationBaseShould.kt
@@ -62,7 +62,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
     fun should_evaluate_mathematical_expressions() {
         val indicator = createIndicator(
             numerator = "4 * 5 / 2",
-            denominator = "2 + 7 - 4"
+            denominator = "2 + 7 - 4",
         )
 
         val value = evaluateForThisMonth(indicator)
@@ -88,7 +88,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
 
         val indicator = createIndicator(
             numerator = de(dataElement1.uid()),
-            denominator = "[days]"
+            denominator = "[days]",
         )
 
         val value = evaluateForThisMonth(indicator)
@@ -104,7 +104,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         val indicator = createIndicator(
             numerator = de(dataElement1.uid()),
             denominator = de(dataElement2.uid()),
-            decimals = 4
+            decimals = 4,
         )
 
         val value = evaluateForThisMonth(indicator)
@@ -118,7 +118,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
 
         val indicator = createIndicator(
             numerator = de(dataElement1.uid()),
-            denominator = cons(constant1.uid())
+            denominator = cons(constant1.uid()),
         )
 
         val value = evaluateForThisMonth(indicator)
@@ -132,7 +132,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         createEventAndValue("15", dataElement1.uid())
 
         val indicator = createIndicator(
-            numerator = eventDE(program.uid(), dataElement1.uid())
+            numerator = eventDE(program.uid(), dataElement1.uid()),
         )
 
         val value = evaluateForThisMonth(indicator)
@@ -146,7 +146,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         createTEIAndAttribute("5", attribute1.uid())
 
         val indicator = createIndicator(
-            numerator = eventAtt(program.uid(), attribute1.uid())
+            numerator = eventAtt(program.uid(), attribute1.uid()),
         )
 
         val value = evaluateForThisMonth(indicator)
@@ -216,7 +216,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         mapOf(
             "${de(dataElement1.uid())}.minDate(2019-10-05)" to "12.0",
             "${de(dataElement1.uid())}.maxDate(2019-12-01)" to "6.0",
-            "${de(dataElement1.uid())}.minDate(2019-10-05).maxDate(2019-12-01)" to "4.0"
+            "${de(dataElement1.uid())}.minDate(2019-10-05).maxDate(2019-12-01)" to "4.0",
         ).forEach { (numerator, expected) ->
             val indicator = createIndicator(numerator = numerator)
             val result = evaluateForAbsolute(indicator, periodId = period2019Q4.periodId()!!)
@@ -231,7 +231,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         mapOf(
             period201910 to "12.0",
             period2019Q4 to "4.0",
-            period2019SunW25 to "52.0"
+            period2019SunW25 to "52.0",
         ).forEach { (period, expected) ->
             val result = evaluateForAbsolute(indicator, periodId = period.periodId()!!)
             assertThat(result).isEqualTo(expected)
@@ -245,7 +245,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         mapOf(
             period201910 to "10.0",
             period2019Q4 to "4.0",
-            period2019SunW25 to "25.0"
+            period2019SunW25 to "25.0",
         ).forEach { (period, expected) ->
             val result = evaluateForAbsolute(indicator, periodId = period.periodId()!!)
             assertThat(result).isEqualTo(expected)
@@ -265,7 +265,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
             period201910 to "2.0",
             period201911 to "6.0",
             period201912 to "14.0",
-            period202001 to "16.0"
+            period202001 to "16.0",
         ).forEach { (period, expected) ->
             val result = evaluateForAbsolute(indicator, periodId = period.periodId()!!)
             assertThat(result).isEqualTo(expected)
@@ -288,46 +288,46 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
 
     private fun evaluateForThisMonth(
         indicator: Indicator,
-        aggregationType: AggregationType = AggregationType.DEFAULT
+        aggregationType: AggregationType = AggregationType.DEFAULT,
     ): String? {
         return evaluateFor(
             indicator = indicator,
             aggregationType = aggregationType,
-            periodItem = DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH)
+            periodItem = DimensionItem.PeriodItem.Relative(RelativePeriod.THIS_MONTH),
         )
     }
 
     private fun evaluateForAbsolute(
         indicator: Indicator,
         periodId: String,
-        aggregationType: AggregationType = AggregationType.DEFAULT
+        aggregationType: AggregationType = AggregationType.DEFAULT,
     ): String? {
         return evaluateFor(
             indicator = indicator,
             aggregationType = aggregationType,
-            periodItem = DimensionItem.PeriodItem.Absolute(periodId)
+            periodItem = DimensionItem.PeriodItem.Absolute(periodId),
         )
     }
 
     private fun evaluateFor(
         indicator: Indicator,
         aggregationType: AggregationType = AggregationType.DEFAULT,
-        periodItem: DimensionItem.PeriodItem
+        periodItem: DimensionItem.PeriodItem,
     ): String? {
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.IndicatorItem(indicator.uid()),
-                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid())
+                DimensionItem.OrganisationUnitItem.Absolute(orgunitParent.uid()),
             ),
             filters = listOf(
-                periodItem
+                periodItem,
             ),
-            aggregationType = aggregationType
+            aggregationType = aggregationType,
         )
 
         return indicatorEvaluator.evaluate(
             evaluationItem,
-            metadata + (indicator.uid() to MetadataItem.IndicatorItem(indicator))
+            metadata + (indicator.uid() to MetadataItem.IndicatorItem(indicator)),
         )
     }
 
@@ -335,7 +335,7 @@ internal abstract class IndicatorEvaluatorIntegrationBaseShould : BaseEvaluatorI
         numerator: String? = "1",
         denominator: String? = "1",
         decimals: Int? = null,
-        factor: Int? = 1
+        factor: Int? = 1,
     ): Indicator {
         val indicatorType = IndicatorType.builder()
             .uid(generator.generate())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationShould.kt
index 279afdf35a..ef1c595995 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorIntegrationShould.kt
@@ -40,7 +40,7 @@ internal class IndicatorEvaluatorIntegrationShould : IndicatorEvaluatorIntegrati
     private val indicatorEngine = IndicatorEngine(
         indicatorTypeStore,
         analyticExpressionEngineFactory,
-        expressionService
+        expressionService,
     )
 
     override val indicatorEvaluator = IndicatorEvaluator(indicatorEngine)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluatorIntegrationShould.kt
index b2cefbed24..6149024795 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluatorIntegrationShould.kt
@@ -40,7 +40,7 @@ internal class IndicatorSQLEvaluatorIntegrationShould : IndicatorEvaluatorIntegr
     private val indicatorEngine = IndicatorSQLEngine(
         indicatorTypeStore,
         analyticExpressionEngineFactory,
-        databaseAdapter
+        databaseAdapter,
     )
 
     override val indicatorEvaluator = IndicatorSQLEvaluator(indicatorEngine)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
index 36559e834b..7ec3ababe0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorIntegrationShould.kt
@@ -61,7 +61,7 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
     private val programIndicatorEvaluator = ProgramIndicatorEvaluator(
         EventStoreImpl(databaseAdapter),
         EnrollmentStoreImpl(databaseAdapter),
-        d2.programModule().programIndicatorEngine()
+        d2.programModule().programIndicatorEngine(),
     )
 
     private val helper = BaseTrackerDataIntegrationHelper(databaseAdapter)
@@ -72,16 +72,16 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
         val valueSum = evaluateIndicator(
             setProgramIndicator(
-                expression = de(programStage1.uid(), dataElement1.uid())
-            )
+                expression = de(programStage1.uid(), dataElement1.uid()),
+            ),
         )
         assertThat(valueSum).isEqualTo("30.0")
 
         val valueAvg = evaluateIndicator(
             setProgramIndicator(
                 expression = de(programStage1.uid(), dataElement1.uid()),
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         )
         assertThat(valueAvg).isEqualTo("15.0")
     }
@@ -92,16 +92,16 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
         val defaultValue = evaluateIndicator(
             setProgramIndicator(
-                expression = de(programStage1.uid(), dataElement1.uid())
-            )
+                expression = de(programStage1.uid(), dataElement1.uid()),
+            ),
         )
         assertThat(defaultValue).isEqualTo("30.0")
 
         val overrideValue = evaluateIndicator(
             setProgramIndicator(
-                expression = de(programStage1.uid(), dataElement1.uid())
+                expression = de(programStage1.uid(), dataElement1.uid()),
             ),
-            overrideAggregationType = AggregationType.AVERAGE
+            overrideAggregationType = AggregationType.AVERAGE,
         )
         assertThat(overrideValue).isEqualTo("15.0")
     }
@@ -117,7 +117,7 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -130,7 +130,7 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10")
@@ -139,22 +139,22 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
 
     private fun evaluateIndicator(
         programIndicator: ProgramIndicator,
-        overrideAggregationType: AggregationType = AggregationType.DEFAULT
+        overrideAggregationType: AggregationType = AggregationType.DEFAULT,
     ): String? {
         val evaluationItemSum = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
-                DimensionItem.DataItem.ProgramIndicatorItem(programIndicator.uid())
+                DimensionItem.DataItem.ProgramIndicatorItem(programIndicator.uid()),
             ),
             filters = listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(BaseEvaluatorSamples.orgunitParent.uid()),
-                DimensionItem.PeriodItem.Relative(RelativePeriod.LAST_MONTH)
+                DimensionItem.PeriodItem.Relative(RelativePeriod.LAST_MONTH),
             ),
-            aggregationType = overrideAggregationType
+            aggregationType = overrideAggregationType,
         )
 
         return programIndicatorEvaluator.evaluate(
             evaluationItemSum,
-            metadata + (programIndicator.uid() to MetadataItem.ProgramIndicatorItem(programIndicator))
+            metadata + (programIndicator.uid() to MetadataItem.ProgramIndicatorItem(programIndicator)),
         )
     }
 
@@ -162,7 +162,7 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
         expression: String,
         filter: String? = null,
         analyticsType: AnalyticsType? = AnalyticsType.EVENT,
-        aggregationType: AggregationType? = AggregationType.SUM
+        aggregationType: AggregationType? = AggregationType.SUM,
     ): ProgramIndicator {
         val boundaryTarget = if (analyticsType == AnalyticsType.EVENT) {
             "EVENT_DATE"
@@ -178,7 +178,7 @@ internal class ProgramIndicatorEvaluatorIntegrationShould : BaseEvaluatorIntegra
             AnalyticsPeriodBoundary.builder()
                 .boundaryTarget(boundaryTarget)
                 .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                .build()
+                .build(),
         )
 
         val programIndicator = ProgramIndicator.builder()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
index cbd6ca400f..3e5aa75ff2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactoryHelper.kt
@@ -49,11 +49,11 @@ internal object AnalyticExpressionEngineFactoryHelper {
             ConstantStoreImpl(databaseAdapter),
             DataElementStoreImpl(databaseAdapter),
             TrackedEntityAttributeStoreImpl(databaseAdapter),
-            databaseAdapter
+            databaseAdapter,
         )
 
         val programIndicatorEvaluator = ProgramIndicatorSQLEvaluator(
-            programIndicatorExecutor
+            programIndicatorExecutor,
         )
 
         val eventDataItemEvaluator = EventDataItemSQLEvaluator(databaseAdapter)
@@ -67,7 +67,7 @@ internal object AnalyticExpressionEngineFactoryHelper {
             dataElementEvaluator,
             programIndicatorEvaluator,
             eventDataItemEvaluator,
-            ConstantStoreImpl(databaseAdapter)
+            ConstantStoreImpl(databaseAdapter),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
index 1590c6e78f..1771b1c759 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt
@@ -114,7 +114,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         userOrganisationUnitStore,
         organisationUnitStore,
         organisationUnitLevelStore,
-        organisationUnitGroupLinkStore
+        organisationUnitGroupLinkStore,
     )
 
     private val eventLineListService: EventLineListService = EventLineListServiceImpl(
@@ -133,8 +133,8 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             programIndicatorRepository = d2.programModule().programIndicators(),
             legendRepository = d2.legendSetModule().legends(),
             indicatorRepository = d2.indicatorModule().indicators(),
-            trackedEntityAttributeCollectionRepository = d2.trackedEntityModule().trackedEntityAttributes()
-        )
+            trackedEntityAttributeCollectionRepository = d2.trackedEntityModule().trackedEntityAttributes(),
+        ),
     )
 
     @Before
@@ -207,7 +207,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            dataElements = listOf(LineListItem(dataElement1.uid()))
+            dataElements = listOf(LineListItem(dataElement1.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -250,7 +250,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid()))
+            dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -271,7 +271,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid()))
+            dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -303,13 +303,13 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         createDataValue(event2.uid(), dataElement2.uid(), "20.5")
 
         val programIndicator = createProgramIndicator(
-            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}"
+            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}",
         )
 
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            programIndicators = listOf(LineListItem(programIndicator.uid()))
+            programIndicators = listOf(LineListItem(programIndicator.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -337,7 +337,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            programIndicators = listOf(LineListItem(programIndicator.uid()))
+            programIndicators = listOf(LineListItem(programIndicator.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -359,7 +359,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            dataElements = listOf(LineListItem(dataElement1.uid()))
+            dataElements = listOf(LineListItem(dataElement1.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -382,7 +382,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            dataElements = listOf(LineListItem(dataElement1.uid()))
+            dataElements = listOf(LineListItem(dataElement1.uid())),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -409,8 +409,8 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.THIS_MONTH)
                     .type(DatePeriodType.RELATIVE)
-                    .build()
-            )
+                    .build(),
+            ),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -426,7 +426,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
-            organisationUnits = listOf(OrganisationUnitFilter(null, RelativeOrganisationUnit.USER_ORGUNIT))
+            organisationUnits = listOf(OrganisationUnitFilter(null, RelativeOrganisationUnit.USER_ORGUNIT)),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -443,14 +443,14 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         createDataValue(event1.uid(), dataElement2.uid(), "10.0")
 
         val programIndicator = createProgramIndicator(
-            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}"
+            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}",
         )
 
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
             programIndicators = listOf(LineListItem(programIndicator.uid())),
-            analyticsLegendStrategy = AnalyticsLegendStrategy.None
+            analyticsLegendStrategy = AnalyticsLegendStrategy.None,
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -466,14 +466,14 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         createDataValue(event1.uid(), dataElement2.uid(), "10.0")
 
         val programIndicator = createProgramIndicator(
-            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}"
+            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}",
         )
 
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
             programIndicators = listOf(LineListItem(programIndicator.uid())),
-            analyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem
+            analyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem,
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -493,14 +493,14 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         createDataValue(event1.uid(), dataElement2.uid(), "40.0")
 
         val programIndicator = createProgramIndicator(
-            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}"
+            "#{${program1Stage2.uid()}.${dataElement1.uid()}} + #{${program1Stage2.uid()}.${dataElement2.uid()}}",
         )
 
         val eventListParams = EventLineListParams(
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
             programIndicators = listOf(LineListItem(programIndicator.uid())),
-            analyticsLegendStrategy = AnalyticsLegendStrategy.Fixed(legendSet2.uid())
+            analyticsLegendStrategy = AnalyticsLegendStrategy.Fixed(legendSet2.uid()),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -523,7 +523,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
             dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid())),
-            analyticsLegendStrategy = AnalyticsLegendStrategy.None
+            analyticsLegendStrategy = AnalyticsLegendStrategy.None,
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -542,7 +542,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
             dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid())),
-            analyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem
+            analyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem,
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -570,7 +570,7 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             programStage = program1Stage2.uid(),
             trackedEntityInstance = trackedEntityInstance.uid(),
             dataElements = listOf(LineListItem(dataElement1.uid()), LineListItem(dataElement2.uid())),
-            analyticsLegendStrategy = AnalyticsLegendStrategy.Fixed(legendSet2.uid())
+            analyticsLegendStrategy = AnalyticsLegendStrategy.Fixed(legendSet2.uid()),
         )
 
         val result = eventLineListService.evaluate(eventListParams)
@@ -625,8 +625,8 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         programIndicatorStore.insert(programIndicator)
         programIndicatorLegendSetLinkStore.insert(
             ProgramIndicatorLegendSetLink.builder().programIndicator(programIndicator.uid()).legendSet(
-                legendSet1.uid()
-            ).build()
+                legendSet1.uid(),
+            ).build(),
         )
         return programIndicator
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListSamples.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListSamples.kt
index 389a18772b..798c9c8719 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListSamples.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListSamples.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.analytics.eventlinelist
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
@@ -48,6 +47,7 @@ import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+import java.util.*
 
 object EventLineListSamples {
 
@@ -81,8 +81,8 @@ object EventLineListSamples {
                 Legend.builder().uid(generator.generate()).name("60 - 80").startValue(60.0).endValue(80.0)
                     .color("#fecc5c").build(),
                 Legend.builder().uid(generator.generate()).name("80 - 100").startValue(80.0).endValue(100.0)
-                    .color("#bd0026").build()
-            )
+                    .color("#bd0026").build(),
+            ),
         ).build()
 
     val legendSet2: LegendSet = LegendSet.builder()
@@ -93,8 +93,8 @@ object EventLineListSamples {
                 Legend.builder().uid(generator.generate()).name("0 - 50").startValue(0.0).endValue(50.0)
                     .color("#ffffff").build(),
                 Legend.builder().uid(generator.generate()).name("50 - 100").startValue(50.0).endValue(100.0)
-                    .color("#000000").build()
-            )
+                    .color("#000000").build(),
+            ),
         ).build()
 
     val program1: Program = Program.builder()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
index 357c0af1a2..bed4797c36 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
@@ -49,7 +49,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
 
         RelationshipTypeAsserts.assertTypesWithoutConstraints(
             relationshipType!!,
-            RelationshipTypeSamples.RELATIONSHIP_TYPE_1
+            RelationshipTypeSamples.RELATIONSHIP_TYPE_1,
         )
     }
 
@@ -58,7 +58,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
         val relationshipType = relationshipTypeCollectionRepository
             .byConstraint(
                 RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
-                RelationshipTypeSamples.TET_FOR_RELATIONSHIP_3_UID
+                RelationshipTypeSamples.TET_FOR_RELATIONSHIP_3_UID,
             )
             .withConstraints()
             .blockingGet()
@@ -72,7 +72,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
             .byConstraint(
                 RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
                 RelationshipTypeSamples.TET_FOR_RELATIONSHIP_3_UID,
-                RelationshipConstraintType.FROM
+                RelationshipConstraintType.FROM,
             )
             .withConstraints()
             .blockingGet()
@@ -92,7 +92,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
 
         RelationshipTypeAsserts.assertTypesWithoutConstraints(
             relationshipType!!,
-            RelationshipTypeSamples.RELATIONSHIP_TYPE_2
+            RelationshipTypeSamples.RELATIONSHIP_TYPE_2,
         )
     }
 
@@ -105,7 +105,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
 
         RelationshipTypeAsserts.assertTypeWithConstraints(
             relationshipType!!,
-            RelationshipTypeSamples.RELATIONSHIP_TYPE_1
+            RelationshipTypeSamples.RELATIONSHIP_TYPE_1,
         )
     }
 
@@ -118,7 +118,7 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
 
         RelationshipTypeAsserts.assertTypeWithConstraints(
             relationshipType,
-            RelationshipTypeSamples.RELATIONSHIP_TYPE_2
+            RelationshipTypeSamples.RELATIONSHIP_TYPE_2,
         )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStorageMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStorageMockIntegrationShould.kt
index 4ab8771cd1..406ac5c5af 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStorageMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStorageMockIntegrationShould.kt
@@ -38,8 +38,8 @@ import org.junit.runner.RunWith
 class CredentialsSecureStorageMockIntegrationShould {
     private fun instantiateStore(): CredentialsSecureStoreImpl = CredentialsSecureStoreImpl(
         ChunkedSecureStore(
-            AndroidSecureStore(InstrumentationRegistry.getInstrumentation().context)
-        )
+            AndroidSecureStore(InstrumentationRegistry.getInstrumentation().context),
+        ),
     )
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt
index db42af7f18..08aa6172e8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith
 class AttributeStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Attribute>(
     AttributeStoreImpl(TestDatabaseAdapterFactory.get()),
     AttributeTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): Attribute {
         return AttributeSamples.getAttribute()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
index d84f518cd1..d2e517e2de 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreIntegrationShould.kt
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith
 class CategoryCategoryComboLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<CategoryCategoryComboLink>(
     CategoryCategoryComboLinkStoreImpl(TestDatabaseAdapterFactory.get()),
     CategoryCategoryComboLinkTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun addMasterUid(): String {
         return CategoryCategoryComboLinkSamples.getCategoryCategoryComboLink().categoryCombo()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
index c795342db9..41f1c1e405 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
@@ -43,7 +43,7 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
         assertThat(categoryCategoryComboLinks.isEmpty()).isTrue()
 
         val categoryComboEndpointCall = getD2DIComponent(d2).internalModules().category.categoryComboCall.download(
-            setOf("bjDvmb4bfuf")
+            setOf("bjDvmb4bfuf"),
         )
         val categoryCombos = categoryComboEndpointCall.blockingGet()
         assertThat(categoryCombos.isEmpty()).isFalse()
@@ -61,7 +61,7 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
 
     private fun downloadCategories() {
         getD2DIComponent(d2).internalModules().category.categoryCall.download(
-            setOf("GLevLNI9wkl")
+            setOf("GLevLNI9wkl"),
         ).blockingGet()
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
index 467691ac59..a57e9c7326 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
@@ -36,7 +36,7 @@ class CategoryEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     fun call_categories_endpoint() {
         d2.userModule().logIn(username, password, url).blockingGet()
         val categoryEndpointCall = getD2DIComponent(d2).internalModules().category.categoryCall.download(
-            setOf("cX5k9anHEHd")
+            setOf("cX5k9anHEHd"),
         )
         val categories = categoryEndpointCall.blockingGet()
         assertThat(categories.isEmpty()).isFalse()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
index 7328287b2e..85b8b4603a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
@@ -36,7 +36,7 @@ class CategoryEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable() {
     @Test
     fun download_category_successfully() {
         val categoriesSingle = objects.d2DIComponent.internalModules().category.categoryCall.download(
-            setOf("vGs6omsRekv", "KfdsGBcoiCa", "cX5k9anHEHd", "x3uo8LqiTBk")
+            setOf("vGs6omsRekv", "KfdsGBcoiCa", "cX5k9anHEHd", "x3uo8LqiTBk"),
         )
         dhis2MockServer.enqueueMockResponse("category/categories.json")
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt
index 3919c5c414..e4736cbc0d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreIntegrationShould.kt
@@ -41,7 +41,7 @@ class CategoryOptionOrganisationUnitLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<CategoryOptionOrganisationUnitLink>(
         CategoryOptionOrganisationUnitLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         CategoryOptionOrganisationUnitLinkTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
 
     override fun buildObjectWithOtherMasterUid(): CategoryOptionOrganisationUnitLink {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
index b317e5a6af..20a46439c8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorIntegrationShould.kt
@@ -29,9 +29,6 @@ package org.hisp.dhis.android.core.common.internal
 
 import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import java.text.ParseException
-import java.util.*
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -55,6 +52,9 @@ import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.IOException
+import java.text.ParseException
+import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
@@ -87,7 +87,7 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
             relationshipStore,
             relationshipItemStore,
             relationshipTypeStore,
-            programOwnerStore
+            programOwnerStore,
         )
     }
 
@@ -233,12 +233,12 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
                     .relationshipType(relationshipType)
                     .from(RelationshipHelper.teiItem(teiUid))
                     .to(RelationshipHelper.teiItem(toTeiUid))
-                    .build()
+                    .build(),
             )
 
             assertThat(trackedEntityInstanceStore.selectByUid(teiUid)!!.syncState()).isEqualTo(State.SYNCED)
             assertThat(
-                trackedEntityInstanceStore.selectByUid(teiUid)!!.aggregatedSyncState()
+                trackedEntityInstanceStore.selectByUid(teiUid)!!.aggregatedSyncState(),
             ).isEqualTo(State.TO_UPDATE)
 
             val toTeiState = if (bidirectional) State.TO_UPDATE else State.SYNCED
@@ -267,12 +267,12 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
                     .relationshipType(relationshipType)
                     .from(RelationshipHelper.enrollmentItem(enrollmentUid))
                     .to(RelationshipHelper.teiItem(toTeiUid))
-                    .build()
+                    .build(),
             )
 
             assertThat(trackedEntityInstanceStore.selectByUid(teiUid)!!.syncState()).isEqualTo(State.SYNCED)
             assertThat(
-                trackedEntityInstanceStore.selectByUid(teiUid)!!.aggregatedSyncState()
+                trackedEntityInstanceStore.selectByUid(teiUid)!!.aggregatedSyncState(),
             ).isEqualTo(State.TO_UPDATE)
             assertThat(enrollmentStore.selectByUid(enrollmentUid)!!.syncState()).isEqualTo(State.SYNCED)
             assertThat(enrollmentStore.selectByUid(enrollmentUid)!!.aggregatedSyncState()).isEqualTo(State.TO_UPDATE)
@@ -304,12 +304,12 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
                     .relationshipType(relationshipType)
                     .from(RelationshipHelper.eventItem(eventUid))
                     .to(RelationshipHelper.teiItem(toTeiUid))
-                    .build()
+                    .build(),
             )
 
             assertThat(trackedEntityInstanceStore.selectByUid(teiUid)!!.syncState()).isEqualTo(State.SYNCED)
             assertThat(
-                trackedEntityInstanceStore.selectByUid(teiUid)!!.aggregatedSyncState()
+                trackedEntityInstanceStore.selectByUid(teiUid)!!.aggregatedSyncState(),
             ).isEqualTo(State.TO_UPDATE)
             assertThat(enrollmentStore.selectByUid(enrollmentUid)!!.syncState()).isEqualTo(State.SYNCED)
             assertThat(enrollmentStore.selectByUid(enrollmentUid)!!.aggregatedSyncState()).isEqualTo(State.TO_UPDATE)
@@ -469,7 +469,7 @@ class DataStatePropagatorIntegrationShould : BaseMockIntegrationTestFullDispatch
             "lxAQ7Zs9VYR",
             "dBwrot7S420",
             "DiszpKrYNg8",
-            "bRowv6yZOF2"
+            "bRowv6yZOF2",
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
index 41f2a6d0c8..e05627afdb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigrationIntegrationShould.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.configuration.internal
 
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
-import java.io.File
-import java.io.IOException
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
@@ -44,6 +42,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.File
+import java.io.IOException
 
 @RunWith(D2JunitRunner::class)
 class DatabaseConfigurationMigrationIntegrationShould {
@@ -82,7 +82,7 @@ class DatabaseConfigurationMigrationIntegrationShould {
             insecureStore,
             nameGenerator,
             renamer,
-            databaseAdapterFactory
+            databaseAdapterFactory,
         )
 
         FileResourceDirectoryHelper.deleteRootFileResourceDirectory(context)
@@ -143,10 +143,10 @@ class DatabaseConfigurationMigrationIntegrationShould {
                                     .databaseName(newName)
                                     .databaseCreationDate("2014-06-06T20:44:21.375")
                                     .encrypted(false)
-                                    .build()
-                            )
-                        ).build()
-                )
+                                    .build(),
+                            ),
+                        ).build(),
+                ),
             ).build()
 
         DatabaseConfigurationInsecureStoreOld.get(insecureStore).set(oldDatabaseConfiguration)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.kt
index 019fb646fd..9af4f60b4e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/DatabaseAssert.kt
@@ -70,7 +70,7 @@ class DatabaseAssert private constructor(var databaseAdapter: DatabaseAdapter) {
 
         val cursor = databaseAdapter.rawQuery(
             " SELECT name FROM sqlite_master WHERE type='table' and " +
-                excludedTables.joinToString(" and ") { "name != '$it'" }
+                excludedTables.joinToString(" and ") { "name != '$it'" },
         )
 
         val tablesCount = ArrayList<TableCount>()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt
index 57f41bbf9c..6923efd96c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableDataObjectStoreAbstractIntegrationShould.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.data.database
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import kotlin.Throws
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
@@ -39,15 +37,17 @@ import org.hisp.dhis.android.core.common.ObjectWithDeleteInterface
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.junit.Before
 import org.junit.Test
+import java.io.IOException
+import kotlin.Throws
 
 abstract class IdentifiableDataObjectStoreAbstractIntegrationShould<M> internal constructor(
     store: IdentifiableObjectStore<M>,
     tableInfo: TableInfo,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : IdentifiableObjectStoreAbstractIntegrationShould<M>(
     store,
     tableInfo,
-    databaseAdapter
+    databaseAdapter,
 ) where M : ObjectWithUidInterface, M : CoreObject, M : DataObject, M : ObjectWithDeleteInterface {
 
     private val objectWithToDeleteState: M
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt
index 372971b34d..a41618cafe 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/IdentifiableObjectStoreAbstractIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.data.database
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
-import java.io.IOException
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
@@ -39,15 +38,16 @@ import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.junit.Before
 import org.junit.Test
+import java.io.IOException
 
 abstract class IdentifiableObjectStoreAbstractIntegrationShould<M> internal constructor(
     internal var store: IdentifiableObjectStore<M>,
     tableInfo: TableInfo,
-    databaseAdapter: DatabaseAdapter?
+    databaseAdapter: DatabaseAdapter?,
 ) : ObjectStoreAbstractIntegrationShould<M>(
     store,
     tableInfo,
-    databaseAdapter!!
+    databaseAdapter!!,
 ) where M : ObjectWithUidInterface, M : CoreObject {
     private val objectToUpdate: M
     protected abstract fun buildObjectToUpdate(): M
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkStoreAbstractIntegrationShould.kt
index 30154db495..b22a3b8274 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/LinkStoreAbstractIntegrationShould.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.data.database
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.common.CoreObject
 import org.junit.Before
 import org.junit.Test
+import java.io.IOException
 
 abstract class LinkStoreAbstractIntegrationShould<M : CoreObject> internal constructor(
     internal var store: LinkStore<M>,
     tableInfo: TableInfo,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ObjectStoreAbstractIntegrationShould<M>(store, tableInfo, databaseAdapter) {
 
     private val objectWithOtherMasterUid: M
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.kt
index 16333d0398..eb2195106b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectStoreAbstractIntegrationShould.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.data.database
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import kotlin.jvm.Throws
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
@@ -37,11 +35,13 @@ import org.hisp.dhis.android.core.common.CoreObject
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import java.io.IOException
+import kotlin.jvm.Throws
 
 abstract class ObjectStoreAbstractIntegrationShould<M : CoreObject> internal constructor(
     private val store: ObjectStore<M>,
     tableInfo: TableInfo,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) {
     val `object`: M
     private val tableInfo: TableInfo
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.kt
index 8ebb31b600..9bcd1f7c5c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/ObjectWithoutUidStoreAbstractIntegrationShould.kt
@@ -41,7 +41,7 @@ import org.junit.Test
 abstract class ObjectWithoutUidStoreAbstractIntegrationShould<M : CoreObject> internal constructor(
     internal val store: ObjectWithoutUidStore<M>,
     tableInfo: TableInfo,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ObjectStoreAbstractIntegrationShould<M>(store, tableInfo, databaseAdapter) {
 
     private val objectToUpdate: M
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
index 91c29ab963..97eaf33d59 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.dataelement.internal
 
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.junit.Before
+import java.util.concurrent.Callable
 
 class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     /**
@@ -49,7 +49,7 @@ class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
         val uids = setOf(
             "FTRrcoaog83",
             "P3jJH5Tu5VC",
-            "FQ2o8UBlcrS"
+            "FQ2o8UBlcrS",
         )
         return getD2DIComponent(d2).dataElementCallFactory().create(uids)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
index 22f1e35123..581ec843ec 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCallMockIntegrationShould.kt
@@ -57,7 +57,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
             period = dataSetCompleteRegistration.period(),
             organisationUnit = dataSetCompleteRegistration.organisationUnit(),
             dataSet = dataSetCompleteRegistration.dataSet(),
-            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo()
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo(),
         ).blockingSet()
 
         val toPostRepository = d2.dataSetModule()
@@ -98,7 +98,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
             period = dataSetCompleteRegistration.period(),
             organisationUnit = dataSetCompleteRegistration.organisationUnit(),
             dataSet = dataSetCompleteRegistration.dataSet(),
-            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo()
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo(),
         )
 
         dhis2MockServer.enqueueMockResponse(200, "imports/data_value_import_summary_web_response.json")
@@ -116,7 +116,7 @@ class DataSetCompleteRegistrationPostCallMockIntegrationShould : BaseMockIntegra
             period = dataSetCompleteRegistration.period(),
             organisationUnit = dataSetCompleteRegistration.organisationUnit(),
             dataSet = dataSetCompleteRegistration.dataSet(),
-            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo()
+            attributeOptionCombo = dataSetCompleteRegistration.attributeOptionCombo(),
         )
         dObject.blockingDelete()
         assertEquals(toUpdateRepository.blockingGet().size, 1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
index 125a46bb79..a4d4a46669 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.junit.Before
+import java.util.concurrent.Callable
 
 class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
index db2aec6a79..5ffc928902 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreIntegrationShould.kt
@@ -66,7 +66,7 @@ class DataSetInstanceStoreIntegrationShould : BaseMockIntegrationTestMetadataDis
             listOf(State.TO_POST, State.ERROR) to State.ERROR,
             listOf(State.ERROR, State.TO_UPDATE) to State.ERROR,
             listOf(State.UPLOADING, State.TO_POST) to State.UPLOADING,
-            listOf(State.UPLOADING, State.ERROR) to State.ERROR
+            listOf(State.UPLOADING, State.ERROR) to State.ERROR,
         ).forEach { (valueStates, aggregated) ->
             insertDataValuesWithStates(valueStates[0], valueStates[1])
             checkSyncState(aggregated)
@@ -109,7 +109,7 @@ class DataSetInstanceStoreIntegrationShould : BaseMockIntegrationTestMetadataDis
                 .dataElement(dataElements[0]?.dataElement()?.uid()!!)
                 .categoryOptionCombo(categoryOption1.uid())
                 .syncState(state1)
-                .build()
+                .build(),
         )
 
         dataValueStore.updateOrInsertWhere(
@@ -117,7 +117,7 @@ class DataSetInstanceStoreIntegrationShould : BaseMockIntegrationTestMetadataDis
                 .dataElement(dataElements[1]?.dataElement()?.uid()!!)
                 .categoryOptionCombo(categoryOption2.uid())
                 .syncState(state2)
-                .build()
+                .build(),
         )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
index 04a0f5f756..f1dc11eeed 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 class SectionIndicatorLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<SectionIndicatorLink>(
     SectionIndicatorLinkStoreImpl(TestDatabaseAdapterFactory.get()),
     SectionIndicatorLinkTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
 
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt
index 0670ab4666..9f6607bd2b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/DataStoreEntryStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 class DataStoreEntryStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<DataStoreEntry>(
     DataStoreEntryStoreImpl(TestDatabaseAdapterFactory.get()),
     DataStoreEntryTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): DataStoreEntry {
         return DataStoreEntrySamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt
index 71463d8160..c36453c815 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datastore/LocalDataStoreStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 class LocalDataStoreStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<KeyValuePair>(
     LocalDataStoreStoreImpl(TestDatabaseAdapterFactory.get()),
     LocalDataStoreTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): KeyValuePair {
         return keyValuePairSample
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt
index a657152d57..750f98911a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith
 class DataValueConflictStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<DataValueConflict>(
     DataValueConflictStoreImpl(TestDatabaseAdapterFactory.get()),
     DataValueConflictTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): DataValueConflict {
         return DataValueConflictSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
index 4fdf496f14..a3d43f312c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEndpointCallRealIntegrationShould.kt
@@ -68,7 +68,7 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             periodType = PeriodType.Daily,
             futurePeriods = 0,
             pastPeriods = 30,
-            lastUpdated = null
+            lastUpdated = null,
         )
 
         val bundle = AggregatedDataCallBundle(
@@ -76,7 +76,7 @@ class DataValueEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             dataSets = DataValueUtils.dataSets,
             periodIds = DataValueUtils.periodIds,
             rootOrganisationUnitUids = DataValueUtils.orgUnitUids,
-            allOrganisationUnitUidsSet = emptySet()
+            allOrganisationUnitUidsSet = emptySet(),
         )
 
         val resourceHandler = getGenericCallData(d2).resourceHandler()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallMockIntegrationShould.kt
index 58625b5be8..a0624bd6a4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCallMockIntegrationShould.kt
@@ -80,14 +80,14 @@ class DataValuePostCallMockIntegrationShould : BaseMockIntegrationTestMetadataEn
             "DiszpKrYNg8",
             "Ok9OQpitjQr",
             "DwrQJzeChWp",
-            "DwrQJzeChWp"
+            "DwrQJzeChWp",
         ).blockingSet(value1)
         d2.dataValueModule().dataValues().value(
             "20191021",
             "DiszpKrYNg8",
             "vANAXwtLwcT",
             "bRowv6yZOF2",
-            "bRowv6yZOF2"
+            "bRowv6yZOF2",
         ).blockingSet(value2)
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt
index dc012f193e..999f59147d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ internal class AggregatedDataSyncStoreIntegrationShould :
     ObjectWithoutUidStoreAbstractIntegrationShould<AggregatedDataSync>(
         AggregatedDataSyncStoreImpl(TestDatabaseAdapterFactory.get()),
         AggregatedDataSyncTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
 
     override fun buildObject(): AggregatedDataSync {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
index 0d02a30f5a..58a4bd0747 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallMockIntegrationShould.kt
@@ -89,8 +89,8 @@ class MetadataCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher
                 ProgramIndicator::class,
                 Indicator::class,
                 LegendSet::class,
-                ExpressionDimensionItem::class
-            ).map { it.java.simpleName }
+                ExpressionDimensionItem::class,
+            ).map { it.java.simpleName },
         )
 
         testObserver.dispose()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
index ef643074d6..6b0bff86c8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventAPIRealShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth.assertThat
-import java.util.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
@@ -40,12 +39,13 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.junit.Assert
 import org.junit.Before
+import java.util.*
 
 @OptIn(ExperimentalCoroutinesApi::class)
 abstract class EventAPIRealShould internal constructor(
     // API version dependant parameters
     private val serverUrl: String,
-    private val strategy: String
+    private val strategy: String,
 ) : BaseRealIntegrationTest() {
     private val ouMode = OrganisationUnitMode.ACCESSIBLE.name
     private lateinit var apiCallExecutor: CoroutineAPICallExecutor
@@ -125,7 +125,7 @@ abstract class EventAPIRealShould internal constructor(
                 eventService.getEvent(
                     invalidEvent.uid(),
                     EventFields.allFields,
-                    ouMode
+                    ouMode,
                 )
             }.getOrThrow()
             Assert.fail("Should not reach that line")
@@ -167,7 +167,7 @@ abstract class EventAPIRealShould internal constructor(
                 eventService.getEvent(
                     invalidEvent.uid(),
                     EventFields.allFields,
-                    ouMode
+                    ouMode,
                 )
             }.getOrThrow()
             Assert.fail("Should not reach that line")
@@ -243,7 +243,7 @@ abstract class EventAPIRealShould internal constructor(
                 eventService.getEvent(
                     invalidEvent.uid(),
                     EventFields.allFields,
-                    ouMode
+                    ouMode,
                 )
             }.getOrThrow()
             Assert.fail("Should not reach that line")
@@ -278,7 +278,7 @@ abstract class EventAPIRealShould internal constructor(
             eventService.getEvent(
                 validEvent.uid(),
                 EventFields.allFields,
-                ouMode
+                ouMode,
             )
         }.getOrThrow()
 
@@ -286,7 +286,7 @@ abstract class EventAPIRealShould internal constructor(
             eventService.getEvent(
                 invalidEvent.uid(),
                 EventFields.allFields,
-                ouMode
+                ouMode,
             )
         }.getOrThrow()
 
@@ -300,7 +300,7 @@ abstract class EventAPIRealShould internal constructor(
         return apiCallExecutor.wrap(
             storeError = false,
             acceptedErrorCodes = listOf(409),
-            errorClass = EventWebResponse::class.java
+            errorClass = EventWebResponse::class.java,
         ) {
             eventService.postEvents(payload, strategy)
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
index a6202eab27..8a71e81593 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventCallFactory.kt
@@ -40,7 +40,7 @@ object EventCallFactory {
         retrofit: Retrofit,
         orgUnit: String?,
         pageSize: Int,
-        uids: Collection<String> = emptyList()
+        uids: Collection<String> = emptyList(),
     ): Payload<Event> {
         val eventQuery = TrackerAPIQuery(
             commonParams = TrackerQueryCommonParams(
@@ -51,15 +51,15 @@ object EventCallFactory {
                 orgUnitsBeforeDivision = emptyList(),
                 limit = 50,
                 ouMode = OrganisationUnitMode.ACCESSIBLE,
-                startDate = null
+                startDate = null,
             ),
             orgUnit = orgUnit,
             pageSize = pageSize,
-            uids = uids
+            uids = uids,
         )
 
         return OldEventEndpointCallFactory(
-            retrofit.create(EventService::class.java)
+            retrofit.create(EventService::class.java),
         ).getCollectionCall(eventQuery)
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt
index c80f03b497..059b8e7be5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class EventDataFilterStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<EventDataFilter>(
     EventDataFilterStoreImpl(TestDatabaseAdapterFactory.get()),
     ItemFilterTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): EventDataFilter {
         return EventDataFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
index 536c3101d1..ba8eb537b1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallBaseMockIntegrationShould.kt
@@ -101,7 +101,7 @@ abstract class EventEndpointCallBaseMockIntegrationShould : BaseMockIntegrationT
             event.toBuilder()
                 .syncState(state)
                 .aggregatedSyncState(state)
-                .status(EventStatus.SKIPPED).build()
+                .status(EventStatus.SKIPPED).build(),
         )
 
         enqueue(events1File)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
index 306399ca1a..5be079db07 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallRealIntegrationShould.kt
@@ -50,7 +50,7 @@ class EventEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
         // TODO: we should create dependant server data verifications in other test suite
         /* verifyNumberOfDownloadedEvents(49);
         verifyNumberOfDownloadedTrackedEntityDataValue(335);
-        */
+         */
     }
 
     // @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
index 4abe32c7ab..ea7996e93e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 internal class EventFilterStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<EventFilter>(
     EventFilterStoreImpl(TestDatabaseAdapterFactory.get()),
     EventFilterTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): EventFilter {
         return EventFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index e8158e3783..1950053b62 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.event.internal
 
 import com.google.common.truth.Truth
 import com.google.common.truth.Truth.assertThat
-import java.util.*
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.helpers.UidGenerator
@@ -43,6 +42,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 import org.junit.Before
+import java.util.*
 
 class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
     private lateinit var eventStore: EventStore
@@ -85,7 +85,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
                 .program(programUid)
                 .programStage(programStageUid)
                 .attributeOptionCombo(attributeOptionCombo)
-                .build()
+                .build(),
         )
         val repo = d2.eventModule().events().uid(eventUid)
         repo.setEventDate(Date())
@@ -137,7 +137,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
                 .status(EventStatus.ACTIVE).program(programUid)
                 .programStage(programStageUid).organisationUnit(orgUnitUid).eventDate(Date())
                 .completedDate(Date()).dueDate(Date()).syncState(State.TO_POST)
-                .attributeOptionCombo(attributeOptionCombo).build()
+                .attributeOptionCombo(attributeOptionCombo).build(),
         )
         val trackedEntityDataValue = TrackedEntityDataValue.builder()
             .event(eventUid)
@@ -162,7 +162,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
             d2.retrofit(),
             orgUnitUid,
             50,
-            emptyList()
+            emptyList(),
         )
         val events = eventPayload.items()
         for (event in events) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostNewMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostNewMockIntegrationShould.kt
index 05183b9f22..93a9718ce6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostNewMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostNewMockIntegrationShould.kt
@@ -38,10 +38,10 @@ class EventPostNewMockIntegrationShould : EventPostBaseMockIntegrationShould() {
     override val exporterVersion = TrackerExporterVersion.V2
     override val importConflictsFile1 = listOf(
         "imports/tracker-importer/job_response.json",
-        "imports/web_response_with_event_import_conflicts_new.json"
+        "imports/web_response_with_event_import_conflicts_new.json",
     )
     override val importConflictsFile2 = listOf(
         "imports/tracker-importer/job_response.json",
-        "imports/web_response_with_event_import_conflicts2_new.json"
+        "imports/web_response_with_event_import_conflicts2_new.json",
     )
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt
index 1685a9a8f1..65ec2438ef 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ class ExpressionDimensionItemStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<ExpressionDimensionItem>(
         ExpressionDimensionItemStoreImpl(TestDatabaseAdapterFactory.get()),
         ExpressionDimensionItemTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
 
     override fun buildObject(): ExpressionDimensionItem {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
index 042283a609..4d8c99cce5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import com.google.common.truth.Truth.assertThat
-import java.io.File
-import java.util.*
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.ValueType
@@ -37,6 +35,8 @@ import org.hisp.dhis.android.core.data.server.RealServerMother
 import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
 import org.hisp.dhis.android.core.fileresource.FileResourceElementType
+import java.io.File
+import java.util.*
 
 class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
 
@@ -142,8 +142,8 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
                 existingEvent.program(),
                 existingEvent.programStage(),
                 existingEvent.organisationUnit(),
-                existingEvent.attributeOptionCombo()
-            )
+                existingEvent.attributeOptionCombo(),
+            ),
         )
         d2.eventModule().events().uid(newEventUid).setEventDate(Date())
 
@@ -204,7 +204,7 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
                 dataValue.organisationUnit()!!,
                 dataValue.dataElement()!!,
                 dataValue.categoryOptionCombo()!!,
-                dataValue.attributeOptionCombo()!!
+                dataValue.attributeOptionCombo()!!,
             )
             .blockingSet(uid)
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineSamples.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineSamples.kt
index 5e078ba931..e07354c938 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineSamples.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineSamples.kt
@@ -29,9 +29,6 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import androidx.test.platform.app.InstrumentationRegistry
-import java.io.File
-import java.util.Calendar
-import java.util.Date
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -52,6 +49,9 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import java.io.File
+import java.util.Calendar
+import java.util.Date
 
 object FileResourceRoutineSamples {
     private val generator = UidGeneratorImpl()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineShould.kt
index 198df4e469..9cf8b5a7e6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceRoutineShould.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import com.google.common.truth.Truth.assertThat
-import java.io.File
 import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.File
 
 @RunWith(D2JunitRunner::class)
 internal class FileResourceRoutineShould : BaseFileResourceRoutineIntegrationShould() {
@@ -46,7 +46,7 @@ internal class FileResourceRoutineShould : BaseFileResourceRoutineIntegrationSho
             fileResourceStore = fileResourceStore,
             trackedEntityAttributeCollectionRepository = d2.trackedEntityModule().trackedEntityAttributes(),
             trackedEntityAttributeValueCollectionRepository = d2.trackedEntityModule().trackedEntityAttributeValues(),
-            trackedEntityDataValueCollectionRepository = d2.trackedEntityModule().trackedEntityDataValues()
+            trackedEntityDataValueCollectionRepository = d2.trackedEntityModule().trackedEntityDataValues(),
         )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
index 9c8b857f6e..51d56f31e8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class FileResourceStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<FileResource>(
     FileResourceStoreImpl(TestDatabaseAdapterFactory.get()),
     FileResourceTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): FileResource {
         return FileResourceSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
index 22d4c30c96..92f889b073 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFact
 class IndicatorStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Indicator>(
     IndicatorStoreImpl(TestDatabaseAdapterFactory.get()),
     IndicatorTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): Indicator {
         return IndicatorSamples.indicator
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
index 928a83cc46..cdbef0b08d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/DataElementLegendSetLinkStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ class DataElementLegendSetLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<DataElementLegendSetLink>(
         DataElementLegendSetLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         DataElementLegendSetLinkTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun addMasterUid(): String {
         return DataElementLegendSetLinkSamples.getDataElementLegendSetLink().dataElement()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt
index b62ef49d9c..54e7056ec9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt
@@ -41,7 +41,7 @@ class IndicatorLegendSetLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<IndicatorLegendSetLink>(
         IndicatorLegendSetLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         IndicatorLegendSetLinkTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun addMasterUid(): String {
         return IndicatorLegendSetLinkSamples.getIndicatorLegendSetLink().indicator()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
index 9981d342c2..e26b52e381 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerShould.kt
@@ -94,7 +94,7 @@ class ForeignKeyCleanerShould : BaseMockIntegrationTestEmptyDispatcher() {
         executor.executeD2CallTransactionally<Any?> {
             ProgramRuleStoreImpl(d2.databaseAdapter()).insert(
                 ProgramRule.builder()
-                    .uid(PROGRAM_RULE_UID).name("Rule").program(program).build()
+                    .uid(PROGRAM_RULE_UID).name("Rule").program(program).build(),
             )
             val programRuleAction = ProgramRuleAction.builder()
                 .uid("action_uid")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt
index dc9ed193f8..fa83afcbeb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerImageryProviderStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith
 class MapLayerImageryProviderStoreIntegrationShould : LinkStoreAbstractIntegrationShould<MapLayerImageryProvider>(
     MapLayerImageryProviderStoreImpl(TestDatabaseAdapterFactory.get()),
     MapLayerImageryProviderTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
 
     override fun addMasterUid(): String {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt
index b682185261..d9eb21bfc6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/map/internal/MapLayerStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith
 class MapLayerStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<MapLayer>(
     MapLayerStoreImpl(TestDatabaseAdapterFactory.get()),
     MapLayerTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): MapLayer {
         return MapLayerSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
index 60b5dafed7..eea6fee900 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import android.content.ContentValues
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Completable
-import java.io.IOException
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
@@ -51,6 +50,7 @@ import org.junit.AfterClass
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.IOException
 
 @RunWith(D2JunitRunner::class)
 class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
@@ -90,8 +90,8 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
             DataSetOrganisationUnitLinkHandler(DataSetOrganisationUnitLinkStoreImpl(databaseAdapter)),
             OrganisationUnitGroupHandler(OrganisationUnitGroupStoreImpl(databaseAdapter)),
             OrganisationUnitOrganisationUnitGroupLinkHandler(
-                OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter)
-            )
+                OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter),
+            ),
         )
         val organisationUnitCollectionCleaner = OrganisationUnitCollectionCleaner(databaseAdapter)
         val pathTransformer = OrganisationUnitDisplayPathTransformer()
@@ -101,7 +101,7 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
             pathTransformer,
             UserOrganisationUnitLinkStoreImpl(databaseAdapter),
             OrganisationUnitStoreImpl(databaseAdapter),
-            organisationUnitCollectionCleaner
+            organisationUnitCollectionCleaner,
         )
             .download(user)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt
index e09cb894a1..6eaa4468e1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodHelperIntegrationShould.kt
@@ -30,12 +30,12 @@ package org.hisp.dhis.android.core.period.internal
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
-import java.util.*
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.*
 
 @RunWith(D2JunitRunner::class)
 class PeriodHelperIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
index dbd523746f..52b9947fe4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ internal class AnalyticsPeriodBoundaryStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<AnalyticsPeriodBoundary>(
         AnalyticsPeriodBoundaryStoreImpl(TestDatabaseAdapterFactory.get()),
         AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): AnalyticsPeriodBoundary {
         return AnalyticsPeriodBoundarySamples.getAnalyticsPeriodBoundary()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
index d97cf78ac7..23842db71e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class ProgramSectionStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<ProgramSection>(
     ProgramSectionStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramSectionTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): ProgramSection {
         return ProgramSectionSamples.programSection
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt
index f168348a8a..fc69c45770 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class ProgramStageSectionStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<ProgramStageSection>(
     ProgramStageSectionStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramStageSectionTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): ProgramStageSection {
         return programStageSection
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt
index 9f5ad7181e..141c7442a8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseProgramIndicatorSQLExecutorIntegrationShould.kt
@@ -52,7 +52,7 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
         ConstantStoreImpl(databaseAdapter),
         DataElementStoreImpl(databaseAdapter),
         TrackedEntityAttributeStoreImpl(databaseAdapter),
-        databaseAdapter
+        databaseAdapter,
     )
 
     protected val helper = BaseTrackerDataIntegrationHelper(databaseAdapter)
@@ -60,7 +60,7 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
     protected fun evaluateTeiCount(
         filter: String? = null,
         periods: List<Period>? = null,
-        boundaries: List<AnalyticsPeriodBoundary>? = null
+        boundaries: List<AnalyticsPeriodBoundary>? = null,
     ): String? {
         return evaluateProgramIndicator(
             expression = `var`("tei_count"),
@@ -68,14 +68,14 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
             analyticsType = AnalyticsType.ENROLLMENT,
             aggregationType = AggregationType.COUNT,
             periods = periods,
-            boundaries = boundaries
+            boundaries = boundaries,
         )
     }
 
     protected fun evaluateEventCount(
         filter: String? = null,
         periods: List<Period>? = null,
-        boundaries: List<AnalyticsPeriodBoundary>? = null
+        boundaries: List<AnalyticsPeriodBoundary>? = null,
     ): String? {
         return evaluateProgramIndicator(
             expression = `var`("event_count"),
@@ -83,7 +83,7 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
             analyticsType = AnalyticsType.EVENT,
             aggregationType = AggregationType.COUNT,
             periods = periods,
-            boundaries = boundaries
+            boundaries = boundaries,
         )
     }
 
@@ -93,19 +93,19 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
         analyticsType: AnalyticsType = AnalyticsType.EVENT,
         aggregationType: AggregationType? = AggregationType.SUM,
         periods: List<Period>? = null,
-        boundaries: List<AnalyticsPeriodBoundary>? = null
+        boundaries: List<AnalyticsPeriodBoundary>? = null,
     ): String? {
         val programIndicator = setProgramIndicator(
             expression = expression,
             filter = filter,
             analyticsType = analyticsType,
             aggregationType = aggregationType,
-            boundaries = boundaries
+            boundaries = boundaries,
         )
 
         val evaluationItem = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(DimensionItem.DataItem.ProgramIndicatorItem(programIndicator.uid())),
-            filters = periods?.map { DimensionItem.PeriodItem.Absolute(it.periodId()!!) } ?: emptyList()
+            filters = periods?.map { DimensionItem.PeriodItem.Absolute(it.periodId()!!) } ?: emptyList(),
         )
 
         return programIndicatorEvaluator.getProgramIndicatorValue(
@@ -113,7 +113,7 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
             metadata = metadata +
                 (programIndicator.uid() to MetadataItem.ProgramIndicatorItem(programIndicator)) +
                 (periods?.associate { it.periodId()!! to MetadataItem.PeriodItem(it) } ?: emptyMap()),
-            queryMods = null
+            queryMods = null,
         )
     }
 
@@ -122,7 +122,7 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
         filter: String? = null,
         analyticsType: AnalyticsType = AnalyticsType.EVENT,
         aggregationType: AggregationType? = AggregationType.SUM,
-        boundaries: List<AnalyticsPeriodBoundary>? = null
+        boundaries: List<AnalyticsPeriodBoundary>? = null,
     ): ProgramIndicator {
         val actualBoundaries: List<AnalyticsPeriodBoundary> =
             boundaries ?: when (analyticsType) {
@@ -155,7 +155,7 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
             AnalyticsPeriodBoundary.builder()
                 .boundaryTarget("EVENT_DATE")
                 .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                .build()
+                .build(),
         )
 
     private val defaultEnrollmentBoundaries: List<AnalyticsPeriodBoundary> =
@@ -167,6 +167,6 @@ internal open class BaseProgramIndicatorSQLExecutorIntegrationShould : BaseEvalu
             AnalyticsPeriodBoundary.builder()
                 .boundaryTarget("ENROLLMENT_DATE")
                 .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                .build()
+                .build(),
         )
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt
index e9116fcf2d..76253ad9be 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/BaseTrackerDataIntegrationHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -48,6 +47,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStoreImpl
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
+import java.util.*
 
 open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: DatabaseAdapter) {
 
@@ -72,7 +72,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         incidentDate: Date? = null,
         created: Date? = null,
         lastUpdated: Date? = null,
-        status: EnrollmentStatus? = EnrollmentStatus.ACTIVE
+        status: EnrollmentStatus? = EnrollmentStatus.ACTIVE,
     ) {
         val enrollment = Enrollment.builder().uid(enrollmentUid).organisationUnit(orgunitUid).program(programUid)
             .enrollmentDate(enrollmentDate).incidentDate(incidentDate).trackedEntityInstance(teiUid)
@@ -90,7 +90,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         eventDate: Date?,
         created: Date? = null,
         lastUpdated: Date? = null,
-        status: EventStatus? = EventStatus.ACTIVE
+        status: EventStatus? = EventStatus.ACTIVE,
     ) {
         val event = Event.builder().uid(eventUid).enrollment(enrollmentUid).created(created).lastUpdated(lastUpdated)
             .program(programUid).programStage(programStageUid).organisationUnit(orgunitUid)
@@ -108,7 +108,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         eventDate: Date? = null,
         created: Date? = null,
         lastUpdated: Date? = null,
-        status: EventStatus? = EventStatus.ACTIVE
+        status: EventStatus? = EventStatus.ACTIVE,
     ) {
         createEvent(
             eventUid = eventUid,
@@ -120,7 +120,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
             created = created,
             lastUpdated = lastUpdated,
             eventDate = eventDate,
-            status = status
+            status = status,
         )
     }
 
@@ -132,7 +132,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         deleted: Boolean = false,
         eventDate: Date? = null,
         lastUpdated: Date? = null,
-        status: EventStatus? = EventStatus.ACTIVE
+        status: EventStatus? = EventStatus.ACTIVE,
     ) {
         createEvent(
             eventUid = eventUid,
@@ -143,14 +143,14 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
             deleted = deleted,
             eventDate = eventDate,
             lastUpdated = lastUpdated,
-            status = status
+            status = status,
         )
     }
 
     fun setProgramIndicatorExpression(
         programIndicatorUid: String,
         programUid: String,
-        expression: String
+        expression: String,
     ) {
         insertProgramIndicator(programIndicatorUid, programUid, expression, AggregationType.AVERAGE)
     }
@@ -159,7 +159,7 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
         programIndicatorUid: String,
         programUid: String,
         expression: String,
-        aggregationType: AggregationType
+        aggregationType: AggregationType,
     ) {
         val programIndicator = ProgramIndicator.builder().uid(programIndicatorUid)
             .program(ObjectWithUid.create(programUid)).expression(expression).aggregationType(aggregationType).build()
@@ -194,13 +194,13 @@ open class BaseTrackerDataIntegrationHelper(private val databaseAdapter: Databas
                 relationship.from()!!.toBuilder()
                     .relationshipItemType(RelationshipConstraintType.FROM)
                     .relationship(r)
-                    .build()
+                    .build(),
             )
             it.insert(
                 relationship.to()!!.toBuilder()
                     .relationshipItemType(RelationshipConstraintType.TO)
                     .relationship(r)
-                    .build()
+                    .build(),
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt
index 6677369c8b..acbb64c9ae 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorBoundariesSQLExecutorIntegrationShould.kt
@@ -73,7 +73,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191102
+            enrollmentDate = day20191102,
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
@@ -82,7 +82,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -92,7 +92,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment2,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191102
+            enrollmentDate = day20191102,
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
@@ -101,7 +101,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20201202
+            eventDate = day20201202,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10")
@@ -111,8 +111,8 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             evaluateProgramIndicator(
                 expression = de(programStage1.uid(), dataElement1.uid()),
                 analyticsType = AnalyticsType.EVENT,
-                periods = listOf(period201912)
-            )
+                periods = listOf(period201912),
+            ),
         ).isEqualTo("10")
 
         assertThat(
@@ -124,9 +124,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget("EVENT_DATE")
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.AFTER_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("20")
 
         assertThat(
@@ -142,9 +142,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget("ENROLLMENT_DATE")
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("30")
 
         assertThat(
@@ -161,9 +161,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget("EVENT_DATE")
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("1")
     }
 
@@ -176,7 +176,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191102
+            enrollmentDate = day20191102,
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
@@ -185,7 +185,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
@@ -194,7 +194,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage2.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "2020-12-03")
@@ -214,9 +214,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget(de(programStage1.uid(), dataElement1.uid()))
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -233,9 +233,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget(de(programStage1.uid(), dataElement1.uid()))
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("1")
     }
 
@@ -248,7 +248,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191102
+            enrollmentDate = day20191102,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -256,7 +256,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -264,7 +264,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage2.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191110
+            eventDate = day20191110,
         )
 
         helper.insertTrackedEntityAttributeValue(trackedEntity1.uid(), attribute1.uid(), "2020-12-03")
@@ -283,9 +283,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget(att(attribute1.uid()))
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("2")
 
         assertThat(
@@ -302,9 +302,9 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                     AnalyticsPeriodBoundary.builder()
                         .boundaryTarget(att(attribute1.uid()))
                         .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         ).isEqualTo("1")
     }
 
@@ -317,7 +317,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191101
+            enrollmentDate = day20191101,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -325,7 +325,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -333,7 +333,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20201202
+            eventDate = day20201202,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -343,7 +343,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment2,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191102
+            enrollmentDate = day20191102,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -351,7 +351,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -359,7 +359,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage2.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191110
+            eventDate = day20191110,
         )
 
         val boundaries = listOf(
@@ -370,7 +370,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             AnalyticsPeriodBoundary.builder()
                 .boundaryTarget(psEventDate(programStage1.uid()))
                 .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
-                .build()
+                .build(),
         )
 
         assertThat(
@@ -379,8 +379,8 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                 analyticsType = AnalyticsType.ENROLLMENT,
                 aggregationType = AggregationType.COUNT,
                 periods = listOf(period201911),
-                boundaries = boundaries
-            )
+                boundaries = boundaries,
+            ),
         ).isEqualTo("0")
 
         assertThat(
@@ -389,8 +389,8 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                 analyticsType = AnalyticsType.ENROLLMENT,
                 aggregationType = AggregationType.COUNT,
                 periods = listOf(period201912),
-                boundaries = boundaries
-            )
+                boundaries = boundaries,
+            ),
         ).isEqualTo("2")
 
         assertThat(
@@ -399,8 +399,8 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                 analyticsType = AnalyticsType.ENROLLMENT,
                 aggregationType = AggregationType.COUNT,
                 periods = listOf(period202001),
-                boundaries = boundaries
-            )
+                boundaries = boundaries,
+            ),
         ).isEqualTo("0")
 
         assertThat(
@@ -409,8 +409,8 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                 analyticsType = AnalyticsType.ENROLLMENT,
                 aggregationType = AggregationType.COUNT,
                 periods = listOf(period202012),
-                boundaries = boundaries
-            )
+                boundaries = boundaries,
+            ),
         ).isEqualTo("1")
     }
 
@@ -423,7 +423,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191101
+            enrollmentDate = day20191101,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -431,7 +431,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -439,7 +439,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20201202
+            eventDate = day20201202,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -449,7 +449,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             enrollment2,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191201
+            enrollmentDate = day20191201,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -457,7 +457,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191201
+            eventDate = day20191201,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -465,7 +465,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
             program.uid(),
             programStage2.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191110
+            eventDate = day20191110,
         )
 
         // Test moving a period backwards
@@ -474,22 +474,22 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         assertThat(
             evaluateEventCount(
                 periods = listOf(period201911),
-                boundaries = previousMonthEventBoundaries
-            )
+                boundaries = previousMonthEventBoundaries,
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateEventCount(
                 periods = listOf(period201912),
-                boundaries = previousMonthEventBoundaries
-            )
+                boundaries = previousMonthEventBoundaries,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateEventCount(
                 periods = listOf(period202001),
-                boundaries = previousMonthEventBoundaries
-            )
+                boundaries = previousMonthEventBoundaries,
+            ),
         ).isEqualTo("2")
 
         // Test moving a period backwards
@@ -497,22 +497,22 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
         assertThat(
             evaluateTeiCount(
                 periods = listOf(period201911),
-                boundaries = previousMonthEnrollmentBoundaries
-            )
+                boundaries = previousMonthEnrollmentBoundaries,
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateTeiCount(
                 periods = listOf(period201912),
-                boundaries = previousMonthEnrollmentBoundaries
-            )
+                boundaries = previousMonthEnrollmentBoundaries,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateTeiCount(
                 periods = listOf(period202001),
-                boundaries = previousMonthEnrollmentBoundaries
-            )
+                boundaries = previousMonthEnrollmentBoundaries,
+            ),
         ).isEqualTo("1")
 
         // Test adding periods before the start and after the end
@@ -528,14 +528,14 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                 .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
                 .offsetPeriods(15)
                 .offsetPeriodType(PeriodType.Monthly)
-                .build()
+                .build(),
         )
 
         assertThat(
             evaluateEventCount(
                 periods = listOf(period201912),
-                boundaries = wideRangeBoundaries
-            )
+                boundaries = wideRangeBoundaries,
+            ),
         ).isEqualTo("4")
     }
 
@@ -552,7 +552,7 @@ internal class ProgramIndicatorBoundariesSQLExecutorIntegrationShould :
                 .analyticsPeriodBoundaryType(AnalyticsPeriodBoundaryType.BEFORE_END_OF_REPORTING_PERIOD)
                 .offsetPeriods(-1)
                 .offsetPeriodType(PeriodType.Monthly)
-                .build()
+                .build(),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
index 46dca04b79..01b56e37c3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorEngineIntegrationShould.kt
@@ -29,9 +29,6 @@ package org.hisp.dhis.android.core.program.programindicatorengine
 
 import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 import org.hisp.dhis.android.core.category.internal.CreateCategoryComboUtils
@@ -57,6 +54,9 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreI
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.junit.*
 import org.junit.runner.RunWith
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
@@ -195,19 +195,19 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
             eventUid = event1,
             programStageUid = programStage1,
             eventDate = twoDaysBefore(),
-            lastUpdated = today()
+            lastUpdated = today(),
         )
         createTrackerEvent(
             eventUid = event2,
             programStageUid = programStage1,
             eventDate = today(),
-            lastUpdated = today()
+            lastUpdated = today(),
         )
         createTrackerEvent(
             eventUid = event3,
             programStageUid = programStage1,
             eventDate = twoDaysBefore(),
-            lastUpdated = today()
+            lastUpdated = today(),
         )
         insertTrackedEntityDataValue(event1, dataElement1, "1")
         insertTrackedEntityDataValue(event2, dataElement1, "2") // Expected as last value
@@ -225,19 +225,19 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
             eventUid = event1,
             programStageUid = programStage1,
             eventDate = eventDate,
-            lastUpdated = twoDaysBefore()
+            lastUpdated = twoDaysBefore(),
         )
         createTrackerEvent(
             eventUid = event2,
             programStageUid = programStage1,
             eventDate = eventDate,
-            lastUpdated = today()
+            lastUpdated = today(),
         )
         createTrackerEvent(
             eventUid = event3,
             programStageUid = programStage1,
             eventDate = eventDate,
-            lastUpdated = twoDaysBefore()
+            lastUpdated = twoDaysBefore(),
         )
         insertTrackedEntityDataValue(event1, dataElement1, "1")
         insertTrackedEntityDataValue(event2, dataElement1, "2") // Expected as last value
@@ -257,11 +257,11 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
         insertTrackedEntityAttributeValue(attribute1, "2")
         setProgramIndicatorExpression(
             "(${de(programStage1, dataElement1)} + ${de(programStage2, dataElement2)})" +
-                " / ${att(attribute1)}"
+                " / ${att(attribute1)}",
         )
         val enrollmentValue = programIndicatorEngine.getEnrollmentProgramIndicatorValue(
             enrollmentUid,
-            programIndicatorUid
+            programIndicatorUid,
         )
         val event1Value = programIndicatorEngine.getEventProgramIndicatorValue(event1, programIndicatorUid)
         val event2Value = programIndicatorEngine.getEventProgramIndicatorValue(event2, programIndicatorUid)
@@ -279,7 +279,7 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
         setProgramIndicatorExpression(`var`("event_count"))
         val result = programIndicatorEngine.getEnrollmentProgramIndicatorValue(
             enrollmentUid,
-            programIndicatorUid
+            programIndicatorUid,
         )
         assertThat(result).isEqualTo("2")
     }
@@ -291,7 +291,7 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
         insertTrackedEntityDataValue(event1, dataElement1, "4.8")
         insertTrackedEntityDataValue(event1, dataElement2, "3")
         setProgramIndicatorExpression(
-            "d2:round(${de(programStage1, dataElement1)}) * ${de(programStage1, dataElement2)}"
+            "d2:round(${de(programStage1, dataElement1)}) * ${de(programStage1, dataElement2)}",
         )
         val result = programIndicatorEngine.getEnrollmentProgramIndicatorValue(enrollmentUid, programIndicatorUid)
         assertThat(result).isEqualTo("15")
@@ -327,7 +327,7 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
         programStageUid: String,
         deleted: Boolean = false,
         eventDate: Date? = null,
-        lastUpdated: Date? = null
+        lastUpdated: Date? = null,
     ) {
         helper.createEvent(
             eventUid = eventUid,
@@ -337,7 +337,7 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
             orgunitUid = orgunitUid,
             deleted = deleted,
             eventDate = eventDate,
-            lastUpdated = lastUpdated
+            lastUpdated = lastUpdated,
         )
     }
 
@@ -346,7 +346,7 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
         programStageUid: String,
         deleted: Boolean = false,
         eventDate: Date? = null,
-        lastUpdated: Date? = null
+        lastUpdated: Date? = null,
     ) {
         helper.createEvent(
             eventUid = eventUid,
@@ -356,7 +356,7 @@ class ProgramIndicatorEngineIntegrationShould : BaseMockIntegrationTestEmptyDisp
             orgunitUid = orgunitUid,
             deleted = deleted,
             eventDate = eventDate,
-            lastUpdated = lastUpdated
+            lastUpdated = lastUpdated,
         )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt
index 889eadf6dd..d1808d9349 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/programindicatorengine/ProgramIndicatorSQLExecutorIntegrationShould.kt
@@ -77,7 +77,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild1.uid(), trackedEntityType.uid())
@@ -90,7 +90,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "10")
@@ -100,16 +100,16 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = de(programStage1.uid(), dataElement1.uid()),
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("15")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = de(programStage1.uid(), dataElement1.uid()),
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("15")
     }
 
@@ -121,8 +121,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         assertThat(
             evaluateProgramIndicator(
                 expression = cons(constant1.uid()),
-                analyticsType = AnalyticsType.EVENT
-            )
+                analyticsType = AnalyticsType.EVENT,
+            ),
         ).isEqualTo("10")
     }
 
@@ -138,21 +138,21 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         assertThat(
             evaluateProgramIndicator(
                 expression = att(attribute1.uid()),
-                analyticsType = AnalyticsType.EVENT
-            )
+                analyticsType = AnalyticsType.EVENT,
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = att(attribute1.uid()),
-                analyticsType = AnalyticsType.ENROLLMENT
-            )
+                analyticsType = AnalyticsType.ENROLLMENT,
+            ),
         ).isEqualTo("0")
 
         helper.insertTrackedEntityAttributeValue(trackedEntity1.uid(), attribute1.uid(), "8")
@@ -160,15 +160,15 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
         assertThat(
             evaluateProgramIndicator(
                 expression = att(attribute1.uid()),
-                analyticsType = AnalyticsType.EVENT
-            )
+                analyticsType = AnalyticsType.EVENT,
+            ),
         ).isEqualTo("8")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = att(attribute1.uid()),
-                analyticsType = AnalyticsType.ENROLLMENT
-            )
+                analyticsType = AnalyticsType.ENROLLMENT,
+            ),
         ).isEqualTo("8")
     }
 
@@ -184,54 +184,54 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment1,
             program.uid(),
             programStage1.uid(),
-            orgunitChild1.uid()
+            orgunitChild1.uid(),
         )
         helper.createTrackerEvent(
             generator.generate(),
             enrollment1,
             program.uid(),
             programStage1.uid(),
-            orgunitChild1.uid()
+            orgunitChild1.uid(),
         )
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("tei_count"),
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("tei_count"),
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("enrollment_count"),
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("enrollment_count"),
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("2")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("event_count"),
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("2")
 
         // This use case is not supported. DHIS2 backend does not support it neither (2.36)
@@ -239,8 +239,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = `var`("event_count"),
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
     }
 
@@ -253,7 +253,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191101
+            enrollmentDate = day20191101,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -261,7 +261,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20201202
+            eventDate = day20201202,
         )
 
         val dateDiff = "${`var`("enrollment_date")}, ${`var`("event_date")}"
@@ -270,40 +270,40 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "d2:yearsBetween($dateDiff)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:monthsBetween($dateDiff)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("13")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:weeksBetween($dateDiff)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("56")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:daysBetween($dateDiff)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("397")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:minutesBetween($dateDiff)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("571680")
     }
 
@@ -316,7 +316,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191101
+            enrollmentDate = day20191101,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -324,7 +324,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -332,7 +332,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage2.uid(),
             orgunitChild1.uid(),
-            eventDate = day20201202
+            eventDate = day20201202,
         )
 
         assertThat(
@@ -340,8 +340,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = "d2:monthsBetween(${`var`("enrollment_date")}, " +
                     "PS_EVENTDATE:${programStage2.uid()})",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("13")
     }
 
@@ -359,16 +359,16 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "d2:condition('${de(programStage1.uid(), dataElement1.uid())} > 10', 10, -10)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("10")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:condition('${de(programStage1.uid(), dataElement1.uid())} < 10', 10, -10)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("-10")
     }
 
@@ -392,24 +392,24 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "d2:count(${de(programStage1.uid(), dataElement1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("2")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:countIfCondition(${de(programStage1.uid(), dataElement1.uid())}, '< 15')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:countIfCondition(${de(programStage1.uid(), dataElement1.uid())}, '< 5')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("0")
 
         assertThat(
@@ -417,24 +417,24 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = "d2:countIfCondition(${de(programStage1.uid(), dataElement1.uid())}, " +
                     "'< ${de(programStage1.uid(), dataElement2.uid())}')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:countIfValue(${de(programStage1.uid(), dataElement1.uid())}, 10)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:countIfValue(${de(programStage1.uid(), dataElement3.uid())}, 'POSITIVE')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
     }
 
@@ -457,8 +457,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "d2:hasValue(${de(programStage1.uid(), dataElement1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -466,8 +466,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "d2:hasValue(${de(programStage1.uid(), dataElement2.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("2")
     }
 
@@ -485,7 +485,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = eventDate1
+            eventDate = eventDate1,
         )
 
         val event2 = generator.generate()
@@ -496,7 +496,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = eventDate2
+            eventDate = eventDate2,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "1")
@@ -518,28 +518,28 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             Triple("d2:minValue(${de(programStage1.uid(), dataElement3.uid())})", AnalyticsType.EVENT, "500"),
             Triple("d2:minValue(${de(programStage1.uid(), dataElement1.uid())})", AnalyticsType.ENROLLMENT, "1"),
             Triple("d2:minValue(${de(programStage1.uid(), dataElement2.uid())})", AnalyticsType.ENROLLMENT, "10"),
-            Triple("d2:minValue(${de(programStage1.uid(), dataElement3.uid())})", AnalyticsType.ENROLLMENT, "500")
+            Triple("d2:minValue(${de(programStage1.uid(), dataElement3.uid())})", AnalyticsType.ENROLLMENT, "500"),
         ).forEach {
             assertThat(
                 evaluateProgramIndicator(
                     expression = it.first,
-                    analyticsType = it.second
-                )
+                    analyticsType = it.second,
+                ),
             ).isEqualTo(it.third)
         }
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:daysBetween('2023-02-01', d2:maxValue(PS_EVENTDATE:${programStage1.uid()}))",
-                analyticsType = AnalyticsType.ENROLLMENT
-            )
+                analyticsType = AnalyticsType.ENROLLMENT,
+            ),
         ).isEqualTo("5")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:daysBetween('2023-02-01', d2:minValue(PS_EVENTDATE:${programStage1.uid()}))",
-                analyticsType = AnalyticsType.ENROLLMENT
-            )
+                analyticsType = AnalyticsType.ENROLLMENT,
+            ),
         ).isEqualTo("2")
     }
 
@@ -560,24 +560,24 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = "firstNonNull(${de(programStage1.uid(), dataElement1.uid())}, " +
                     "${de(programStage1.uid(), dataElement2.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("10")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "if(isNull(${de(programStage1.uid(), dataElement1.uid())}), '50', '500')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("100")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "if(isNotNull(${de(programStage1.uid(), dataElement1.uid())}), '50', '500')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1000")
     }
 
@@ -598,24 +598,24 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "if(is($textDe in 'ONE', 'TWO', 'THREE'), 1, 2)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "if(is($textDe in  'TWO', 'THREE'), 1, 2)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("2")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "if(is($nullD2 in  'ONE', 'TWO', 'THREE'), 1, 2)",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("2")
     }
 
@@ -639,8 +639,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "${de(programStage1.uid(), dataElement1.uid())} > 3",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -648,8 +648,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "${de(programStage1.uid(), dataElement2.uid())} > 3",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("2")
     }
 
@@ -662,7 +662,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            status = EnrollmentStatus.COMPLETED
+            status = EnrollmentStatus.COMPLETED,
         )
         val enrollment2 = generator.generate()
         helper.createEnrollment(
@@ -670,7 +670,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment2,
             program.uid(),
             orgunitChild1.uid(),
-            status = EnrollmentStatus.ACTIVE
+            status = EnrollmentStatus.ACTIVE,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -678,7 +678,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            status = EventStatus.COMPLETED
+            status = EventStatus.COMPLETED,
         )
         helper.createTrackerEvent(
             generator.generate(),
@@ -686,7 +686,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage2.uid(),
             orgunitChild1.uid(),
-            status = EventStatus.ACTIVE
+            status = EventStatus.ACTIVE,
         )
 
         assertThat(
@@ -694,8 +694,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("enrollment_count"),
                 filter = "${`var`("enrollment_status")} == 'COMPLETED'",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -703,8 +703,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "${`var`("event_status")} == 'COMPLETED'",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
     }
 
@@ -727,8 +727,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = expression,
                 filter = "${`var`("value_count")} >= 2",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("6")
 
         assertThat(
@@ -736,8 +736,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = expression,
                 filter = "${`var`("value_count")} < 2",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isNull()
 
         assertThat(
@@ -745,8 +745,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = expression,
                 filter = "${`var`("zero_pos_value_count")} >= 1",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("6")
 
         assertThat(
@@ -754,8 +754,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = expression,
                 filter = "${`var`("zero_pos_value_count")} < 1",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isNull()
     }
 
@@ -774,32 +774,32 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "d2:oizp(${de(programStage1.uid(), dataElement1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:oizp(${de(programStage1.uid(), dataElement1.uid())} + ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:zing(${de(programStage1.uid(), dataElement1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:zing(${de(programStage1.uid(), dataElement1.uid())} + ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("6")
 
         assertThat(
@@ -807,16 +807,16 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = "d2:zpvc(${de(programStage1.uid(), dataElement1.uid())}, " +
                     "${de(programStage1.uid(), dataElement2.uid())}, ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:zing(d2:oizp(d2:zpvc(${att(attribute1.uid())})))",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
     }
 
@@ -835,32 +835,32 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "greatest(${de(programStage1.uid(), dataElement1.uid())}, ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("12")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "greatest(${de(programStage1.uid(), dataElement2.uid())}, ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("3")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "least(${de(programStage1.uid(), dataElement1.uid())}, ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("3")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "least(${de(programStage1.uid(), dataElement2.uid())}, ${att(attribute1.uid())})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("3")
     }
 
@@ -879,8 +879,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("tei_count"),
                 filter = "${de(programStage1.uid(), dataElement3.uid())} == 'POSITIVE'",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
     }
 
@@ -900,8 +900,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "${de(programStage1.uid(), dataElement4.uid())} == true",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -909,8 +909,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("event_count"),
                 filter = "(${de(programStage1.uid(), dataElement1.uid())} > 0) == true",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
     }
 
@@ -926,7 +926,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
@@ -935,7 +935,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191102
+            eventDate = day20191102,
         )
         val event3 = generator.generate()
         helper.createTrackerEvent(
@@ -944,7 +944,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20201202
+            eventDate = day20201202,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "1")
@@ -954,8 +954,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = de(programStage1.uid(), dataElement1.uid()),
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("2")
     }
 
@@ -971,7 +971,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         assertThat(
@@ -979,8 +979,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("tei_count"),
                 filter = "${`var`("program_stage_id")} == '${programStage1.uid()}'",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -988,8 +988,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("tei_count"),
                 filter = "${`var`("program_stage_id")} == '${programStage1.uid()}'",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -997,8 +997,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("tei_count"),
                 filter = "${`var`("program_stage_name")} == '${programStage1.name()}'",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
@@ -1006,8 +1006,8 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
                 expression = `var`("tei_count"),
                 filter = "${`var`("program_stage_name")} == '${programStage1.name()}'",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
     }
 
@@ -1020,7 +1020,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment1,
             program.uid(),
             orgunitChild1.uid(),
-            enrollmentDate = day20191102
+            enrollmentDate = day20191102,
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
@@ -1029,35 +1029,35 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191110
+            eventDate = day20191110,
         )
 
         assertThat(
             evaluateTeiCount(
                 filter = "d2:daysBetween(${`var`("analytics_period_start")}, ${`var`("event_date")}) < 15",
-                listOf(period201911)
-            )
+                listOf(period201911),
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateTeiCount(
                 filter = "d2:daysBetween(${`var`("analytics_period_start")}, ${`var`("event_date")}) < 5",
-                listOf(period201911)
-            )
+                listOf(period201911),
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateTeiCount(
                 filter = "d2:daysBetween(${`var`("event_date")}, ${`var`("analytics_period_end")}) < 5",
-                listOf(period201911)
-            )
+                listOf(period201911),
+            ),
         ).isEqualTo("0")
 
         assertThat(
             evaluateTeiCount(
                 filter = "d2:daysBetween(${`var`("event_date")}, ${`var`("analytics_period_end")}) < 24",
-                listOf(period201911)
-            )
+                listOf(period201911),
+            ),
         ).isEqualTo("1")
     }
 
@@ -1073,7 +1073,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild1.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
@@ -1082,23 +1082,23 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             programStage1.uid(),
             orgunitChild2.uid(),
-            eventDate = day20191101
+            eventDate = day20191101,
         )
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("org_unit_count"),
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = `var`("org_unit_count"),
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.COUNT
-            )
+                aggregationType = AggregationType.COUNT,
+            ),
         ).isEqualTo("2")
     }
 
@@ -1112,14 +1112,14 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment1,
             program.uid(),
             programStage1.uid(),
-            orgunitChild1.uid()
+            orgunitChild1.uid(),
         )
         helper.createTrackerEvent(
             generator.generate(),
             enrollment1,
             program.uid(),
             programStage1.uid(),
-            orgunitChild1.uid()
+            orgunitChild1.uid(),
         )
 
         helper.createTrackedEntity(trackedEntity2.uid(), orgunitChild2.uid(), trackedEntityType.uid())
@@ -1130,7 +1130,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             enrollment2,
             program.uid(),
             programStage1.uid(),
-            orgunitChild2.uid()
+            orgunitChild2.uid(),
         )
 
         helper.createRelationship(relationshipType.uid(), trackedEntity1.uid(), trackedEntity2.uid())
@@ -1139,32 +1139,32 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "d2:relationshipCount()",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("2")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:relationshipCount('${relationshipType.uid()}')",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("2")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:relationshipCount()",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("3")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:relationshipCount('${relationshipType.uid()}')",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("3")
     }
 
@@ -1178,7 +1178,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             orgunitChild1.uid(),
             created = day20191101,
-            lastUpdated = day20191102
+            lastUpdated = day20191102,
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
@@ -1188,23 +1188,23 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             programStage1.uid(),
             orgunitChild1.uid(),
             created = day20191101,
-            lastUpdated = day20191110
+            lastUpdated = day20191110,
         )
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:daysBetween(${`var`("creation_date")}, ${`var`("sync_date")})",
                 analyticsType = AnalyticsType.ENROLLMENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("1")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "d2:daysBetween(${`var`("creation_date")}, ${`var`("sync_date")})",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("9")
     }
 
@@ -1218,7 +1218,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             program.uid(),
             orgunitChild1.uid(),
             created = day20191101,
-            lastUpdated = day20191102
+            lastUpdated = day20191102,
         )
         val event1 = generator.generate()
         helper.createTrackerEvent(
@@ -1228,7 +1228,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             programStage1.uid(),
             orgunitChild1.uid(),
             created = day20191101,
-            lastUpdated = day20191110
+            lastUpdated = day20191110,
         )
         val event2 = generator.generate()
         helper.createTrackerEvent(
@@ -1238,7 +1238,7 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             programStage1.uid(),
             orgunitChild1.uid(),
             created = day20191101,
-            lastUpdated = day20191110
+            lastUpdated = day20191110,
         )
 
         helper.insertTrackedEntityDataValue(event1, dataElement1.uid(), "4")
@@ -1248,16 +1248,16 @@ internal class ProgramIndicatorSQLExecutorIntegrationShould : BaseProgramIndicat
             evaluateProgramIndicator(
                 expression = "${de(programStage1.uid(), dataElement1.uid())} + 100",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.SUM
-            )
+                aggregationType = AggregationType.SUM,
+            ),
         ).isEqualTo("211")
 
         assertThat(
             evaluateProgramIndicator(
                 expression = "${de(programStage1.uid(), dataElement1.uid())} % 5",
                 analyticsType = AnalyticsType.EVENT,
-                aggregationType = AggregationType.AVERAGE
-            )
+                aggregationType = AggregationType.AVERAGE,
+            ),
         ).isEqualTo("3")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt
index 377c5179be..4dc696ead2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ class ProgramStageWorkingListAttributeValueFilterStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<ProgramStageWorkingListAttributeValueFilter>(
         ProgramStageWorkingListAttributeValueFilterStoreImpl(TestDatabaseAdapterFactory.get()),
         ItemFilterTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): ProgramStageWorkingListAttributeValueFilter {
         return ProgramStageWorkingListAttributeValueFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt
index f83c8ea608..c54514aefa 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListEventDataFilterStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ class ProgramStageWorkingListEventDataFilterStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<ProgramStageWorkingListEventDataFilter>(
         ProgramStageWorkingListEventDataFilterStoreImpl(TestDatabaseAdapterFactory.get()),
         ItemFilterTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): ProgramStageWorkingListEventDataFilter {
         return ProgramStageWorkingListEventDataFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt
index 9a0df42094..6693d451f7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListStoreIntegrationShould.kt
@@ -41,7 +41,7 @@ class ProgramStageWorkingListStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<ProgramStageWorkingList>(
         ProgramStageWorkingListStoreImpl(TestDatabaseAdapterFactory.get()),
         ProgramStageWorkingListTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
 
     override fun buildObject(): ProgramStageWorkingList {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt
index 2e7e8de58c..9c95891f72 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreIntegrationShould.kt
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith
 class RelationshipItemStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<RelationshipItem>(
     RelationshipItemStoreImpl(TestDatabaseAdapterFactory.get()),
     RelationshipItemTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
 
     private val relationshipItemStore = store as RelationshipItemStore
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt
index c16b924c95..938f26556b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreIntegrationShould.kt
@@ -41,7 +41,7 @@ class AnalyticsDhisVisualizationStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<AnalyticsDhisVisualization>(
         AnalyticsDhisVisualizationStoreImpl(TestDatabaseAdapterFactory.get()),
         AnalyticsDhisVisualizationTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): AnalyticsDhisVisualization {
         return AnalyticsSettingsSamples.analyticsDhisVisualization
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt
index b4c306dd46..fe1291a82f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class AnalyticsTeiAttributeStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiAttribute>(
     AnalyticsTeiAttributeStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiAttributeTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): AnalyticsTeiAttribute {
         return AnalyticsSettingsSamples.analyticsTeiAttribute
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt
index db9a49bba6..1811fbc1f0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class AnalyticsTeiDataElementStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiDataElement>(
     AnalyticsTeiDataElementStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiDataElementTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): AnalyticsTeiDataElement {
         return AnalyticsSettingsSamples.analyticsTeiDataElementSample
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt
index bb3254cefd..514d69a337 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class AnalyticsTeiIndicatorStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiIndicator>(
     AnalyticsTeiIndicatorStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiIndicatorTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): AnalyticsTeiIndicator {
         return AnalyticsSettingsSamples.analyticsTeiIndicator
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt
index 91e3a26c84..0653ffe833 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class AnalyticsTeiSettingStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AnalyticsTeiSetting>(
     AnalyticsTeiSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     AnalyticsTeiSettingTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): AnalyticsTeiSetting {
         return AnalyticsSettingsSamples.analyticsTeiSetting
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt
index ff557831ef..aa860e9071 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ class AnalyticsTeiWHONutritionDataStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<AnalyticsTeiWHONutritionData>(
         AnalyticsTeiWHONutritionDataStoreImpl(TestDatabaseAdapterFactory.get()),
         AnalyticsTeiWHONutritionDataTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): AnalyticsTeiWHONutritionData {
         return AnalyticsSettingsSamples.analyticsTeiWHONutritionData
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt
index 6318dc701a..99bf9a1349 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith
 class FilterSettingStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<FilterSetting>(
     FilterSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     FilterSettingTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): FilterSetting {
         return FilterSettingSamples.getFilterSetting()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt
index 96f789ec67..05d81520ba 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingsStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class GeneralSettingsStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<GeneralSettings>(
     GeneralSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     GeneralSettingTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): GeneralSettings {
         return GeneralSettingsSamples.getGeneralSettings()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt
index 33438aa224..7dda0be4eb 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class LatestAppVersionStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<LatestAppVersion>(
     LatestAppVersionStoreImpl(TestDatabaseAdapterFactory.get()),
     LatestAppVersionTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): LatestAppVersion {
         return latestAppVersion
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt
index 32d00c7666..f5075621d8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ class ProgramConfigurationSettingStoreIntegrationShould :
     ObjectStoreAbstractIntegrationShould<ProgramConfigurationSetting>(
         ProgramConfigurationSettingStoreImpl(TestDatabaseAdapterFactory.get()),
         ProgramConfigurationSettingTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): ProgramConfigurationSetting {
         return ProgramConfigurationSettingSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt
index 1d7c795751..b9836cfb07 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class SynchronizationSettingsStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<SynchronizationSettings>(
     SynchronizationSettingStoreImpl(TestDatabaseAdapterFactory.get()),
     SynchronizationSettingTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): SynchronizationSettings {
         return SynchronizationSettingsSamples.getSynchronizationSettings()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt
index 5371cf7ccf..dfb25f8b1c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 class SMSConfigStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<KeyValuePair>(
     SMSConfigStoreImpl(TestDatabaseAdapterFactory.get()),
     SMSConfigTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): KeyValuePair {
         return keyValuePairSample
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt
index c9c62033ab..9e187a7897 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class SMSMetadataIdStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<SMSMetadataId>(
     SMSMetadataIdStoreImpl(TestDatabaseAdapterFactory.get()),
     SMSMetadataIdTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): SMSMetadataId {
         return SMSMetadataIdSample.get
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt
index 2649d2b8ea..8328864027 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreIntegrationShould.kt
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith
 class SMSOngoingSubmissionStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<SMSOngoingSubmission>(
     SMSOngoingSubmissionStoreImpl(TestDatabaseAdapterFactory.get()),
     SMSOngoingSubmissionTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): SMSOngoingSubmission {
         return SMSOngoingSubmissionSample.get
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 132d88e64d..5b55e5bd16 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import com.google.common.truth.Truth
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -60,6 +59,7 @@ import org.mockito.ArgumentMatchers
 import org.mockito.Captor
 import org.mockito.Mock
 import org.mockito.Mockito
+import java.util.concurrent.Callable
 
 @SuppressWarnings("MaxLineLength")
 class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
@@ -72,8 +72,10 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
     private var pattern: String? = null
 
     @Mock
-    val trackedEntityAttributeReservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
-        TrackedEntityAttributeReservedValueQuery>? =
+    val trackedEntityAttributeReservedValueQueryCallFactory: QueryCallFactory<
+        TrackedEntityAttributeReservedValue,
+        TrackedEntityAttributeReservedValueQuery,
+        >? =
         null
 
     @Mock
@@ -118,7 +120,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
 
         pattern = "CURRENT_DATE(YYYYMM) + \"-\" + CURRENT_DATE(ww) + ORG_UNIT_CODE(...)"
         trackedEntityAttributeStore.updateOrInsert(
-            TrackedEntityAttribute.builder().uid(ownerUid).pattern(pattern).build()
+            TrackedEntityAttribute.builder().uid(ownerUid).pattern(pattern).build(),
         )
         val categoryCombo = CategoryCombo.builder().uid(categoryComboUid).build()
         d2.databaseAdapter()
@@ -133,20 +135,20 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
             .program(ObjectWithUid.create(programUid))
             .build()
         ProgramTrackedEntityAttributeStoreImpl(d2.databaseAdapter()).insert(
-            programTrackedEntityAttribute
+            programTrackedEntityAttribute,
         )
         val organisationUnitProgramLink =
             OrganisationUnitProgramLink.builder().organisationUnit(organisationUnitUid)
                 .program(programUid).build()
         OrganisationUnitProgramLinkStoreImpl(d2.databaseAdapter()).insert(
-            organisationUnitProgramLink
+            organisationUnitProgramLink,
         )
         Mockito.`when`(
             trackedEntityAttributeReservedValueQueryCallFactory!!.create(
                 ArgumentMatchers.any(
-                    TrackedEntityAttributeReservedValueQuery::class.java
-                )
-            )
+                    TrackedEntityAttributeReservedValueQuery::class.java,
+                ),
+            ),
         )
             .thenReturn(trackedEntityAttributeReservedValueCall)
         handler.handleMany(trackedEntityAttributeReservedValues)
@@ -263,8 +265,9 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
         d2.metadataModule().blockingDownload()
         d2.trackedEntityModule().reservedValueManager().blockingDownloadAllReservedValues(null)
 
-        /* 100 Reserved values by default * 2 TEA with generated property true on server = 200 */Truth.assertThat(
-            selectAll().size
+        /* 100 Reserved values by default * 2 TEA with generated property true on server = 200 */
+        Truth.assertThat(
+            selectAll().size,
         ).isEqualTo(200)
     }
 
@@ -342,7 +345,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
      */
     private fun assertQueryIsCreatedRight(numberOfValuesExpected: Int) {
         Mockito.verify(trackedEntityAttributeReservedValueQueryCallFactory)!!.create(
-            trackedEntityAttributeReservedValueQueryCaptor!!.capture()
+            trackedEntityAttributeReservedValueQueryCaptor!!.capture(),
         )
         val query = trackedEntityAttributeReservedValueQueryCaptor.value
         Truth.assertThat(query.organisationUnit()!!.uid()).isEqualTo(organisationUnit!!.uid())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
index 1f7188d7e3..d02d2b6be8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.api
 
 import com.google.common.truth.Truth.assertThat
-import java.util.Arrays
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
@@ -50,6 +49,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePa
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipService
 import org.junit.Before
+import java.util.Arrays
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
@@ -87,7 +87,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
         super.setUp()
         executor = d2.coroutineAPICallExecutor()
         trackedEntityInstanceService = d2.retrofit().create(
-            TrackedEntityInstanceService::class.java
+            TrackedEntityInstanceService::class.java,
         )
         ownershipService = d2.retrofit().create(OwnershipService::class.java)
         login()
@@ -143,7 +143,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
             TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
             TrackedEntityInstanceUtils.assertEnrollments(
                 importSummary,
-                ImportStatus.SUCCESS
+                ImportStatus.SUCCESS,
             ) // Because it is the first upload.Ownership is not defined
             TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.ERROR) // It takes enrollment ownership
         }
@@ -154,7 +154,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
             TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
             TrackedEntityInstanceUtils.assertEnrollments(
                 importSummary,
-                ImportStatus.ERROR
+                ImportStatus.ERROR,
             ) // Because ownership was previously set
         }
     }
@@ -170,7 +170,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
             TrackedEntityInstanceUtils.assertTei(importSummary, ImportStatus.SUCCESS)
             TrackedEntityInstanceUtils.assertEnrollments(
                 importSummary,
-                ImportStatus.SUCCESS
+                ImportStatus.SUCCESS,
             ) // Because it is the first upload.Ownership is not defined
             TrackedEntityInstanceUtils.assertEvents(importSummary, ImportStatus.ERROR) // It takes enrollment ownership
         }
@@ -202,8 +202,8 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
                     TrackedEntityAttributeValue.builder()
                         .trackedEntityAttribute(attribute2)
                         .value("TrackedEntity")
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .build()
     }
@@ -239,11 +239,11 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
                     listOf(
                         validEvent().toBuilder()
                             .organisationUnit(searchOrgunit)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                    .build()
-            )
+                    .build(),
+            ),
         )
             .build()
     }
@@ -253,8 +253,8 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
             validTei().toBuilder(),
             listOf(
                 EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(), listOf(validEvent()))
-                    .organisationUnit(searchOrgunit).build()
-            )
+                    .organisationUnit(searchOrgunit).build(),
+            ),
         )
             .build()
     }
@@ -269,7 +269,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
         return executor.wrap(
             storeError = false,
             acceptedErrorCodes = listOf(409),
-            errorClass = TEIWebResponse::class.java
+            errorClass = TEIWebResponse::class.java,
         ) {
             trackedEntityInstanceService
                 .postTrackedEntityInstances(wrapPayload(*instances), strategy)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
index d2b47b8cd3..8903a73c19 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceAPIShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.api
 
 import com.google.common.truth.Truth.assertThat
-import java.util.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
@@ -50,12 +49,13 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePa
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.junit.Assert
 import org.junit.Before
+import java.util.*
 
 @OptIn(ExperimentalCoroutinesApi::class)
 abstract class TrackedEntityInstanceAPIShould internal constructor(
     // API version dependant parameters
     private val serverUrl: String,
-    private val strategy: String
+    private val strategy: String,
 ) : BaseRealIntegrationTest() {
     private lateinit var executor: CoroutineAPICallExecutor
     private lateinit var trackedEntityInstanceService: TrackedEntityInstanceService
@@ -65,7 +65,7 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         super.setUp()
         executor = d2.coroutineAPICallExecutor()
         trackedEntityInstanceService = d2.retrofit().create(
-            TrackedEntityInstanceService::class.java
+            TrackedEntityInstanceService::class.java,
         )
     }
 
@@ -309,13 +309,13 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0]).size).isEqualTo(1)
         assertThat(
             getEvents(getEnrollments(serverValidTEI1.items()[0])[0])[0]!!
-                .trackedEntityDataValues()!!.size
+                .trackedEntityDataValues()!!.size,
         ).isEqualTo(1)
         assertThat(getEnrollments(serverValidTEI2.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI2.items()[0])[0]).size).isEqualTo(1)
         assertThat(
             getEvents(getEnrollments(serverValidTEI2.items()[0])[0])[0]!!
-                .trackedEntityDataValues()
+                .trackedEntityDataValues(),
         ).isEmpty()
     }
 
@@ -345,13 +345,13 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0]).size).isEqualTo(1)
         assertThat(
             getEvents(getEnrollments(serverValidTEI1.items()[0])[0])[0]!!
-                .trackedEntityDataValues()!!.size
+                .trackedEntityDataValues()!!.size,
         ).isEqualTo(1)
         assertThat(getEnrollments(serverValidTEI2.items()[0]).size).isEqualTo(1)
         assertThat(getEvents(getEnrollments(serverValidTEI2.items()[0])[0]).size).isEqualTo(1)
         assertThat(
             getEvents(getEnrollments(serverValidTEI2.items()[0])[0])[0]!!
-                .trackedEntityDataValues()!!.size
+                .trackedEntityDataValues()!!.size,
         ).isEqualTo(1)
     }
 
@@ -376,17 +376,17 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         assertThat(getEnrollments(serverValidTEI1.items()[0]).size).isEqualTo(1)
         assertThat(
             getEnrollments(serverValidTEI1.items()[0])[0]!!
-                .status()
+                .status(),
         ).isEqualTo(EnrollmentStatus.COMPLETED)
         assertThat(getEvents(getEnrollments(serverValidTEI1.items()[0])[0]).size).isEqualTo(1)
         assertThat(
             getEvents(getEnrollments(serverValidTEI1.items()[0])[0])[0]!!
-                .trackedEntityDataValues()!!.size
+                .trackedEntityDataValues()!!.size,
         ).isEqualTo(1)
         assertThat(
             getEvents(
-                getEnrollments(serverValidTEI1.items()[0])[0]
-            )[0]!!.status()
+                getEnrollments(serverValidTEI1.items()[0])[0],
+            )[0]!!.status(),
         ).isEqualTo(EventStatus.COMPLETED)
     }
 
@@ -428,7 +428,7 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
         return executor.wrap(
             storeError = false,
             acceptedErrorCodes = listOf(409),
-            errorClass = TEIWebResponse::class.java
+            errorClass = TEIWebResponse::class.java,
         ) {
             trackedEntityInstanceService.postTrackedEntityInstances(payload, strategy)
         }.getOrThrow()
@@ -442,7 +442,7 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                     OrganisationUnitMode.ACCESSIBLE.name,
                     TrackedEntityInstanceFields.allFields,
                     includeAllAttributes = true,
-                    includeDeleted = true
+                    includeDeleted = true,
                 )
         }.getOrThrow()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt
index e07ef5b48b..b341849f93 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class AttributeValueFilterStoreIntegrationShould : ObjectStoreAbstractIntegrationShould<AttributeValueFilter>(
     AttributeValueFilterStoreImpl(TestDatabaseAdapterFactory.get()),
     ItemFilterTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): AttributeValueFilter {
         return AttributeValueFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
index 0d566b7228..868362febf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
@@ -151,7 +151,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
 
         val tei = TrackedEntityInstanceInternalAccessor.insertEnrollments(
             TrackedEntityInstance.builder(),
-            listOf(enrollment1, enrollment2, enrollment3)
+            listOf(enrollment1, enrollment2, enrollment3),
         )
             .uid(teiId)
             .trackedEntityType(teiType.uid())
@@ -196,7 +196,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
                 .organisationUnit(orgUnit!!.uid())
                 .syncState(state)
                 .aggregatedSyncState(state)
-                .build()
+                .build(),
         )
     }
 
@@ -204,7 +204,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
     protected fun storeRelationship(
         relationshipUid: String,
         from: String,
-        to: String
+        to: String,
     ) {
         storeRelationship(relationshipUid, RelationshipHelper.teiItem(from), RelationshipHelper.teiItem(to))
     }
@@ -213,7 +213,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
     protected fun storeRelationship(
         relationshipUid: String,
         from: RelationshipItem,
-        to: RelationshipItem
+        to: RelationshipItem,
     ) {
         val relationshipType = RelationshipTypeStoreImpl(databaseAdapter).selectFirst()
         val executor = D2CallExecutor.create(databaseAdapter)
@@ -222,19 +222,19 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
                 RelationshipSamples.get230(relationshipUid, from, to).toBuilder()
                     .relationshipType(relationshipType!!.uid())
                     .syncState(State.TO_POST)
-                    .build()
+                    .build(),
             )
             RelationshipItemStoreImpl(databaseAdapter).insert(
                 from.toBuilder()
                     .relationship(ObjectWithUid.create(relationshipUid))
                     .relationshipItemType(RelationshipConstraintType.FROM)
-                    .build()
+                    .build(),
             )
             RelationshipItemStoreImpl(databaseAdapter).insert(
                 to.toBuilder()
                     .relationship(ObjectWithUid.create(relationshipUid))
                     .relationshipItemType(RelationshipConstraintType.TO)
-                    .build()
+                    .build(),
             )
             ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
             null
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGeneratorMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGeneratorMockIntegrationShould.kt
index efd97fdb3b..74e4978d83 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGeneratorMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGeneratorMockIntegrationShould.kt
@@ -84,7 +84,7 @@ class OldTrackerImporterPayloadGeneratorMockIntegrationShould : BasePayloadGener
         storeRelationship(
             relationshipUid = "relationship1",
             from = RelationshipHelper.teiItem(teiId),
-            to = RelationshipHelper.eventItem(singleEventId)
+            to = RelationshipHelper.eventItem(singleEventId),
         )
         val instance = teiStore.selectByUid(teiId)!!
 
@@ -106,7 +106,7 @@ class OldTrackerImporterPayloadGeneratorMockIntegrationShould : BasePayloadGener
         storeRelationship(
             relationshipUid = "relationship1",
             from = RelationshipHelper.teiItem(fromTeiUid),
-            to = RelationshipHelper.eventItem(event1Id)
+            to = RelationshipHelper.eventItem(event1Id),
         )
         val instance = teiStore.selectByUid(fromTeiUid)!!
 
@@ -124,7 +124,7 @@ class OldTrackerImporterPayloadGeneratorMockIntegrationShould : BasePayloadGener
         storeRelationship(
             relationshipUid = "relationship1",
             from = RelationshipHelper.teiItem(fromTeiUid),
-            to = RelationshipHelper.enrollmentItem(enrollment1Id)
+            to = RelationshipHelper.enrollmentItem(enrollment1Id),
         )
         val instance = teiStore.selectByUid(fromTeiUid)!!
 
@@ -142,7 +142,7 @@ class OldTrackerImporterPayloadGeneratorMockIntegrationShould : BasePayloadGener
         storeRelationship(
             relationshipUid = "relationship1",
             from = RelationshipHelper.teiItem(fromTeiUid),
-            to = RelationshipHelper.teiItem(teiId)
+            to = RelationshipHelper.teiItem(teiId),
         )
         val instance = teiStore.selectByUid(fromTeiUid)!!
 
@@ -172,7 +172,7 @@ class OldTrackerImporterPayloadGeneratorMockIntegrationShould : BasePayloadGener
         storeRelationship(
             relationshipUid = "relationship1",
             from = RelationshipHelper.eventItem(singleEventId),
-            to = RelationshipHelper.teiItem(teiId)
+            to = RelationshipHelper.teiItem(teiId),
         )
         val event = eventStore.selectByUid(singleEventId)!!
 
@@ -193,7 +193,7 @@ class OldTrackerImporterPayloadGeneratorMockIntegrationShould : BasePayloadGener
         storeRelationship(
             relationshipUid = "relationship1",
             from = RelationshipHelper.enrollmentItem(enrollment1Id),
-            to = RelationshipHelper.enrollmentItem(enrollment1Id)
+            to = RelationshipHelper.enrollmentItem(enrollment1Id),
         )
         val instance = teiStore.selectByUid(teiId)!!
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
index b6f4972303..c5285d2806 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallBaseMockIntegrationShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
 import junit.framework.Assert.fail
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
@@ -52,6 +51,7 @@ import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTest
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import java.io.IOException
 
 abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockIntegrationTestMetadataEnqueable() {
 
@@ -117,7 +117,7 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
 
         verifyDownloadedTrackedEntityInstanceSingle(
             teiWithRemovedDataFile,
-            teiUid
+            teiUid,
         )
     }
 
@@ -226,7 +226,7 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
         val enrollmentStore = EnrollmentStoreImpl(databaseAdapter)
         val downloadedEnrollments = enrollmentStore.selectWhere(
             WhereClauseBuilder()
-                .appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, teiUid).build()
+                .appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, teiUid).build(),
         )
         val downloadedEnrollmentsWithoutIdAndDeleteFalse = downloadedEnrollments.map {
             it.toBuilder().id(null).deleted(false).notes(ArrayList()).build()
@@ -246,7 +246,7 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
             attValuesWithoutIdAndTEI,
             downloadedEnrollmentsWithoutIdAndDeleteFalse,
             downloadedEventsWithoutValuesAndDeleteFalse,
-            downloadedValues
+            downloadedValues,
         )
     }
 
@@ -255,7 +255,7 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
         attValuesWithoutIdAndTEI: List<TrackedEntityAttributeValue>,
         downloadedEnrollmentsWithoutEvents: List<Enrollment>,
         downloadedEventsWithoutValues: List<Event>,
-        downloadedValues: Map<String?, List<TrackedEntityDataValue>?>
+        downloadedValues: Map<String?, List<TrackedEntityDataValue>?>,
     ): TrackedEntityInstance? {
         val downloadedEvents = downloadedEventsWithoutValues.map { event ->
             val trackedEntityDataValuesWithNullIdsAndEvents = downloadedValues[event.uid()]!!.map {
@@ -268,7 +268,7 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
         val downloadedEnrollments = downloadedEnrollmentsWithoutEvents.map { enrollment ->
             EnrollmentInternalAccessor.insertEvents(
                 enrollment.toBuilder(),
-                downloadedEvents[enrollment.uid()]
+                downloadedEvents[enrollment.uid()],
             )
                 .trackedEntityInstance(downloadedTei!!.uid())
                 .build()
@@ -279,9 +279,9 @@ abstract class TrackedEntityInstanceCallBaseMockIntegrationShould : BaseMockInte
         return TrackedEntityInstanceInternalAccessor.insertEnrollments(
             TrackedEntityInstanceInternalAccessor.insertRelationships(
                 downloadedTei!!.toBuilder(),
-                relationships
+                relationships,
             ),
-            downloadedEnrollments
+            downloadedEnrollments,
         )
             .id(null)
             .deleted(false)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
index 920fba05f7..398339c5d8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ class TrackedEntityInstanceFilterStoreIntegrationShould :
     IdentifiableObjectStoreAbstractIntegrationShould<TrackedEntityInstanceFilter>(
         TrackedEntityInstanceFilterStoreImpl(TestDatabaseAdapterFactory.get()),
         TrackedEntityInstanceFilterTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun buildObject(): TrackedEntityInstanceFilter {
         return TrackedEntityInstanceFilterSamples.get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt
index b3b4d26835..62b356b991 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class ProgramOwnerStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<ProgramOwner>(
     ProgramOwnerStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramOwnerTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): ProgramOwner {
         return ProgramOwnerSamples.programOwner
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt
index b710d09498..cc86f4315d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class ProgramTempOwnerStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<ProgramTempOwner>(
     ProgramTempOwnerStoreImpl(TestDatabaseAdapterFactory.get()),
     ProgramTempOwnerTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): ProgramTempOwner {
         return ProgramTempOwnerSamples.programTempOwner
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
index 3f6f3d3f48..cf51438280 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
@@ -60,18 +60,18 @@ class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockInteg
             .programDate(
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.LAST_10_YEARS)
-                    .build()
+                    .build(),
             )
             .incidentDate(
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.LAST_3_MONTHS)
-                    .build()
+                    .build(),
             )
             .enrollmentStatus(listOf(EnrollmentStatus.ACTIVE))
             .eventDate(
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.LAST_10_YEARS)
-                    .build()
+                    .build(),
             )
             .eventStatus(listOf(EventStatus.ACTIVE))
             .filter(
@@ -85,15 +85,15 @@ class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockInteg
                         .key("attributeUid2")
                         .operator(FilterItemOperator.EQ)
                         .value("value2")
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .query(
                 RepositoryScopeFilterItem.builder()
                     .key("")
                     .operator(FilterItemOperator.EQ)
                     .value("value1")
-                    .build()
+                    .build(),
             )
             .trackedEntityType("trackedEntityTypeUid")
             .orgUnitMode(OrganisationUnitMode.CAPTURE)
@@ -109,16 +109,16 @@ class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockInteg
                         .eventDate(
                             DateFilterPeriod.builder()
                                 .period(RelativePeriod.LAST_10_YEARS)
-                                .build()
+                                .build(),
                         )
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .states(listOf(State.SYNCED, State.TO_UPDATE))
             .lastUpdatedDate(
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.LAST_10_YEARS)
-                    .build()
+                    .build(),
             )
             .order(
                 listOf(
@@ -129,8 +129,8 @@ class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockInteg
                     TrackedEntityInstanceQueryScopeOrderByItem.builder()
                         .column(TrackedEntityInstanceQueryScopeOrderColumn.LAST_UPDATED)
                         .direction(RepositoryScope.OrderByDirection.ASC)
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .build()
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallRealIntegrationShould.kt
index 0830387861..5f91ece7ce 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallRealIntegrationShould.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
-import java.util.*
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.junit.Assert
 import org.junit.Before
+import java.util.*
 
 class TrackedEntityInstanceQueryCallRealIntegrationShould : BaseRealIntegrationTest() {
     private lateinit var repository: TrackedEntityInstanceQueryCollectionRepository
@@ -479,7 +479,7 @@ class TrackedEntityInstanceQueryCallRealIntegrationShould : BaseRealIntegrationT
             "aVlSMMvgVzf", "zAyK28LLaez", "IcVHzEm0b6Z", "lc3eMKXaEfw", "VfZnZ6UKyn8", "uYG1rUdsJJi",
             "szbAJSWOXjT", "cZZG5BMDLps", "GRc9WXp9gSy", "kbPmt60yi0L", "vRC0stJ5y9Q", "tO01bqIipeD",
             "iUauWFeH8Qp", "AXZq6q7Dr6E", "LZclRdyVk1t", "OI0BQUurVFS", "DwpbWkiqjMy", "MwfWgjMRgId",
-            "Q2USZSJmcNK", "EJoI3HArJ2W", "E497Rk80ivZ", "nOYt1LtFSyU", "wbtk73Zwhj9", "cMFi8lYbXHY"
+            "Q2USZSJmcNK", "EJoI3HArJ2W", "E497Rk80ivZ", "nOYt1LtFSyU", "wbtk73Zwhj9", "cMFi8lYbXHY",
         )
         try {
             repository.byOrgUnits().`in`(orgUnits).blockingGet()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt
index c34261a45f..ce7aa3f774 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreIntegrationShould.kt
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith
 class TrackerJobObjectStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<TrackerJobObject>(
     TrackerJobObjectStoreImpl(TestDatabaseAdapterFactory.get()),
     TrackerJobObjectTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): TrackerJobObject {
         return TrackerJobObjectSamples.get1()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
index ecf03fd21d..eb4471516d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class StockUseCaseStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<InternalStockUseCase>(
     StockUseCaseStoreImpl(TestDatabaseAdapterFactory.get()),
     StockUseCaseTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): InternalStockUseCase {
         return get()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
index f17ef3ab3a..c871c70c6e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreIntegrationShould.kt
@@ -42,7 +42,7 @@ class StockUseCaseTransactionLinkStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<InternalStockUseCaseTransaction>(
         StockUseCaseTransactionLinkStoreImpl(TestDatabaseAdapterFactory.get()),
         StockUseCaseTransactionTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun addMasterUid(): String {
         return InternalStockUseCaseTransactionSamples.get().programUid()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/UserDisabledMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/UserDisabledMockIntegrationShould.kt
index 940da386a0..e14377ee94 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/UserDisabledMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/UserDisabledMockIntegrationShould.kt
@@ -84,7 +84,7 @@ class UserDisabledMockIntegrationShould : BaseMockIntegrationTestMetadataEnqueab
             "DiszpKrYNg8",
             "Ok9OQpitjQr",
             "DwrQJzeChWp",
-            "DwrQJzeChWp"
+            "DwrQJzeChWp",
         ).blockingSet("30")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
index 6db67b4beb..427e4bb7f5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.data.user.UserSamples
 import org.hisp.dhis.android.core.user.User
@@ -37,6 +36,7 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.BeforeClass
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.concurrent.Callable
 
 @RunWith(D2JunitRunner::class)
 class UserCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
index f7a2031888..871aa111d8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreIntegrationShould.kt
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith
 class UserOrganisationUnitLinkStoreIntegrationShould : LinkStoreAbstractIntegrationShould<UserOrganisationUnitLink>(
     UserOrganisationUnitLinkStoreImpl(TestDatabaseAdapterFactory.get()),
     UserOrganisationUnitLinkTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     private var linkStore: UserOrganisationUnitLinkStore = store as UserOrganisationUnitLinkStore
 
@@ -65,11 +65,11 @@ class UserOrganisationUnitLinkStoreIntegrationShould : LinkStoreAbstractIntegrat
         linkStore.insert(UserOrganisationUnitLinkSamples.getUserOrganisationUnitLink())
         linkStore.insert(
             UserOrganisationUnitLinkSamples
-                .getAssignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
+                .getAssignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE),
         )
         linkStore.insert(
             UserOrganisationUnitLinkSamples
-                .getUnassignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
+                .getUnassignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE),
         )
         val orgUnitUids = linkStore
             .queryAssignedOrganisationUnitUidsByScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
@@ -81,11 +81,11 @@ class UserOrganisationUnitLinkStoreIntegrationShould : LinkStoreAbstractIntegrat
         linkStore.insert(UserOrganisationUnitLinkSamples.getUserOrganisationUnitLink())
         linkStore.insert(
             UserOrganisationUnitLinkSamples
-                .getAssignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
+                .getAssignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_TEI_SEARCH),
         )
         linkStore.insert(
             UserOrganisationUnitLinkSamples
-                .getUnassignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
+                .getUnassignedUserOrganisationUnitLink(OrganisationUnit.Scope.SCOPE_TEI_SEARCH),
         )
 
         val orgUnitUids = linkStore.queryAssignedOrganisationUnitUidsByScope(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
index 44a639052e..1acd16fe64 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class UserRoleStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<UserRole>(
     UserRoleStoreImpl(TestDatabaseAdapterFactory.get()),
     UserRoleTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): UserRole {
         return UserRoleSamples.getUserRole()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
index 71e7522d66..5368970d84 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserStoreIntegrationShould.kt
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith
 class UserStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<User>(
     UserStoreImpl(TestDatabaseAdapterFactory.get()),
     UserTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): User {
         return UserSamples.getUser()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
index d4e14d907e..5595292834 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
@@ -41,7 +41,7 @@ abstract class BaseMockIntegrationTestEmptyDispatcher : BaseMockIntegrationTest(
                 objects.d2.userModule().blockingLogIn(
                     RealServerMother.username,
                     RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint
+                    objects.dhis2MockServer.baseEndpoint,
                 )
             }
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
index 976b93bf6c..e613a20c61 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
@@ -41,7 +41,7 @@ abstract class BaseMockIntegrationTestEmptyEnqueable : BaseMockIntegrationTest()
                 objects.d2.userModule().blockingLogIn(
                     RealServerMother.username,
                     RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint
+                    objects.dhis2MockServer.baseEndpoint,
                 )
             }
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
index 6acb8c3d9d..bcbaf75e91 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
@@ -116,7 +116,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                     .url("http://dhis2.org/api/programs/uid")
                     .errorDescription("Different server offline")
                     .httpErrorCode(402)
-                    .build()
+                    .build(),
             )
         }
 
@@ -127,7 +127,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                     .trackedEntityInstance(null)
                     .enrollment(null)
                     .event(null)
-                    .build()
+                    .build(),
             )
             trackerImportConflictStore.insert(
                 TrackerImportConflictSamples.get().toBuilder()
@@ -139,7 +139,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                     .tableReference("table_reference_2")
                     .errorCode("error_code_2")
                     .status(ImportStatus.ERROR)
-                    .build()
+                    .build(),
             )
 
             val dataValueConflictStore = DataValueConflictStoreImpl(databaseAdapter)
@@ -152,7 +152,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                     .dataElement("bx6fsa0t90x")
                     .categoryOptionCombo("bRowv6yZOF2")
                     .status(ImportStatus.WARNING)
-                    .build()
+                    .build(),
             )
             dataValueConflictStore.insert(
                 DataValueConflictSamples.get().toBuilder()
@@ -161,7 +161,7 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                     .period("202201")
                     .orgUnit("YuQRtpLP10I")
                     .displayDescription("display_description_other")
-                    .build()
+                    .build(),
             )
         }
 
@@ -172,13 +172,13 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
                 KeyValuePair.builder()
                     .key("key1")
                     .value("value1")
-                    .build()
+                    .build(),
             )
             dataStore.insert(
                 KeyValuePair.builder()
                     .key("key2")
                     .value("value2")
-                    .build()
+                    .build(),
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
index 3a38c84196..6f58261f86 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
@@ -49,7 +49,7 @@ abstract class BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher : BaseM
                 objects.d2.userModule().blockingLogIn(
                     RealServerMother.username,
                     RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint!!
+                    objects.dhis2MockServer.baseEndpoint!!,
                 )
             }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
index 12dc7380c1..fd678d9b49 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
@@ -42,7 +42,7 @@ abstract class BaseMockIntegrationTestMetadataDispatcher : BaseMockIntegrationTe
                 objects.d2.userModule().blockingLogIn(
                     RealServerMother.username,
                     RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint
+                    objects.dhis2MockServer.baseEndpoint,
                 )
                 objects.d2.metadataModule().blockingDownload()
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
index b39f629a00..17bc4023d6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
@@ -40,7 +40,7 @@ abstract class BaseMockIntegrationTestMetadataEnqueable : BaseMockIntegrationTes
                 objects.d2.userModule().blockingLogIn(
                     "android",
                     "Android123",
-                    objects.dhis2MockServer.baseEndpoint
+                    objects.dhis2MockServer.baseEndpoint,
                 )
                 objects.dhis2MockServer.enqueueMetadataResponses()
                 objects.d2.metadataModule().blockingDownload()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt
index 0228db6d2d..736dd2a3ce 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt
@@ -63,6 +63,6 @@ internal object MockIntegrationTestObjectsFactory {
 
     internal class IntegrationTestObjectsWithIsNewInstance(
         val objects: MockIntegrationTestObjects,
-        val isNewInstance: Boolean
+        val isNewInstance: Boolean,
     )
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt
index 4de739467d..257084e40f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ class VisualizationDimensionItemStoreIntegrationShould :
     LinkStoreAbstractIntegrationShould<VisualizationDimensionItem>(
         VisualizationDimensionItemStoreImpl(TestDatabaseAdapterFactory.get()),
         VisualizationDimensionItemTableInfo.TABLE_INFO,
-        TestDatabaseAdapterFactory.get()
+        TestDatabaseAdapterFactory.get(),
     ) {
     override fun addMasterUid(): String {
         return "visualization_uid"
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
index b6f29d0796..b613473ee0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
@@ -50,8 +50,8 @@ class VisualizationEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable()
             BaseMockIntegrationTestEmptyEnqueable.setUpClass()
             visualizationsSingle = objects.d2DIComponent.internalModules().visualization.visualizationCall.download(
                 HashSet(
-                    Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe")
-                )
+                    Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe"),
+                ),
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt
index dd245e8b0f..4f6344e5ce 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreIntegrationShould.kt
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith
 class VisualizationStoreIntegrationShould : IdentifiableObjectStoreAbstractIntegrationShould<Visualization>(
     VisualizationStoreImpl(TestDatabaseAdapterFactory.get()),
     VisualizationTableInfo.TABLE_INFO,
-    TestDatabaseAdapterFactory.get()
+    TestDatabaseAdapterFactory.get(),
 ) {
     override fun buildObject(): Visualization {
         return VisualizationSamples.visualization()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
index b1930727c3..218c1bcd3e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
@@ -109,7 +109,7 @@ class WipeDBCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             D2Error.builder()
                 .errorCode(D2ErrorCode.API_RESPONSE_PROCESS_ERROR)
                 .errorDescription("Sample error")
-                .build()
+                .build(),
         )
         TrackerImportConflictStoreImpl(databaseAdapter).insert(TrackerImportConflict.builder().build())
         FileResourceStoreImpl(databaseAdapter).insert(FileResource.builder().uid("uid").build())
@@ -119,13 +119,13 @@ class WipeDBCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
             KeyValuePair.builder()
                 .key("key1")
                 .value("value1")
-                .build()
+                .build(),
         )
         LocalDataStoreStoreImpl(databaseAdapter).insert(
             KeyValuePair.builder()
                 .key("key2")
                 .value("value2")
-                .build()
+                .build(),
         )
         ProgramTempOwnerStoreImpl(databaseAdapter).insert(ProgramTempOwnerSamples.programTempOwner)
 
@@ -134,11 +134,11 @@ class WipeDBCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
 
         StockUseCaseStoreImpl(databaseAdapter).insert(
             InternalStockUseCaseSamples.get()
-                .toBuilder().uid("lxAQ7Zs9VYR").build()
+                .toBuilder().uid("lxAQ7Zs9VYR").build(),
         )
         StockUseCaseTransactionLinkStoreImpl(databaseAdapter).insert(
             InternalStockUseCaseTransactionSamples.get()
-                .toBuilder().programUid("lxAQ7Zs9VYR").build()
+                .toBuilder().programUid("lxAQ7Zs9VYR").build(),
         )
 
         MapLayerStoreImpl(databaseAdapter).insert(MapLayerSamples.get())
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt
index 11a0c34d49..8e2d6082d2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDataGenerator.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.localanalytics.dbgeneration
 
-import java.util.*
-import kotlin.random.Random
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.data.datavalue.DataValueSamples
 import org.hisp.dhis.android.core.data.enrollment.EnrollmentSamples
@@ -46,6 +44,8 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import java.util.*
+import kotlin.random.Random
 
 internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDataParams) {
 
@@ -79,7 +79,7 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
                             period.periodId()!!,
                             categoryOptionCombo.uid(),
                             metadata.categoryOptionCombos.first().uid(),
-                            random.nextDouble().toString()
+                            random.nextDouble().toString(),
                         )
                     }
                 }
@@ -102,7 +102,7 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
                 tei.organisationUnit(),
                 program.uid(),
                 tei.uid(),
-                getRandomDateInLastYear()
+                getRandomDateInLastYear(),
             )
         }
     }
@@ -122,7 +122,7 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
                 programStage.program()!!.uid(),
                 programStage.uid(),
                 metadata.categoryOptionCombos.first().uid(),
-                getRandomDateInLastYear()
+                getRandomDateInLastYear(),
             )
         }
     }
@@ -141,7 +141,7 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
                         enrollment.program(),
                         ps.uid(),
                         metadata.categoryOptionCombos.first().uid(),
-                        getRandomDateInLastYear()
+                        getRandomDateInLastYear(),
                     )
                 }
             }
@@ -150,7 +150,7 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
 
     fun generateTrackedEntityAttributeValues(
         trackedEntityAttributes: List<TrackedEntityAttribute>,
-        teis: List<TrackedEntityInstance>
+        teis: List<TrackedEntityInstance>,
     ): List<TrackedEntityAttributeValue> {
         return trackedEntityAttributes.flatMap { tea ->
             teis.map { tei ->
@@ -161,7 +161,7 @@ internal class LocalAnalyticsDataGenerator(private val params: LocalAnalyticsDat
 
     fun generateTrackedEntityDataValues(
         dataElements: List<DataElement>,
-        events: List<Event>
+        events: List<Event>,
     ): List<TrackedEntityDataValue> {
         return dataElements.flatMap { de ->
             events.map { event ->
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
index c82add6d15..bc504ebd07 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
@@ -60,7 +60,7 @@ internal data class MetadataForDataFilling(
     val trackerDataElements: List<DataElement>,
     val programs: List<Program>,
     val programStages: List<ProgramStage>,
-    val trackedEntityAttributes: List<TrackedEntityAttribute>
+    val trackedEntityAttributes: List<TrackedEntityAttribute>,
 )
 
 internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
@@ -112,7 +112,7 @@ internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
             trackerDataElements,
             programs,
             programStages,
-            trackedEntityAttributes
+            trackedEntityAttributes,
         )
     }
 
@@ -133,11 +133,11 @@ internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
         EventStoreImpl(da).insert(events)
 
         TrackedEntityAttributeValueStoreImpl(da).insert(
-            generator.generateTrackedEntityAttributeValues(metadata.trackedEntityAttributes, teis)
+            generator.generateTrackedEntityAttributeValues(metadata.trackedEntityAttributes, teis),
         )
 
         TrackedEntityDataValueStoreImpl(da).insert(
-            generator.generateTrackedEntityDataValues(metadata.trackerDataElements, events)
+            generator.generateTrackedEntityDataValues(metadata.trackerDataElements, events),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt
index e6f4016313..f6d2237d5e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsMetadataGenerator.kt
@@ -58,7 +58,7 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
             OrganisationUnitSamples.getOrganisationUnit(
                 "${parent.name()} $i",
                 parent.level()!! + 1,
-                parent
+                parent,
             )
         }
     }
@@ -90,7 +90,7 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
                     "DE Aggr $i",
                     null,
                     ObjectWithUid.create(categoryCombo.uid()),
-                    "AGGREGATE"
+                    "AGGREGATE",
                 )
             }
         }
@@ -102,7 +102,7 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
                 "DE Tracker $i",
                 null,
                 ObjectWithUid.create(categoryCombo.uid()),
-                "TRACKER"
+                "TRACKER",
             )
         }
     }
@@ -111,12 +111,12 @@ internal class LocalAnalyticsMetadataGenerator(private val params: LocalAnalytic
         val withReg = ProgramSamples.getProgram(
             "Program with registration",
             ProgramType.WITH_REGISTRATION,
-            categoryCombo
+            categoryCombo,
         )
         val withoutReg = ProgramSamples.getProgram(
             "Program without registration",
             ProgramType.WITHOUT_REGISTRATION,
-            categoryCombo
+            categoryCombo,
         )
         return listOf(withReg, withoutReg)
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsParams.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsParams.kt
index c07903f52f..36240d9279 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsParams.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsParams.kt
@@ -35,7 +35,7 @@ internal data class LocalAnalyticsMetadataParams(
     val dataElementsTracker: Int,
     val programStagesWithRegistration: Int,
     val programStagesWithoutRegistration: Int,
-    val trackedEntityAttributes: Int
+    val trackedEntityAttributes: Int,
 ) {
 
     companion object LocalAnalyticsMetadataParams {
@@ -47,7 +47,7 @@ internal data class LocalAnalyticsMetadataParams(
             dataElementsTracker = 10,
             programStagesWithRegistration = 3,
             programStagesWithoutRegistration = 1,
-            trackedEntityAttributes = 10
+            trackedEntityAttributes = 10,
         )
     }
 }
@@ -56,14 +56,14 @@ internal data class LocalAnalyticsDataParams(
     val dataValues: Int,
     val trackedEntityInstances: Int,
     val eventsWithoutRegistration: Int,
-    val eventsWithRegistrationPerEnrollmentAndPS: Int
+    val eventsWithRegistrationPerEnrollmentAndPS: Int,
 ) {
     companion object LocalAnalyticsDataParams {
         fun get(f: Int) = LocalAnalyticsDataParams(
             dataValues = 3000 * f,
             trackedEntityInstances = 500 * f,
             eventsWithoutRegistration = 500 * f,
-            eventsWithRegistrationPerEnrollmentAndPS = 1
+            eventsWithRegistrationPerEnrollmentAndPS = 1,
         )
 
         const val DefaultFactor = 1
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbtests/LocalAnalyticsSuperLargeDatabaseMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbtests/LocalAnalyticsSuperLargeDatabaseMockIntegrationShould.kt
index 31aa96aa51..f99258610f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbtests/LocalAnalyticsSuperLargeDatabaseMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbtests/LocalAnalyticsSuperLargeDatabaseMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsSuperLargeDatabaseMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.SuperLargeFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt
index 9a4ce99cb6..e200a36f96 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/BaseLocalAnalyticsTest.kt
@@ -50,7 +50,7 @@ abstract class BaseLocalAnalyticsTest : BaseMockIntegrationTest() {
                 objects.d2.userModule().blockingLogIn(
                     RealServerMother.username,
                     RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint!!
+                    objects.dhis2MockServer.baseEndpoint!!,
                 )
             }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedDefaultDataMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedDefaultDataMockIntegrationShould.kt
index d6d4dfcc80..c1ef4bb139 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedDefaultDataMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedDefaultDataMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsAggregatedDefaultDataMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.DefaultFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsDefaultDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsDefaultDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedLargeDataMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedLargeDataMockIntegrationShould.kt
index bca63931e1..129f1469a4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedLargeDataMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedLargeDataMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsAggregatedLargeDataMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.LargeFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsLargeDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsLargeDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedSuperLargeDataMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedSuperLargeDataMockIntegrationShould.kt
index 1d345629ec..d64b9baa2c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedSuperLargeDataMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsAggregatedSuperLargeDataMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsAggregatedSuperLargeDataMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.SuperLargeFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerDefaultMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerDefaultMockIntegrationShould.kt
index 2ad9dbb197..7f7f33b5b9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerDefaultMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerDefaultMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsTrackerDefaultMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.DefaultFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsDefaultDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsDefaultDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerLargeMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerLargeMockIntegrationShould.kt
index c208faebf3..c07f2082e5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerLargeMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerLargeMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsTrackerLargeMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.LargeFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsLargeDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsLargeDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerSuperLargeMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerSuperLargeMockIntegrationShould.kt
index 95742f8ff1..0f5e73ce4c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerSuperLargeMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/tests/LocalAnalyticsTrackerSuperLargeMockIntegrationShould.kt
@@ -46,7 +46,7 @@ internal class LocalAnalyticsTrackerSuperLargeMockIntegrationShould :
         fun setUpClass() {
             setUpClass(
                 LocalAnalyticsDataParams.SuperLargeFactor,
-                MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher
+                MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher,
             )
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt
index 256d39c53f..f1cfe28f50 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/EnumTestHelper.kt
@@ -36,7 +36,7 @@ internal class EnumTestHelper {
             } else {
                 val errorList = listOfNotNull(
                     constantsContained(sdkEnumEntry.value, generateConstants, sdkEnumEntry.key, "SDK"),
-                    constantsContained(generateConstants, sdkEnumEntry.value, sdkEnumEntry.key, "server")
+                    constantsContained(generateConstants, sdkEnumEntry.value, sdkEnumEntry.key, "server"),
                 )
                 if (errorList.isNotEmpty()) errorList.joinToString() else null
             }
@@ -46,7 +46,7 @@ internal class EnumTestHelper {
             containerList: List<String>,
             containedList: List<String>,
             enumKey: String,
-            containerKey: String
+            containerKey: String,
         ): String? {
             val notContainedValues = containedList.filter { !containerList.contains(it) }
             return if (notContainedValues.isNotEmpty()) {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchema.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchema.kt
index 788f505ea6..2f4502de66 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchema.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchema.kt
@@ -29,13 +29,13 @@
 package org.hisp.dhis.android.realservertests.apischema
 
 internal data class ApiSchema(
-    val properties: List<SchemaProperty>
+    val properties: List<SchemaProperty>,
 ) {
     internal companion object {
         internal data class SchemaProperty(
             val propertyType: String,
             val klass: String,
-            val constants: List<String>?
+            val constants: List<String>?,
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaCall.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaCall.kt
index 8a3a2c3472..de7e6e1c76 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaCall.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaCall.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import retrofit2.Retrofit
 
 internal class ApiSchemaCall internal constructor(
-    private val retrofit: Retrofit
+    private val retrofit: Retrofit,
 ) : ListCall<ApiSchema> {
     override fun download(): Single<List<ApiSchema>> {
         return retrofit.create(ApiSchemaService::class.java).getSchema(ApiSchemaFields.allFields).map { it.items() }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaFields.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaFields.kt
index 0c6e9324e8..9f7c973c48 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaFields.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaFields.kt
@@ -43,14 +43,14 @@ internal object ApiSchemaFields {
             .fields(
                 ApiSchemaPropertyFh.field<String>(KLASS),
                 ApiSchemaPropertyFh.field<String>(PROPERTY_TYPE),
-                ApiSchemaPropertyFh.field<String>(CONSTANTS)
+                ApiSchemaPropertyFh.field<String>(CONSTANTS),
             ).build()
 
     val allFields: Fields<ApiSchema> = Fields.builder<ApiSchema>()
         .fields(
             ApiSchemaFh.nestedField<ApiSchema.Companion.SchemaProperty>(
-                PROPERTIES
+                PROPERTIES,
             )
-                .with(propertyFields)
+                .with(propertyFields),
         ).build()
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaService.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaService.kt
index 1221336312..d1688cc1a5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaService.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/ApiSchemaService.kt
@@ -38,6 +38,6 @@ import retrofit2.http.Query
 internal interface ApiSchemaService {
     @GET("schemas")
     fun getSchema(
-        @Query("fields") @Which fields: Fields<ApiSchema>
+        @Query("fields") @Which fields: Fields<ApiSchema>,
     ): Single<Payload<ApiSchema>>
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaShould.kt
index fc171de8fa..a3948d05a7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaShould.kt
@@ -29,10 +29,10 @@ package org.hisp.dhis.android.realservertests.apischema.tests
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.common.truth.Truth
-import java.io.InputStream
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory
 import org.hisp.dhis.android.realservertests.apischema.ApiSchema
 import org.junit.Test
+import java.io.InputStream
 
 class ApiSchemaShould {
     private var objectMapper: ObjectMapper = ObjectMapperFactory.objectMapper()
@@ -46,7 +46,7 @@ class ApiSchemaShould {
         Truth.assertThat(apiSchema.properties[0].klass).isEqualTo("java.util.List")
         Truth.assertThat(
             apiSchema.properties
-                .find { it.klass == "org.hisp.dhis.event.EventStatus" }?.constants?.get(0)
+                .find { it.klass == "org.hisp.dhis.event.EventStatus" }?.constants?.get(0),
         )
             .isEqualTo("ACTIVE")
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaUpdatesCheckerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaUpdatesCheckerRealIntegrationShould.kt
index 8783849581..d0a067a393 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaUpdatesCheckerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/apischema/tests/ApiSchemaUpdatesCheckerRealIntegrationShould.kt
@@ -91,7 +91,7 @@ class ApiSchemaUpdatesCheckerRealIntegrationShould : BaseRealIntegrationTest() {
             entry<DisplayDensity>("DisplayDensity"),
             entry<LegendStrategy>("LegendDisplayStrategy"),
             entry<HideEmptyItemStrategy>("HideEmptyItemStrategy"),
-            entry<FileResourceStorageStatus>("FileResourceStorageStatus")
+            entry<FileResourceStorageStatus>("FileResourceStorageStatus"),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchema.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchema.kt
index 040f795f1e..eb88fdbadf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchema.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchema.kt
@@ -29,5 +29,5 @@
 package org.hisp.dhis.android.realservertests.generatedschema
 
 internal data class GeneratedSchema(
-    val enum: List<String>?
+    val enum: List<String>?,
 )
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaCall.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaCall.kt
index 8363053c57..7433998627 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaCall.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaCall.kt
@@ -32,7 +32,7 @@ import retrofit2.Retrofit
 
 internal class GeneratedSchemaCall internal constructor(
     private val retrofit: Retrofit,
-    private val instanceVersion: String
+    private val instanceVersion: String,
 ) {
     fun download(schemaId: String): Single<GeneratedSchema> {
         return retrofit.create(GeneratedSchemaService::class.java).getSchema(instanceVersion, schemaId)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaService.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaService.kt
index 2272a7909c..75c11d5e7f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaService.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/GeneratedSchemaService.kt
@@ -37,6 +37,6 @@ internal interface GeneratedSchemaService {
     @GET("{instanceVersion}/{schemaName}.json")
     fun getSchema(
         @Path("instanceVersion") instanceVersion: String,
-        @Path("schemaName") schemaName: String
+        @Path("schemaName") schemaName: String,
     ): Single<GeneratedSchema>
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/tests/GeneratedSchemaUpdatesCheckerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/tests/GeneratedSchemaUpdatesCheckerRealIntegrationShould.kt
index de0e3ab097..e96a46c003 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/tests/GeneratedSchemaUpdatesCheckerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/realservertests/generatedschema/tests/GeneratedSchemaUpdatesCheckerRealIntegrationShould.kt
@@ -98,7 +98,7 @@ class GeneratedSchemaUpdatesCheckerRealIntegrationShould {
             entry<DisplayDensity>("displayDensity"),
             entry<LegendStrategy>("legendDisplayStrategy"),
             entry<HideEmptyItemStrategy>("hideEmptyItemStrategy"),
-            entry<FileResourceStorageStatus>("fileResourceStorageStatus")
+            entry<FileResourceStorageStatus>("fileResourceStorageStatus"),
         )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/arch/helpers/FileResizerHelperShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/arch/helpers/FileResizerHelperShould.kt
index 60c7c4b3c2..d1cda35520 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/arch/helpers/FileResizerHelperShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/arch/helpers/FileResizerHelperShould.kt
@@ -33,15 +33,15 @@ import android.graphics.BitmapFactory
 import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
-import java.io.File
-import java.io.FileOutputStream
-import java.io.OutputStream
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.FileResizerHelper
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.File
+import java.io.FileOutputStream
+import java.io.OutputStream
+import java.util.*
 
 @RunWith(D2JunitRunner::class)
 class FileResizerHelperShould {
@@ -117,7 +117,7 @@ class FileResizerHelperShould {
             val imageFile = File(
                 FileResourceDirectoryHelper.getRootFileResourceDirectory(context),
                 "image." +
-                    compressFormat.name.lowercase(Locale.getDefault())
+                    compressFormat.name.lowercase(Locale.getDefault()),
             )
             val os: OutputStream
             try {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
index a2c9e4f56c..8922361bd6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
@@ -190,7 +190,7 @@ class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
                 "DiszpKrYNg8",
                 "g9eOBujte1U",
                 "Gmbgme7z9BF",
-                "bRowv6yZOF2"
+                "bRowv6yZOF2",
             )
 
         assertThat(objectRepository.blockingExists()).isTrue()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
index af2aa0b800..bbc30703a6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
@@ -120,8 +120,8 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
                     "no_org_unit",
                     "no_data_element",
                     "no_category",
-                    "no_attribute"
-                ).blockingExists()
+                    "no_attribute",
+                ).blockingExists(),
         ).isFalse()
 
         assertThat(
@@ -131,8 +131,8 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
                     "DiszpKrYNg8",
                     "g9eOBujte1U",
                     "Gmbgme7z9BF",
-                    "bRowv6yZOF2"
-                ).blockingExists()
+                    "bRowv6yZOF2",
+                ).blockingExists(),
         ).isTrue()
     }
 
@@ -143,7 +143,7 @@ class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFu
                 "DiszpKrYNg8",
                 "g9eOBujte1U",
                 "Gmbgme7z9BF",
-                "bRowv6yZOF2"
+                "bRowv6yZOF2",
             )
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
index 5edc0af610..ff962d46ab 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.testapp.fileresource
 
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
-import java.io.File
-import java.io.InputStream
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper.getFileResourceDirectory
 import org.hisp.dhis.android.core.data.fileresource.RandomGeneratedInputStream
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceStoreImpl
@@ -39,6 +37,8 @@ import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTest
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.File
+import java.io.InputStream
 
 @RunWith(D2JunitRunner::class)
 class FileResourceAddMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
index c992d7d139..a74367a281 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -75,7 +75,7 @@ class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .byNumerator()
             .eq(
                 "#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}" +
-                    "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}"
+                    "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
             )
             .blockingGet()
         Truth.assertThat(indicators.size).isEqualTo(1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
index 8b629e4a2b..1d85bbaf8f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
@@ -81,7 +81,7 @@ class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
                 optionSetUid = "VQ2lai3OfVG",
                 searchText = "19",
                 optionToHideUids = listOf("Y1ILwhy5VDY"),
-                optionToShowUids = listOf("egT1YqFWsVk")
+                optionToShowUids = listOf("egT1YqFWsVk"),
             )
 
         assertThat(options.size).isEqualTo(1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt
index b6b06fa5a4..16618b024a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt
@@ -50,7 +50,7 @@ internal abstract class BaseTrackerConflictMockIntegrationShould : BaseMockInteg
             errorUid,
             trackerImporterObjectType,
             importerError.name,
-            errorMessage
+            errorMessage,
         )
     }
 
@@ -58,7 +58,7 @@ internal abstract class BaseTrackerConflictMockIntegrationShould : BaseMockInteg
     fun generate_correct_display_descriptions_for_error() {
         val trackerConflictHelper = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector()
+            objects.d2DIComponent.interpreterSelector(),
         )
         val trackerImportConflict = trackerConflictHelper.getConflictBuilder(errorReport).build()
         assertThat(trackerImportConflict.displayDescription()).isEqualTo(expectedDescription)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
index d1598c2a72..4b2729f9e9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
@@ -44,12 +44,12 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
     fun generate_correct_display_descriptions_if_passing_correct_error_report() {
         val trackerImportConflict = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector()
+            objects.d2DIComponent.interpreterSelector(),
         ).getConflictBuilder(errorReport).build()
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo(
                 "The Antenatal care visit - Program rules demo event was not found in the server." +
-                    " (Event: event1)"
+                    " (Event: event1)",
             )
     }
 
@@ -57,7 +57,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
     fun return_default_message_when_passing_wrong_error_report() {
         val trackerImportConflict = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector()
+            objects.d2DIComponent.interpreterSelector(),
         ).getConflictBuilder(wrongCodeErrorReport).build()
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo("Event: `event1`, Enrollment value is NULL.")
@@ -67,7 +67,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
     fun generate_correct_display_descriptions_for_E1000_error() {
         val trackerImportConflict = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector()
+            objects.d2DIComponent.interpreterSelector(),
         ).getConflictBuilder(errorReportE1000).build()
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo("You do not have access to Ngelehun CHC")
@@ -78,14 +78,14 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
             "event1",
             TrackerImporterObjectType.EVENT,
             "E1032",
-            "Event: `event1`, Enrollment value is NULL."
+            "Event: `event1`, Enrollment value is NULL.",
         )
 
         private val errorReportE1000 = JobValidationError(
             "teiUid",
             TrackerImporterObjectType.TRACKED_ENTITY,
             "E1000",
-            "User: `User (DXyJmlo9rge)`, has no write access to OrganisationUnit: `OrganisationUnit (DiszpKrYNg8)`."
+            "User: `User (DXyJmlo9rge)`, has no write access to OrganisationUnit: `OrganisationUnit (DiszpKrYNg8)`.",
         )
         private val wrongCodeErrorReport = errorReport.copy(errorCode = "WrongCode")
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt
index 4616c664c6..5b340b98a2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.testapp.user
 
 import com.google.common.truth.Truth.assertThat
-import java.util.*
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -41,6 +40,7 @@ import org.junit.Assert
 import org.junit.BeforeClass
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.*
 
 @RunWith(D2JunitRunner::class)
 class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2.kt b/core/src/main/java/org/hisp/dhis/android/core/D2.kt
index 5b5429ff1d..d90f4e0061 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2.kt
@@ -105,8 +105,8 @@ class D2 internal constructor(internal val d2DIComponent: D2DIComponent) {
     @Deprecated(
         "Use settingModule() instead.",
         replaceWith = ReplaceWith(
-            expression = "settingModule()"
-        )
+            expression = "settingModule()",
+        ),
     )
     fun systemSettingModule(): SettingModule {
         return modules.settingModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2ConfigurationValidator.kt b/core/src/main/java/org/hisp/dhis/android/core/D2ConfigurationValidator.kt
index e0e8290d11..c56939814e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2ConfigurationValidator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2ConfigurationValidator.kt
@@ -59,7 +59,7 @@ internal object D2ConfigurationValidator {
                     .errorCode(D2ErrorCode.APP_VERSION_NOT_SET)
                     .errorDescription(
                         "The version number was not passed and the SDK was not able to get it " +
-                            "from the Android System"
+                            "from the Android System",
                     )
                     .build()
         } else {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
index 82073cb76a..cc7b1bbf4c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
@@ -114,7 +114,7 @@ object D2Manager {
                     testingServerUrl!!,
                     testingDatabaseName!!,
                     false,
-                    testingUsername!!
+                    testingUsername!!,
                 )
             } else {
                 multiUserDatabaseManager.loadIfLogged(credentials)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/NotClosedObjectsDetector.kt b/core/src/main/java/org/hisp/dhis/android/core/NotClosedObjectsDetector.kt
index ecdcc83566..74cc1f6529 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/NotClosedObjectsDetector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/NotClosedObjectsDetector.kt
@@ -38,7 +38,7 @@ internal object NotClosedObjectsDetector {
                 .detectLeakedClosableObjects()
                 .penaltyLog()
                 .penaltyDeath()
-                .build()
+                .build(),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsException.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsException.kt
index 5837a7de7d..77be65b168 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsException.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsException.kt
@@ -53,7 +53,7 @@ sealed class AnalyticsException(message: String) : Throwable(message) {
     class ProgramIndicatorCustomBoundaries(val programIndicator: ProgramIndicator) :
         AnalyticsException(
             "Custom boundaries are not supported for program indicators: " +
-                "${programIndicator.displayName()} (${programIndicator.uid()})"
+                "${programIndicator.displayName()} (${programIndicator.uid()})",
         )
 
     class SQLException(message: String) : AnalyticsException(message)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt
index 4c09196e4d..d49c2bd3c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.analytics
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsRepository
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsVisualizationsRepository
 import org.hisp.dhis.android.core.analytics.linelist.EventLineListRepository
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsModuleImpl @Inject constructor(
     private val eventLineListRepository: EventLineListRepository,
     private val analyticsRepository: AnalyticsRepository,
-    private val analyticsVisualizationsRepository: AnalyticsVisualizationsRepository
+    private val analyticsVisualizationsRepository: AnalyticsVisualizationsRepository,
 ) : AnalyticsModule {
 
     override fun eventLineList(): EventLineListRepository = eventLineListRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt
index 76522b4728..eca9bfd5c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt
@@ -36,8 +36,8 @@ import org.hisp.dhis.android.core.analytics.linelist.LineListEntityDIModule
 @Module(
     includes = [
         AggregatedEntityDIModule::class,
-        LineListEntityDIModule::class
-    ]
+        LineListEntityDIModule::class,
+    ],
 )
 internal class AnalyticsPackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
index 4ed2c8649c..f281811cb6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
@@ -28,12 +28,12 @@
 
 package org.hisp.dhis.android.core.analytics
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.dataelement.DataElementCollectionRepository
 import org.hisp.dhis.android.core.indicator.IndicatorCollectionRepository
 import org.hisp.dhis.android.core.legendset.LegendCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
+import javax.inject.Inject
 
 @Suppress("TooGenericExceptionCaught")
 internal class LegendEvaluator @Inject constructor(
@@ -41,11 +41,11 @@ internal class LegendEvaluator @Inject constructor(
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     private val indicatorRepository: IndicatorCollectionRepository,
     private val legendRepository: LegendCollectionRepository,
-    private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository
+    private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository,
 ) {
     fun getLegendByProgramIndicator(
         programIndicatorUid: String,
-        value: String?
+        value: String?,
     ): String? {
         return if (value == null) {
             null
@@ -67,7 +67,7 @@ internal class LegendEvaluator @Inject constructor(
 
     fun getLegendByDataElement(
         dataElementUid: String,
-        value: String?
+        value: String?,
     ): String? {
         return if (value == null) {
             null
@@ -89,7 +89,7 @@ internal class LegendEvaluator @Inject constructor(
 
     fun getLegendByTrackedEntityAttribute(
         trackedEntityAttributeUid: String,
-        value: String?
+        value: String?,
     ): String? {
         return if (value == null) {
             null
@@ -111,7 +111,7 @@ internal class LegendEvaluator @Inject constructor(
 
     fun getLegendByIndicator(
         indicatorUid: String,
-        value: String?
+        value: String?,
     ): String? {
         return if (value == null) {
             null
@@ -133,7 +133,7 @@ internal class LegendEvaluator @Inject constructor(
 
     fun getLegendByLegendSet(
         legendSetUid: String,
-        value: String?
+        value: String?,
     ): String? {
         return if (value == null || value.toDouble().isNaN()) {
             null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AnalyticsModel.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AnalyticsModel.kt
index 3ec7abc445..e625db63c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AnalyticsModel.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AnalyticsModel.kt
@@ -70,17 +70,17 @@ sealed class MetadataItem(val id: String, val displayName: String) {
     class OrganisationUnitItem(val item: OrganisationUnit) : MetadataItem(item.uid(), item.displayName()!!)
     class OrganisationUnitLevelItem(
         val item: OrganisationUnitLevel,
-        val organisationUnitUids: List<String>
+        val organisationUnitUids: List<String>,
     ) : MetadataItem(item.uid(), item.displayName()!!)
 
     class OrganisationUnitGroupItem(
         val item: OrganisationUnitGroup,
-        val organisationUnitUids: List<String>
+        val organisationUnitUids: List<String>,
     ) : MetadataItem(item.uid(), item.displayName()!!)
 
     class OrganisationUnitRelativeItem(
         val item: RelativeOrganisationUnit,
-        val organisationUnitUids: List<String>
+        val organisationUnitUids: List<String>,
     ) : MetadataItem(item.name, item.name)
 
     class PeriodItem(val item: Period) : MetadataItem(item.periodId()!!, item.periodId()!!)
@@ -126,7 +126,7 @@ sealed class DimensionItem(val dimension: Dimension, val id: String) {
 
     class CategoryItem(
         val uid: String,
-        val categoryOption: String
+        val categoryOption: String,
     ) : DimensionItem(Dimension.Category(uid), categoryOption), AbsoluteDimensionItem
 }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/DimensionalResponse.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/DimensionalResponse.kt
index 0c762f7759..967330812e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/DimensionalResponse.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/DimensionalResponse.kt
@@ -33,11 +33,11 @@ data class DimensionalResponse(
     val dimensions: List<Dimension>,
     val dimensionItems: Map<Dimension, List<DimensionItem>>,
     val filters: List<String>,
-    val values: List<DimensionalValue>
+    val values: List<DimensionalValue>,
 )
 
 data class DimensionalValue(
     val dimensions: List<String>,
     val value: String?,
-    val legend: String?
+    val legend: String?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/GridAnalyticsResponse.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/GridAnalyticsResponse.kt
index aa42cff22b..8f8af1646b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/GridAnalyticsResponse.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/GridAnalyticsResponse.kt
@@ -34,27 +34,27 @@ data class GridAnalyticsResponse(
     val dimensions: GridDimension,
     val dimensionItems: Map<Dimension, List<DimensionItem>>,
     val filters: List<String>,
-    val values: List<List<GridResponseValue>>
+    val values: List<List<GridResponseValue>>,
 )
 
 data class GridHeader(
     val columns: List<List<GridHeaderItem>>,
-    val rows: List<List<GridHeaderItem>>
+    val rows: List<List<GridHeaderItem>>,
 )
 
 data class GridHeaderItem(
     val id: String,
-    val weight: Int
+    val weight: Int,
 )
 
 data class GridDimension(
     val columns: List<Dimension>,
-    val rows: List<Dimension>
+    val rows: List<Dimension>,
 )
 
 data class GridResponseValue(
     val columns: List<String>,
     val rows: List<String>,
     val value: String?,
-    val legend: String?
+    val legend: String?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
index 81726a22cb..825f876713 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
@@ -39,12 +38,13 @@ import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLeve
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import javax.inject.Inject
 
 internal class AnalyticsOrganisationUnitHelper @Inject constructor(
     private val userOrganisationUnitStore: UserOrganisationUnitLinkStore,
     private val organisationUnitStore: OrganisationUnitStore,
     private val organisationUnitLevelStore: OrganisationUnitLevelStore,
-    private val organisationUnitOrganisationUnitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore
+    private val organisationUnitOrganisationUnitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore,
 ) {
 
     fun getRelativeOrganisationUnitUids(relative: RelativeOrganisationUnit): List<String> {
@@ -63,12 +63,12 @@ internal class AnalyticsOrganisationUnitHelper @Inject constructor(
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 OrganisationUnitTableInfo.Columns.UID,
-                relativeOrganisationUnitsUids
+                relativeOrganisationUnitsUids,
             ).build()
 
         return organisationUnitStore.selectUidsWhere(
             whereClause,
-            "${OrganisationUnitTableInfo.Columns.NAME} ${RepositoryScope.OrderByDirection.ASC}"
+            "${OrganisationUnitTableInfo.Columns.NAME} ${RepositoryScope.OrderByDirection.ASC}",
         )
     }
 
@@ -90,12 +90,12 @@ internal class AnalyticsOrganisationUnitHelper @Inject constructor(
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(
                 OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP,
-                groupUid
+                groupUid,
             ).build()
 
         return organisationUnitOrganisationUnitGroupLinkStore.selectStringColumnsWhereClause(
             OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT,
-            whereClause
+            whereClause,
         ).distinct()
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt
index 2209c4cb15..fcab21ab63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsRepository
@@ -37,10 +36,11 @@ import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionalResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.AggregationType
+import javax.inject.Inject
 
 internal class AnalyticsRepositoryImpl @Inject constructor(
     private val params: AnalyticsRepositoryParams,
-    private val analyticsService: AnalyticsService
+    private val analyticsService: AnalyticsService,
 ) : AnalyticsRepository {
 
     override fun withDimension(dimensionItem: DimensionItem): AnalyticsRepositoryImpl {
@@ -68,7 +68,7 @@ internal class AnalyticsRepositoryImpl @Inject constructor(
     }
 
     private fun updateParams(
-        func: (params: AnalyticsRepositoryParams) -> AnalyticsRepositoryParams
+        func: (params: AnalyticsRepositoryParams) -> AnalyticsRepositoryParams,
     ): AnalyticsRepositoryImpl {
         return AnalyticsRepositoryImpl(func(params), analyticsService)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryParams.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryParams.kt
index 84e32c7c3e..ec13c0a724 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryParams.kt
@@ -36,5 +36,5 @@ internal data class AnalyticsRepositoryParams(
     val dimensions: List<DimensionItem>,
     val filters: List<DimensionItem>,
     val analyticsLegendStrategy: AnalyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem,
-    val aggregationType: AggregationType = AggregationType.DEFAULT
+    val aggregationType: AggregationType = AggregationType.DEFAULT,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt
index efd6abad91..9a2eaf4690 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt
@@ -29,18 +29,18 @@
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
 import android.database.sqlite.SQLiteException
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionalResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.antlr.ParserException
+import javax.inject.Inject
 
 internal class AnalyticsService @Inject constructor(
     private val analyticsServiceDimensionHelper: AnalyticsServiceDimensionHelper,
     private val analyticsServiceMetadataHelper: AnalyticsServiceMetadataHelper,
-    private val analyticsServiceEvaluatorHelper: AnalyticsServiceEvaluatorHelper
+    private val analyticsServiceEvaluatorHelper: AnalyticsServiceEvaluatorHelper,
 ) {
 
     fun evaluate(params: AnalyticsRepositoryParams): Result<DimensionalResponse, AnalyticsException> {
@@ -80,8 +80,8 @@ internal class AnalyticsService @Inject constructor(
                     dimensions = queryDimensions,
                     dimensionItems = dimensionItemsMap,
                     filters = params.filters.map { it.id },
-                    values = values
-                )
+                    values = values,
+                ),
             )
         } catch (e: AnalyticsException) {
             Result.Failure(e)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt
index 98f0eb781b..5e6b3d7576 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt
@@ -28,17 +28,17 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.AbsoluteDimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import javax.inject.Inject
 
 internal class AnalyticsServiceDimensionHelper @Inject constructor(
     private val periodGenerator: ParentPeriodGenerator,
     private val periodHelper: PeriodHelper,
-    private val analyticsOrganisationUnitHelper: AnalyticsOrganisationUnitHelper
+    private val analyticsOrganisationUnitHelper: AnalyticsOrganisationUnitHelper,
 ) {
 
     fun getQueryDimensions(params: AnalyticsRepositoryParams): List<Dimension> {
@@ -50,7 +50,7 @@ internal class AnalyticsServiceDimensionHelper @Inject constructor(
      */
     fun getQueryAbsoluteDimensionItems(
         queryDimensionItems: List<DimensionItem>,
-        dimensions: List<Dimension>
+        dimensions: List<Dimension>,
     ): Map<Dimension, List<AbsoluteDimensionItem>> {
         return dimensions.associateWith { dimension ->
             queryDimensionItems
@@ -67,7 +67,7 @@ internal class AnalyticsServiceDimensionHelper @Inject constructor(
 
     fun getEvaluationItems(
         params: AnalyticsRepositoryParams,
-        queryAbsoluteDimensionItems: Map<Dimension, List<AbsoluteDimensionItem>>
+        queryAbsoluteDimensionItems: Map<Dimension, List<AbsoluteDimensionItem>>,
     ): List<AnalyticsServiceEvaluationItem> {
         val dimensionCartesianProductList = queryAbsoluteDimensionItems.entries
             .fold(listOf(listOf<AbsoluteDimensionItem>())) { acc, dimensionEntry ->
@@ -78,7 +78,7 @@ internal class AnalyticsServiceDimensionHelper @Inject constructor(
             AnalyticsServiceEvaluationItem(
                 dimensionItems = dimensionList,
                 filters = params.filters,
-                aggregationType = params.aggregationType
+                aggregationType = params.aggregationType,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluationItem.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluationItem.kt
index 86e6995602..5b9d632015 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluationItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluationItem.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.common.AggregationType
 internal data class AnalyticsServiceEvaluationItem(
     val dimensionItems: List<AbsoluteDimensionItem>,
     val filters: List<DimensionItem>,
-    val aggregationType: AggregationType = AggregationType.DEFAULT
+    val aggregationType: AggregationType = AggregationType.DEFAULT,
 ) {
     val allDimensionItems: List<DimensionItem> by lazy {
         (dimensionItems + filters).map { it as DimensionItem }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
index 414d7be79f..ec20fff0f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.analytics.LegendEvaluator
@@ -41,6 +40,7 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.EventD
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ExpressionDimensionItemEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.IndicatorEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ProgramIndicatorSQLEvaluator
+import javax.inject.Inject
 
 internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
     private val dataElementEvaluator: DataElementSQLEvaluator,
@@ -48,12 +48,12 @@ internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
     private val indicatorEvaluator: IndicatorEvaluator,
     private val eventDataItemEvaluator: EventDataItemSQLEvaluator,
     private val expressionDimensionItemEvaluator: ExpressionDimensionItemEvaluator,
-    private val legendEvaluator: LegendEvaluator
+    private val legendEvaluator: LegendEvaluator,
 ) {
     fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        legendStrategy: AnalyticsLegendStrategy
+        legendStrategy: AnalyticsLegendStrategy,
     ): DimensionalValue {
         val evaluator = getEvaluator(evaluationItem)
 
@@ -68,7 +68,7 @@ internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
         return DimensionalValue(
             dimensions = evaluationItem.dimensionItems.map { (it as DimensionItem).id },
             value = value,
-            legend = legend
+            legend = legend,
         )
     }
 
@@ -98,7 +98,7 @@ internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
             else ->
                 throw AnalyticsException.InvalidArguments(
                     "Invalid arguments: Only a single indicator " +
-                        "can be specified as filter."
+                        "can be specified as filter.",
                 )
         }
     }
@@ -123,27 +123,27 @@ internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
         return when (dimensionDataItem) {
             is DimensionItem.DataItem.DataElementItem -> legendEvaluator.getLegendByDataElement(
                 dimensionDataItem.uid,
-                value
+                value,
             )
             is DimensionItem.DataItem.DataElementOperandItem -> legendEvaluator.getLegendByDataElement(
                 dimensionDataItem.dataElement,
-                value
+                value,
             )
             is DimensionItem.DataItem.ProgramIndicatorItem -> legendEvaluator.getLegendByProgramIndicator(
                 dimensionDataItem.uid,
-                value
+                value,
             )
             is DimensionItem.DataItem.IndicatorItem -> legendEvaluator.getLegendByIndicator(
                 dimensionDataItem.uid,
-                value
+                value,
             )
             is DimensionItem.DataItem.EventDataItem.DataElement -> legendEvaluator.getLegendByDataElement(
                 dimensionDataItem.dataElement,
-                value
+                value,
             )
             is DimensionItem.DataItem.EventDataItem.Attribute -> legendEvaluator.getLegendByTrackedEntityAttribute(
                 dimensionDataItem.attribute,
-                value
+                value,
             )
             is DimensionItem.DataItem.ExpressionDimensionItem -> null
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
index f1ab4266c6..d1b35abf22 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
@@ -49,6 +48,7 @@ import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import javax.inject.Inject
 
 @Suppress("LongParameterList")
 internal class AnalyticsServiceMetadataHelper @Inject constructor(
@@ -67,7 +67,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     private val analyticsOrganisationUnitHelper: AnalyticsOrganisationUnitHelper,
     private val parentPeriodGenerator: ParentPeriodGenerator,
-    private val periodHelper: PeriodHelper
+    private val periodHelper: PeriodHelper,
 ) {
 
     fun getMetadata(evaluationItems: List<AnalyticsServiceEvaluationItem>): Map<String, MetadataItem> {
@@ -82,7 +82,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
 
     fun includeLegendsToMetadata(
         metadata: Map<String, MetadataItem>,
-        legendsUids: List<String>
+        legendsUids: List<String>,
     ): Map<String, MetadataItem> {
         val finalMetadata = metadata.toMutableMap()
         val legends = legendStore.selectByUids(legendsUids.distinct()).map { MetadataItem.LegendItem(it) }
@@ -136,7 +136,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
                     MetadataItem.DataElementOperandItem(
                         dataElementOperand,
                         dataElement.displayName()!!,
-                        coc.displayName()
+                        coc.displayName(),
                     )
                 }
 
@@ -174,7 +174,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
 
                     MetadataItem.ExpressionDimensionItemItem(expressionItem)
                 }
-            }
+            },
         )
     }
 
@@ -189,7 +189,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
                     val periods = parentPeriodGenerator.generateRelativePeriods(item.relative)
                     MetadataItem.RelativePeriodItem(item.relative, periods)
                 }
-            }
+            },
         )
     }
 
@@ -219,7 +219,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
                         val ouUids = analyticsOrganisationUnitHelper.getOrganisationUnitUidsByGroup(item.uid)
                         MetadataItem.OrganisationUnitGroupItem(group, ouUids)
                     } ?: throw AnalyticsException.InvalidOrganisationUnitGroup(item.uid)
-            }
+            },
         )
     }
 
@@ -231,7 +231,7 @@ internal class AnalyticsServiceMetadataHelper @Inject constructor(
 
             categoryOptionStore.selectByUid(item.categoryOption)
                 ?.let { categoryOption -> MetadataItem.CategoryOptionItem(categoryOption) }
-                ?: throw AnalyticsException.InvalidCategoryOption(item.categoryOption)
+                ?: throw AnalyticsException.InvalidCategoryOption(item.categoryOption),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt
index 52b35eff70..8d0ac7fc7c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt
@@ -29,16 +29,16 @@
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsVisualizationsRepository
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.GridAnalyticsResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
+import javax.inject.Inject
 
 internal class AnalyticsVisualizationsRepositoryImpl @Inject constructor(
     private val params: AnalyticsVisualizationsRepositoryParams,
-    private val service: AnalyticsVisualizationsService
+    private val service: AnalyticsVisualizationsService,
 ) : AnalyticsVisualizationsRepository {
 
     override fun withVisualization(visualization: String): AnalyticsVisualizationsRepositoryImpl {
@@ -50,7 +50,7 @@ internal class AnalyticsVisualizationsRepositoryImpl @Inject constructor(
     }
 
     override fun withOrganisationUnits(
-        orgUnits: List<DimensionItem.OrganisationUnitItem>
+        orgUnits: List<DimensionItem.OrganisationUnitItem>,
     ): AnalyticsVisualizationsRepository {
         return updateParams { params -> params.copy(organisationUnits = orgUnits) }
     }
@@ -64,7 +64,7 @@ internal class AnalyticsVisualizationsRepositoryImpl @Inject constructor(
     }
 
     private fun updateParams(
-        func: (params: AnalyticsVisualizationsRepositoryParams) -> AnalyticsVisualizationsRepositoryParams
+        func: (params: AnalyticsVisualizationsRepositoryParams) -> AnalyticsVisualizationsRepositoryParams,
     ): AnalyticsVisualizationsRepositoryImpl {
         return AnalyticsVisualizationsRepositoryImpl(func(params), service)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryParams.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryParams.kt
index 137f279f0c..84963230ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryParams.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 internal data class AnalyticsVisualizationsRepositoryParams(
     val visualization: String?,
     val periods: List<DimensionItem.PeriodItem>?,
-    val organisationUnits: List<DimensionItem.OrganisationUnitItem>?
+    val organisationUnits: List<DimensionItem.OrganisationUnitItem>?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
index 63ac80fa5e..48a8c440be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.analytics.aggregated.*
@@ -36,11 +35,12 @@ import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.visualization.LegendStrategy
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationCollectionRepository
+import javax.inject.Inject
 
 internal class AnalyticsVisualizationsService @Inject constructor(
     private val analyticsRepository: AnalyticsRepository,
     private val visualizationCollectionRepository: VisualizationCollectionRepository,
-    private val dimensionHelper: AnalyticsVisualizationsServiceDimensionHelper
+    private val dimensionHelper: AnalyticsVisualizationsServiceDimensionHelper,
 ) {
 
     fun evaluate(params: AnalyticsVisualizationsRepositoryParams): Result<GridAnalyticsResponse, AnalyticsException> {
@@ -73,7 +73,7 @@ internal class AnalyticsVisualizationsService @Inject constructor(
     @Suppress("ComplexMethod")
     private fun getDimensionalResponse(
         visualization: Visualization,
-        params: AnalyticsVisualizationsRepositoryParams
+        params: AnalyticsVisualizationsRepositoryParams,
     ): Result<DimensionalResponse, AnalyticsException> {
         var queryAnalyticsRepository = analyticsRepository
 
@@ -137,7 +137,7 @@ internal class AnalyticsVisualizationsService @Inject constructor(
 
     private fun buildGridResponse(
         visualization: Visualization,
-        dimensionalResponse: DimensionalResponse
+        dimensionalResponse: DimensionalResponse,
     ): GridAnalyticsResponse {
         val gridDimension = dimensionHelper.getGridDimensions(visualization)
 
@@ -153,7 +153,7 @@ internal class AnalyticsVisualizationsService @Inject constructor(
                     columns = value.dimensions.filterNot { rows.contains(it) },
                     rows = rows,
                     value = value.value,
-                    legend = value.legend
+                    legend = value.legend,
                 )
             }
         }
@@ -166,7 +166,7 @@ internal class AnalyticsVisualizationsService @Inject constructor(
             dimensions = gridDimension,
             dimensionItems = dimensionalResponse.dimensionItems,
             filters = dimensionalResponse.filters,
-            values = gridValues
+            values = gridValues,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
index 03a17ca4c7..9bb199ba11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
@@ -45,11 +44,12 @@ import org.hisp.dhis.android.core.visualization.DataDimensionItemType
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
+import javax.inject.Inject
 
 internal class AnalyticsVisualizationsServiceDimensionHelper @Inject constructor(
     private val categoryStore: CategoryStore,
     private val categoryOptionLinkStore: CategoryCategoryOptionLinkStore,
-    private val organisationUnitLevelStore: OrganisationUnitLevelStore
+    private val organisationUnitLevelStore: OrganisationUnitLevelStore,
 ) {
     private val dataDimension = "dx"
     private val orgUnitDimension = "ou"
@@ -133,7 +133,7 @@ internal class AnalyticsVisualizationsServiceDimensionHelper @Inject constructor
                     val level = organisationUnitLevelStore.selectOneWhere(
                         WhereClauseBuilder()
                             .appendKeyNumberValue(OrganisationUnitLevelTableInfo.Columns.LEVEL, levelNumber.toInt())
-                            .build()
+                            .build(),
                     ) ?: throw AnalyticsException.InvalidOrganisationUnitLevel(levelNumber)
                     DimensionItem.OrganisationUnitItem.Level(level.uid())
                 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelper.kt
index 7eca87d300..9e364868ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelper.kt
@@ -42,7 +42,7 @@ internal object AnalyticsDimensionHelper {
 
     @Suppress("ThrowsCount")
     inline fun <reified E : DimensionItem> getSingleItemByDimension(
-        item: AnalyticsServiceEvaluationItem
+        item: AnalyticsServiceEvaluationItem,
     ): List<E> {
         val dimensionItems = item.dimensionItems.filterIsInstance<E>()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluator.kt
index 2e810a4e39..d49a170c39 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluator.kt
@@ -37,12 +37,12 @@ internal interface AnalyticsEvaluator {
     fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods? = null
+        queryMods: QueryMods? = null,
     ): String?
 
     fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods? = null
+        queryMods: QueryMods? = null,
     ): String?
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluatorHelper.kt
index 647a9fb60f..88e304b86c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsEvaluatorHelper.kt
@@ -28,21 +28,21 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import java.util.*
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
-import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo as cToCcInfo
 import org.hisp.dhis.android.core.category.CategoryDataDimensionType
-import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo as cocToCoInfo
-import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo as cocInfo
 import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodTableInfo
 import org.hisp.dhis.android.core.period.PeriodType
+import java.util.*
+import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo as cToCcInfo
+import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo as cocToCoInfo
+import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo as cocInfo
 
 /**
  * This class includes some SQL helpers to build the where clause. Dimensions might include several items, like for
@@ -67,7 +67,7 @@ internal object AnalyticsEvaluatorHelper {
         columnName: String,
         items: List<DimensionItem>,
         builder: WhereClauseBuilder,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): WhereClauseBuilder {
         val innerClause = WhereClauseBuilder().apply {
             items.map { i ->
@@ -97,7 +97,7 @@ internal object AnalyticsEvaluatorHelper {
     fun getReportingPeriods(
         items: List<DimensionItem>,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): List<Period> {
         val periods = mutableListOf<Period>().apply {
             items.forEach { i ->
@@ -133,13 +133,14 @@ internal object AnalyticsEvaluatorHelper {
 
     fun getReportingPeriodsForAggregationType(
         periods: List<Period>,
-        aggregationType: AggregationType
+        aggregationType: AggregationType,
     ): List<Period> {
         return when (aggregationType) {
             AggregationType.FIRST,
             AggregationType.FIRST_AVERAGE_ORG_UNIT,
             AggregationType.LAST,
-            AggregationType.LAST_AVERAGE_ORG_UNIT -> {
+            AggregationType.LAST_AVERAGE_ORG_UNIT,
+            -> {
                 val startDate = DateUtils.getStartDate(periods)
                 val endDate = DateUtils.getEndDate(periods)
                 startDate?.let {
@@ -153,7 +154,7 @@ internal object AnalyticsEvaluatorHelper {
 
     fun getStartDate(
         items: List<DimensionItem>,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): Date? {
         return items.map { it as DimensionItem.PeriodItem }
             .map { metadata[it.id] as MetadataItem.PeriodItem }
@@ -163,7 +164,7 @@ internal object AnalyticsEvaluatorHelper {
 
     fun getEndDate(
         items: List<DimensionItem>,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): Date? {
         return items.map { it as DimensionItem.PeriodItem }
             .map { metadata[it.id] as MetadataItem.PeriodItem }
@@ -175,15 +176,15 @@ internal object AnalyticsEvaluatorHelper {
         return "SELECT ${PeriodTableInfo.Columns.PERIOD_ID} " +
             "FROM ${PeriodTableInfo.TABLE_INFO.name()} " +
             "WHERE ${
-            periods.joinToString(" OR ") {
-                "(${
-                getPeriodWhereClause(
-                    PeriodTableInfo.Columns.START_DATE,
-                    PeriodTableInfo.Columns.END_DATE,
-                    it
-                )
-                })"
-            }
+                periods.joinToString(" OR ") {
+                    "(${
+                        getPeriodWhereClause(
+                            PeriodTableInfo.Columns.START_DATE,
+                            PeriodTableInfo.Columns.END_DATE,
+                            it,
+                        )
+                    })"
+                }
             }"
     }
 
@@ -224,7 +225,7 @@ internal object AnalyticsEvaluatorHelper {
         disaggregationColumnName: String?,
         items: List<DimensionItem>,
         builder: WhereClauseBuilder,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): WhereClauseBuilder {
         val innerClause = WhereClauseBuilder().apply {
             items.map { it as DimensionItem.CategoryItem }.map { item ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
index cad64bb0b9..a635dd6599 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
@@ -38,19 +37,20 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
-import org.hisp.dhis.android.core.datavalue.DataValueTableInfo.Columns as dvColumns
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.period.PeriodTableInfo
+import javax.inject.Inject
+import org.hisp.dhis.android.core.datavalue.DataValueTableInfo.Columns as dvColumns
 import org.hisp.dhis.android.core.period.PeriodTableInfo.Columns as peColumns
 
 internal class DataElementSQLEvaluator @Inject constructor(
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val sqlQuery = getSql(evaluationItem, metadata, queryMods)
 
@@ -64,7 +64,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -88,7 +88,8 @@ internal class DataElementSQLEvaluator @Inject constructor(
             AggregationType.SUM,
             AggregationType.COUNT,
             AggregationType.MIN,
-            AggregationType.MAX -> {
+            AggregationType.MAX,
+            -> {
                 "SELECT ${aggregator.sql}(${dvColumns.VALUE}) " +
                     "FROM ${DataValueTableInfo.TABLE_INFO.name()} " +
                     "WHERE $whereClause"
@@ -111,12 +112,14 @@ internal class DataElementSQLEvaluator @Inject constructor(
                     "FROM (${firstOrLastValueClauseByOrgunit(whereClause, "MIN")})"
             }
             AggregationType.LAST,
-            AggregationType.LAST_IN_PERIOD -> {
+            AggregationType.LAST_IN_PERIOD,
+            -> {
                 "SELECT SUM(${dvColumns.VALUE}) " +
                     "FROM (${firstOrLastValueClauseByOrgunit(whereClause, "MAX")})"
             }
             AggregationType.LAST_AVERAGE_ORG_UNIT,
-            AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT -> {
+            AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
+            -> {
                 "SELECT AVG(${dvColumns.VALUE}) " +
                     "FROM (${firstOrLastValueClauseByOrgunit(whereClause, "MAX")})"
             }
@@ -129,7 +132,8 @@ internal class DataElementSQLEvaluator @Inject constructor(
             AggregationType.STDDEV,
             AggregationType.VARIANCE,
             AggregationType.DEFAULT,
-            AggregationType.NONE -> throw AnalyticsException.UnsupportedAggregationType(aggregator)
+            AggregationType.NONE,
+            -> throw AnalyticsException.UnsupportedAggregationType(aggregator)
         }
     }
 
@@ -156,7 +160,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
 
     private fun appendDataWhereClause(
         items: List<DimensionItem>,
-        builder: WhereClauseBuilder
+        builder: WhereClauseBuilder,
     ): WhereClauseBuilder {
         val innerClause = items.map { it as DimensionItem.DataItem }
             .foldRight(WhereClauseBuilder()) { item, innerBuilder ->
@@ -168,7 +172,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
                             .appendKeyStringValue(DataValueTableInfo.Columns.DATA_ELEMENT, item.dataElement)
                             .appendKeyStringValue(
                                 DataValueTableInfo.Columns.CATEGORY_OPTION_COMBO,
-                                item.categoryOptionCombo
+                                item.categoryOptionCombo,
                             )
                             .build()
                         innerBuilder.appendOrComplexQuery(operandClause)
@@ -176,7 +180,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
                     else ->
                         throw AnalyticsException.InvalidArguments(
                             "Invalid arguments: unexpected " +
-                                "dataItem ${item.javaClass.name} in DataElement Evaluator."
+                                "dataItem ${item.javaClass.name} in DataElement Evaluator.",
                         )
                 }
             }.build()
@@ -189,41 +193,41 @@ internal class DataElementSQLEvaluator @Inject constructor(
         builder: WhereClauseBuilder,
         metadata: Map<String, MetadataItem>,
         aggregationType: AggregationType,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): WhereClauseBuilder {
         val reportingPeriods = AnalyticsEvaluatorHelper.getReportingPeriods(items, metadata, queryMods)
         val periods = AnalyticsEvaluatorHelper.getReportingPeriodsForAggregationType(reportingPeriods, aggregationType)
 
         return builder.appendInSubQuery(
             DataValueTableInfo.Columns.PERIOD,
-            AnalyticsEvaluatorHelper.getInPeriodsClause(periods)
+            AnalyticsEvaluatorHelper.getInPeriodsClause(periods),
         )
     }
 
     private fun appendOrgunitWhereClause(
         items: List<DimensionItem>,
         builder: WhereClauseBuilder,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): WhereClauseBuilder {
         return AnalyticsEvaluatorHelper.appendOrgunitWhereClause(
             columnName = DataValueTableInfo.Columns.ORGANISATION_UNIT,
             items = items,
             builder = builder,
-            metadata = metadata
+            metadata = metadata,
         )
     }
 
     private fun appendCategoryWhereClause(
         items: List<DimensionItem>,
         builder: WhereClauseBuilder,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): WhereClauseBuilder {
         return AnalyticsEvaluatorHelper.appendCategoryWhereClause(
             attributeColumnName = DataValueTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
             disaggregationColumnName = DataValueTableInfo.Columns.CATEGORY_OPTION_COMBO,
             items = items,
             builder = builder,
-            metadata = metadata
+            metadata = metadata,
         )
     }
 
@@ -243,7 +247,7 @@ internal class DataElementSQLEvaluator @Inject constructor(
     private fun getAggregator(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): AggregationType {
         val itemList: List<DimensionItem.DataItem> = AnalyticsDimensionHelper.getSingleItemByDimension(evaluationItem)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
index eecd3ef1e9..bb4054d97a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
@@ -41,18 +40,19 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo.Columns as tavColumns
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import javax.inject.Inject
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo.Columns as tavColumns
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo.Columns as dvColumns
 
 internal class EventDataItemSQLEvaluator @Inject constructor(
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val sqlQuery = getSql(evaluationItem, metadata, queryMods)
 
@@ -66,7 +66,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -91,7 +91,8 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
             AggregationType.SUM,
             AggregationType.COUNT,
             AggregationType.MIN,
-            AggregationType.MAX -> {
+            AggregationType.MAX,
+            -> {
                 "SELECT ${aggregator.sql}($valueColumn) " +
                     "FROM $fromClause " +
                     "WHERE $whereClause"
@@ -114,12 +115,14 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
                     "FROM (${firstOrLastValueClauseByOrunit(valueColumn, fromClause, whereClause, "MIN")})"
             }
             AggregationType.LAST,
-            AggregationType.LAST_IN_PERIOD -> {
+            AggregationType.LAST_IN_PERIOD,
+            -> {
                 "SELECT SUM(${dvColumns.VALUE}) " +
                     "FROM (${firstOrLastValueClauseByOrunit(valueColumn, fromClause, whereClause, "MAX")})"
             }
             AggregationType.LAST_AVERAGE_ORG_UNIT,
-            AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT -> {
+            AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
+            -> {
                 "SELECT AVG(${dvColumns.VALUE}) " +
                     "FROM (${firstOrLastValueClauseByOrunit(valueColumn, fromClause, whereClause, "MAX")})"
             }
@@ -132,12 +135,13 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
             AggregationType.STDDEV,
             AggregationType.VARIANCE,
             AggregationType.DEFAULT,
-            AggregationType.NONE -> throw AnalyticsException.UnsupportedAggregationType(aggregator)
+            AggregationType.NONE,
+            -> throw AnalyticsException.UnsupportedAggregationType(aggregator)
         }
     }
 
     private fun getEventDataItemSQLItems(
-        eventDataItem: DimensionItem.DataItem.EventDataItem
+        eventDataItem: DimensionItem.DataItem.EventDataItem,
     ): Pair<String, String> {
         return when (eventDataItem) {
             is DimensionItem.DataItem.EventDataItem.DataElement ->
@@ -167,7 +171,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
         valueColumn: String,
         fromClause: String,
         whereClause: String,
-        minOrMax: String
+        minOrMax: String,
     ): String {
         val firstOrLastValueClause = "SELECT " +
             "$valueColumn, " +
@@ -186,7 +190,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
 
     private fun appendDataWhereClause(
         items: List<DimensionItem>,
-        builder: WhereClauseBuilder
+        builder: WhereClauseBuilder,
     ): WhereClauseBuilder {
         val innerClause = items.map { it as DimensionItem.DataItem }
             .foldRight(WhereClauseBuilder()) { item, innerBuilder ->
@@ -195,11 +199,11 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
                         val operandClause = WhereClauseBuilder()
                             .appendKeyStringValue(
                                 "$dataValueAlias.${TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT}",
-                                item.dataElement
+                                item.dataElement,
                             )
                             .appendKeyStringValue(
                                 "$eventAlias.${EventTableInfo.Columns.PROGRAM}",
-                                item.program
+                                item.program,
                             )
                             .build()
                         innerBuilder.appendOrComplexQuery(operandClause)
@@ -208,11 +212,11 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
                         val operandClause = WhereClauseBuilder()
                             .appendKeyStringValue(
                                 "$attAlias.${TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE}",
-                                item.attribute
+                                item.attribute,
                             )
                             .appendKeyStringValue(
                                 "$eventAlias.${EventTableInfo.Columns.PROGRAM}",
-                                item.program
+                                item.program,
                             )
                             .build()
                         innerBuilder.appendOrComplexQuery(operandClause)
@@ -220,7 +224,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
                     else ->
                         throw AnalyticsException.InvalidArguments(
                             "Invalid arguments: unexpected " +
-                                "dataItem ${item.javaClass.name} in EventDataItem Evaluator."
+                                "dataItem ${item.javaClass.name} in EventDataItem Evaluator.",
                         )
                 }
             }.build()
@@ -233,7 +237,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
         builder: WhereClauseBuilder,
         metadata: Map<String, MetadataItem>,
         aggregation: AggregationType,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): WhereClauseBuilder {
         val reportingPeriods = AnalyticsEvaluatorHelper.getReportingPeriods(items, metadata, queryMods)
 
@@ -245,11 +249,11 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
 
             val innerClause = periods.joinToString(" OR ") {
                 "(${
-                AnalyticsEvaluatorHelper.getPeriodWhereClause(
-                    columnStart = eventDateColumn,
-                    columnEnd = eventDateColumn,
-                    period = it
-                )
+                    AnalyticsEvaluatorHelper.getPeriodWhereClause(
+                        columnStart = eventDateColumn,
+                        columnEnd = eventDateColumn,
+                        period = it,
+                    )
                 })"
             }
 
@@ -260,32 +264,32 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
     private fun appendOrgunitWhereClause(
         items: List<DimensionItem>,
         builder: WhereClauseBuilder,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): WhereClauseBuilder {
         return AnalyticsEvaluatorHelper.appendOrgunitWhereClause(
             columnName = "$eventAlias.${EventTableInfo.Columns.ORGANISATION_UNIT}",
             items = items,
             builder = builder,
-            metadata = metadata
+            metadata = metadata,
         )
     }
 
     private fun appendCategoryWhereClause(
         items: List<DimensionItem>,
         builder: WhereClauseBuilder,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): WhereClauseBuilder {
         return AnalyticsEvaluatorHelper.appendCategoryWhereClause(
             attributeColumnName = "$eventAlias.${EventTableInfo.Columns.ATTRIBUTE_OPTION_COMBO}",
             disaggregationColumnName = null,
             items = items,
             builder = builder,
-            metadata = metadata
+            metadata = metadata,
         )
     }
 
     private fun getEventDataItems(
-        evaluationItem: AnalyticsServiceEvaluationItem
+        evaluationItem: AnalyticsServiceEvaluationItem,
     ): List<DimensionItem.DataItem.EventDataItem> {
         return AnalyticsDimensionHelper.getSingleItemByDimension(evaluationItem)
     }
@@ -294,7 +298,7 @@ internal class EventDataItemSQLEvaluator @Inject constructor(
         evaluationItem: AnalyticsServiceEvaluationItem,
         item: DimensionItem.DataItem.EventDataItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): AggregationType {
         return if (queryMods?.aggregationType?.let { it != AggregationType.DEFAULT } == true) {
             queryMods.aggregationType!!
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
index b809e7f39b..d731951c36 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
@@ -27,21 +27,21 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.expressiondimensionitemengine.ExpressionDimensionItemEngine
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
+import javax.inject.Inject
 
 internal class ExpressionDimensionItemEvaluator @Inject constructor(
-    private val expressionDimensionItemEngine: ExpressionDimensionItemEngine
+    private val expressionDimensionItemEngine: ExpressionDimensionItemEngine,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val item = ExpressionDimensionItemEvaluatorHelper.getItem(evaluationItem, metadata)
         val contextEvaluationItem = ExpressionDimensionItemEvaluatorHelper
@@ -50,14 +50,14 @@ internal class ExpressionDimensionItemEvaluator @Inject constructor(
         return expressionDimensionItemEngine.evaluateIndicator(
             expressionDimensionItem = item,
             contextEvaluationItem = contextEvaluationItem,
-            contextMetadata = metadata
+            contextMetadata = metadata,
         )
     }
 
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         throw AnalyticsException.SQLException("Method getSql not implemented for ExpressionDimensionItemEvaluator")
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorHelper.kt
index 4091d00a10..092ddea3b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluatorHelper.kt
@@ -37,7 +37,7 @@ internal object ExpressionDimensionItemEvaluatorHelper {
 
     fun getItem(
         evaluationItem: AnalyticsServiceEvaluationItem,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): ExpressionDimensionItem {
         val expressionDimensionItem = evaluationItem.allDimensionItems
             .find { it is DimensionItem.DataItem.ExpressionDimensionItem }
@@ -48,12 +48,12 @@ internal object ExpressionDimensionItemEvaluatorHelper {
 
     fun getContextEvaluationItem(
         evaluationItem: AnalyticsServiceEvaluationItem,
-        item: ExpressionDimensionItem
+        item: ExpressionDimensionItem,
     ): AnalyticsServiceEvaluationItem {
         return AnalyticsServiceEvaluationItem(
             dimensionItems = evaluationItem.dimensionItems.filter { (it as DimensionItem).id != item.uid() },
             filters = evaluationItem.filters.filter { it.id != item.uid() },
-            aggregationType = evaluationItem.aggregationType
+            aggregationType = evaluationItem.aggregationType,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
index d4c42cc7a7..d73a9266d4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
@@ -27,21 +27,21 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine.IndicatorEngine
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
+import javax.inject.Inject
 
 internal class IndicatorEvaluator @Inject constructor(
-    private val indicatorEngine: IndicatorEngine
+    private val indicatorEngine: IndicatorEngine,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val indicator = IndicatorEvaluatorHelper.getIndicator(evaluationItem, metadata)
         val contextEvaluationItem = IndicatorEvaluatorHelper.getContextEvaluationItem(evaluationItem, indicator)
@@ -49,14 +49,14 @@ internal class IndicatorEvaluator @Inject constructor(
         return indicatorEngine.evaluateIndicator(
             indicator = indicator,
             contextEvaluationItem = contextEvaluationItem,
-            contextMetadata = metadata
+            contextMetadata = metadata,
         )
     }
 
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         throw AnalyticsException.SQLException("Method getSql not implemented for ProgramIndicatorEvaluator")
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorHelper.kt
index 4ba1d90fd0..ee84b13a04 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluatorHelper.kt
@@ -37,7 +37,7 @@ internal object IndicatorEvaluatorHelper {
 
     fun getIndicator(
         evaluationItem: AnalyticsServiceEvaluationItem,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): Indicator {
         val indicatorItem = evaluationItem.allDimensionItems
             .find { it is DimensionItem.DataItem.IndicatorItem }
@@ -48,12 +48,12 @@ internal object IndicatorEvaluatorHelper {
 
     fun getContextEvaluationItem(
         evaluationItem: AnalyticsServiceEvaluationItem,
-        indicator: Indicator
+        indicator: Indicator,
     ): AnalyticsServiceEvaluationItem {
         return AnalyticsServiceEvaluationItem(
             dimensionItems = evaluationItem.dimensionItems.filter { (it as DimensionItem).id != indicator.uid() },
             filters = evaluationItem.filters.filter { it.id != indicator.uid() },
-            aggregationType = evaluationItem.aggregationType
+            aggregationType = evaluationItem.aggregationType,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
index 5d409da792..78bb9fed25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
@@ -27,20 +27,20 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine.IndicatorSQLEngine
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
+import javax.inject.Inject
 
 internal class IndicatorSQLEvaluator @Inject constructor(
-    private val indicatorEngine: IndicatorSQLEngine
+    private val indicatorEngine: IndicatorSQLEngine,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val indicator = IndicatorEvaluatorHelper.getIndicator(evaluationItem, metadata)
         val contextEvaluationItem = IndicatorEvaluatorHelper.getContextEvaluationItem(evaluationItem, indicator)
@@ -48,14 +48,14 @@ internal class IndicatorSQLEvaluator @Inject constructor(
         return indicatorEngine.evaluateIndicator(
             indicator = indicator,
             contextEvaluationItem = contextEvaluationItem,
-            contextMetadata = metadata
+            contextMetadata = metadata,
         )
     }
 
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val indicator = IndicatorEvaluatorHelper.getIndicator(evaluationItem, metadata)
         val contextEvaluationItem = IndicatorEvaluatorHelper.getContextEvaluationItem(evaluationItem, indicator)
@@ -63,7 +63,7 @@ internal class IndicatorSQLEvaluator @Inject constructor(
         return indicatorEngine.getSql(
             indicator = indicator,
             contextEvaluationItem = contextEvaluationItem,
-            contextMetadata = metadata
+            contextMetadata = metadata,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
index ceb116625f..31f1ab20a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
@@ -43,17 +42,18 @@ import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.enrollment
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.event
+import javax.inject.Inject
 
 internal class ProgramIndicatorEvaluator @Inject constructor(
     private val eventStore: EventStore,
     private val enrollmentStore: EnrollmentStore,
-    private val programIndicatorEngine: ProgramIndicatorEngine
+    private val programIndicatorEngine: ProgramIndicatorEngine,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val programIndicator = ProgramIndicatorEvaluatorHelper.getProgramIndicator(evaluationItem, metadata)
 
@@ -72,7 +72,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         throw AnalyticsException.SQLException("Method getSql not implemented for ProgramIndicatorEvaluator")
     }
@@ -81,7 +81,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): List<String?> {
         return getFilteredEventUids(programIndicator, evaluationItem, metadata, queryMods).map {
             programIndicatorEngine.getEventProgramIndicatorValue(it, programIndicator.uid())
@@ -92,7 +92,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): List<String> {
         val whereClause = ProgramIndicatorEvaluatorHelper
             .getEventWhereClause(programIndicator, evaluationItem, metadata, queryMods)
@@ -105,7 +105,7 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): List<String?> {
         return getFilteredEnrollmentUids(programIndicator, evaluationItem, metadata, queryMods).map {
             programIndicatorEngine.getEnrollmentProgramIndicatorValue(it, programIndicator.uid())
@@ -116,14 +116,14 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): List<String> {
         val whereClause =
             ProgramIndicatorEvaluatorHelper.getEnrollmentWhereClause(
                 programIndicator,
                 evaluationItem,
                 metadata,
-                queryMods
+                queryMods,
             )
 
         val rawClause = "SELECT * FROM ${EnrollmentTableInfo.TABLE_INFO.name()} $enrollment WHERE $whereClause"
@@ -139,10 +139,12 @@ internal class ProgramIndicatorEvaluator @Inject constructor(
                 AggregationType.MAX -> floatValues.maxOrNull()
                 AggregationType.MIN -> floatValues.minOrNull()
                 AggregationType.AVERAGE,
-                AggregationType.AVERAGE_SUM_ORG_UNIT -> floatValues.average().toFloat()
+                AggregationType.AVERAGE_SUM_ORG_UNIT,
+                -> floatValues.average().toFloat()
                 AggregationType.COUNT -> floatValues.size.toFloat()
                 AggregationType.LAST,
-                AggregationType.LAST_AVERAGE_ORG_UNIT -> floatValues.lastOrNull()
+                AggregationType.LAST_AVERAGE_ORG_UNIT,
+                -> floatValues.lastOrNull()
                 else -> floatValues.sum()
             }.toString()
         } catch (e: NumberFormatException) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt
index e36e2775f2..af4cb1743e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluatorHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import java.util.*
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
@@ -49,13 +48,14 @@ import org.hisp.dhis.android.core.program.programindicatorengine.internal.Progra
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.event
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import java.util.*
 
 @Suppress("TooManyFunctions")
 internal object ProgramIndicatorEvaluatorHelper {
 
     fun getProgramIndicator(
         evaluationItem: AnalyticsServiceEvaluationItem,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): ProgramIndicator {
         val programIndicatorItem = evaluationItem.allDimensionItems
             .find { it is DimensionItem.DataItem.ProgramIndicatorItem }
@@ -71,12 +71,12 @@ internal object ProgramIndicatorEvaluatorHelper {
                     hasDefaultTargetBoundaries(
                         programIndicator,
                         AnalyticsType.EVENT,
-                        BoundaryTargetType.EventDate
+                        BoundaryTargetType.EventDate,
                     ) ||
                         hasDefaultTargetBoundaries(
                             programIndicator,
                             AnalyticsType.ENROLLMENT,
-                            BoundaryTargetType.EnrollmentDate
+                            BoundaryTargetType.EnrollmentDate,
                         )
                     )
         } ?: false
@@ -85,7 +85,7 @@ internal object ProgramIndicatorEvaluatorHelper {
     private fun hasDefaultTargetBoundaries(
         programIndicator: ProgramIndicator,
         type: AnalyticsType,
-        targetType: BoundaryTargetType
+        targetType: BoundaryTargetType,
     ): Boolean {
         val hasTargetTypeAndNoOffset = programIndicator.analyticsPeriodBoundaries()!!.all {
             it.boundaryTargetType() == targetType &&
@@ -111,7 +111,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -120,13 +120,13 @@ internal object ProgramIndicatorEvaluatorHelper {
                 WhereClauseBuilder().apply {
                     appendOrKeyNumberValue(EventTableInfo.Columns.DELETED, 0)
                     appendOrIsNullValue(EventTableInfo.Columns.DELETED)
-                }.build()
+                }.build(),
             )
             appendInSubQuery(
                 EventTableInfo.Columns.PROGRAM_STAGE,
                 "SELECT ${ProgramStageTableInfo.Columns.UID} " +
                     "FROM ${ProgramStageTableInfo.TABLE_INFO.name()} " +
-                    "WHERE ${ProgramStageTableInfo.Columns.PROGRAM} = '${programIndicator.program()?.uid()}'"
+                    "WHERE ${ProgramStageTableInfo.Columns.PROGRAM} = '${programIndicator.program()?.uid()}'",
             )
 
             items.entries.forEach { entry ->
@@ -138,7 +138,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                             dimensions = entry.value,
                             builder = this,
                             metadata = metadata,
-                            queryMods = queryMods
+                            queryMods = queryMods,
                         )
                     }
                     is Dimension.OrganisationUnit ->
@@ -146,7 +146,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                             columnName = EventTableInfo.Columns.ORGANISATION_UNIT,
                             items = entry.value,
                             builder = this,
-                            metadata = metadata
+                            metadata = metadata,
                         )
                     is Dimension.Category ->
                         AnalyticsEvaluatorHelper.appendCategoryWhereClause(
@@ -154,7 +154,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                             disaggregationColumnName = null,
                             items = entry.value,
                             builder = this,
-                            metadata = metadata
+                            metadata = metadata,
                         )
                     else -> {
                     }
@@ -167,7 +167,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         programIndicator: ProgramIndicator,
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val items = AnalyticsDimensionHelper.getItemsByDimension(evaluationItem)
 
@@ -176,7 +176,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                 WhereClauseBuilder().apply {
                     appendOrKeyNumberValue(EnrollmentTableInfo.Columns.DELETED, 0)
                     appendOrIsNullValue(EnrollmentTableInfo.Columns.DELETED)
-                }.build()
+                }.build(),
             )
             appendKeyStringValue(EnrollmentTableInfo.Columns.PROGRAM, programIndicator.program()?.uid())
 
@@ -189,14 +189,14 @@ internal object ProgramIndicatorEvaluatorHelper {
                             dimensions = entry.value,
                             builder = this,
                             metadata = metadata,
-                            queryMods = queryMods
+                            queryMods = queryMods,
                         )
                     is Dimension.OrganisationUnit ->
                         AnalyticsEvaluatorHelper.appendOrgunitWhereClause(
                             columnName = EnrollmentTableInfo.Columns.ORGANISATION_UNIT,
                             items = entry.value,
                             builder = this,
-                            metadata = metadata
+                            metadata = metadata,
                         )
                     is Dimension.Category -> TODO()
                     else -> {
@@ -213,7 +213,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         programIndicator: ProgramIndicator,
         defaultColumn: String,
         builder: WhereClauseBuilder,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ) {
         if (hasDefaultBoundaries(programIndicator)) {
             builder.appendComplexQuery(
@@ -221,8 +221,8 @@ internal object ProgramIndicatorEvaluatorHelper {
                     column = defaultColumn,
                     dimensions = dimensions,
                     metadata = metadata,
-                    queryMods = queryMods
-                )
+                    queryMods = queryMods,
+                ),
             )
         } else {
             buildNonDefaultBoundariesClauses(programIndicator, dimensions, metadata).forEach {
@@ -235,7 +235,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         column: String,
         dimensions: List<DimensionItem>,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val reportingPeriods = AnalyticsEvaluatorHelper.getReportingPeriods(dimensions, metadata, queryMods)
 
@@ -245,8 +245,8 @@ internal object ProgramIndicatorEvaluatorHelper {
                     AnalyticsEvaluatorHelper.getPeriodWhereClause(
                         columnStart = column,
                         columnEnd = column,
-                        period = period
-                    )
+                        period = period,
+                    ),
                 )
             }
         }.build()
@@ -255,7 +255,7 @@ internal object ProgramIndicatorEvaluatorHelper {
     private fun buildNonDefaultBoundariesClauses(
         programIndicator: ProgramIndicator,
         dimensions: List<DimensionItem>,
-        metadata: Map<String, MetadataItem>
+        metadata: Map<String, MetadataItem>,
     ): List<String> {
         val startDate: Date? = AnalyticsEvaluatorHelper.getStartDate(dimensions, metadata)
         val endDate: Date? = AnalyticsEvaluatorHelper.getEndDate(dimensions, metadata)
@@ -281,7 +281,7 @@ internal object ProgramIndicatorEvaluatorHelper {
         boundaries: List<AnalyticsPeriodBoundary>,
         programIndicator: ProgramIndicator,
         startDate: Date,
-        endDate: Date
+        endDate: Date,
     ): List<String> {
         val analyticsType = programIndicator.analyticsType() ?: AnalyticsType.ENROLLMENT
 
@@ -318,7 +318,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                     column = TrackedEntityDataValueTableInfo.Columns.VALUE,
                     programStageUid = target.programStageUid,
                     dataElementUid = target.dataElementUid,
-                    programIndicator = programIndicator
+                    programIndicator = programIndicator,
                 )
                 boundaries.map { getBoundaryCondition(targetColumn, it, startDate, endDate) }
             }
@@ -327,7 +327,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                 val targetColumn = ProgramIndicatorSQLUtils.getAttributeWhereClause(
                     column = TrackedEntityAttributeValueTableInfo.Columns.VALUE,
                     attributeUid = target.attributeUid,
-                    programIndicator = programIndicator
+                    programIndicator = programIndicator,
                 )
                 boundaries.map { getBoundaryCondition(targetColumn, it, startDate, endDate) }
             }
@@ -342,7 +342,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                                 column = EventTableInfo.Columns.EVENT_DATE,
                                 boundary = it,
                                 startDate = startDate,
-                                endDate = endDate
+                                endDate = endDate,
                             )
                         }
 
@@ -350,7 +350,7 @@ internal object ProgramIndicatorEvaluatorHelper {
                             programStageUid = target.programStageUid,
                             whereClause = WhereClauseBuilder().apply {
                                 whereClauses.forEach { appendComplexQuery(it) }
-                            }.build()
+                            }.build(),
                         )
 
                         listOf(whereClause)
@@ -363,17 +363,19 @@ internal object ProgramIndicatorEvaluatorHelper {
         column: String,
         boundary: AnalyticsPeriodBoundary,
         startDate: Date,
-        endDate: Date
+        endDate: Date,
     ): String {
         val operator = when (boundary.analyticsPeriodBoundaryType()) {
             AnalyticsPeriodBoundaryType.AFTER_START_OF_REPORTING_PERIOD,
-            AnalyticsPeriodBoundaryType.AFTER_END_OF_REPORTING_PERIOD -> ">="
+            AnalyticsPeriodBoundaryType.AFTER_END_OF_REPORTING_PERIOD,
+            -> ">="
             else -> "<="
         }
 
         val date = when (boundary.analyticsPeriodBoundaryType()) {
             AnalyticsPeriodBoundaryType.AFTER_START_OF_REPORTING_PERIOD,
-            AnalyticsPeriodBoundaryType.BEFORE_START_OF_REPORTING_PERIOD -> startDate
+            AnalyticsPeriodBoundaryType.BEFORE_START_OF_REPORTING_PERIOD,
+            -> startDate
             else -> endDate
         }
 
@@ -389,7 +391,7 @@ internal object ProgramIndicatorEvaluatorHelper {
     fun getAggregator(
         evaluationItem: AnalyticsServiceEvaluationItem,
         programIndicator: ProgramIndicator,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): AggregationType {
         val aggregationType =
             if (queryMods?.aggregationType?.let { it != AggregationType.DEFAULT } == true) {
@@ -407,17 +409,20 @@ internal object ProgramIndicatorEvaluatorHelper {
             AggregationType.SUM,
             AggregationType.COUNT,
             AggregationType.MIN,
-            AggregationType.MAX -> aggregationType
+            AggregationType.MAX,
+            -> aggregationType
 
             AggregationType.AVERAGE_SUM_ORG_UNIT,
             AggregationType.FIRST,
             AggregationType.LAST,
-            AggregationType.LAST_IN_PERIOD -> AggregationType.SUM
+            AggregationType.LAST_IN_PERIOD,
+            -> AggregationType.SUM
 
             AggregationType.FIRST_AVERAGE_ORG_UNIT,
             AggregationType.LAST_AVERAGE_ORG_UNIT,
             AggregationType.LAST_IN_PERIOD_AVERAGE_ORG_UNIT,
-            AggregationType.DEFAULT -> AggregationType.AVERAGE
+            AggregationType.DEFAULT,
+            -> AggregationType.AVERAGE
 
             AggregationType.LAST_LAST_ORG_UNIT,
             AggregationType.FIRST_FIRST_ORG_UNIT,
@@ -427,7 +432,8 @@ internal object ProgramIndicatorEvaluatorHelper {
             AggregationType.VARIANCE,
             AggregationType.STDDEV,
             AggregationType.CUSTOM,
-            AggregationType.NONE ->
+            AggregationType.NONE,
+            ->
                 throw AnalyticsException.UnsupportedAggregationType(programIndicator.aggregationType()!!)
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
index f3a11bfa0f..ce3ad0e7a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
@@ -28,20 +28,20 @@
 
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLExecutor
+import javax.inject.Inject
 
 internal class ProgramIndicatorSQLEvaluator @Inject constructor(
-    private val programIndicatorSQLExecutor: ProgramIndicatorSQLExecutor
+    private val programIndicatorSQLExecutor: ProgramIndicatorSQLExecutor,
 ) : AnalyticsEvaluator {
 
     override fun evaluate(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         return programIndicatorSQLExecutor.getProgramIndicatorValue(evaluationItem, metadata, queryMods)
     }
@@ -49,7 +49,7 @@ internal class ProgramIndicatorSQLEvaluator @Inject constructor(
     override fun getSql(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         return programIndicatorSQLExecutor.getProgramIndicatorSQL(evaluationItem, metadata, queryMods)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
index c04d67d355..ed26822b84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.CommonParser
+import javax.inject.Inject
 
 internal class AnalyticExpressionEngine @Inject constructor(
-    private val visitor: CommonExpressionVisitor
+    private val visitor: CommonExpressionVisitor,
 ) {
 
     fun evaluate(
-        expression: String
+        expression: String,
     ): Any? {
         return CommonParser.visit(expression, visitor)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
index b3fb2c3f9b..10755b4b11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.DataElementSQLEvaluator
@@ -45,6 +44,7 @@ import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItemMetho
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import javax.inject.Inject
 
 internal class AnalyticExpressionEngineFactory @Inject constructor(
     private val dataElementStore: DataElementStore,
@@ -55,14 +55,14 @@ internal class AnalyticExpressionEngineFactory @Inject constructor(
     private val dataElementEvaluator: DataElementSQLEvaluator,
     private val programIndicatorEvaluator: ProgramIndicatorSQLEvaluator,
     private val eventDataItemEvaluator: EventDataItemSQLEvaluator,
-    private val constantStore: ConstantStore
+    private val constantStore: ConstantStore,
 ) {
 
     fun getEngine(
         method: ExpressionItemMethod,
         contextEvaluationItem: AnalyticsServiceEvaluationItem,
         contextMetadata: Map<String, MetadataItem>,
-        days: Int?
+        days: Int?,
     ): AnalyticExpressionEngine {
         val indicatorContext = IndicatorContext(
             dataElementStore = dataElementStore,
@@ -74,7 +74,7 @@ internal class AnalyticExpressionEngineFactory @Inject constructor(
             programIndicatorEvaluator = programIndicatorEvaluator,
             eventDataItemEvaluator = eventDataItemEvaluator,
             evaluationItem = contextEvaluationItem,
-            contextMetadata = contextMetadata
+            contextMetadata = contextMetadata,
         )
 
         val visitor = newVisitor(indicatorContext, method)
@@ -94,15 +94,15 @@ internal class AnalyticExpressionEngineFactory @Inject constructor(
 
     private fun newVisitor(
         indicatorContext: IndicatorContext,
-        method: ExpressionItemMethod
+        method: ExpressionItemMethod,
     ): CommonExpressionVisitor {
         return CommonExpressionVisitor(
             CommonExpressionVisitorScope.AnalyticsIndicator(
                 itemMap = AnalyticExpressionParserUtils.ANALYTIC_EXPRESSION_ITEMS,
                 itemMethod = method,
                 constantMap = constantMap,
-                indicatorContext = indicatorContext
-            )
+                indicatorContext = indicatorContext,
+            ),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt
index ffad989d7a..f1f2504b80 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionParserUtils.kt
@@ -119,12 +119,12 @@ internal object AnalyticExpressionParserUtils {
             ExpressionParser.MIN_DATE to FunctionMinDate(),
             ExpressionParser.MAX_DATE to FunctionMaxDate(),
             ExpressionParser.PERIOD_OFFSET to PeriodOffset(),
-            ExpressionParser.YEAR_TO_DATE to FunctionYearToDate()
+            ExpressionParser.YEAR_TO_DATE to FunctionYearToDate(),
         )
 
     fun getDays(
         contextEvaluationItem: AnalyticsServiceEvaluationItem,
-        contextMetadata: Map<String, MetadataItem>
+        contextMetadata: Map<String, MetadataItem>,
     ): Int? {
         val periods = contextEvaluationItem.allDimensionItems
             .mapNotNull { item ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt
index 9453ccefb8..6045b4d30f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.expressiondimensionitemengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
@@ -35,22 +34,23 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyt
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
+import javax.inject.Inject
 
 internal class ExpressionDimensionItemEngine @Inject constructor(
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
-    private val expressionService: ExpressionService
+    private val expressionService: ExpressionService,
 ) {
 
     fun evaluateIndicator(
         expressionDimensionItem: ExpressionDimensionItem,
         contextEvaluationItem: AnalyticsServiceEvaluationItem,
-        contextMetadata: Map<String, MetadataItem>
+        contextMetadata: Map<String, MetadataItem>,
     ): String? {
         val engine = analyticExpressionEngineFactory.getEngine(
             method = ParserUtils.ITEM_EVALUATE,
             contextEvaluationItem = contextEvaluationItem,
             contextMetadata = contextMetadata,
-            days = AnalyticExpressionParserUtils.getDays(contextEvaluationItem, contextMetadata)
+            days = AnalyticExpressionParserUtils.getDays(contextEvaluationItem, contextMetadata),
         )
 
         val evaluatedExpression = engine.evaluate(expressionDimensionItem.expression()!!)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
index 0332659a91..c9d9b2c34e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
@@ -48,5 +48,5 @@ internal data class IndicatorContext(
     val programIndicatorEvaluator: AnalyticsEvaluator,
     val eventDataItemEvaluator: AnalyticsEvaluator,
     val evaluationItem: AnalyticsServiceEvaluationItem,
-    val contextMetadata: Map<String, MetadataItem>
+    val contextMetadata: Map<String, MetadataItem>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
index a3f25c0abc..159697294b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
@@ -36,17 +35,18 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
+import javax.inject.Inject
 
 internal class IndicatorEngine @Inject constructor(
     private val indicatorTypeStore: IndicatorTypeStore,
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
-    private val expressionService: ExpressionService
+    private val expressionService: ExpressionService,
 ) {
 
     fun evaluateIndicator(
         indicator: Indicator,
         contextEvaluationItem: AnalyticsServiceEvaluationItem,
-        contextMetadata: Map<String, MetadataItem>
+        contextMetadata: Map<String, MetadataItem>,
     ): String? {
         val indicatorType = indicator.indicatorType()?.let {
             indicatorTypeStore.selectByUid(it.uid())
@@ -56,7 +56,7 @@ internal class IndicatorEngine @Inject constructor(
             method = ParserUtils.ITEM_EVALUATE,
             contextEvaluationItem = contextEvaluationItem,
             contextMetadata = contextMetadata,
-            days = AnalyticExpressionParserUtils.getDays(contextEvaluationItem, contextMetadata)
+            days = AnalyticExpressionParserUtils.getDays(contextEvaluationItem, contextMetadata),
         )
 
         val numerator = engine.evaluate(indicator.numerator()!!)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
index 0a3aad3cff..9484f52feb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyticexpressionengine.AnalyticExpressionEngineFactory
@@ -36,17 +35,18 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
+import javax.inject.Inject
 
 internal class IndicatorSQLEngine @Inject constructor(
     private val indicatorTypeStore: IndicatorTypeStore,
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) {
 
     fun evaluateIndicator(
         indicator: Indicator,
         contextEvaluationItem: AnalyticsServiceEvaluationItem,
-        contextMetadata: Map<String, MetadataItem>
+        contextMetadata: Map<String, MetadataItem>,
     ): String? {
         val sqlQuery = getSql(indicator, contextEvaluationItem, contextMetadata)
 
@@ -60,13 +60,13 @@ internal class IndicatorSQLEngine @Inject constructor(
     fun getSql(
         indicator: Indicator,
         contextEvaluationItem: AnalyticsServiceEvaluationItem,
-        contextMetadata: Map<String, MetadataItem>
+        contextMetadata: Map<String, MetadataItem>,
     ): String {
         val engine = analyticExpressionEngineFactory.getEngine(
             method = ParserUtils.ITEM_GET_SQL,
             contextEvaluationItem = contextEvaluationItem,
             contextMetadata = contextMetadata,
-            days = AnalyticExpressionParserUtils.getDays(contextEvaluationItem, contextMetadata)
+            days = AnalyticExpressionParserUtils.getDays(contextEvaluationItem, contextMetadata),
         )
 
         val indicatorType = indicator.indicatorType()?.let {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/IndicatorDataItem.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/IndicatorDataItem.kt
index af6ac0559d..c74a477969 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/IndicatorDataItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/IndicatorDataItem.kt
@@ -48,7 +48,7 @@ internal interface IndicatorDataItem : ExpressionItem {
                 getEvaluator(visitor).evaluate(
                     evaluationItem = evaluationItem,
                     metadata = visitor.indicatorContext!!.contextMetadata + metadataEntry,
-                    queryMods = visitor.state.queryMods
+                    queryMods = visitor.state.queryMods,
                 )
             }
         } ?: ParserUtils.DOUBLE_VALUE_IF_NULL
@@ -60,7 +60,7 @@ internal interface IndicatorDataItem : ExpressionItem {
                 getEvaluator(visitor).getSql(
                     evaluationItem = evaluationItem,
                     metadata = visitor.indicatorContext!!.contextMetadata + metadataEntry,
-                    queryMods = visitor.state.queryMods
+                    queryMods = visitor.state.queryMods,
                 )?.let { "($it)" }
             }
         }
@@ -72,13 +72,13 @@ internal interface IndicatorDataItem : ExpressionItem {
 
     private fun getEvaluationItem(
         ctx: ExprContext,
-        visitor: CommonExpressionVisitor
+        visitor: CommonExpressionVisitor,
     ): AnalyticsServiceEvaluationItem? {
         return getDataItem(ctx, visitor)?.let { dataItem ->
             AnalyticsServiceEvaluationItem(
                 dimensionItems = listOf(dataItem),
                 filters = visitor.indicatorContext!!.evaluationItem.allDimensionItems,
-                aggregationType = visitor.indicatorContext.evaluationItem.aggregationType
+                aggregationType = visitor.indicatorContext.evaluationItem.aggregationType,
             )
         }
     }
@@ -86,7 +86,7 @@ internal interface IndicatorDataItem : ExpressionItem {
     @Suppress("ThrowsCount")
     private fun getMetadataEntry(
         evaluationItem: AnalyticsServiceEvaluationItem,
-        visitor: CommonExpressionVisitor
+        visitor: CommonExpressionVisitor,
     ): Pair<String, MetadataItem>? {
         return when (val dataItem = evaluationItem.dimensionItems.first()) {
             is DimensionItem.DataItem.DataElementOperandItem -> {
@@ -107,7 +107,7 @@ internal interface IndicatorDataItem : ExpressionItem {
                 dataElementOperandId to MetadataItem.DataElementOperandItem(
                     dataElementOperand,
                     dataElement.displayName()!!,
-                    coc.displayName()
+                    coc.displayName(),
                 )
             }
             is DimensionItem.DataItem.DataElementItem -> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/ProgramIndicatorItem.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/ProgramIndicatorItem.kt
index e4c46d0e56..b552516618 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/ProgramIndicatorItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/dataitem/ProgramIndicatorItem.kt
@@ -37,7 +37,7 @@ internal class ProgramIndicatorItem : IndicatorDataItem {
 
     override fun getDataItem(
         ctx: ExprContext,
-        visitor: CommonExpressionVisitor
+        visitor: CommonExpressionVisitor,
     ): AbsoluteDimensionItem? {
         return ctx.uid0?.text?.let { uid ->
             DimensionItem.DataItem.ProgramIndicatorItem(uid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/DimensionalResponseSamples.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/DimensionalResponseSamples.kt
index 17b5411d52..746c842e91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/DimensionalResponseSamples.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/DimensionalResponseSamples.kt
@@ -50,69 +50,69 @@ object DimensionalResponseSamples {
             period1.periodId()!! to MetadataItem.PeriodItem(period1),
             period2.periodId()!! to MetadataItem.PeriodItem(period2),
             orgunit1.uid() to MetadataItem.OrganisationUnitItem(orgunit1),
-            orgunit2.uid() to MetadataItem.OrganisationUnitItem(orgunit2)
+            orgunit2.uid() to MetadataItem.OrganisationUnitItem(orgunit2),
         ),
         dimensions = listOf(Dimension.Data, Dimension.Category(cc1.uid()), Dimension.Period),
         dimensionItems = mapOf(
             Dimension.Data to listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.DataItem.DataElementItem(dataElement2.uid())
+                DimensionItem.DataItem.DataElementItem(dataElement2.uid()),
             ),
             Dimension.Category(cc1.uid()) to listOf(
                 DimensionItem.CategoryItem(cc1.uid(), co11.uid()),
-                DimensionItem.CategoryItem(cc1.uid(), co12.uid())
+                DimensionItem.CategoryItem(cc1.uid(), co12.uid()),
             ),
             Dimension.Period to listOf(
                 DimensionItem.PeriodItem.Absolute(period1.periodId()!!),
-                DimensionItem.PeriodItem.Absolute(period2.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period2.periodId()!!),
             ),
             Dimension.OrganisationUnit to listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunit1.uid()),
-                DimensionItem.OrganisationUnitItem.Absolute(orgunit2.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Absolute(orgunit2.uid()),
+            ),
         ),
         filters = listOf(orgunit1.uid(), orgunit2.uid()),
         values = listOf(
             DimensionalValue(
                 listOf(dataElement1.uid(), co11.uid(), period1.periodId()!!),
                 "34.5",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement1.uid(), co12.uid(), period1.periodId()!!),
                 "10.0",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement2.uid(), co11.uid(), period1.periodId()!!),
                 "13",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement2.uid(), co12.uid(), period1.periodId()!!),
                 "15",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement1.uid(), co11.uid(), period2.periodId()!!),
                 "34.5",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement1.uid(), co12.uid(), period2.periodId()!!),
                 "10.0",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement2.uid(), co11.uid(), period2.periodId()!!),
                 "13",
-                null
+                null,
             ),
             DimensionalValue(
                 listOf(dataElement2.uid(), co12.uid(), period2.periodId()!!),
                 "15",
-                null
-            )
-        )
+                null,
+            ),
+        ),
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/GridAnalyticsResponseSamples.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/GridAnalyticsResponseSamples.kt
index 32843d5a40..908bf489ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/GridAnalyticsResponseSamples.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/GridAnalyticsResponseSamples.kt
@@ -50,49 +50,49 @@ object GridAnalyticsResponseSamples {
             period1.periodId()!! to MetadataItem.PeriodItem(period1),
             period2.periodId()!! to MetadataItem.PeriodItem(period2),
             orgunit1.uid() to MetadataItem.OrganisationUnitItem(orgunit1),
-            orgunit2.uid() to MetadataItem.OrganisationUnitItem(orgunit2)
+            orgunit2.uid() to MetadataItem.OrganisationUnitItem(orgunit2),
         ),
         headers = GridHeader(
             columns = listOf(
                 listOf(
                     GridHeaderItem(dataElement1.uid(), 2),
-                    GridHeaderItem(dataElement2.uid(), 2)
+                    GridHeaderItem(dataElement2.uid(), 2),
                 ),
                 listOf(
                     GridHeaderItem(co11.uid(), 1),
                     GridHeaderItem(co12.uid(), 1),
                     GridHeaderItem(co11.uid(), 1),
-                    GridHeaderItem(co12.uid(), 1)
-                )
+                    GridHeaderItem(co12.uid(), 1),
+                ),
             ),
             rows = listOf(
                 listOf(
                     GridHeaderItem(period1.periodId()!!, 1),
-                    GridHeaderItem(period2.periodId()!!, 1)
-                )
-            )
+                    GridHeaderItem(period2.periodId()!!, 1),
+                ),
+            ),
         ),
         dimensions = GridDimension(
             columns = listOf(Dimension.Data, Dimension.Category(cc1.uid())),
-            rows = listOf(Dimension.Period)
+            rows = listOf(Dimension.Period),
         ),
         dimensionItems = mapOf(
             Dimension.Data to listOf(
                 DimensionItem.DataItem.DataElementItem(dataElement1.uid()),
-                DimensionItem.DataItem.DataElementItem(dataElement2.uid())
+                DimensionItem.DataItem.DataElementItem(dataElement2.uid()),
             ),
             Dimension.Category(cc1.uid()) to listOf(
                 DimensionItem.CategoryItem(cc1.uid(), co11.uid()),
-                DimensionItem.CategoryItem(cc1.uid(), co12.uid())
+                DimensionItem.CategoryItem(cc1.uid(), co12.uid()),
             ),
             Dimension.Period to listOf(
                 DimensionItem.PeriodItem.Absolute(period1.periodId()!!),
-                DimensionItem.PeriodItem.Absolute(period2.periodId()!!)
+                DimensionItem.PeriodItem.Absolute(period2.periodId()!!),
             ),
             Dimension.OrganisationUnit to listOf(
                 DimensionItem.OrganisationUnitItem.Absolute(orgunit1.uid()),
-                DimensionItem.OrganisationUnitItem.Absolute(orgunit2.uid())
-            )
+                DimensionItem.OrganisationUnitItem.Absolute(orgunit2.uid()),
+            ),
         ),
         filters = listOf(orgunit1.uid(), orgunit2.uid()),
         values = listOf(
@@ -101,53 +101,53 @@ object GridAnalyticsResponseSamples {
                     listOf(dataElement1.uid(), co11.uid()),
                     listOf(period1.periodId()!!),
                     "34.5",
-                    null
+                    null,
                 ),
                 GridResponseValue(
                     listOf(dataElement1.uid(), co12.uid()),
                     listOf(period1.periodId()!!),
                     "10.0",
-                    null
+                    null,
                 ),
                 GridResponseValue(
                     listOf(dataElement2.uid(), co11.uid()),
                     listOf(period1.periodId()!!),
                     "13",
-                    null
+                    null,
                 ),
                 GridResponseValue(
                     listOf(dataElement2.uid(), co12.uid()),
                     listOf(period1.periodId()!!),
                     "15",
-                    null
-                )
+                    null,
+                ),
             ),
             listOf(
                 GridResponseValue(
                     listOf(dataElement1.uid(), co11.uid()),
                     listOf(period2.periodId()!!),
                     "34.5",
-                    null
+                    null,
                 ),
                 GridResponseValue(
                     listOf(dataElement1.uid(), co12.uid()),
                     listOf(period2.periodId()!!),
                     "10.0",
-                    null
+                    null,
                 ),
                 GridResponseValue(
                     listOf(dataElement2.uid(), co11.uid()),
                     listOf(period2.periodId()!!),
                     "13",
-                    null
+                    null,
                 ),
                 GridResponseValue(
                     listOf(dataElement2.uid(), co12.uid()),
                     listOf(period2.periodId()!!),
                     "15",
-                    null
-                )
-            )
-        )
+                    null,
+                ),
+            ),
+        ),
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt
index 377a36e413..871bcc6ed0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.analytics.aggregated.mock
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsRepository
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionalResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.AggregationType
+import javax.inject.Inject
 
 @Reusable
 class MockAnalyticsRepository @Inject constructor() : AnalyticsRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt
index ccc2475635..869527f8da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt
@@ -30,12 +30,12 @@ package org.hisp.dhis.android.core.analytics.aggregated.mock
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsException
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsVisualizationsRepository
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.GridAnalyticsResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
+import javax.inject.Inject
 
 @Reusable
 class MockAnalyticsVisualizationsRepository @Inject constructor() : AnalyticsVisualizationsRepository {
@@ -49,7 +49,7 @@ class MockAnalyticsVisualizationsRepository @Inject constructor() : AnalyticsVis
     }
 
     override fun withOrganisationUnits(
-        orgUnits: List<DimensionItem.OrganisationUnitItem>
+        orgUnits: List<DimensionItem.OrganisationUnitItem>,
     ): AnalyticsVisualizationsRepository {
         return MockAnalyticsVisualizationsRepository()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListParams.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListParams.kt
index 4980972a13..6b478a7ce1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListParams.kt
@@ -43,10 +43,10 @@ internal data class EventLineListParams(
 
     val organisationUnits: List<OrganisationUnitFilter>? = null,
 
-    val analyticsLegendStrategy: AnalyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem
+    val analyticsLegendStrategy: AnalyticsLegendStrategy = AnalyticsLegendStrategy.ByDataItem,
 ) : BaseScope
 
 internal data class LineListItem(
     val uid: String,
-    val legendSet: String? = null
+    val legendSet: String? = null,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt
index 5224c85f72..2d87583587 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt
@@ -29,17 +29,17 @@ package org.hisp.dhis.android.core.analytics.linelist
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.OrganisationUnitFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodsFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
+import javax.inject.Inject
 
 @Reusable
 internal class EventLineListRepositoryImpl @Inject constructor(
     private val eventLineListService: EventLineListService,
-    private val eventLineListParams: EventLineListParams
+    private val eventLineListParams: EventLineListParams,
 ) : EventLineListRepository {
 
     private val connectorFactory: ScopedFilterConnectorFactory<EventLineListRepository, EventLineListParams> =
@@ -75,7 +75,7 @@ internal class EventLineListRepositoryImpl @Inject constructor(
         val updatedDataElements = eventLineListParams.dataElements + LineListItem(dataElementUid)
         return EventLineListRepositoryImpl(
             eventLineListService,
-            eventLineListParams.copy(dataElements = updatedDataElements)
+            eventLineListParams.copy(dataElements = updatedDataElements),
         )
     }
 
@@ -83,14 +83,14 @@ internal class EventLineListRepositoryImpl @Inject constructor(
         val updatedProgramIndicators = eventLineListParams.programIndicators + LineListItem(programIndicatorUid)
         return EventLineListRepositoryImpl(
             eventLineListService,
-            eventLineListParams.copy(programIndicators = updatedProgramIndicators)
+            eventLineListParams.copy(programIndicators = updatedProgramIndicators),
         )
     }
 
     override fun withLegendStrategy(analyticsLegendStrategy: AnalyticsLegendStrategy): EventLineListRepository {
         return EventLineListRepositoryImpl(
             eventLineListService,
-            eventLineListParams.copy(analyticsLegendStrategy = analyticsLegendStrategy)
+            eventLineListParams.copy(analyticsLegendStrategy = analyticsLegendStrategy),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
index 5a7c099aef..2724266ce4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.analytics.linelist
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.analytics.LegendEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsOrganisationUnitHelper
@@ -44,6 +43,7 @@ import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
+import javax.inject.Inject
 
 @Suppress("LongParameterList")
 internal class EventLineListServiceImpl @Inject constructor(
@@ -57,7 +57,7 @@ internal class EventLineListServiceImpl @Inject constructor(
     private val periodHelper: PeriodHelper,
     private val dateFilterPeriodHelper: DateFilterPeriodHelper,
     private val organisationUnitHelper: AnalyticsOrganisationUnitHelper,
-    private val legendEvaluator: LegendEvaluator
+    private val legendEvaluator: LegendEvaluator,
 ) : EventLineListService {
 
     override fun evaluate(params: EventLineListParams): List<LineListResponse> {
@@ -72,7 +72,7 @@ internal class EventLineListServiceImpl @Inject constructor(
         val metadataMap = getMetadataMap(
             params.dataElements,
             params.programIndicators,
-            events.map { it.organisationUnit()!! }.toHashSet()
+            events.map { it.organisationUnit()!! }.toHashSet(),
         )
 
         val dataElementValues = if (params.dataElements.isNotEmpty()) {
@@ -96,11 +96,11 @@ internal class EventLineListServiceImpl @Inject constructor(
                         is AnalyticsLegendStrategy.None -> null
                         is AnalyticsLegendStrategy.ByDataItem -> legendEvaluator.getLegendByDataElement(
                             de.uid,
-                            dv?.value()
+                            dv?.value(),
                         )
                         is AnalyticsLegendStrategy.Fixed -> legendEvaluator.getLegendByLegendSet(
                             params.analyticsLegendStrategy.legendSetUid,
-                            dv?.value()
+                            dv?.value(),
                         )
                     }
 
@@ -108,7 +108,7 @@ internal class EventLineListServiceImpl @Inject constructor(
                         uid = de.uid,
                         displayName = metadataMap[de.uid] ?: de.uid,
                         value = dv?.value(),
-                        legend = legend
+                        legend = legend,
                     )
                 }
 
@@ -120,11 +120,11 @@ internal class EventLineListServiceImpl @Inject constructor(
                         is AnalyticsLegendStrategy.None -> null
                         is AnalyticsLegendStrategy.ByDataItem -> legendEvaluator.getLegendByProgramIndicator(
                             pi.uid,
-                            value
+                            value,
                         )
                         is AnalyticsLegendStrategy.Fixed -> legendEvaluator.getLegendByLegendSet(
                             params.analyticsLegendStrategy.legendSetUid,
-                            value
+                            value,
                         )
                     }
 
@@ -132,7 +132,7 @@ internal class EventLineListServiceImpl @Inject constructor(
                         uid = pi.uid,
                         displayName = metadataMap[pi.uid] ?: pi.uid,
                         value = value,
-                        legend = legend
+                        legend = legend,
                     )
                 }
 
@@ -142,7 +142,7 @@ internal class EventLineListServiceImpl @Inject constructor(
                     period = eventPeriod,
                     organisationUnit = it.organisationUnit()!!,
                     organisationUnitName = metadataMap[it.organisationUnit()!!] ?: it.organisationUnit()!!,
-                    values = eventDataValues + programIndicatorValues
+                    values = eventDataValues + programIndicatorValues,
                 )
             }
         }
@@ -181,7 +181,7 @@ internal class EventLineListServiceImpl @Inject constructor(
     private fun getMetadataMap(
         dataElements: List<LineListItem>,
         programIndicators: List<LineListItem>,
-        organisationUnitUids: HashSet<String>
+        organisationUnitUids: HashSet<String>,
     ): Map<String, String> {
         val dataElementNameMap = if (dataElements.isNotEmpty()) {
             dataElementRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListResponse.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListResponse.kt
index b229813f91..e781baa7a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListResponse.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListResponse.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.analytics.linelist
 
-import java.util.Date
 import org.hisp.dhis.android.core.period.Period
+import java.util.Date
 
 data class LineListResponse(
     val uid: String, // Event or enrollment uid
@@ -36,12 +36,12 @@ data class LineListResponse(
     val period: Period,
     val organisationUnit: String,
     val organisationUnitName: String,
-    val values: List<LineListResponseValue>
+    val values: List<LineListResponseValue>,
 )
 
 data class LineListResponseValue(
     val uid: String,
     val displayName: String,
     val value: String?,
-    val legend: String?
+    val legend: String?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt
index 9b17016790..fe5441a9b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
-import javax.inject.Inject
-import javax.inject.Singleton
 import okhttp3.Request
 import okhttp3.Response
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 internal class CookieAuthenticatorHelper @Inject constructor() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
index 2a24b213f0..11b5502435 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -36,6 +35,7 @@ import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectLogoutHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectTokenRefresher
+import javax.inject.Inject
 
 private const val UNAUTHORIZED = 401
 
@@ -44,7 +44,7 @@ internal class OpenIDConnectAuthenticator @Inject constructor(
     private val credentialsSecureStore: CredentialsSecureStore,
     private val tokenRefresher: OpenIDConnectTokenRefresher,
     private val userIdHelper: UserIdAuthenticatorHelper,
-    private val logoutHandler: OpenIDConnectLogoutHandler
+    private val logoutHandler: OpenIDConnectLogoutHandler,
 ) {
 
     fun handleTokenCall(chain: Interceptor.Chain, credentials: Credentials): Response {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt
index fd7617df9e..bcd4e7b4ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
 import dagger.Reusable
-import java.io.IOException
-import javax.inject.Inject
 import okhttp3.Interceptor
 import okhttp3.Response
 import org.hisp.dhis.android.core.arch.api.authentication.internal.UserIdAuthenticatorHelper.Companion.AUTHORIZATION_KEY
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
+import java.io.IOException
+import javax.inject.Inject
 
 @Reusable
 internal class ParentAuthenticator @Inject constructor(
     private val credentialsSecureStore: CredentialsSecureStore,
     private val passwordAndCookieAuthenticator: PasswordAndCookieAuthenticator,
     private val openIDConnectAuthenticator: OpenIDConnectAuthenticator,
-    private val cookieHelper: CookieAuthenticatorHelper
+    private val cookieHelper: CookieAuthenticatorHelper,
 ) :
     Interceptor {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
index 7d96ba3eb5..bbbb9dbfba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
+import javax.inject.Inject
 
 @Reusable
 internal class PasswordAndCookieAuthenticator @Inject constructor(
     private val userIdHelper: UserIdAuthenticatorHelper,
-    private val cookieHelper: CookieAuthenticatorHelper
+    private val cookieHelper: CookieAuthenticatorHelper,
 ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt
index 72fa9883b1..d26ae43572 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import okhttp3.Interceptor
 import okhttp3.Request
 import org.hisp.dhis.android.core.arch.helpers.UserHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
+import javax.inject.Inject
 
 @Reusable
 internal class UserIdAuthenticatorHelper @Inject constructor(
-    private val userIdStore: UserIdInMemoryStore
+    private val userIdStore: UserIdInMemoryStore,
 ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallErrorCatcher.kt
index 0379ca7650..89b18a6fa1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallErrorCatcher.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
-import java.io.IOException
-import kotlin.Throws
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import retrofit2.Response
+import java.io.IOException
+import kotlin.Throws
 
 internal interface APICallErrorCatcher {
     fun mustBeStored(): Boolean?
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index 4a5f74407c..cdeeb11f67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -40,7 +40,7 @@ internal interface APIDownloader {
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>>
 
     fun <P, O> downloadPartitioned(
@@ -48,33 +48,33 @@ internal interface APIDownloader {
         pageSize: Int,
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
-        transform: (O) -> P
+        transform: (O) -> P,
     ): Single<List<P>>
 
     fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>>
 
     fun <K, V> downloadPartitionedMap(
         uids: Set<String>,
         pageSize: Int,
         handler: (Map<K, V>) -> Any,
-        pageDownloader: (Set<String>) -> Single<out Map<K, V>>
+        pageDownloader: (Set<String>) -> Single<out Map<K, V>>,
     ): Single<Map<K, V>>
 
     fun <P, O : CoreObject> downloadLink(
         masterUid: String,
         handler: LinkHandler<P, O>,
         downloader: (String) -> Single<Payload<P>>,
-        transform: ((P) -> O)
+        transform: ((P) -> O),
     ): Single<List<P>>
 
     fun <P> downloadWithLastUpdated(
         handler: Handler<P>,
         resourceType: Resource.Type,
-        downloader: (String?) -> Single<Payload<P>>
+        downloader: (String?) -> Single<Payload<P>>,
     ): Single<List<P>>
 
     fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>>
@@ -86,6 +86,6 @@ internal interface APIDownloader {
 
     fun <P> downloadPagedPayload(
         pageSize: Int,
-        downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>
+        downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>,
     ): Single<Payload<P>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 0595507e2e..f04a0bdfce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -31,7 +31,6 @@ import androidx.annotation.VisibleForTesting
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -39,6 +38,7 @@ import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.resource.internal.Resource
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
+import javax.inject.Inject
 
 @Reusable
 @VisibleForTesting
@@ -49,13 +49,13 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>> {
         return downloadPartitionedWithCustomHandling(
             uids,
             pageSize,
             handler,
-            pageDownloader
+            pageDownloader,
         ) { it }
     }
 
@@ -64,27 +64,27 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         pageSize: Int,
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
-        transform: (O) -> P
+        transform: (O) -> P,
     ): Single<List<P>> {
         return downloadPartitionedWithCustomHandling(
             uids,
             pageSize,
             handler,
             pageDownloader,
-            transform
+            transform,
         )
     }
 
     override fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>> {
         return downloadPartitionedWithoutHandling(
             uids = uids,
             pageSize = pageSize,
             pageDownloader = pageDownloader,
-            transform = { it }
+            transform = { it },
         )
     }
 
@@ -92,7 +92,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         uids: Set<String>,
         pageSize: Int,
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
-        transform: (O) -> P
+        transform: (O) -> P,
     ): Single<List<P>> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
         return Observable.fromIterable(partitions)
@@ -111,13 +111,13 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         pageSize: Int,
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
-        transform: (O) -> P
+        transform: (O) -> P,
     ): Single<List<P>> {
         return downloadPartitionedWithoutHandling(
             uids = uids,
             pageSize = pageSize,
             pageDownloader = pageDownloader,
-            transform = transform
+            transform = transform,
         ).doOnSuccess { oCollection: List<P> ->
             handler.handleMany(oCollection)
         }
@@ -127,13 +127,13 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         uids: Set<String>,
         pageSize: Int,
         handler: (Map<K, V>) -> Any,
-        pageDownloader: (Set<String>) -> Single<out Map<K, V>>
+        pageDownloader: (Set<String>) -> Single<out Map<K, V>>,
     ): Single<Map<K, V>> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
         return Observable.fromIterable(partitions)
             .flatMapSingle(pageDownloader)
             .reduce(
-                mapOf()
+                mapOf(),
             ) { items: Map<K, V>, items2: Map<K, V> ->
                 items + items2
             }
@@ -144,7 +144,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         masterUid: String,
         handler: LinkHandler<P, O>,
         downloader: (String) -> Single<Payload<P>>,
-        transform: (P) -> O
+        transform: (P) -> O,
     ): Single<List<P>> {
         return Single.just(masterUid)
             .flatMap(downloader)
@@ -155,11 +155,11 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
     override fun <P> downloadWithLastUpdated(
         handler: Handler<P>,
         resourceType: Resource.Type,
-        downloader: (String?) -> Single<Payload<P>>
+        downloader: (String?) -> Single<Payload<P>>,
     ): Single<List<P>> {
         return Single.defer {
             downloader(
-                resourceHandler.getLastUpdated(resourceType)
+                resourceHandler.getLastUpdated(resourceType),
             )
         }
             .map { obj: Payload<P> -> obj.items() }
@@ -192,7 +192,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
 
     override fun <P> downloadPagedPayload(
         pageSize: Int,
-        downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>
+        downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>,
     ): Single<Payload<P>> {
         var page = 1
         return Single.defer { downloader(page++, pageSize) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
index cbd2ea7f01..56db3a7a69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
@@ -29,12 +29,6 @@ package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import android.util.Log
 import dagger.Reusable
-import java.io.IOException
-import java.net.ConnectException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.net.ssl.SSLException
 import okhttp3.Request
 import org.hisp.dhis.android.core.arch.api.internal.DynamicServerURLInterceptor
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -43,6 +37,12 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 import retrofit2.Call
 import retrofit2.HttpException
 import retrofit2.Response
+import java.io.IOException
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.net.ssl.SSLException
 
 @Reusable
 @Suppress("TooManyFunctions")
@@ -143,7 +143,7 @@ internal class APIErrorMapper @Inject constructor() {
         errorBuilder: D2Error.Builder,
         response: Response<*>,
         errorCode: D2ErrorCode?,
-        errorBody: String?
+        errorBody: String?,
     ): D2Error {
         val code = errorCode ?: D2ErrorCode.API_UNSUCCESSFUL_RESPONSE
         val serverMessage = errorBody ?: getServerMessage(response)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutor.kt
index b00c663bdd..d1990424ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutor.kt
@@ -36,11 +36,11 @@ internal interface CoroutineAPICallExecutor {
         acceptedErrorCodes: List<Int>? = null,
         errorCatcher: APICallErrorCatcher? = null,
         errorClass: Class<P>? = null,
-        block: suspend () -> P
+        block: suspend () -> P,
     ): Result<P, D2Error>
 
     suspend fun <P> wrapTransactionally(
         cleanForeignKeyErrors: Boolean = true,
-        block: suspend () -> P
+        block: suspend () -> P,
     ): P
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
index 20cc139170..12dc922e8d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import kotlinx.coroutines.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
@@ -40,6 +39,7 @@ import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
 import retrofit2.HttpException
 import retrofit2.Response
+import javax.inject.Inject
 
 @Reusable
 internal class CoroutineAPICallExecutorImpl @Inject constructor(
@@ -47,7 +47,7 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher,
     private val errorStore: D2ErrorStore,
     private val databaseAdapter: DatabaseAdapter,
-    private val foreignKeyCleaner: ForeignKeyCleaner
+    private val foreignKeyCleaner: ForeignKeyCleaner,
 ) : CoroutineAPICallExecutor {
 
     @OptIn(DelicateCoroutinesApi::class)
@@ -59,7 +59,7 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
         acceptedErrorCodes: List<Int>?,
         errorCatcher: APICallErrorCatcher?,
         errorClass: Class<P>?,
-        block: suspend () -> P
+        block: suspend () -> P,
     ): Result<P, D2Error> {
         return try {
             Result.Success(block.invoke())
@@ -72,27 +72,27 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
 
                 if (userAccountDisabledErrorCatcher.isUserAccountLocked(response, errorBody)) {
                     Result.Failure(
-                        catchError(userAccountDisabledErrorCatcher, errorBuilder, response, errorBody, storeError)
+                        catchError(userAccountDisabledErrorCatcher, errorBuilder, response, errorBody, storeError),
                     )
                 } else if (errorClass != null && acceptedErrorCodes?.contains(response.code()) == true) {
                     Result.Success(
-                        ObjectMapperFactory.objectMapper().readValue(errorBody, errorClass)
+                        ObjectMapperFactory.objectMapper().readValue(errorBody, errorClass),
                     )
                 } else if (errorCatcher != null) {
                     Result.Failure(
-                        catchError(errorCatcher, errorBuilder, response, errorBody, storeError)
+                        catchError(errorCatcher, errorBuilder, response, errorBody, storeError),
                     )
                 } else {
                     Result.Failure(
                         storeAndReturn(
                             errorMapper.responseException(errorBuilder, response, null, errorBody),
-                            storeError
-                        )
+                            storeError,
+                        ),
                     )
                 }
             } else {
                 Result.Failure(
-                    storeAndReturn(errorMapper.mapRetrofitException(t, baseErrorBuilder()), storeError)
+                    storeAndReturn(errorMapper.mapRetrofitException(t, baseErrorBuilder()), storeError),
                 )
             }
         } catch (d2Error: D2Error) {
@@ -105,7 +105,7 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
     @Suppress("TooGenericExceptionCaught")
     override suspend fun <P> wrapTransactionally(
         cleanForeignKeyErrors: Boolean,
-        block: suspend () -> P
+        block: suspend () -> P,
     ): P {
         return withContext(dbDispatcher) {
             val transaction = databaseAdapter.beginNewTransaction()
@@ -131,7 +131,7 @@ internal class CoroutineAPICallExecutorImpl @Inject constructor(
         errorBuilder: D2Error.Builder,
         response: Response<P>,
         errorBody: String,
-        storeError: Boolean
+        storeError: Boolean,
     ): D2Error {
         return errorCatcher.catchError(response, errorBody)?.let { errorCode ->
             val d2Error = errorMapper.responseException(errorBuilder, response, errorCode, errorBody)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
index 65936aac64..b7d640a3ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
@@ -31,13 +31,13 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
+import javax.inject.Inject
 
 @Reusable
 internal class RxAPICallExecutorImpl @Inject constructor(
@@ -45,7 +45,7 @@ internal class RxAPICallExecutorImpl @Inject constructor(
     private val errorStore: D2ErrorStore,
     private val errorMapper: APIErrorMapper,
     private val foreignKeyCleaner: ForeignKeyCleaner,
-    private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher
+    private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher,
 ) : RxAPICallExecutor {
 
     override fun <P> wrapSingle(single: Single<P>, storeError: Boolean): Single<P> {
@@ -54,7 +54,7 @@ internal class RxAPICallExecutorImpl @Inject constructor(
 
     override fun <P> wrapObservableTransactionally(
         observable: Observable<P>,
-        cleanForeignKeys: Boolean
+        cleanForeignKeys: Boolean,
     ): Observable<P> {
         return Observable.fromCallable { databaseAdapter.beginNewTransaction() }
             .flatMap { transaction: Transaction ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxCoroutineWrapper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxCoroutineWrapper.kt
index b9b3c57857..8c7c239023 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxCoroutineWrapper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxCoroutineWrapper.kt
@@ -35,7 +35,7 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.rxSingle
 
 internal fun <T : Any> wrapRxSingle(
-    block: suspend CoroutineScope.() -> T
+    block: suspend CoroutineScope.() -> T,
 ): Single<T> {
     return rxSingle(Dispatchers.Unconfined) {
         runBlocking {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt
index 951524006c..c06c5d64d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/DynamicServerURLInterceptor.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.arch.api.internal
 
-import java.io.IOException
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
+import java.io.IOException
 
 internal class DynamicServerURLInterceptor : Interceptor {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServerURLVersionRedirectionInterceptor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServerURLVersionRedirectionInterceptor.kt
index bbf02a6f8b..cb2c8c13f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServerURLVersionRedirectionInterceptor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServerURLVersionRedirectionInterceptor.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.arch.api.internal
 
-import java.io.IOException
 import okhttp3.Interceptor
 import okhttp3.Response
 import org.hisp.dhis.android.core.arch.api.authentication.internal.PasswordAndCookieAuthenticator.Companion.LOCATION_KEY
+import java.io.IOException
 
 internal class ServerURLVersionRedirectionInterceptor : Interceptor {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt
index cbd506bb32..8054f3845d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/paging/internal/ApiPagingEngine.kt
@@ -50,14 +50,14 @@ object ApiPagingEngine {
                     currentPageSize,
                     numberOfFullCallsDone,
                     requiredItemsCount,
-                    itemsSkippedCount
-                )
+                    itemsSkippedCount,
+                ),
             )
         }
 
         for (call in numberOfFullCallsDone + pagingList.size + 1 until numberOfCalls) {
             pagingList.add(
-                Paging.create(call, currentPageSize, 0, 0, false)
+                Paging.create(call, currentPageSize, 0, 0, false),
             )
         }
 
@@ -66,8 +66,8 @@ object ApiPagingEngine {
                 calculateLastPagination(
                     currentPageSize,
                     requiredItemsCount + itemsSkippedCount,
-                    numberOfCalls
-                )
+                    numberOfCalls,
+                ),
             )
         }
 
@@ -80,7 +80,7 @@ object ApiPagingEngine {
         maxPageSize: Int,
         numberOfFullCallsDone: Int,
         requiredItemsCount: Int,
-        itemsSkippedCount: Int
+        itemsSkippedCount: Int,
     ): Paging {
         val upperLimit = minOf(itemsSkippedCount + requiredItemsCount, (numberOfFullCallsDone + 1) * maxPageSize)
         val minimumPageSize = upperLimit - itemsSkippedCount
@@ -95,7 +95,7 @@ object ApiPagingEngine {
                     pageSize,
                     previousItemsToSkipCount,
                     posteriorItemsToSkipCount,
-                    false
+                    false,
                 )
             }
         }
@@ -120,7 +120,7 @@ object ApiPagingEngine {
                         pageSize,
                         previousItemsToSkipCount,
                         posteriorItemsToSkipCount,
-                        true
+                        true,
                     )
                 }
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/payload/internal/NTIPayload.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/payload/internal/NTIPayload.kt
index 93fb6228f9..fbd7e96ad0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/payload/internal/NTIPayload.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/payload/internal/NTIPayload.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.arch.api.payload.internal
 data class NTIPayload<T>(
     val page: Int,
     val pageSize: Int,
-    val instances: List<T>
+    val instances: List<T>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt
index 2abda79439..70c615f79a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.arch.cache.internal
 import java.util.concurrent.TimeUnit
 
 internal class ExpirableCache<K, V>(
-    private val flushInterval: Long = TimeUnit.MINUTES.toMillis(2)
+    private val flushInterval: Long = TimeUnit.MINUTES.toMillis(2),
 ) : D2Cache<K, V> {
 
     private val cache = HashMap<K, V>()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressStatus.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressStatus.kt
index b82da52401..da7dd25c17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressStatus.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/D2ProgressStatus.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.call
 
 data class D2ProgressStatus(
     val isComplete: Boolean = false,
-    val syncStatus: D2ProgressSyncStatus? = null
+    val syncStatus: D2ProgressSyncStatus? = null,
 ) {
     fun addSyncStatus(syncStatus: D2ProgressSyncStatus): D2ProgressStatus {
         val newStatus = when {
@@ -47,5 +47,5 @@ data class D2ProgressStatus(
 enum class D2ProgressSyncStatus {
     SUCCESS,
     ERROR,
-    PARTIAL_ERROR
+    PARTIAL_ERROR,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
index 81cef4beda..3355ae7c86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.arch.call.queries.internal
 internal open class BaseQueryKt(
     open val page: Int,
     open val pageSize: Int,
-    open val paging: Boolean
+    open val paging: Boolean,
 ) {
     companion object {
         const val DEFAULT_PAGE_SIZE = 50
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt
index b9f7cec590..e4f069bcf7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/CollectionCleanerImpl.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
 internal open class CollectionCleanerImpl<P : ObjectWithUidInterface>(
     private val tableName: String,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : CollectionCleaner<P> {
 
     override fun deleteNotPresent(objects: Collection<P>?): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt
index 1284ab2338..333afb1c19 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/DataOrphanCleaner.kt
@@ -37,7 +37,7 @@ internal open class DataOrphanCleaner<P : ObjectWithUidInterface, C : ObjectWith
     private val tableName: String,
     private val parentColumn: String,
     private val stateColumn: String,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : OrphanCleaner<P, C> {
 
     override fun deleteOrphan(parent: P?, children: Collection<C>?): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt
index 2e7e095a7a..81fc9f81dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/LinkCleanerImpl.kt
@@ -36,7 +36,7 @@ internal open class LinkCleanerImpl<P : ObjectWithUidInterface>(
     private val tableName: String,
     private val applicableColumn: String,
     private val parentStore: ObjectStore<P>,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : LinkCleaner<P> {
 
     override fun deleteNotPresent(objects: Collection<P>?): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt
index 111f9e3a11..a87faca9ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/OrphanCleanerImpl.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 internal open class OrphanCleanerImpl<P : ObjectWithUidInterface, C : ObjectWithUidInterface>(
     private val tableName: String,
     private val parentColumn: String,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : OrphanCleaner<P, C> {
 
     override fun deleteOrphan(parent: P?, children: Collection<C>?): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt
index b37352e158..c379a01322 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cleaners/internal/SubCollectionCleanerImpl.kt
@@ -38,7 +38,7 @@ internal open class SubCollectionCleanerImpl<P : ObjectWithUidInterface>(
     private val tableName: String,
     private val parentColumn: String,
     private val databaseAdapter: DatabaseAdapter,
-    private val keyExtractor: Transformer<P, String>
+    private val keyExtractor: Transformer<P, String>,
 ) : SubCollectionCleaner<P> {
 
     override fun deleteNotPresent(objects: Collection<P>?): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt
index 3a8ddea2be..9b61d3428f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.D2Configuration
 
 @Module
 internal class AppContextDIModule(
-    private val d2Configuration: D2Configuration
+    private val d2Configuration: D2Configuration,
 ) {
 
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index 6f9dcd14a5..ec08247c27 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.arch.d2.internal
 import android.content.Context
 import androidx.annotation.VisibleForTesting
 import dagger.Component
-import javax.inject.Singleton
 import org.hisp.dhis.android.core.D2Configuration
 import org.hisp.dhis.android.core.analytics.AnalyticsPackageDIModule
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -98,6 +97,7 @@ import org.hisp.dhis.android.core.visualization.internal.VisualizationPackageDIM
 import org.hisp.dhis.android.core.wipe.internal.WipeDIModule
 import org.hisp.dhis.android.core.wipe.internal.WipeModule
 import retrofit2.Retrofit
+import javax.inject.Singleton
 
 @Singleton
 @Component(
@@ -150,8 +150,8 @@ import retrofit2.Retrofit
         VisualizationPackageDIModule::class,
         DataValueConflictEntityDIModule::class,
         MapPackageDIModule::class,
-        ProgramStageWorkingListPackageDIModule::class
-    ]
+        ProgramStageWorkingListPackageDIModule::class,
+    ],
 )
 @Suppress("TooManyFunctions")
 internal interface D2DIComponent {
@@ -252,7 +252,7 @@ internal interface D2DIComponent {
         fun create(
             d2Configuration: D2Configuration,
             secureStore: SecureStore,
-            insecureStore: InsecureStore
+            insecureStore: InsecureStore,
         ): D2DIComponent {
             return DaggerD2DIComponent.builder()
                 .appContextDIModule(AppContextDIModule(d2Configuration))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt
index 3c9b32cd34..f22da1e7bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.arch.d2.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.internal.CategoryInternalModule
 import org.hisp.dhis.android.core.user.internal.UserInternalModule
 import org.hisp.dhis.android.core.visualization.internal.VisualizationInternalModule
+import javax.inject.Inject
 
 @Reusable
 internal class D2InternalModules @Inject constructor(
     val category: CategoryInternalModule,
     val visualization: VisualizationInternalModule,
-    val user: UserInternalModule
+    val user: UserInternalModule,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt
index 168e9d8753..eeb172d0f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.arch.d2.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.AnalyticsModule
 import org.hisp.dhis.android.core.category.CategoryModule
 import org.hisp.dhis.android.core.constant.ConstantModule
@@ -59,6 +58,7 @@ import org.hisp.dhis.android.core.usecase.UseCaseModule
 import org.hisp.dhis.android.core.user.UserModule
 import org.hisp.dhis.android.core.validation.ValidationModule
 import org.hisp.dhis.android.core.visualization.VisualizationModule
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -92,5 +92,5 @@ internal class D2Modules @Inject constructor(
     val user: UserModule,
     val validation: ValidationModule,
     val visualization: VisualizationModule,
-    val sms: SmsModule
+    val sms: SmsModule,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
index 50008821f7..74302c9a9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.arch.db.access.internal
 
 import android.content.Context
 import dagger.Reusable
-import java.io.File
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.DatabaseImportExport
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -46,6 +44,8 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStoreImpl
 import org.hisp.dhis.android.core.user.UserModule
 import org.hisp.dhis.android.core.user.internal.UserStoreImpl
+import java.io.File
+import javax.inject.Inject
 
 @Reusable
 internal class DatabaseImportExportImpl @Inject constructor(
@@ -56,7 +56,7 @@ internal class DatabaseImportExportImpl @Inject constructor(
     private val credentialsStore: CredentialsSecureStore,
     private val databaseConfigurationSecureStore: DatabaseConfigurationInsecureStore,
     private val databaseRenamer: DatabaseRenamer,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) : DatabaseImportExport {
 
     companion object {
@@ -134,7 +134,7 @@ internal class DatabaseImportExportImpl @Inject constructor(
         val userConfiguration = DatabaseConfigurationHelper.getLoggedAccount(
             databasesConfiguration,
             credentials.serverUrl,
-            credentials.username
+            credentials.username,
         )
 
         if (userConfiguration.encrypted()) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationExecutor.kt
index 8d56485291..811c0e748a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationExecutor.kt
@@ -30,8 +30,8 @@ package org.hisp.dhis.android.core.arch.db.access.internal
 import android.content.res.AssetManager
 import android.util.Log
 import androidx.annotation.VisibleForTesting
-import java.io.IOException
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import java.io.IOException
 
 internal class DatabaseMigrationExecutor(private val databaseAdapter: DatabaseAdapter, assetManager: AssetManager) {
     private val parser = DatabaseMigrationParser(assetManager, databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationParser.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationParser.kt
index 12df5d4b1d..a66ff6343c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseMigrationParser.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.arch.db.access.internal
 
 import android.content.res.AssetManager
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.access.internal.migrations.DatabaseCodeMigrations
 import java.io.IOException
 import java.util.ArrayList
 import java.util.Scanner
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.access.internal.migrations.DatabaseCodeMigrations
 
 internal class DatabaseMigrationParser(
     private val assetManager: AssetManager,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) {
     private val codeMigrations = DatabaseCodeMigrations(databaseAdapter)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigration133.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigration133.kt
index b973481611..28f2235d7e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigration133.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigration133.kt
@@ -29,10 +29,10 @@
 package org.hisp.dhis.android.core.arch.db.access.internal.migrations
 
 import android.util.Log
-import java.util.ArrayList
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.valuetype.validation.validators.NumberValidatorBase
+import java.util.ArrayList
 
 internal class DatabaseCodeMigration133(private val databaseAdapter: DatabaseAdapter) : DatabaseCodeMigration {
     override fun migrate() {
@@ -41,7 +41,7 @@ internal class DatabaseCodeMigration133(private val databaseAdapter: DatabaseAda
             .appendNotKeyStringValue("syncState", "SYNCED")
             .appendInSubQuery(
                 "dataElement",
-                "SELECT uid FROM DataElement WHERE valueType IN ($valueTypes)"
+                "SELECT uid FROM DataElement WHERE valueType IN ($valueTypes)",
             )
             .build()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigrations.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigrations.kt
index 7cfc2ac98b..4572363b80 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigrations.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/migrations/DatabaseCodeMigrations.kt
@@ -41,6 +41,6 @@ internal class DatabaseCodeMigrations(databaseAdapter: DatabaseAdapter) {
 
     @Suppress("MagicNumber")
     val map: Map<Int, DatabaseCodeMigration> = mapOf(
-        133 to DatabaseCodeMigration133(databaseAdapter)
+        133 to DatabaseCodeMigration133(databaseAdapter),
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/AnalyticsTeiWHONutritionGenderColumnAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/AnalyticsTeiWHONutritionGenderColumnAdapter.kt
index 61c199e0c6..a24c0136bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/AnalyticsTeiWHONutritionGenderColumnAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/AnalyticsTeiWHONutritionGenderColumnAdapter.kt
@@ -47,7 +47,7 @@ internal class AnalyticsTeiWHONutritionGenderColumnAdapter : ColumnTypeAdapter<A
                 AnalyticsTeiWHONutritionGenderValues.builder()
                     .female(cursor.getString(femaleIndex))
                     .male(cursor.getString(maleIndex))
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/SectionRenderingColumnAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/SectionRenderingColumnAdapter.kt
index 77aa822265..4671bce16f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/SectionRenderingColumnAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/SectionRenderingColumnAdapter.kt
@@ -38,7 +38,7 @@ internal class SectionRenderingColumnAdapter : ColumnTypeAdapter<SectionRenderin
     override fun fromCursor(cursor: Cursor, columnName: String): SectionRendering {
         return SectionRendering.create(
             getFromCursor(cursor, DESKTOP_RENDER_TYPE),
-            getFromCursor(cursor, MOBILE_RENDER_TYPE)
+            getFromCursor(cursor, MOBILE_RENDER_TYPE),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/StringSetColumnAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/StringSetColumnAdapter.kt
index 25939042f2..aee4313804 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/StringSetColumnAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/StringSetColumnAdapter.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.arch.db.adapters.custom.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory
+import java.util.*
 
 internal class StringSetColumnAdapter : JSONObjectSetColumnAdapter<String>() {
     override fun getObjectClass(): Class<Set<String>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt
index 1d50daa6bd..6e2c73567a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDataObjectStoreImpl.kt
@@ -47,7 +47,7 @@ internal open class IdentifiableDataObjectStoreImpl<O>(
     databaseAdapter: DatabaseAdapter,
     builder: SQLStatementBuilder,
     binder: StatementBinder<O>,
-    objectFactory: (Cursor) -> O
+    objectFactory: (Cursor) -> O,
 ) : IdentifiableObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory),
     IdentifiableDataObjectStore<O> where O : ObjectWithUidInterface, O : DataObject {
 
@@ -55,12 +55,12 @@ internal open class IdentifiableDataObjectStoreImpl<O>(
         databaseAdapter: DatabaseAdapter,
         tableInfo: TableInfo,
         binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
+        objectFactory: (Cursor) -> O,
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(tableInfo),
         binder,
-        objectFactory
+        objectFactory,
     )
 
     private var selectStateQuery: String? = null
@@ -161,7 +161,7 @@ internal open class IdentifiableDataObjectStoreImpl<O>(
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 DataColumns.SYNC_STATE,
-                EnumHelper.asStringList(State.uploadableStatesIncludingError().toList())
+                EnumHelper.asStringList(State.uploadableStatesIncludingError().toList()),
             ).build()
 
         return selectWhere(whereClause)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt
index 1e68f737ec..95bdde7522 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableDeletableDataObjectStoreImpl.kt
@@ -47,7 +47,7 @@ internal open class IdentifiableDeletableDataObjectStoreImpl<O>(
     databaseAdapter: DatabaseAdapter,
     builder: SQLStatementBuilder,
     binder: StatementBinder<O>,
-    objectFactory: (Cursor) -> O
+    objectFactory: (Cursor) -> O,
 ) : IdentifiableDataObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory),
     IdentifiableDeletableDataObjectStore<O> where O : ObjectWithUidInterface, O : DeletableDataObject {
 
@@ -55,12 +55,12 @@ internal open class IdentifiableDeletableDataObjectStoreImpl<O>(
         databaseAdapter: DatabaseAdapter,
         tableInfo: TableInfo,
         binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
+        objectFactory: (Cursor) -> O,
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(tableInfo),
         binder,
-        objectFactory
+        objectFactory,
     )
 
     private var setDeletedStatement: StatementWrapper? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt
index 261b547832..481f9866d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/IdentifiableObjectStoreImpl.kt
@@ -45,7 +45,7 @@ internal open class IdentifiableObjectStoreImpl<O>(
     databaseAdapter: DatabaseAdapter,
     builder: SQLStatementBuilder,
     binder: StatementBinder<O>,
-    objectFactory: (Cursor) -> O
+    objectFactory: (Cursor) -> O,
 ) : ObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory),
     IdentifiableObjectStore<O> where O : CoreObject, O : ObjectWithUidInterface {
 
@@ -53,12 +53,12 @@ internal open class IdentifiableObjectStoreImpl<O>(
         databaseAdapter: DatabaseAdapter,
         tableInfo: TableInfo,
         binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
+        objectFactory: (Cursor) -> O,
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(tableInfo.name(), tableInfo.columns().all(), arrayOf()),
         binder,
-        objectFactory
+        objectFactory,
     )
 
     private var updateStatement: StatementWrapper? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt
index fdf8c5712a..7f495234e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkChildStoreImpl.kt
@@ -37,7 +37,7 @@ internal class LinkChildStoreImpl<P : ObjectWithUidInterface, C : ObjectWithUidI
     private val linkTableChildProjection: LinkTableChildProjection,
     private val databaseAdapter: DatabaseAdapter,
     private val statementBuilder: SQLStatementBuilder,
-    private val cursorExecutor: CursorExecutor<C>
+    private val cursorExecutor: CursorExecutor<C>,
 ) : LinkChildStore<P, C> {
 
     override fun getChildren(p: P): List<C> {
@@ -48,7 +48,7 @@ internal class LinkChildStoreImpl<P : ObjectWithUidInterface, C : ObjectWithUidI
         val selectStatement = statementBuilder.selectChildrenWithLinkTable(
             linkTableChildProjection,
             p.uid(),
-            whereClause
+            whereClause,
         )
         return cursorExecutor.getObjects(databaseAdapter.rawQuery(selectStatement))
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt
index 0083d81f4d..7b29479c37 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/LinkStoreImpl.kt
@@ -42,7 +42,7 @@ internal open class LinkStoreImpl<O : CoreObject>(
     builder: SQLStatementBuilder,
     private val masterColumn: String,
     binder: StatementBinder<O>,
-    objectFactory: (Cursor) -> O
+    objectFactory: (Cursor) -> O,
 ) : ObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory), LinkStore<O> {
 
     constructor(
@@ -50,17 +50,17 @@ internal open class LinkStoreImpl<O : CoreObject>(
         tableInfo: TableInfo,
         masterColumn: String,
         binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
+        objectFactory: (Cursor) -> O,
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(
             tableInfo.name(),
             tableInfo.columns().all(),
-            tableInfo.columns().whereUpdate()
+            tableInfo.columns().whereUpdate(),
         ),
         masterColumn,
         binder,
-        objectFactory
+        objectFactory,
     )
 
     override fun insertIfNotExists(o: O): HandleAction {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt
index f1a6b164c6..9add0aec47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectStoreImpl.kt
@@ -44,19 +44,19 @@ internal open class ObjectStoreImpl<O : CoreObject> internal constructor(
     databaseAdapter: DatabaseAdapter,
     override val builder: SQLStatementBuilder,
     protected val binder: StatementBinder<O>,
-    objectFactory: (Cursor) -> O
+    objectFactory: (Cursor) -> O,
 ) : ReadableStoreImpl<O>(databaseAdapter, builder, objectFactory), ObjectStore<O> {
 
     constructor(
         databaseAdapter: DatabaseAdapter,
         tableInfo: TableInfo,
         binder: StatementBinder<O>,
-        objectFactory: (Cursor) -> O
+        objectFactory: (Cursor) -> O,
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(tableInfo),
         binder,
-        objectFactory
+        objectFactory,
     )
 
     private var insertStatement: StatementWrapper? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.kt
index 94a67e6a38..f1aa3b4792 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithUidChildStoreImpl.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 internal class ObjectWithUidChildStoreImpl<P : ObjectWithUidInterface>(
     private val linkTableChildProjection: LinkTableChildProjection,
     private val databaseAdapter: DatabaseAdapter,
-    private val statementBuilder: SQLStatementBuilder
+    private val statementBuilder: SQLStatementBuilder,
 ) : ObjectWithUidChildStore<P> {
 
     override fun getChildren(p: P): List<ObjectWithUid> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
index fdf8236e08..916454ab42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ObjectWithoutUidStoreImpl.kt
@@ -45,7 +45,7 @@ internal open class ObjectWithoutUidStoreImpl<O : CoreObject>(
     binder: StatementBinder<O>,
     private val whereUpdateBinder: WhereStatementBinder<O>,
     private val whereDeleteBinder: WhereStatementBinder<O>,
-    objectFactory: (Cursor) -> O
+    objectFactory: (Cursor) -> O,
 ) : ObjectStoreImpl<O>(databaseAdapter, builder, binder, objectFactory), ObjectWithoutUidStore<O> {
 
     constructor(
@@ -54,18 +54,18 @@ internal open class ObjectWithoutUidStoreImpl<O : CoreObject>(
         binder: StatementBinder<O>,
         whereUpdateBinder: WhereStatementBinder<O>,
         whereDeleteBinder: WhereStatementBinder<O>,
-        objectFactory: (Cursor) -> O
+        objectFactory: (Cursor) -> O,
     ) : this(
         databaseAdapter,
         SQLStatementBuilderImpl(
             tableInfo.name(),
             tableInfo.columns().all(),
-            tableInfo.columns().whereUpdate()
+            tableInfo.columns().whereUpdate(),
         ),
         binder,
         whereUpdateBinder,
         whereDeleteBinder,
-        objectFactory
+        objectFactory,
     )
 
     private var updateWhereStatement: StatementWrapper? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStoreImpl.kt
index c1ba285767..86bb97b29d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/ReadableStoreImpl.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.arch.db.stores.internal
 
 import android.database.Cursor
-import java.util.ArrayList
-import java.util.HashMap
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.ReadOnlySQLStatementBuilder
 import org.hisp.dhis.android.core.arch.db.sqlorder.internal.SQLOrderType
 import org.hisp.dhis.android.core.common.CoreObject
+import java.util.ArrayList
+import java.util.HashMap
 
 @Suppress("TooManyFunctions")
 internal open class ReadableStoreImpl<O : CoreObject>(
     protected val databaseAdapter: DatabaseAdapter,
     protected open val builder: ReadOnlySQLStatementBuilder,
-    val objectFactory: (Cursor) -> O
+    val objectFactory: (Cursor) -> O,
 ) : ReadableStore<O> {
 
     override fun selectAll(): List<O> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.kt
index 6e602df336..971597a872 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/SingleParentChildStoreImpl.kt
@@ -38,7 +38,7 @@ internal class SingleParentChildStoreImpl<P : ObjectWithUidInterface, C>(
     private val childProjection: SingleParentChildProjection,
     private val databaseAdapter: DatabaseAdapter,
     private val statementBuilder: SQLStatementBuilder,
-    private val cursorExecutor: CursorExecutor<C>
+    private val cursorExecutor: CursorExecutor<C>,
 ) : SingleParentChildStore<P, C> {
 
     override fun getChildren(p: P): List<C> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt
index 66db8ff838..3ec4cbcf1a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/stores/internal/StoreFactory.kt
@@ -43,13 +43,13 @@ internal object StoreFactory {
         databaseAdapter: DatabaseAdapter,
         linkTableInfo: TableInfo,
         linkTableChildProjection: LinkTableChildProjection,
-        childFactory: (Cursor) -> C
+        childFactory: (Cursor) -> C,
     ): LinkChildStore<P, C> {
         return LinkChildStoreImpl(
             linkTableChildProjection,
             databaseAdapter,
             SQLStatementBuilderImpl(linkTableInfo),
-            CursorExecutorImpl(childFactory)
+            CursorExecutorImpl(childFactory),
         )
     }
 
@@ -57,13 +57,13 @@ internal object StoreFactory {
     fun <P : ObjectWithUidInterface, C> singleParentChildStore(
         databaseAdapter: DatabaseAdapter,
         childProjection: SingleParentChildProjection,
-        childFactory: (Cursor) -> C
+        childFactory: (Cursor) -> C,
     ): SingleParentChildStore<P, C> {
         return SingleParentChildStoreImpl(
             childProjection,
             databaseAdapter,
             SQLStatementBuilderImpl(childProjection.childTableInfo),
-            CursorExecutorImpl(childFactory)
+            CursorExecutorImpl(childFactory),
         )
     }
 
@@ -71,12 +71,12 @@ internal object StoreFactory {
     fun <P : ObjectWithUidInterface> objectWithUidChildStore(
         databaseAdapter: DatabaseAdapter,
         linkTableInfo: TableInfo,
-        childProjection: LinkTableChildProjection
+        childProjection: LinkTableChildProjection,
     ): ObjectWithUidChildStore<P> {
         return ObjectWithUidChildStoreImpl(
             childProjection,
             databaseAdapter,
-            SQLStatementBuilderImpl(linkTableInfo)
+            SQLStatementBuilderImpl(linkTableInfo),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.kt
index 6606361171..b434ac5ebe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/fields/internal/FieldsHelper.kt
@@ -85,7 +85,7 @@ internal class FieldsHelper<O> {
             displayName(),
             created(),
             lastUpdated(),
-            deleted()
+            deleted(),
         )
     }
 
@@ -94,7 +94,7 @@ internal class FieldsHelper<O> {
             this.field<O>(BaseNameableObject.SHORT_NAME),
             this.field<O>(BaseNameableObject.DISPLAY_SHORT_NAME),
             this.field<O>(BaseNameableObject.DESCRIPTION),
-            this.field<O>(BaseNameableObject.DISPLAY_DESCRIPTION)
+            this.field<O>(BaseNameableObject.DISPLAY_DESCRIPTION),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt
index dfaa092403..3c546a7838 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandler.kt
@@ -36,6 +36,6 @@ interface IdentifiableDataHandler<O> where O : DeletableDataObject, O : ObjectWi
     fun handleMany(
         oCollection: Collection<O>?,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt
index 67f45ee595..39f367d3ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerImpl.kt
@@ -41,7 +41,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelative
 internal abstract class IdentifiableDataHandlerImpl<O>(
     val store: IdentifiableDataObjectStore<O>,
     private val relationshipVersionManager: RelationshipDHISVersionManager,
-    private val relationshipHandler: RelationshipHandler
+    private val relationshipHandler: RelationshipHandler,
 ) : IdentifiableDataHandler<O> where O : DeletableDataObject, O : ObjectWithUidInterface {
 
     @JvmSuppressWildcards
@@ -49,7 +49,7 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
         o: O?,
         transformer: (O) -> O,
         oTransformedCollection: MutableList<O>,
-        params: IdentifiableDataHandlerParams
+        params: IdentifiableDataHandlerParams,
     ) {
         if (o == null) {
             return
@@ -64,7 +64,7 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
         transformer: (O) -> O,
         oTransformedCollection: MutableList<O>,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ) {
         if (o == null) {
             return
@@ -85,7 +85,7 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
         o: O,
         transformer: (O) -> O,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ): O {
         val o2 = beforeObjectHandled(o, params)
         val o3 = transformer(o2)
@@ -98,7 +98,7 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
     override fun handleMany(
         oCollection: Collection<O>?,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ) {
         if (oCollection == null) {
             return
@@ -132,7 +132,7 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
     protected fun handleRelationships(
         relationships: Collection<Relationship>,
         parent: ObjectWithUidInterface,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ) {
         val ownedRelationships = relationshipVersionManager.getOwnedRelationships(relationships, parent.uid())
 
@@ -141,11 +141,11 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
                 ownedRelationships,
                 parent.uid(),
                 relatives,
-                relationshipHandler
+                relationshipHandler,
             )
         }
         relationshipHandler.handleMany(
-            ownedRelationships
+            ownedRelationships,
         ) { relationship: Relationship ->
             relationship.toBuilder()
                 .syncState(State.SYNCED)
@@ -183,12 +183,12 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
         o: O,
         action: HandleAction?,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     )
 
     protected fun beforeCollectionHandled(
         oCollection: Collection<O>,
-        params: IdentifiableDataHandlerParams
+        params: IdentifiableDataHandlerParams,
     ): Collection<O> {
         return when {
             params.overwrite -> {
@@ -197,7 +197,7 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
             params.asRelationship -> {
                 removeAllowedExistingObjects(
                     oCollection,
-                    listOf(State.RELATIONSHIP.name)
+                    listOf(State.RELATIONSHIP.name),
                 )
             }
             else -> {
@@ -206,8 +206,8 @@ internal abstract class IdentifiableDataHandlerImpl<O>(
                     listOf(
                         State.SYNCED.name,
                         State.RELATIONSHIP.name,
-                        State.SYNCED_VIA_SMS.name
-                    )
+                        State.SYNCED_VIA_SMS.name,
+                    ),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerParams.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerParams.kt
index dc8221a634..d3c3b1013e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableDataHandlerParams.kt
@@ -32,5 +32,5 @@ data class IdentifiableDataHandlerParams(
     val hasAllAttributes: Boolean,
     val overwrite: Boolean,
     val asRelationship: Boolean,
-    val program: String? = null
+    val program: String? = null,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableWithoutDeleteInterfaceHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableWithoutDeleteInterfaceHandlerImpl.kt
index 53e6b9fb63..43a61c2b0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableWithoutDeleteInterfaceHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/IdentifiableWithoutDeleteInterfaceHandlerImpl.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
 internal open class IdentifiableWithoutDeleteInterfaceHandlerImpl<O : ObjectWithUidInterface>(
-    val store: IdentifiableObjectStore<O>
+    val store: IdentifiableObjectStore<O>,
 ) :
     HandlerBaseImpl<O>() {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt
index 01f682acfb..0e8247e817 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/handlers/internal/OrderedLinkHandlerImpl.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.common.CoreObject
 
 internal open class OrderedLinkHandlerImpl<S, M : CoreObject>(
-    private val store: LinkStore<M>
+    private val store: LinkStore<M>,
 ) : OrderedLinkHandler<S, M> {
 
     override fun handleMany(masterUid: String, slaves: List<S>?, transformer: Function2<S, Int, M>) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/DateUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/DateUtils.kt
index 6f6078f018..eef30bd5eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/DateUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/DateUtils.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.arch.helpers
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.dateformat.internal.SafeDateFormat
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
+import java.util.*
 
 object DateUtils {
 
@@ -57,19 +57,22 @@ object DateUtils {
             PeriodType.WeeklySaturday,
             PeriodType.WeeklySunday,
             PeriodType.WeeklyThursday,
-            PeriodType.WeeklyWednesday -> calendar.add(Calendar.WEEK_OF_YEAR, periods)
+            PeriodType.WeeklyWednesday,
+            -> calendar.add(Calendar.WEEK_OF_YEAR, periods)
             PeriodType.BiWeekly -> calendar.add(Calendar.WEEK_OF_YEAR, 2 * periods)
             PeriodType.Monthly -> calendar.add(Calendar.MONTH, periods)
             PeriodType.BiMonthly -> calendar.add(Calendar.MONTH, 2 * periods)
             PeriodType.Quarterly -> calendar.add(Calendar.MONTH, 3 * periods)
             PeriodType.SixMonthly,
             PeriodType.SixMonthlyApril,
-            PeriodType.SixMonthlyNov -> calendar.add(Calendar.MONTH, 6 * periods)
+            PeriodType.SixMonthlyNov,
+            -> calendar.add(Calendar.MONTH, 6 * periods)
             PeriodType.Yearly,
             PeriodType.FinancialApril,
             PeriodType.FinancialJuly,
             PeriodType.FinancialOct,
-            PeriodType.FinancialNov -> calendar.add(Calendar.YEAR, periods)
+            PeriodType.FinancialNov,
+            -> calendar.add(Calendar.YEAR, periods)
         }
 
         return calendar.time
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
index 69b527d1ba..26f1134121 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResizerHelper.kt
@@ -30,14 +30,14 @@ package org.hisp.dhis.android.core.arch.helpers
 import android.graphics.Bitmap
 import android.graphics.Bitmap.CompressFormat
 import android.graphics.BitmapFactory
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
 import org.hisp.dhis.android.core.D2Manager
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.getExtension
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 
 object FileResizerHelper {
 
@@ -67,7 +67,7 @@ object FileResizerHelper {
                     bitmap,
                     dimension.dimension,
                     (dimension.dimension / scaleFactor).toInt(),
-                    dimension
+                    dimension,
                 )
             }
         } else {
@@ -79,7 +79,7 @@ object FileResizerHelper {
                     bitmap,
                     (scaleFactor * dimension.dimension).toInt(),
                     dimension.dimension,
-                    dimension
+                    dimension,
                 )
             }
         }
@@ -138,6 +138,6 @@ object FileResizerHelper {
     enum class Dimension(val dimension: Int) {
         SMALL(256),
         MEDIUM(512),
-        LARGE(1024)
+        LARGE(1024),
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
index 26c0908932..a8e2e29081 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.arch.helpers
 
 import android.content.Context
-import java.io.File
 import org.hisp.dhis.android.core.D2Manager
 import org.hisp.dhis.android.core.configuration.internal.DatabaseAccount
 import org.hisp.dhis.android.core.configuration.internal.DatabaseNameGenerator
+import java.io.File
 
 object FileResourceDirectoryHelper {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.kt
index 1124f5ef12..8f858fba71 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UidsHelper.kt
@@ -52,7 +52,7 @@ object UidsHelper {
     @JvmStatic
     fun <P, C : ObjectWithUidInterface> getChildrenUids(
         parentList: Collection<P>,
-        childExtractor: (P) -> List<C>
+        childExtractor: (P) -> List<C>,
     ): Set<String> {
         return getUids(parentList.flatMap { childExtractor(it) })
     }
@@ -116,7 +116,7 @@ object UidsHelper {
     @JvmStatic
     fun <O : ObjectWithUidInterface> mapByParentUid(
         objects: Collection<O>,
-        parentExtractor: Transformer<O, String>
+        parentExtractor: Transformer<O, String>,
     ): Map<String, List<O>> {
         return objects.groupBy { o -> parentExtractor.transform(o) }
     }
@@ -141,7 +141,7 @@ object UidsHelper {
      */
     @JvmStatic
     fun <O : ObjectWithUidInterface> commaSeparatedUidsWithSingleQuotationMarks(
-        objects: Collection<O>
+        objects: Collection<O>,
     ): String {
         return CollectionsHelper.commaAndSpaceSeparatedArrayValues(getUidsArray(objects))
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt
index 7d1cfe225b..b7e46fad33 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt
@@ -36,14 +36,14 @@ internal class MultiDimensionalPartitioner @Inject constructor() {
     fun partitionForSize(size: Int, vararg partitions: Collection<String>): List<List<List<String>>> {
         return partitionInternal(
             UrlLengthHelper.getHowManyUidsFitInURL(size),
-            listOf(partitions.map { it.toList() })
+            listOf(partitions.map { it.toList() }),
         )
     }
 
     fun partition(maxValues: Int, vararg partitions: Collection<String>): List<List<List<String>>> {
         return partitionInternal(
             maxValues,
-            listOf(partitions.map { it.toList() })
+            listOf(partitions.map { it.toList() }),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIAttributeDeserializer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIAttributeDeserializer.kt
index f0dabe3efe..cf688ee7ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIAttributeDeserializer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIAttributeDeserializer.kt
@@ -32,15 +32,14 @@ import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
-import java.io.IOException
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
+import java.io.IOException
 
 class AnalyticsTEIAttributeDeserializer @JvmOverloads constructor(
-    vc: Class<*>? = null
+    vc: Class<*>? = null,
 ) : StdDeserializer<AnalyticsTeiAttribute>(vc) {
 
     @Throws(IOException::class, JsonProcessingException::class)
-
     override fun deserialize(jp: JsonParser, ctxt: DeserializationContext): AnalyticsTeiAttribute {
         val node = jp.codec.readTree<JsonNode>(jp)
         val attribute = node.textValue()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIDataElementDeserializer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIDataElementDeserializer.kt
index 060522c15a..26236751ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIDataElementDeserializer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIDataElementDeserializer.kt
@@ -33,15 +33,14 @@ import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
-import java.io.IOException
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
+import java.io.IOException
 
 class AnalyticsTEIDataElementDeserializer @JvmOverloads constructor(
-    vc: Class<*>? = null
+    vc: Class<*>? = null,
 ) : StdDeserializer<AnalyticsTeiDataElement>(vc) {
 
     @Throws(IOException::class, JsonProcessingException::class)
-
     override fun deserialize(jp: JsonParser, ctxt: DeserializationContext): AnalyticsTeiDataElement {
         val node = jp.codec.readTree<JsonNode>(jp)
         val programDataElement = node.textValue()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIIndicatorDeserializer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIIndicatorDeserializer.kt
index f1a83704b2..a35592fb7f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIIndicatorDeserializer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/AnalyticsTEIIndicatorDeserializer.kt
@@ -33,15 +33,14 @@ import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
-import java.io.IOException
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
+import java.io.IOException
 
 class AnalyticsTEIIndicatorDeserializer @JvmOverloads constructor(
-    vc: Class<*>? = null
+    vc: Class<*>? = null,
 ) : StdDeserializer<AnalyticsTeiIndicator>(vc) {
 
     @Throws(IOException::class, JsonProcessingException::class)
-
     override fun deserialize(jp: JsonParser, ctxt: DeserializationContext): AnalyticsTeiIndicator {
         val node = jp.codec.readTree<JsonNode>(jp)
         val programIndicator = node.textValue()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/DateMultiFormatDeserializer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/DateMultiFormatDeserializer.kt
index 15fb549b90..5d6d7d9faf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/DateMultiFormatDeserializer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/DateMultiFormatDeserializer.kt
@@ -41,7 +41,6 @@ import java.util.Locale
 
 class DateMultiFormatDeserializer @JvmOverloads constructor(vc: Class<*>? = null) : StdDeserializer<Date>(vc) {
     @Throws(IOException::class, JsonProcessingException::class)
-
     override fun deserialize(jp: JsonParser, ctxt: DeserializationContext): Date {
         val node = jp.codec.readTree<JsonNode>(jp)
         val date = node.textValue()
@@ -63,7 +62,7 @@ class DateMultiFormatDeserializer @JvmOverloads constructor(vc: Class<*>? = null
             "yyyy-MM-dd'T'HH:mm:ssZ",
             "yyyy-MM-dd'T'HH:mm",
             "yyyy-MM-dd'T'HH:mmZ",
-            "yyyy-MM-dd"
+            "yyyy-MM-dd",
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactory.kt
index a3320bea69..015f299f78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactory.kt
@@ -32,8 +32,8 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import java.util.Date
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import java.util.Date
 
 internal object ObjectMapperFactory {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
index 86a5639bfa..ee943b38c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
@@ -34,7 +34,7 @@ internal object ChildrenAppenderExecutor {
     fun <M> appendInObject(
         m: M?,
         childrenAppenders: Map<String, ChildrenAppender<M>>,
-        childrenSelection: ChildrenSelection
+        childrenSelection: ChildrenSelection,
     ): M? {
         return m?.let {
             val selectedAppenders = getSelectedChildrenAppenders(childrenAppenders, childrenSelection)
@@ -49,7 +49,7 @@ internal object ChildrenAppenderExecutor {
     fun <M : CoreObject?> appendInObjectCollection(
         list: List<M>,
         childrenAppenders: Map<String, ChildrenAppender<M>>,
-        childrenSelection: ChildrenSelection
+        childrenSelection: ChildrenSelection,
     ): List<M> {
         val selectedAppenders = getSelectedChildrenAppenders(childrenAppenders, childrenSelection)
 
@@ -64,7 +64,7 @@ internal object ChildrenAppenderExecutor {
 
     private fun <M> getSelectedChildrenAppenders(
         appendersMap: Map<String, ChildrenAppender<M>>,
-        childrenSelection: ChildrenSelection
+        childrenSelection: ChildrenSelection,
     ): Collection<ChildrenAppender<M>> {
         return childrenSelection.children.mapNotNull { key -> appendersMap[key] }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
index 552f0a6e92..ce4ff50cb2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -42,7 +42,7 @@ abstract class BaseReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollec
     @JvmField internal val store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    cf: FilterConnectorFactory<R>
+    cf: FilterConnectorFactory<R>,
 ) : ReadOnlyCollectionRepositoryImpl<M, R>(store, childrenAppenders, scope, cf),
     ReadOnlyWithUidCollectionRepository<M> where M : CoreObject, M : ObjectWithUidInterface {
 
@@ -66,8 +66,8 @@ abstract class BaseReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollec
             whereClause,
             OrderByClauseBuilder.orderByFromItems(
                 scope.orderBy(),
-                scope.pagingKey()
-            )
+                scope.pagingKey(),
+            ),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
index 91a65c5e05..f431004e03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseRepositoryImpl.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
 open class BaseRepositoryImpl<R : BaseRepository>(
     @JvmField protected val scope: RepositoryScope,
-    @JvmField protected val cf: FilterConnectorFactory<R>
+    @JvmField protected val cf: FilterConnectorFactory<R>,
 ) : BaseRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index 6235e4c83f..5c5362a463 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -49,15 +49,15 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
     private val store: ReadableStore<M>,
     @JvmField internal val childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    cf: FilterConnectorFactory<R>
+    cf: FilterConnectorFactory<R>,
 ) : BaseRepositoryImpl<R>(scope, cf), ReadOnlyCollectionRepository<M> {
     protected fun blockingGetWithoutChildren(): List<M> {
         return store.selectWhere(
             whereClause,
             OrderByClauseBuilder.orderByFromItems(
                 scope.orderBy(),
-                scope.pagingKey()
-            )
+                scope.pagingKey(),
+            ),
         )
     }
 
@@ -80,7 +80,7 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
         return ChildrenAppenderExecutor.appendInObjectCollection(
             blockingGetWithoutChildren(),
             childrenAppenders,
-            scope.children()
+            scope.children(),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 9c1446f2dc..3ad0d7fd94 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -45,7 +45,7 @@ open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectio
     store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    cf: FilterConnectorFactory<R>
+    cf: FilterConnectorFactory<R>,
 ) : ReadOnlyWithUidCollectionRepositoryImpl<M, R>(store, childrenAppenders, scope, cf),
     ReadOnlyIdentifiableCollectionRepository<M, R> where M : CoreObject, M : IdentifiableObject {
     override fun byUid(): StringFilterConnector<R> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 80393ede3d..a167ac8f19 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -43,12 +43,12 @@ internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyColl
     store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    cf: FilterConnectorFactory<R>
+    cf: FilterConnectorFactory<R>,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<M, R>(
     store,
     childrenAppenders,
     scope,
-    cf
+    cf,
 ),
     ReadOnlyNameableCollectionRepository<M, R> where M : CoreObject, M : NameableObject {
     override fun byShortName(): StringFilterConnector<R> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index 3c052b368c..195126524d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -48,13 +48,15 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFr
 import org.hisp.dhis.android.core.common.CoreObject
 
 internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
-    M : CoreObject, T : Any, R : ReadOnlyCollectionRepository<T>
+    M : CoreObject,
+    T : Any,
+    R : ReadOnlyCollectionRepository<T>,
     > internal constructor(
     private val store: ReadableStore<M>,
     val childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
-    open val transformer: TwoWayTransformer<M, T>
+    open val transformer: TwoWayTransformer<M, T>,
 ) : BaseRepositoryImpl<R>(scope, cf), ReadOnlyCollectionRepository<T> {
 
     fun blockingGetWithoutChildren(): List<M> {
@@ -62,8 +64,8 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
             whereClause,
             OrderByClauseBuilder.orderByFromItems(
                 scope.orderBy(),
-                scope.pagingKey()
-            )
+                scope.pagingKey(),
+            ),
         )
     }
 
@@ -86,7 +88,7 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
         return ChildrenAppenderExecutor.appendInObjectCollection(
             blockingGetWithoutChildren(),
             childrenAppenders,
-            scope.children()
+            scope.children(),
         ).map { transformer.transform(it) }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index 8e85d0d3a2..07ef8a340a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -43,13 +43,15 @@ import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
 internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
-    M, T, R : ReadOnlyCollectionRepository<T>
+    M,
+    T,
+    R : ReadOnlyCollectionRepository<T>,
     > internal constructor(
     private val store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
-    override val transformer: TwoWayTransformer<M, T>
+    override val transformer: TwoWayTransformer<M, T>,
 ) : ReadOnlyWithTransformerCollectionRepositoryImpl<M, T, R>(store, childrenAppenders, scope, cf, transformer),
     ReadOnlyWithUidCollectionRepository<T>
     where M : CoreObject, M : ObjectWithUidInterface, T : ObjectWithUidInterface {
@@ -73,8 +75,8 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
             whereClause,
             OrderByClauseBuilder.orderByFromItems(
                 scope.orderBy(),
-                scope.pagingKey()
-            )
+                scope.pagingKey(),
+            ),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index 78d9805aa6..18df710214 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -41,12 +41,12 @@ open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepo
     store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    cf: FilterConnectorFactory<R>
+    cf: FilterConnectorFactory<R>,
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
     store,
     childrenAppenders,
     scope,
-    cf
+    cf,
 ) where M : CoreObject, M : ObjectWithUidInterface {
     /**
      * Returns a new [ReadOnlyObjectRepository] whose scope is the one of the current repository plus the
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index e33100e1c5..689795fb2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -47,12 +47,12 @@ internal abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadO
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
     @JvmField protected val transformer: Transformer<P, M>,
-    cf: FilterConnectorFactory<R>
+    cf: FilterConnectorFactory<R>,
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
     store,
     childrenAppenders,
     scope,
-    cf
+    cf,
 ),
     ReadWriteWithUidCollectionRepository<M, P> where M : CoreObject, M : ObjectWithUidInterface {
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
index 2b68c3402c..bdda624902 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateFilterConnector.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.dateformat.internal.SafeDateFormat
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryFactory
@@ -36,12 +35,13 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 import org.hisp.dhis.android.core.period.DatePeriod
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.internal.InPeriodQueryHelper
+import java.util.*
 
 abstract class DateFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
     key: String,
-    val formatter: SafeDateFormat
+    val formatter: SafeDateFormat,
 ) : BaseAbstractFilterConnector<R, Date>(repositoryFactory, scope, key) {
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateTimeFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateTimeFilterConnector.kt
index 4c803aa5a8..40ed7dae67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateTimeFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DateTimeFilterConnector.kt
@@ -35,5 +35,5 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class DateTimeFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : DateFilterConnector<R>(repositoryFactory, scope, key, DateUtils.DATE_FORMAT)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt
index da08f887ed..dbab97c6d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqLikeItemFilterConnector.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 
 class EqLikeItemFilterConnector<R : BaseRepository?> internal constructor(
     private val key: String,
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, RepositoryScopeFilterItem>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, RepositoryScopeFilterItem>,
 ) {
     fun eq(value: String): R {
         val item = RepositoryScopeFilterItem.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EventDataFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EventDataFilterConnector.kt
index b7fd83c528..3aea8d05ab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EventDataFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EventDataFilterConnector.kt
@@ -27,17 +27,17 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DatePeriodType
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.event.EventDataFilter
+import java.util.*
 
 @Suppress("TooManyFunctions")
 class EventDataFilterConnector<R : BaseRepository> internal constructor(
     private val key: String,
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, EventDataFilter>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, EventDataFilter>,
 ) {
     fun eq(value: String): R {
         val filter = EventDataFilter.builder().dataItem(key).eq(value).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
index bcc02a1e9c..106cf848cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ScopedFilterConnectorFactory.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.common.OrganisationUnitFilter
 import org.hisp.dhis.android.core.event.EventDataFilter
 
 internal class ScopedFilterConnectorFactory<R : BaseRepository, S : BaseScope>(
-    private val repositoryFactory: ScopedRepositoryFactory<R, S>
+    private val repositoryFactory: ScopedRepositoryFactory<R, S>,
 ) {
     fun <T> eqConnector(baseScopeFactory: BaseScopeFactory<S, T>): EqFilterConnector<R, T> {
         return EqFilterConnector { value: T -> repositoryFactory.updated(baseScopeFactory.updated(value)) }
@@ -53,11 +53,11 @@ internal class ScopedFilterConnectorFactory<R : BaseRepository, S : BaseScope>(
 
     fun eqLikeItemC(
         key: String,
-        baseScopeFactory: BaseScopeFactory<S, RepositoryScopeFilterItem>
+        baseScopeFactory: BaseScopeFactory<S, RepositoryScopeFilterItem>,
     ): EqLikeItemFilterConnector<R> {
         return EqLikeItemFilterConnector(key) { item: RepositoryScopeFilterItem ->
             repositoryFactory.updated(
-                baseScopeFactory.updated(item)
+                baseScopeFactory.updated(item),
             )
         }
     }
@@ -66,8 +66,8 @@ internal class ScopedFilterConnectorFactory<R : BaseRepository, S : BaseScope>(
         return PeriodFilterConnector { filter: DateFilterPeriod ->
             repositoryFactory.updated(
                 baseScopeFactory.updated(
-                    filter
-                )
+                    filter,
+                ),
             )
         }
     }
@@ -76,29 +76,29 @@ internal class ScopedFilterConnectorFactory<R : BaseRepository, S : BaseScope>(
         return PeriodsFilterConnector { filter: List<DateFilterPeriod> ->
             repositoryFactory.updated(
                 baseScopeFactory.updated(
-                    filter
-                )
+                    filter,
+                ),
             )
         }
     }
 
     fun organisationUnitConnector(
-        baseScopeFactory: BaseScopeFactory<S, List<OrganisationUnitFilter>>
+        baseScopeFactory: BaseScopeFactory<S, List<OrganisationUnitFilter>>,
     ): OrganisationUnitFilterConnector<R> {
         return OrganisationUnitFilterConnector { filter: List<OrganisationUnitFilter> ->
             repositoryFactory.updated(
-                baseScopeFactory.updated(filter)
+                baseScopeFactory.updated(filter),
             )
         }
     }
 
     fun eventDataFilterConnector(
         key: String,
-        baseScopeFactory: BaseScopeFactory<S, EventDataFilter>
+        baseScopeFactory: BaseScopeFactory<S, EventDataFilter>,
     ): EventDataFilterConnector<R> {
         return EventDataFilterConnector(key) { item: EventDataFilter ->
             repositoryFactory.updated(
-                baseScopeFactory.updated(item)
+                baseScopeFactory.updated(item),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SimpleDateFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SimpleDateFilterConnector.kt
index 53f57e56e5..8cac4e8b53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SimpleDateFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SimpleDateFilterConnector.kt
@@ -35,5 +35,5 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class SimpleDateFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : DateFilterConnector<R>(repositoryFactory, scope, "date($key)", DateUtils.SIMPLE_DATE_FORMAT)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
index 03e4c3a1d6..bd905f6442 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class ReadOnlyOneObjectRepositoryFinalImpl<M> internal constructor(
     store: ReadableStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyOneObjectRepositoryImpl<M, ReadOnlyOneObjectRepositoryFinalImpl<M>>(
     store,
     childrenAppenders,
@@ -45,7 +45,7 @@ class ReadOnlyOneObjectRepositoryFinalImpl<M> internal constructor(
         ReadOnlyOneObjectRepositoryFinalImpl(
             store,
             childrenAppenders,
-            s
+            s,
         )
-    }
+    },
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
index b42e33d6e4..68f7616451 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
@@ -32,7 +32,7 @@ import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 
 abstract class ReadOnlyAnyObjectWithDownloadRepositoryImpl<M>(
-    private val downloadCompletableProvider: CompletableProvider
+    private val downloadCompletableProvider: CompletableProvider,
 ) {
     fun get(): Single<M?> {
         return Single.fromCallable { blockingGet() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
index 5ed2b3db78..cc81587465 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
@@ -43,7 +43,7 @@ internal constructor(
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
     private val downloadProvider: DownloadProvider,
-    repositoryFactory: ObjectRepositoryFactory<R>
+    repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
     ReadOnlyWithDownloadObjectRepository<M> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
index 51f3af8e88..f5c42ca547 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
     private val childrenAppenders: Map<String, ChildrenAppender<M>>,
     protected val scope: RepositoryScope,
-    repositoryFactory: ObjectRepositoryFactory<R>
+    repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyObjectRepository<M> {
     @JvmField protected val cf: FilterConnectorFactory<R> = FilterConnectorFactory(scope, repositoryFactory)
 
@@ -60,7 +60,7 @@ abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>>
         return ChildrenAppenderExecutor.appendInObject(
             blockingGetWithoutChildren(),
             childrenAppenders,
-            scope.children()
+            scope.children(),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
index f66fcd9a70..85b1b93bdc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
@@ -38,7 +38,7 @@ open class ReadOnlyOneObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> i
     private val store: ReadableStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    repositoryFactory: ObjectRepositoryFactory<R>
+    repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyObjectRepositoryImpl<M, R>(childrenAppenders, scope, repositoryFactory) {
 
     override fun blockingGetWithoutChildren(): M? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
index 82891dcfae..1aa263109a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
@@ -42,7 +42,7 @@ internal constructor(
     private val store: ReadableStore<M>,
     private val childrenAppenders: Map<String, ChildrenAppender<M>>,
     private val scope: RepositoryScope,
-    private val transformer: TwoWayTransformer<M, T>
+    private val transformer: TwoWayTransformer<M, T>,
 ) : ReadOnlyObjectRepository<T> {
 
     fun blockingGetWithoutChildren(): M? {
@@ -67,7 +67,7 @@ internal constructor(
         val item = ChildrenAppenderExecutor.appendInObject(
             blockingGetWithoutChildren(),
             childrenAppenders,
-            scope.children()
+            scope.children(),
         )
 
         return item?.let { transformer.transform(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
index 3095f1bf2b..13a87fc3c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
@@ -47,7 +47,7 @@ abstract class ReadWriteWithUidDataObjectRepositoryImpl<M, R : ReadOnlyObjectRep
     store: IdentifiableDeletableDataObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    repositoryFactory: ObjectRepositoryFactory<R>
+    repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadWriteWithUidObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
     ReadWriteObjectRepository<M> where M : CoreObject, M : ObjectWithUidInterface, M : DeletableDataObject {
     /**
@@ -116,7 +116,7 @@ abstract class ReadWriteWithUidDataObjectRepositoryImpl<M, R : ReadOnlyObjectRep
     }
 
     @Throws(D2Error::class)
-    override fun updateObject(m: M): Unit {
+    override fun updateObject(m: M) {
         super.updateObject(m)
         propagateState(m, HandleAction.Update)
         return Unit()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
index d3c69bb84c..55691005c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
@@ -42,17 +42,17 @@ open class ReadWriteWithUidObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<
     private val store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    repositoryFactory: ObjectRepositoryFactory<R>
+    repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyOneObjectRepositoryImpl<M, R>(
     store,
     childrenAppenders,
     scope,
-    repositoryFactory
+    repositoryFactory,
 ) where M : CoreObject, M : ObjectWithUidInterface {
 
     @Throws(D2Error::class)
     @Suppress("TooGenericExceptionCaught")
-    protected open fun updateObject(m: M): Unit {
+    protected open fun updateObject(m: M) {
         return try {
             store.update(m)
             Unit()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
index 9a0a7dc691..63c67e9e97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
@@ -44,7 +44,7 @@ internal constructor(
     private val store: ObjectWithoutUidStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
-    repositoryFactory: ObjectRepositoryFactory<R>
+    repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
     ReadWriteObjectRepository<M> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
index 423b615284..214fc10e64 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
@@ -42,7 +42,7 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
     private val store: ReadableStore<M>,
     private val scope: RepositoryScope,
     private val childrenAppenders: Map<String, ChildrenAppender<M>>,
-    private val transformer: TwoWayTransformer<M, T>
+    private val transformer: TwoWayTransformer<M, T>,
 ) : ItemKeyedDataSource<M, T>() {
 
     override fun loadInitial(params: LoadInitialParams<M>, callback: LoadInitialCallback<T>) {
@@ -50,7 +50,7 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
         val withoutChildren = store.selectWhere(
             whereClause,
             OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-            params.requestedLoadSize
+            params.requestedLoadSize,
         )
         callback.onResult(appendChildren(withoutChildren))
     }
@@ -70,13 +70,13 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
             scope.orderBy(),
             params.key.toContentValues(),
             reversed,
-            scope.pagingKey()
+            scope.pagingKey(),
         )
         val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope)
         val withoutChildren = store.selectWhere(
             whereClause,
             OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-            params.requestedLoadSize
+            params.requestedLoadSize,
         )
         callback.onResult(appendChildren(withoutChildren))
     }
@@ -89,7 +89,7 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
         return ChildrenAppenderExecutor.appendInObjectCollection(
             withoutChildren,
             childrenAppenders,
-            scope.children()
+            scope.children(),
         ).map { transformer.transform(it) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/FilterItemOperator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/FilterItemOperator.kt
index 8ecbbcc0ee..fc4a3269a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/FilterItemOperator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/FilterItemOperator.kt
@@ -39,5 +39,5 @@ enum class FilterItemOperator(val sqlOperator: String, val apiOperator: String,
     GE(">=", "ge", "GE"),
     SW("LIKE", "sw", "SW"),
     EW("LIKE", "ew", "EW"),
-    VOID("", "", "")
+    VOID("", "", ""),
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/Credentials.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/Credentials.kt
index 09fa92a350..db6772f81d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/Credentials.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/Credentials.kt
@@ -34,7 +34,7 @@ data class Credentials(
     val username: String,
     val serverUrl: String,
     val password: String?,
-    val openIDConnectState: AuthState?
+    val openIDConnectState: AuthState?,
 ) {
     fun getHash(): String? {
         return password?.let { UserHelper.md5(username, it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt
index 3663bea8bf..0612a71612 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.arch.storage.internal
 
+import net.openid.appauth.AuthState
 import java.lang.RuntimeException
 import javax.inject.Inject
 import javax.inject.Singleton
-import net.openid.appauth.AuthState
 
 @Singleton
 internal class CredentialsSecureStoreImpl @Inject constructor(private val secureStore: ChunkedSecureStore) :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
index d41cf0928f..756558a880 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
 
 internal class AttributeHandler(
-    store: IdentifiableObjectStore<Attribute>
+    store: IdentifiableObjectStore<Attribute>,
 ) : IdentifiableHandlerImpl<Attribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
index 0045ff9e65..667d75ffbb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
@@ -42,7 +42,7 @@ internal class AttributeStoreImpl(databaseAdapter: DatabaseAdapter) : AttributeS
         databaseAdapter,
         AttributeTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Attribute.create(cursor) }
+        { cursor: Cursor -> Attribute.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
index 9eccba8b2a..977477f17f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
 
 internal class DataElementAttributeValueLinkHandler(
-    store: DataElementAttributeValueLinkStore
+    store: DataElementAttributeValueLinkStore,
 ) : LinkHandlerImpl<Attribute, DataElementAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
index f21ba83814..72f0a44137 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
 import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLinkTableInfo
 
 internal class DataElementAttributeValueLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataElementAttributeValueLinkStore,
     LinkStoreImpl<DataElementAttributeValueLink>(
         databaseAdapter,
         DataElementAttributeValueLinkTableInfo.TABLE_INFO,
         DataElementAttributeValueLinkTableInfo.Columns.DATA_ELEMENT,
         BINDER,
-        { cursor: Cursor -> DataElementAttributeValueLink.create(cursor) }
+        { cursor: Cursor -> DataElementAttributeValueLink.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: DataElementAttributeValueLink, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
index 62d9f6cdd9..87f82beb8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
 
 internal class ProgramAttributeValueLinkHandler(
-    store: ProgramAttributeValueLinkStore
+    store: ProgramAttributeValueLinkStore,
 ) : LinkHandlerImpl<Attribute, ProgramAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
index a25a57aae0..5eb27bb40c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
 import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLinkTableInfo
 
 internal class ProgramAttributeValueLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramAttributeValueLinkStore,
     LinkStoreImpl<ProgramAttributeValueLink>(
         databaseAdapter,
         ProgramAttributeValueLinkTableInfo.TABLE_INFO,
         ProgramAttributeValueLinkTableInfo.Columns.PROGRAM,
         BINDER,
-        { cursor: Cursor -> ProgramAttributeValueLink.create(cursor) }
+        { cursor: Cursor -> ProgramAttributeValueLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
index 996ad6bf6f..b0bd323dce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
 
 internal class ProgramStageAttributeValueLinkHandler(
-    store: ProgramStageAttributeValueLinkStore
+    store: ProgramStageAttributeValueLinkStore,
 ) : LinkHandlerImpl<Attribute, ProgramStageAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
index 72846b3240..2128a1f89e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
 import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLinkTableInfo
 
 internal class ProgramStageAttributeValueLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageAttributeValueLinkStore,
     LinkStoreImpl<ProgramStageAttributeValueLink>(
         databaseAdapter,
         ProgramStageAttributeValueLinkTableInfo.TABLE_INFO,
         ProgramStageAttributeValueLinkTableInfo.Columns.PROGRAM_STAGE,
         BINDER,
-        { cursor: Cursor -> ProgramStageAttributeValueLink.create(cursor) }
+        { cursor: Cursor -> ProgramStageAttributeValueLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDataDimensionType.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDataDimensionType.kt
index 08b712b7c5..384fe362d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDataDimensionType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDataDimensionType.kt
@@ -29,5 +29,5 @@ package org.hisp.dhis.android.core.category
 
 enum class CategoryDataDimensionType {
     ATTRIBUTE,
-    DISAGGREGATION
+    DISAGGREGATION,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
index 920b16d6c5..b265bbe708 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
 
 @Reusable
 class CategoryOptionComboService @Inject constructor(
-    private val categoryOptionRepository: CategoryOptionCollectionRepository
+    private val categoryOptionRepository: CategoryOptionCollectionRepository,
 ) {
 
     fun blockingHasAccess(categoryOptionComboUid: String, date: Date?, orgUnitUid: String? = null): Boolean {
@@ -48,14 +48,14 @@ class CategoryOptionComboService @Inject constructor(
     }
 
     fun blockingHasWriteAccess(
-        categoryOptions: List<CategoryOption>
+        categoryOptions: List<CategoryOption>,
     ): Boolean {
         return categoryOptions.none { it.access().data().write() == false }
     }
 
     fun blockingIsAssignedToOrgUnit(
         categoryOptionComboUid: String,
-        orgUnitUid: String?
+        orgUnitUid: String?,
     ): Boolean {
         return orgUnitUid?.let {
             val categoryOptions = categoryOptionRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
index 12dc99ecc1..16cc2df3a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.category.Category
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryCall @Inject constructor(
     private val handler: CategoryHandler,
     private val service: CategoryService,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<Category> {
 
     companion object {
@@ -49,12 +49,12 @@ internal class CategoryCall @Inject constructor(
         return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
-            handler
+            handler,
         ) { partitionUids: Set<String> ->
             service.getCategories(
                 CategoryFields.allFields,
                 CategoryFields.uid.`in`(partitionUids),
-                paging = false
+                paging = false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboChildrenAppender.kt
index 5944dcb1bf..a194d516d4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryTableInfo
 
 internal class CategoryCategoryComboChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<CategoryCombo, Category>
+    private val linkChildStore: LinkChildStore<CategoryCombo, Category>,
 ) : ChildrenAppender<CategoryCombo>() {
     override fun appendChildren(categoryCombo: CategoryCombo): CategoryCombo {
         val builder = categoryCombo.toBuilder()
@@ -51,7 +51,7 @@ internal class CategoryCategoryComboChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             CategoryTableInfo.TABLE_INFO,
             CategoryCategoryComboLinkTableInfo.Columns.CATEGORY_COMBO,
-            CategoryCategoryComboLinkTableInfo.Columns.CATEGORY
+            CategoryCategoryComboLinkTableInfo.Columns.CATEGORY,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<CategoryCombo> {
@@ -59,8 +59,8 @@ internal class CategoryCategoryComboChildrenAppender private constructor(
                 linkChildStore(
                     databaseAdapter,
                     CategoryCategoryComboLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> Category.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> Category.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
index b60787b933..9b5076d3a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
@@ -43,7 +43,7 @@ internal class CategoryCategoryComboEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: CategoryCategoryComboLinkStore
+        store: CategoryCategoryComboLinkStore,
     ): CategoryCategoryComboLinkHandler {
         return CategoryCategoryComboLinkHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
index 6105b29264..eea660008a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
@@ -34,5 +34,5 @@ import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
 
 internal class CategoryCategoryComboLinkHandler(
-    store: LinkStore<CategoryCategoryComboLink>
+    store: LinkStore<CategoryCategoryComboLink>,
 ) : OrderedLinkHandlerImpl<Category, CategoryCategoryComboLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
index 6bcf05206f..ac385081b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo
 
 @Suppress("MagicNumber")
 internal class CategoryCategoryComboLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryCategoryComboLinkStore,
     LinkStoreImpl<CategoryCategoryComboLink>(
         databaseAdapter,
         CategoryCategoryComboLinkTableInfo.TABLE_INFO,
         CategoryCategoryComboLinkTableInfo.Columns.CATEGORY_COMBO,
         BINDER,
-        { cursor: Cursor -> CategoryCategoryComboLink.create(cursor) }
+        { cursor: Cursor -> CategoryCategoryComboLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionChildrenAppender.kt
index ec0c31db65..693cf6e36d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
 
 internal class CategoryCategoryOptionChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<Category, CategoryOption>
+    private val linkChildStore: LinkChildStore<Category, CategoryOption>,
 ) : ChildrenAppender<Category>() {
     override fun appendChildren(category: Category): Category {
         val builder = category.toBuilder()
@@ -51,7 +51,7 @@ internal class CategoryCategoryOptionChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             CategoryOptionTableInfo.TABLE_INFO,
             CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY,
-            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION
+            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Category> {
@@ -59,8 +59,8 @@ internal class CategoryCategoryOptionChildrenAppender private constructor(
                 linkChildStore(
                     databaseAdapter,
                     CategoryCategoryOptionLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> CategoryOption.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> CategoryOption.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
index a899628c3c..67324fc6d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
@@ -43,7 +43,7 @@ internal class CategoryCategoryOptionEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: CategoryCategoryOptionLinkStore
+        store: CategoryCategoryOptionLinkStore,
     ): CategoryCategoryOptionLinkHandler {
         return CategoryCategoryOptionLinkHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
index 056f21528c..76479995fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOption
 
 internal class CategoryCategoryOptionLinkHandler(
-    store: CategoryCategoryOptionLinkStore
+    store: CategoryCategoryOptionLinkStore,
 ) : OrderedLinkHandlerImpl<CategoryOption, CategoryCategoryOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
index 2e5043767b..1529bb0ef2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOption
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryCategoryOptionLinkPersistor @Inject constructor(
-    private val categoryCategoryOptionLinkHandler: CategoryCategoryOptionLinkHandler
+    private val categoryCategoryOptionLinkHandler: CategoryCategoryOptionLinkHandler,
 ) {
 
     fun handleMany(categories: List<Category>, categoryOptions: List<CategoryOption>) {
@@ -50,7 +50,7 @@ internal class CategoryCategoryOptionLinkPersistor @Inject constructor(
 
         categoryCategoryOptionLinkHandler.handleMany(
             category.uid(),
-            categoryOptionsWithAccess
+            categoryOptionsWithAccess,
         ) { categoryOption: CategoryOption, sortOrder: Int ->
             CategoryCategoryOptionLink.builder()
                 .category(category.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
index 1a9d5ccd3e..4f30b47ea6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.category.CategoryCategoryOptionLinkTableInfo
 
 @Suppress("MagicNumber")
 internal class CategoryCategoryOptionLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryCategoryOptionLinkStore,
     LinkStoreImpl<CategoryCategoryOptionLink>(
         databaseAdapter,
         CategoryCategoryOptionLinkTableInfo.TABLE_INFO,
         CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY,
         BINDER,
-        { cursor: Cursor -> CategoryCategoryOptionLink.create(cursor) }
+        { cursor: Cursor -> CategoryCategoryOptionLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
index 892134b318..4097c2ee97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
@@ -29,23 +29,23 @@ package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.category.CategoryCombo
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryComboCall @Inject constructor(
     private val service: CategoryComboService,
     private val handler: CategoryComboHandler,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<CategoryCombo> {
     override fun download(uids: Set<String>): Single<List<CategoryCombo>> {
         return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler) { partitionUids: Set<String> ->
             service.getCategoryCombos(
                 CategoryComboFields.allFields,
                 CategoryComboFields.uid.`in`(partitionUids),
-                paging = false
+                paging = false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
index a2887d7477..1ed99f673f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
@@ -48,7 +48,7 @@ internal class CategoryComboEntityDIModule {
         store: CategoryComboStore,
         optionComboHandler: CategoryOptionComboHandler,
         categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
-        categoryOptionCleaner: CategoryOptionComboOrphanCleaner
+        categoryOptionCleaner: CategoryOptionComboOrphanCleaner,
     ): CategoryComboHandler {
         return CategoryComboHandler(store, optionComboHandler, categoryCategoryComboLinkHandler, categoryOptionCleaner)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboFields.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboFields.kt
index d90837db64..010eca5f02 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboFields.kt
@@ -46,6 +46,6 @@ internal object CategoryComboFields {
             fh.field<Boolean>(CategoryComboTableInfo.Columns.IS_DEFAULT),
             fh.nestedFieldWithUid(CATEGORIES),
             fh.nestedField<CategoryOptionCombo>(CATEGORY_OPTION_COMBOS)
-                .with(CategoryOptionComboFields.allFields)
+                .with(CategoryOptionComboFields.allFields),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
index e8775fe809..a168858f69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
@@ -41,12 +41,12 @@ internal class CategoryComboHandler constructor(
     store: CategoryComboStore,
     private val optionComboHandler: CategoryOptionComboHandler,
     private val categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
-    private val categoryOptionCleaner: CategoryOptionComboOrphanCleaner
+    private val categoryOptionCleaner: CategoryOptionComboOrphanCleaner,
 ) : IdentifiableHandlerImpl<CategoryCombo>(store) {
 
     override fun afterObjectHandled(o: CategoryCombo, action: HandleAction) {
         optionComboHandler.handleMany(
-            CategoryComboInternalAccessor.accessCategoryOptionCombos(o)
+            CategoryComboInternalAccessor.accessCategoryOptionCombos(o),
         ) { optionCombo: CategoryOptionCombo ->
             optionCombo.toBuilder()
                 .categoryCombo(ObjectWithUid.create(o.uid()))
@@ -54,7 +54,7 @@ internal class CategoryComboHandler constructor(
         }
         categoryCategoryComboLinkHandler.handleMany(
             o.uid(),
-            o.categories()
+            o.categories(),
         ) { category: Category, sortOrder: Int? ->
             CategoryCategoryComboLink.builder()
                 .categoryCombo(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt
index 9b6d8e207b..ba5628216b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt
@@ -42,6 +42,6 @@ internal interface CategoryComboService {
     fun getCategoryCombos(
         @Query("fields") @Which fields: Fields<CategoryCombo>,
         @Query("filter") @Where uids: Filter<CategoryCombo, String>,
-        @Query("paging") paging: Boolean?
+        @Query("paging") paging: Boolean?,
     ): Single<Payload<CategoryCombo>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
index d0372355e0..5717a560a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 
 @Suppress("MagicNumber")
 internal class CategoryComboStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryComboStore,
     IdentifiableObjectStoreImpl<CategoryCombo>(
         databaseAdapter,
         CategoryComboTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> CategoryCombo.create(cursor) }
+        { cursor: Cursor -> CategoryCombo.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<CategoryCombo> = object : IdentifiableStatementBinder<CategoryCombo>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt
index 877e350066..209beba55a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
@@ -36,17 +35,18 @@ import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 import org.hisp.dhis.android.core.program.ProgramTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryComboUidsSeeker @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
     fun seekUids(): Set<String> {
         val tableNames = listOf(
             ProgramTableInfo.TABLE_INFO.name(),
             DataSetTableInfo.TABLE_INFO.name(),
             DataElementTableInfo.TABLE_INFO.name(),
-            DataSetElementLinkTableInfo.TABLE_INFO.name()
+            DataSetElementLinkTableInfo.TABLE_INFO.name(),
         )
         val query = MultipleTableQueryBuilder()
             .generateQuery(DataSetTableInfo.Columns.CATEGORY_COMBO, tableNames).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
index 56a801335a..39d76de884 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
@@ -53,7 +53,7 @@ internal class CategoryEntityDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Category>> {
         return mapOf(
             CategoryFields.CATEGORY_OPTIONS to
-                CategoryCategoryOptionChildrenAppender.create(databaseAdapter)
+                CategoryCategoryOptionChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryFields.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryFields.kt
index 253c41def9..d86059697e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryFields.kt
@@ -42,6 +42,6 @@ internal object CategoryFields {
         .fields(fh.getIdentifiableFields())
         .fields(
             fh.nestedFieldWithUid(CATEGORY_OPTIONS),
-            fh.field<String>(CategoryTableInfo.Columns.DATA_DIMENSION_TYPE)
+            fh.field<String>(CategoryTableInfo.Columns.DATA_DIMENSION_TYPE),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
index 9b89e062aa..5f8906fe4c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.Category
 
 internal class CategoryHandler(
-    store: CategoryStore
+    store: CategoryStore,
 ) : IdentifiableHandlerImpl<Category>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
index d27b421f70..f9bbea844b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
@@ -33,5 +33,5 @@ import javax.inject.Inject
 @Reusable
 internal class CategoryInternalModule @Inject constructor(
     val categoryCall: CategoryCall,
-    val categoryComboCall: CategoryComboCall
+    val categoryComboCall: CategoryComboCall,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index a375dc33c3..67c6d0ada7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -30,8 +30,8 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 class CategoryModuleDownloader @Inject internal constructor(
@@ -41,7 +41,7 @@ class CategoryModuleDownloader @Inject internal constructor(
     private val categoryOptionOrganisationUnitsCall: CategoryOptionOrganisationUnitsCall,
     private val categoryComboUidsSeeker: CategoryComboUidsSeeker,
     private val categoryCategoryOptionLinkPersistor: CategoryCategoryOptionLinkPersistor,
-    private val categoryOptionComboIntegrityChecker: CategoryOptionComboIntegrityChecker
+    private val categoryOptionComboIntegrityChecker: CategoryOptionComboIntegrityChecker,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt
index 0655285526..706e3f8560 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt
@@ -28,8 +28,8 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.*
+import javax.inject.Inject
 
 @Reusable
 class CategoryModuleImpl @Inject internal constructor(
@@ -37,7 +37,7 @@ class CategoryModuleImpl @Inject internal constructor(
     private val categoryOptions: CategoryOptionCollectionRepository,
     private val categoryOptionCombos: CategoryOptionComboCollectionRepository,
     private val categoryCombos: CategoryComboCollectionRepository,
-    private val categoryOptionComboService: CategoryOptionComboService
+    private val categoryOptionComboService: CategoryOptionComboService,
 ) : CategoryModule {
     override fun categories(): CategoryCollectionRepository {
         return categories
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt
index 49306df7bd..f2f58e511a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.*
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryModuleWiper @Inject constructor(
-    private val tableWiper: TableWiper
+    private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
@@ -45,7 +45,7 @@ internal class CategoryModuleWiper @Inject constructor(
             CategoryCategoryOptionLinkTableInfo.TABLE_INFO,
             CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO,
             CategoryComboTableInfo.TABLE_INFO,
-            CategoryCategoryComboLinkTableInfo.TABLE_INFO
+            CategoryCategoryComboLinkTableInfo.TABLE_INFO,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
index 3110194baf..8f9afaf033 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
@@ -29,19 +29,19 @@ package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryOptionCall @Inject constructor(
     private val handler: CategoryOptionHandler,
     private val service: CategoryOptionService,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<CategoryOption> {
 
     companion object {
@@ -57,13 +57,13 @@ internal class CategoryOptionCall @Inject constructor(
         return apiDownloader.downloadPartitioned(
             uids,
             UrlLengthHelper.getHowManyUidsFitInURL(QUERY_WITHOUT_UIDS_LENGTH),
-            handler
+            handler,
         ) { partitionUids: Set<String> ->
             service.getCategoryOptions(
                 CategoryOptionFields.allFields,
                 "categories." + ObjectWithUid.uid.`in`(partitionUids).generateString(),
                 accessDataReadFilter,
-                paging = false
+                paging = false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionChildrenAppender.kt
index 80ba583ae4..620c0d6f92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
 
 internal class CategoryOptionComboCategoryOptionChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<CategoryOptionCombo, CategoryOption>
+    private val linkChildStore: LinkChildStore<CategoryOptionCombo, CategoryOption>,
 ) : ChildrenAppender<CategoryOptionCombo>() {
     override fun appendChildren(optionCombo: CategoryOptionCombo): CategoryOptionCombo {
         val builder = optionCombo.toBuilder()
@@ -51,7 +51,7 @@ internal class CategoryOptionComboCategoryOptionChildrenAppender private constru
         private val CHILD_PROJECTION = LinkTableChildProjection(
             CategoryOptionTableInfo.TABLE_INFO,
             CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
-            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION
+            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<CategoryOptionCombo> {
@@ -59,8 +59,8 @@ internal class CategoryOptionComboCategoryOptionChildrenAppender private constru
                 linkChildStore(
                     databaseAdapter,
                     CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> CategoryOption.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> CategoryOption.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
index 7ea79926bb..1f5962feb6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
@@ -43,7 +43,7 @@ internal class CategoryOptionComboCategoryOptionEntityDIModule {
     @Provides
     @Reusable
     fun categoryOptionComboCategoryOptionLinkHandler(
-        store: CategoryOptionComboCategoryOptionLinkStore
+        store: CategoryOptionComboCategoryOptionLinkStore,
     ): CategoryOptionComboCategoryOptionHandler {
         return CategoryOptionComboCategoryOptionHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
index 9abd84db93..dc6beeca84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
 
 internal class CategoryOptionComboCategoryOptionHandler(
-    store: CategoryOptionComboCategoryOptionLinkStore
+    store: CategoryOptionComboCategoryOptionLinkStore,
 ) : LinkHandlerImpl<CategoryOption, CategoryOptionComboCategoryOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
index 3ef78e8cfc..9f2b7c6529 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
 
 @Suppress("MagicNumber")
 internal class CategoryOptionComboCategoryOptionLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryOptionComboCategoryOptionLinkStore,
     LinkStoreImpl<CategoryOptionComboCategoryOptionLink>(
         databaseAdapter,
         CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO,
         CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
         BINDER,
-        { cursor: Cursor -> CategoryOptionComboCategoryOptionLink.create(cursor) }
+        { cursor: Cursor -> CategoryOptionComboCategoryOptionLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
index 2105fbce6a..8555ca1ef6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class CategoryOptionComboEntityDIModule {
     @Reusable
     fun handler(
         store: CategoryOptionComboStore,
-        categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler
+        categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler,
     ): CategoryOptionComboHandler {
         return CategoryOptionComboHandler(store, categoryOptionComboCategoryOptionLinkHandler)
     }
@@ -56,7 +56,7 @@ internal class CategoryOptionComboEntityDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<CategoryOptionCombo>> {
         return mapOf(
             CategoryOptionComboFields.CATEGORY_OPTIONS to
-                CategoryOptionComboCategoryOptionChildrenAppender.create(databaseAdapter)
+                CategoryOptionComboCategoryOptionChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboFields.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboFields.kt
index b6a795325e..323d50d08f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboFields.kt
@@ -39,6 +39,6 @@ object CategoryOptionComboFields {
     val allFields: Fields<CategoryOptionCombo> = Fields.builder<CategoryOptionCombo>()
         .fields(fh.getIdentifiableFields())
         .fields(
-            fh.nestedFieldWithUid(CATEGORY_OPTIONS)
+            fh.nestedFieldWithUid(CATEGORY_OPTIONS),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
index fe67234ee9..11a8548697 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
@@ -35,12 +35,12 @@ import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
 
 internal class CategoryOptionComboHandler constructor(
     store: CategoryOptionComboStore,
-    private val categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler
+    private val categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler,
 ) : IdentifiableHandlerImpl<CategoryOptionCombo>(store) {
     override fun afterObjectHandled(o: CategoryOptionCombo, action: HandleAction) {
         categoryOptionComboCategoryOptionLinkHandler.handleMany(
             o.uid(),
-            o.categoryOptions()
+            o.categoryOptions(),
         ) { categoryOption: CategoryOption ->
             CategoryOptionComboCategoryOptionLink.builder()
                 .categoryOptionCombo(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt
index 4a01e15f29..597cbcc1bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryOptionComboIntegrityChecker @Inject constructor(
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) {
     /**
      * Sharing access is applied to CategoryOption level, so it might happen that a CategoryOptionCombo is missing
@@ -66,7 +66,7 @@ internal class CategoryOptionComboIntegrityChecker @Inject constructor(
         databaseAdapter.delete(
             CategoryOptionComboTableInfo.TABLE_INFO.name(),
             whereClause,
-            emptyArray()
+            emptyArray(),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
index 54f9f0d7b2..955e665696 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryOptionComboOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<CategoryCombo, CategoryOptionCombo>(
     tableName = CategoryOptionComboTableInfo.TABLE_INFO.name(),
     parentColumn = CategoryOptionComboTableInfo.Columns.CATEGORY_COMBO,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
index 86ead7e2d0..06e3d52939 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 
 @Suppress("MagicNumber")
 internal class CategoryOptionComboStoreImpl constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryOptionComboStore,
     IdentifiableObjectStoreImpl<CategoryOptionCombo>(
         databaseAdapter,
         CategoryOptionComboTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> CategoryOptionCombo.create(cursor) }
+        { cursor: Cursor -> CategoryOptionCombo.create(cursor) },
     ) {
 
     override fun getForCategoryCombo(categoryComboUid: String): List<CategoryOptionCombo> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
index dc55a6cff9..b1cfb63b39 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
@@ -30,10 +30,10 @@ package org.hisp.dhis.android.core.category.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.Collections
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.category.CategoryOption
+import java.util.Collections
 
 @Module
 internal class CategoryOptionEntityDIModule {
@@ -55,7 +55,7 @@ internal class CategoryOptionEntityDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<CategoryOption>> {
         return Collections.singletonMap(
             CategoryOptionFields.ORGANISATION_UNITS,
-            CategoryOptionOrganisationUnitChildrenAppender.create(databaseAdapter)
+            CategoryOptionOrganisationUnitChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionFields.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionFields.kt
index d71edff55c..6d274a2341 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionFields.kt
@@ -46,6 +46,6 @@ internal object CategoryOptionFields {
         .fields(
             fh.field<String>(CategoryOptionTableInfo.Columns.START_DATE),
             fh.field<String>(CategoryOptionTableInfo.Columns.END_DATE),
-            fh.nestedField<Access>(ACCESS).with(AccessFields.data.with(DataAccessFields.allFields))
+            fh.nestedField<Access>(ACCESS).with(AccessFields.data.with(DataAccessFields.allFields)),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
index 7d31550b8c..866d1bb2d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOption
 
 internal class CategoryOptionHandler constructor(
-    categoryOptionStore: IdentifiableObjectStore<CategoryOption>
+    categoryOptionStore: IdentifiableObjectStore<CategoryOption>,
 ) : IdentifiableHandlerImpl<CategoryOption>(categoryOptionStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
index 5bbcf1ec26..c553a85d2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.category.internal.CategoryOptionOrganisationUn
 import org.hisp.dhis.android.core.common.ObjectWithUid
 
 internal class CategoryOptionOrganisationUnitChildrenAppender private constructor(
-    private val childStore: LinkStore<CategoryOptionOrganisationUnitLink>
+    private val childStore: LinkStore<CategoryOptionOrganisationUnitLink>,
 ) : ChildrenAppender<CategoryOption>() {
 
     override fun appendChildren(categoryOption: CategoryOption): CategoryOption {
@@ -47,7 +47,7 @@ internal class CategoryOptionOrganisationUnitChildrenAppender private constructo
         val whereClause = WhereClauseBuilder().apply {
             appendKeyStringValue(
                 CategoryOptionOrganisationUnitLinkTableInfo.Columns.CATEGORY_OPTION,
-                categoryOption.uid()
+                categoryOption.uid(),
             )
         }.build()
         val links = childStore.selectWhere(whereClause)
@@ -65,7 +65,7 @@ internal class CategoryOptionOrganisationUnitChildrenAppender private constructo
     companion object {
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<CategoryOption> {
             return CategoryOptionOrganisationUnitChildrenAppender(
-                CategoryOptionOrganisationUnitLinkStoreImpl(databaseAdapter)
+                CategoryOptionOrganisationUnitLinkStoreImpl(databaseAdapter),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
index 2dbbede2a1..e1e13d80b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
 
 internal class CategoryOptionOrganisationUnitLinkHandler(
-    store: CategoryOptionOrganisationUnitLinkStore
+    store: CategoryOptionOrganisationUnitLinkStore,
 ) : LinkHandlerImpl<CategoryOptionOrganisationUnitsCall.CategoryOptionRestriction, CategoryOptionOrganisationUnitLink>(
-    store
+    store,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
index af164b01ed..fdcc3a611d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLinkTab
 
 @Suppress("MagicNumber")
 internal class CategoryOptionOrganisationUnitLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryOptionOrganisationUnitLinkStore,
     LinkStoreImpl<CategoryOptionOrganisationUnitLink>(
         databaseAdapter,
         CategoryOptionOrganisationUnitLinkTableInfo.TABLE_INFO,
         CategoryOptionOrganisationUnitLinkTableInfo.Columns.CATEGORY_OPTION,
         BINDER,
-        { cursor: Cursor -> CategoryOptionOrganisationUnitLink.create(cursor) }
+        { cursor: Cursor -> CategoryOptionOrganisationUnitLink.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: CategoryOptionOrganisationUnitLink, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
index aa1acd9293..9b4cbfbd56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
@@ -29,19 +29,19 @@ package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import javax.inject.Inject
 
 @Reusable
 internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
     private val handler: CategoryOptionOrganisationUnitLinkHandler,
     private val service: CategoryOptionService,
     private val dhisVersionManager: DHISVersionManager,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) {
 
     companion object {
@@ -59,7 +59,7 @@ internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
                 },
                 pageDownloader = { partitionUids: Set<String> ->
                     service.getCategoryOptionOrgUnits(partitionUids.joinToString(","))
-                }
+                },
             )
         } else {
             Single.just(emptyMap())
@@ -68,7 +68,7 @@ internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
 
     private fun getUpdatedEntries(
         uids: Set<String>,
-        data: Map<String, List<String?>>
+        data: Map<String, List<String?>>,
     ): Map<String, List<CategoryOptionRestriction>> {
         val updatedEntries = mutableMapOf<String, List<CategoryOptionRestriction>>()
         for (uid in uids) {
@@ -102,22 +102,22 @@ internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
                     .categoryOption(entry.key)
                     .restriction(o.label)
                     .build()
-            }
+            },
         )
     }
 
     sealed class CategoryOptionRestriction(open val label: String) {
         data class Restricted(
             val uid: String,
-            override val label: String = RESTRICTED
+            override val label: String = RESTRICTED,
         ) : CategoryOptionRestriction(label)
 
         class NotRestricted(
-            override val label: String = NOT_RESTRICTED
+            override val label: String = NOT_RESTRICTED,
         ) : CategoryOptionRestriction(label)
 
         class NotAccessibleToUser(
-            override val label: String = NOT_ACCESSIBLE_TO_USER
+            override val label: String = NOT_ACCESSIBLE_TO_USER,
         ) : CategoryOptionRestriction(label)
 
         companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
index 7d999d8d59..e72214e208 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
@@ -43,11 +43,11 @@ internal interface CategoryOptionService {
         @Query("fields") @Which fields: Fields<CategoryOption>,
         @Query("filter") categoryUidsFilterString: String,
         @Query("filter") accessDataReadFilter: String,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Payload<CategoryOption>>
 
     @GET("categoryOptions/orgUnits")
     fun getCategoryOptionOrgUnits(
-        @Query("categoryOptions") categoryOptions: String
+        @Query("categoryOptions") categoryOptions: String,
     ): Single<CategoryOptionOrganisationUnits>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
index 985cbfd6da..e3b39b2c90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
 
 @Suppress("MagicNumber")
 internal class CategoryOptionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryOptionStore,
     IdentifiableObjectStoreImpl<CategoryOption>(
         databaseAdapter,
         CategoryOptionTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> CategoryOption.create(cursor) }
+        { cursor: Cursor -> CategoryOption.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
index 293c63008f..64152c313e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
@@ -42,8 +42,8 @@ import retrofit2.Retrofit
         CategoryOptionEntityDIModule::class,
         CategoryOptionOrganisationUnitEntityDIModule::class,
         CategoryOptionComboEntityDIModule::class,
-        CategoryOptionComboCategoryOptionEntityDIModule::class
-    ]
+        CategoryOptionComboCategoryOptionEntityDIModule::class,
+    ],
 )
 internal class CategoryPackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt
index 309f5aa91b..8276efc756 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt
@@ -42,6 +42,6 @@ internal interface CategoryService {
     fun getCategories(
         @Query("fields") @Which fields: Fields<Category>,
         @Query("filter") @Where uids: Filter<Category, String>,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Payload<Category>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
index 210c948916..03af67d9a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.category.CategoryTableInfo
 
 @Suppress("MagicNumber")
 internal class CategoryStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CategoryStore,
     IdentifiableObjectStoreImpl<Category>(
         databaseAdapter,
         CategoryTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Category.create(cursor) }
+        { cursor: Cursor -> Category.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/AggregationType.kt b/core/src/main/java/org/hisp/dhis/android/core/common/AggregationType.kt
index 665a127ef0..055530584e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/AggregationType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/AggregationType.kt
@@ -52,5 +52,5 @@ enum class AggregationType(val sql: String?) {
     CUSTOM(null),
 
     @JsonEnumDefaultValue
-    DEFAULT(null)
+    DEFAULT(null),
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt
index 1c3011632c..302fc00647 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.common
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.event.EventDataFilter
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.internal.CalendarProvider
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 internal class DateFilterPeriodHelper @Inject constructor(
     private val calendarProvider: CalendarProvider,
-    private val parentPeriodGenerator: ParentPeriodGenerator
+    private val parentPeriodGenerator: ParentPeriodGenerator,
 ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/OrganisationUnitFilter.kt b/core/src/main/java/org/hisp/dhis/android/core/common/OrganisationUnitFilter.kt
index 49568c0683..85bf6f7236 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/OrganisationUnitFilter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/OrganisationUnitFilter.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.common
 
 internal data class OrganisationUnitFilter(
     val organisationUnitUid: String?,
-    val relativeOrganisationUnit: RelativeOrganisationUnit?
+    val relativeOrganisationUnit: RelativeOrganisationUnit?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/RelativeOrganisationUnit.kt b/core/src/main/java/org/hisp/dhis/android/core/common/RelativeOrganisationUnit.kt
index a10f2132ea..e2008cb49e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/RelativeOrganisationUnit.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/RelativeOrganisationUnit.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.common
 enum class RelativeOrganisationUnit {
     USER_ORGUNIT,
     USER_ORGUNIT_CHILDREN,
-    USER_ORGUNIT_GRANDCHILDREN
+    USER_ORGUNIT_GRANDCHILDREN,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt b/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt
index ae9bc772e8..6bce63a5ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/RelativePeriod.kt
@@ -36,7 +36,7 @@ enum class RelativePeriod constructor(
     internal val start: Int?,
     internal val end: Int?,
     internal val periodsThisYear: Boolean = false,
-    internal val periodsLastYear: Boolean = false
+    internal val periodsLastYear: Boolean = false,
 ) {
     @JsonAlias("today", "thisDay")
     TODAY(PeriodType.Daily, 0, 1),
@@ -171,5 +171,5 @@ enum class RelativePeriod constructor(
     LAST_12_WEEKS(PeriodType.Weekly, -12, 0),
 
     @JsonAlias("last52Weeks")
-    LAST_52_WEEKS(PeriodType.Weekly, -52, 0)
+    LAST_52_WEEKS(PeriodType.Weekly, -52, 0),
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/State.kt b/core/src/main/java/org/hisp/dhis/android/core/common/State.kt
index 8074457181..67594114b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/State.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/State.kt
@@ -64,7 +64,9 @@ enum class State {
     SENT_VIA_SMS,
 
     /** Data is sent by sms and there is a successful response from the server.  */
-    SYNCED_VIA_SMS;
+    SYNCED_VIA_SMS,
+
+    ;
 
     companion object {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValidationStrategy.kt b/core/src/main/java/org/hisp/dhis/android/core/common/ValidationStrategy.kt
index 24b1b090f5..fc639dcf16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/ValidationStrategy.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValidationStrategy.kt
@@ -29,5 +29,5 @@ package org.hisp.dhis.android.core.common
 
 enum class ValidationStrategy {
     ON_COMPLETE,
-    ON_UPDATE_AND_INSERT
+    ON_UPDATE_AND_INSERT,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/ValueType.kt b/core/src/main/java/org/hisp/dhis/android/core/common/ValueType.kt
index 33b01cc68e..68d6d74342 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/ValueType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/ValueType.kt
@@ -1,97 +1,98 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.common
-
-import org.hisp.dhis.android.core.common.valuetype.validation.validators.*
-
-enum class ValueType(val validator: ValueTypeValidator<*>) {
-    TEXT(TextValidator),
-    LONG_TEXT(LongTextValidator),
-    LETTER(LetterValidator),
-    PHONE_NUMBER(PhoneNumberValidator),
-    EMAIL(EmailValidator),
-    BOOLEAN(BooleanValidator),
-    TRUE_ONLY(TrueOnlyValidator),
-    DATE(DateValidator),
-    DATETIME(DateTimeValidator),
-    TIME(TimeValidator),
-    NUMBER(NumberValidator),
-    UNIT_INTERVAL(UnitIntervalValidator),
-    PERCENTAGE(PercentageValidator),
-    INTEGER(IntegerValidator),
-    INTEGER_POSITIVE(IntegerPositiveValidator),
-    INTEGER_NEGATIVE(IntegerNegativeValidator),
-    INTEGER_ZERO_OR_POSITIVE(IntegerZeroOrPositiveValidator),
-    TRACKER_ASSOCIATE(UidValidator),
-    USERNAME(TextValidator),
-    COORDINATE(CoordinateValidator),
-    ORGANISATION_UNIT(UidValidator),
-    REFERENCE(TextValidator),
-    AGE(DateValidator),
-    URL(TextValidator),
-    FILE_RESOURCE(UidValidator),
-    IMAGE(UidValidator),
-    GEOJSON(TextValidator),
-    MULTI_TEXT(TextValidator);
-
-    val isInteger: Boolean
-        get() = INTEGER_TYPES.contains(this)
-    val isDecimal: Boolean
-        get() = DECIMAL_TYPES.contains(this)
-    val isNumeric: Boolean
-        get() = NUMERIC_TYPES.contains(this)
-    val isBoolean: Boolean
-        get() = BOOLEAN_TYPES.contains(this)
-    val isText: Boolean
-        get() = TEXT_TYPES.contains(this)
-    val isDate: Boolean
-        get() = DATE_TYPES.contains(this)
-    val isFile: Boolean
-        get() = FILE_TYPES.contains(this)
-    val isCoordinate: Boolean
-        get() = this == COORDINATE
-    val isGeo: Boolean
-        get() = GEO_TYPES.contains(this)
-    val isJson: Boolean
-        get() = JSON_TYPES.contains(this)
-
-    companion object {
-        private val INTEGER_TYPES: Set<ValueType> =
-            hashSetOf(INTEGER, INTEGER_POSITIVE, INTEGER_NEGATIVE, INTEGER_ZERO_OR_POSITIVE)
-        private val DECIMAL_TYPES: Set<ValueType> =
-            hashSetOf(NUMBER, UNIT_INTERVAL, PERCENTAGE)
-        private val NUMERIC_TYPES: Set<ValueType> = INTEGER_TYPES + DECIMAL_TYPES
-        private val BOOLEAN_TYPES: Set<ValueType> = hashSetOf(BOOLEAN, TRUE_ONLY)
-        private val TEXT_TYPES: Set<ValueType> =
-            hashSetOf(TEXT, LONG_TEXT, LETTER, TIME, USERNAME, EMAIL, PHONE_NUMBER, URL)
-        private val DATE_TYPES: Set<ValueType> = hashSetOf(DATE, DATETIME, AGE)
-        private val FILE_TYPES: Set<ValueType> = hashSetOf(IMAGE, FILE_RESOURCE)
-        private val GEO_TYPES: Set<ValueType> = hashSetOf(COORDINATE, GEOJSON)
-        private val JSON_TYPES: Set<ValueType> = hashSetOf(GEOJSON)
-    }
-}
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.common
+
+import org.hisp.dhis.android.core.common.valuetype.validation.validators.*
+
+enum class ValueType(val validator: ValueTypeValidator<*>) {
+    TEXT(TextValidator),
+    LONG_TEXT(LongTextValidator),
+    LETTER(LetterValidator),
+    PHONE_NUMBER(PhoneNumberValidator),
+    EMAIL(EmailValidator),
+    BOOLEAN(BooleanValidator),
+    TRUE_ONLY(TrueOnlyValidator),
+    DATE(DateValidator),
+    DATETIME(DateTimeValidator),
+    TIME(TimeValidator),
+    NUMBER(NumberValidator),
+    UNIT_INTERVAL(UnitIntervalValidator),
+    PERCENTAGE(PercentageValidator),
+    INTEGER(IntegerValidator),
+    INTEGER_POSITIVE(IntegerPositiveValidator),
+    INTEGER_NEGATIVE(IntegerNegativeValidator),
+    INTEGER_ZERO_OR_POSITIVE(IntegerZeroOrPositiveValidator),
+    TRACKER_ASSOCIATE(UidValidator),
+    USERNAME(TextValidator),
+    COORDINATE(CoordinateValidator),
+    ORGANISATION_UNIT(UidValidator),
+    REFERENCE(TextValidator),
+    AGE(DateValidator),
+    URL(TextValidator),
+    FILE_RESOURCE(UidValidator),
+    IMAGE(UidValidator),
+    GEOJSON(TextValidator),
+    MULTI_TEXT(TextValidator),
+    ;
+
+    val isInteger: Boolean
+        get() = INTEGER_TYPES.contains(this)
+    val isDecimal: Boolean
+        get() = DECIMAL_TYPES.contains(this)
+    val isNumeric: Boolean
+        get() = NUMERIC_TYPES.contains(this)
+    val isBoolean: Boolean
+        get() = BOOLEAN_TYPES.contains(this)
+    val isText: Boolean
+        get() = TEXT_TYPES.contains(this)
+    val isDate: Boolean
+        get() = DATE_TYPES.contains(this)
+    val isFile: Boolean
+        get() = FILE_TYPES.contains(this)
+    val isCoordinate: Boolean
+        get() = this == COORDINATE
+    val isGeo: Boolean
+        get() = GEO_TYPES.contains(this)
+    val isJson: Boolean
+        get() = JSON_TYPES.contains(this)
+
+    companion object {
+        private val INTEGER_TYPES: Set<ValueType> =
+            hashSetOf(INTEGER, INTEGER_POSITIVE, INTEGER_NEGATIVE, INTEGER_ZERO_OR_POSITIVE)
+        private val DECIMAL_TYPES: Set<ValueType> =
+            hashSetOf(NUMBER, UNIT_INTERVAL, PERCENTAGE)
+        private val NUMERIC_TYPES: Set<ValueType> = INTEGER_TYPES + DECIMAL_TYPES
+        private val BOOLEAN_TYPES: Set<ValueType> = hashSetOf(BOOLEAN, TRUE_ONLY)
+        private val TEXT_TYPES: Set<ValueType> =
+            hashSetOf(TEXT, LONG_TEXT, LETTER, TIME, USERNAME, EMAIL, PHONE_NUMBER, URL)
+        private val DATE_TYPES: Set<ValueType> = hashSetOf(DATE, DATETIME, AGE)
+        private val FILE_TYPES: Set<ValueType> = hashSetOf(IMAGE, FILE_RESOURCE)
+        private val GEO_TYPES: Set<ValueType> = hashSetOf(COORDINATE, GEOJSON)
+        private val JSON_TYPES: Set<ValueType> = hashSetOf(GEOJSON)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
index 3aa7cb2b70..a25ad596f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
@@ -41,8 +41,8 @@ import retrofit2.Retrofit
 @Module(
     includes = [
         ValueTypeDeviceRenderingEntityDIModule::class,
-        ValueTypeRenderingEntityDIModule::class
-    ]
+        ValueTypeRenderingEntityDIModule::class,
+    ],
 )
 internal class CommonPackageDIModule {
     @Provides
@@ -51,13 +51,13 @@ internal class CommonPackageDIModule {
         databaseAdapter: DatabaseAdapter,
         retrofit: Retrofit,
         resourceHandler: ResourceHandler,
-        versionManager: DHISVersionManager
+        versionManager: DHISVersionManager,
     ): GenericCallData {
         return GenericCallData.create(
             databaseAdapter,
             retrofit,
             resourceHandler,
-            versionManager
+            versionManager,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagator.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagator.kt
index a47c642d9f..8db2e184a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagator.kt
@@ -71,6 +71,6 @@ internal interface DataStatePropagator {
         trackedEntityInstanceUids: List<String>,
         enrollmentUids: List<String>,
         eventUids: List<String>,
-        relationshipUids: List<String>
+        relationshipUids: List<String>,
     ): DataStateUidHolder
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
index 1b8840c454..1a230afbe5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.common.internal
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -50,6 +48,8 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions")
@@ -60,7 +60,7 @@ internal class DataStatePropagatorImpl @Inject internal constructor(
     private val relationshipStore: RelationshipStore,
     private val relationshipItemStore: RelationshipItemStore,
     private val relationshipTypeStore: RelationshipTypeStore,
-    private val programOwner: ProgramOwnerStore
+    private val programOwner: ProgramOwnerStore,
 ) : DataStatePropagator {
 
     override fun propagateTrackedEntityInstanceUpdate(tei: TrackedEntityInstance?) {
@@ -100,7 +100,7 @@ internal class DataStatePropagatorImpl @Inject internal constructor(
         trackedEntityAttributeValue!!.trackedEntityInstance()?.let { trackedEntityInstanceUid ->
             val enrollments = enrollmentStore.selectByTrackedEntityInstanceAndAttribute(
                 trackedEntityInstanceUid,
-                trackedEntityAttributeValue.trackedEntityAttribute()!!
+                trackedEntityAttributeValue.trackedEntityAttribute()!!,
             )
             enrollments.forEach {
                 enrollmentStore.setSyncState(it.uid(), getStateForUpdate(it.syncState()))
@@ -276,7 +276,7 @@ internal class DataStatePropagatorImpl @Inject internal constructor(
                 enrollmentStates +
                     relationshipStates +
                     programOwnerStates +
-                    instance.syncState()!!
+                    instance.syncState()!!,
             )
 
             trackedEntityInstanceStore.setAggregatedSyncState(trackedEntityInstanceUid, teiAggregatedSyncState)
@@ -344,7 +344,7 @@ internal class DataStatePropagatorImpl @Inject internal constructor(
         trackedEntityInstanceUids: List<String>,
         enrollmentUids: List<String>,
         eventUids: List<String>,
-        relationshipUids: List<String>
+        relationshipUids: List<String>,
     ): DataStateUidHolder {
         val enrollmentsFromEvents = eventStore.selectByUids(eventUids).mapNotNull { it.enrollment() }
 
@@ -362,7 +362,7 @@ internal class DataStatePropagatorImpl @Inject internal constructor(
                 relationshipItems.filter { it.hasEnrollment() }.map { it.elementUid() },
             trackedEntities = trackedEntityInstanceUids +
                 trackedEntitiesFromEnrollments +
-                relationshipItems.filter { it.hasTrackedEntityInstance() }.map { it.elementUid() }
+                relationshipItems.filter { it.hasTrackedEntityInstance() }.map { it.elementUid() },
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStateUidHolder.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStateUidHolder.kt
index d1a3bdaef2..147bdf3ad5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStateUidHolder.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStateUidHolder.kt
@@ -31,5 +31,5 @@ package org.hisp.dhis.android.core.common.internal
 data class DataStateUidHolder(
     val trackedEntities: List<String>,
     val enrollments: List<String>,
-    val events: List<String>
+    val events: List<String>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
index 5953a7b68c..7abb9bfaff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.common.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
@@ -50,6 +49,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions")
@@ -60,7 +60,7 @@ internal class TrackerDataManagerImpl @Inject constructor(
     private val relationshipStore: RelationshipStore,
     private val relationshipChildrenAppender: RelationshipItemChildrenAppender,
     private val dataStatePropagator: DataStatePropagator,
-    private val programOwner: ProgramOwnerStore
+    private val programOwner: ProgramOwnerStore,
 ) : TrackerDataManager {
 
     override fun deleteTrackedEntity(tei: TrackedEntityInstance?) {
@@ -103,7 +103,7 @@ internal class TrackerDataManagerImpl @Inject constructor(
     private fun <O> internalDelete(
         obj: O,
         store: IdentifiableDeletableDataObjectStore<O>,
-        propagateState: (O) -> Any
+        propagateState: (O) -> Any,
     ) where O : ObjectWithUidInterface, O : DeletableDataObject {
         if (obj.syncState() === State.TO_POST) {
             store.delete(obj.uid())
@@ -195,7 +195,7 @@ internal class TrackerDataManagerImpl @Inject constructor(
                             .program(program)
                             .ownerOrgUnit(orgunit)
                             .syncState(State.SYNCED)
-                            .build()
+                            .build(),
                     )
                 }
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
index 2c166a8eb2..74a4012187 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
 
 internal class ValueTypeDeviceRenderingHandler(
-    store: ValueTypeDeviceRenderingStore
+    store: ValueTypeDeviceRenderingStore,
 ) : ObjectWithoutUidHandlerImpl<ValueTypeDeviceRendering>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
index 3e7477e316..40cc2ba2d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo
 
 internal class ValueTypeDeviceRenderingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ValueTypeDeviceRenderingStore,
     ObjectWithoutUidStoreImpl<ValueTypeDeviceRendering>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class ValueTypeDeviceRenderingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> ValueTypeDeviceRendering.create(cursor) }
+        { cursor: Cursor -> ValueTypeDeviceRendering.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: ValueTypeDeviceRendering, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
index 743394e265..b6b983dfb3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
@@ -33,12 +33,12 @@ import org.hisp.dhis.android.core.common.ValueTypeRendering
 import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingHandler
 
 internal class ValueTypeRenderingHandler(
-    private val valueTypeDeviceRenderingHandler: ValueTypeDeviceRenderingHandler
+    private val valueTypeDeviceRenderingHandler: ValueTypeDeviceRenderingHandler,
 ) : DictionaryTableHandler<ValueTypeRendering> {
     override fun handle(o: ValueTypeRendering?, uid: String, objectTable: String) {
         if (o != null) {
             valueTypeDeviceRenderingHandler.handle(
-                o.desktop()
+                o.desktop(),
             ) { value: ValueTypeDeviceRendering ->
                 value.toBuilder()
                     .uid(uid)
@@ -48,7 +48,7 @@ internal class ValueTypeRenderingHandler(
             }
 
             valueTypeDeviceRenderingHandler.handle(
-                o.mobile()
+                o.mobile(),
             ) { value: ValueTypeDeviceRendering ->
                 value.toBuilder()
                     .uid(uid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
index ddc1ad028e..bd3dfe09bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
@@ -30,10 +30,10 @@ package org.hisp.dhis.android.core.configuration.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.Date
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.SecureStore
+import java.util.Date
 
 @Module
 internal class ConfigurationPackageDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt
index 9f4e89cb07..80c71cf63f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationStoreImpl.kt
@@ -34,13 +34,13 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
 
 internal class ConfigurationStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ConfigurationStore,
     ObjectStoreImpl<Configuration>(
         databaseAdapter,
         ConfigurationTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Configuration.create(cursor) }
+        { cursor: Cursor -> Configuration.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: Configuration, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
index 23a2dfba7b..7b451d7954 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
@@ -33,7 +33,7 @@ import javax.inject.Inject
 @Reusable
 internal class DatabaseConfigurationHelper @Inject constructor(
     private val databaseNameGenerator: DatabaseNameGenerator,
-    private val dateProvider: DateProvider
+    private val dateProvider: DateProvider,
 ) {
 
     fun changeEncryption(serverUrl: String?, account: DatabaseAccount): DatabaseAccount {
@@ -43,8 +43,8 @@ internal class DatabaseConfigurationHelper @Inject constructor(
                 databaseNameGenerator.getDatabaseName(
                     serverUrl!!,
                     account.username(),
-                    !account.encrypted()
-                )
+                    !account.encrypted(),
+                ),
             )
             .build()
     }
@@ -53,7 +53,7 @@ internal class DatabaseConfigurationHelper @Inject constructor(
         configuration: DatabasesConfiguration?,
         serverUrl: String,
         username: String,
-        encrypt: Boolean
+        encrypt: Boolean,
     ): DatabasesConfiguration {
         val newAccount = DatabaseAccount.builder()
             .username(username)
@@ -76,7 +76,7 @@ internal class DatabaseConfigurationHelper @Inject constructor(
         fun getAccount(
             configuration: DatabasesConfiguration?,
             serverUrl: String,
-            username: String
+            username: String,
         ): DatabaseAccount? {
             return configuration?.accounts()?.find {
                 equalsIgnoreProtocol(it.serverUrl(), serverUrl) && it.username() == username
@@ -85,7 +85,7 @@ internal class DatabaseConfigurationHelper @Inject constructor(
 
         fun removeAccount(
             configuration: DatabasesConfiguration,
-            userToRemove: List<DatabaseAccount>
+            userToRemove: List<DatabaseAccount>,
         ): DatabasesConfiguration {
             val users = configuration.accounts().filterNot { user ->
                 userToRemove.any { it.databaseName() == user.databaseName() }
@@ -98,7 +98,7 @@ internal class DatabaseConfigurationHelper @Inject constructor(
         fun getLoggedAccount(
             configuration: DatabasesConfiguration,
             username: String,
-            serverUrl: String
+            serverUrl: String,
         ): DatabaseAccount {
             val account = getAccount(configuration, serverUrl, username)
             return account
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
index 41872a5862..4e77a2ae6d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
@@ -31,6 +31,6 @@ import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.JsonKeyValueStoreImpl
 
 internal class DatabaseConfigurationInsecureStoreImpl(
-    insecureStore: InsecureStore
+    insecureStore: InsecureStore,
 ) : DatabaseConfigurationInsecureStore,
     JsonKeyValueStoreImpl<DatabasesConfiguration>(insecureStore, "DB_CONFIGS", DatabasesConfiguration::class.java)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
index 6de96c61f7..2897ae4a3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.configuration.internal
 import android.content.Context
 import android.database.sqlite.SQLiteException
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.BuildConfig
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
 import org.hisp.dhis.android.core.configuration.internal.migration.DatabaseConfigurationInsecureStoreOld
 import org.hisp.dhis.android.core.configuration.internal.migration.Migration260
+import javax.inject.Inject
 
 @Reusable
 internal class DatabaseConfigurationMigration @Inject constructor(
@@ -47,7 +47,7 @@ internal class DatabaseConfigurationMigration @Inject constructor(
     private val insecureStore: InsecureStore,
     private val nameGenerator: DatabaseNameGenerator,
     private val renamer: DatabaseRenamer,
-    private val databaseAdapterFactory: DatabaseAdapterFactory
+    private val databaseAdapterFactory: DatabaseAdapterFactory,
 ) {
     @Suppress("TooGenericExceptionCaught")
     fun apply() {
@@ -60,7 +60,7 @@ internal class DatabaseConfigurationMigration @Inject constructor(
             databaseAdapterFactory.createOrOpenDatabase(
                 databaseAdapter,
                 OLD_DBNAME,
-                false
+                false,
             )
             val username = getUsernameForOldDatabase(databaseAdapter)
             val serverUrl = getServerUrl(databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt
index 7a9259d26b..da9352a96b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationTransformer.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.configuration.internal
 
-import java.util.Date
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import java.util.Date
 
 internal object DatabaseConfigurationTransformer {
     fun transform(serverUrl: String, databaseName: String, username: String): DatabasesConfiguration {
@@ -41,8 +41,8 @@ internal object DatabaseConfigurationTransformer {
                         .databaseName(databaseName)
                         .databaseCreationDate(BaseIdentifiableObject.dateToDateStr(Date()))
                         .encrypted(false)
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .build()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
index c8676cd2b4..afd8b22787 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
@@ -30,12 +30,12 @@ package org.hisp.dhis.android.core.configuration.internal
 import android.content.Context
 import android.util.Log
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseExport
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
+import javax.inject.Inject
 
 @Reusable
 internal class MultiUserDatabaseManager @Inject internal constructor(
@@ -44,18 +44,18 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
     private val databaseConfigurationSecureStore: DatabaseConfigurationInsecureStore,
     private val configurationHelper: DatabaseConfigurationHelper,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
-    private val databaseExport: DatabaseExport
+    private val databaseExport: DatabaseExport,
 ) {
     fun loadExistingChangingEncryptionIfRequiredOtherwiseCreateNew(
         serverUrl: String,
         username: String,
-        encrypt: Boolean
+        encrypt: Boolean,
     ) {
         val existing = loadExistingChangingEncryptionIfRequired(
             serverUrl,
             username,
             { encrypt },
-            true
+            true,
         )
 
         if (!existing) {
@@ -68,7 +68,7 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
             serverUrl,
             username,
             { obj: DatabaseAccount -> obj.encrypted() },
-            true
+            true,
         )
 
         if (!existing) {
@@ -102,7 +102,7 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
             credentials.serverUrl,
             credentials.username,
             { encrypt },
-            false
+            false,
         )
     }
 
@@ -111,7 +111,7 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
             serverUrl,
             username,
             { obj: DatabaseAccount -> obj.encrypted() },
-            true
+            true,
         )
     }
 
@@ -131,7 +131,7 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
         serverUrl: String,
         username: String,
         encryptionExtractor: (config: DatabaseAccount) -> Boolean,
-        alsoOpenWhenEncryptionDoesntChange: Boolean
+        alsoOpenWhenEncryptionDoesntChange: Boolean,
     ): Boolean {
         val existingAccount = getAccount(serverUrl, username) ?: return false
         val encrypt = encryptionExtractor(existingAccount)
@@ -140,7 +140,7 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
             val updatedAccount = addNewAccountInternal(
                 serverUrl,
                 username,
-                encrypt
+                encrypt,
             )
             databaseAdapterFactory.createOrOpenDatabase(databaseAdapter, updatedAccount)
         }
@@ -150,12 +150,12 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
     private fun changeEncryptionIfRequired(
         serverUrl: String,
         existingAccount: DatabaseAccount,
-        encrypt: Boolean
+        encrypt: Boolean,
     ) {
         if (encrypt != existingAccount.encrypted()) {
             Log.w(
                 MultiUserDatabaseManager::class.java.name,
-                "Encryption value changed for " + existingAccount.username() + ": " + encrypt
+                "Encryption value changed for " + existingAccount.username() + ": " + encrypt,
             )
             if (encrypt && !existingAccount.encrypted()) {
                 databaseExport.encrypt(serverUrl, existingAccount)
@@ -174,13 +174,13 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
     private fun addNewAccountInternal(
         serverUrl: String,
         username: String,
-        encrypt: Boolean
+        encrypt: Boolean,
     ): DatabaseAccount {
         val updatedAccount = configurationHelper.addAccount(
             databaseConfigurationSecureStore.get(),
             serverUrl,
             username,
-            encrypt
+            encrypt,
         )
         databaseConfigurationSecureStore.set(updatedAccount)
         return DatabaseConfigurationHelper.getLoggedAccount(updatedAccount, username, serverUrl)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
index 1540a2996c..964be38f97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.configuration.internal
 
 import dagger.Reusable
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class MultiUserDatabaseManagerForD2Manager @Inject constructor(
     private val databaseAdapter: DatabaseAdapter,
     private val migration: DatabaseConfigurationMigration,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
-    private val databaseConfigurationStore: DatabaseConfigurationInsecureStore
+    private val databaseConfigurationStore: DatabaseConfigurationInsecureStore,
 ) {
     fun loadIfLogged(credentials: Credentials?) {
         val databaseConfiguration = databaseConfigurationStore.get()
@@ -50,7 +50,7 @@ internal class MultiUserDatabaseManagerForD2Manager @Inject constructor(
             val account = DatabaseConfigurationHelper.getLoggedAccount(
                 databaseConfiguration,
                 credentials.username,
-                credentials.serverUrl
+                credentials.serverUrl,
             )
             databaseAdapterFactory.createOrOpenDatabase(databaseAdapter, account)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt
index 9c64f28888..301b24461f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/migration/Migration260.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.configuration.internal.migration
 
 import android.content.Context
-import java.io.File
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
@@ -38,11 +37,12 @@ import org.hisp.dhis.android.core.configuration.internal.DatabasesConfiguration
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceStoreImpl
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigKey
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStoreImpl
+import java.io.File
 
 internal class Migration260(
     private val context: Context,
     private val databaseConfigurationStore: ObjectKeyValueStore<DatabasesConfiguration>,
-    private val databaseAdapterFactory: DatabaseAdapterFactory
+    private val databaseAdapterFactory: DatabaseAdapterFactory,
 ) {
     fun apply() {
         val configuration = databaseConfigurationStore.get()
@@ -76,7 +76,7 @@ internal class Migration260(
         fileResources.forEach {
             val newPath = it.path()?.replace(
                 oldValue = FileResourceDirectoryHelper.FilesDir,
-                newValue = FileResourceDirectoryHelper.FilesDir + "/" + accountSubFolder
+                newValue = FileResourceDirectoryHelper.FilesDir + "/" + accountSubFolder,
             ) ?: ""
             val newFileResource = it.toBuilder().path(newPath).build()
             fileResourcesStore.updateOrInsert(newFileResource)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
index 012cbba365..b3878fea8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ConstantCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<Constant>(
     tableName = ConstantTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
index d71311b0d4..77df37f955 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.constant.Constant
 @Suppress("MagicNumber")
 internal class ConstantHandler constructor(
     optionStore: ConstantStore,
-    private val collectionCleaner: ConstantCollectionCleaner
+    private val collectionCleaner: ConstantCollectionCleaner,
 ) : IdentifiableHandlerImpl<Constant>(optionStore) {
     override fun afterCollectionHandled(oCollection: Collection<Constant>?) {
         collectionCleaner.deleteNotPresent(oCollection)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
index e4dd7e389b..f840f6c632 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
@@ -49,7 +49,7 @@ internal class ConstantPackageDIModule {
     @Reusable
     fun handler(
         optionStore: ConstantStore,
-        collectionCleaner: ConstantCollectionCleaner
+        collectionCleaner: ConstantCollectionCleaner,
     ): ConstantHandler {
         return ConstantHandler(optionStore, collectionCleaner)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
index b326bc6785..cb99933216 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.constant.ConstantTableInfo
 
 @Suppress("MagicNumber")
 internal class ConstantStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ConstantStore,
     IdentifiableObjectStoreImpl<Constant>(
         databaseAdapter,
         ConstantTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Constant.create(cursor) }
+        { cursor: Cursor -> Constant.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<Constant> = object : IdentifiableStatementBinder<Constant>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
index 93ecbc2ea3..e934485ce3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.dataapproval.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.internal.MultiDimensionalPartitioner
 import org.hisp.dhis.android.core.dataapproval.DataApproval
+import javax.inject.Inject
 
 @Reusable
 internal class DataApprovalCall @Inject constructor(
     private val service: DataApprovalService,
     private val handler: DataApprovalHandler,
     private val apiDownloader: APIDownloader,
-    private val multiDimensionalPartitioner: MultiDimensionalPartitioner
+    private val multiDimensionalPartitioner: MultiDimensionalPartitioner,
 ) : QueryCall<DataApproval, DataApprovalQuery> {
 
     companion object {
@@ -56,7 +56,7 @@ internal class DataApprovalCall @Inject constructor(
             query.workflowsUids,
             query.periodIds,
             query.organisationUnistUids,
-            query.attributeOptionCombosUids
+            query.attributeOptionCombosUids,
         )
         return partitions.flatMap { part ->
             apiDownloader.downloadListAsCoroutine(handler) {
@@ -66,7 +66,7 @@ internal class DataApprovalCall @Inject constructor(
                     workflow = commaSeparatedCollectionValues(part[0]),
                     periods = commaSeparatedCollectionValues(part[1]),
                     organisationUnit = commaSeparatedCollectionValues(part[2]),
-                    attributeOptionCombo = commaSeparatedCollectionValues(part[3])
+                    attributeOptionCombo = commaSeparatedCollectionValues(part[3]),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
index 84c15ffc52..c1729444ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.dataapproval.DataApproval
 
 internal class DataApprovalHandler(
-    dataApprovalStore: DataApprovalStore
+    dataApprovalStore: DataApprovalStore,
 ) : ObjectWithoutUidHandlerImpl<DataApproval>(dataApprovalStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt
index 7ee945c5fa..d8da442a62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalQuery.kt
@@ -34,9 +34,9 @@ internal data class DataApprovalQuery(
     val organisationUnistUids: Collection<String>,
     val periodIds: Collection<String>,
     val attributeOptionCombosUids: Collection<String>,
-    val lastUpdatedStr: String?
+    val lastUpdatedStr: String?,
 ) : BaseQueryKt(
     page = 1,
     pageSize = DEFAULT_PAGE_SIZE,
-    paging = false
+    paging = false,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt
index 078b76d306..d530cb23f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalService.kt
@@ -42,6 +42,6 @@ internal interface DataApprovalService {
         @Query("wf") workflow: String,
         @Query("pe") periods: String,
         @Query("ou") organisationUnit: String,
-        @Query("aoc") attributeOptionCombo: String
+        @Query("aoc") attributeOptionCombo: String,
     ): List<DataApproval>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
index f457e004c2..057c57e681 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.dataapproval.DataApproval
 import org.hisp.dhis.android.core.dataapproval.DataApprovalTableInfo
 
 internal class DataApprovalStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataApprovalStore,
     ObjectWithoutUidStoreImpl<DataApproval>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class DataApprovalStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> DataApproval.create(cursor) }
+        { cursor: Cursor -> DataApproval.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { dataApproval: DataApproval, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
index bda03d9d0d..b5d0e694a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class DataElementAttributeValueEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: DataElementAttributeValueLinkStore
+        store: DataElementAttributeValueLinkStore,
     ): DataElementAttributeValueLinkHandler {
         return DataElementAttributeValueLinkHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
index 9e9925cdc3..c20c5e7671 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
@@ -30,13 +30,13 @@ package org.hisp.dhis.android.core.dataelement.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.Collections
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
 import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
+import java.util.Collections
 
 @Module
 internal class DataElementEntityDIModule {
@@ -52,13 +52,13 @@ internal class DataElementEntityDIModule {
         dataElementStore: DataElementStore,
         attributeHandler: AttributeHandler,
         dataElementAttributeLinkHandler: DataElementAttributeValueLinkHandler,
-        dataElementLegendSetLinkHandler: DataElementLegendSetLinkHandler
+        dataElementLegendSetLinkHandler: DataElementLegendSetLinkHandler,
     ): DataElementHandler {
         return DataElementHandler(
             dataElementStore,
             attributeHandler,
             dataElementAttributeLinkHandler,
-            dataElementLegendSetLinkHandler
+            dataElementLegendSetLinkHandler,
         )
     }
 
@@ -67,7 +67,7 @@ internal class DataElementEntityDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataElement>> {
         return Collections.singletonMap(
             DataElementFields.LEGEND_SETS,
-            DataElementLegendSetChildrenAppender.create(databaseAdapter)
+            DataElementLegendSetChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
index 6309dfad31..d44502046c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
@@ -43,7 +43,7 @@ internal class DataElementHandler constructor(
     dataElementStore: DataElementStore,
     private val attributeHandler: AttributeHandler,
     private val dataElementAttributeLinkHandler: LinkHandler<Attribute, DataElementAttributeValueLink>,
-    private val dataElementLegendSetLinkHandler: OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink>
+    private val dataElementLegendSetLinkHandler: OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink>,
 ) : IdentifiableHandlerImpl<DataElement>(dataElementStore) {
 
     override fun afterObjectHandled(o: DataElement, action: HandleAction) {
@@ -52,7 +52,7 @@ internal class DataElementHandler constructor(
             attributeHandler.handleMany(attributes)
             dataElementAttributeLinkHandler.handleMany(
                 o.uid(),
-                attributes
+                attributes,
             ) { attribute: Attribute ->
                 DataElementAttributeValueLink.builder()
                     .dataElement(o.uid())
@@ -64,7 +64,7 @@ internal class DataElementHandler constructor(
         if (o.legendSets() != null) {
             dataElementLegendSetLinkHandler.handleMany(
                 o.uid(),
-                o.legendSets()
+                o.legendSets(),
             ) { legendSet: ObjectWithUid, sortOrder: Int? ->
                 DataElementLegendSetLink.builder()
                     .dataElement(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt
index 775e1ce22c..27f99a81b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetChildrenAppender.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
 
 internal class DataElementLegendSetChildrenAppender private constructor(
-    private val linkChildStore: ObjectWithUidChildStore<DataElement>
+    private val linkChildStore: ObjectWithUidChildStore<DataElement>,
 ) : ChildrenAppender<DataElement>() {
     override fun appendChildren(m: DataElement): DataElement {
         return m.toBuilder()
@@ -49,8 +49,8 @@ internal class DataElementLegendSetChildrenAppender private constructor(
                 objectWithUidChildStore(
                     databaseAdapter,
                     DataElementLegendSetLinkTableInfo.TABLE_INFO,
-                    DataElementLegendSetLinkTableInfo.CHILD_PROJECTION
-                )
+                    DataElementLegendSetLinkTableInfo.CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
index 4c3faa8968..d27f316e9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class DataElementLegendSetEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: DataElementLegendSetLinkStore
+        store: DataElementLegendSetLinkStore,
     ): DataElementLegendSetLinkHandler {
         return DataElementLegendSetLinkHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
index d3bd0785c7..e9dcea0b21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
 
 internal class DataElementOperandHandler constructor(
-    store: IdentifiableObjectStore<DataElementOperand>
+    store: IdentifiableObjectStore<DataElementOperand>,
 ) : IdentifiableHandlerImpl<DataElementOperand>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
index 2c5dd81461..5c38528897 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
@@ -37,13 +37,13 @@ import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo
 
 internal class DataElementOperandStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataElementOperandStore,
     IdentifiableObjectStoreImpl<DataElementOperand>(
         databaseAdapter,
         DataElementOperandTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> DataElementOperand.create(cursor) }
+        { cursor: Cursor -> DataElementOperand.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
index 3d06ea4db2..24b4d26b72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
@@ -40,8 +40,8 @@ import retrofit2.Retrofit
         DataElementEntityDIModule::class,
         DataElementOperandEntityDIModule::class,
         DataElementAttributeValueEntityDIModule::class,
-        DataElementLegendSetEntityDIModule::class
-    ]
+        DataElementLegendSetEntityDIModule::class,
+    ],
 )
 internal class DataElementPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
index 15893e3700..722247a0d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 
 @Suppress("MagicNumber")
 internal class DataElementStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataElementStore,
     IdentifiableObjectStoreImpl<DataElement>(
         databaseAdapter,
         DataElementTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> DataElement.create(cursor) }
+        { cursor: Cursor -> DataElement.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
index 7fe3d18803..fbd231af29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asObservable
@@ -49,6 +48,7 @@ import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationHa
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationPostCall
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore
 import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository
+import javax.inject.Inject
 
 @Reusable
 @Suppress("SpreadOperator", "TooManyFunctions")
@@ -58,13 +58,13 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     scope: RepositoryScope,
     handler: DataSetCompleteRegistrationHandler,
     private val postCall: DataSetCompleteRegistrationPostCall,
-    private val credentialsRepository: UserCredentialsObjectRepository
+    private val credentialsRepository: UserCredentialsObjectRepository,
 ) : ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationCollectionRepository>(
     dataSetCompleteRegistrationStore,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
-        scope
+        scope,
     ) { s: RepositoryScope ->
         DataSetCompleteRegistrationCollectionRepository(
             dataSetCompleteRegistrationStore,
@@ -72,16 +72,16 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
             s,
             handler,
             postCall,
-            credentialsRepository
+            credentialsRepository,
         )
-    }
+    },
 ),
     ReadOnlyWithUploadCollectionRepository<DataSetCompleteRegistration> {
     fun value(
         period: String,
         organisationUnit: String,
         dataSet: String,
-        attributeOptionCombo: String
+        attributeOptionCombo: String,
     ): DataSetCompleteRegistrationObjectRepository {
         val updatedScope = byPeriod().eq(period)
             .byOrganisationUnitUid().eq(organisationUnit)
@@ -95,7 +95,7 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
             period,
             organisationUnit,
             dataSet,
-            attributeOptionCombo
+            attributeOptionCombo,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt
index 4b1eff57dc..4716f41cf7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt
@@ -36,14 +36,14 @@ interface DataSetInstanceService {
         dataSetUid: String,
         periodId: String,
         organisationUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<DataSetEditableStatus>
 
     fun blockingGetEditableStatus(
         dataSetUid: String,
         periodId: String,
         organisationUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): DataSetEditableStatus
 
     fun hasDataWriteAccess(dataSetUid: String): Single<Boolean>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt
index 6d278ecf61..d3244fff46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetNonEditableReason.kt
@@ -36,5 +36,5 @@ enum class DataSetNonEditableReason {
     PERIOD_IS_NOT_IN_ORGUNIT_RANGE,
     PERIOD_IS_NOT_IN_ATTRIBUTE_OPTION_RANGE,
     CLOSED,
-    EXPIRED
+    EXPIRED,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt
index 7fa021cd97..2c2856b969 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.dataset.DataInputPeriod
 import org.hisp.dhis.android.core.dataset.DataSet
 
 internal class DataInputPeriodChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<DataSet, DataInputPeriod>
+    private val childStore: SingleParentChildStore<DataSet, DataInputPeriod>,
 ) : ChildrenAppender<DataSet>() {
     override fun appendChildren(m: DataSet): DataSet {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class DataInputPeriodChildrenAppender private constructor(
             return DataInputPeriodChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    DataInputPeriodStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor? -> DataInputPeriod.create(cursor) }
+                    DataInputPeriodStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor? -> DataInputPeriod.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
index f29e3e421c..ad8ee5ca53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.dataset.DataInputPeriod
 
 internal class DataInputPeriodHandler(
-    store: DataInputPeriodStore
+    store: DataInputPeriodStore,
 ) : LinkHandlerImpl<DataInputPeriod, DataInputPeriod>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
index 5d8da36d64..cff57f4fcf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
@@ -38,14 +38,14 @@ import org.hisp.dhis.android.core.dataset.DataInputPeriod
 import org.hisp.dhis.android.core.dataset.DataInputPeriodTableInfo
 
 internal class DataInputPeriodStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataInputPeriodStore,
     LinkStoreImpl<DataInputPeriod>(
         databaseAdapter,
         DataInputPeriodTableInfo.TABLE_INFO,
         DataInputPeriodTableInfo.Columns.DATA_SET,
         BINDER,
-        { cursor: Cursor -> DataInputPeriod.create(cursor) }
+        { cursor: Cursor -> DataInputPeriod.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { dataInputPeriod: DataInputPeriod, w: StatementWrapper ->
@@ -56,7 +56,7 @@ internal class DataInputPeriodStoreImpl(
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
             DataInputPeriodTableInfo.TABLE_INFO,
-            DataInputPeriodTableInfo.Columns.DATA_SET
+            DataInputPeriodTableInfo.Columns.DATA_SET,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
index e91fd4b79a..4fcedda82a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<DataSet>(
     tableName = DataSetTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
index 3a527982e5..82d408e3e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.internal.MultiDimensionalPartitioner
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetCompleteRegistrationCall @Inject constructor(
     private val service: DataSetCompleteRegistrationService,
     private val multiDimensionalPartitioner: MultiDimensionalPartitioner,
-    private val processor: DataSetCompleteRegistrationCallProcessor
+    private val processor: DataSetCompleteRegistrationCallProcessor,
 ) : QueryCall<DataSetCompleteRegistration, DataSetCompleteRegistrationQuery> {
 
     companion object {
@@ -58,7 +58,7 @@ internal class DataSetCompleteRegistrationCall @Inject constructor(
             QUERY_WITHOUT_UIDS_LENGTH,
             query.dataSetUids,
             query.periodIds,
-            query.rootOrgUnitUids
+            query.rootOrgUnitUids,
         )
 
         return partitions.flatMap { part ->
@@ -69,7 +69,7 @@ internal class DataSetCompleteRegistrationCall @Inject constructor(
                 periodIds = commaSeparatedCollectionValues(part[1]),
                 organisationUnitIds = commaSeparatedCollectionValues(part[2]),
                 children = true,
-                paging = false
+                paging = false,
             ).dataSetCompleteRegistrations
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
index 11517323c2..12d8ab3f65 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetCompleteRegistrationCallProcessor @Inject internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
-    private val handler: DataSetCompleteRegistrationHandler
+    private val handler: DataSetCompleteRegistrationHandler,
 ) {
 
     internal fun process(objectList: List<DataSetCompleteRegistration>, query: DataSetCompleteRegistrationQuery) {
@@ -58,7 +58,7 @@ internal class DataSetCompleteRegistrationCallProcessor @Inject internal constru
             dataSetCompleteRegistrationStore.removeNotPresentAndSynced(
                 query.dataSetUids,
                 query.periodIds,
-                rootOrgUnitUid
+                rootOrgUnitUid,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
index 2755b585a0..494930b29e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 
 internal class DataSetCompleteRegistrationHandler(
-    store: DataSetCompleteRegistrationStore
+    store: DataSetCompleteRegistrationStore,
 ) : ObjectWithoutUidHandlerImpl<DataSetCompleteRegistration>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 1e38446373..8d823bd583 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flow
@@ -49,6 +47,8 @@ import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResp
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetCompleteRegistrationPostCall @Inject constructor(
@@ -57,10 +57,10 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
     private val categoryOptionComboCollectionRepository: CategoryOptionComboCollectionRepository,
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
     private val versionManager: DHISVersionManager,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
     fun uploadDataSetCompleteRegistrations(
-        dataSetCompleteRegistrations: List<DataSetCompleteRegistration>
+        dataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
     ): Flow<D2Progress> {
         if (dataSetCompleteRegistrations.isEmpty()) {
             return emptyFlow()
@@ -71,7 +71,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
         return uploadInternal(
             progressManager,
             toPostDataSetCompleteRegistrations,
-            toDeleteDataSetCompleteRegistrations
+            toDeleteDataSetCompleteRegistrations,
         )
     }
 
@@ -79,7 +79,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
     private fun uploadInternal(
         progressManager: D2ProgressManager,
         toPostDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
-        toDeleteDataSetCompleteRegistrations: List<DataSetCompleteRegistration>
+        toDeleteDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
     ) = flow {
         val payload = DataSetCompleteRegistrationPayload(toPostDataSetCompleteRegistrations)
         val dataValueImportSummary: DataValueImportSummary =
@@ -110,7 +110,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
                     dataSetCompleteRegistration.organisationUnit(),
                     coc!!.categoryCombo()!!.uid(),
                     CollectionsHelper.semicolonSeparatedCollectionValues(getUids(coc.categoryOptions()!!)),
-                    false
+                    false,
                 )
             }.fold(
                 onSuccess = { result ->
@@ -123,25 +123,25 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
 
                 onFailure = {
                     withErrorDataSetCompleteRegistrations.add(dataSetCompleteRegistration)
-                }
+                },
             )
         }
         dataSetCompleteRegistrationImportHandler.handleImportSummary(
             payload,
             dataValueImportSummary,
             deletedDataSetCompleteRegistrations,
-            withErrorDataSetCompleteRegistrations
+            withErrorDataSetCompleteRegistrations,
         )
         emit(progressManager.increaseProgress(DataSetCompleteRegistration::class.java, true))
     }
 
     private suspend fun postCompleteRegistrations(
-        payload: DataSetCompleteRegistrationPayload
+        payload: DataSetCompleteRegistrationPayload,
     ): Result<DataValueImportSummary, D2Error> {
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
             coroutineAPICallExecutor.wrap(
                 acceptedErrorCodes = listOf(HttpURLConnection.HTTP_CONFLICT),
-                errorClass = DataValueImportSummaryWebResponse::class.java
+                errorClass = DataValueImportSummaryWebResponse::class.java,
             ) {
                 dataSetCompleteRegistrationService.postDataSetCompleteRegistrationsWebResponse(payload)
             }.map { it.response }
@@ -154,7 +154,7 @@ internal class DataSetCompleteRegistrationPostCall @Inject constructor(
 
     private fun markObjectsAs(
         dataSetCompleteRegistrations: Collection<DataSetCompleteRegistration>,
-        forcedState: State?
+        forcedState: State?,
     ) {
         for (dscr in dataSetCompleteRegistrations) {
             dataSetCompleteRegistrationStore.setState(dscr, forcedOrOwn(dscr, forcedState))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
index 572183be8e..d79b68b7b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationQuery.kt
@@ -33,9 +33,9 @@ internal data class DataSetCompleteRegistrationQuery(
     val dataSetUids: Collection<String>,
     val periodIds: Collection<String>,
     val rootOrgUnitUids: Collection<String>,
-    val lastUpdatedStr: String?
+    val lastUpdatedStr: String?,
 ) : BaseQueryKt(
     page = 1,
     pageSize = DEFAULT_PAGE_SIZE,
-    paging = false
+    paging = false,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
index a096d89a94..81e64922d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationService.kt
@@ -47,17 +47,17 @@ internal interface DataSetCompleteRegistrationService {
         @Query("period") periodIds: String,
         @Query("orgUnit") organisationUnitIds: String,
         @Query("children") children: Boolean,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): DataSetCompleteRegistrationPayload
 
     @POST("completeDataSetRegistrations")
     suspend fun postDataSetCompleteRegistrations(
-        @Body dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload
+        @Body dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload,
     ): DataValueImportSummary
 
     @POST("completeDataSetRegistrations")
     suspend fun postDataSetCompleteRegistrationsWebResponse(
-        @Body dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload
+        @Body dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload,
     ): DataValueImportSummaryWebResponse
 
     @DELETE("completeDataSetRegistrations")
@@ -67,6 +67,6 @@ internal interface DataSetCompleteRegistrationService {
         @Query("ou") orgUnit: String,
         @Query("cc") categoryComboUid: String,
         @Query("cp") categoryOptionUids: String,
-        @Query("multiOu") multiOrganisationUnit: Boolean
+        @Query("multiOu") multiOrganisationUnit: Boolean,
     ): Response<Unit>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt
index 1a2b1f2b02..a18ca7652c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStore.kt
@@ -37,7 +37,7 @@ internal interface DataSetCompleteRegistrationStore : ObjectWithoutUidStore<Data
     fun removeNotPresentAndSynced(
         dataSetUids: Collection<String>,
         periodIds: Collection<String>,
-        rootOrgunitUid: String
+        rootOrgunitUid: String,
     ): Boolean
 
     fun isBeingUpload(dscr: DataSetCompleteRegistration): Boolean
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
index ce9941f465..bc1562160b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 
 internal class DataSetCompleteRegistrationStoreImpl constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetCompleteRegistrationStore,
     ObjectWithoutUidStoreImpl<DataSetCompleteRegistration>(
         databaseAdapter,
@@ -48,7 +48,7 @@ internal class DataSetCompleteRegistrationStoreImpl constructor(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> DataSetCompleteRegistration.create(cursor) }
+        { cursor: Cursor -> DataSetCompleteRegistration.create(cursor) },
     ) {
 
     /**
@@ -68,7 +68,7 @@ internal class DataSetCompleteRegistrationStoreImpl constructor(
     override fun removeNotPresentAndSynced(
         dataSetUids: Collection<String>,
         periodIds: Collection<String>,
-        rootOrgunitUid: String
+        rootOrgunitUid: String,
     ): Boolean {
         val whereClause = WhereClauseBuilder()
         whereClause.appendInKeyStringValues(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dataSetUids)
@@ -78,7 +78,7 @@ internal class DataSetCompleteRegistrationStoreImpl constructor(
             OrganisationUnitTableInfo.Columns.UID,
             OrganisationUnitTableInfo.TABLE_INFO.name(),
             OrganisationUnitTableInfo.Columns.PATH,
-            "%$rootOrgunitUid%"
+            "%$rootOrgunitUid%",
         )
         whereClause.appendInSubQuery(DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT, subQuery)
         whereClause.appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE, State.SYNCED)
@@ -91,11 +91,11 @@ internal class DataSetCompleteRegistrationStoreImpl constructor(
             .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dscr.dataSet())
             .appendKeyStringValue(
                 DataSetCompleteRegistrationTableInfo.Columns.ORGANISATION_UNIT,
-                dscr.organisationUnit()
+                dscr.organisationUnit(),
             )
             .appendKeyStringValue(
                 DataSetCompleteRegistrationTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
-                dscr.attributeOptionCombo()
+                dscr.attributeOptionCombo(),
             )
             .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE, State.UPLOADING)
             .build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt
index ab7425f4a6..324b958943 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo
 
 internal class DataSetCompulsoryDataElementOperandChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<DataSet, DataElementOperand>
+    private val linkChildStore: LinkChildStore<DataSet, DataElementOperand>,
 ) : ChildrenAppender<DataSet>() {
     override fun appendChildren(m: DataSet): DataSet {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class DataSetCompulsoryDataElementOperandChildrenAppender private const
         private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementOperandTableInfo.TABLE_INFO,
             DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_SET,
-            DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_ELEMENT_OPERAND
+            DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_ELEMENT_OPERAND,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
@@ -59,8 +59,8 @@ internal class DataSetCompulsoryDataElementOperandChildrenAppender private const
                 linkChildStore(
                     databaseAdapter,
                     DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> DataElementOperand.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> DataElementOperand.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
index 8fa194a64e..ba5b63edc1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
@@ -43,7 +43,7 @@ internal class DataSetCompulsoryDataElementOperandEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: DataSetCompulsoryDataElementOperandLinkStore
+        store: DataSetCompulsoryDataElementOperandLinkStore,
     ): DataSetCompulsoryDataElementOperandHandler {
         return DataSetCompulsoryDataElementOperandHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
index 70d3e9d8db..66f8b4adee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
 
 internal class DataSetCompulsoryDataElementOperandHandler(
-    store: DataSetCompulsoryDataElementOperandLinkStore
+    store: DataSetCompulsoryDataElementOperandLinkStore,
 ) : LinkHandlerImpl<DataElementOperand, DataSetCompulsoryDataElementOperandLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
index 0c6a709b98..59c795d42a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLin
 import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo
 
 internal class DataSetCompulsoryDataElementOperandLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetCompulsoryDataElementOperandLinkStore,
     LinkStoreImpl<DataSetCompulsoryDataElementOperandLink>(
         databaseAdapter,
         DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
         DataSetCompulsoryDataElementOperandLinkTableInfo.Columns.DATA_SET,
         BINDER,
-        { cursor: Cursor -> DataSetCompulsoryDataElementOperandLink.create(cursor) }
+        { cursor: Cursor -> DataSetCompulsoryDataElementOperandLink.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: DataSetCompulsoryDataElementOperandLink, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt
index 80a6b5c908..180d947786 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementChildrenAppender.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.dataset.DataSetElement
 import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
 
 internal class DataSetElementChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<DataSet, DataSetElement>
+    private val childStore: SingleParentChildStore<DataSet, DataSetElement>,
 ) : ChildrenAppender<DataSet>() {
     override fun appendChildren(m: DataSet): DataSet {
         val builder = m.toBuilder()
@@ -49,15 +49,15 @@ internal class DataSetElementChildrenAppender private constructor(
     companion object {
         private val CHILD_PROJECTION = SingleParentChildProjection(
             DataSetElementLinkTableInfo.TABLE_INFO,
-            DataSetElementLinkTableInfo.Columns.DATA_SET
+            DataSetElementLinkTableInfo.Columns.DATA_SET,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
             return DataSetElementChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> DataSetElement.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> DataSetElement.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
index 3a3c4e65ec..e574e21339 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.dataset.DataSetElement
 
 internal class DataSetElementHandler(
-    store: DataSetElementStore
+    store: DataSetElementStore,
 ) : LinkHandlerImpl<DataSetElement, DataSetElement>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
index 58f50f4a9c..0500c1957c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.dataset.DataSetElement
 import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
 
 internal class DataSetElementStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetElementStore,
     LinkStoreImpl<DataSetElement>(
         databaseAdapter,
         DataSetElementLinkTableInfo.TABLE_INFO,
         DataSetElementLinkTableInfo.Columns.DATA_SET,
         BINDER,
-        { cursor: Cursor -> DataSetElement.create(cursor) }
+        { cursor: Cursor -> DataSetElement.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
index 25b1aec585..6b05b145f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
@@ -58,7 +58,7 @@ internal class DataSetEntityDIModule {
         dataSetElementLinkHandler: DataSetElementHandler,
         dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
         collectionCleaner: DataSetCollectionCleaner,
-        linkCleaner: DataSetOrganisationUnitLinkCleaner
+        linkCleaner: DataSetOrganisationUnitLinkCleaner,
     ): DataSetHandler {
         return DataSetHandler(
             dataSetStore,
@@ -70,7 +70,7 @@ internal class DataSetEntityDIModule {
             dataSetElementLinkHandler,
             dataSetIndicatorLinkHandler,
             collectionCleaner,
-            linkCleaner
+            linkCleaner,
         )
     }
 
@@ -83,7 +83,7 @@ internal class DataSetEntityDIModule {
 
             DataSetFields.DATA_INPUT_PERIODS to DataInputPeriodChildrenAppender.create(databaseAdapter),
             DataSetFields.DATA_SET_ELEMENTS to DataSetElementChildrenAppender.create(databaseAdapter),
-            DataSetFields.INDICATORS to DataSetIndicatorChildrenAppender.create(databaseAdapter)
+            DataSetFields.INDICATORS to DataSetIndicatorChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index 8dc41db529..d0f4c5f4f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -48,7 +48,7 @@ internal class DataSetHandler constructor(
     private val dataSetElementLinkHandler: DataSetElementHandler,
     private val dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
     private val collectionCleaner: DataSetCollectionCleaner,
-    private val linkCleaner: DataSetOrganisationUnitLinkCleaner
+    private val linkCleaner: DataSetOrganisationUnitLinkCleaner,
 ) : IdentifiableHandlerImpl<DataSet>(dataSetStore) {
 
     override fun afterObjectHandled(o: DataSet, action: HandleAction) {
@@ -57,7 +57,7 @@ internal class DataSetHandler constructor(
         compulsoryDataElementOperandHandler.handleMany(o.compulsoryDataElementOperands())
         dataSetCompulsoryDataElementOperandLinkHandler.handleMany(
             o.uid(),
-            o.compulsoryDataElementOperands()
+            o.compulsoryDataElementOperands(),
         ) { dataElementOperand: DataElementOperand ->
             DataSetCompulsoryDataElementOperandLink.builder()
                 .dataSet(o.uid())
@@ -66,19 +66,19 @@ internal class DataSetHandler constructor(
         }
         dataInputPeriodHandler.handleMany(
             o.uid(),
-            o.dataInputPeriods()
+            o.dataInputPeriods(),
         ) { dataInputPeriod: DataInputPeriod ->
             dataInputPeriod.toBuilder().dataSet(ObjectWithUid.create(o.uid())).build()
         }
         dataSetElementLinkHandler.handleMany(
             o.uid(),
-            o.dataSetElements()
+            o.dataSetElements(),
         ) { dataSetElement: DataSetElement ->
             dataSetElement.toBuilder().dataSet(ObjectWithUid.create(o.uid())).build()
         }
         dataSetIndicatorLinkHandler.handleMany(
             o.uid(),
-            o.indicators()
+            o.indicators(),
         ) { indicator: Indicator ->
             DataSetIndicatorLink.builder().dataSet(o.uid()).indicator(indicator.uid()).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index b4ac99c86f..1a27439156 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionCollectionRepository
 import org.hisp.dhis.android.core.category.CategoryOptionComboService
@@ -45,6 +43,8 @@ import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions")
@@ -54,21 +54,21 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
     private val organisationUnitService: OrganisationUnitService,
     private val periodHelper: PeriodHelper,
     private val categoryOptionComboService: CategoryOptionComboService,
-    private val periodGenerator: ParentPeriodGenerator
+    private val periodGenerator: ParentPeriodGenerator,
 ) : DataSetInstanceService {
 
     override fun getEditableStatus(
         dataSetUid: String,
         periodId: String,
         organisationUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<DataSetEditableStatus> {
         return Single.fromCallable {
             blockingGetEditableStatus(
                 dataSetUid = dataSetUid,
                 periodId = periodId,
                 organisationUnitUid = organisationUnitUid,
-                attributeOptionComboUid = attributeOptionComboUid
+                attributeOptionComboUid = attributeOptionComboUid,
             )
         }
     }
@@ -78,7 +78,7 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
         dataSetUid: String,
         periodId: String,
         organisationUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): DataSetEditableStatus {
         val dataSet = dataSetCollectionRepository.uid(dataSetUid).blockingGet()
         val period = periodHelper.getPeriodForPeriodId(periodId).blockingGet()
@@ -122,11 +122,11 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
 
     fun blockingIsAttributeOptionComboAssignToOrgUnit(
         categoryOptionComboUid: String,
-        orgUnitUid: String
+        orgUnitUid: String,
     ): Boolean {
         return categoryOptionComboService.blockingIsAssignedToOrgUnit(
             categoryOptionComboUid = categoryOptionComboUid,
-            orgUnitUid = orgUnitUid
+            orgUnitUid = orgUnitUid,
         )
     }
 
@@ -136,7 +136,7 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
             periodGenerator.generatePeriod(
                 periodType = PeriodType.Daily,
                 date = endDate,
-                offset = expiryDays - 1
+                offset = expiryDays - 1,
             )
         }
         return Date().after(generatedPeriod?.endDate())
@@ -148,7 +148,7 @@ internal class DataSetInstanceServiceImpl @Inject constructor(
         val generatedPeriod = periodGenerator.generatePeriod(
             periodType = periodType,
             date = Date(),
-            offset = openFuturePeriods - 1
+            offset = openFuturePeriods - 1,
         )
         return period.endDate()?.before(generatedPeriod?.endDate()) ?: true
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
index 69dc503591..2a0e76bdbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
@@ -33,10 +33,10 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl
 import org.hisp.dhis.android.core.dataset.DataSetInstance
 
 internal class DataSetInstanceStoreImpl constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetInstanceStore,
     ReadableStoreImpl<DataSetInstance>(
         databaseAdapter,
         DataSetInstanceSQLStatementBuilder(),
-        { cursor: Cursor -> DataSetInstance.create(cursor) }
+        { cursor: Cursor -> DataSetInstance.create(cursor) },
     )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
index ad2e714183..a8904c3c79 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
@@ -33,10 +33,10 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl
 import org.hisp.dhis.android.core.dataset.DataSetInstanceSummary
 
 internal class DataSetInstanceSummaryStoreImpl constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetInstanceSummaryStore,
     ReadableStoreImpl<DataSetInstanceSummary>(
         databaseAdapter,
         DataSetInstanceSummarySQLStatementBuilder(),
-        { cursor: Cursor -> DataSetInstanceSummary.create(cursor) }
+        { cursor: Cursor -> DataSetInstanceSummary.create(cursor) },
     )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index 5332e7975e..bab6f1a97f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
@@ -41,6 +40,7 @@ import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCall
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetModuleDownloader @Inject internal constructor(
@@ -51,7 +51,7 @@ internal class DataSetModuleDownloader @Inject internal constructor(
     private val validationRuleCall: ValidationRuleCall,
     private val validationRuleUidsCall: ValidationRuleUidsCall,
     private val periodHandler: PeriodHandler,
-    private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore
+    private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
@@ -61,7 +61,7 @@ internal class DataSetModuleDownloader @Inject internal constructor(
             val dataSets = dataSetCallFactory.create(orgUnitDataSetUids).call()
 
             val dataElements = dataElementCallFactory.create(
-                DataSetParentUidsHelper.getDataElementUids(dataSets)
+                DataSetParentUidsHelper.getDataElementUids(dataSets),
             ).call()
 
             val optionSetUids = DataSetParentUidsHelper.getAssignedOptionSetUids(dataElements)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
index 08df21c1f1..460ecfb105 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetOrganisationUnitLinkCleaner @Inject constructor(
     programStore: DataSetStore,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : LinkCleanerImpl<DataSet>(
     tableName = DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
     applicableColumn = DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
     parentStore = programStore,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
index 53cc1dbdd0..72716f3af6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
 
 internal class DataSetOrganisationUnitLinkHandler(
-    store: DataSetOrganisationUnitLinkStore
+    store: DataSetOrganisationUnitLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, DataSetOrganisationUnitLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
index d59f7bad26..0e30fd97b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 
 internal class DataSetOrganisationUnitLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetOrganisationUnitLinkStore,
     LinkStoreImpl<DataSetOrganisationUnitLink>(
         databaseAdapter,
         DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
         DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
         BINDER,
-        { cursor: Cursor -> DataSetOrganisationUnitLink.create(cursor) }
+        { cursor: Cursor -> DataSetOrganisationUnitLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
index 1505865a43..08ee72dd2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
@@ -47,8 +47,8 @@ import retrofit2.Retrofit
         SectionEntityDIModule::class,
         SectionIndicatorEntityDIModule::class,
         SectionDataElementEntityDIModule::class,
-        SectionGreyedFieldsEntityDIModule::class
-    ]
+        SectionGreyedFieldsEntityDIModule::class,
+    ],
 )
 internal class DataSetPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
index ed198eac98..397020c47a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 
 @Suppress("MagicNumber")
 internal class DataSetStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetStore,
     IdentifiableObjectStoreImpl<DataSet>(
         databaseAdapter,
         DataSetTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> DataSet.create(cursor) }
+        { cursor: Cursor -> DataSet.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt
index 7acae63564..411e335644 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo
 
 internal class SectionDataElementChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<Section, DataElement>
+    private val linkChildStore: LinkChildStore<Section, DataElement>,
 ) : ChildrenAppender<Section>() {
     override fun appendChildren(m: Section): Section {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class SectionDataElementChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementTableInfo.TABLE_INFO,
             SectionDataElementLinkTableInfo.Columns.SECTION,
-            SectionDataElementLinkTableInfo.Columns.DATA_ELEMENT
+            SectionDataElementLinkTableInfo.Columns.DATA_ELEMENT,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Section> {
@@ -59,8 +59,8 @@ internal class SectionDataElementChildrenAppender private constructor(
                 linkChildStore(
                     databaseAdapter,
                     SectionDataElementLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> DataElement.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> DataElement.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
index 8d7037a4de..2794548963 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataset.SectionDataElementLink
 
 internal class SectionDataElementLinkHandler(
-    store: SectionDataElementLinkStore
+    store: SectionDataElementLinkStore,
 ) : OrderedLinkHandlerImpl<DataElement, SectionDataElementLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
index 987b643027..664e0f78e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.dataset.SectionDataElementLink
 import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo
 
 internal class SectionDataElementLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SectionDataElementLinkStore,
     LinkStoreImpl<SectionDataElementLink>(
         databaseAdapter,
         SectionDataElementLinkTableInfo.TABLE_INFO,
         SectionDataElementLinkTableInfo.Columns.SECTION,
         BINDER,
-        { cursor: Cursor -> SectionDataElementLink.create(cursor) }
+        { cursor: Cursor -> SectionDataElementLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
index 9d9bf0d170..ce5cc1dcc3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
@@ -48,7 +48,7 @@ internal class SectionEntityDIModule {
         return mapOf(
             SectionFields.GREYED_FIELDS to SectionGreyedFieldsChildrenAppender.create(databaseAdapter),
             SectionFields.DATA_ELEMENTS to SectionDataElementChildrenAppender.create(databaseAdapter),
-            SectionFields.INDICATORS to SectionIndicatorsChildrenAppender.create(databaseAdapter)
+            SectionFields.INDICATORS to SectionIndicatorsChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt
index 98add1cbfa..ec1b784bf1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
 
 internal class SectionGreyedFieldsChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<Section, DataElementOperand>
+    private val linkChildStore: LinkChildStore<Section, DataElementOperand>,
 ) : ChildrenAppender<Section>() {
     override fun appendChildren(m: Section): Section {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class SectionGreyedFieldsChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementOperandTableInfo.TABLE_INFO,
             SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
-            SectionGreyedFieldsLinkTableInfo.Columns.DATA_ELEMENT_OPERAND
+            SectionGreyedFieldsLinkTableInfo.Columns.DATA_ELEMENT_OPERAND,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Section> {
@@ -59,8 +59,8 @@ internal class SectionGreyedFieldsChildrenAppender private constructor(
                 linkChildStore(
                     databaseAdapter,
                     SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> DataElementOperand.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> DataElementOperand.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
index 141c52a642..a239d50a56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
 
 internal class SectionGreyedFieldsLinkHandler(
-    store: SectionGreyedFieldsLinkStore
+    store: SectionGreyedFieldsLinkStore,
 ) : LinkHandlerImpl<DataElementOperand, SectionGreyedFieldsLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
index 9637c545bb..8bfecedef7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
 
 internal class SectionGreyedFieldsLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SectionGreyedFieldsLinkStore,
     LinkStoreImpl<SectionGreyedFieldsLink>(
         databaseAdapter,
         SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
         SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
         BINDER,
-        { cursor: Cursor -> SectionGreyedFieldsLink.create(cursor) }
+        { cursor: Cursor -> SectionGreyedFieldsLink.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: SectionGreyedFieldsLink, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
index 44ee0f5989..303e74ba2e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
@@ -40,6 +39,7 @@ import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionDataElementLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class SectionHandler @Inject constructor(
@@ -48,13 +48,13 @@ internal class SectionHandler @Inject constructor(
     private val greyedFieldsHandler: DataElementOperandHandler,
     private val sectionGreyedFieldsLinkHandler: SectionGreyedFieldsLinkHandler,
     private val sectionIndicatorLinkHandler: SectionIndicatorLinkHandler,
-    private val sectionGreyedFieldsStore: SectionGreyedFieldsLinkStore
+    private val sectionGreyedFieldsStore: SectionGreyedFieldsLinkStore,
 ) : IdentifiableHandlerImpl<Section>(sectionStore) {
 
     override fun afterObjectHandled(o: Section, action: HandleAction) {
         sectionDataElementLinkHandler.handleMany(
             o.uid(),
-            o.dataElements()
+            o.dataElements(),
         ) { dataElement: DataElement, sortOrder: Int ->
             SectionDataElementLink.builder()
                 .section(o.uid())
@@ -65,7 +65,7 @@ internal class SectionHandler @Inject constructor(
 
         sectionIndicatorLinkHandler.handleMany(
             o.uid(),
-            o.indicators()
+            o.indicators(),
         ) {
             SectionIndicatorLink.builder()
                 .section(o.uid())
@@ -78,13 +78,13 @@ internal class SectionHandler @Inject constructor(
         sectionGreyedFieldsStore.deleteWhere(
             WhereClauseBuilder().appendKeyStringValue(
                 SectionGreyedFieldsLinkTableInfo.Columns.SECTION,
-                o.uid()
-            ).build()
+                o.uid(),
+            ).build(),
         )
 
         sectionGreyedFieldsLinkHandler.handleMany(
             o.uid(),
-            o.greyedFields()
+            o.greyedFields(),
         ) { dataElementOperand: DataElementOperand ->
             SectionGreyedFieldsLink.builder()
                 .section(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
index 97c44e0415..9e24b31c0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.indicator.Indicator
 
 internal class SectionIndicatorLinkHandler(
-    store: SectionIndicatorLinkStore
+    store: SectionIndicatorLinkStore,
 ) : LinkHandlerImpl<Indicator, SectionIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
index ba2cfcb35f..5677874b69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
@@ -34,14 +34,14 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
 
 internal class SectionIndicatorLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SectionIndicatorLinkStore,
     LinkStoreImpl<SectionIndicatorLink>(
         databaseAdapter,
         SectionIndicatorLinkTableInfo.TABLE_INFO,
         SectionIndicatorLinkTableInfo.Columns.SECTION,
         BINDER,
-        { SectionIndicatorLink.create(it) }
+        { SectionIndicatorLink.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorsChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorsChildrenAppender.kt
index 9dacdb5861..3895d04905 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorsChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorsChildrenAppender.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo
 
 internal class SectionIndicatorsChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<Section, Indicator>
+    private val linkChildStore: LinkChildStore<Section, Indicator>,
 ) : ChildrenAppender<Section>() {
 
     override fun appendChildren(section: Section): Section {
@@ -52,15 +52,15 @@ internal class SectionIndicatorsChildrenAppender private constructor(
             val childProjection = LinkTableChildProjection(
                 IndicatorTableInfo.TABLE_INFO,
                 SectionIndicatorLinkTableInfo.Columns.SECTION,
-                SectionIndicatorLinkTableInfo.Columns.INDICATOR
+                SectionIndicatorLinkTableInfo.Columns.INDICATOR,
             )
 
             return SectionIndicatorsChildrenAppender(
                 linkChildStore(
                     databaseAdapter,
                     SectionIndicatorLinkTableInfo.TABLE_INFO,
-                    childProjection
-                ) { Indicator.create(it) }
+                    childProjection,
+                ) { Indicator.create(it) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
index 067fd6a0bb..023297032f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class SectionOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<DataSet, Section>(
     tableName = SectionTableInfo.TABLE_INFO.name(),
     parentColumn = SectionTableInfo.Columns.DATA_SET,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
index c0c3cc0664..a64824451f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.dataset.SectionTableInfo
 
 @Suppress("MagicNumber")
 internal class SectionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SectionStore,
     IdentifiableObjectStoreImpl<Section>(
         databaseAdapter,
         SectionTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Section.create(cursor) }
+        { cursor: Cursor -> Section.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<Section> = object : IdentifiableStatementBinder<Section>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
index 51750a635f..3ac77350ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.datastore
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
@@ -45,18 +44,19 @@ import org.hisp.dhis.android.core.common.DeletableColumns
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.internal.DataStoreEntryStore
 import org.hisp.dhis.android.core.datastore.internal.DataStorePostCall
+import javax.inject.Inject
 
 @Reusable
 class DataStoreCollectionRepository @Inject internal constructor(
     private val store: DataStoreEntryStore,
     private val call: DataStorePostCall,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataStoreEntry>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<DataStoreEntry, DataStoreCollectionRepository>(
     store,
     childrenAppenders,
     scope,
-    FilterConnectorFactory(scope) { s -> DataStoreCollectionRepository(store, call, childrenAppenders, s) }
+    FilterConnectorFactory(scope) { s -> DataStoreCollectionRepository(store, call, childrenAppenders, s) },
 ),
     ReadOnlyWithUploadCollectionRepository<DataStoreEntry> {
     override fun upload(): Observable<D2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
index 4e59b0b7fd..4f71bdfbfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
@@ -30,18 +30,18 @@ package org.hisp.dhis.android.core.datastore
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.datastore.internal.DataStoreDownloadCall
 import org.hisp.dhis.android.core.datastore.internal.DataStoreDownloadParams
+import javax.inject.Inject
 
 @Reusable
 class DataStoreDownloader @Inject internal constructor(
     private val call: DataStoreDownloadCall,
-    private val params: DataStoreDownloadParams
+    private val params: DataStoreDownloadParams,
 ) : BaseRepository {
     private val connectorFactory: ScopedFilterConnectorFactory<DataStoreDownloader, DataStoreDownloadParams> =
         ScopedFilterConnectorFactory { params ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt
index fd80854f44..198a43db22 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreEntryTableInfo.kt
@@ -54,7 +54,7 @@ object DataStoreEntryTableInfo {
                 KEY,
                 VALUE,
                 SYNC_STATE,
-                DELETED
+                DELETED,
             )
         }
 
@@ -62,7 +62,7 @@ object DataStoreEntryTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 NAMESPACE,
-                KEY
+                KEY,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
index 6601b278bb..a477aa32e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.datastore
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepo
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.State
+import javax.inject.Inject
 
 @Reusable
 class DataStoreObjectRepository @Inject internal constructor(
@@ -45,14 +45,14 @@ class DataStoreObjectRepository @Inject internal constructor(
     childrenAppenders: Map<String, ChildrenAppender<DataStoreEntry>>,
     scope: RepositoryScope,
     private val namespace: String,
-    private val key: String
+    private val key: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<DataStoreEntry, DataStoreObjectRepository>(
     store,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s ->
         DataStoreObjectRepository(store, childrenAppenders, s, namespace, key)
-    }
+    },
 ),
     ReadWriteValueObjectRepository<DataStoreEntry> {
     override fun set(value: String?): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreTableInfo.kt
index 37050e92bb..dbba269d4e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreTableInfo.kt
@@ -50,14 +50,14 @@ object LocalDataStoreTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 KEY,
-                VALUE
+                VALUE,
             )
         }
 
         override fun whereUpdate(): Array<String> {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
-                KEY
+                KEY,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
index 2874d65e08..8e046b04c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.datastore.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.rxObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -42,18 +41,19 @@ import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import javax.inject.Inject
 
 @Reusable
 internal class DataStoreDownloadCall @Inject constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataStoreEntryService: DataStoreService,
     private val dataStoreEntryHandler: DataStoreHandler,
-    private val versionManager: DHISVersionManager
+    private val versionManager: DHISVersionManager,
 ) {
     fun download(params: DataStoreDownloadParams): Observable<D2Progress> {
         return rxObservable {
             return@rxObservable coroutineAPICallExecutor.wrapTransactionally(
-                cleanForeignKeyErrors = true
+                cleanForeignKeyErrors = true,
             ) {
                 coroutineAPICallExecutor.wrap(storeError = false) {
                     dataStoreEntryService.getNamespaces()
@@ -68,7 +68,7 @@ internal class DataStoreDownloadCall @Inject constructor(
                             }
                             send(progressManager.increaseProgress(DataStoreEntry::class.java, isComplete = true))
                         },
-                        onFailure = { t -> throw t }
+                        onFailure = { t -> throw t },
                     )
             }
         }
@@ -125,7 +125,7 @@ internal class DataStoreDownloadCall @Inject constructor(
                 },
                 onFailure = { t ->
                     entries = Result.Failure(t)
-                }
+                },
             )
         } while (lastPage.size >= PAGE_SIZE && result.succeeded)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadParams.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadParams.kt
index 2c90f3d99f..92ab1e9a4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadParams.kt
@@ -31,5 +31,5 @@ package org.hisp.dhis.android.core.datastore.internal
 import org.hisp.dhis.android.core.arch.repositories.scope.BaseScope
 
 internal data class DataStoreDownloadParams(
-    val namespaces: List<String> = emptyList()
+    val namespaces: List<String> = emptyList(),
 ) : BaseScope
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
index 8c63917aed..8327c45b7a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
@@ -42,14 +42,14 @@ import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
 
 @Suppress("MagicNumber")
 internal class DataStoreEntryStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ObjectWithoutUidStoreImpl<DataStoreEntry>(
     databaseAdapter,
     DataStoreEntryTableInfo.TABLE_INFO,
     BINDER,
     WHERE_UPDATE_BINDER,
     WHERE_DELETE_BINDER,
-    { cursor: Cursor -> DataStoreEntry.create(cursor) }
+    { cursor: Cursor -> DataStoreEntry.create(cursor) },
 ),
     DataStoreEntryStore {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
index cbd51a55db..0e0b4764c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
 
 internal class DataStoreHandler constructor(
-    private val store: DataStoreEntryStore
+    private val store: DataStoreEntryStore,
 ) : LinkHandler<DataStoreEntry, DataStoreEntry>, HandlerBaseImpl<DataStoreEntry>() {
 
     override fun handleMany(
         masterUid: String,
         slaves: Collection<DataStoreEntry>?,
-        transformer: (DataStoreEntry) -> DataStoreEntry
+        transformer: (DataStoreEntry) -> DataStoreEntry,
     ) {
         val entriesToHandle = filterUnsycnedEntries(masterUid, slaves)
         handleMany(entriesToHandle)
@@ -61,14 +61,14 @@ internal class DataStoreHandler constructor(
 
     private fun filterUnsycnedEntries(
         namespace: String,
-        slaves: Collection<DataStoreEntry>?
+        slaves: Collection<DataStoreEntry>?,
     ): List<DataStoreEntry>? {
         return slaves?.let {
             val whereClause = WhereClauseBuilder().run {
                 appendKeyStringValue(DataStoreEntryTableInfo.Columns.NAMESPACE, namespace)
                 appendNotInKeyStringValues(
                     DataColumns.SYNC_STATE,
-                    listOf(State.SYNCED.name, State.SYNCED_VIA_SMS.name)
+                    listOf(State.SYNCED.name, State.SYNCED_VIA_SMS.name),
                 )
                 build()
             }
@@ -82,7 +82,7 @@ internal class DataStoreHandler constructor(
 
     private fun cleanOrphan(
         namespace: String,
-        slaves: Collection<DataStoreEntry>?
+        slaves: Collection<DataStoreEntry>?,
     ) {
         val notInSlaves = WhereClauseBuilder().run {
             appendKeyStringValue(DataStoreEntryTableInfo.Columns.NAMESPACE, namespace)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt
index b97c912dbb..ea2bdaa9e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.datastore.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
+import javax.inject.Inject
 
 @Reusable
 @Suppress("MagicNumber")
 internal class DataStoreImportHandler @Inject constructor(
-    private val store: DataStoreEntryStore
+    private val store: DataStoreEntryStore,
 ) {
 
     fun handleDelete(entry: DataStoreEntry, response: HttpMessageResponse) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt
index 0d4d8636e7..2e6532dc06 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.datastore.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.datastore.DataStoreCollectionRepository
 import org.hisp.dhis.android.core.datastore.DataStoreDownloader
 import org.hisp.dhis.android.core.datastore.DataStoreModule
 import org.hisp.dhis.android.core.datastore.LocalDataStoreCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 class DataStoreModuleImpl @Inject internal constructor(
     private val localDataStore: LocalDataStoreCollectionRepository,
     private val dataStoreEntryCollectionRepository: DataStoreCollectionRepository,
-    private val dataStoreDownloader: DataStoreDownloader
+    private val dataStoreDownloader: DataStoreDownloader,
 ) : DataStoreModule {
     override fun localDataStore(): LocalDataStoreCollectionRepository {
         return localDataStore
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt
index cea3df5ffd..7e3b6af0e3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.datastore.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
 import org.hisp.dhis.android.core.datastore.LocalDataStoreTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class DataStoreModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
@@ -43,7 +43,7 @@ class DataStoreModuleWiper @Inject internal constructor(private val tableWiper:
     override fun wipeData() {
         tableWiper.wipeTables(
             LocalDataStoreTableInfo.TABLE_INFO,
-            DataStoreEntryTableInfo.TABLE_INFO
+            DataStoreEntryTableInfo.TABLE_INFO,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt
index 516a5ceed3..acc5eb865e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.datastore.DataStoreModule
 @Module(
     includes = [
         DataStoreEntityDIModule::class,
-        LocalDataStoreEntityDIModule::class
-    ]
+        LocalDataStoreEntityDIModule::class,
+    ],
 )
 class DataStorePackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePagedEntry.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePagedEntry.kt
index 00fcb20e91..b37986fe70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePagedEntry.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePagedEntry.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.api.payload.internal.Pager
 
 internal data class DataStorePagedEntry(
     val pager: Pager,
-    val entries: List<DataStorePageEntryItem>
+    val entries: List<DataStorePageEntryItem>,
 )
 
 internal data class DataStorePageEntryItem(val key: String, val value: Any?)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt
index a47d86999d..1cf1527219 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.datastore.internal
 import com.fasterxml.jackson.databind.JsonNode
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.rxObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -43,6 +42,7 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
+import javax.inject.Inject
 
 @Reusable
 @Suppress("MagicNumber")
@@ -50,7 +50,7 @@ internal class DataStorePostCall @Inject constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataStoreEntryService: DataStoreService,
     private val dataStoreEntryImportHandler: DataStoreImportHandler,
-    private val store: DataStoreEntryStore
+    private val store: DataStoreEntryStore,
 ) {
     fun uploadDataStoreEntries(entries: List<DataStoreEntry>): Observable<D2Progress> {
         return Observable.defer {
@@ -84,14 +84,14 @@ internal class DataStorePostCall @Inject constructor(
         val result = coroutineAPICallExecutor.wrap(
             storeError = false,
             acceptedErrorCodes = listOf(404),
-            errorClass = HttpMessageResponse::class.java
+            errorClass = HttpMessageResponse::class.java,
         ) {
             dataStoreEntryService.deleteNamespaceKeyValue(entry.namespace(), entry.key())
         }
 
         result.fold(
             onSuccess = { r -> dataStoreEntryImportHandler.handleDelete(entry, r) },
-            onFailure = { t -> store.setStateIfUploading(entry, forcedOrOwn(entry, errorIfOnline(t))) }
+            onFailure = { t -> store.setStateIfUploading(entry, forcedOrOwn(entry, errorIfOnline(t))) },
         )
     }
 
@@ -115,7 +115,7 @@ internal class DataStorePostCall @Inject constructor(
 
         result.fold(
             onSuccess = { r -> dataStoreEntryImportHandler.handleUpdateOrCreate(entry, r) },
-            onFailure = { t -> store.setStateIfUploading(entry, forcedOrOwn(entry, errorIfOnline(t))) }
+            onFailure = { t -> store.setStateIfUploading(entry, forcedOrOwn(entry, errorIfOnline(t))) },
         )
     }
 
@@ -123,7 +123,7 @@ internal class DataStorePostCall @Inject constructor(
         return coroutineAPICallExecutor.wrap(
             storeError = false,
             acceptedErrorCodes = listOf(409),
-            errorClass = HttpMessageResponse::class.java
+            errorClass = HttpMessageResponse::class.java,
         ) {
             dataStoreEntryService.postNamespaceKeyValue(entry.namespace(), entry.key(), readValue(entry))
         }
@@ -133,7 +133,7 @@ internal class DataStorePostCall @Inject constructor(
         return coroutineAPICallExecutor.wrap(
             storeError = false,
             acceptedErrorCodes = listOf(404),
-            errorClass = HttpMessageResponse::class.java
+            errorClass = HttpMessageResponse::class.java,
         ) {
             dataStoreEntryService.putNamespaceKeyValue(entry.namespace(), entry.key(), readValue(entry))
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt
index 86119f0989..d68eacd74c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt
@@ -36,7 +36,7 @@ internal interface DataStoreService {
 
     @GET("$DATA_STORE/{$NAMESPACE}")
     suspend fun getNamespaceKeys(
-        @Path(NAMESPACE) namespace: String
+        @Path(NAMESPACE) namespace: String,
     ): List<String>
 
     @GET("$DATA_STORE/{$NAMESPACE}")
@@ -44,33 +44,33 @@ internal interface DataStoreService {
         @Path(NAMESPACE) namespace: String,
         @Query("page") page: Int,
         @Query("pageSize") pageSize: Int,
-        @Query("fields") fields: String = "."
+        @Query("fields") fields: String = ".",
     ): DataStorePagedEntry
 
     @GET("$DATA_STORE/{$NAMESPACE}/{$KEY}")
     suspend fun getNamespaceKeyValue(
         @Path(NAMESPACE) namespace: String,
-        @Path(KEY) key: String
+        @Path(KEY) key: String,
     ): Any
 
     @POST("$DATA_STORE/{$NAMESPACE}/{$KEY}")
     suspend fun postNamespaceKeyValue(
         @Path(NAMESPACE) namespace: String,
         @Path(KEY) key: String,
-        @Body value: Any?
+        @Body value: Any?,
     ): HttpMessageResponse
 
     @PUT("$DATA_STORE/{$NAMESPACE}/{$KEY}")
     suspend fun putNamespaceKeyValue(
         @Path(NAMESPACE) namespace: String,
         @Path(KEY) key: String,
-        @Body value: Any?
+        @Body value: Any?,
     ): HttpMessageResponse
 
     @DELETE("$DATA_STORE/{$NAMESPACE}/{$KEY}")
     suspend fun deleteNamespaceKeyValue(
         @Path(NAMESPACE) namespace: String,
-        @Path(KEY) key: String
+        @Path(KEY) key: String,
     ): HttpMessageResponse
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
index 836fe2eac2..7e39ffda67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.datastore.LocalDataStoreTableInfo
 
 @Suppress("MagicNumber")
 internal class LocalDataStoreStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : LocalDataStoreStore,
     ObjectWithoutUidStoreImpl<KeyValuePair>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class LocalDataStoreStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> KeyValuePair.create(cursor) }
+        { cursor: Cursor -> KeyValuePair.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueByDataSetQueryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueByDataSetQueryHelper.kt
index ebd8b0174d..bf6266979f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueByDataSetQueryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueByDataSetQueryHelper.kt
@@ -61,14 +61,14 @@ internal object DataValueByDataSetQueryHelper {
     val dataValueKey = buildKey(
         DataValueTableInfo.Columns.DATA_ELEMENT,
         DataValueTableInfo.Columns.CATEGORY_OPTION_COMBO,
-        DataValueTableInfo.Columns.ATTRIBUTE_OPTION_COMBO
+        DataValueTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
     )
 
     @JvmStatic
     val dataValueConflictKey = buildKey(
         DataValueConflictTableInfo.Columns.DATA_ELEMENT,
         DataValueConflictTableInfo.Columns.CATEGORY_OPTION_COMBO,
-        DataValueConflictTableInfo.Columns.ATTRIBUTE_OPTION_COMBO
+        DataValueConflictTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
     )
 
     @JvmStatic
@@ -103,7 +103,7 @@ internal object DataValueByDataSetQueryHelper {
     private fun buildKey(
         dataElementTag: String,
         categoryOptionComboTag: String,
-        attributeOptionComboTag: String
+        attributeOptionComboTag: String,
     ): String {
         return "$dataElementTag || '.' || $categoryOptionComboTag || '.' || $attributeOptionComboTag"
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
index 6e6d8fd6bb..f257c89997 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.datavalue
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asObservable
@@ -45,6 +44,7 @@ import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.operat
 import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
 import org.hisp.dhis.android.core.datavalue.internal.DataValuePostCall
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
+import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
 @Reusable
@@ -52,14 +52,14 @@ class DataValueCollectionRepository @Inject internal constructor(
     private val store: DataValueStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataValue>>,
     scope: RepositoryScope,
-    private val postCall: DataValuePostCall
+    private val postCall: DataValuePostCall,
 ) : ReadOnlyCollectionRepositoryImpl<DataValue, DataValueCollectionRepository>(
     store,
     childrenAppenders,
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
         DataValueCollectionRepository(store, childrenAppenders, s, postCall)
-    }
+    },
 ),
     ReadOnlyWithUploadCollectionRepository<DataValue> {
 
@@ -78,7 +78,7 @@ class DataValueCollectionRepository @Inject internal constructor(
         organisationUnit: String,
         dataElement: String,
         categoryOptionCombo: String,
-        attributeOptionCombo: String
+        attributeOptionCombo: String,
     ): DataValueObjectRepository {
         val updatedScope = byPeriod().eq(period)
             .byOrganisationUnitUid().eq(organisationUnit)
@@ -93,7 +93,7 @@ class DataValueCollectionRepository @Inject internal constructor(
             organisationUnit,
             dataElement,
             categoryOptionCombo,
-            attributeOptionCombo
+            attributeOptionCombo,
         )
     }
 
@@ -125,7 +125,7 @@ class DataValueCollectionRepository @Inject internal constructor(
         return cf.subQuery(dataValueKey)
             .rawSubQuery(
                 operator,
-                whereClause(dataSetUid!!)
+                whereClause(dataSetUid!!),
             )!!
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictTableInfo.kt
index 4b8056aeb3..b12f36968f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictTableInfo.kt
@@ -59,7 +59,7 @@ object DataValueConflictTableInfo {
                 ERROR_CODE,
                 DISPLAY_DESCRIPTION,
                 STATUS,
-                CREATED
+                CREATED,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
index d7416932b1..2362bb9cc2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedUids
 import org.hisp.dhis.android.core.datavalue.DataValue
+import javax.inject.Inject
 
 @Reusable
 internal class DataValueCall @Inject constructor(
     private val service: DataValueService,
     private val handler: DataValueHandler,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : QueryCall<DataValue, DataValueQuery> {
 
     override suspend fun download(query: DataValueQuery): List<DataValue> {
@@ -53,7 +53,7 @@ internal class DataValueCall @Inject constructor(
                 orgUnitUids = commaSeparatedCollectionValues(b.rootOrganisationUnitUids),
                 children = true,
                 paging = false,
-                includeDeleted = true
+                includeDeleted = true,
             ).dataValues
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
index 48fcb359fa..18cb3328ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.dataset.internal.DataSetStore
 import org.hisp.dhis.android.core.datavalue.DataValue
@@ -42,27 +41,28 @@ import org.hisp.dhis.android.core.datavalue.internal.conflicts.PeriodAfterLatest
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import javax.inject.Inject
 
 @Reusable
 internal class DataValueConflictParser @Inject constructor(
     dataElementStore: DataElementStore,
     dataValueStore: DataValueStore,
     dataSetStore: DataSetStore,
-    val versionManager: DHISVersionManager
+    val versionManager: DHISVersionManager,
 ) {
 
     private val conflicts = listOf(
         InvalidDataElementTypeConflict(dataElementStore),
         InvalidDataElementType37Conflict(dataElementStore),
         PastExpiryDateConflict(dataValueStore, dataSetStore),
-        PeriodAfterLatestOpenFutureConflict(dataElementStore)
+        PeriodAfterLatestOpenFutureConflict(dataElementStore),
     )
 
     private val indexedDataValueConflict = IndexedDataValueConflict()
 
     fun getDataValueConflicts(
         conflict: ImportConflict,
-        dataValues: List<DataValue>
+        dataValues: List<DataValue>,
     ): List<DataValueConflict> {
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_37)) {
             indexedDataValueConflict.getDataValues(conflict, dataValues)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
index 2d3e48a50f..7d829ea56d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
@@ -37,13 +37,13 @@ import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 
 @Suppress("MagicNumber")
 internal class DataValueConflictStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataValueConflictStore,
     ObjectStoreImpl<DataValueConflict>(
         databaseAdapter,
         DataValueConflictTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> DataValueConflict.create(cursor) }
+        { cursor: Cursor -> DataValueConflict.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder<DataValueConflict> { o, w ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
index 22fb7af1aa..02c2efb1ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceHelper
 import org.hisp.dhis.android.core.fileresource.internal.FileResourcePostCall
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceValue
+import javax.inject.Inject
 
 @Reusable
 internal class DataValueFileResourcePostCall @Inject constructor(
     private val fileResourceHelper: FileResourceHelper,
-    private val fileResourcePostCall: FileResourcePostCall
+    private val fileResourcePostCall: FileResourcePostCall,
 ) {
     suspend fun uploadFileResource(dataValues: List<DataValue>): DataValueFileResourcePostCallResult {
         val fileResources = fileResourceHelper.getUploadableFileResources()
@@ -69,5 +69,5 @@ internal class DataValueFileResourcePostCall @Inject constructor(
 
 internal data class DataValueFileResourcePostCallResult(
     val dataValues: List<DataValue>,
-    val fileResources: List<String>
+    val fileResources: List<String>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
index e29c1830bb..09ab327901 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import java.util.Arrays
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
@@ -36,9 +35,10 @@ import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
+import java.util.Arrays
 
 internal class DataValueHandler(
-    store: ObjectWithoutUidStore<DataValue>
+    store: ObjectWithoutUidStore<DataValue>,
 ) : ObjectWithoutUidHandlerImpl<DataValue>(store) {
     override fun deleteOrPersist(o: DataValue): HandleAction {
         return if (CollectionsHelper.isDeleted(o)) {
@@ -85,7 +85,7 @@ internal class DataValueHandler(
             val whereClause = WhereClauseBuilder()
                 .appendNotInKeyStringValues(
                     DataValueTableInfo.Columns.SYNC_STATE,
-                    Arrays.asList(State.SYNCED.name, State.SYNCED_VIA_SMS.name)
+                    Arrays.asList(State.SYNCED.name, State.SYNCED_VIA_SMS.name),
                 )
                 .build()
             return store.selectWhere(whereClause)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
index 6aa97dbf9e..c09e389fd2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.State.ERROR
@@ -40,17 +39,18 @@ import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import javax.inject.Inject
 
 @Reusable
 internal class DataValueImportHandler @Inject constructor(
     private val dataValueStore: DataValueStore,
     private val dataValueConflictParser: DataValueConflictParser,
-    private val dataValueConflictStore: DataValueConflictStore
+    private val dataValueConflictStore: DataValueConflictStore,
 ) {
 
     fun handleImportSummary(
         dataValueSet: DataValueSet?,
-        dataValueImportSummary: DataValueImportSummary?
+        dataValueImportSummary: DataValueImportSummary?,
     ) {
         if (dataValueSet == null || dataValueImportSummary == null) {
             return
@@ -76,23 +76,23 @@ internal class DataValueImportHandler @Inject constructor(
             val whereClause = WhereClauseBuilder()
                 .appendKeyStringValue(
                     DataValueConflictTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
-                    dataValue.attributeOptionCombo()
+                    dataValue.attributeOptionCombo(),
                 )
                 .appendKeyStringValue(
                     DataValueConflictTableInfo.Columns.CATEGORY_OPTION_COMBO,
-                    dataValue.categoryOptionCombo()
+                    dataValue.categoryOptionCombo(),
                 )
                 .appendKeyStringValue(
                     DataValueConflictTableInfo.Columns.DATA_ELEMENT,
-                    dataValue.dataElement()
+                    dataValue.dataElement(),
                 )
                 .appendKeyStringValue(
                     DataValueConflictTableInfo.Columns.PERIOD,
-                    dataValue.period()
+                    dataValue.period(),
                 )
                 .appendKeyStringValue(
                     DataValueConflictTableInfo.Columns.ORG_UNIT,
-                    dataValue.organisationUnit()
+                    dataValue.organisationUnit(),
                 ).build()
             dataValueConflictStore.deleteWhereIfExists(whereClause)
         }
@@ -100,11 +100,11 @@ internal class DataValueImportHandler @Inject constructor(
 
     private fun handleDataValueWarnings(
         dataValues: List<DataValue>,
-        dataValueImportSummary: DataValueImportSummary
+        dataValueImportSummary: DataValueImportSummary,
     ) {
         getValuesWithConflicts(
             dataValues,
-            dataValueImportSummary.importConflicts()
+            dataValueImportSummary.importConflicts(),
         )?.let { dataValueConflicts ->
             setDataValueStates(dataValues, dataValueConflicts)
         } ?: setStateToDataValues(WARNING, dataValues)
@@ -112,7 +112,7 @@ internal class DataValueImportHandler @Inject constructor(
 
     private fun getValuesWithConflicts(
         dataValues: List<DataValue>,
-        importConflicts: List<ImportConflict>?
+        importConflicts: List<ImportConflict>?,
     ): Set<DataValue>? {
         val dataValueImportConflicts: MutableList<DataValueConflict> = mutableListOf()
         importConflicts?.forEach { importConflict ->
@@ -141,7 +141,7 @@ internal class DataValueImportHandler @Inject constructor(
 
     private fun setDataValueStates(
         dataValues: List<DataValue>,
-        dataValueConflicts: Set<DataValue>
+        dataValueConflicts: Set<DataValue>,
     ) {
         val syncedValues = dataValues.filter { dataValue ->
             !dataValueConflicts.contains(dataValue)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt
index ef75279da6..dc82d657f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataSyncTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class DataValueModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
@@ -45,7 +45,7 @@ class DataValueModuleWiper @Inject internal constructor(private val tableWiper:
         tableWiper.wipeTables(
             DataValueTableInfo.TABLE_INFO,
             AggregatedDataSyncTableInfo.TABLE_INFO,
-            DataValueConflictTableInfo.TABLE_INFO
+            DataValueConflictTableInfo.TABLE_INFO,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index d9ed78367c..8ac463eb24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import dagger.Reusable
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -45,6 +43,8 @@ import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResp
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class DataValuePostCall @Inject constructor(
@@ -53,7 +53,7 @@ internal class DataValuePostCall @Inject constructor(
     private val fileResourcePostCall: DataValueFileResourcePostCall,
     private val dataValueStore: DataValueStore,
     private val versionManager: DHISVersionManager,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
     fun uploadDataValues(dataValues: List<DataValue>): Flow<D2Progress> = flow {
         if (dataValues.isEmpty()) {
@@ -73,7 +73,7 @@ internal class DataValuePostCall @Inject constructor(
                 },
                 onFailure = {
                     throw it
-                }
+                },
             )
         } catch (e: D2Error) {
             markObjectsAs(validDataValues, errorIfOnline(e))
@@ -88,7 +88,7 @@ internal class DataValuePostCall @Inject constructor(
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
             coroutineAPICallExecutor.wrap(
                 acceptedErrorCodes = listOf(HttpURLConnection.HTTP_CONFLICT),
-                errorClass = DataValueImportSummaryWebResponse::class.java
+                errorClass = DataValueImportSummaryWebResponse::class.java,
             ) {
                 dataValueService.postDataValuesWebResponse(dataValueSet)
             }.map { it.response }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt
index 06f71f8e43..1b433aa2a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueQuery.kt
@@ -31,9 +31,9 @@ import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataCallBundle
 
 internal data class DataValueQuery(
-    val bundle: AggregatedDataCallBundle
+    val bundle: AggregatedDataCallBundle,
 ) : BaseQueryKt(
     page = 1,
     pageSize = DEFAULT_PAGE_SIZE,
-    paging = false
+    paging = false,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
index 0e3ac8deba..6757d03549 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueService.kt
@@ -49,7 +49,7 @@ internal interface DataValueService {
         @Query("orgUnit") orgUnitUids: String,
         @Query("children") children: Boolean,
         @Query("paging") paging: Boolean,
-        @Query("includeDeleted") includeDeleted: Boolean?
+        @Query("includeDeleted") includeDeleted: Boolean?,
     ): DataValueSet
 
     @POST("dataValueSets")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
index d380c058c2..ac01b39a0a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
@@ -41,7 +41,7 @@ import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereC
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 
 internal class DataValueStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataValueStore,
     ObjectWithoutUidStoreImpl<DataValue>(
         databaseAdapter,
@@ -49,7 +49,7 @@ internal class DataValueStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor? -> DataValue.create(cursor) }
+        { cursor: Cursor? -> DataValue.create(cursor) },
     ) {
 
     override fun getDataValuesWithState(state: State): Collection<DataValue> {
@@ -98,7 +98,7 @@ internal class DataValueStoreImpl(
         val whereClauseBuilder = uniqueWhereClauseBuilder(dataValue)
             .appendInSubQuery(
                 dataValueKey,
-                whereClause(dataSetUid)
+                whereClause(dataSetUid),
             )
         return selectWhere(whereClauseBuilder.build()).isNotEmpty()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictItem.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictItem.kt
index 18c9c79966..2b7861729c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictItem.kt
@@ -28,11 +28,11 @@
 
 package org.hisp.dhis.android.core.datavalue.internal.conflicts
 
-import java.util.Date
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import java.util.Date
 
 internal interface DataValueImportConflictItem {
 
@@ -41,7 +41,7 @@ internal interface DataValueImportConflictItem {
     fun getConflictBuilder(
         dataValue: DataValue,
         conflict: ImportConflict,
-        displayDescription: String
+        displayDescription: String,
     ): DataValueConflict.Builder {
         return DataValueConflict.builder()
             .conflict(conflict.value())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflict.kt
index 15b048f11b..5fc8db9fbf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflict.kt
@@ -39,7 +39,7 @@ internal class IndexedDataValueConflict : DataValueImportConflictItem {
             getConflictBuilder(
                 dataValue = dataValues[it],
                 conflict = conflict,
-                displayDescription = conflict.value() // TODO Add interpreters for translations
+                displayDescription = conflict.value(), // TODO Add interpreters for translations
             ).build()
         }.orEmpty()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt
index cfca82ed47..f6f3bcb54e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt
@@ -28,15 +28,15 @@
 
 package org.hisp.dhis.android.core.datavalue.internal.conflicts
 
-import java.util.ArrayList
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import java.util.ArrayList
 
 internal class InvalidDataElementType37Conflict(
-    dataElementStore: IdentifiableObjectStore<DataElement>
+    dataElementStore: IdentifiableObjectStore<DataElement>,
 ) : InvalidDataElementTypeConflict(dataElementStore) {
 
     override val regex: Regex
@@ -54,9 +54,9 @@ internal class InvalidDataElementType37Conflict(
                         displayDescription = getDisplayDescription(
                             conflict,
                             dataValue.value() ?: "",
-                            dataValue.dataElement()
-                        )
-                    ).build()
+                            dataValue.dataElement(),
+                        ),
+                    ).build(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt
index 56ad46bfd7..eaf5ca1690 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt
@@ -28,15 +28,15 @@
 
 package org.hisp.dhis.android.core.datavalue.internal.conflicts
 
-import java.util.ArrayList
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import java.util.ArrayList
 
 internal open class InvalidDataElementTypeConflict(
-    private val dataElementStore: IdentifiableObjectStore<DataElement>
+    private val dataElementStore: IdentifiableObjectStore<DataElement>,
 ) : LegacyDataValueImportConflictItem {
 
     override val regex: Regex
@@ -52,8 +52,8 @@ internal open class InvalidDataElementTypeConflict(
                     getConflictBuilder(
                         dataValue = dataValue,
                         conflict = conflict,
-                        displayDescription = getDisplayDescription(conflict, value, dataValue.dataElement())
-                    ).build()
+                        displayDescription = getDisplayDescription(conflict, value, dataValue.dataElement()),
+                    ).build(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt
index 8b96886a92..de858b4995 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PastExpiryDateConflict.kt
@@ -28,17 +28,17 @@
 
 package org.hisp.dhis.android.core.datavalue.internal.conflicts
 
-import java.util.ArrayList
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import java.util.ArrayList
 
 internal class PastExpiryDateConflict(
     private val dataValueStore: DataValueStore,
-    private val dataSetStore: IdentifiableObjectStore<DataSet>
+    private val dataSetStore: IdentifiableObjectStore<DataSet>,
 ) : LegacyDataValueImportConflictItem {
 
     override val regex: Regex
@@ -56,8 +56,8 @@ internal class PastExpiryDateConflict(
                     getConflictBuilder(
                         dataValue = dataValue,
                         conflict = conflict,
-                        displayDescription = getDisplayDescription(conflict, dataValue, dataSetUid)
-                    ).build()
+                        displayDescription = getDisplayDescription(conflict, dataValue, dataSetUid),
+                    ).build(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflict.kt
index 3e95561dd1..0a6e2cca8d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflict.kt
@@ -28,16 +28,16 @@
 
 package org.hisp.dhis.android.core.datavalue.internal.conflicts
 
-import java.util.ArrayList
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import java.util.ArrayList
 
 @Suppress("MagicNumber")
 internal class PeriodAfterLatestOpenFutureConflict(
-    private val dataElementStore: IdentifiableObjectStore<DataElement>
+    private val dataElementStore: IdentifiableObjectStore<DataElement>,
 ) : LegacyDataValueImportConflictItem {
 
     override val regex: Regex
@@ -53,8 +53,8 @@ internal class PeriodAfterLatestOpenFutureConflict(
                     getConflictBuilder(
                         dataValue = dataValue,
                         conflict = conflict,
-                        displayDescription = getDisplayDescription(conflict, period, dataValue.dataElement())
-                    ).build()
+                        displayDescription = getDisplayDescription(conflict, period, dataValue.dataElement()),
+                    ).build(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index 0a15643351..69b6210343 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -51,6 +50,7 @@ import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -64,7 +64,7 @@ internal class AggregatedDataCall @Inject constructor(
     private val aggregatedDataSyncStore: AggregatedDataSyncStore,
     private val aggregatedDataCallBundleFactory: AggregatedDataCallBundleFactory,
     private val resourceHandler: ResourceHandler,
-    private val hashHelper: AggregatedDataSyncHashHelper
+    private val hashHelper: AggregatedDataSyncHashHelper,
 ) {
     fun download(): Flow<AggregatedD2Progress> = flow {
         val progressManager = AggregatedD2ProgressManager(null)
@@ -73,7 +73,7 @@ internal class AggregatedDataCall @Inject constructor(
     }
 
     private fun selectDataSetsAndDownload(
-        progressManager: AggregatedD2ProgressManager
+        progressManager: AggregatedD2ProgressManager,
     ): Flow<AggregatedD2Progress> {
         return flow {
             val bundles = aggregatedDataCallBundleFactory.bundles
@@ -98,7 +98,7 @@ internal class AggregatedDataCall @Inject constructor(
     }
 
     private suspend fun downloadBundle(
-        bundle: AggregatedDataCallBundle
+        bundle: AggregatedDataCallBundle,
     ) {
         return try {
             coroutineCallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
@@ -112,27 +112,27 @@ internal class AggregatedDataCall @Inject constructor(
     }
 
     private suspend fun downloadDataValues(
-        bundle: AggregatedDataCallBundle
+        bundle: AggregatedDataCallBundle,
     ): List<DataValue> {
         val dataValueQuery = DataValueQuery(bundle)
         return dataValueCall.download(dataValueQuery)
     }
 
     private suspend fun downloadCompleteRegistration(
-        bundle: AggregatedDataCallBundle
+        bundle: AggregatedDataCallBundle,
     ): List<DataSetCompleteRegistration> {
         val completeRegistrationQuery = DataSetCompleteRegistrationQuery(
             dataSetUids = getUids(bundle.dataSets),
             periodIds = bundle.periodIds,
             rootOrgUnitUids = bundle.rootOrganisationUnitUids,
-            lastUpdatedStr = bundle.key.lastUpdatedStr()
+            lastUpdatedStr = bundle.key.lastUpdatedStr(),
         )
 
         return dsCompleteRegistrationCall.download(completeRegistrationQuery)
     }
 
     private fun updateAggregatedDataSync(
-        bundle: AggregatedDataCallBundle
+        bundle: AggregatedDataCallBundle,
     ) {
         for (dataSet in bundle.dataSets) {
             aggregatedDataSyncStore.updateOrInsertWhere(
@@ -144,13 +144,13 @@ internal class AggregatedDataCall @Inject constructor(
                     .dataElementsHash(hashHelper.getDataSetDataElementsHash(dataSet))
                     .organisationUnitsHash(bundle.allOrganisationUnitUidsSet.hashCode())
                     .lastUpdated(resourceHandler.serverDate)
-                    .build()
+                    .build(),
             )
         }
     }
 
     private suspend fun downloadApproval(
-        bundle: AggregatedDataCallBundle
+        bundle: AggregatedDataCallBundle,
     ): List<DataApproval> {
         val dataSetsWithWorkflow = bundle.dataSets.filter { it.workflow() != null }
         val workflowUids = dataSetsWithWorkflow.mapNotNull { it.workflow()?.uid() }
@@ -164,7 +164,7 @@ internal class AggregatedDataCall @Inject constructor(
                 organisationUnistUids = bundle.allOrganisationUnitUidsSet,
                 periodIds = bundle.periodIds,
                 attributeOptionCombosUids = attributeOptionComboUids,
-                lastUpdatedStr = bundle.key.lastUpdatedStr()
+                lastUpdatedStr = bundle.key.lastUpdatedStr(),
             )
             dataApprovalCall.download(dataApprovalQuery)
         }
@@ -176,7 +176,7 @@ internal class AggregatedDataCall @Inject constructor(
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 CategoryOptionComboTableInfo.Columns.CATEGORY_COMBO,
-                categoryComboUids
+                categoryComboUids,
             ).build()
 
         return categoryOptionComboStore.selectWhere(whereClause).map { it.uid() }.toSet()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundle.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundle.kt
index 743b58b63b..601337e2dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundle.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundle.kt
@@ -34,5 +34,5 @@ data class AggregatedDataCallBundle(
     val dataSets: List<DataSet>,
     val periodIds: List<String>,
     val rootOrganisationUnitUids: Collection<String>,
-    val allOrganisationUnitUidsSet: Collection<String>
+    val allOrganisationUnitUidsSet: Collection<String>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
index 71d650148f..b4e10c75d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.period.internal.PeriodForDataSetManager
 import org.hisp.dhis.android.core.settings.DataSetSetting
 import org.hisp.dhis.android.core.settings.DataSetSettings
 import org.hisp.dhis.android.core.settings.DataSetSettingsObjectRepository
+import javax.inject.Inject
 
 @Reusable
 internal class AggregatedDataCallBundleFactory @Inject constructor(
@@ -46,7 +46,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
     private val dataSetSettingsObjectRepository: DataSetSettingsObjectRepository,
     private val periodManager: PeriodForDataSetManager,
     private val aggregatedDataSyncStore: AggregatedDataSyncStore,
-    private val lastUpdatedCalculator: AggregatedDataSyncLastUpdatedCalculator
+    private val lastUpdatedCalculator: AggregatedDataSyncLastUpdatedCalculator,
 ) {
     val bundles: List<AggregatedDataCallBundle>
         get() {
@@ -62,7 +62,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
                 dataSetSettingsObjectRepository.blockingGet(),
                 rootOrganisationUnitUids,
                 HashSet(allOrganisationUnitUids),
-                syncValuesByDataSetUid
+                syncValuesByDataSetUid,
             )
         }
 
@@ -77,7 +77,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
         dataSetSettings: DataSetSettings?,
         rootOrganisationUnitUids: List<String>,
         allOrganisationUnitUids: Set<String>,
-        syncValues: Map<String, AggregatedDataSync>
+        syncValues: Map<String, AggregatedDataSync>,
     ): List<AggregatedDataCallBundle> {
         val organisationUnitsHash = allOrganisationUnitUids.hashCode()
         val keyDataSetMap = dataSets.groupBy { getBundleKey(dataSetSettings, it, syncValues, organisationUnitsHash) }
@@ -86,7 +86,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
             val periods = periodManager.getPeriodsInRange(
                 key.periodType,
                 -key.pastPeriods,
-                key.futurePeriods
+                key.futurePeriods,
             )
             if (periods.isNotEmpty()) {
                 val periodIds = selectPeriodIds(periods)
@@ -95,7 +95,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
                     dataSets,
                     periodIds,
                     rootOrganisationUnitUids,
-                    allOrganisationUnitUids
+                    allOrganisationUnitUids,
                 )
             } else {
                 null
@@ -107,7 +107,7 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
         dataSetSettings: DataSetSettings?,
         dataSet: DataSet,
         syncValues: Map<String, AggregatedDataSync>,
-        organisationUnitsHash: Int
+        organisationUnitsHash: Int,
     ): AggregatedDataCallBundleKey {
         val pastPeriods = getPastPeriods(dataSetSettings, dataSet)
         val futurePeriods = if (dataSet.openFuturePeriods() == null) 1 else dataSet.openFuturePeriods()!!
@@ -122,8 +122,8 @@ internal class AggregatedDataCallBundleFactory @Inject constructor(
                 dataSet,
                 pastPeriods,
                 futurePeriods,
-                organisationUnitsHash
-            )
+                organisationUnitsHash,
+            ),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleKey.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleKey.kt
index dae25f5151..00243d6833 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleKey.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleKey.kt
@@ -27,15 +27,15 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.period.PeriodType
+import java.util.*
 
 data class AggregatedDataCallBundleKey(
     val periodType: PeriodType,
     val pastPeriods: Int,
     val futurePeriods: Int,
-    val lastUpdated: Date?
+    val lastUpdated: Date?,
 ) {
     fun lastUpdatedStr(): String? {
         return lastUpdated?.let { DateUtils.DATE_FORMAT.format(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
index 76bdf49f18..72354ad966 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
@@ -30,14 +30,14 @@ package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class AggregatedDataDownloaderImpl @Inject constructor(
-    private val dataCall: AggregatedDataCall
+    private val dataCall: AggregatedDataCall,
 ) : AggregatedDataDownloader {
 
     override fun download(): Observable<AggregatedD2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt
index 4d4c3f80bd..a7b0e6227c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt
@@ -28,8 +28,8 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.dataset.DataSet
+import javax.inject.Inject
 
 @Reusable
 internal class AggregatedDataSyncHashHelper @Inject constructor() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt
index 5c1285d16c..ace66dc0af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.dataset.DataSet
 import java.util.*
 import javax.inject.Inject
-import org.hisp.dhis.android.core.dataset.DataSet
 
 @Reusable
 internal class AggregatedDataSyncLastUpdatedCalculator @Inject constructor(
-    private val hashHelper: AggregatedDataSyncHashHelper
+    private val hashHelper: AggregatedDataSyncHashHelper,
 ) {
 
     @Suppress("ComplexCondition")
@@ -43,7 +43,7 @@ internal class AggregatedDataSyncLastUpdatedCalculator @Inject constructor(
         dataSet: DataSet,
         pastPeriods: Int,
         futurePeriods: Int,
-        organisationUnitHash: Int
+        organisationUnitHash: Int,
     ): Date? {
         return if (
             syncValue == null ||
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
index a13985792b..a4cf49e846 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 
 @Suppress("MagicNumber")
 internal class AggregatedDataSyncStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AggregatedDataSyncStore,
     ObjectWithoutUidStoreImpl<AggregatedDataSync>(
         databaseAdapter,
@@ -44,7 +44,7 @@ internal class AggregatedDataSyncStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         DELETE_UPDATE_BINDER,
-        { cursor: Cursor -> AggregatedDataSync.create(cursor) }
+        { cursor: Cursor -> AggregatedDataSync.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: AggregatedDataSync, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt
index 5549dbe106..f2c578e2ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.domain.aggregated.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.domain.aggregated.AggregatedModule
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class AggregatedModuleImpl @Inject constructor(
-    private val dataDownloader: AggregatedDataDownloader
+    private val dataDownloader: AggregatedDataDownloader,
 ) : AggregatedModule {
 
     override fun data(): AggregatedDataDownloader {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 5f32e421c0..6d9576ecbd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.domain.metadata
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.collect
@@ -72,6 +71,7 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserModuleDownloader
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleDownloader
+import javax.inject.Inject
 
 @Suppress("LongParameterList")
 @Reusable
@@ -95,7 +95,7 @@ internal class MetadataCall @Inject constructor(
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val legendSetModuleDownloader: LegendSetModuleDownloader,
-    private val expressionDimensionItemModuleDownloader: ExpressionDimensionItemModuleDownloader
+    private val expressionDimensionItemModuleDownloader: ExpressionDimensionItemModuleDownloader,
 ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
index 39b2a21096..ebaf168a90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
@@ -29,15 +29,15 @@ package org.hisp.dhis.android.core.domain.metadata.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.modules.internal.WithProgressDownloader
 import org.hisp.dhis.android.core.domain.metadata.MetadataCall
+import javax.inject.Inject
 
 @Reusable
 class MetadataModuleImpl @Inject internal constructor(
-    private val metadataCall: MetadataCall
+    private val metadataCall: MetadataCall,
 ) : WithProgressDownloader {
     override fun download(): Observable<D2Progress> {
         return metadataCall.download().asObservable()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentAccess.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentAccess.kt
index 1e00ef884f..17bab15c59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentAccess.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentAccess.kt
@@ -32,5 +32,5 @@ enum class EnrollmentAccess {
     READ_ACCESS,
     WRITE_ACCESS,
     PROTECTED_PROGRAM_DENIED,
-    CLOSED_PROGRAM_DENIED
+    CLOSED_PROGRAM_DENIED,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/NewTrackerImporterEnrollmentTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/NewTrackerImporterEnrollmentTransformer.kt
index fc88dc95db..5292e29117 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/NewTrackerImporterEnrollmentTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/NewTrackerImporterEnrollmentTransformer.kt
@@ -37,7 +37,7 @@ internal object NewTrackerImporterEnrollmentTransformer {
     fun transform(
         o: Enrollment,
         teiAttributes: List<TrackedEntityAttributeValue>?,
-        programAttributeMap: Map<String, List<String>>
+        programAttributeMap: Map<String, List<String>>,
     ): NewTrackerImporterEnrollment {
         val programAttributeUids = programAttributeMap[o.program()] ?: emptyList()
         val enrollmentAttributeValues = teiAttributes
@@ -67,14 +67,14 @@ internal object NewTrackerImporterEnrollmentTransformer {
             .notes(
                 o.notes()?.map {
                     NewTrackerImporterNoteTransformer.transform(it)
-                }
+                },
             )
             .attributes(enrollmentAttributeValues)
             .build()
     }
 
     fun deTransform(
-        o: NewTrackerImporterEnrollment
+        o: NewTrackerImporterEnrollment,
     ): Enrollment {
         val notes = o.notes()?.map { NewTrackerImporterNoteTransformer.deTransform(it) }
         val events = o.events()?.map { NewTrackerImporterEventTransformer.deTransform(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
index bcec169004..958816ae2c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
@@ -62,7 +62,7 @@ internal class EnrollmentEntityDIModule {
         eventOrphanCleaner: EventOrphanCleaner,
         noteHandler: NoteHandler,
         noteUniquenessManager: NoteUniquenessManager,
-        relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner
+        relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner,
     ): EnrollmentHandler {
         return EnrollmentHandler(
             relationshipVersionManager,
@@ -73,7 +73,7 @@ internal class EnrollmentEntityDIModule {
             eventOrphanCleaner,
             noteHandler,
             noteUniquenessManager,
-            relationshipOrphanCleaner
+            relationshipOrphanCleaner,
         )
     }
 
@@ -81,7 +81,7 @@ internal class EnrollmentEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Enrollment>> {
         return mapOf(
-            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender.create(databaseAdapter)
+            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentFields.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentFields.kt
index ba7c984521..6801725e25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentFields.kt
@@ -56,7 +56,7 @@ internal object EnrollmentFields {
         .fields(
             fh.nestedField<Event>(EVENTS).with(EventFields.allFields),
             fh.nestedField<Note>(NOTES).with(NoteFields.all),
-            fh.nestedField<Relationship>(RELATIONSHIPS).with(RelationshipFields.allFields)
+            fh.nestedField<Relationship>(RELATIONSHIPS).with(RelationshipFields.allFields),
         ).build()
 
     val asRelationshipFields: Fields<Enrollment> = commonFields().build()
@@ -78,7 +78,7 @@ internal object EnrollmentFields {
             fh.field<Boolean>(DELETED),
             fh.field<String>(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE),
             fh.field<Coordinates>(COORDINATE),
-            fh.field<Geometry>(GEOMETRY)
+            fh.field<Geometry>(GEOMETRY),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
index 0d72509ab7..59f40f71f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
@@ -55,7 +55,7 @@ internal class EnrollmentHandler constructor(
     private val eventOrphanCleaner: EventOrphanCleaner,
     private val noteHandler: Handler<Note>,
     private val noteUniquenessManager: NoteUniquenessManager,
-    private val relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner
+    private val relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner,
 ) : IdentifiableDataHandlerImpl<Enrollment>(enrollmentStore, relationshipVersionManager, relationshipHandler) {
 
     override fun addRelationshipState(o: Enrollment): Enrollment {
@@ -72,7 +72,7 @@ internal class EnrollmentHandler constructor(
         } else {
             Log.i(
                 this.javaClass.simpleName,
-                "Enrollment " + o.uid() + " has invalid geometry value"
+                "Enrollment " + o.uid() + " has invalid geometry value",
             )
             o.toBuilder().geometry(null).build()
         }
@@ -82,7 +82,7 @@ internal class EnrollmentHandler constructor(
         o: Enrollment,
         action: HandleAction?,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ) {
         if (action !== HandleAction.Delete) {
             val events = EnrollmentInternalAccessor.accessEvents(o)
@@ -90,7 +90,7 @@ internal class EnrollmentHandler constructor(
                 val thisParams = IdentifiableDataHandlerParams(
                     hasAllAttributes = false,
                     overwrite = params.overwrite,
-                    asRelationship = false
+                    asRelationship = false,
                 )
                 eventHandler.handleMany(events, thisParams, relatives)
                 eventOrphanCleaner.deleteOrphan(o, events)
@@ -103,7 +103,7 @@ internal class EnrollmentHandler constructor(
                 val notesToSync = noteUniquenessManager.buildUniqueCollection(
                     transformed,
                     Note.NoteType.ENROLLMENT_NOTE,
-                    o.uid()
+                    o.uid(),
                 )
                 noteHandler.handleMany(notesToSync)
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
index bef2ea26b9..4cf4fb0d3e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
@@ -46,6 +44,8 @@ import org.hisp.dhis.android.core.imports.internal.TEIWebResponseHandlerSummary
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictParser
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
 import org.hisp.dhis.android.core.tracker.importer.internal.JobReportEnrollmentHandler
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentImportHandler @Inject constructor(
@@ -54,14 +54,14 @@ internal class EnrollmentImportHandler @Inject constructor(
     private val trackerImportConflictStore: TrackerImportConflictStore,
     private val trackerImportConflictParser: TrackerImportConflictParser,
     private val jobReportEnrollmentHandler: JobReportEnrollmentHandler,
-    private val dataStatePropagator: DataStatePropagator
+    private val dataStatePropagator: DataStatePropagator,
 ) {
 
     @Suppress("NestedBlockDepth")
     fun handleEnrollmentImportSummary(
         enrollmentImportSummaries: List<EnrollmentImportSummary?>?,
         enrollments: List<Enrollment>,
-        teiState: State
+        teiState: State,
     ): TEIWebResponseHandlerSummary {
         val summary = TEIWebResponseHandlerSummary()
 
@@ -111,20 +111,20 @@ internal class EnrollmentImportHandler @Inject constructor(
 
     private fun handleEventImportSummaries(
         enrollmentImportSummary: EnrollmentImportSummary,
-        enrollments: List<Enrollment>
+        enrollments: List<Enrollment>,
     ): TEIWebResponseHandlerSummary {
         return enrollmentImportSummary.events()?.importSummaries()?.let { importSummaries ->
             val enrollmentUid = enrollmentImportSummary.reference()!!
             eventImportHandler.handleEventImportSummaries(
                 importSummaries,
-                getEvents(enrollmentUid, enrollments)
+                getEvents(enrollmentUid, enrollments),
             )
         } ?: TEIWebResponseHandlerSummary()
     }
 
     private fun storeEnrollmentImportConflicts(
         enrollmentImportSummary: EnrollmentImportSummary,
-        teiUid: String
+        teiUid: String,
     ) {
         val trackerImportConflicts: MutableList<TrackerImportConflict> = ArrayList()
 
@@ -134,14 +134,14 @@ internal class EnrollmentImportHandler @Inject constructor(
                     .conflict(enrollmentImportSummary.description())
                     .displayDescription(enrollmentImportSummary.description())
                     .value(enrollmentImportSummary.reference())
-                    .build()
+                    .build(),
             )
         }
 
         enrollmentImportSummary.conflicts()?.forEach { importConflict ->
             trackerImportConflicts.add(
                 trackerImportConflictParser
-                    .getEnrollmentConflict(importConflict, getConflictBuilder(teiUid, enrollmentImportSummary))
+                    .getEnrollmentConflict(importConflict, getConflictBuilder(teiUid, enrollmentImportSummary)),
             )
         }
 
@@ -151,7 +151,7 @@ internal class EnrollmentImportHandler @Inject constructor(
     private fun processIgnoredEnrollments(
         enrollmentImportSummaries: List<EnrollmentImportSummary?>?,
         enrollments: List<Enrollment>,
-        teiState: State
+        teiState: State,
     ): List<Enrollment> {
         val processedEnrollments = getReferences(enrollmentImportSummaries)
 
@@ -185,7 +185,7 @@ internal class EnrollmentImportHandler @Inject constructor(
 
     private fun getEvents(
         enrollmentUid: String,
-        enrollments: List<Enrollment>
+        enrollments: List<Enrollment>,
     ): List<Event> {
         return enrollments.find { it.uid() == enrollmentUid }?.let {
             EnrollmentInternalAccessor.accessEvents(it)
@@ -194,7 +194,7 @@ internal class EnrollmentImportHandler @Inject constructor(
 
     private fun getConflictBuilder(
         trackedEntityInstanceUid: String,
-        enrollmentImportSummary: EnrollmentImportSummary
+        enrollmentImportSummary: EnrollmentImportSummary,
     ): TrackerImportConflict.Builder {
         return TrackerImportConflict.builder()
             .trackedEntityInstance(trackedEntityInstanceUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt
index cfb818aaa8..7a509f6356 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.EnrollmentCollectionRepository
 import org.hisp.dhis.android.core.enrollment.EnrollmentModule
 import org.hisp.dhis.android.core.enrollment.EnrollmentService
+import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentModuleImpl @Inject constructor(
     private val enrollments: EnrollmentCollectionRepository,
-    private val enrollmentService: EnrollmentServiceImpl
+    private val enrollmentService: EnrollmentServiceImpl,
 ) : EnrollmentModule {
 
     override fun enrollments(): EnrollmentCollectionRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
index 3fe73a93da..4d051d716e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.enrollment.Enrollment
+import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentPersistenceCallFactory @Inject constructor(
-    private val enrollmentHandler: EnrollmentHandler
+    private val enrollmentHandler: EnrollmentHandler,
 ) {
     fun persistAsRelationships(enrollments: List<Enrollment>): Completable {
         return persistEnrollmentsInternal(enrollments, asRelationship = true, overwrite = false)
@@ -44,12 +44,12 @@ internal class EnrollmentPersistenceCallFactory @Inject constructor(
     private fun persistEnrollmentsInternal(
         enrollments: List<Enrollment>,
         asRelationship: Boolean,
-        overwrite: Boolean
+        overwrite: Boolean,
     ): Completable {
         val params = IdentifiableDataHandlerParams(
             hasAllAttributes = true,
             overwrite = overwrite,
-            asRelationship = asRelationship
+            asRelationship = asRelationship,
         )
         return Completable.defer {
             enrollmentHandler.handleMany(enrollments, params, relatives = null)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
index 1515fb7923..1978d22a13 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentProjectionTransformer @Inject constructor() :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt
index 290924ea4e..42a2876f23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentService.kt
@@ -38,7 +38,7 @@ interface EnrollmentService {
     @GET("$ENROLLMENTS/{$ENROLLMENT_UID}")
     suspend fun getEnrollmentSingle(
         @Path(ENROLLMENT_UID) enrollmentUid: String?,
-        @Query(FIELDS) @Which fields: Fields<Enrollment>
+        @Query(FIELDS) @Which fields: Fields<Enrollment>,
     ): Enrollment
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index 791cd3f76a..ee88c9fa2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.enrollment.EnrollmentAccess
@@ -48,6 +46,8 @@ import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentServiceImpl @Inject constructor(
@@ -57,7 +57,7 @@ internal class EnrollmentServiceImpl @Inject constructor(
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
     private val eventCollectionRepository: EventCollectionRepository,
     private val programStagesCollectionRepository: ProgramStageCollectionRepository,
-    private val programTempOwnerStore: ProgramTempOwnerStore
+    private val programTempOwnerStore: ProgramTempOwnerStore,
 ) : EnrollmentService {
 
     override fun blockingIsOpen(enrollmentUid: String): Boolean {
@@ -119,7 +119,7 @@ internal class EnrollmentServiceImpl @Inject constructor(
             .toList()
             .flatMap { currentProgramStagesUids: List<String?> ->
                 val repository = programStagesCollectionRepository.byProgramUid().eq(
-                    enrollmentRepository.uid(enrollmentUid).blockingGet()?.program()
+                    enrollmentRepository.uid(enrollmentUid).blockingGet()?.program(),
                 ).byAccessDataWrite().isTrue
 
                 repository.get().toFlowable()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
index 0b9a8b51e6..e08f259b16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
@@ -44,20 +44,20 @@ import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 
 internal class EnrollmentStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : EnrollmentStore,
     IdentifiableDeletableDataObjectStoreImpl<Enrollment>(
         databaseAdapter,
         EnrollmentTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Enrollment.create(cursor) }
+        { cursor: Cursor -> Enrollment.create(cursor) },
     ) {
 
     override fun queryEnrollmentsToPost(): Map<String, List<Enrollment>> {
         val enrollmentsToPostQuery = WhereClauseBuilder()
             .appendInKeyStringValues(
                 DataColumns.AGGREGATED_SYNC_STATE,
-                EnumHelper.asStringList(State.uploadableStatesIncludingError().toList())
+                EnumHelper.asStringList(State.uploadableStatesIncludingError().toList()),
             ).build()
         val enrollmentList: List<Enrollment> = selectWhere(enrollmentsToPostQuery)
 
@@ -91,7 +91,7 @@ internal class EnrollmentStoreImpl(
 
     override fun selectByTrackedEntityInstanceAndAttribute(
         teiUid: String,
-        attributeUid: String
+        attributeUid: String,
     ): List<Enrollment> {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE, teiUid)
@@ -100,7 +100,7 @@ internal class EnrollmentStoreImpl(
                 "SELECT ${ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM} " +
                     "FROM ${ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name()} " +
                     "WHERE ${ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE} = " +
-                    "'$attributeUid'"
+                    "'$attributeUid'",
             ).build()
 
         return selectWhere(whereClause)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
index fd9f5fd0bf..fb3f9fb531 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class EventOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataOrphanCleaner<Enrollment, Event>(
     tableName = EventTableInfo.TABLE_INFO.name(),
     parentColumn = EventTableInfo.Columns.ENROLLMENT,
     stateColumn = DataColumns.SYNC_STATE,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
index 6f631a2247..75416c2408 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollmentTransformer
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
+import javax.inject.Inject
 
 @Reusable
 internal class NewEnrollmentEndpointCallFactory @Inject constructor(
-    private val service: TrackerExporterService
+    private val service: TrackerExporterService,
 ) : EnrollmentEndpointCallFactory {
     override suspend fun getRelationshipEntityCall(uid: String): Enrollment {
         return service.getEnrollmentSingle(
             uid,
-            NewEnrollmentFields.asRelationshipFields
+            NewEnrollmentFields.asRelationshipFields,
         ).let { NewTrackerImporterEnrollmentTransformer.deTransform(it) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentFields.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentFields.kt
index 819763c0bd..fe94825d1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentFields.kt
@@ -65,7 +65,7 @@ internal object NewEnrollmentFields {
         .fields(
             fh.nestedField<NewTrackerImporterEvent>(EVENTS).with(NewEventFields.allFields),
             fh.nestedField<NewTrackerImporterNote>(NOTES).with(NewNoteFields.all),
-            fh.nestedField<NewTrackerImporterRelationship>(RELATIONSHIPS).with(NewRelationshipFields.allFields)
+            fh.nestedField<NewTrackerImporterRelationship>(RELATIONSHIPS).with(NewRelationshipFields.allFields),
         ).build()
 
     val asRelationshipFields: Fields<NewTrackerImporterEnrollment> = commonFields().build()
@@ -86,7 +86,7 @@ internal object NewEnrollmentFields {
             fh.field<EnrollmentStatus>(STATUS),
             fh.field<Boolean>(DELETED),
             fh.field<String>(TRACKED_ENTITY),
-            fh.field<Geometry>(GEOMETRY)
+            fh.field<Geometry>(GEOMETRY),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
index cb22fb4ed9..64580b17bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
+import javax.inject.Inject
 
 @Reusable
 internal class OldEnrollmentEndpointCallFactory @Inject constructor(
-    private val service: EnrollmentService
+    private val service: EnrollmentService,
 ) : EnrollmentEndpointCallFactory {
     override suspend fun getRelationshipEntityCall(uid: String): Enrollment {
         return service.getEnrollmentSingle(
             uid,
-            EnrollmentFields.asRelationshipFields
+            EnrollmentFields.asRelationshipFields,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
index e2aedfe325..57227d7b2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.event
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -39,14 +38,15 @@ import org.hisp.dhis.android.core.event.internal.EventDownloadCall
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams
 import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress
+import javax.inject.Inject
 
 @Reusable
 class EventDownloader @Inject internal constructor(
     scope: RepositoryScope,
-    private val callFactory: EventDownloadCall
+    private val callFactory: EventDownloadCall,
 ) : BaseRepositoryImpl<EventDownloader>(
     scope,
-    FilterConnectorFactory(scope) { s: RepositoryScope -> EventDownloader(s, callFactory) }
+    FilterConnectorFactory(scope) { s: RepositoryScope -> EventDownloader(s, callFactory) },
 ) {
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventInternalAccessor.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventInternalAccessor.kt
index b0368cc2c1..3be84b36e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventInternalAccessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventInternalAccessor.kt
@@ -38,7 +38,7 @@ internal object EventInternalAccessor {
 
     fun insertRelationships(
         builder: Event.Builder,
-        relationships: List<Relationship>
+        relationships: List<Relationship>,
     ): Event.Builder {
         return builder.relationships(relationships)
     }
@@ -49,7 +49,7 @@ internal object EventInternalAccessor {
 
     fun insertTrackedEntityInstance(
         builder: Event.Builder,
-        trackedEntityInstance: String
+        trackedEntityInstance: String,
     ): Event.Builder {
         return builder.trackedEntityInstance(trackedEntityInstance)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventNonEditableReason.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventNonEditableReason.kt
index fceb418886..5a0bc42d7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventNonEditableReason.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventNonEditableReason.kt
@@ -34,5 +34,5 @@ enum class EventNonEditableReason {
     EVENT_DATE_IS_NOT_IN_ORGUNIT_RANGE,
     NO_CATEGORY_COMBO_ACCESS,
     ENROLLMENT_IS_NOT_OPEN,
-    ORGUNIT_IS_NOT_IN_CAPTURE_SCOPE
+    ORGUNIT_IS_NOT_IN_CAPTURE_SCOPE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/NewTrackerImporterEventTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/event/NewTrackerImporterEventTransformer.kt
index 287be5f911..8d8adb2991 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/NewTrackerImporterEventTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/NewTrackerImporterEventTransformer.kt
@@ -60,12 +60,12 @@ internal object NewTrackerImporterEventTransformer : TwoWayTransformer<Event, Ne
             .trackedEntityDataValues(
                 o.trackedEntityDataValues()?.map {
                     NewTrackerImporterTrackedEntityDataValueTransformer.transform(it)
-                }
+                },
             )
             .notes(
                 o.notes()?.map {
                     NewTrackerImporterNoteTransformer.transform(it)
-                }
+                },
             )
             .build()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
index bc2066f32f..76803ca187 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.event.EventDataFilter
 
 internal class EventDataFilterHandler(
-    store: EventDataFilterStore
+    store: EventDataFilterStore,
 ) : ObjectWithoutUidHandlerImpl<EventDataFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
index c35a42194f..8db6929a02 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.event.EventDataFilter
 
 @Suppress("MagicNumber")
 internal class EventDataFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : EventDataFilterStore,
     ObjectWithoutUidStoreImpl<EventDataFilter>(
         databaseAdapter,
@@ -48,7 +48,7 @@ internal class EventDataFilterStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { EventDataFilter.create(it) }
+        { EventDataFilter.create(it) },
     ) {
 
     companion object {
@@ -75,7 +75,7 @@ internal class EventDataFilterStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ItemFilterTableInfo.TABLE_INFO,
-            ItemFilterTableInfo.Columns.EVENT_FILTER
+            ItemFilterTableInfo.Columns.EVENT_FILTER,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt
index 5d8daa1c0a..52c667e1ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import java.util.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 
 @Reusable
 class EventDateUtils @Inject constructor(
-    private val periodHelper: PeriodHelper
+    private val periodHelper: PeriodHelper,
 ) {
 
     /**
@@ -71,7 +71,7 @@ class EventDateUtils @Inject constructor(
         event: Event,
         completeExpiryDays: Int,
         programPeriodType: PeriodType?,
-        expiryDays: Int
+        expiryDays: Int,
     ): Boolean {
         if (event.status() == EventStatus.COMPLETED && event.completedDate() == null) return false
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 8af26090c2..32cde047e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -43,6 +42,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactor
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerDownloadCall
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import javax.inject.Inject
 
 @Reusable
 internal class EventDownloadCall @Inject internal constructor(
@@ -53,12 +53,12 @@ internal class EventDownloadCall @Inject internal constructor(
     private val eventQueryBundleFactory: EventQueryBundleFactory,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val persistenceCallFactory: EventPersistenceCallFactory,
-    private val lastUpdatedManager: EventLastUpdatedManager
+    private val lastUpdatedManager: EventLastUpdatedManager,
 ) : TrackerDownloadCall<Event, EventQueryBundle>(
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory,
-    coroutineAPICallExecutor
+    coroutineAPICallExecutor,
 ) {
 
     override fun getBundles(params: ProgramDataDownloadParams): List<EventQueryBundle> {
@@ -74,7 +74,7 @@ internal class EventDownloadCall @Inject internal constructor(
     override fun persistItems(
         items: List<Event>,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ) {
         persistenceCallFactory.persistEvents(items, relatives).blockingAwait()
     }
@@ -86,16 +86,16 @@ internal class EventDownloadCall @Inject internal constructor(
     override suspend fun queryByUids(
         bundle: EventQueryBundle,
         overwrite: Boolean,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): ItemsWithPagingResult {
         val result = ItemsWithPagingResult(0, true, null, false)
 
         val eventQuery = TrackerAPIQuery(
             commonParams = bundle.commonParams().copy(
                 program = bundle.commonParams().program,
-                limit = bundle.commonParams().uids.size
+                limit = bundle.commonParams().uids.size,
             ),
-            uids = bundle.commonParams().uids
+            uids = bundle.commonParams().uids,
         )
 
         try {
@@ -106,7 +106,7 @@ internal class EventDownloadCall @Inject internal constructor(
                 hasAllAttributes = true,
                 overwrite = overwrite,
                 asRelationship = false,
-                program = eventQuery.commonParams.program
+                program = eventQuery.commonParams.program,
             )
 
             persistItems(items, params = persistParams, relatives)
@@ -126,16 +126,16 @@ internal class EventDownloadCall @Inject internal constructor(
         bundle: EventQueryBundle,
         program: String?,
         orgunitUid: String?,
-        limit: Int
+        limit: Int,
     ): TrackerAPIQuery {
         return TrackerAPIQuery(
             commonParams = bundle.commonParams().copy(
                 program = program,
-                limit = limit
+                limit = limit,
             ),
             lastUpdatedStr = lastUpdatedManager.getLastUpdatedStr(bundle.commonParams()),
             orgUnit = orgunitUid,
-            uids = bundle.commonParams().uids
+            uids = bundle.commonParams().uids,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
index 9107fa6508..d975d66430 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
@@ -62,7 +62,7 @@ internal class EventEntityDIModule {
         noteHandler: NoteHandler,
         noteVersionManager: NoteDHISVersionManager,
         noteUniquenessManager: NoteUniquenessManager,
-        relationshipOrphanCleaner: EventRelationshipOrphanCleaner
+        relationshipOrphanCleaner: EventRelationshipOrphanCleaner,
     ): EventHandler {
         return EventHandler(
             relationshipVersionManager,
@@ -72,7 +72,7 @@ internal class EventEntityDIModule {
             noteHandler,
             noteVersionManager,
             noteUniquenessManager,
-            relationshipOrphanCleaner
+            relationshipOrphanCleaner,
         )
     }
 
@@ -81,7 +81,7 @@ internal class EventEntityDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Event>> {
         return mapOf(
             EventFields.TRACKED_ENTITY_DATA_VALUES to TrackedEntityDataValueChildrenAppender.create(databaseAdapter),
-            EventFields.NOTES to NoteForEventChildrenAppender.create(databaseAdapter)
+            EventFields.NOTES to NoteForEventChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFields.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFields.kt
index d848eacfe8..8211a6b47d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFields.kt
@@ -58,7 +58,7 @@ internal object EventFields {
             fh.nestedField<Note>(NOTES).with(NoteFields.all),
             fh.nestedField<Relationship>(RELATIONSHIPS).with(RelationshipFields.allFields),
             fh.nestedField<TrackedEntityDataValue>(TRACKED_ENTITY_DATA_VALUES)
-                .with(TrackedEntityDataValueFields.allFields)
+                .with(TrackedEntityDataValueFields.allFields),
         ).build()
 
     val asRelationshipFields: Fields<Event> = commonFields().build()
@@ -87,7 +87,7 @@ internal object EventFields {
             fh.field<String>(EventTableInfo.Columns.DUE_DATE),
             fh.field<String>(EventTableInfo.Columns.ATTRIBUTE_OPTION_COMBO),
             fh.field<String>(EventTableInfo.Columns.ASSIGNED_USER),
-            fh.field<String>(EventTableInfo.Columns.COMPLETED_BY)
+            fh.field<String>(EventTableInfo.Columns.COMPLETED_BY),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
index 393134e1e7..d7ae5b3aeb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
@@ -46,11 +46,11 @@ internal class EventFilterEntityDIModule {
     @Reusable
     fun handler(
         eventFilterStore: EventFilterStore,
-        eventDataFilterHandler: EventDataFilterHandler
+        eventDataFilterHandler: EventDataFilterHandler,
     ): EventFilterHandler {
         return EventFilterHandler(
             eventFilterStore,
-            eventDataFilterHandler
+            eventDataFilterHandler,
         )
     }
 
@@ -58,7 +58,7 @@ internal class EventFilterEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<EventFilter>> {
         return mapOf(
-            EventQueryCriteriaFields.DATA_FILTERS to EventFilterEventDataFilterChildrenAppender.create(databaseAdapter)
+            EventQueryCriteriaFields.DATA_FILTERS to EventFilterEventDataFilterChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt
index 7794285650..2c03971f83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEventDataFilterChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.event.EventDataFilter
 import org.hisp.dhis.android.core.event.EventFilter
 
 internal class EventFilterEventDataFilterChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<EventFilter, EventDataFilter>
+    private val childStore: SingleParentChildStore<EventFilter, EventDataFilter>,
 ) : ChildrenAppender<EventFilter>() {
     override fun appendChildren(m: EventFilter): EventFilter {
         return if (m.eventQueryCriteria() != null) {
@@ -53,8 +53,8 @@ internal class EventFilterEventDataFilterChildrenAppender private constructor(
             return EventFilterEventDataFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    EventDataFilterStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> EventDataFilter.create(cursor) }
+                    EventDataFilterStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> EventDataFilter.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
index 837cd1f449..db1cd9b7ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.event.EventFilter
 
 internal class EventFilterHandler constructor(
     eventFilterStore: EventFilterStore,
-    private val eventDataFilterHandler: EventDataFilterHandler
+    private val eventDataFilterHandler: EventDataFilterHandler,
 ) : IdentifiableHandlerImpl<EventFilter>(eventFilterStore) {
 
     override fun beforeCollectionHandled(oCollection: Collection<EventFilter>): Collection<EventFilter> {
@@ -45,7 +45,7 @@ internal class EventFilterHandler constructor(
     override fun afterObjectHandled(o: EventFilter, action: HandleAction) {
         if (action !== HandleAction.Delete && o.eventQueryCriteria() != null) {
             eventDataFilterHandler.handleMany(
-                o.eventQueryCriteria()!!.dataFilters()
+                o.eventQueryCriteria()!!.dataFilters(),
             ) { edf: EventDataFilter -> edf.toBuilder().eventFilter(o.uid()).build() }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
index dd7cda6d16..4fb181daaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.event.EventFilterTableInfo
 
 @Suppress("MagicNumber")
 internal class EventFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : EventFilterStore,
     IdentifiableObjectStoreImpl<EventFilter>(
         databaseAdapter,
         EventFilterTableInfo.TABLE_INFO,
         BINDER,
-        { EventFilter.create(it) }
+        { EventFilter.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
index 7642681d66..e1af0155aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.event.internal
 
 import android.util.Log
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -48,6 +47,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
+import javax.inject.Inject
 
 @Reusable
 internal class EventHandler @Inject constructor(
@@ -58,7 +58,7 @@ internal class EventHandler @Inject constructor(
     private val noteHandler: NoteHandler,
     private val noteVersionManager: NoteDHISVersionManager,
     private val noteUniquenessManager: NoteUniquenessManager,
-    private val relationshipOrphanCleaner: EventRelationshipOrphanCleaner
+    private val relationshipOrphanCleaner: EventRelationshipOrphanCleaner,
 ) : IdentifiableDataHandlerImpl<Event>(eventStore, relationshipVersionManager, relationshipHandler) {
 
     override fun beforeObjectHandled(o: Event, params: IdentifiableDataHandlerParams): Event {
@@ -74,7 +74,7 @@ internal class EventHandler @Inject constructor(
         o: Event,
         action: HandleAction?,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ) {
         val eventUid = o.uid()
         if (action === HandleAction.Delete) {
@@ -84,7 +84,7 @@ internal class EventHandler @Inject constructor(
                 trackedEntityDataValueHandler.removeEventDataValues(eventUid)
             } else {
                 trackedEntityDataValueHandler.handleMany(
-                    o.trackedEntityDataValues()
+                    o.trackedEntityDataValues(),
                 ) { dataValue: TrackedEntityDataValue -> dataValue.toBuilder().event(eventUid).build() }
             }
 
@@ -95,7 +95,7 @@ internal class EventHandler @Inject constructor(
                 val notesToSync = noteUniquenessManager.buildUniqueCollection(
                     transformed,
                     Note.NoteType.EVENT_NOTE,
-                    o.uid()
+                    o.uid(),
                 )
                 noteHandler.handleMany(notesToSync)
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
index c91af40a89..cf9ed5b548 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
@@ -44,6 +42,8 @@ import org.hisp.dhis.android.core.imports.internal.TEIWebResponseHandlerSummary
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictParser
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
 import org.hisp.dhis.android.core.tracker.importer.internal.JobReportEventHandler
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 internal class EventImportHandler @Inject constructor(
@@ -52,13 +52,13 @@ internal class EventImportHandler @Inject constructor(
     private val trackerImportConflictStore: TrackerImportConflictStore,
     private val trackerImportConflictParser: TrackerImportConflictParser,
     private val jobReportEventHandler: JobReportEventHandler,
-    private val dataStatePropagator: DataStatePropagator
+    private val dataStatePropagator: DataStatePropagator,
 ) {
 
     @Suppress("NestedBlockDepth")
     fun handleEventImportSummaries(
         eventImportSummaries: List<EventImportSummary?>?,
-        events: List<Event>
+        events: List<Event>,
     ): TEIWebResponseHandlerSummary {
         val summary = TEIWebResponseHandlerSummary()
 
@@ -110,7 +110,7 @@ internal class EventImportHandler @Inject constructor(
 
     private fun processIgnoredEvents(
         eventImportSummaries: List<EventImportSummary?>?,
-        events: List<Event>
+        events: List<Event>,
     ): List<Event> {
         val processedEvents = getReferences(eventImportSummaries)
 
@@ -123,7 +123,7 @@ internal class EventImportHandler @Inject constructor(
 
     private fun storeEventImportConflicts(
         importSummary: EventImportSummary,
-        enrollmentUid: String?
+        enrollmentUid: String?,
     ) {
         val trackerImportConflicts: MutableList<TrackerImportConflict> = ArrayList()
 
@@ -133,14 +133,14 @@ internal class EventImportHandler @Inject constructor(
                     .conflict(importSummary.description())
                     .displayDescription(importSummary.description())
                     .value(importSummary.reference())
-                    .build()
+                    .build(),
             )
         }
 
         importSummary.conflicts()?.forEach { importConflict ->
             trackerImportConflicts.add(
                 trackerImportConflictParser
-                    .getEventConflict(importConflict, getConflictBuilder(enrollmentUid, importSummary))
+                    .getEventConflict(importConflict, getConflictBuilder(enrollmentUid, importSummary)),
             )
         }
 
@@ -149,7 +149,7 @@ internal class EventImportHandler @Inject constructor(
 
     private fun getConflictBuilder(
         enrollmentUid: String?,
-        eventImportSummary: EventImportSummary
+        eventImportSummary: EventImportSummary,
     ): TrackerImportConflict.Builder {
         val trackedEntityInstanceUid = enrollmentUid?.let {
             enrollmentStore.selectByUid(it)?.trackedEntityInstance()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
index e967467561..7cd40b01b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerSyncLastUpdatedManager
+import javax.inject.Inject
 
 @Reusable
 internal class EventLastUpdatedManager @Inject constructor(
     store: EventSyncStore,
-    private val resourceHandler: ResourceHandler
+    private val resourceHandler: ResourceHandler,
 ) : TrackerSyncLastUpdatedManager<EventSync>(store) {
 
     fun update(bundle: EventQueryBundle) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt
index e0743b6db8..79f54f8384 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.event.EventCollectionRepository
 import org.hisp.dhis.android.core.event.EventDownloader
 import org.hisp.dhis.android.core.event.EventFilterCollectionRepository
 import org.hisp.dhis.android.core.event.EventModule
 import org.hisp.dhis.android.core.event.EventService
 import org.hisp.dhis.android.core.event.search.EventQueryCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 internal class EventModuleImpl @Inject internal constructor(
@@ -42,7 +42,7 @@ internal class EventModuleImpl @Inject internal constructor(
     private val eventFilters: EventFilterCollectionRepository,
     private val eventDownloader: EventDownloader,
     private val eventService: EventServiceImpl,
-    private val eventQuery: EventQueryCollectionRepository
+    private val eventQuery: EventQueryCollectionRepository,
 ) : EventModule {
     override fun events(): EventCollectionRepository {
         return events
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
index 13b5822d53..72d089ee3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
@@ -40,8 +40,8 @@ import retrofit2.Retrofit
         EventFilterEntityDIModule::class,
         EventDataFilterEntityDIModule::class,
         EventSyncEntityDIModule::class,
-        EventQueryEntityDIModule::class
-    ]
+        EventQueryEntityDIModule::class,
+    ],
 )
 internal class EventPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
index e4fa3d8d85..89532cd06b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
@@ -29,18 +29,18 @@ package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
+import javax.inject.Inject
 
 @Reusable
 internal class EventPersistenceCallFactory @Inject constructor(
     private val eventHandler: EventHandler,
     private val organisationUnitStore: OrganisationUnitStore,
-    private val organisationUnitDownloader: OrganisationUnitModuleDownloader
+    private val organisationUnitDownloader: OrganisationUnitModuleDownloader,
 ) {
     fun persistEvents(events: Collection<Event>, relatives: RelationshipItemRelatives?): Completable {
         return persistEventsInternal(events, asRelationship = false, relatives)
@@ -53,13 +53,13 @@ internal class EventPersistenceCallFactory @Inject constructor(
     private fun persistEventsInternal(
         events: Collection<Event>,
         asRelationship: Boolean,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ): Completable {
         return Completable.defer {
             val params = IdentifiableDataHandlerParams(
                 hasAllAttributes = false,
                 overwrite = false,
-                asRelationship = asRelationship
+                asRelationship = asRelationship,
             )
             eventHandler.handleMany(events, params, relatives)
             if (hasMissingOrganisationUnitUids(events)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
index 8c1f65221d..cd38e02ec9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
@@ -29,19 +29,19 @@ package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.trackedentity.internal.OldTrackerImporterPostCall
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterPostCall
+import javax.inject.Inject
 
 @Reusable
 internal class EventPostParentCall @Inject internal constructor(
     private val oldTrackerImporterCall: OldTrackerImporterPostCall,
     private val trackerImporterCall: TrackerImporterPostCall,
-    private val trackerParentCallHelper: TrackerPostParentCallHelper
+    private val trackerParentCallHelper: TrackerPostParentCallHelper,
 ) {
 
     fun uploadEvents(events: List<Event>): Observable<D2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt
index 1b5293f887..a9a873643f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.internal.DataStateHelper
 import org.hisp.dhis.android.core.common.DataObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
+import javax.inject.Inject
 
 @Reusable
 internal class EventPostStateManager @Inject internal constructor(
-    private val eventStore: EventStore
+    private val eventStore: EventStore,
 ) {
 
     fun <T> markObjectsAs(events: Collection<T>, forcedState: State?) where T : ObjectWithUidInterface, T : DataObject {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
index 036835479a..24171992c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.event.EventStatus
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class EventProjectionTransformer @Inject constructor() : Transformer<EventCreateProjection, Event> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
index 6baab4ce7d..79bd229545 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramStore
@@ -36,13 +35,14 @@ import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactoryCommonHelper
+import javax.inject.Inject
 
 @Reusable
 internal class EventQueryBundleFactory @Inject constructor(
     programStore: ProgramStore,
     programSettingsObjectRepository: ProgramSettingsObjectRepository,
     lastUpdatedManager: EventLastUpdatedManager,
-    commonHelper: TrackerQueryFactoryCommonHelper
+    commonHelper: TrackerQueryFactoryCommonHelper,
 ) : TrackerQueryFactory<EventQueryBundle, EventSync>(
     programStore,
     programSettingsObjectRepository,
@@ -50,7 +50,8 @@ internal class EventQueryBundleFactory @Inject constructor(
     commonHelper,
     ProgramType.WITHOUT_REGISTRATION,
     { params: ProgramDataDownloadParams,
-        programSettings: ProgramSettings? ->
+            programSettings: ProgramSettings?,
+        ->
         EventQueryBundleInternalFactory(commonHelper, params, programSettings)
-    }
+    },
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt
index 67acf8397c..d35fa160a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleInternalFactory.kt
@@ -36,18 +36,18 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryInternalFac
 internal class EventQueryBundleInternalFactory constructor(
     commonHelper: TrackerQueryFactoryCommonHelper,
     params: ProgramDataDownloadParams,
-    programSettings: ProgramSettings?
+    programSettings: ProgramSettings?,
 ) : TrackerQueryInternalFactory<EventQueryBundle>(commonHelper, params, programSettings) {
 
     override fun queryInternal(
         programs: List<String>,
         programUid: String?,
-        orgUnitByLimitExtractor: () -> List<String>
+        orgUnitByLimitExtractor: () -> List<String>,
     ): List<EventQueryBundle> {
         val limit = commonHelper.getLimit(
             params,
             programSettings,
-            programUid
+            programUid,
         ) { it?.eventsDownload() }
         if (limit == 0 || programs.isEmpty()) {
             return emptyList()
@@ -58,7 +58,7 @@ internal class EventQueryBundleInternalFactory constructor(
             programs,
             programUid,
             limit,
-            orgUnitByLimitExtractor
+            orgUnitByLimitExtractor,
         ) { it?.eventDateDownload() }
 
         val builder = EventQueryBundle.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
index bef914a8eb..ff661be3f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventService.kt
@@ -63,21 +63,21 @@ internal interface EventService {
         @Query(LAST_UPDATED_START_DATE) lastUpdatedStartDate: String? = null,
         @Query(LAST_UPDATED_END_DATE) lastUpdatedEndDate: String? = null,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean,
-        @Query(EVENT) eventUid: String? = null
+        @Query(EVENT) eventUid: String? = null,
     ): Payload<Event>
 
     @GET("$EVENTS/{$EVENT_UID}")
     suspend fun getEvent(
         @Path(EVENT_UID) eventUid: String,
         @Query(FIELDS) @Which fields: Fields<Event>,
-        @Query(OU_MODE) orgUnitMode: String
+        @Query(OU_MODE) orgUnitMode: String,
     ): Event
 
     @GET(EVENTS)
     suspend fun getEventSingle(
         @Query(EVENT) eventUid: String,
         @Query(FIELDS) @Which fields: Fields<Event>,
-        @Query(OU_MODE) orgUnitMode: String
+        @Query(OU_MODE) orgUnitMode: String,
     ): Payload<Event>
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
index e4c5b39d0f..f9bb0c04d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.CategoryOptionComboService
 import org.hisp.dhis.android.core.enrollment.EnrollmentCollectionRepository
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
@@ -39,6 +38,7 @@ import org.hisp.dhis.android.core.event.EventService
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitService
 import org.hisp.dhis.android.core.program.ProgramCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -50,7 +50,7 @@ internal class EventServiceImpl @Inject constructor(
     private val enrollmentService: EnrollmentServiceImpl,
     private val organisationUnitService: OrganisationUnitService,
     private val categoryOptionComboService: CategoryOptionComboService,
-    private val eventDateUtils: EventDateUtils
+    private val eventDateUtils: EventDateUtils,
 ) : EventService {
 
     override fun blockingHasDataWriteAccess(eventUid: String): Boolean {
@@ -107,7 +107,7 @@ internal class EventServiceImpl @Inject constructor(
                 event = event,
                 completeExpiryDays = program?.completeEventsExpiryDays() ?: 0,
                 programPeriodType = programStage?.periodType() ?: program?.expiryPeriodType(),
-                expiryDays = program?.expiryDays() ?: 0
+                expiryDays = program?.expiryDays() ?: 0,
             ) ->
                 EventEditableStatus.NonEditable(EventNonEditableReason.EXPIRED)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStore.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStore.kt
index 998c264dec..103b85da76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStore.kt
@@ -41,7 +41,7 @@ internal interface EventStore : IdentifiableDeletableDataObjectStore<Event> {
     fun queryOrderedForEnrollmentAndProgramStage(
         enrollmentUid: String,
         programStageUid: String,
-        includeDeleted: Boolean
+        includeDeleted: Boolean,
     ): List<Event>
 
     fun countEventsForEnrollment(enrollmentUid: String, includeDeleted: Boolean): Int
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
index e90fc211fb..7bda54203f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.event.internal
 
 import android.content.ContentValues
 import android.database.Cursor
-import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
@@ -44,16 +43,17 @@ import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludi
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventTableInfo
+import java.util.*
 
 @Suppress("TooManyFunctions")
 internal class EventStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : EventStore,
     IdentifiableDeletableDataObjectStoreImpl<Event>(
         databaseAdapter,
         EventTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Event.create(cursor) }
+        { cursor: Cursor -> Event.create(cursor) },
     ) {
 
     override fun queryEventsAttachedToEnrollmentToPost(): Map<String, List<Event>> {
@@ -61,7 +61,7 @@ internal class EventStoreImpl(
             .appendIsNotNullValue(EventTableInfo.Columns.ENROLLMENT)
             .appendInKeyStringValues(
                 EventTableInfo.Columns.AGGREGATED_SYNC_STATE,
-                asStringList(uploadableStatesIncludingError().toList())
+                asStringList(uploadableStatesIncludingError().toList()),
             ).build()
         val eventList = selectWhere(eventsAttachedToEnrollmentsQuery)
 
@@ -70,7 +70,7 @@ internal class EventStoreImpl(
 
     override fun querySingleEventsToPost(): List<Event> {
         val states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
-            CollectionsHelper.withSingleQuotationMarksArray(asStringList(uploadableStatesIncludingError().toList()))
+            CollectionsHelper.withSingleQuotationMarksArray(asStringList(uploadableStatesIncludingError().toList())),
         )
         val singleEventsToPostQuery = QUERY_SINGLE_EVENTS +
             " AND (" + EventTableInfo.Columns.SYNC_STATE + " IN (" + states + "))"
@@ -84,7 +84,7 @@ internal class EventStoreImpl(
     override fun queryOrderedForEnrollmentAndProgramStage(
         enrollmentUid: String,
         programStageUid: String,
-        includeDeleted: Boolean
+        includeDeleted: Boolean,
     ): List<Event> {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(EventTableInfo.Columns.ENROLLMENT, enrollmentUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
index 7670387447..312f4582f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 
 internal class EventSyncStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : EventSyncStore,
     ObjectWithoutUidStoreImpl<EventSync>(
         databaseAdapter,
@@ -43,7 +43,7 @@ internal class EventSyncStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         DELETE_UPDATE_BINDER,
-        { cursor: Cursor -> EventSync.create(cursor) }
+        { cursor: Cursor -> EventSync.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
index e573ca623a..37dbc32f00 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
@@ -37,10 +36,11 @@ import org.hisp.dhis.android.core.event.NewTrackerImporterEventTransformer
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
+import javax.inject.Inject
 
 @Reusable
 internal class NewEventEndpointCallFactory @Inject constructor(
-    private val service: TrackerExporterService
+    private val service: TrackerExporterService,
 ) : EventEndpointCallFactory() {
 
     override suspend fun getCollectionCall(eventQuery: TrackerAPIQuery): Payload<Event> {
@@ -55,7 +55,7 @@ internal class NewEventEndpointCallFactory @Inject constructor(
             pageSize = eventQuery.pageSize,
             updatedAfter = eventQuery.lastUpdatedStr,
             includeDeleted = true,
-            eventUid = getUidStr(eventQuery)
+            eventUid = getUidStr(eventQuery),
         ).let { mapPayload(it) }
     }
 
@@ -63,7 +63,7 @@ internal class NewEventEndpointCallFactory @Inject constructor(
         return service.getEventSingle(
             eventUid = uid,
             fields = NewEventFields.asRelationshipFields,
-            orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name
+            orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name,
         ).let { mapPayload(it) }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventFields.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventFields.kt
index 570a9e270d..189fbf851b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventFields.kt
@@ -70,7 +70,7 @@ internal object NewEventFields {
             fh.nestedField<NewTrackerImporterNote>(NOTES).with(NewNoteFields.all),
             fh.nestedField<NewTrackerImporterRelationship>(RELATIONSHIPS).with(NewRelationshipFields.allFields),
             fh.nestedField<NewTrackerImporterTrackedEntityDataValue>(TRACKED_ENTITY_DATA_VALUES)
-                .with(NewTrackedEntityDataValueFields.allFields)
+                .with(NewTrackedEntityDataValueFields.allFields),
         ).build()
 
     val asRelationshipFields: Fields<NewTrackerImporterEvent> = commonFields().build()
@@ -98,7 +98,7 @@ internal object NewEventFields {
             fh.field<Boolean>(DELETED),
             fh.field<String>(ATTRIBUTE_OPTION_COMBO),
             fh.field<String>(ASSIGNED_USER),
-            fh.field<String>(COMPLETED_BY)
+            fh.field<String>(COMPLETED_BY),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
index 3a52aef5c2..acb1370afa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.event.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
+import javax.inject.Inject
 
 @Reusable
 internal class OldEventEndpointCallFactory @Inject constructor(
-    private val service: EventService
+    private val service: EventService,
 ) : EventEndpointCallFactory() {
 
     override suspend fun getCollectionCall(eventQuery: TrackerAPIQuery): Payload<Event> {
@@ -51,7 +51,7 @@ internal class OldEventEndpointCallFactory @Inject constructor(
             pageSize = eventQuery.pageSize,
             lastUpdatedStartDate = eventQuery.lastUpdatedStr,
             includeDeleted = true,
-            eventUid = getUidStr(eventQuery)
+            eventUid = getUidStr(eventQuery),
         )
     }
 
@@ -59,7 +59,7 @@ internal class OldEventEndpointCallFactory @Inject constructor(
         return service.getEventSingle(
             eventUid = uid,
             fields = EventFields.asRelationshipFields,
-            orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name
+            orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
index 8ff63f8c0d..8b84003ed4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
@@ -28,25 +28,25 @@
 package org.hisp.dhis.android.core.event.search
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
 import org.hisp.dhis.android.core.event.EventCollectionRepository
 import org.hisp.dhis.android.core.event.EventDataFilter
-import org.hisp.dhis.android.core.event.search.EventQueryScopeOrderColumn.Type as OrderColumnType
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.user.AuthenticatedUserObjectRepository
+import java.util.*
+import javax.inject.Inject
+import org.hisp.dhis.android.core.event.search.EventQueryScopeOrderColumn.Type as OrderColumnType
 
 @Reusable
 internal class EventCollectionRepositoryAdapter @Inject constructor(
     private val eventCollectionRepository: EventCollectionRepository,
     private val organisationUnitCollectionRepository: OrganisationUnitCollectionRepository,
     private val userRepository: AuthenticatedUserObjectRepository,
-    private val datePeriodHelper: DateFilterPeriodHelper
+    private val datePeriodHelper: DateFilterPeriodHelper,
 ) {
 
     @Suppress("ComplexMethod")
@@ -94,14 +94,14 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
 
     private fun applyOrgunitSelection(
         repository: EventCollectionRepository,
-        scope: EventQueryRepositoryScope
+        scope: EventQueryRepositoryScope,
     ): EventCollectionRepository {
         return getOrganisationUnits(scope)?.let { repository.byOrganisationUnitUid().`in`(it) } ?: repository
     }
 
     private fun applyDataFilter(
         repository: EventCollectionRepository,
-        filter: EventDataFilter
+        filter: EventDataFilter,
     ): EventCollectionRepository {
         var filterRepo = repository
         filter.dataItem()?.let { deId ->
@@ -153,7 +153,7 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
 
     private fun applyOrderColumn(
         repository: EventCollectionRepository,
-        order: EventQueryScopeOrderByItem
+        order: EventQueryScopeOrderByItem,
     ): EventCollectionRepository {
         return when (order.column().type()) {
             OrderColumnType.EVENT_DATE -> repository.orderByEventDate(order.direction())
@@ -174,13 +174,14 @@ internal class EventCollectionRepositoryAdapter @Inject constructor(
             OrderColumnType.FOLLOW_UP,
             OrderColumnType.STATUS,
             OrderColumnType.STORED_BY,
-            OrderColumnType.COMPLETED_BY -> repository
+            OrderColumnType.COMPLETED_BY,
+            -> repository
         }
     }
 
     private fun applyUserAssignedMode(
         repository: EventCollectionRepository,
-        mode: AssignedUserMode
+        mode: AssignedUserMode,
     ): EventCollectionRepository {
         return when (mode) {
             AssignedUserMode.CURRENT -> repository.byAssignedUser().eq(userRepository.blockingGet()?.user())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScopeHelper.kt
index de9eb7a74c..be27a1555c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScopeHelper.kt
@@ -36,7 +36,7 @@ internal object EventQueryRepositoryScopeHelper {
     @Suppress("ComplexMethod")
     fun addEventFilter(
         scope: EventQueryRepositoryScope,
-        filter: EventFilter
+        filter: EventFilter,
     ): EventQueryRepositoryScope {
         val builder = scope.toBuilder()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemTableInfo.kt
index 83e3afbd88..e412a5f44c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemTableInfo.kt
@@ -47,7 +47,7 @@ object ExpressionDimensionItemTableInfo {
         override fun all(): Array<String> {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
-                EXPRESSION
+                EXPRESSION,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
index 185966038e..8f186648fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
@@ -29,27 +29,27 @@ package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
+import javax.inject.Inject
 
 @Reusable
 internal class ExpressionDimensionItemCall @Inject constructor(
     private val service: ExpressionDimensionItemService,
     private val handler: ExpressionDimensionItemHandler,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<ExpressionDimensionItem> {
     override fun download(uids: Set<String>): Single<List<ExpressionDimensionItem>> {
         return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
-            handler
+            handler,
         ) { partitionUids: Set<String> ->
             service.getExpressionDimensionItems(
                 ExpressionDimensionItemFields.uid.`in`(partitionUids),
                 ExpressionDimensionItemFields.allFields,
-                false
+                false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
index 4565090f9b..7423ed517e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
@@ -31,5 +31,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 
 internal class ExpressionDimensionItemHandler constructor(
-    store: ExpressionDimensionItemStore
+    store: ExpressionDimensionItemStore,
 ) : IdentifiableHandlerImpl<ExpressionDimensionItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
index b511a417e1..53a5319fce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
@@ -31,13 +31,13 @@ package org.hisp.dhis.android.core.expressiondimensionitem.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class ExpressionDimensionItemModuleDownloader @Inject internal constructor(
     private val expressionDimensionItemUidsSeeker: ExpressionDimensionItemUidsSeeker,
-    private val expressionDimensionItemCall: ExpressionDimensionItemCall
+    private val expressionDimensionItemCall: ExpressionDimensionItemCall,
 ) : UntypedModuleDownloader {
     override fun downloadMetadata(): Completable {
         return Single.fromCallable { expressionDimensionItemUidsSeeker.seekUids() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt
index aeb0b95ba4..0cc0619924 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemCollectionRepository
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemModule
+import javax.inject.Inject
 
 @Reusable
 internal class ExpressionDimensionItemModuleImpl @Inject internal constructor(
-    private val expressionDimensionItems: ExpressionDimensionItemCollectionRepository
+    private val expressionDimensionItems: ExpressionDimensionItemCollectionRepository,
 ) : ExpressionDimensionItemModule {
 
     override fun expressionDimensionItems(): ExpressionDimensionItemCollectionRepository = expressionDimensionItems
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt
index 6c59e536c9..2684c3fe11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 internal class ExpressionDimensionItemModuleWiper @Inject constructor(
-    private val tableWiper: TableWiper
+    private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTable(ExpressionDimensionItemTableInfo.TABLE_INFO)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt
index 2d6f962757..8370f665dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt
@@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionIte
 
 @Module(
     includes = [
-        ExpressionDimensionItemEntityDIModule::class
-    ]
+        ExpressionDimensionItemEntityDIModule::class,
+    ],
 )
 internal class ExpressionDimensionItemPackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt
index 8598291c0c..2de8f44835 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt
@@ -42,6 +42,6 @@ internal interface ExpressionDimensionItemService {
     fun getExpressionDimensionItems(
         @Query("filter") @Where uids: Filter<ExpressionDimensionItem, String>,
         @Query("fields") @Which fields: Fields<ExpressionDimensionItem>,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Payload<ExpressionDimensionItem>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
index 705d03f030..1089ae9421 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionIte
 
 @Suppress("MagicNumber")
 internal class ExpressionDimensionItemStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ExpressionDimensionItemStore,
     IdentifiableObjectStoreImpl<ExpressionDimensionItem>(
         databaseAdapter,
         ExpressionDimensionItemTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ExpressionDimensionItem.create(cursor) }
+        { cursor: Cursor -> ExpressionDimensionItem.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt
index abb0b79ddd..e938640b8e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt
@@ -29,15 +29,15 @@
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ExpressionDimensionItemUidsSeeker @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
     fun seekUids(): Set<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDomain.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDomain.kt
index a22cdbc4e2..3ef3dae1c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDomain.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDomain.kt
@@ -33,5 +33,5 @@ enum class FileResourceDomain {
     DOCUMENT,
     MESSAGE_ATTACHMENT,
     USER_AVATAR,
-    ORG_UNIT
+    ORG_UNIT,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloadConst.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloadConst.kt
index d79503acf8..d1a024be63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloadConst.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloadConst.kt
@@ -31,15 +31,15 @@ import org.hisp.dhis.android.core.common.ValueType
 
 enum class FileResourceValueType(internal val valueType: ValueType) {
     FILE_RESOURCE(ValueType.FILE_RESOURCE),
-    IMAGE(ValueType.IMAGE)
+    IMAGE(ValueType.IMAGE),
 }
 
 enum class FileResourceElementType {
     DATA_ELEMENT,
-    TRACED_ENTITY_ATTRIBUTE
+    TRACED_ENTITY_ATTRIBUTE,
 }
 
 enum class FileResourceDomainType {
     AGGREGATED,
-    TRACKER
+    TRACKER,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
index 60158d21be..1fbcad8dbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.fileresource
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
@@ -38,11 +37,12 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterC
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceDownloadCall
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceDownloadParams
+import javax.inject.Inject
 
 @Reusable
 class FileResourceDownloader @Inject internal constructor(
     private val call: FileResourceDownloadCall,
-    private val params: FileResourceDownloadParams
+    private val params: FileResourceDownloadParams,
 ) : BaseRepository {
 
     private val connectorFactory: ScopedFilterConnectorFactory<FileResourceDownloader, FileResourceDownloadParams> =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceModule.kt
index a39cdb8294..ba77261878 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceModule.kt
@@ -39,8 +39,8 @@ interface FileResourceModule {
                 "            .byValueType().eq(FileResourceValueType.IMAGE)\n" +
                 "            .download()",
             "org.hisp.dhis.android.core.fileresource.FileResourceDomainType",
-            "org.hisp.dhis.android.core.fileresource.FileResourceValueType"
-        )
+            "org.hisp.dhis.android.core.fileresource.FileResourceValueType",
+        ),
     )
     fun download(): Observable<D2Progress>
 
@@ -52,8 +52,8 @@ interface FileResourceModule {
                 "            .byValueType().eq(FileResourceValueType.IMAGE)\n" +
                 "            .blockingDownload()",
             "org.hisp.dhis.android.core.fileresource.FileResourceDomainType",
-            "org.hisp.dhis.android.core.fileresource.FileResourceValueType"
-        )
+            "org.hisp.dhis.android.core.fileresource.FileResourceValueType",
+        ),
     )
     fun blockingDownload()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
index c925f6b477..5b4fb3dbe4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
@@ -30,10 +30,6 @@ package org.hisp.dhis.android.core.fileresource
 
 import dagger.Reusable
 import io.reactivex.Completable
-import java.io.File
-import java.util.Calendar
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementCollectionRepository
@@ -46,6 +42,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
+import java.io.File
+import java.util.Calendar
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourceRoutine @Inject constructor(
@@ -55,7 +55,7 @@ internal class FileResourceRoutine @Inject constructor(
     private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository,
     private val trackedEntityDataValueCollectionRepository: TrackedEntityDataValueCollectionRepository,
     private val fileResourceStore: FileResourceStore,
-    private val trackedEntityAttributeValueCollectionRepository: TrackedEntityAttributeValueCollectionRepository
+    private val trackedEntityAttributeValueCollectionRepository: TrackedEntityAttributeValueCollectionRepository,
 ) {
     fun deleteOutdatedFileResources(after: Date? = null): Completable {
         return Completable.fromCallable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceStorageStatus.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceStorageStatus.kt
index 081b465c3d..055f4e17df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceStorageStatus.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceStorageStatus.kt
@@ -31,5 +31,5 @@ internal enum class FileResourceStorageStatus {
     NONE,
     PENDING,
     FAILED,
-    STORED
+    STORED,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index 99cb0086f5..823954f2f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.fileresource.internal
 import android.content.Context
 import android.util.Log
 import dagger.Reusable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import okhttp3.ResponseBody
@@ -47,6 +46,7 @@ import org.hisp.dhis.android.core.fileresource.FileResourceInternalAccessor
 import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList")
 @Reusable
@@ -58,7 +58,7 @@ internal class FileResourceDownloadCall @Inject constructor(
     private val fileResourceRoutine: FileResourceRoutine,
     private val synchronizationSettingsStore: SynchronizationSettingStore,
     private val context: Context,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
 
     fun download(params: FileResourceDownloadParams): Flow<D2Progress> = flow {
@@ -68,7 +68,7 @@ internal class FileResourceDownloadCall @Inject constructor(
         val paramsWithCorrectedMaxContentLength = params.copy(
             maxContentLength = params.maxContentLength
                 ?: synchronizationSettingsStore.selectFirst()?.fileMaxLengthBytes()
-                ?: defaultDownloadMaxContentLength
+                ?: defaultDownloadMaxContentLength,
         )
 
         downloadAggregatedValues(paramsWithCorrectedMaxContentLength, existingFileResources)
@@ -81,7 +81,7 @@ internal class FileResourceDownloadCall @Inject constructor(
 
     private suspend fun downloadAggregatedValues(
         params: FileResourceDownloadParams,
-        existingFileResources: List<String>
+        existingFileResources: List<String>,
     ) {
         if (params.domainTypes.contains(FileResourceDomainType.AGGREGATED)) {
             val dataValues = helper.getMissingAggregatedDataValues(params, existingFileResources)
@@ -95,10 +95,10 @@ internal class FileResourceDownloadCall @Inject constructor(
                         v.period()!!,
                         v.organisationUnit()!!,
                         v.attributeOptionCombo()!!,
-                        FileResizerHelper.Dimension.MEDIUM.name
+                        FileResizerHelper.Dimension.MEDIUM.name,
                     )
                 },
-                getUid = { v -> v.value() }
+                getUid = { v -> v.value() },
             )
         }
     }
@@ -117,19 +117,19 @@ internal class FileResourceDownloadCall @Inject constructor(
                                 fileResourceService.getImageFromTrackedEntityAttribute(
                                     v.value.trackedEntityInstance()!!,
                                     v.value.trackedEntityAttribute()!!,
-                                    FileResizerHelper.Dimension.MEDIUM.name
+                                    FileResizerHelper.Dimension.MEDIUM.name,
                                 )
 
                             ValueType.FILE_RESOURCE ->
                                 fileResourceService.getFileFromTrackedEntityAttribute(
                                     v.value.trackedEntityInstance()!!,
-                                    v.value.trackedEntityAttribute()!!
+                                    v.value.trackedEntityAttribute()!!,
                                 )
 
                             else -> null
                         }
                     },
-                    getUid = { v -> v.value.value() }
+                    getUid = { v -> v.value.value() },
                 )
             }
 
@@ -143,10 +143,10 @@ internal class FileResourceDownloadCall @Inject constructor(
                         fileResourceService.getFileFromEventValue(
                             v.event()!!,
                             v.dataElement()!!,
-                            FileResizerHelper.Dimension.MEDIUM.name
+                            FileResizerHelper.Dimension.MEDIUM.name,
                         )
                     },
-                    getUid = { v -> v.value() }
+                    getUid = { v -> v.value() },
                 )
             }
         }
@@ -156,7 +156,7 @@ internal class FileResourceDownloadCall @Inject constructor(
         values: List<V>,
         maxContentLength: Int?,
         download: suspend (V) -> ResponseBody?,
-        getUid: (V) -> String?
+        getUid: (V) -> String?,
     ) {
         val fileResources = values.mapNotNull { downloadFile(it, maxContentLength, download, getUid) }
 
@@ -172,7 +172,7 @@ internal class FileResourceDownloadCall @Inject constructor(
         value: V,
         maxContentLength: Int?,
         download: suspend (V) -> ResponseBody?,
-        getUid: (V) -> String?
+        getUid: (V) -> String?,
     ): FileResource? {
         return getUid(value)?.let { uid ->
             try {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
index 21d8183ef4..a89e0a4248 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
@@ -45,6 +44,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourceDownloadCallHelper @Inject constructor(
@@ -53,12 +53,12 @@ internal class FileResourceDownloadCallHelper @Inject constructor(
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
     private val dataValueStore: DataValueStore,
-    private val dhisVersionManager: DHISVersionManager
+    private val dhisVersionManager: DHISVersionManager,
 ) {
 
     fun getMissingTrackerAttributeValues(
         params: FileResourceDownloadParams,
-        existingFileResources: List<String>
+        existingFileResources: List<String>,
     ): List<MissingTrackerAttributeValue> {
         val fileTypes =
             if (dhisVersionManager.isGreaterOrEqualThan(DHISVersion.V2_40)) {
@@ -73,11 +73,11 @@ internal class FileResourceDownloadCallHelper @Inject constructor(
         val attributeValuesWhereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                trackedEntityAttributes.map { it.uid() }
+                trackedEntityAttributes.map { it.uid() },
             )
             .appendNotInKeyStringValues(
                 TrackedEntityAttributeValueTableInfo.Columns.VALUE,
-                existingFileResources
+                existingFileResources,
             )
             .build()
         return trackedEntityAttributeValueStore.selectWhere(attributeValuesWhereClause)
@@ -89,7 +89,7 @@ internal class FileResourceDownloadCallHelper @Inject constructor(
 
     fun getMissingTrackerDataValues(
         params: FileResourceDownloadParams,
-        existingFileResources: List<String>
+        existingFileResources: List<String>,
     ): List<TrackedEntityDataValue> {
         val dataElementUidsWhereClause = WhereClauseBuilder()
             .appendInKeyEnumValues(DataElementTableInfo.Columns.VALUE_TYPE, params.valueTypes.map { it.valueType })
@@ -105,7 +105,7 @@ internal class FileResourceDownloadCallHelper @Inject constructor(
 
     fun getMissingAggregatedDataValues(
         params: FileResourceDownloadParams,
-        existingFileResources: List<String>
+        existingFileResources: List<String>,
     ): List<DataValue> {
         val dataElementUidsWhereClause = WhereClauseBuilder()
             .appendInKeyEnumValues(DataElementTableInfo.Columns.VALUE_TYPE, params.valueTypes.map { it.valueType })
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadParams.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadParams.kt
index 707e607a51..58c9c2c060 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadParams.kt
@@ -36,5 +36,5 @@ internal data class FileResourceDownloadParams(
     val valueTypes: List<FileResourceValueType> = FileResourceValueType.values().asList(),
     val elementTypes: List<FileResourceElementType> = FileResourceElementType.values().asList(),
     val domainTypes: List<FileResourceDomainType> = FileResourceDomainType.values().asList(),
-    val maxContentLength: Int? = null
+    val maxContentLength: Int? = null,
 ) : BaseScope
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
index 0ca96cfece..f1829b1ef6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDele
 import org.hisp.dhis.android.core.fileresource.FileResource
 
 internal class FileResourceHandler(
-    store: FileResourceStore
+    store: FileResourceStore,
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<FileResource>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
index 06aa2cab23..a552ed0a9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.fileresource.internal
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
@@ -43,6 +42,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeS
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
 internal class FileResourceHelper @Inject constructor(
@@ -53,7 +53,7 @@ internal class FileResourceHelper @Inject constructor(
     private val eventStore: EventStore,
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val dataValueStore: DataValueStore,
-    private val fileResourceStore: FileResourceStore
+    private val fileResourceStore: FileResourceStore,
 ) {
 
     fun getUploadableFileResources(): List<FileResource> {
@@ -68,7 +68,7 @@ internal class FileResourceHelper @Inject constructor(
 
     fun isPresentInAttributeValues(
         fileResourceUid: String,
-        attributeValues: Collection<TrackedEntityAttributeValue>?
+        attributeValues: Collection<TrackedEntityAttributeValue>?,
     ): Boolean {
         return attributeValues?.any {
             fileResourceUid == it.value() && isFileAttribute(it.trackedEntityAttribute())
@@ -77,7 +77,7 @@ internal class FileResourceHelper @Inject constructor(
 
     fun findAttributeFileResource(
         attributeValue: NewTrackerImporterTrackedEntityAttributeValue,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): FileResource? {
         return fileResources.find {
             it.uid() == attributeValue.value() && isFileAttribute(attributeValue.trackedEntityAttribute())
@@ -86,7 +86,7 @@ internal class FileResourceHelper @Inject constructor(
 
     fun findAttributeFileResource(
         attributeValue: TrackedEntityAttributeValue,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): FileResource? {
         return fileResources.find {
             it.uid() == attributeValue.value() && isFileAttribute(attributeValue.trackedEntityAttribute())
@@ -95,7 +95,7 @@ internal class FileResourceHelper @Inject constructor(
 
     fun findDataValueFileResource(
         dataValue: NewTrackerImporterTrackedEntityDataValue,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): FileResource? {
         return fileResources.find {
             it.uid() == dataValue.value() && isFileDataElement(dataValue.dataElement())
@@ -104,7 +104,7 @@ internal class FileResourceHelper @Inject constructor(
 
     fun findDataValueFileResource(
         dataValue: TrackedEntityDataValue,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): FileResource? {
         return fileResources.find {
             it.uid() == dataValue.value() && isFileDataElement(dataValue.dataElement())
@@ -113,7 +113,7 @@ internal class FileResourceHelper @Inject constructor(
 
     fun findDataValueFileResource(
         dataValue: DataValue,
-        fileResource: List<FileResource>
+        fileResource: List<FileResource>,
     ): FileResource? {
         return fileResource.find {
             it.uid() == dataValue.value() && isFileDataElement(dataValue.dataElement())
@@ -144,7 +144,7 @@ internal class FileResourceHelper @Inject constructor(
         val candidates = trackedEntityDataValueStore.selectWhere(
             WhereClauseBuilder()
                 .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.VALUE, fileResourceUid)
-                .build()
+                .build(),
         )
         val dataValue = candidates.find { isFileDataElement(it.dataElement()) }
 
@@ -155,7 +155,7 @@ internal class FileResourceHelper @Inject constructor(
         val candidates = trackedEntityAttributeValueStore.selectWhere(
             WhereClauseBuilder()
                 .appendKeyStringValue(TrackedEntityAttributeValueTableInfo.Columns.VALUE, fileResourceUid)
-                .build()
+                .build(),
         )
         val attributeValue = candidates.find { isFileAttribute(it.trackedEntityAttribute()) }
 
@@ -166,7 +166,7 @@ internal class FileResourceHelper @Inject constructor(
         val candidates = dataValueStore.selectWhere(
             WhereClauseBuilder()
                 .appendKeyStringValue(DataValueTableInfo.Columns.VALUE, fileResourceUid)
-                .build()
+                .build(),
         )
         return candidates.find { isFileDataElement(it.dataElement()) }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt
index d13104b664..a6b5688f49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt
@@ -29,14 +29,14 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.fileresource.*
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourceModuleImpl @Inject internal constructor(
     private val fileResources: FileResourceCollectionRepository,
-    private val fileResourceDownloader: FileResourceDownloader
+    private val fileResourceDownloader: FileResourceDownloader,
 ) : FileResourceModule {
 
     @Deprecated(
@@ -47,8 +47,8 @@ internal class FileResourceModuleImpl @Inject internal constructor(
                 "            .byValueType().eq(FileResourceValueType.IMAGE)\n" +
                 "            .download()",
             "org.hisp.dhis.android.core.fileresource.FileResourceDomainType",
-            "org.hisp.dhis.android.core.fileresource.FileResourceValueType"
-        )
+            "org.hisp.dhis.android.core.fileresource.FileResourceValueType",
+        ),
     )
     override fun download(): Observable<D2Progress> {
         return fileResourceDownloader()
@@ -65,8 +65,8 @@ internal class FileResourceModuleImpl @Inject internal constructor(
                 "            .byValueType().eq(FileResourceValueType.IMAGE)\n" +
                 "            .blockingDownload()",
             "org.hisp.dhis.android.core.fileresource.FileResourceDomainType",
-            "org.hisp.dhis.android.core.fileresource.FileResourceValueType"
-        )
+            "org.hisp.dhis.android.core.fileresource.FileResourceValueType",
+        ),
     )
     override fun blockingDownload() {
         download().blockingSubscribe()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt
index 9718ce12b6..21dd853866 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import android.content.Context
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.fileresource.FileResourceTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourceModuleWiper @Inject constructor(
     private val tableWiper: TableWiper,
-    private val context: Context
+    private val context: Context,
 ) : ModuleWiper {
 
     override fun wipeMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt
index 9b8923a4de..ab46501185 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt
@@ -35,8 +35,8 @@ import retrofit2.Retrofit
 
 @Module(
     includes = [
-        FileResourceEntityDIModule::class
-    ]
+        FileResourceEntityDIModule::class,
+    ],
 )
 internal class FileResourcePackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
index 4b0128ff70..ee27e6dc66 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
@@ -31,9 +31,6 @@ import android.content.Context
 import android.util.Log
 import android.webkit.MimeTypeMap
 import dagger.Reusable
-import java.io.File
-import java.io.IOException
-import javax.inject.Inject
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
@@ -50,6 +47,9 @@ import org.hisp.dhis.android.core.systeminfo.internal.PingCall
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
+import java.io.File
+import java.io.IOException
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourcePostCall @Inject constructor(
@@ -61,7 +61,7 @@ internal class FileResourcePostCall @Inject constructor(
     private val fileResourceStore: FileResourceStore,
     private val fileResourceHandler: FileResourceHandler,
     private val pingCall: PingCall,
-    private val context: Context
+    private val context: Context,
 ) {
 
     private var alreadyPinged = false
@@ -99,7 +99,7 @@ internal class FileResourcePostCall @Inject constructor(
         responseBody: String,
         fileResource: FileResource,
         file: File,
-        value: FileResourceValue
+        value: FileResourceValue,
     ): String {
         try {
             val downloadedFileResource = getDownloadedFileResource(responseBody)
@@ -134,7 +134,7 @@ internal class FileResourcePostCall @Inject constructor(
     private fun updateValue(
         fileResource: FileResource,
         newUid: String?,
-        value: FileResourceValue
+        value: FileResourceValue,
     ) {
         val updateValueMethod = when (value) {
             is FileResourceValue.DataValue -> ::updateAggregatedDataValue
@@ -166,7 +166,7 @@ internal class FileResourcePostCall @Inject constructor(
     private fun updateTrackedEntityAttributeValue(
         fileResource: FileResource,
         newUid: String?,
-        elementUid: String
+        elementUid: String,
     ): Boolean {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(TrackedEntityAttributeValueTableInfo.Columns.VALUE, fileResource.uid())
@@ -177,7 +177,7 @@ internal class FileResourcePostCall @Inject constructor(
             trackedEntityAttributeValueStore.updateWhere(
                 attributeValue.toBuilder()
                     .value(newUid)
-                    .build()
+                    .build(),
             )
             true
         } ?: false
@@ -193,7 +193,7 @@ internal class FileResourcePostCall @Inject constructor(
             trackedEntityDataValueStore.updateWhere(
                 dataValue.toBuilder()
                     .value(newUid)
-                    .build()
+                    .build(),
             )
         }
     }
@@ -201,14 +201,14 @@ internal class FileResourcePostCall @Inject constructor(
     private fun updateFileResource(
         fileResource: FileResource,
         downloadedFileResource: FileResource,
-        file: File
+        file: File,
     ) {
         fileResourceStore.delete(fileResource.uid()!!)
         fileResourceHandler.handle(
             downloadedFileResource.toBuilder()
                 .syncState(State.UPLOADING)
                 .path(file.absolutePath)
-                .build()
+                .build(),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
index 7682e5a9b5..5a9e48ab6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import dagger.Reusable
-import java.io.File
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomain
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.getContentTypeFromName
+import java.io.File
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class FileResourceProjectionTransformer @Inject constructor() : Transformer<File, FileResource> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
index 6b519644ad..6691dd86ab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceService.kt
@@ -45,20 +45,20 @@ internal interface FileResourceService {
     suspend fun getImageFromTrackedEntityAttribute(
         @Path(TRACKED_ENTITY_INSTANCE) trackedEntityInstanceUid: String,
         @Path(TRACKED_ENTITY_ATTRIBUTE) trackedEntityAttributeUid: String,
-        @Query("dimension") dimension: String
+        @Query("dimension") dimension: String,
     ): ResponseBody
 
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTANCE}/{$TRACKED_ENTITY_ATTRIBUTE}/file")
     suspend fun getFileFromTrackedEntityAttribute(
         @Path(TRACKED_ENTITY_INSTANCE) trackedEntityInstanceUid: String,
-        @Path(TRACKED_ENTITY_ATTRIBUTE) trackedEntityAttributeUid: String
+        @Path(TRACKED_ENTITY_ATTRIBUTE) trackedEntityAttributeUid: String,
     ): ResponseBody
 
     @GET("$EVENTS/files")
     suspend fun getFileFromEventValue(
         @Query("eventUid") eventUid: String,
         @Query("dataElementUid") dataElementUid: String,
-        @Query("dimension") dimension: String
+        @Query("dimension") dimension: String,
     ): ResponseBody
 
     @GET("$DATA_VALUES/files")
@@ -67,7 +67,7 @@ internal interface FileResourceService {
         @Query("pe") period: String,
         @Query("ou") organisationUnit: String,
         @Query("co") categoryOptionCombo: String,
-        @Query("dimension") dimension: String
+        @Query("dimension") dimension: String,
     ): ResponseBody
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
index 4dba0f91c8..42b0e256f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
@@ -36,13 +36,13 @@ import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceTableInfo
 
 internal class FileResourceStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : FileResourceStore,
     IdentifiableDataObjectStoreImpl<FileResource>(
         databaseAdapter,
         FileResourceTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> FileResource.create(cursor) }
+        { cursor: Cursor -> FileResource.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt
index f1eccac22d..aa5dbdd54d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceUtil.kt
@@ -29,11 +29,11 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import android.content.Context
 import android.util.Log
-import java.io.*
-import java.net.URLConnection
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.fileresource.FileResource
+import java.io.*
+import java.net.URLConnection
 
 internal object FileResourceUtil {
 
@@ -74,7 +74,7 @@ internal object FileResourceUtil {
     fun saveFileFromResponse(body: ResponseBody, fileResource: FileResource, context: Context): File {
         val destinationFile = File(
             FileResourceDirectoryHelper.getFileResourceDirectory(context),
-            generateFileName(fileResource.uid()!!, getExtension(fileResource.name()!!))
+            generateFileName(fileResource.uid()!!, getExtension(fileResource.name()!!)),
         )
         writeInputStream(body.byteStream(), destinationFile, body.contentLength())
         return destinationFile
@@ -104,7 +104,7 @@ internal object FileResourceUtil {
                 outputStream?.close()
                 Log.d(
                     FileResourceUtil::class.java.canonicalName,
-                    "file saved. Size: $fileSize"
+                    "file saved. Size: $fileSize",
                 )
             } catch (e: IOException) {
                 logMessage(e)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/MissingTrackerAttributeValue.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/MissingTrackerAttributeValue.kt
index c1e3d62af8..1e6b86a04b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/MissingTrackerAttributeValue.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/MissingTrackerAttributeValue.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 
 internal data class MissingTrackerAttributeValue(
     val value: TrackedEntityAttributeValue,
-    val valueType: ValueType
+    val valueType: ValueType,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt
index 8d84efe506..d51bdaa247 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.imports
 
 import io.reactivex.Observable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
+import javax.inject.Inject
 
 class TrackerJobManager @Inject internal constructor(
-    private val jobQueryCall: JobQueryCall
+    private val jobQueryCall: JobQueryCall,
 ) {
     fun resumePendingJobs(): Observable<D2Progress> {
         return jobQueryCall.queryPendingJobs()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
index 6f3998a042..ddc770b682 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/DataValueImportSummaryWebResponse.kt
@@ -32,7 +32,7 @@ data class DataValueImportSummaryWebResponse(
     val httpStatus: String,
     val httpStatusCode: Int,
     val status: String,
-    val message: String
+    val message: String,
 ) : WebResponse() {
     override fun httpStatus() = httpStatus
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ItemsWithFileResources.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ItemsWithFileResources.kt
index e846efc540..09cb2f8406 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ItemsWithFileResources.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ItemsWithFileResources.kt
@@ -29,5 +29,5 @@ package org.hisp.dhis.android.core.imports.internal
 
 internal data class ItemsWithFileResources<T> (
     val items: List<T>,
-    val fileResources: List<String>
+    val fileResources: List<String>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
index 1f410e22eb..c7d9d1d9f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
@@ -28,23 +28,23 @@
 package org.hisp.dhis.android.core.imports.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceImportHandler
+import javax.inject.Inject
 
 @Reusable
 internal class TEIWebResponseHandler @Inject constructor(
-    private val trackedEntityInstanceImportHandler: TrackedEntityInstanceImportHandler
+    private val trackedEntityInstanceImportHandler: TrackedEntityInstanceImportHandler,
 ) {
 
     fun handleWebResponse(
         webResponse: TEIWebResponse?,
-        instances: List<TrackedEntityInstance>
+        instances: List<TrackedEntityInstance>,
     ): TEIWebResponseHandlerSummary {
         return webResponse?.response()?.let { response ->
             trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
                 response.importSummaries(),
-                instances
+                instances,
             )
         } ?: TEIWebResponseHandlerSummary()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandlerSummary.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandlerSummary.kt
index 46e96f2be1..91af5c6a58 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandlerSummary.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandlerSummary.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 internal data class TEIWebResponseHandlerSummary(
     val teis: TrackerResponseHandlerSummary<TrackedEntityInstance> = TrackerResponseHandlerSummary(),
     val enrollments: TrackerResponseHandlerSummary<Enrollment> = TrackerResponseHandlerSummary(),
-    val events: TrackerResponseHandlerSummary<Event> = TrackerResponseHandlerSummary()
+    val events: TrackerResponseHandlerSummary<Event> = TrackerResponseHandlerSummary(),
 ) {
     fun add(other: TEIWebResponseHandlerSummary) {
         teis.add(other.teis)
@@ -53,7 +53,7 @@ internal data class TEIWebResponseHandlerSummary(
 internal data class TrackerResponseHandlerSummary<E : ObjectWithUidInterface>(
     val success: MutableList<E> = mutableListOf(),
     val error: MutableList<E> = mutableListOf(),
-    val ignored: MutableList<E> = mutableListOf()
+    val ignored: MutableList<E> = mutableListOf(),
 ) {
     fun add(other: TrackerResponseHandlerSummary<E>) {
         success.addAll(other.success)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
index 0b25b927bc..cb4fab83fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.imports.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
 import org.hisp.dhis.android.core.imports.internal.conflicts.BadAttributePatternConflict
@@ -53,13 +52,14 @@ import org.hisp.dhis.android.core.imports.internal.conflicts.TrackerImportConfli
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerImportConflictParser @Inject constructor(
     attributeStore: TrackedEntityAttributeStore,
     dataElementStore: DataElementStore,
     private val trackedEntityAttributeValueRepository: TrackedEntityAttributeValueCollectionRepository,
-    private val trackedEntityInstanceDataValueRepository: TrackedEntityDataValueCollectionRepository
+    private val trackedEntityInstanceDataValueRepository: TrackedEntityDataValueCollectionRepository,
 ) {
 
     private val context = TrackerImportConflictItemContext(attributeStore, dataElementStore)
@@ -74,7 +74,7 @@ internal class TrackerImportConflictParser @Inject constructor(
         EnrollmentNotFoundConflict,
         EnrollmentHasInvalidProgramConflict,
         FileResourceAlreadyAssignedConflict,
-        FileResourceReferenceNotFoundConflict
+        FileResourceReferenceNotFoundConflict,
     )
 
     private val trackedEntityInstanceConflicts: List<TrackerImportConflictItem> = commonConflicts + listOf(
@@ -82,38 +82,38 @@ internal class TrackerImportConflictParser @Inject constructor(
         MissingAttributeConflict,
         BadAttributePatternConflict,
         NonUniqueAttributeConflict,
-        InvalidTrackedEntityTypeConflict
+        InvalidTrackedEntityTypeConflict,
     )
 
     private val enrollmentConflicts: List<TrackerImportConflictItem> = commonConflicts + listOf(
         InvalidAttributeValueTypeConflict,
         MissingAttributeConflict,
         BadAttributePatternConflict,
-        NonUniqueAttributeConflict
+        NonUniqueAttributeConflict,
     )
 
     private val eventConflicts: List<TrackerImportConflictItem> = commonConflicts + listOf(
         InvalidDataValueConflict,
-        MissingDataElementConflict
+        MissingDataElementConflict,
     )
 
     fun getTrackedEntityInstanceConflict(
         conflict: ImportConflict,
-        conflictBuilder: TrackerImportConflict.Builder
+        conflictBuilder: TrackerImportConflict.Builder,
     ): TrackerImportConflict {
         return evaluateConflicts(conflict, conflictBuilder, trackedEntityInstanceConflicts)
     }
 
     fun getEnrollmentConflict(
         conflict: ImportConflict,
-        conflictBuilder: TrackerImportConflict.Builder
+        conflictBuilder: TrackerImportConflict.Builder,
     ): TrackerImportConflict {
         return evaluateConflicts(conflict, conflictBuilder, enrollmentConflicts)
     }
 
     fun getEventConflict(
         conflict: ImportConflict,
-        conflictBuilder: TrackerImportConflict.Builder
+        conflictBuilder: TrackerImportConflict.Builder,
     ): TrackerImportConflict {
         return evaluateConflicts(conflict, conflictBuilder, eventConflicts)
     }
@@ -121,7 +121,7 @@ internal class TrackerImportConflictParser @Inject constructor(
     private fun evaluateConflicts(
         conflict: ImportConflict,
         conflictBuilder: TrackerImportConflict.Builder,
-        conflictTypes: List<TrackerImportConflictItem>
+        conflictTypes: List<TrackerImportConflictItem>,
     ): TrackerImportConflict {
         val conflictType = conflictTypes.find { it.matches(conflict) }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
index a8d6283576..85e3fa6116 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
@@ -41,20 +41,20 @@ import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
 
 internal class TrackerImportConflictStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackerImportConflictStore,
     ObjectStoreImpl<TrackerImportConflict>(
         databaseAdapter,
         TrackerImportConflictTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> TrackerImportConflict.create(cursor) }
+        { cursor: Cursor -> TrackerImportConflict.create(cursor) },
     ) {
 
     override fun deleteEventConflicts(eventUid: String) {
         deleteTypeConflicts(
             TrackerImportConflictTableInfo.Columns.EVENT,
             EventTableInfo.TABLE_INFO,
-            eventUid
+            eventUid,
         )
     }
 
@@ -62,7 +62,7 @@ internal class TrackerImportConflictStoreImpl(
         deleteTypeConflicts(
             TrackerImportConflictTableInfo.Columns.ENROLLMENT,
             EnrollmentTableInfo.TABLE_INFO,
-            enrollmentUid
+            enrollmentUid,
         )
     }
 
@@ -70,7 +70,7 @@ internal class TrackerImportConflictStoreImpl(
         deleteTypeConflicts(
             TrackerImportConflictTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
             TrackedEntityInstanceTableInfo.TABLE_INFO,
-            tackedEntityUid
+            tackedEntityUid,
         )
     }
 
@@ -79,7 +79,7 @@ internal class TrackerImportConflictStoreImpl(
             .appendKeyStringValue(column, uid)
             .appendKeyStringValue(
                 TrackerImportConflictTableInfo.Columns.TABLE_REFERENCE,
-                tableInfo.name()
+                tableInfo.name(),
             )
             .build()
         deleteWhereIfExists(whereClause)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/BadAttributePatternConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/BadAttributePatternConflict.kt
index c8a071a77e..131eeab85d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/BadAttributePatternConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/BadAttributePatternConflict.kt
@@ -41,7 +41,7 @@ internal object BadAttributePatternConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return conflict.value()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentHasInvalidProgramConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentHasInvalidProgramConflict.kt
index d997812019..2d1f5320f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentHasInvalidProgramConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentHasInvalidProgramConflict.kt
@@ -46,7 +46,7 @@ internal object EnrollmentHasInvalidProgramConflict : TrackerImportConflictItem
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getEnrollment(conflict)?.let { enrollmentUid ->
             description(enrollmentUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentNotFoundConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentNotFoundConflict.kt
index 1e8c6b5435..bcb98e83cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentNotFoundConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EnrollmentNotFoundConflict.kt
@@ -47,7 +47,7 @@ internal object EnrollmentNotFoundConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getEnrollment(conflict)?.let { enrollmentUid ->
             description(enrollmentUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramConflict.kt
index fdc3267402..ae1cb43c26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramConflict.kt
@@ -46,7 +46,7 @@ internal object EventHasInvalidProgramConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getEvent(conflict)?.let { eventUid ->
             description(eventUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramStageConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramStageConflict.kt
index cda10a9d05..ae19938c7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramStageConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventHasInvalidProgramStageConflict.kt
@@ -46,7 +46,7 @@ internal object EventHasInvalidProgramStageConflict : TrackerImportConflictItem
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getEvent(conflict)?.let { eventUid ->
             description(eventUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventNotFoundConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventNotFoundConflict.kt
index c2d110a444..b567e92481 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventNotFoundConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/EventNotFoundConflict.kt
@@ -46,7 +46,7 @@ internal object EventNotFoundConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getEvent(conflict)?.let { eventUid ->
             description(eventUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceAlreadyAssignedConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceAlreadyAssignedConflict.kt
index 47ee73308f..dd647fac60 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceAlreadyAssignedConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceAlreadyAssignedConflict.kt
@@ -33,7 +33,7 @@ internal object FileResourceAlreadyAssignedConflict : TrackerImportConflictItem
 
     private val regex: Regex = Regex(
         "File resource with uid '(\\w{11})' has already been assigned to " +
-            "a different object"
+            "a different object",
     )
     private fun description(fileResourceUid: String) = "The file $fileResourceUid has already been assigned"
 
@@ -49,7 +49,7 @@ internal object FileResourceAlreadyAssignedConflict : TrackerImportConflictItem
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getFileResource(conflict)?.let { fileResourceUid ->
             description(fileResourceUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceReferenceNotFoundConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceReferenceNotFoundConflict.kt
index 43a0d4db98..ac0f59e772 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceReferenceNotFoundConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/FileResourceReferenceNotFoundConflict.kt
@@ -46,7 +46,7 @@ internal object FileResourceReferenceNotFoundConflict : TrackerImportConflictIte
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getFileResource(conflict)?.let { fileResourceUid ->
             description(fileResourceUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt
index 1c84617673..5d521b255e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflict.kt
@@ -39,7 +39,7 @@ internal object InvalidAttributeValueTypeConflict : TrackerImportConflictItem {
         Regex("Value '[\\w|\\s]*' is not a valid datetime for attribute (\\w{11})"),
         Regex("Value '[\\w|\\s]*' is not a valid username for attribute (\\w{11})"),
         Regex("Value '[\\w|\\s]*' is not the uid of a file"),
-        Regex("Value '[\\w|\\s]*' is not a valid option for attribute (\\w{11}) and option set [\\w|\\s]*")
+        Regex("Value '[\\w|\\s]*' is not a valid option for attribute (\\w{11}) and option set [\\w|\\s]*"),
     )
 
     private fun description(attribute: String?) = "Invalid value type for attribute: $attribute"
@@ -56,7 +56,7 @@ internal object InvalidAttributeValueTypeConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getTrackedEntityAttribute(conflict)?.let { attributeUid ->
             context.attributeStore.selectByUid(attributeUid)?.let { attribute ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt
index 8912e4b3a0..d527537141 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidDataValueConflict.kt
@@ -45,7 +45,7 @@ internal object InvalidDataValueConflict : TrackerImportConflictItem {
         "value_not_valid_datetime",
         "value_not_coordinate",
         "value_not_url",
-        "value_not_valid_file_resource_uid"
+        "value_not_valid_file_resource_uid",
     )
 
     private fun description(dataElementId: String) = "Invalid value type for dataElement: $dataElementId"
@@ -62,7 +62,7 @@ internal object InvalidDataValueConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getDataElement(conflict)?.let { dataElementUid ->
             context.dataElementStore.selectByUid(dataElementUid)?.let { dataElement ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidTrackedEntityTypeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidTrackedEntityTypeConflict.kt
index a6812d5894..899600051b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidTrackedEntityTypeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidTrackedEntityTypeConflict.kt
@@ -47,7 +47,7 @@ internal object InvalidTrackedEntityTypeConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getTrackedEntityInstance(conflict)?.let { trackedEntityInstanceUid ->
             description(trackedEntityInstanceUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingEnrollmentCascadeDeleteAuthorityConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingEnrollmentCascadeDeleteAuthorityConflict.kt
index 7a304718b2..ef49f14078 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingEnrollmentCascadeDeleteAuthorityConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingEnrollmentCascadeDeleteAuthorityConflict.kt
@@ -33,7 +33,7 @@ internal object LackingEnrollmentCascadeDeleteAuthorityConflict : TrackerImportC
 
     private val regex: Regex = Regex(
         "Enrollment (\\w{11}) cannot be deleted as it has associated" +
-            " events and user does not have authority: F_ENROLLMENT_CASCADE_DELETE"
+            " events and user does not have authority: F_ENROLLMENT_CASCADE_DELETE",
     )
     private fun description(enrollment: String) = "You lack the authority to delete the enrollment: $enrollment"
 
@@ -49,7 +49,7 @@ internal object LackingEnrollmentCascadeDeleteAuthorityConflict : TrackerImportC
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getEnrollment(conflict)?.let { enrollmentUid ->
             description(enrollmentUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingTEICascadeDeleteAuthorityConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingTEICascadeDeleteAuthorityConflict.kt
index 03b349b203..df3dcdc237 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingTEICascadeDeleteAuthorityConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/LackingTEICascadeDeleteAuthorityConflict.kt
@@ -33,7 +33,7 @@ internal object LackingTEICascadeDeleteAuthorityConflict : TrackerImportConflict
 
     private val regex: Regex = Regex(
         "Tracked entity instance (\\w{11}) cannot be deleted as it has associated" +
-            " enrollments and user does not have authority F_TEI_CASCADE_DELETE"
+            " enrollments and user does not have authority F_TEI_CASCADE_DELETE",
     )
     private fun description(trackedEntityInstance: String) =
         "You lack the authority to delete the entity: $trackedEntityInstance"
@@ -50,7 +50,7 @@ internal object LackingTEICascadeDeleteAuthorityConflict : TrackerImportConflict
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getTrackedEntityInstance(conflict)?.let { trackedEntityInstanceUid ->
             description(trackedEntityInstanceUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt
index b46412eb83..96c7c02b36 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingAttributeConflict.kt
@@ -46,7 +46,7 @@ internal object MissingAttributeConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getTrackedEntityAttribute(conflict)?.let { attributeUid ->
             context.attributeStore.selectByUid(attributeUid)?.let { attribute ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt
index 5fb632729d..19eec95469 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/MissingDataElementConflict.kt
@@ -47,7 +47,7 @@ internal object MissingDataElementConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getDataElement(conflict)?.let { dataElementUid ->
             context.dataElementStore.selectByUid(dataElementUid)?.let { dataElement ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt
index ac846acb12..466e7ee6db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/NonUniqueAttributeConflict.kt
@@ -46,7 +46,7 @@ internal object NonUniqueAttributeConflict : TrackerImportConflictItem {
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getTrackedEntityAttribute(conflict)?.let { attributeUid ->
             context.attributeStore.selectByUid(attributeUid)?.let { attribute ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedEntityInstanceNotFoundConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedEntityInstanceNotFoundConflict.kt
index fa3bb2a637..91b65a0419 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedEntityInstanceNotFoundConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedEntityInstanceNotFoundConflict.kt
@@ -47,7 +47,7 @@ internal object TrackedEntityInstanceNotFoundConflict : TrackerImportConflictIte
 
     override fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String {
         return getTrackedEntityInstance(conflict)?.let { trackedEntityInstanceUid ->
             description(trackedEntityInstanceUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItem.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItem.kt
index 472268ab1c..bb2c0c53c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItem.kt
@@ -40,6 +40,6 @@ internal interface TrackerImportConflictItem {
     fun getFileResource(conflict: ImportConflict): String? { return null }
     fun getDisplayDescription(
         conflict: ImportConflict,
-        context: TrackerImportConflictItemContext
+        context: TrackerImportConflictItemContext,
     ): String
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt
index b8927be88d..e2ad962c69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 
 internal class TrackerImportConflictItemContext(
     val attributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
-    val dataElementStore: IdentifiableObjectStore<DataElement>
+    val dataElementStore: IdentifiableObjectStore<DataElement>,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt
index 5093e16237..f902861cda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorLegendSetLinkTableInfo.kt
@@ -50,7 +50,7 @@ class IndicatorLegendSetLinkTableInfo {
         val CHILD_PROJECTION = LinkTableChildProjection(
             LegendSetTableInfo.TABLE_INFO,
             Columns.INDICATOR,
-            Columns.LEGEND_SET
+            Columns.LEGEND_SET,
         )
     }
 
@@ -60,7 +60,7 @@ class IndicatorLegendSetLinkTableInfo {
                 super.all(),
                 INDICATOR,
                 LEGEND_SET,
-                SORT_ORDER
+                SORT_ORDER,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
index a049d99533..ce69df8dfd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTableInfo.kt
@@ -55,7 +55,7 @@ object IndicatorTableInfo {
                 DENOMINATOR,
                 DENOMINATOR_DESCRIPTION,
                 URL,
-                DECIMALS
+                DECIMALS,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt
index c6a8e11ea8..bc07f9d0d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeTableInfo.kt
@@ -49,7 +49,7 @@ object IndicatorTypeTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 NUMBER,
-                FACTOR
+                FACTOR,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngine.kt
index 07835dfeb6..d83d2c1ffd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngine.kt
@@ -36,7 +36,7 @@ interface DataSetIndicatorEngine {
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<Double>
 
     fun blockingEvaluate(
@@ -44,6 +44,6 @@ interface DataSetIndicatorEngine {
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Double
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
index c8858978ff..229dd4aa78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.indicator.datasetindicatorengine
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantCollectionRepository
@@ -45,6 +44,7 @@ import org.hisp.dhis.android.core.parser.internal.service.dataobject.Dimensional
 import org.hisp.dhis.android.core.parser.internal.service.utils.ExpressionHelper
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetIndicatorEngineImpl @Inject constructor(
@@ -54,7 +54,7 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
     private val constantRepository: ConstantCollectionRepository,
     private val orgunitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore,
     private val periodHelper: PeriodHelper,
-    private val dataSetIndicatorEvaluator: DataSetIndicatorEvaluator
+    private val dataSetIndicatorEvaluator: DataSetIndicatorEvaluator,
 ) : DataSetIndicatorEngine {
 
     override fun evaluate(
@@ -62,7 +62,7 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<Double> {
         return Single.fromCallable {
             blockingEvaluate(indicatorUid, dataSetUid, periodId, orgUnitUid, attributeOptionComboUid)
@@ -74,7 +74,7 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Double {
         val indicator = indicatorRepository.uid(indicatorUid).blockingGet()
         val indicatorType = indicatorTypeRepository.uid(indicator?.indicatorType()?.uid()).blockingGet()
@@ -84,13 +84,13 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
                 valueMap = getValueMap(dataSetUid, attributeOptionComboUid, orgUnitUid, periodId),
                 constantMap = getConstantMap(),
                 orgUnitCountMap = getOrgunitGroupMap(),
-                days = PeriodHelper.getDays(getPeriod(periodId))
+                days = PeriodHelper.getDays(getPeriod(periodId)),
             )
 
             dataSetIndicatorEvaluator.evaluate(
                 indicator = indicator,
                 indicatorType = indicatorType,
-                context = context
+                context = context,
             )
         } else {
             ParserUtils.DOUBLE_VALUE_IF_NULL
@@ -101,7 +101,7 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
         dataSetUid: String,
         attributeOptionComboUid: String,
         orgUnitUid: String,
-        periodId: String
+        periodId: String,
     ): Map<DimensionalItemObject, Double> {
         val dataValues: List<DataValue> = dataValueRepository
             .byDataSetUid(dataSetUid)
@@ -121,7 +121,7 @@ internal class DataSetIndicatorEngineImpl @Inject constructor(
 
     private fun getOrgunitGroupMap(): Map<String, Int> {
         return orgunitGroupLinkStore.groupAndGetCountBy(
-            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP
+            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
index 64db2bc81c..7157502826 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.indicator.datasetindicatorengine
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorType
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
 import org.hisp.dhis.android.core.validation.MissingValueStrategy
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetIndicatorEvaluator @Inject constructor(private val expressionService: ExpressionService) {
@@ -42,18 +42,18 @@ internal class DataSetIndicatorEvaluator @Inject constructor(private val express
     fun evaluate(
         indicator: Indicator,
         indicatorType: IndicatorType,
-        context: ExpressionServiceContext
+        context: ExpressionServiceContext,
     ): Double {
         val numerator = expressionService.getExpressionValue(
             indicator.numerator(),
             context,
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double
 
         val denominator = expressionService.getExpressionValue(
             indicator.denominator(),
             context,
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double
 
         val formula = "$numerator * ${indicatorType.factor() ?: 1} / $denominator"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt
index 0eb7bd5afa..0db314333a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.TABLE_INFO
 
 internal class DataSetIndicatorChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<DataSet, Indicator>
+    private val linkChildStore: LinkChildStore<DataSet, Indicator>,
 ) : ChildrenAppender<DataSet>() {
     override fun appendChildren(m: DataSet): DataSet {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class DataSetIndicatorChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             TABLE_INFO,
             DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
-            DataSetIndicatorLinkTableInfo.Columns.INDICATOR
+            DataSetIndicatorLinkTableInfo.Columns.INDICATOR,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<DataSet> {
@@ -59,8 +59,8 @@ internal class DataSetIndicatorChildrenAppender private constructor(
                 linkChildStore(
                     databaseAdapter,
                     DataSetIndicatorLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> Indicator.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> Indicator.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
index 11a94c4b95..de4f5e30fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.Indicator
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetIndicatorLinkHandler @Inject constructor(
-    store: DataSetIndicatorLinkStore
+    store: DataSetIndicatorLinkStore,
 ) : LinkHandlerImpl<Indicator, DataSetIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
index f4648aabfd..72121d5d07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
 
 internal class DataSetIndicatorLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetIndicatorLinkStore,
     LinkStoreImpl<DataSetIndicatorLink>(
         databaseAdapter,
         DataSetIndicatorLinkTableInfo.TABLE_INFO,
         DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
         BINDER,
-        { cursor: Cursor -> DataSetIndicatorLink.create(cursor) }
+        { cursor: Cursor -> DataSetIndicatorLink.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: DataSetIndicatorLink, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
index 70a48cc9fe..cac26edbaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class IndicatorEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Indicator>> {
         return mapOf(
-            IndicatorFields.LEGEND_SETS to IndicatorLegendSetChildrenAppender.create(databaseAdapter)
+            IndicatorFields.LEGEND_SETS to IndicatorLegendSetChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
index 8f4c3a9b71..556502aac0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
@@ -29,17 +29,17 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.internal.IndicatorLegendSetLinkHandler
+import javax.inject.Inject
 
 @Reusable
 internal class IndicatorHandler @Inject constructor(
     indicatorStore: IndicatorStore,
-    private val indicatorLegendSetLinkHandler: IndicatorLegendSetLinkHandler
+    private val indicatorLegendSetLinkHandler: IndicatorLegendSetLinkHandler,
 ) : IdentifiableHandlerImpl<Indicator>(indicatorStore) {
 
     override fun afterObjectHandled(o: Indicator, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorLegendSetChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorLegendSetChildrenAppender.kt
index d6cb14af4e..2845d24740 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorLegendSetChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorLegendSetChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorLegendSetLinkTableInfo
 
 internal class IndicatorLegendSetChildrenAppender(
-    private val linkChildStore: ObjectWithUidChildStore<Indicator>
+    private val linkChildStore: ObjectWithUidChildStore<Indicator>,
 ) : ChildrenAppender<Indicator>() {
 
     override fun appendChildren(indicator: Indicator): Indicator {
@@ -51,8 +51,8 @@ internal class IndicatorLegendSetChildrenAppender(
                 StoreFactory.objectWithUidChildStore(
                     databaseAdapter,
                     IndicatorLegendSetLinkTableInfo.TABLE_INFO,
-                    IndicatorLegendSetLinkTableInfo.CHILD_PROJECTION
-                )
+                    IndicatorLegendSetLinkTableInfo.CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
index b24007071a..7691c9f388 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
@@ -29,17 +29,17 @@ package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorType
+import javax.inject.Inject
 
 @Reusable
 class IndicatorModuleDownloader @Inject internal constructor(
     private val indicatorCallFactory: UidsCallFactory<Indicator>,
     private val indicatorTypeCallFactory: UidsCallFactory<IndicatorType>,
-    private val indicatorUidsSeeker: IndicatorUidsSeeker
+    private val indicatorUidsSeeker: IndicatorUidsSeeker,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
index 8234600b8e..8d4bcf58bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
@@ -42,8 +42,8 @@ import retrofit2.Retrofit
         DataSetIndicatorEntityDIModule::class,
         IndicatorEntityDIModule::class,
         IndicatorTypeEntityDIModule::class,
-        IndicatorEngineEntityDIModule::class
-    ]
+        IndicatorEngineEntityDIModule::class,
+    ],
 )
 internal class IndicatorPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
index 2f1c5a8676..f0b94d319f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.TABLE_INFO
 
 @Suppress("MagicNumber")
 internal class IndicatorStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : IndicatorStore,
     IdentifiableObjectStoreImpl<Indicator>(
         databaseAdapter,
         TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Indicator.create(cursor) }
+        { cursor: Cursor -> Indicator.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<Indicator> = object : NameableWithStyleStatementBinder<Indicator>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
index 8a2b2aa53f..48c472b3e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.indicator.IndicatorType
+import javax.inject.Inject
 
 @Reusable
 internal class IndicatorTypeHandler @Inject constructor(
-    store: IndicatorTypeStore
+    store: IndicatorTypeStore,
 ) : IdentifiableHandlerImpl<IndicatorType>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
index d4a4d122b8..296358608a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.TABLE_INFO
 
 @Suppress("MagicNumber")
 internal class IndicatorTypeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : IndicatorTypeStore,
     IdentifiableObjectStoreImpl<IndicatorType>(
         databaseAdapter,
         TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> IndicatorType.create(cursor) }
+        { cursor: Cursor -> IndicatorType.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<IndicatorType> = object : IdentifiableStatementBinder<IndicatorType>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt
index 806dc1bdc6..d876a032c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.indicator.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
@@ -36,16 +35,17 @@ import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class IndicatorUidsSeeker @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
     fun seekUids(): Set<String> {
         val tableNames = listOf(
             DataSetIndicatorLinkTableInfo.TABLE_INFO.name(),
-            SectionIndicatorLinkTableInfo.TABLE_INFO.name()
+            SectionIndicatorLinkTableInfo.TABLE_INFO.name(),
         )
         val tablesQuery = MultipleTableQueryBuilder()
             .generateQuery(DataSetIndicatorLinkTableInfo.Columns.INDICATOR, tableNames).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
index 48de4d7f68..c286a58c44 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
 
 internal class DataElementLegendSetLinkHandler(
-    store: DataElementLegendSetLinkStore
+    store: DataElementLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, DataElementLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
index d9b6a524e2..43ff6bea49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
 
 internal class DataElementLegendSetLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataElementLegendSetLinkStore,
     LinkStoreImpl<DataElementLegendSetLink>(
         databaseAdapter,
         DataElementLegendSetLinkTableInfo.TABLE_INFO,
         DataElementLegendSetLinkTableInfo.Columns.DATA_ELEMENT,
         BINDER,
-        { cursor: Cursor -> DataElementLegendSetLink.create(cursor) }
+        { cursor: Cursor -> DataElementLegendSetLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
index 533d09dede..423ba66a8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 
 internal class IndicatorLegendSetLinkHandler(
-    store: IndicatorLegendSetLinkStore
+    store: IndicatorLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, IndicatorLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
index 4fe879185d..3d7a75e965 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.indicator.IndicatorLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 
 internal class IndicatorLegendSetLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : IndicatorLegendSetLinkStore,
     LinkStoreImpl<IndicatorLegendSetLink>(
         databaseAdapter,
         IndicatorLegendSetLinkTableInfo.TABLE_INFO,
         IndicatorLegendSetLinkTableInfo.Columns.INDICATOR,
         BINDER,
-        { cursor: Cursor -> IndicatorLegendSetLink.create(cursor) }
+        { cursor: Cursor -> IndicatorLegendSetLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt
index db10130b4a..8149d6da32 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendSet
 
 internal class LegendChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<LegendSet, Legend>
+    private val childStore: SingleParentChildStore<LegendSet, Legend>,
 ) : ChildrenAppender<LegendSet>() {
     override fun appendChildren(m: LegendSet): LegendSet {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class LegendChildrenAppender private constructor(
             return LegendChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    LegendStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> Legend.create(cursor) }
+                    LegendStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> Legend.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
index ffc4127408..d348838f34 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.legendset.Legend
 
 internal class LegendHandler(
-    store: LegendStore
+    store: LegendStore,
 ) : IdentifiableHandlerImpl<Legend>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
index dd97a4565e..774e46568a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
@@ -37,8 +37,8 @@ import retrofit2.Retrofit
     includes = [
         LegendEntityDIModule::class,
         LegendSetEntityDIModule::class,
-        IndicatorLegendSetEntityDIModule::class
-    ]
+        IndicatorLegendSetEntityDIModule::class,
+    ],
 )
 internal class LegendPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
index 503ea18e9c..a9b463fa5d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
@@ -30,16 +30,16 @@ package org.hisp.dhis.android.core.legendset.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.legendset.LegendSet
+import javax.inject.Inject
 
 @Reusable
 internal class LegendSetCall @Inject constructor(
     private val service: LegendSetService,
     private val handler: LegendSetHandler,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<LegendSet> {
     override fun download(uids: Set<String>): Single<List<LegendSet>> {
         return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler) { partitionUids ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
index 63929c3aa3..efd2bc6238 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
@@ -47,12 +47,12 @@ internal class LegendSetEntityDIModule {
     fun handler(
         legendSetStore: LegendSetStore,
         legendHandler: LegendHandler,
-        legendCleaner: LegendSetLegendOrphanCleaner
+        legendCleaner: LegendSetLegendOrphanCleaner,
     ): LegendSetHandler {
         return LegendSetHandler(
             legendSetStore,
             legendHandler,
-            legendCleaner
+            legendCleaner,
         )
     }
 
@@ -60,7 +60,7 @@ internal class LegendSetEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<LegendSet>> {
         return mapOf(
-            LegendSetFields.LEGENDS to LegendChildrenAppender.create(databaseAdapter)
+            LegendSetFields.LEGENDS to LegendChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
index a0df4d5ab7..008a905364 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
@@ -36,12 +36,12 @@ import org.hisp.dhis.android.core.legendset.LegendSet
 internal class LegendSetHandler constructor(
     legendSetStore: LegendSetStore,
     private val legendHandler: LegendHandler,
-    private val legendCleaner: LegendSetLegendOrphanCleaner
+    private val legendCleaner: LegendSetLegendOrphanCleaner,
 ) : IdentifiableHandlerImpl<LegendSet>(legendSetStore) {
 
     override fun afterObjectHandled(o: LegendSet, action: HandleAction) {
         legendHandler.handleMany(
-            o.legends()
+            o.legends(),
         ) { legend: Legend ->
             legend.toBuilder()
                 .legendSet(ObjectWithUid.create(o.uid()))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
index 9b7c7bc9d6..c842d855e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.legendset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendSet
 import org.hisp.dhis.android.core.legendset.LegendTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class LegendSetLegendOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<LegendSet, Legend>(
     tableName = LegendTableInfo.TABLE_INFO.name(),
     parentColumn = LegendTableInfo.Columns.LEGEND_SET,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
index e2d390c397..f69e171a62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
@@ -31,13 +31,13 @@ package org.hisp.dhis.android.core.legendset.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class LegendSetModuleDownloader @Inject internal constructor(
     private val legendSetUidsSeeker: LegendSetUidsSeeker,
-    private val legendSetCall: LegendSetCall
+    private val legendSetCall: LegendSetCall,
 ) : UntypedModuleDownloader {
     override fun downloadMetadata(): Completable {
         return Single.fromCallable { legendSetUidsSeeker.seekUids() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt
index 431b43e186..9255814576 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt
@@ -43,6 +43,6 @@ internal interface LegendSetService {
     fun getLegendSets(
         @Query("fields") @Which fields: Fields<LegendSet>,
         @Query("filter") @Where uids: Filter<LegendSet, String>,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Payload<LegendSet>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
index 87a0baf023..9a51ba3d70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.legendset.LegendSetTableInfo
 
 @Suppress("MagicNumber")
 internal class LegendSetStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : LegendSetStore,
     IdentifiableObjectStoreImpl<LegendSet>(
         databaseAdapter,
         LegendSetTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> LegendSet.create(cursor) }
+        { cursor: Cursor -> LegendSet.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
index d74f6e1de0..944ca5b939 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.legendset.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
@@ -38,10 +37,11 @@ import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class LegendSetUidsSeeker @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
     fun seekUids(): Set<String> {
@@ -49,7 +49,7 @@ internal class LegendSetUidsSeeker @Inject constructor(
             ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO.name(),
             IndicatorLegendSetLinkTableInfo.TABLE_INFO.name(),
             DataElementLegendSetLinkTableInfo.TABLE_INFO.name(),
-            TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO.name()
+            TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO.name(),
         )
         val query = MultipleTableQueryBuilder()
             .generateQuery(ProgramIndicatorLegendSetLinkTableInfo.Columns.LEGEND_SET, tableNames)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
index e07ab74715..110f97240b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.legendset.LegendTableInfo
 
 @Suppress("MagicNumber")
 internal class LegendStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : LegendStore,
     IdentifiableObjectStoreImpl<Legend>(
         databaseAdapter,
         LegendTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Legend.create(cursor) }
+        { cursor: Cursor -> Legend.create(cursor) },
     ) {
 
     companion object {
@@ -62,7 +62,7 @@ internal class LegendStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             LegendTableInfo.TABLE_INFO,
-            LegendTableInfo.Columns.LEGEND_SET
+            LegendTableInfo.Columns.LEGEND_SET,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
index 6654da96cd..2937f78048 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
 
 internal class ProgramIndicatorLegendSetLinkHandler(
-    store: ProgramIndicatorLegendSetLinkStore
+    store: ProgramIndicatorLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, ProgramIndicatorLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
index 1b8d5885c0..0d0b447f79 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
 
 internal class ProgramIndicatorLegendSetLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramIndicatorLegendSetLinkStore,
     LinkStoreImpl<ProgramIndicatorLegendSetLink>(
         databaseAdapter,
         ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
         ProgramIndicatorLegendSetLinkTableInfo.Columns.PROGRAM_INDICATOR,
         BINDER,
-        { cursor: Cursor -> ProgramIndicatorLegendSetLink.create(cursor) }
+        { cursor: Cursor -> ProgramIndicatorLegendSetLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
index fc09dc6fc2..4564d8d8cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
@@ -36,13 +36,13 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorTableInfo
 
 internal class D2ErrorStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : D2ErrorStore,
     ObjectStoreImpl<D2Error>(
         databaseAdapter,
         D2ErrorTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> D2Error.create(cursor) }
+        { cursor: Cursor -> D2Error.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
index 87f8a5eaab..f10c5b864e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
@@ -36,13 +36,13 @@ import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation
 import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
 
 internal class ForeignKeyViolationStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ForeignKeyViolationStore,
     ObjectStoreImpl<ForeignKeyViolation>(
         databaseAdapter,
         ForeignKeyViolationTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ForeignKeyViolation.create(cursor) }
+        { cursor: Cursor -> ForeignKeyViolation.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: ForeignKeyViolation, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
index 37bae69d41..78c7f3d7ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
@@ -36,15 +36,15 @@ import org.hisp.dhis.android.core.maintenance.MaintenanceModule
 @Module(
     includes = [
         D2ErrorEntityDIModule::class,
-        ForeignKeyViolationEntityDIModule::class
-    ]
+        ForeignKeyViolationEntityDIModule::class,
+    ],
 )
 internal class MaintenancePackageDIModule {
     @Provides
     @Reusable
     fun cleaner(
         databaseAdapter: DatabaseAdapter,
-        foreignKeyViolationStore: ForeignKeyViolationStore
+        foreignKeyViolationStore: ForeignKeyViolationStore,
     ): ForeignKeyCleaner {
         return ForeignKeyCleanerImpl(databaseAdapter, foreignKeyViolationStore)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt
index 4aafe3c2e9..c174345eba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.map.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.map.MapModule
 import org.hisp.dhis.android.core.map.layer.MapLayerCollectionRepository
 import org.hisp.dhis.android.core.map.layer.MapLayerDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class MapModuleImpl @Inject internal constructor(
     private val mapLayerCollectionRepository: MapLayerCollectionRepository,
-    private val mapLayerModuleDownloader: MapLayerDownloader
+    private val mapLayerModuleDownloader: MapLayerDownloader,
 ) : MapModule {
 
     override fun mapLayers(): MapLayerCollectionRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt
index 49209226f0..5d64373c58 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.map.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
 import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class MapModuleWiper @Inject internal constructor(
-    private val tableWiper: TableWiper
+    private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             MapLayerTableInfo.TABLE_INFO,
-            MapLayerImageryProviderTableInfo.TABLE_INFO
+            MapLayerImageryProviderTableInfo.TABLE_INFO,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
index aa3369fea8..203bbf78e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
@@ -39,8 +39,8 @@ import org.hisp.dhis.android.core.map.layer.internal.bing.BingEntityDIModule
     includes = [
         MapLayerEntityDIModule::class,
         MapLayerImageryProviderEntityDIModule::class,
-        BingEntityDIModule::class
-    ]
+        BingEntityDIModule::class,
+    ],
 )
 internal class MapPackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
index d73bf60542..6d3c91ad42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.map.layer
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -37,19 +36,20 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerStore
+import javax.inject.Inject
 
 @Reusable
 class MapLayerCollectionRepository @Inject internal constructor(
     store: MapLayerStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<MapLayer>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyWithUidCollectionRepositoryImpl<MapLayer, MapLayerCollectionRepository>(
     store,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
-        scope
-    ) { s: RepositoryScope -> MapLayerCollectionRepository(store, childrenAppenders, s) }
+        scope,
+    ) { s: RepositoryScope -> MapLayerCollectionRepository(store, childrenAppenders, s) },
 ) {
 
     fun byUid(): StringFilterConnector<MapLayerCollectionRepository> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
index 08f1435673..216cbd8efc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
@@ -29,14 +29,14 @@ package org.hisp.dhis.android.core.map.layer
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerCallFactory
+import javax.inject.Inject
 
 @Reusable
 class MapLayerDownloader @Inject internal constructor(
-    private val mapLayerCallFactory: MapLayerCallFactory
+    private val mapLayerCallFactory: MapLayerCallFactory,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerImageryProviderTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerImageryProviderTableInfo.kt
index 8ad04b4fa8..4e0a2500df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerImageryProviderTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerImageryProviderTableInfo.kt
@@ -49,7 +49,7 @@ object MapLayerImageryProviderTableInfo {
                 listOf(
                     MAP_LAYER,
                     ATTRIBUTION,
-                    COVERAGE_AREAS
+                    COVERAGE_AREAS,
                 )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerTableInfo.kt
index 938b162415..4104a06da3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerTableInfo.kt
@@ -55,7 +55,7 @@ object MapLayerTableInfo {
                     STYLE,
                     IMAGE_URL,
                     SUBDOMAINS,
-                    SUBDOMAIN_PLACEHOLDER
+                    SUBDOMAIN_PLACEHOLDER,
                 )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
index 74966e8a09..77c5be2bd4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.map.layer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.internal.bing.BingCallFactory
 import org.hisp.dhis.android.core.map.layer.internal.osm.OSMCallFactory
+import javax.inject.Inject
 
 @Reusable
 internal class MapLayerCallFactory @Inject constructor(
     private val osmCallFactory: OSMCallFactory,
-    private val bingCallFactory: BingCallFactory
+    private val bingCallFactory: BingCallFactory,
 ) {
 
     suspend fun downloadMetadata(): List<MapLayer> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
index 6d5de18afb..579c22090d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
@@ -47,7 +47,7 @@ internal class MapLayerEntityDIModule {
     @Reusable
     fun handler(
         store: MapLayerStore,
-        imageryProviderHandler: MapLayerImageryProviderHandler
+        imageryProviderHandler: MapLayerImageryProviderHandler,
     ): MapLayerHandler {
         return MapLayerHandler(store, imageryProviderHandler)
     }
@@ -55,10 +55,10 @@ internal class MapLayerEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        store: MapLayerImageryProviderStore
+        store: MapLayerImageryProviderStore,
     ): Map<String, ChildrenAppender<MapLayer>> {
         return mapOf(
-            MapLayer.IMAGERY_PROVIDERS to MapLayerImagerProviderChildrenAppender(store)
+            MapLayer.IMAGERY_PROVIDERS to MapLayerImagerProviderChildrenAppender(store),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
index 305e47d5d2..bee0608c97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.map.layer.MapLayer
 
 internal class MapLayerHandler constructor(
     store: MapLayerStore,
-    private val imagerProviderHandler: MapLayerImageryProviderHandler
+    private val imagerProviderHandler: MapLayerImageryProviderHandler,
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<MapLayer>(store) {
 
     override fun afterObjectHandled(o: MapLayer, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
index 528abc72fe..20d6b7b0da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAp
 import org.hisp.dhis.android.core.map.layer.MapLayer
 
 internal class MapLayerImagerProviderChildrenAppender(
-    private val mapLayerImageryProviderStore: MapLayerImageryProviderStore
+    private val mapLayerImageryProviderStore: MapLayerImageryProviderStore,
 ) : ChildrenAppender<MapLayer>() {
 
     override fun appendChildren(mapLayer: MapLayer): MapLayer {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
index a8942d138d..e77c4c3db3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 
 internal class MapLayerImageryProviderHandler(
-    store: MapLayerImageryProviderStore
+    store: MapLayerImageryProviderStore,
 ) : LinkHandlerImpl<MapLayerImageryProvider, MapLayerImageryProvider>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
index e234272b00..ef02bbe4f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
 
 @Suppress("MagicNumber")
 internal class MapLayerImageryProviderStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : MapLayerImageryProviderStore,
     LinkStoreImpl<MapLayerImageryProvider>(
         databaseAdapter,
         MapLayerImageryProviderTableInfo.TABLE_INFO,
         MapLayerImageryProviderTableInfo.Columns.MAP_LAYER,
         BINDER,
-        { cursor -> MapLayerImageryProvider.create(cursor) }
+        { cursor -> MapLayerImageryProvider.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
index 69b29f294d..2a1724eebe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
 
 @Suppress("MagicNumber")
 internal class MapLayerStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : MapLayerStore,
     IdentifiableObjectStoreImpl<MapLayer>(
         databaseAdapter,
         MapLayerTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> MapLayer.create(cursor) }
+        { cursor: Cursor -> MapLayer.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemap.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemap.kt
index 755bb8f0a1..54e14c8ab8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemap.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemap.kt
@@ -31,5 +31,5 @@ package org.hisp.dhis.android.core.map.layer.internal.bing
 internal data class BingBasemap(
     val id: String,
     val name: String,
-    val style: String
+    val style: String,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemaps.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemaps.kt
index 5d5f6aeb48..61dd599ede 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemaps.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingBasemaps.kt
@@ -33,22 +33,22 @@ internal object BingBasemaps {
         BingBasemap(
             id = "ql5jVkAL1iy",
             name = "Bing Road",
-            style = "CanvasLight"
+            style = "CanvasLight",
         ),
         BingBasemap(
             id = "PwJ1fQoTthh",
             name = "Bing Dark",
-            style = "CanvasDark"
+            style = "CanvasDark",
         ),
         BingBasemap(
             id = "kKJNmY2yYtM",
             name = "Bing Aerial",
-            style = "Aerial"
+            style = "Aerial",
         ),
         BingBasemap(
             id = "TfK2zM71AHJ",
             name = "Bing Aerial Labels",
-            style = "AerialWithLabelsOnDemand"
-        )
+            style = "AerialWithLabelsOnDemand",
+        ),
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
index c3946b37bb..602ea3084c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
@@ -29,8 +29,6 @@
 package org.hisp.dhis.android.core.map.layer.internal.bing
 
 import dagger.Reusable
-import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.withTimeout
 import org.hisp.dhis.android.core.D2Manager
@@ -44,6 +42,8 @@ import org.hisp.dhis.android.core.settings.internal.SettingService
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import javax.inject.Inject
+import kotlin.time.Duration.Companion.seconds
 
 @Reusable
 internal class BingCallFactory @Inject constructor(
@@ -51,7 +51,7 @@ internal class BingCallFactory @Inject constructor(
     private val mapLayerHandler: MapLayerHandler,
     private val versionManager: DHISVersionManager,
     private val settingsService: SettingService,
-    private val bingService: BingService
+    private val bingService: BingService,
 ) {
 
     @Suppress("TooGenericExceptionCaught")
@@ -79,7 +79,7 @@ internal class BingCallFactory @Inject constructor(
 
     @Suppress("TooGenericExceptionCaught")
     private suspend fun downloadBingBasemaps(
-        bingKey: String
+        bingKey: String,
     ): List<MapLayer> {
         return try {
             BingBasemaps.list.map { b ->
@@ -101,7 +101,7 @@ internal class BingCallFactory @Inject constructor(
 
     private suspend fun downloadBasemap(
         bingkey: String,
-        basemap: BingBasemap
+        basemap: BingBasemap,
     ): List<MapLayer> {
         val bingResponseResult = coroutineAPICallExecutor.wrap(storeError = false) {
             bingService.getBaseMap(getUrl(basemap.style, bingkey))
@@ -132,12 +132,12 @@ internal class BingCallFactory @Inject constructor(
                                                 .zoomMax(ca.zoomMax)
                                                 .zoomMin(ca.zoomMin)
                                                 .build()
-                                        }
+                                        },
                                     )
                                     .build()
-                            }
+                            },
                         )
-                        .build()
+                        .build(),
                 )
             }
         }.getOrNull() ?: emptyList()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingServerResponse.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingServerResponse.kt
index e7b7310735..0933d48e67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingServerResponse.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingServerResponse.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.map.layer.internal.bing
 
 internal data class BingServerResponse(
-    val resourceSets: List<ResourceSet>
+    val resourceSets: List<ResourceSet>,
 )
 
 internal data class ResourceSet(
     val estimatedTotal: Int,
-    val resources: List<Resource>
+    val resources: List<Resource>,
 )
 
 internal data class Resource(
@@ -44,16 +44,16 @@ internal data class Resource(
     val imageUrlSubdomains: List<String>,
     val zoomMax: Int,
     val zoomMin: Int,
-    val imageryProviders: List<ImageryProvider>
+    val imageryProviders: List<ImageryProvider>,
 )
 
 internal data class ImageryProvider(
     val attribution: String,
-    val coverageAreas: List<CoverageArea>
+    val coverageAreas: List<CoverageArea>,
 )
 
 internal data class CoverageArea(
     val bbox: List<Double>,
     val zoomMax: Int,
-    val zoomMin: Int
+    val zoomMin: Int,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingService.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingService.kt
index 8638a61f8c..47621f7241 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingService.kt
@@ -35,6 +35,6 @@ internal interface BingService {
 
     @GET
     suspend fun getBaseMap(
-        @Url url: String
+        @Url url: String,
     ): BingServerResponse
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMap.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMap.kt
index 888c77b46b..4f76aa7e03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMap.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMap.kt
@@ -35,5 +35,5 @@ data class OSMBaseMap(
     val imageUrl: String,
     val subdomains: List<String>? = null,
     val subdomainPlaceholder: String? = null,
-    val attribution: String
+    val attribution: String,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMaps.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMaps.kt
index 90b7341e63..e644ead7ea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMaps.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMBaseMaps.kt
@@ -37,7 +37,7 @@ object OSMBaseMaps {
             subdomains = listOf("a", "b", "c", "d"),
             subdomainPlaceholder = "{s}",
             attribution = "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors," +
-                " &copy; <a href=\"https://carto.com/attribution\">Carto</a>"
+                " &copy; <a href=\"https://carto.com/attribution\">Carto</a>",
         ),
         OSMBaseMap(
             id = "k6QEWMytadd",
@@ -45,7 +45,7 @@ object OSMBaseMaps {
             imageUrl = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
             subdomains = listOf("a", "b", "c", "d"),
             subdomainPlaceholder = "{s}",
-            attribution = "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors\n"
-        )
+            attribution = "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors\n",
+        ),
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
index 834ee95572..039e4966ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
@@ -29,15 +29,15 @@
 package org.hisp.dhis.android.core.map.layer.internal.osm
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.hisp.dhis.android.core.map.layer.MapLayerPosition
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerHandler
+import javax.inject.Inject
 
 @Reusable
 internal class OSMCallFactory @Inject constructor(
-    private val mapLayerHandler: MapLayerHandler
+    private val mapLayerHandler: MapLayerHandler,
 ) {
 
     fun download(): List<MapLayer> {
@@ -64,8 +64,8 @@ internal class OSMCallFactory @Inject constructor(
                         MapLayerImageryProvider.builder()
                             .mapLayer(basemap.id)
                             .attribution(basemap.attribution)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
                 .build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NewNoteFields.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NewNoteFields.kt
index 6b870bdb3b..9b2c09784b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NewNoteFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NewNoteFields.kt
@@ -45,6 +45,6 @@ internal object NewNoteFields {
             fh.field<String>(UID),
             fh.field<String>(VALUE),
             fh.field<String>(STORED_AT),
-            fh.field<String>(STORED_BY)
+            fh.field<String>(STORED_BY),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteFields.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteFields.kt
index 7e4bb5cc33..6a736d9479 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteFields.kt
@@ -43,6 +43,6 @@ internal object NoteFields {
             fh.field<String>(UID),
             fh.field<String>(NoteTableInfo.Columns.VALUE),
             fh.field<String>(NoteTableInfo.Columns.STORED_BY),
-            fh.field<String>(NoteTableInfo.Columns.STORED_DATE)
+            fh.field<String>(NoteTableInfo.Columns.STORED_DATE),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt
index aeb1a978ef..4328ee3893 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEnrollmentChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.note.Note
 
 internal class NoteForEnrollmentChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<Enrollment, Note>
+    private val childStore: SingleParentChildStore<Enrollment, Note>,
 ) : ChildrenAppender<Enrollment>() {
     override fun appendChildren(m: Enrollment): Enrollment {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class NoteForEnrollmentChildrenAppender private constructor(
             return NoteForEnrollmentChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    NoteStoreImpl.ENROLLMENT_CHILD_PROJECTION
-                ) { cursor: Cursor -> Note.create(cursor) }
+                    NoteStoreImpl.ENROLLMENT_CHILD_PROJECTION,
+                ) { cursor: Cursor -> Note.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt
index baa29b9fa6..123f1f69a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteForEventChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.note.Note
 
 internal class NoteForEventChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<Event, Note>
+    private val childStore: SingleParentChildStore<Event, Note>,
 ) : ChildrenAppender<Event>() {
     override fun appendChildren(m: Event): Event {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class NoteForEventChildrenAppender private constructor(
             return NoteForEventChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    NoteStoreImpl.EVENT_CHILD_PROJECTION
-                ) { cursor: Cursor -> Note.create(cursor) }
+                    NoteStoreImpl.EVENT_CHILD_PROJECTION,
+                ) { cursor: Cursor -> Note.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
index b858d0b339..a9f65ef50a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.note.Note
 
 internal class NoteHandler(
-    store: NoteStore
+    store: NoteStore,
 ) : IdentifiableHandlerImpl<Note>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
index fbc6e4a32b..c0cd91768e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.note.internal
 
 import dagger.Reusable
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -37,10 +35,12 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteCreateProjection
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class NoteProjectionTransformer @Inject constructor(
-    private val credentialsSecureStore: CredentialsSecureStore
+    private val credentialsSecureStore: CredentialsSecureStore,
 ) : Transformer<NoteCreateProjection, Note> {
 
     override fun transform(o: NoteCreateProjection): Note {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
index abf32dec79..017bcd49b1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
@@ -37,13 +37,13 @@ import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteTableInfo
 
 internal class NoteStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : NoteStore,
     IdentifiableObjectStoreImpl<Note>(
         databaseAdapter,
         NoteTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Note.create(cursor) }
+        { cursor: Cursor -> Note.create(cursor) },
     ) {
 
     companion object {
@@ -60,11 +60,11 @@ internal class NoteStoreImpl(
         }
         val ENROLLMENT_CHILD_PROJECTION = SingleParentChildProjection(
             NoteTableInfo.TABLE_INFO,
-            NoteTableInfo.Columns.ENROLLMENT
+            NoteTableInfo.Columns.ENROLLMENT,
         )
         val EVENT_CHILD_PROJECTION = SingleParentChildProjection(
             NoteTableInfo.TABLE_INFO,
-            NoteTableInfo.Columns.EVENT
+            NoteTableInfo.Columns.EVENT,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt
index 3418a50e3d..3f50c19cf5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionService.kt
@@ -35,13 +35,13 @@ interface OptionService {
         optionSetUid: String,
         searchText: String? = null,
         optionToHideUids: List<String>? = null,
-        optionToShowUids: List<String>? = null
+        optionToShowUids: List<String>? = null,
     ): List<Option>
 
     fun searchForOptions(
         optionSetUid: String,
         searchText: String? = null,
         optionToHideUids: List<String>? = null,
-        optionToShowUids: List<String>? = null
+        optionToShowUids: List<String>? = null,
     ): Single<List<Option>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
index 12480d308d..33035939ea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
@@ -30,19 +30,19 @@ package org.hisp.dhis.android.core.option
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import javax.inject.Inject
 
 @Reusable
 class OptionServiceImpl @Inject constructor(
-    private val optionRepository: OptionCollectionRepository
+    private val optionRepository: OptionCollectionRepository,
 ) : OptionService {
 
     override fun blockingSearchForOptions(
         optionSetUid: String,
         searchText: String?,
         optionToHideUids: List<String>?,
-        optionToShowUids: List<String>?
+        optionToShowUids: List<String>?,
     ): List<Option> {
         var repository = optionRepository
             .byOptionSetUid().eq(optionSetUid)
@@ -64,7 +64,7 @@ class OptionServiceImpl @Inject constructor(
         optionSetUid: String,
         searchText: String?,
         optionToHideUids: List<String>?,
-        optionToShowUids: List<String>?
+        optionToShowUids: List<String>?,
     ): Single<List<Option>> {
         return Single.fromCallable {
             blockingSearchForOptions(optionSetUid, searchText, optionToHideUids, optionToShowUids)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
index d6f5dab410..7315397b5d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
@@ -29,23 +29,23 @@ package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.Option
+import javax.inject.Inject
 
 @Reusable
 class OptionCall @Inject internal constructor(
     private val service: OptionService,
     private val handler: OptionHandler,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<Option> {
     override fun download(uids: Set<String>): Single<List<Option>> {
         return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
-            handler
+            handler,
         ) { partitionUids: Set<String> ->
             val optionSetUidsFilterStr = "optionSet." + ObjectWithUid.uid.`in`(partitionUids).generateString()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
index 38889a80cd..df2fad58f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
@@ -46,11 +46,11 @@ internal class OptionEntityDIModule {
     @Reusable
     fun handler(
         optionStore: OptionStore,
-        optionCleaner: OptionSubCollectionCleaner
+        optionCleaner: OptionSubCollectionCleaner,
     ): OptionHandler {
         return OptionHandler(
             optionStore,
-            optionCleaner
+            optionCleaner,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
index 0a548f6952..bafb50407f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionGroupTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class OptionGroupCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<OptionGroup>(
     tableName = OptionGroupTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
index 6a1dfbd863..a84f4a447f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
@@ -47,12 +47,12 @@ internal class OptionGroupEntityDIModule {
     fun handler(
         optionStore: OptionGroupStore,
         optionGroupOptionLinkHandler: OptionGroupOptionLinkHandler,
-        collectionCleaner: OptionGroupCollectionCleaner
+        collectionCleaner: OptionGroupCollectionCleaner,
     ): OptionGroupHandler {
         return OptionGroupHandler(
             optionStore,
             optionGroupOptionLinkHandler,
-            collectionCleaner
+            collectionCleaner,
         )
     }
 
@@ -60,7 +60,7 @@ internal class OptionGroupEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<OptionGroup>> {
         return mapOf(
-            OptionGroupFields.OPTIONS to OptionGroupOptionChildrenAppender.create(databaseAdapter)
+            OptionGroupFields.OPTIONS to OptionGroupOptionChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
index aa3aa6dfb8..420224be7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
@@ -37,13 +37,13 @@ import org.hisp.dhis.android.core.option.OptionGroupOptionLink
 internal class OptionGroupHandler(
     optionStore: OptionGroupStore,
     private val optionGroupOptionLinkHandler: LinkHandler<ObjectWithUid, OptionGroupOptionLink>,
-    private val collectionCleaner: OptionGroupCollectionCleaner
+    private val collectionCleaner: OptionGroupCollectionCleaner,
 ) : IdentifiableHandlerImpl<OptionGroup>(optionStore) {
 
     override fun afterObjectHandled(o: OptionGroup, action: HandleAction) {
         optionGroupOptionLinkHandler.handleMany(
             o.uid(),
-            o.options()
+            o.options(),
         ) { option: ObjectWithUid ->
             OptionGroupOptionLink.builder().optionGroup(o.uid()).option(option.uid()).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt
index 2060415637..c78a30ec72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionChildrenAppender.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo
 import org.hisp.dhis.android.core.option.OptionTableInfo
 
 internal class OptionGroupOptionChildrenAppender private constructor(
-    private val childStore: ObjectWithUidChildStore<OptionGroup>
+    private val childStore: ObjectWithUidChildStore<OptionGroup>,
 ) : ChildrenAppender<OptionGroup>() {
     override fun appendChildren(m: OptionGroup): OptionGroup {
         val builder = m.toBuilder()
@@ -49,7 +49,7 @@ internal class OptionGroupOptionChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             OptionTableInfo.TABLE_INFO,
             OptionGroupOptionLinkTableInfo.Columns.OPTION_GROUP,
-            OptionGroupOptionLinkTableInfo.Columns.OPTION
+            OptionGroupOptionLinkTableInfo.Columns.OPTION,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OptionGroup> {
@@ -57,8 +57,8 @@ internal class OptionGroupOptionChildrenAppender private constructor(
                 objectWithUidChildStore(
                     databaseAdapter,
                     OptionGroupOptionLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                )
+                    CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
index 568e6a3d3e..7ed60cccab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.OptionGroupOptionLink
 
 internal class OptionGroupOptionLinkHandler(
-    store: OptionGroupOptionLinkStore
+    store: OptionGroupOptionLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, OptionGroupOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
index 82c436b3ba..ec11b101b7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.option.OptionGroupOptionLink
 import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo
 
 internal class OptionGroupOptionLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OptionGroupOptionLinkStore,
     LinkStoreImpl<OptionGroupOptionLink>(
         databaseAdapter,
         OptionGroupOptionLinkTableInfo.TABLE_INFO,
         OptionGroupOptionLinkTableInfo.Columns.OPTION_GROUP,
         BINDER,
-        { cursor: Cursor -> OptionGroupOptionLink.create(cursor) }
+        { cursor: Cursor -> OptionGroupOptionLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
index 4a2f93c1c2..dc4c076ec9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.option.OptionGroupTableInfo
 
 @Suppress("MagicNumber")
 internal class OptionGroupStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OptionGroupStore,
     IdentifiableObjectStoreImpl<OptionGroup>(
         databaseAdapter,
         OptionGroupTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> OptionGroup.create(cursor) }
+        { cursor: Cursor -> OptionGroup.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<OptionGroup> = object : IdentifiableStatementBinder<OptionGroup>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
index 55dc40089d..c8b998bc1f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.option.Option
 
 internal class OptionHandler constructor(
     optionStore: OptionStore,
-    private val optionCleaner: OptionSubCollectionCleaner
+    private val optionCleaner: OptionSubCollectionCleaner,
 ) : IdentifiableHandlerImpl<Option>(optionStore) {
 
     override fun afterCollectionHandled(oCollection: Collection<Option>?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
index 35bc780590..7cea1ca6d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
@@ -38,8 +38,8 @@ import retrofit2.Retrofit
         OptionEntityDIModule::class,
         OptionGroupEntityDIModule::class,
         OptionGroupOptionEntityDIModule::class,
-        OptionSetEntityDIModule::class
-    ]
+        OptionSetEntityDIModule::class,
+    ],
 )
 internal class OptionPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt
index 886d3439c4..2dc004fbbb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt
@@ -42,6 +42,6 @@ internal interface OptionService {
         @Query("filter") optionSetUidsFilterString: String,
         @Query("paging") paging: Boolean,
         @Query("page") page: Int,
-        @Query("pageSize") pageSize: Int
+        @Query("pageSize") pageSize: Int,
     ): Single<Payload<Option>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
index 590bc4ada6..69d9389f5c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.option.OptionSet
+import javax.inject.Inject
 
 @Reusable
 internal class OptionSetCall @Inject constructor(
     private val service: OptionSetService,
     private val handler: OptionSetHandler,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<OptionSet> {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
index 980cdd5b71..2e0919651d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.option.OptionSet
 
 internal class OptionSetHandler(
-    store: OptionSetStore
+    store: OptionSetStore,
 ) : IdentifiableHandlerImpl<OptionSet>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
index 5d75c50912..a5ff438dea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.option.OptionSetTableInfo
 
 @Suppress("MagicNumber")
 internal class OptionSetStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OptionSetStore,
     IdentifiableObjectStoreImpl<OptionSet>(
         databaseAdapter,
         OptionSetTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> OptionSet.create(cursor) }
+        { cursor: Cursor -> OptionSet.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
index 13795c7d6a..428f5c9a8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.option.OptionTableInfo
 
 @Suppress("MagicNumber")
 internal class OptionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OptionStore,
     IdentifiableObjectStoreImpl<Option>(
         databaseAdapter,
         OptionTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Option.create(cursor) }
+        { cursor: Cursor -> Option.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
index 12a0521270..06ae04a0bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class OptionSubCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SubCollectionCleanerImpl<Option>(
     tableName = OptionTableInfo.TABLE_INFO.name(),
     parentColumn = OptionTableInfo.Columns.OPTION_SET,
@@ -46,5 +46,5 @@ internal class OptionSubCollectionCleaner @Inject constructor(
         override fun transform(o: Option): String {
             return o.optionSet()!!.uid()
         }
-    }
+    },
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt
index e7a2867b3d..cf81b37df0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
 
 @Reusable
 class OrganisationUnitService @Inject constructor(
-    private val organisationUnitRepository: OrganisationUnitCollectionRepository
+    private val organisationUnitRepository: OrganisationUnitCollectionRepository,
 ) {
 
     fun blockingIsDateInOrgunitRange(organisationUnitUid: String, date: Date): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index fbda0f36c5..b145e82a73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -31,8 +31,6 @@ import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Single
-import java.util.concurrent.atomic.AtomicInteger
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTree
@@ -40,6 +38,8 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import java.util.concurrent.atomic.AtomicInteger
+import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitCall @Inject constructor(
@@ -48,7 +48,7 @@ internal class OrganisationUnitCall @Inject constructor(
     private val pathTransformer: OrganisationUnitDisplayPathTransformer,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val organisationUnitStore: OrganisationUnitStore,
-    private val collectionCleaner: OrganisationUnitCollectionCleaner
+    private val collectionCleaner: OrganisationUnitCollectionCleaner,
 ) {
     fun download(user: User): Completable {
         return Completable.defer {
@@ -65,14 +65,14 @@ internal class OrganisationUnitCall @Inject constructor(
                         downloadDataCaptureOrgUnits(
                             rootSearchOrgUnits,
                             searchOrgUnits,
-                            user
+                            user,
                         )
-                    }
+                    },
                 ).doOnComplete {
                     val assignedOrgunitIds = userOrganisationUnitLinkStore
                         .selectStringColumnsWhereClause(
                             UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                            "1"
+                            "1",
                         )
                     collectionCleaner.deleteNotPresentByUid(assignedOrgunitIds)
                 }
@@ -81,7 +81,7 @@ internal class OrganisationUnitCall @Inject constructor(
 
     private fun downloadSearchOrgUnits(
         rootSearchOrgUnits: Set<OrganisationUnit>,
-        user: User
+        user: User,
     ): Completable {
         return downloadOrgUnits(getUids(rootSearchOrgUnits), user, OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
     }
@@ -89,7 +89,7 @@ internal class OrganisationUnitCall @Inject constructor(
     private fun downloadDataCaptureOrgUnits(
         rootSearchOrgUnits: Set<OrganisationUnit>,
         searchOrgUnits: List<OrganisationUnit>,
-        user: User
+        user: User,
     ): Completable {
         val allRootCaptureOrgUnits = OrganisationUnitTree.findRoots(UserInternalAccessor.accessOrganisationUnits(user))
         val rootCaptureOrgUnitsOutsideSearchScope =
@@ -98,21 +98,21 @@ internal class OrganisationUnitCall @Inject constructor(
             OrganisationUnitTree.getCaptureOrgUnitsInSearchScope(
                 searchOrgUnits,
                 allRootCaptureOrgUnits,
-                rootCaptureOrgUnitsOutsideSearchScope
+                rootCaptureOrgUnitsOutsideSearchScope,
             ),
-            user
+            user,
         )
         return downloadOrgUnits(
             getUids(rootCaptureOrgUnitsOutsideSearchScope),
             user,
-            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
+            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE,
         )
     }
 
     private fun downloadOrgUnits(
         orgUnits: Set<String>,
         user: User,
-        scope: OrganisationUnit.Scope
+        scope: OrganisationUnit.Scope,
     ): Completable {
         return if (orgUnits.isEmpty()) {
             Completable.complete()
@@ -144,7 +144,7 @@ internal class OrganisationUnitCall @Inject constructor(
                 OrganisationUnitFields.ASC_ORDER,
                 true,
                 PAGE_SIZE,
-                page.getAndIncrement()
+                page.getAndIncrement(),
             )
                 .map { obj -> obj.items() }
                 .doOnSuccess { items -> handler.handleMany(items, pathTransformer) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
index a51645b1f0..1ccdbff0fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.organisationunit.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<OrganisationUnit>(
     tableName = OrganisationUnitTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt
index b60a0e8ed3..b67702515f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDataSetChildrenAppender.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 
 internal class OrganisationUnitDataSetChildrenAppender private constructor(
-    private val childStore: ObjectWithUidChildStore<OrganisationUnit>
+    private val childStore: ObjectWithUidChildStore<OrganisationUnit>,
 ) : ChildrenAppender<OrganisationUnit>() {
     override fun appendChildren(m: OrganisationUnit): OrganisationUnit {
         val builder = m.toBuilder()
@@ -49,7 +49,7 @@ internal class OrganisationUnitDataSetChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             DataSetTableInfo.TABLE_INFO,
             DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET
+            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OrganisationUnit> {
@@ -57,8 +57,8 @@ internal class OrganisationUnitDataSetChildrenAppender private constructor(
                 objectWithUidChildStore(
                     databaseAdapter,
                     DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                )
+                    CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
index 0ad132bc47..7c9c62fdc0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
@@ -53,7 +53,7 @@ internal class OrganisationUnitEntityDIModule {
         organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler,
         dataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler,
         organisationUnitGroupHandler: OrganisationUnitGroupHandler,
-        organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler
+        organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler,
     ): OrganisationUnitHandler {
         return OrganisationUnitHandler(
             organisationUnitStore,
@@ -61,7 +61,7 @@ internal class OrganisationUnitEntityDIModule {
             organisationUnitProgramLinkHandler,
             dataSetOrganisationUnitLinkHandler,
             organisationUnitGroupHandler,
-            organisationUnitGroupLinkHandler
+            organisationUnitGroupLinkHandler,
         )
     }
 
@@ -78,7 +78,7 @@ internal class OrganisationUnitEntityDIModule {
             OrganisationUnitFields.PROGRAMS to OrganisationUnitProgramChildrenAppender.create(databaseAdapter),
             OrganisationUnitFields.DATA_SETS to OrganisationUnitDataSetChildrenAppender.create(databaseAdapter),
             OrganisationUnitFields.ORGANISATION_UNIT_GROUPS to
-                OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.create(databaseAdapter)
+                OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
index 1c011892c7..62973b7ccc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 
 internal class OrganisationUnitGroupHandler(
-    store: OrganisationUnitGroupStore
+    store: OrganisationUnitGroupStore,
 ) : IdentifiableHandlerImpl<OrganisationUnitGroup>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
index 4d13c46de4..ef17e70669 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInf
 
 @Suppress("MagicNumber")
 internal class OrganisationUnitGroupStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrganisationUnitGroupStore,
     IdentifiableObjectStoreImpl<OrganisationUnitGroup>(
         databaseAdapter,
         OrganisationUnitGroupTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> OrganisationUnitGroup.create(cursor) }
+        { cursor: Cursor -> OrganisationUnitGroup.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
index 52c4dcf951..10c19b43fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
@@ -47,7 +47,7 @@ internal class OrganisationUnitHandler constructor(
     private val organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler,
     private val dataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler,
     private val organisationUnitGroupHandler: OrganisationUnitGroupHandler,
-    private val organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler
+    private val organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler,
 ) : IdentifiableHandlerImpl<OrganisationUnit>(organisationUnitStore) {
     private var user: User? = null
     private var scope: OrganisationUnit.Scope? = null
@@ -74,7 +74,7 @@ internal class OrganisationUnitHandler constructor(
         } else {
             Log.i(
                 this.javaClass.simpleName,
-                "OrganisationUnit " + o.uid() + " has invalid geometryValue"
+                "OrganisationUnit " + o.uid() + " has invalid geometryValue",
             )
             o.toBuilder().geometry(null).build()
         }
@@ -96,7 +96,7 @@ internal class OrganisationUnitHandler constructor(
         if (orgUnitPrograms != null) {
             organisationUnitProgramLinkHandler.handleMany(
                 organisationUnit.uid(),
-                orgUnitPrograms
+                orgUnitPrograms,
             ) { program ->
                 OrganisationUnitProgramLink.builder()
                     .organisationUnit(organisationUnit.uid())
@@ -111,7 +111,7 @@ internal class OrganisationUnitHandler constructor(
         if (orgUnitDataSets != null) {
             dataSetOrganisationUnitLinkHandler.handleMany(
                 organisationUnit.uid(),
-                orgUnitDataSets
+                orgUnitDataSets,
             ) { dataSet ->
                 DataSetOrganisationUnitLink.builder()
                     .dataSet(dataSet.uid())
@@ -125,7 +125,7 @@ internal class OrganisationUnitHandler constructor(
         organisationUnit.organisationUnitGroups()?.let { orgunitGroups ->
             organisationUnitGroupLinkHandler.handleMany(
                 organisationUnit.uid(),
-                orgunitGroups
+                orgunitGroups,
             ) { organisationUnitGroup ->
                 OrganisationUnitOrganisationUnitGroupLink.builder()
                     .organisationUnit(organisationUnit.uid())
@@ -144,7 +144,7 @@ internal class OrganisationUnitHandler constructor(
         //  not available in the handler. Maybe the store should not be a linkStore.
         userOrganisationUnitLinkHandler.handleMany(
             "",
-            organisationUnits
+            organisationUnits,
         ) { orgUnit: OrganisationUnit ->
             builder
                 .organisationUnit(orgUnit.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
index 754b742a42..56ff119038 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
 
 internal class OrganisationUnitLevelHandler(
-    store: OrganisationUnitLevelStore
+    store: OrganisationUnitLevelStore,
 ) : IdentifiableHandlerImpl<OrganisationUnitLevel>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
index 7c4656cb3f..24286d92d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInf
 
 @Suppress("MagicNumber")
 internal class OrganisationUnitLevelStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrganisationUnitLevelStore,
     IdentifiableObjectStoreImpl<OrganisationUnitLevel>(
         databaseAdapter,
         OrganisationUnitLevelTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> OrganisationUnitLevel.create(cursor) }
+        { cursor: Cursor -> OrganisationUnitLevel.create(cursor) },
     ) {
 
     companion object {
@@ -52,7 +52,7 @@ internal class OrganisationUnitLevelStoreImpl(
             object : IdentifiableStatementBinder<OrganisationUnitLevel>() {
                 override fun bindToStatement(
                     organisationUnitLevel: OrganisationUnitLevel,
-                    w: StatementWrapper
+                    w: StatementWrapper,
                 ) {
                     super.bindToStatement(organisationUnitLevel, w)
                     w.bind(7, organisationUnitLevel.level())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index 2211a2dafa..e71692d8ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -30,12 +30,12 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserCall
+import javax.inject.Inject
 
 @Reusable
 internal class OrganisationUnitModuleDownloader @Inject constructor(
@@ -44,7 +44,7 @@ internal class OrganisationUnitModuleDownloader @Inject constructor(
     private val organisationUnitLevelEndpointCall: OrganisationUnitLevelEndpointCall,
     private val rxCallExecutor: RxAPICallExecutor,
     private val dataSetLinkCleaner: DataSetOrganisationUnitLinkCleaner,
-    private val programLinkCleaner: ProgramOrganisationUnitLinkCleaner
+    private val programLinkCleaner: ProgramOrganisationUnitLinkCleaner,
 ) {
     fun downloadMetadata(user: User): Completable {
         return organisationUnitLevelEndpointCall.download()
@@ -57,7 +57,7 @@ internal class OrganisationUnitModuleDownloader @Inject constructor(
                 .fromCallable { userCall.call() }
                 .flatMapCompletable { user -> downloadMetadata(user) }
                 .andThen(cleanLinksFromDB()),
-            cleanForeignKeys = true
+            cleanForeignKeys = true,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
index 258e6b0639..344bf91965 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
@@ -44,7 +44,7 @@ internal class OrganisationUnitOrganisationUnitGroupLinkEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: OrganisationUnitOrganisationUnitGroupLinkStore
+        store: OrganisationUnitOrganisationUnitGroupLinkStore,
     ): OrganisationUnitOrganisationUnitGroupLinkHandler {
         return OrganisationUnitOrganisationUnitGroupLinkHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
index bd3fb03b2f..ce36f06898 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
 
 internal class OrganisationUnitOrganisationUnitGroupLinkHandler(
-    store: OrganisationUnitOrganisationUnitGroupLinkStore
+    store: OrganisationUnitOrganisationUnitGroupLinkStore,
 ) : LinkHandlerImpl<OrganisationUnitGroup, OrganisationUnitOrganisationUnitGroupLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
index 4737ebbdd3..5673bca519 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationU
 
 @Suppress("MagicNumber")
 internal class OrganisationUnitOrganisationUnitGroupLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrganisationUnitOrganisationUnitGroupLinkStore,
     LinkStoreImpl<OrganisationUnitOrganisationUnitGroupLink>(
         databaseAdapter,
         OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
         OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT,
         BINDER,
-        { cursor: Cursor -> OrganisationUnitOrganisationUnitGroupLink.create(cursor) }
+        { cursor: Cursor -> OrganisationUnitOrganisationUnitGroupLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt
index 0d3e395bcb..5804456ed8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInf
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
 
 internal class OrganisationUnitOrganisationUnitGroupProgramChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<OrganisationUnit, OrganisationUnitGroup>
+    private val linkChildStore: LinkChildStore<OrganisationUnit, OrganisationUnitGroup>,
 ) : ChildrenAppender<OrganisationUnit>() {
     override fun appendChildren(m: OrganisationUnit): OrganisationUnit {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class OrganisationUnitOrganisationUnitGroupProgramChildrenAppender priv
         private val CHILD_PROJECTION = LinkTableChildProjection(
             OrganisationUnitGroupTableInfo.TABLE_INFO,
             OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT,
-            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP
+            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OrganisationUnit> {
@@ -59,8 +59,8 @@ internal class OrganisationUnitOrganisationUnitGroupProgramChildrenAppender priv
                 linkChildStore(
                     databaseAdapter,
                     OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> OrganisationUnitGroup.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> OrganisationUnitGroup.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
index 86c212e470..e90b8fc407 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
@@ -39,8 +39,8 @@ import retrofit2.Retrofit
         OrganisationUnitLevelEntityDIModule::class,
         OrganisationUnitGroupEntityDIModule::class,
         OrganisationUnitProgramLinkEntityDIModule::class,
-        OrganisationUnitOrganisationUnitGroupLinkEntityDIModule::class
-    ]
+        OrganisationUnitOrganisationUnitGroupLinkEntityDIModule::class,
+    ],
 )
 internal class OrganisationUnitPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt
index b382165a53..66cde2cb73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramChildrenAppender.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTa
 import org.hisp.dhis.android.core.program.ProgramTableInfo
 
 internal class OrganisationUnitProgramChildrenAppender private constructor(
-    private val childStore: ObjectWithUidChildStore<OrganisationUnit>
+    private val childStore: ObjectWithUidChildStore<OrganisationUnit>,
 ) : ChildrenAppender<OrganisationUnit>() {
     override fun appendChildren(m: OrganisationUnit): OrganisationUnit {
         val builder = m.toBuilder()
@@ -49,7 +49,7 @@ internal class OrganisationUnitProgramChildrenAppender private constructor(
         private val CHILD_PROJECTION = LinkTableChildProjection(
             ProgramTableInfo.TABLE_INFO,
             OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM
+            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<OrganisationUnit> {
@@ -57,8 +57,8 @@ internal class OrganisationUnitProgramChildrenAppender private constructor(
                 objectWithUidChildStore(
                     databaseAdapter,
                     OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                )
+                    CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
index 7c4dd32077..d3a11e14c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 
 internal class OrganisationUnitProgramLinkHandler(
-    store: OrganisationUnitProgramLinkStore
+    store: OrganisationUnitProgramLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, OrganisationUnitProgramLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
index d25d548312..0fb7639e68 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 
 internal class OrganisationUnitProgramLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrganisationUnitProgramLinkStore,
     LinkStoreImpl<OrganisationUnitProgramLink>(
         databaseAdapter,
         OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
         OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
         BINDER,
-        { cursor: Cursor -> OrganisationUnitProgramLink.create(cursor) }
+        { cursor: Cursor -> OrganisationUnitProgramLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
index b2412c3d34..67342bb004 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 
 @Suppress("MagicNumber")
 internal class OrganisationUnitStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrganisationUnitStore,
     IdentifiableObjectStoreImpl<OrganisationUnit>(
         databaseAdapter,
         OrganisationUnitTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> OrganisationUnit.create(cursor) }
+        { cursor: Cursor -> OrganisationUnit.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt
index 64b982a801..dec4451709 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt
@@ -46,7 +46,7 @@ import org.hisp.dhis.antlr.ParserExceptionWithoutContext
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext
 
 internal class CommonExpressionVisitor constructor(
-    val scope: CommonExpressionVisitorScope
+    val scope: CommonExpressionVisitorScope,
 ) : AntlrExpressionVisitor() {
 
     /**
@@ -118,7 +118,7 @@ internal class CommonExpressionVisitor constructor(
         if (ctx.it != null) {
             val item = itemMap[ctx.it.type]
                 ?: throw ParserExceptionWithoutContext(
-                    "Item " + ctx.it.text + " not supported for this type of expression"
+                    "Item " + ctx.it.text + " not supported for this type of expression",
                 )
             return itemMethod.apply(item, ctx, this)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt
index 36096b4573..76f35054ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitorScope.kt
@@ -53,7 +53,7 @@ internal sealed class CommonExpressionVisitorScope(
     val indicatorContext: IndicatorContext? = null,
     val programIndicatorContext: ProgramIndicatorContext? = null,
     val programIndicatorSQLContext: ProgramIndicatorSQLContext? = null,
-    val programIndicatorExecutor: ProgramIndicatorExecutor? = null
+    val programIndicatorExecutor: ProgramIndicatorExecutor? = null,
 ) {
     class Expression(
         constantMap: Map<String, Constant>,
@@ -62,7 +62,7 @@ internal sealed class CommonExpressionVisitorScope(
         dataElementStore: IdentifiableObjectStore<DataElement>,
         categoryOptionComboStore: IdentifiableObjectStore<CategoryOptionCombo>,
         organisationUnitGroupStore: IdentifiableObjectStore<OrganisationUnitGroup>,
-        programStageStore: IdentifiableObjectStore<ProgramStage>
+        programStageStore: IdentifiableObjectStore<ProgramStage>,
     ) : CommonExpressionVisitorScope(
         constantMap,
         itemMap,
@@ -70,7 +70,7 @@ internal sealed class CommonExpressionVisitorScope(
         dataElementStore = dataElementStore,
         categoryOptionComboStore = categoryOptionComboStore,
         organisationUnitGroupStore = organisationUnitGroupStore,
-        programStageStore = programStageStore
+        programStageStore = programStageStore,
     )
 
     class ProgramIndicator(
@@ -81,7 +81,7 @@ internal sealed class CommonExpressionVisitorScope(
         programIndicatorExecutor: ProgramIndicatorExecutor,
         dataElementStore: IdentifiableObjectStore<DataElement>,
         trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
-        programStageStore: IdentifiableObjectStore<ProgramStage>
+        programStageStore: IdentifiableObjectStore<ProgramStage>,
     ) : CommonExpressionVisitorScope(
         constantMap,
         itemMap,
@@ -90,7 +90,7 @@ internal sealed class CommonExpressionVisitorScope(
         programIndicatorExecutor = programIndicatorExecutor,
         dataElementStore = dataElementStore,
         trackedAttributeStore = trackedEntityAttributeStore,
-        programStageStore = programStageStore
+        programStageStore = programStageStore,
     )
 
     class ProgramSQLIndicator(
@@ -99,25 +99,25 @@ internal sealed class CommonExpressionVisitorScope(
         itemMethod: ExpressionItemMethod,
         programIndicatorSQLContext: ProgramIndicatorSQLContext,
         dataElementStore: IdentifiableObjectStore<DataElement>,
-        trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>
+        trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
     ) : CommonExpressionVisitorScope(
         constantMap,
         itemMap,
         itemMethod,
         programIndicatorSQLContext = programIndicatorSQLContext,
         dataElementStore = dataElementStore,
-        trackedAttributeStore = trackedEntityAttributeStore
+        trackedAttributeStore = trackedEntityAttributeStore,
     )
 
     class AnalyticsIndicator(
         constantMap: Map<String, Constant>,
         itemMap: Map<Int, ExpressionItem>,
         itemMethod: ExpressionItemMethod,
-        indicatorContext: IndicatorContext
+        indicatorContext: IndicatorContext,
     ) : CommonExpressionVisitorScope(
         constantMap,
         itemMap,
         itemMethod,
-        indicatorContext = indicatorContext
+        indicatorContext = indicatorContext,
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
index f33528d034..38352e0e74 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
@@ -27,11 +27,6 @@
  */
 package org.hisp.dhis.android.core.parser.internal.expression
 
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.regex.Pattern
-import kotlin.math.pow
-import kotlin.math.roundToInt
 import kotlinx.datetime.LocalDate
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.parser.internal.expression.function.*
@@ -44,6 +39,11 @@ import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.antlr.ParserExceptionWithoutContext
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.regex.Pattern
+import kotlin.math.pow
+import kotlin.math.roundToInt
 
 internal object ParserUtils {
     const val DOUBLE_VALUE_IF_NULL = 0.0
@@ -99,7 +99,7 @@ internal object ParserUtils {
         ExpressionParser.C_BRACE to ItemConstant(),
 
         // Literals
-        ExpressionParser.NULL to NullLiteral()
+        ExpressionParser.NULL to NullLiteral(),
     )
 
     @JvmStatic
@@ -176,12 +176,14 @@ internal object ParserUtils {
         return when (period.periodType()!!) {
             PeriodType.Daily -> LocalDate.parse(periodIsoDate).dayOfYear
             PeriodType.Monthly,
-            PeriodType.BiMonthly -> period.periodId()!!.substring(4, 6).toInt()
+            PeriodType.BiMonthly,
+            -> period.periodId()!!.substring(4, 6).toInt()
             PeriodType.Yearly,
             PeriodType.FinancialApril,
             PeriodType.FinancialJuly,
             PeriodType.FinancialNov,
-            PeriodType.FinancialOct -> 1
+            PeriodType.FinancialOct,
+            -> 1
             else -> getTrailingDigits(period.periodId()!!) ?: 0
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt
index 4edabc39b8..c81a78dee7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/QueryMods.kt
@@ -36,5 +36,5 @@ internal data class QueryMods(
     var minDate: LocalDate? = null,
     var maxDate: LocalDate? = null,
     var periodOffset: Int? = null,
-    var yearToDate: Boolean = false
+    var yearToDate: Boolean = false,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/function/FunctionGreatestOrLeast.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/function/FunctionGreatestOrLeast.kt
index 6bf8eadfe9..82b77705c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/function/FunctionGreatestOrLeast.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/function/FunctionGreatestOrLeast.kt
@@ -48,7 +48,7 @@ abstract class FunctionGreatestOrLeast : ExpressionItem {
     protected fun greatestOrLeast(
         contexts: List<ExprContext?>,
         visitor: AntlrExpressionVisitor,
-        greatestLeast: Double
+        greatestLeast: Double,
     ): Double? {
         var returnVal: Double? = null
         for (c in contexts) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
index 1b77ae7ec5..a2f242bc33 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.parser.internal.service
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.constant.Constant
@@ -51,12 +50,13 @@ import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import org.hisp.dhis.android.core.validation.MissingValueStrategy
 import org.hisp.dhis.antlr.ParserException
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser
+import javax.inject.Inject
 
 internal class ExpressionService @Inject constructor(
     private val dataElementStore: DataElementStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
     private val organisationUnitGroupStore: OrganisationUnitGroupStore,
-    private val programStageStore: ProgramStageStore
+    private val programStageStore: ProgramStageStore,
 ) {
     private val validationRuleExpressionItems: Map<Int, ExpressionItem> = getValidationRuleExpressionItems()
 
@@ -106,19 +106,19 @@ internal class ExpressionService @Inject constructor(
         return getExpressionValue(
             expression,
             ExpressionServiceContext(),
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         )
     }
 
     fun getExpressionValue(
         expression: String?,
         context: ExpressionServiceContext,
-        missingValueStrategy: MissingValueStrategy
+        missingValueStrategy: MissingValueStrategy,
     ): Any? {
         return expression?.let {
             val visitor = newVisitor(
                 ITEM_EVALUATE,
-                context.constantMap
+                context.constantMap,
             )
             val itemValueMap = context.valueMap.map { it.key.dimensionItem to it.value }.toMap()
 
@@ -157,14 +157,14 @@ internal class ExpressionService @Inject constructor(
 
     fun regenerateExpression(
         expression: String?,
-        context: ExpressionServiceContext
+        context: ExpressionServiceContext,
     ): String {
         return if (expression == null) {
             ""
         } else {
             val visitor = newVisitor(
                 ITEM_REGENERATE,
-                context.constantMap
+                context.constantMap,
             )
 
             val itemValueMap = context.valueMap.map { it.key.dimensionItem to it.value }.toMap()
@@ -196,7 +196,7 @@ internal class ExpressionService @Inject constructor(
         // ParseType parseType,
         itemMethod: ExpressionItemMethod,
         // List<Period> samplePeriods,
-        constantMap: Map<String, Constant>
+        constantMap: Map<String, Constant>,
     ): CommonExpressionVisitor {
         return CommonExpressionVisitor(
             CommonExpressionVisitorScope.Expression(
@@ -206,8 +206,8 @@ internal class ExpressionService @Inject constructor(
                 dataElementStore = dataElementStore,
                 categoryOptionComboStore = categoryOptionComboStore,
                 organisationUnitGroupStore = organisationUnitGroupStore,
-                programStageStore = programStageStore
-            )
+                programStageStore = programStageStore,
+            ),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt
index 1f8cec301d..9ca38505a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionServiceContext.kt
@@ -35,5 +35,5 @@ internal data class ExpressionServiceContext(
     val valueMap: Map<DimensionalItemObject, Double> = emptyMap(),
     val constantMap: Map<String, Constant> = emptyMap(),
     val orgUnitCountMap: Map<String, Int> = emptyMap(),
-    val days: Int? = 0
+    val days: Int? = 0,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimItemDataElementAndOperand.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimItemDataElementAndOperand.kt
index b6fd01995e..3ab1a61bed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimItemDataElementAndOperand.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimItemDataElementAndOperand.kt
@@ -66,12 +66,12 @@ internal class DimItemDataElementAndOperand : DimensionalItem() {
                 dimensionalItemType = DimensionalItemType.DATA_ELEMENT_OPERAND,
                 id0 = ctx.uid0.text,
                 id1 = ctx.uid1?.text,
-                id2 = ctx.uid2?.text
+                id2 = ctx.uid2?.text,
             )
         } else {
             DimensionalItemId(
                 dimensionalItemType = DimensionalItemType.DATA_ELEMENT,
-                id0 = ctx.uid0.text
+                id0 = ctx.uid0.text,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemId.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemId.kt
index cc62259ce5..fb9b9a4e3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemId.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemId.kt
@@ -31,7 +31,7 @@ internal class DimensionalItemId(
     val dimensionalItemType: DimensionalItemType,
     val id0: String,
     val id1: String? = null,
-    val id2: String? = null
+    val id2: String? = null,
 ) {
     val isDataElementOrOperand: Boolean
         get() = (
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemType.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemType.kt
index bfb8c69a1c..b1042576d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItemType.kt
@@ -33,5 +33,5 @@ internal enum class DimensionalItemType {
     DATA_ELEMENT_OPERAND,
     ORGANISATION_UNIT_GROUP,
     TRACKED_ENTITY_ATTRIBUTE,
-    TRACKED_ENTITY_DATA_VALUE
+    TRACKED_ENTITY_DATA_VALUE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemConstant.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemConstant.kt
index 3b51c627f2..16fae4b2e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemConstant.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemConstant.kt
@@ -73,7 +73,7 @@ internal class ItemConstant : ExpressionItem {
     fun getDimensionalItemId(ctx: ExprContext): DimensionalItemId {
         return DimensionalItemId(
             dimensionalItemType = DimensionalItemType.CONSTANT,
-            id0 = ctx.uid0.text
+            id0 = ctx.uid0.text,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemOrgUnitGroup.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemOrgUnitGroup.kt
index 6f21e8d957..5d1c05eae6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemOrgUnitGroup.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemOrgUnitGroup.kt
@@ -78,7 +78,7 @@ internal class ItemOrgUnitGroup : ExpressionItem {
     private fun getDimensionalItemId(ctx: ExprContext): DimensionalItemId {
         return DimensionalItemId(
             dimensionalItemType = DimensionalItemType.ORGANISATION_UNIT_GROUP,
-            id0 = ctx.uid0.text
+            id0 = ctx.uid0.text,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemYearlyPeriodCount.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemYearlyPeriodCount.kt
index 96723b99de..6d505eaa5b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemYearlyPeriodCount.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/ItemYearlyPeriodCount.kt
@@ -41,18 +41,21 @@ internal class ItemYearlyPeriodCount : ItemPeriodBase() {
             PeriodType.WeeklyThursday,
             PeriodType.WeeklySaturday,
             PeriodType.WeeklySunday,
-            PeriodType.BiWeekly -> evaluateWeeklyOrBiWeekly(period)
+            PeriodType.BiWeekly,
+            -> evaluateWeeklyOrBiWeekly(period)
             PeriodType.Monthly -> 12
             PeriodType.BiMonthly -> 6
             PeriodType.Quarterly -> 4
             PeriodType.SixMonthly,
             PeriodType.SixMonthlyApril,
-            PeriodType.SixMonthlyNov -> 2
+            PeriodType.SixMonthlyNov,
+            -> 2
             PeriodType.Yearly,
             PeriodType.FinancialApril,
             PeriodType.FinancialJuly,
             PeriodType.FinancialOct,
-            PeriodType.FinancialNov -> 1
+            PeriodType.FinancialNov,
+            -> 1
         }.toDouble()
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataobject/DataElementOperandObject.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataobject/DataElementOperandObject.kt
index d1215e9257..ff43ae58f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataobject/DataElementOperandObject.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataobject/DataElementOperandObject.kt
@@ -1,56 +1,56 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.parser.internal.service.dataobject
-
-internal data class DataElementOperandObject(
-    val dataElement: String,
-    val categoryOptionCombo: String?,
-    val attributeOptionCombo: String? = null
-) : DimensionalItemObject {
-    override val dimensionItem: String
-        get() {
-            val item = StringBuilder()
-            item.append(dataElement)
-            if (categoryOptionCombo == null) {
-                if (attributeOptionCombo != null) {
-                    item.append(SEPARATOR).append(SYMBOL_WILDCARD)
-                }
-            } else {
-                item.append(SEPARATOR).append(categoryOptionCombo)
-            }
-            if (attributeOptionCombo != null) {
-                item.append(SEPARATOR).append(attributeOptionCombo)
-            }
-            return item.toString()
-        }
-
-    companion object {
-        private const val SEPARATOR = "."
-        private const val SYMBOL_WILDCARD = "*"
-    }
-}
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.parser.internal.service.dataobject
+
+internal data class DataElementOperandObject(
+    val dataElement: String,
+    val categoryOptionCombo: String?,
+    val attributeOptionCombo: String? = null,
+) : DimensionalItemObject {
+    override val dimensionItem: String
+        get() {
+            val item = StringBuilder()
+            item.append(dataElement)
+            if (categoryOptionCombo == null) {
+                if (attributeOptionCombo != null) {
+                    item.append(SEPARATOR).append(SYMBOL_WILDCARD)
+                }
+            } else {
+                item.append(SEPARATOR).append(categoryOptionCombo)
+            }
+            if (attributeOptionCombo != null) {
+                item.append(SEPARATOR).append(attributeOptionCombo)
+            }
+            return item.toString()
+        }
+
+    companion object {
+        private const val SEPARATOR = "."
+        private const val SYMBOL_WILDCARD = "*"
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt
index a22416585e..1940a1f1fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.parser.internal.service.utils
 
-import java.lang.NumberFormatException
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DataElementObject
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DataElementOperandObject
 import org.hisp.dhis.android.core.parser.internal.service.dataobject.DimensionalItemObject
+import java.lang.NumberFormatException
 
 internal object ExpressionHelper {
 
@@ -55,7 +55,7 @@ internal object ExpressionHelper {
     private fun addDimensionalItemValueToMap(
         item: DimensionalItemObject,
         value: String?,
-        valueMap: MutableMap<DimensionalItemObject, Double>
+        valueMap: MutableMap<DimensionalItemObject, Double>,
     ) {
         try {
             value?.toDouble()?.let { newValue ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodType.kt b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodType.kt
index c9d8b06bf1..91b8c13d2a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodType.kt
@@ -36,7 +36,7 @@ enum class PeriodType(
     val defaultStartPeriods: Int,
     val defaultEndPeriods: Int,
     val pattern: String,
-    val sortOrder: Int
+    val sortOrder: Int,
 ) {
     Daily(-59, 1, "\\b(\\d{4})(\\d{2})(\\d{2})\\b", 1),
     Weekly(-12, 1, "\\b(\\d{4})W(\\d[\\d]?)\\b", 2),
@@ -55,7 +55,8 @@ enum class PeriodType(
     FinancialApril(-4, 1, "\\b(\\d{4})April\\b", 15),
     FinancialJuly(-4, 1, "\\b(\\d{4})July\\b", 16),
     FinancialOct(-4, 1, "\\b(\\d{4})Oct\\b", 17),
-    FinancialNov(-4, 1, "\\b(\\d{4})Nov\\b", 18);
+    FinancialNov(-4, 1, "\\b(\\d{4})Nov\\b", 18),
+    ;
 
     companion object {
         @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt
index a98bf4e349..3ecda9f00d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGenerator.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.period.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
+import java.util.*
 
 interface ParentPeriodGenerator {
     fun generatePeriods(): List<Period>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt
index ab9ac8746c..966dd43aed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.period.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
+import java.util.*
 
 internal class ParentPeriodGeneratorImpl(
     private val daily: PeriodGenerator,
@@ -38,7 +38,7 @@ internal class ParentPeriodGeneratorImpl(
     private val biWeekly: PeriodGenerator,
     private val monthly: PeriodGenerator,
     private val nMonthly: NMonthlyPeriodGenerators,
-    private val yearly: YearlyPeriodGenerators
+    private val yearly: YearlyPeriodGenerators,
 ) : ParentPeriodGenerator {
 
     override fun generatePeriods(): List<Period> {
@@ -112,7 +112,7 @@ internal class ParentPeriodGeneratorImpl(
                 BiWeeklyPeriodGenerator(calendar),
                 MonthlyPeriodGenerator(calendar),
                 NMonthlyPeriodGenerators.create(calendar),
-                YearlyPeriodGenerators.create(calendar)
+                YearlyPeriodGenerators.create(calendar),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt
index 7df12d98b7..ec2db77ba8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStore.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.period.internal
 
-import java.util.Date
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
+import java.util.Date
 
 internal interface PeriodStore : ObjectWithoutUidStore<Period> {
     fun selectByPeriodId(periodId: String?): Period?
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
index 935abf0fc8..02a597292c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.period.internal
 
 import android.database.Cursor
-import java.util.Date
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.sqlorder.internal.SQLOrderType
@@ -40,9 +39,10 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodTableInfo
 import org.hisp.dhis.android.core.period.PeriodType
+import java.util.Date
 
 internal class PeriodStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : PeriodStore,
     ObjectWithoutUidStoreImpl<Period>(
         databaseAdapter,
@@ -50,7 +50,7 @@ internal class PeriodStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> Period.create(cursor) }
+        { cursor: Cursor -> Period.create(cursor) },
     ) {
     override fun selectByPeriodId(periodId: String?): Period? {
         val whereClause = WhereClauseBuilder()
@@ -64,11 +64,11 @@ internal class PeriodStoreImpl(
             .appendKeyStringValue(PeriodTableInfo.Columns.PERIOD_TYPE, periodType)
             .appendKeyLessThanOrEqStringValue(
                 PeriodTableInfo.Columns.START_DATE,
-                BaseIdentifiableObject.DATE_FORMAT.format(date)
+                BaseIdentifiableObject.DATE_FORMAT.format(date),
             )
             .appendKeyGreaterOrEqStringValue(
                 PeriodTableInfo.Columns.END_DATE,
-                BaseIdentifiableObject.DATE_FORMAT.format(date)
+                BaseIdentifiableObject.DATE_FORMAT.format(date),
             )
             .build()
         return selectOneWhere(whereClause)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryTableInfo.kt
index c2a882ed71..f4d74b946e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryTableInfo.kt
@@ -51,7 +51,7 @@ object AnalyticsPeriodBoundaryTableInfo {
                 BOUNDARY_TARGET,
                 ANALYTICS_PERIOD_BOUNDARY_TYPE,
                 OFFSET_PERIODS,
-                OFFSET_PERIOD_TYPE
+                OFFSET_PERIOD_TYPE,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryType.kt b/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryType.kt
index 307f168692..c5d8ba0803 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/AnalyticsPeriodBoundaryType.kt
@@ -32,5 +32,5 @@ enum class AnalyticsPeriodBoundaryType {
     BEFORE_START_OF_REPORTING_PERIOD,
     BEFORE_END_OF_REPORTING_PERIOD,
     AFTER_START_OF_REPORTING_PERIOD,
-    AFTER_END_OF_REPORTING_PERIOD
+    AFTER_END_OF_REPORTING_PERIOD,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.kt
index fec9a59942..a939e6ba9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorTableInfo.kt
@@ -55,7 +55,7 @@ object ProgramIndicatorTableInfo {
                 DECIMALS,
                 AGGREGATION_TYPE,
                 PROGRAM,
-                ANALYTICS_TYPE
+                ANALYTICS_TYPE,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryFields.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryFields.kt
index 3dd00e0dc9..f74d1f89ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryFields.kt
@@ -39,6 +39,6 @@ object AnalyticsPeriodBoundaryFields {
             fh.field<String>(AnalyticsPeriodBoundaryTableInfo.Columns.BOUNDARY_TARGET),
             fh.field<String>(AnalyticsPeriodBoundaryTableInfo.Columns.ANALYTICS_PERIOD_BOUNDARY_TYPE),
             fh.field<Int>(AnalyticsPeriodBoundaryTableInfo.Columns.OFFSET_PERIODS),
-            fh.field<String>(AnalyticsPeriodBoundaryTableInfo.Columns.OFFSET_PERIOD_TYPE)
+            fh.field<String>(AnalyticsPeriodBoundaryTableInfo.Columns.OFFSET_PERIOD_TYPE),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
index ab757407e6..09c2505e35 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
 
 internal class AnalyticsPeriodBoundaryHandler(
-    store: AnalyticsPeriodBoundaryStore
+    store: AnalyticsPeriodBoundaryStore,
 ) : LinkHandlerImpl<AnalyticsPeriodBoundary, AnalyticsPeriodBoundary>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
index ad18215a78..0f76ab5472 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsPeriodBoundaryStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsPeriodBoundaryStore,
     LinkStoreImpl<AnalyticsPeriodBoundary>(
         databaseAdapter,
         AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
         AnalyticsPeriodBoundaryTableInfo.Columns.PROGRAM_INDICATOR,
         BINDER,
-        { cursor: Cursor -> AnalyticsPeriodBoundary.create(cursor) }
+        { cursor: Cursor -> AnalyticsPeriodBoundary.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
index 48aa65be02..7951030e29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import javax.inject.Inject
 
 @Reusable
 internal class DataElementValueTypeRenderingChildrenAppender @Inject constructor(
-    store: ValueTypeDeviceRenderingStore
+    store: ValueTypeDeviceRenderingStore,
 ) : ValueTypeRenderingChildrenAppender<ProgramStageDataElement>(store) {
     override fun appendChildren(m: ProgramStageDataElement): ProgramStageDataElement {
         val valueTypeRendering = getValueTypeDeviceRendering(m)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
index 3ef3e7c0df..af772215a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<Program>(
     tableName = ProgramTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
index 2a3d184a1b..90496c5402 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
@@ -46,10 +46,10 @@ internal class ProgramEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        trackedEntityTypeChildrenAppender: ProgramTrackedEntityTypeChildrenAppender
+        trackedEntityTypeChildrenAppender: ProgramTrackedEntityTypeChildrenAppender,
     ): Map<String, ChildrenAppender<Program>> {
         return mapOf(
-            ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE to trackedEntityTypeChildrenAppender
+            ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE to trackedEntityTypeChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index 3b6dc5aea1..d542c9b5c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -39,6 +38,7 @@ import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHa
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramType
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramHandler @Inject constructor(
@@ -50,13 +50,13 @@ internal class ProgramHandler @Inject constructor(
     private val collectionCleaner: ProgramCollectionCleaner,
     private val linkCleaner: ProgramOrganisationUnitLinkCleaner,
     private val attributeHandler: AttributeHandler,
-    private val programAttributeLinkHandler: ProgramAttributeValueLinkHandler
+    private val programAttributeLinkHandler: ProgramAttributeValueLinkHandler,
 ) : IdentifiableHandlerImpl<Program>(programStore) {
 
     override fun afterObjectHandled(o: Program, action: HandleAction) {
         programTrackedEntityAttributeHandler.handleMany(
             ProgramInternalAccessor
-                .accessProgramTrackedEntityAttributes(o)
+                .accessProgramTrackedEntityAttributes(o),
         )
         programRuleVariableHandler.handleMany(ProgramInternalAccessor.accessProgramRuleVariables(o))
         programSectionHandler.handleMany(ProgramInternalAccessor.accessProgramSections(o))
@@ -69,7 +69,7 @@ internal class ProgramHandler @Inject constructor(
             attributeHandler.handleMany(attributes)
             programAttributeLinkHandler.handleMany(
                 o.uid(),
-                attributes
+                attributes,
             ) { attribute: Attribute ->
                 ProgramAttributeValueLink.builder()
                     .program(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt
index db98ffb7d6..6293e8d379 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.kt
@@ -35,9 +35,9 @@ import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
 import org.hisp.dhis.android.core.program.ProgramIndicator
 
-internal class ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender private
-constructor(private val childStore: LinkStore<AnalyticsPeriodBoundary>) :
-    ChildrenAppender<ProgramIndicator>() {
+internal class ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender private constructor(
+    private val childStore: LinkStore<AnalyticsPeriodBoundary>,
+) : ChildrenAppender<ProgramIndicator>() {
     override fun appendChildren(programIndicator: ProgramIndicator): ProgramIndicator {
         return programIndicator.toBuilder().analyticsPeriodBoundaries(getChildren(programIndicator)).build()
     }
@@ -52,7 +52,7 @@ constructor(private val childStore: LinkStore<AnalyticsPeriodBoundary>) :
     companion object {
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramIndicator> {
             return ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender(
-                AnalyticsPeriodBoundaryStoreImpl(databaseAdapter)
+                AnalyticsPeriodBoundaryStoreImpl(databaseAdapter),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
index 7d3f8979e5..cf9bea3a8d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
@@ -30,18 +30,18 @@ package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramIndicator
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorCall @Inject constructor(
     private val service: ProgramIndicatorService,
     private val handler: ProgramIndicatorHandler,
     private val apiDownloader: APIDownloader,
-    private val programStore: ProgramStore
+    private val programStore: ProgramStore,
 ) : UidsCall<ProgramIndicator> {
 
     companion object {
@@ -61,9 +61,9 @@ internal class ProgramIndicatorCall @Inject constructor(
                     displayInForm = displayInFormFilter,
                     program = programUidsFilter,
                     uids = null,
-                    false
+                    false,
                 )
-            }
+            },
         )
 
         val secondPayload = apiDownloader.downloadPartitioned(
@@ -75,9 +75,9 @@ internal class ProgramIndicatorCall @Inject constructor(
                     displayInForm = null,
                     program = null,
                     uids = ProgramIndicatorFields.uid.`in`(partitionUids),
-                    false
+                    false,
                 )
-            }
+            },
         )
 
         return Single.merge(firstPayload, secondPayload).reduce { t1, t2 ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
index 4359a0c7d0..abdeb139a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
@@ -48,7 +48,7 @@ internal class ProgramIndicatorEntityDIModule {
         return mapOf(
             ProgramIndicatorFields.LEGEND_SETS to ProgramIndicatorLegendSetChildrenAppender.create(databaseAdapter),
             ProgramIndicatorFields.ANALYTICS_PERIOD_BOUNDARIES to
-                ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.create(databaseAdapter)
+                ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorFields.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorFields.kt
index 1c6a2d2ae7..4055536705 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorFields.kt
@@ -60,6 +60,6 @@ object ProgramIndicatorFields {
             fh.field<AnalyticsType>(ProgramIndicatorTableInfo.Columns.ANALYTICS_TYPE),
             fh.nestedField<AnalyticsPeriodBoundary>(ANALYTICS_PERIOD_BOUNDARIES)
                 .with(AnalyticsPeriodBoundaryFields.allFields),
-            fh.nestedField<LegendSet>(LEGEND_SETS).with(LegendSetFields.uid)
+            fh.nestedField<LegendSet>(LEGEND_SETS).with(LegendSetFields.uid),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
index 697bed5baf..c24e5dbf88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
@@ -36,12 +35,13 @@ import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkHandler
 import org.hisp.dhis.android.core.program.ProgramIndicator
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorHandler @Inject constructor(
     private val programIndicatorStore: ProgramIndicatorStore,
     private val programIndicatorLegendSetLinkHandler: ProgramIndicatorLegendSetLinkHandler,
-    private val analyticsPeriodBoundaryHandler: AnalyticsPeriodBoundaryHandler
+    private val analyticsPeriodBoundaryHandler: AnalyticsPeriodBoundaryHandler,
 ) : IdentifiableHandlerImpl<ProgramIndicator>(programIndicatorStore) {
 
     override fun afterCollectionHandled(oCollection: Collection<ProgramIndicator>?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt
index 96c10ebcae..f647470c3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetChildrenAppender.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableIn
 import org.hisp.dhis.android.core.program.ProgramIndicator
 
 internal class ProgramIndicatorLegendSetChildrenAppender private constructor(
-    private val linkChildStore: ObjectWithUidChildStore<ProgramIndicator>
+    private val linkChildStore: ObjectWithUidChildStore<ProgramIndicator>,
 ) : ChildrenAppender<ProgramIndicator>() {
     override fun appendChildren(m: ProgramIndicator): ProgramIndicator {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class ProgramIndicatorLegendSetChildrenAppender private constructor(
                 objectWithUidChildStore(
                     databaseAdapter,
                     ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
-                    ProgramIndicatorLegendSetLinkTableInfo.CHILD_PROJECTION
-                )
+                    ProgramIndicatorLegendSetLinkTableInfo.CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
index 416e536e21..0906e4611d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
@@ -31,13 +31,13 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorModuleDownloader @Inject constructor(
     private val programIndicatorCall: ProgramIndicatorCall,
-    private val programIndicatorUidsSeeker: ProgramIndicatorUidsSeeker
+    private val programIndicatorUidsSeeker: ProgramIndicatorUidsSeeker,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
index 5a99087545..ce0cfabf46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
@@ -45,6 +45,6 @@ internal interface ProgramIndicatorService {
         @Query("filter") @Where displayInForm: Filter<ProgramIndicator, Boolean>?,
         @Query("filter") program: String?,
         @Query("filter") @Where uids: Filter<ProgramIndicator, String>?,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Payload<ProgramIndicator>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
index aa5375ec86..52521d9c45 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
@@ -40,24 +40,24 @@ import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramIndicatorStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramIndicatorStore,
     IdentifiableObjectStoreImpl<ProgramIndicator>(
         databaseAdapter,
         ProgramIndicatorTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramIndicator.create(cursor) }
+        { cursor: Cursor -> ProgramIndicator.create(cursor) },
     ) {
 
     companion object {
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramIndicatorTableInfo.TABLE_INFO,
-            ProgramIndicatorTableInfo.Columns.PROGRAM
+            ProgramIndicatorTableInfo.Columns.PROGRAM,
         )
         private val BINDER: StatementBinder<ProgramIndicator> = object : NameableStatementBinder<ProgramIndicator>() {
             override fun bindToStatement(
                 o: ProgramIndicator,
-                w: StatementWrapper
+                w: StatementWrapper,
             ) {
                 super.bindToStatement(o, w)
                 w.bind(11, o.displayInForm())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
index d0927988c2..c25ef61495 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
@@ -29,15 +29,15 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorUidsSeeker @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
     fun seekUids(): Set<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 2f7e869d62..5b5d261330 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -44,6 +43,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -60,7 +60,7 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val optionGroupCall: OptionGroupCall,
-    private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore
+    private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
@@ -77,13 +77,13 @@ internal class ProgramModuleDownloader @Inject constructor(
                             .flatMap { trackedEntityTypes ->
                                 trackedEntityAttributeCall.download(
                                     ProgramParentUidsHelper
-                                        .getAssignedTrackedEntityAttributeUids(programs, trackedEntityTypes)
+                                        .getAssignedTrackedEntityAttributeUids(programs, trackedEntityTypes),
                                 )
                             }
                             .flatMapCompletable { attributes ->
                                 val optionSetUids = ProgramParentUidsHelper.getAssignedOptionSetUids(
                                     attributes,
-                                    programStages
+                                    programStages,
                                 )
                                 Single.merge(
                                     listOf(
@@ -91,8 +91,8 @@ internal class ProgramModuleDownloader @Inject constructor(
                                         relationshipTypeCall.download(),
                                         optionSetCall.download(optionSetUids),
                                         optionCall.download(optionSetUids),
-                                        optionGroupCall.download(optionSetUids)
-                                    )
+                                        optionGroupCall.download(optionSetUids),
+                                    ),
                                 ).ignoreElements()
                             }
                             .concatWith(downloadFiltersAndWorkingLists(programUids))
@@ -106,8 +106,8 @@ internal class ProgramModuleDownloader @Inject constructor(
             listOf(
                 trackedEntityInstanceFilterCall.download(programUids),
                 eventFilterCall.download(programUids),
-                programStageWorkingListCall.download(programUids)
-            )
+                programStageWorkingListCall.download(programUids),
+            ),
         ).ignoreElements()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt
index 2bea83a363..cae8aff7ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.program.*
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -47,7 +47,7 @@ internal class ProgramModuleImpl @Inject constructor(
     private val programStageDataElements: ProgramStageDataElementCollectionRepository,
     private val programTrackedEntityAttributes: ProgramTrackedEntityAttributeCollectionRepository,
     private val programIndicatorEngine: ProgramIndicatorEngine,
-    private val programStageWorkingLists: ProgramStageWorkingListCollectionRepository
+    private val programStageWorkingLists: ProgramStageWorkingListCollectionRepository,
 ) : ProgramModule {
     override fun programs(): ProgramCollectionRepository {
         return programs
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
index 58c0dc725c..f5f5245079 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.program.Program
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramOrganisationUnitLinkCleaner @Inject constructor(
     programStore: ProgramStore,
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : LinkCleanerImpl<Program>(
     tableName = OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
     applicableColumn = OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
     parentStore = programStore,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
index 2d8abe36e4..7af52b7ab5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
@@ -28,22 +28,22 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramOrphanCleaner @Inject constructor(
     private val programRuleVariableCleaner: ProgramRuleVariableOrphanCleaner,
     private val programTrackedEntityAttributeCleaner: ProgramTrackedEntityAttributeOrphanCleaner,
-    private val programSectionCleaner: ProgramSectionOrphanCleaner
+    private val programSectionCleaner: ProgramSectionOrphanCleaner,
 ) : ParentOrphanCleaner<Program> {
     override fun deleteOrphan(parent: Program?) {
         programRuleVariableCleaner.deleteOrphan(parent, ProgramInternalAccessor.accessProgramRuleVariables(parent))
         programTrackedEntityAttributeCleaner.deleteOrphan(
             parent,
-            ProgramInternalAccessor.accessProgramTrackedEntityAttributes(parent)
+            ProgramInternalAccessor.accessProgramTrackedEntityAttributes(parent),
         )
         programSectionCleaner.deleteOrphan(parent, ProgramInternalAccessor.accessProgramSections(parent))
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
index 86fe2707b9..1193ce785d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
@@ -53,8 +53,8 @@ import retrofit2.Retrofit
         ProgramStageSectionProgramIndicatorEntityDIModule::class,
         ProgramStageEntityDIModule::class,
         ProgramTrackedEntityAttributeEntityDIModule::class,
-        ProgramAttributeValueEntityDIModule::class
-    ]
+        ProgramAttributeValueEntityDIModule::class,
+    ],
 )
 internal class ProgramPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt
index 2de247abfb..52bc690211 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 
 internal class ProgramRuleActionChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<ProgramRule, ProgramRuleAction>
+    private val childStore: SingleParentChildStore<ProgramRule, ProgramRuleAction>,
 ) : ChildrenAppender<ProgramRule>() {
     override fun appendChildren(m: ProgramRule): ProgramRule {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class ProgramRuleActionChildrenAppender private constructor(
             return ProgramRuleActionChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    ProgramRuleActionStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> ProgramRuleAction.create(cursor) }
+                    ProgramRuleActionStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> ProgramRuleAction.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
index 313bde9d9b..84d7dac5bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 
 internal class ProgramRuleActionHandler(
-    store: ProgramRuleActionStore
+    store: ProgramRuleActionStore,
 ) : IdentifiableHandlerImpl<ProgramRuleAction>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
index 21814137c5..e988383195 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleActionOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<ProgramRule, ProgramRuleAction>(
     tableName = ProgramRuleActionTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramRuleActionTableInfo.Columns.PROGRAM_RULE,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
index 5ee0d488dc..03fba00942 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramRuleActionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramRuleActionStore,
     IdentifiableObjectStoreImpl<ProgramRuleAction>(
         databaseAdapter,
         ProgramRuleActionTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor? -> ProgramRuleAction.create(cursor) }
+        { cursor: Cursor? -> ProgramRuleAction.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<ProgramRuleAction> =
@@ -70,7 +70,7 @@ internal class ProgramRuleActionStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramRuleActionTableInfo.TABLE_INFO,
-            ProgramRuleActionTableInfo.Columns.PROGRAM_RULE
+            ProgramRuleActionTableInfo.Columns.PROGRAM_RULE,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
index 936ce17ef8..02c18a337a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class ProgramRuleEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramRule>> {
         return mapOf(
-            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender.create(databaseAdapter)
+            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
index d36fd0f798..56f3f54504 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
@@ -28,24 +28,24 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleHandler @Inject constructor(
     programRuleStore: ProgramRuleStore,
     private val programRuleActionHandler: ProgramRuleActionHandler,
     private val programRuleCleaner: ProgramRuleSubCollectionCleaner,
-    private val programRuleActionCleaner: ProgramRuleActionOrphanCleaner
+    private val programRuleActionCleaner: ProgramRuleActionOrphanCleaner,
 ) : IdentifiableHandlerImpl<ProgramRule>(programRuleStore) {
 
     override fun afterObjectHandled(o: ProgramRule, action: HandleAction) {
         programRuleActionHandler.handleMany(
-            o.programRuleActions()
+            o.programRuleActions(),
         ) { pra: ProgramRuleAction ->
             pra.toBuilder().programRule(ObjectWithUid.create(o.uid())).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
index f3afab11bc..46bd7367a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramRuleStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramRuleStore,
     IdentifiableObjectStoreImpl<ProgramRule>(
         databaseAdapter,
         ProgramRuleTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramRule.create(cursor) }
+        { cursor: Cursor -> ProgramRule.create(cursor) },
     ) {
 
     companion object {
@@ -61,7 +61,7 @@ internal class ProgramRuleStoreImpl(
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramRuleTableInfo.TABLE_INFO,
-            ProgramRuleTableInfo.Columns.PROGRAM
+            ProgramRuleTableInfo.Columns.PROGRAM,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
index 79059c0cd7..aa6c6c4776 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleSubCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SubCollectionCleanerImpl<ProgramRule>(
     tableName = ProgramRuleTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramRuleTableInfo.Columns.PROGRAM,
@@ -46,5 +46,5 @@ internal class ProgramRuleSubCollectionCleaner @Inject constructor(
         override fun transform(o: ProgramRule): String {
             return o.program()!!.uid()
         }
-    }
+    },
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
index 33dc9cc139..3abd98e699 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramRuleVariable
 
 internal class ProgramRuleVariableHandler(
-    store: ProgramRuleVariableStore
+    store: ProgramRuleVariableStore,
 ) : IdentifiableHandlerImpl<ProgramRuleVariable>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
index 9078f3ebba..749bda5f01 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramRuleVariable
 import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramRuleVariableOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<Program, ProgramRuleVariable>(
     tableName = ProgramRuleVariableTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramRuleVariableTableInfo.Columns.PROGRAM,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
index 82586d92c1..5b44022525 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramRuleVariableStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramRuleVariableStore,
     IdentifiableObjectStoreImpl<ProgramRuleVariable>(
         databaseAdapter,
         ProgramRuleVariableTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramRuleVariable.create(cursor) }
+        { cursor: Cursor -> ProgramRuleVariable.create(cursor) },
     ) {
 
     companion object {
@@ -65,7 +65,7 @@ internal class ProgramRuleVariableStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramRuleVariableTableInfo.TABLE_INFO,
-            ProgramRuleVariableTableInfo.Columns.PROGRAM
+            ProgramRuleVariableTableInfo.Columns.PROGRAM,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt
index 9d15c4874a..cf3f84184d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
 
 internal class ProgramSectionAttributeChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<ProgramSection, TrackedEntityAttribute>
+    private val linkChildStore: LinkChildStore<ProgramSection, TrackedEntityAttribute>,
 ) : ChildrenAppender<ProgramSection>() {
     override fun appendChildren(m: ProgramSection): ProgramSection {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class ProgramSectionAttributeChildrenAppender private constructor(
         val CHILD_PROJECTION = LinkTableChildProjection(
             TrackedEntityAttributeTableInfo.TABLE_INFO,
             ProgramSectionAttributeLinkTableInfo.Columns.PROGRAM_SECTION,
-            ProgramSectionAttributeLinkTableInfo.Columns.ATTRIBUTE
+            ProgramSectionAttributeLinkTableInfo.Columns.ATTRIBUTE,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramSection> {
@@ -59,8 +59,8 @@ internal class ProgramSectionAttributeChildrenAppender private constructor(
                 linkChildStore(
                     databaseAdapter,
                     ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> TrackedEntityAttribute.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> TrackedEntityAttribute.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
index 18e70d24e4..c4fa86bcf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 
 internal class ProgramSectionAttributeLinkHandler(
-    store: ProgramSectionAttributeLinkStore
+    store: ProgramSectionAttributeLinkStore,
 ) : OrderedLinkHandlerImpl<TrackedEntityAttribute, ProgramSectionAttributeLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
index 5d90eb6a18..0a8b32cc4e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
 import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo
 
 internal class ProgramSectionAttributeLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramSectionAttributeLinkStore,
     LinkStoreImpl<ProgramSectionAttributeLink>(
         databaseAdapter,
         ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
         ProgramSectionAttributeLinkTableInfo.Columns.PROGRAM_SECTION,
         BINDER,
-        { cursor: Cursor -> ProgramSectionAttributeLink.create(cursor) }
+        { cursor: Cursor -> ProgramSectionAttributeLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
index a539ad688e..15120fd6b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class ProgramSectionEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramSection>> {
         return mapOf(
-            ProgramSectionFields.ATTRIBUTES to ProgramSectionAttributeChildrenAppender.create(databaseAdapter)
+            ProgramSectionFields.ATTRIBUTES to ProgramSectionAttributeChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
index c13eb0a761..5406e78975 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
@@ -28,23 +28,23 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramSectionHandler @Inject constructor(
     programSectionStore: ProgramSectionStore,
-    private val programSectionAttributeLinkHandler: ProgramSectionAttributeLinkHandler
+    private val programSectionAttributeLinkHandler: ProgramSectionAttributeLinkHandler,
 ) : IdentifiableHandlerImpl<ProgramSection>(programSectionStore) {
 
     override fun afterObjectHandled(o: ProgramSection, action: HandleAction) {
         programSectionAttributeLinkHandler.handleMany(
             o.uid(),
-            o.attributes()
+            o.attributes(),
         ) { trackedEntityAttribute: TrackedEntityAttribute, sortOrder: Int ->
             ProgramSectionAttributeLink.builder()
                 .programSection(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
index 3e0b080f08..42615cdb67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramSectionOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<Program, ProgramSection>(
     tableName = ProgramSectionTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramSectionTableInfo.Columns.PROGRAM,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
index d08b5eab8b..362156d330 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramSectionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramSectionStore,
     IdentifiableObjectStoreImpl<ProgramSection>(
         databaseAdapter,
         ProgramSectionTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramSection.create(cursor) }
+        { cursor: Cursor -> ProgramSection.create(cursor) },
     ) {
 
     companion object {
@@ -65,7 +65,7 @@ internal class ProgramSectionStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramSectionTableInfo.TABLE_INFO,
-            ProgramSectionTableInfo.Columns.PROGRAM
+            ProgramSectionTableInfo.Columns.PROGRAM,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
index 2afa3ab834..6f2f2a8cc9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
@@ -45,10 +45,10 @@ internal class ProgramStageDataElementEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        valueTypeRenderingChildrenAppender: DataElementValueTypeRenderingChildrenAppender
+        valueTypeRenderingChildrenAppender: DataElementValueTypeRenderingChildrenAppender,
     ): Map<String, ChildrenAppender<ProgramStageDataElement>> {
         return mapOf(
-            ProgramStageDataElementFields.RENDER_TYPE to valueTypeRenderingChildrenAppender
+            ProgramStageDataElementFields.RENDER_TYPE to valueTypeRenderingChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
index 80eb5fd303..841ba78edf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler
 import org.hisp.dhis.android.core.dataelement.internal.DataElementHandler
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageDataElementHandler @Inject constructor(
     programStageDataElementStore: ProgramStageDataElementStore,
     private val dataElementHandler: DataElementHandler,
-    private val valueTypeRenderingHandler: ValueTypeRenderingHandler
+    private val valueTypeRenderingHandler: ValueTypeRenderingHandler,
 ) : IdentifiableHandlerImpl<ProgramStageDataElement>(programStageDataElementStore) {
 
     override fun afterObjectHandled(o: ProgramStageDataElement, action: HandleAction) {
@@ -50,7 +50,7 @@ internal class ProgramStageDataElementHandler @Inject constructor(
         valueTypeRenderingHandler.handle(
             o.renderType(),
             o.uid(),
-            ProgramStageDataElementTableInfo.TABLE_INFO.name()
+            ProgramStageDataElementTableInfo.TABLE_INFO.name(),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
index 8cebb90853..e385d3a901 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageDataElementOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<ProgramStage, ProgramStageDataElement>(
     tableName = ProgramStageDataElementTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
index 9881a5aef5..54d32db20f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
@@ -39,20 +39,20 @@ import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramStageDataElementStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageDataElementStore,
     IdentifiableObjectStoreImpl<ProgramStageDataElement>(
         databaseAdapter,
         ProgramStageDataElementTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramStageDataElement.create(cursor) }
+        { cursor: Cursor -> ProgramStageDataElement.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<ProgramStageDataElement> =
             object : IdentifiableStatementBinder<ProgramStageDataElement>() {
                 override fun bindToStatement(
                     programStageDataElement: ProgramStageDataElement,
-                    w: StatementWrapper
+                    w: StatementWrapper,
                 ) {
                     super.bindToStatement(programStageDataElement, w)
                     w.bind(7, programStageDataElement.displayInReports())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index 7fc63e6bae..4ab7a57d24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -40,6 +39,7 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramStageSection
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageHandler @Inject constructor(
@@ -50,15 +50,15 @@ internal class ProgramStageHandler @Inject constructor(
     private val programStageSectionCleaner: ProgramStageSectionOrphanCleaner,
     private val programStageCleaner: ProgramStageSubCollectionCleaner,
     private val attributeHandler: AttributeHandler,
-    private val programStageAttributeValueLinkHandler: ProgramStageAttributeValueLinkHandler
+    private val programStageAttributeValueLinkHandler: ProgramStageAttributeValueLinkHandler,
 ) : IdentifiableHandlerImpl<ProgramStage>(programStageStore) {
 
     override fun afterObjectHandled(o: ProgramStage, action: HandleAction) {
         programStageDataElementHandler.handleMany(
-            ProgramStageInternalAccessor.accessProgramStageDataElements(o)
+            ProgramStageInternalAccessor.accessProgramStageDataElements(o),
         )
         programStageSectionHandler.handleMany(
-            ProgramStageInternalAccessor.accessProgramStageSections(o)
+            ProgramStageInternalAccessor.accessProgramStageSections(o),
         ) { programStageSection: ProgramStageSection ->
             programStageSection.toBuilder()
                 .programStage(ObjectWithUid.create(o.uid()))
@@ -68,11 +68,11 @@ internal class ProgramStageHandler @Inject constructor(
         if (action === HandleAction.Update) {
             programStageDataElementCleaner.deleteOrphan(
                 o,
-                ProgramStageInternalAccessor.accessProgramStageDataElements(o)
+                ProgramStageInternalAccessor.accessProgramStageDataElements(o),
             )
             programStageSectionCleaner.deleteOrphan(
                 o,
-                ProgramStageInternalAccessor.accessProgramStageSections(o)
+                ProgramStageInternalAccessor.accessProgramStageSections(o),
             )
         }
 
@@ -81,7 +81,7 @@ internal class ProgramStageHandler @Inject constructor(
             attributeHandler.handleMany(attributes)
             programStageAttributeValueLinkHandler.handleMany(
                 o.uid(),
-                attributes
+                attributes,
             ) { attribute: Attribute ->
                 ProgramStageAttributeValueLink.builder()
                     .programStage(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt
index bbc3e74c37..5dadf2864c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo
 
 internal class ProgramStageSectionDataElementChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<ProgramStageSection, DataElement>
+    private val linkChildStore: LinkChildStore<ProgramStageSection, DataElement>,
 ) : ChildrenAppender<ProgramStageSection>() {
     override fun appendChildren(m: ProgramStageSection): ProgramStageSection {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class ProgramStageSectionDataElementChildrenAppender private constructo
         private val CHILD_PROJECTION = LinkTableChildProjection(
             DataElementTableInfo.TABLE_INFO,
             ProgramStageSectionDataElementLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
-            ProgramStageSectionDataElementLinkTableInfo.Columns.DATA_ELEMENT
+            ProgramStageSectionDataElementLinkTableInfo.Columns.DATA_ELEMENT,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramStageSection> {
@@ -59,8 +59,8 @@ internal class ProgramStageSectionDataElementChildrenAppender private constructo
                 linkChildStore(
                     databaseAdapter,
                     ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> DataElement.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> DataElement.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
index f16e546258..6abf8e15ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
 
 internal class ProgramStageSectionDataElementLinkHandler(
-    store: ProgramStageSectionDataElementLinkStore
+    store: ProgramStageSectionDataElementLinkStore,
 ) : OrderedLinkHandlerImpl<DataElement, ProgramStageSectionDataElementLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
index 2f02fee439..a4c6d60809 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo
 
 internal class ProgramStageSectionDataElementLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageSectionDataElementLinkStore,
     LinkStoreImpl<ProgramStageSectionDataElementLink>(
         databaseAdapter,
         ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
         ProgramStageSectionDataElementLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
         BINDER,
-        { cursor: Cursor -> ProgramStageSectionDataElementLink.create(cursor) }
+        { cursor: Cursor -> ProgramStageSectionDataElementLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
index 0d67200d42..573e4fc6a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
@@ -49,7 +49,7 @@ internal class ProgramStageSectionEntityDIModule {
             ProgramStageSectionFields.PROGRAM_INDICATORS to
                 ProgramStageSectionProgramIndicatorChildrenAppender.create(databaseAdapter),
             ProgramStageSectionFields.DATA_ELEMENTS to
-                ProgramStageSectionDataElementChildrenAppender.create(databaseAdapter)
+                ProgramStageSectionDataElementChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
index a10268183f..6336958751 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElement
@@ -36,18 +35,19 @@ import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageSectionHandler @Inject constructor(
     programStageSectionStore: ProgramStageSectionStore,
     private val programStageSectionProgramIndicatorLinkHandler: ProgramStageSectionProgramIndicatorLinkHandler,
-    private val programStageSectionDataElementLinkHandler: ProgramStageSectionDataElementLinkHandler
+    private val programStageSectionDataElementLinkHandler: ProgramStageSectionDataElementLinkHandler,
 ) : IdentifiableHandlerImpl<ProgramStageSection>(programStageSectionStore) {
 
     override fun afterObjectHandled(o: ProgramStageSection, action: HandleAction) {
         programStageSectionDataElementLinkHandler.handleMany(
             o.uid(),
-            o.dataElements()
+            o.dataElements(),
         ) { dataElement: DataElement, sortOrder: Int ->
             ProgramStageSectionDataElementLink.builder()
                 .programStageSection(o.uid())
@@ -58,7 +58,7 @@ internal class ProgramStageSectionHandler @Inject constructor(
 
         programStageSectionProgramIndicatorLinkHandler.handleMany(
             o.uid(),
-            o.programIndicators()
+            o.programIndicators(),
         ) { programIndicator: ProgramIndicator ->
             ProgramStageSectionProgramIndicatorLink.builder()
                 .programStageSection(o.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
index 3b09ddd004..b2e21e8e18 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageSectionOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<ProgramStage, ProgramStageSection>(
     tableName = ProgramStageSectionTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt
index cf0ec6cf0f..381616f40f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorChildrenAppender.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo
 
 internal class ProgramStageSectionProgramIndicatorChildrenAppender private constructor(
-    private val linkChildStore: LinkChildStore<ProgramStageSection, ProgramIndicator>
+    private val linkChildStore: LinkChildStore<ProgramStageSection, ProgramIndicator>,
 ) : ChildrenAppender<ProgramStageSection>() {
     override fun appendChildren(m: ProgramStageSection): ProgramStageSection {
         val builder = m.toBuilder()
@@ -51,7 +51,7 @@ internal class ProgramStageSectionProgramIndicatorChildrenAppender private const
         private val CHILD_PROJECTION = LinkTableChildProjection(
             ProgramIndicatorTableInfo.TABLE_INFO,
             ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
-            ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_INDICATOR
+            ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_INDICATOR,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<ProgramStageSection> {
@@ -59,8 +59,8 @@ internal class ProgramStageSectionProgramIndicatorChildrenAppender private const
                 linkChildStore(
                     databaseAdapter,
                     ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> ProgramIndicator.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> ProgramIndicator.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
index 5ff4025f0a..94dfece086 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
@@ -43,7 +43,7 @@ internal class ProgramStageSectionProgramIndicatorEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: ProgramStageSectionProgramIndicatorLinkStore
+        store: ProgramStageSectionProgramIndicatorLinkStore,
     ): ProgramStageSectionProgramIndicatorLinkHandler {
         return ProgramStageSectionProgramIndicatorLinkHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
index 68dda0d9ee..340a84c5cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
@@ -33,5 +33,5 @@ import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
 
 internal class ProgramStageSectionProgramIndicatorLinkHandler(
-    store: ProgramStageSectionProgramIndicatorLinkStore
+    store: ProgramStageSectionProgramIndicatorLinkStore,
 ) : LinkHandlerImpl<ProgramIndicator, ProgramStageSectionProgramIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
index 980cf623aa..9fa531730b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLin
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo
 
 internal class ProgramStageSectionProgramIndicatorLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageSectionProgramIndicatorLinkStore,
     LinkStoreImpl<ProgramStageSectionProgramIndicatorLink>(
         databaseAdapter,
         ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
         ProgramStageSectionProgramIndicatorLinkTableInfo.Columns.PROGRAM_STAGE_SECTION,
         BINDER,
-        { cursor: Cursor -> ProgramStageSectionProgramIndicatorLink.create(cursor) }
+        { cursor: Cursor -> ProgramStageSectionProgramIndicatorLink.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: ProgramStageSectionProgramIndicatorLink, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
index d7427b954c..d2b11de326 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramStageSectionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageSectionStore,
     IdentifiableObjectStoreImpl<ProgramStageSection>(
         databaseAdapter,
         ProgramStageSectionTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramStageSection.create(cursor) }
+        { cursor: Cursor -> ProgramStageSection.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
index ec47e5757b..0136bc7e01 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
@@ -40,13 +40,13 @@ import org.hisp.dhis.android.core.program.ProgramStageTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramStageStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageStore,
     IdentifiableObjectStoreImpl<ProgramStage>(
         databaseAdapter,
         ProgramStageTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramStage.create(cursor) }
+        { cursor: Cursor -> ProgramStage.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<ProgramStage> =
@@ -82,7 +82,7 @@ internal class ProgramStageStoreImpl(
             }
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramStageTableInfo.TABLE_INFO,
-            ProgramStageTableInfo.Columns.PROGRAM
+            ProgramStageTableInfo.Columns.PROGRAM,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
index cff77ef2ed..4c39db02b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageSubCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SubCollectionCleanerImpl<ProgramStage>(
     tableName = ProgramStageTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramStageTableInfo.Columns.PROGRAM,
@@ -46,5 +46,5 @@ internal class ProgramStageSubCollectionCleaner @Inject constructor(
         override fun transform(o: ProgramStage): String {
             return o.program()!!.uid()
         }
-    }
+    },
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
index f789ee0e98..db1427210c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
@@ -42,13 +42,13 @@ import org.hisp.dhis.android.core.program.ProgramType
 
 @Suppress("MagicNumber")
 internal class ProgramStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStore,
     IdentifiableObjectStoreImpl<Program>(
         databaseAdapter,
         ProgramTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Program.create(cursor) }
+        { cursor: Cursor -> Program.create(cursor) },
     ) {
 
     override fun getUidsByProgramType(programType: ProgramType): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
index ccf931bbf8..abe182a0db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
@@ -45,10 +45,10 @@ internal class ProgramTrackedEntityAttributeEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        valueTypeRenderingChildrenAppender: ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender
+        valueTypeRenderingChildrenAppender: ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender,
     ): Map<String, ChildrenAppender<ProgramTrackedEntityAttribute>> {
         return mapOf(
-            ProgramTrackedEntityAttributeFields.RENDER_TYPE to valueTypeRenderingChildrenAppender
+            ProgramTrackedEntityAttributeFields.RENDER_TYPE to valueTypeRenderingChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
index 53f28f9b80..1cc8296f6e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
@@ -28,24 +28,24 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityAttributeHandler @Inject constructor(
     store: ProgramTrackedEntityAttributeStore,
-    private val renderTypeHandler: ValueTypeRenderingHandler
+    private val renderTypeHandler: ValueTypeRenderingHandler,
 ) : IdentifiableHandlerImpl<ProgramTrackedEntityAttribute>(store) {
     override fun afterObjectHandled(o: ProgramTrackedEntityAttribute, action: HandleAction) {
         if (action !== HandleAction.Delete) {
             renderTypeHandler.handle(
                 o.renderType(),
                 o.uid(),
-                ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name()
+                ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name(),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
index c7182e02e5..b3e7de02b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityAttributeOrphanCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<Program, ProgramTrackedEntityAttribute>(
     tableName = ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name(),
     parentColumn = ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
index 42e16b2470..bac75c264f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
@@ -40,20 +40,20 @@ import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramTrackedEntityAttributeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramTrackedEntityAttributeStore,
     IdentifiableObjectStoreImpl<ProgramTrackedEntityAttribute>(
         databaseAdapter,
         ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramTrackedEntityAttribute.create(cursor) }
+        { cursor: Cursor -> ProgramTrackedEntityAttribute.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<ProgramTrackedEntityAttribute> =
             object : NameableStatementBinder<ProgramTrackedEntityAttribute>() {
                 override fun bindToStatement(
                     o: ProgramTrackedEntityAttribute,
-                    w: StatementWrapper
+                    w: StatementWrapper,
                 ) {
                     super.bindToStatement(o, w)
                     w.bind(11, o.mandatory())
@@ -68,7 +68,7 @@ internal class ProgramTrackedEntityAttributeStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
-            ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM
+            ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
index 27634ff11f..7bdbdc356e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender @Inject constructor(
-    store: ValueTypeDeviceRenderingStore
+    store: ValueTypeDeviceRenderingStore,
 ) : ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute>(store) {
     override fun appendChildren(m: ProgramTrackedEntityAttribute): ProgramTrackedEntityAttribute {
         val valueTypeRendering = getValueTypeDeviceRendering(m)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
index 82becb17b3..e177c59bfb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityTypeChildrenAppender @Inject constructor(
-    private val store: TrackedEntityTypeStore
+    private val store: TrackedEntityTypeStore,
 ) : ChildrenAppender<Program>() {
     override fun appendChildren(m: Program): Program {
         val builder = m.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt
index cde058bb11..8a5c6f0d42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ValueTypeRenderingChildrenAppender.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo
 import org.hisp.dhis.android.core.common.ValueTypeRendering
 
 internal abstract class ValueTypeRenderingChildrenAppender<M : ObjectWithUidInterface>(
-    private val store: ObjectWithoutUidStore<ValueTypeDeviceRendering>
+    private val store: ObjectWithoutUidStore<ValueTypeDeviceRendering>,
 ) : ChildrenAppender<M>() {
     fun getValueTypeDeviceRendering(model: M): ValueTypeRendering {
         val desktopWhereClause = WhereClauseBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorContext.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorContext.kt
index be9261f156..d557225e1a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorContext.kt
@@ -36,5 +36,5 @@ data class ProgramIndicatorContext(
     val programIndicator: ProgramIndicator,
     val enrollment: Enrollment? = null,
     val attributeValues: Map<String, TrackedEntityAttributeValue> = mapOf(),
-    val events: Map<String, List<Event>> = mapOf()
+    val events: Map<String, List<Event>> = mapOf(),
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
index bb83843808..e2df27f912 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal
 
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.constant.Constant
@@ -45,6 +43,8 @@ import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicato
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
+import java.util.*
+import javax.inject.Inject
 
 internal class ProgramIndicatorEngineImpl @Inject constructor(
     private val programIndicatorStore: ProgramIndicatorStore,
@@ -55,14 +55,14 @@ internal class ProgramIndicatorEngineImpl @Inject constructor(
     private val programRepository: ProgramStageCollectionRepository,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
     private val constantStore: ConstantStore,
-    private val programStageStore: ProgramStageStore
+    private val programStageStore: ProgramStageStore,
 ) : ProgramIndicatorEngine {
 
     @Deprecated("Deprecated in Java")
     override fun getProgramIndicatorValue(
         enrollmentUid: String?,
         eventUid: String?,
-        programIndicatorUid: String
+        programIndicatorUid: String,
     ): String? {
         return when {
             eventUid != null -> getEventProgramIndicatorValue(eventUid, programIndicatorUid)
@@ -81,7 +81,7 @@ internal class ProgramIndicatorEngineImpl @Inject constructor(
             programIndicator = programIndicator,
             attributeValues = getAttributeValues(enrollment),
             enrollment = enrollment,
-            events = getEnrollmentEvents(enrollment)
+            events = getEnrollmentEvents(enrollment),
         )
 
         return evaluateProgramIndicatorContext(programIndicatorContext)
@@ -104,7 +104,7 @@ internal class ProgramIndicatorEngineImpl @Inject constructor(
             programIndicator = programIndicator,
             attributeValues = getAttributeValues(enrollment),
             enrollment = enrollment,
-            events = mapOf(event.programStage()!! to listOf(event))
+            events = mapOf(event.programStage()!! to listOf(event)),
         )
 
         return evaluateProgramIndicatorContext(programIndicatorContext)
@@ -116,7 +116,7 @@ internal class ProgramIndicatorEngineImpl @Inject constructor(
             context,
             dataElementStore,
             trackedEntityAttributeStore,
-            programStageStore
+            programStageStore,
         )
 
         return executor.getProgramIndicatorValue(context.programIndicator)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt
index ce54e082e7..efde162f24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt
@@ -45,7 +45,7 @@ internal class ProgramIndicatorExecutor constructor(
     private val programIndicatorContext: ProgramIndicatorContext,
     private val dataElementStore: IdentifiableObjectStore<DataElement>,
     private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
-    private val programStageStore: IdentifiableObjectStore<ProgramStage>
+    private val programStageStore: IdentifiableObjectStore<ProgramStage>,
 ) {
     fun getProgramIndicatorValue(programIndicator: ProgramIndicator): String? {
         val visitor = newVisitor(ParserUtils.ITEM_EVALUATE)
@@ -117,8 +117,8 @@ internal class ProgramIndicatorExecutor constructor(
                 programIndicatorExecutor = this,
                 dataElementStore = dataElementStore,
                 trackedEntityAttributeStore = trackedEntityAttributeStore,
-                programStageStore = programStageStore
-            )
+                programStageStore = programStageStore,
+            ),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorItemIdsCollector.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorItemIdsCollector.kt
index 221da5490b..eb18ec11bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorItemIdsCollector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorItemIdsCollector.kt
@@ -54,8 +54,8 @@ internal class ProgramIndicatorItemIdsCollector : ExpressionBaseListener() {
                         DimensionalItemId(
                             dimensionalItemType = DimensionalItemType.TRACKED_ENTITY_DATA_VALUE,
                             id0 = stageId,
-                            id1 = dataElementId
-                        )
+                            id1 = dataElementId,
+                        ),
                     )
                 }
 
@@ -67,8 +67,8 @@ internal class ProgramIndicatorItemIdsCollector : ExpressionBaseListener() {
                     itemIds.add(
                         DimensionalItemId(
                             dimensionalItemType = DimensionalItemType.TRACKED_ENTITY_ATTRIBUTE,
-                            id0 = attributeId
-                        )
+                            id0 = attributeId,
+                        ),
                     )
                 }
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorParserUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorParserUtils.kt
index 74df437e1f..431a089803 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorParserUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorParserUtils.kt
@@ -88,7 +88,7 @@ internal object ProgramIndicatorParserUtils {
         ExpressionParser.HASH_BRACE to ProgramItemStageElement(),
         ExpressionParser.A_BRACE to ProgramItemAttribute(),
         ExpressionParser.PS_EVENTDATE to ProgramItemPsEventdate(), // Program variables
-        ExpressionParser.V_BRACE to ProgramVariableItem()
+        ExpressionParser.V_BRACE to ProgramVariableItem(),
     )
 
     @JvmField
@@ -107,7 +107,7 @@ internal object ProgramIndicatorParserUtils {
                 ExpressionParser.D2_ROUND to D2Round(),
                 ExpressionParser.D2_SPLIT to D2Split(),
                 ExpressionParser.D2_SUBSTRING to D2Substring(),
-                ExpressionParser.D2_VALIDATE_PATTERN to D2ValidatePattern()
+                ExpressionParser.D2_VALIDATE_PATTERN to D2ValidatePattern(),
             )
 
     @JvmField
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLContext.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLContext.kt
index 22fb8bac4e..8e9cd732df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLContext.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.program.ProgramIndicator
 
 data class ProgramIndicatorSQLContext(
     val programIndicator: ProgramIndicator,
-    val periods: List<Period>?
+    val periods: List<Period>?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
index f8d5667f29..7475653559 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.programindicatorengine.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
@@ -53,19 +52,20 @@ import org.hisp.dhis.android.core.program.programindicatorengine.internal.Progra
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.literal.ProgramIndicatorSQLLiteral
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.antlr.Parser
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorSQLExecutor @Inject constructor(
     private val constantStore: ConstantStore,
     private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
-    private val databaseAdapter: DatabaseAdapter
+    private val databaseAdapter: DatabaseAdapter,
 ) {
 
     fun getProgramIndicatorValue(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String? {
         val sqlQuery = getProgramIndicatorSQL(evaluationItem, metadata, queryMods)
 
@@ -78,7 +78,7 @@ internal class ProgramIndicatorSQLExecutor @Inject constructor(
     fun getProgramIndicatorSQL(
         evaluationItem: AnalyticsServiceEvaluationItem,
         metadata: Map<String, MetadataItem>,
-        queryMods: QueryMods?
+        queryMods: QueryMods?,
     ): String {
         val programIndicator = ProgramIndicatorEvaluatorHelper.getProgramIndicator(evaluationItem, metadata)
         val periodItems = evaluationItem.allDimensionItems.filterIsInstance<DimensionItem.PeriodItem>()
@@ -101,20 +101,20 @@ internal class ProgramIndicatorSQLExecutor @Inject constructor(
                     programIndicator,
                     evaluationItem,
                     metadata,
-                    queryMods
+                    queryMods,
                 )
             AnalyticsType.ENROLLMENT, null ->
                 ProgramIndicatorEvaluatorHelper.getEnrollmentWhereClause(
                     programIndicator,
                     evaluationItem,
                     metadata,
-                    queryMods
+                    queryMods,
                 )
         }
 
         val context = ProgramIndicatorSQLContext(
             programIndicator = programIndicator,
-            periods = periods
+            periods = periods,
         )
 
         val collector = ProgramIndicatorItemIdsCollector()
@@ -146,7 +146,7 @@ internal class ProgramIndicatorSQLExecutor @Inject constructor(
 
     private fun newVisitor(
         itemMethod: ExpressionItemMethod,
-        context: ProgramIndicatorSQLContext
+        context: ProgramIndicatorSQLContext,
     ): CommonExpressionVisitor {
         return CommonExpressionVisitor(
             CommonExpressionVisitorScope.ProgramSQLIndicator(
@@ -155,8 +155,8 @@ internal class ProgramIndicatorSQLExecutor @Inject constructor(
                 constantMap = constantMap(),
                 programIndicatorSQLContext = context,
                 dataElementStore = dataElementStore,
-                trackedEntityAttributeStore = trackedEntityAttributeStore
-            )
+                trackedEntityAttributeStore = trackedEntityAttributeStore,
+            ),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt
index 5143e09874..1cec991795 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLUtils.kt
@@ -73,7 +73,7 @@ internal object ProgramIndicatorSQLUtils {
         column: String,
         programStageUid: String,
         dataElementUid: String,
-        programIndicator: ProgramIndicator
+        programIndicator: ProgramIndicator,
     ): String {
         return "(SELECT $column " +
             "FROM ${TrackedEntityDataValueTableInfo.TABLE_INFO.name()} " +
@@ -90,7 +90,7 @@ internal object ProgramIndicatorSQLUtils {
     fun getAttributeWhereClause(
         column: String,
         attributeUid: String,
-        programIndicator: ProgramIndicator
+        programIndicator: ProgramIndicator,
     ): String {
         return "(SELECT $column " +
             "FROM ${TrackedEntityAttributeValueTableInfo.TABLE_INFO.name()} " +
@@ -129,7 +129,7 @@ internal object ProgramIndicatorSQLUtils {
 
     fun getColumnValueCast(
         column: String,
-        valueType: ValueType?
+        valueType: ValueType?,
     ): String {
         return when {
             valueType?.isNumeric == true ->
@@ -142,7 +142,7 @@ internal object ProgramIndicatorSQLUtils {
     }
 
     fun getDefaultValue(
-        valueType: ValueType?
+        valueType: ValueType?,
     ): String {
         return if (valueType?.isNumeric == true || valueType?.isBoolean == true) {
             "CAST(0 AS NUMERIC)"
@@ -154,7 +154,7 @@ internal object ProgramIndicatorSQLUtils {
     fun valueCountExpression(
         itemIds: Set<DimensionalItemId>,
         programIndicator: ProgramIndicator,
-        conditionalValueExpression: String? = null
+        conditionalValueExpression: String? = null,
     ): String {
         val stageElementItems = itemIds.filter {
             it.dimensionalItemType == DimensionalItemType.TRACKED_ENTITY_DATA_VALUE
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt
index 91f3beeeda..1bc0cdf8db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt
@@ -67,13 +67,13 @@ internal class ProgramItemAttribute : ProgramExpressionItem() {
 
         val valueCastExpression = getColumnValueCast(
             TrackedEntityAttributeValueTableInfo.Columns.VALUE,
-            attribute.valueType()
+            attribute.valueType(),
         )
 
         val selectExpression = ProgramIndicatorSQLUtils.getAttributeWhereClause(
             column = valueCastExpression,
             attributeUid = attributeUid,
-            programIndicator = visitor.programIndicatorSQLContext!!.programIndicator
+            programIndicator = visitor.programIndicatorSQLContext!!.programIndicator,
         )
 
         return if (visitor.state.replaceNulls) {
@@ -87,8 +87,8 @@ internal class ProgramItemAttribute : ProgramExpressionItem() {
         return visitor.itemIds.add(
             DimensionalItemId(
                 dimensionalItemType = DimensionalItemType.TRACKED_ENTITY_ATTRIBUTE,
-                id0 = ctx.uid0.text
-            )
+                id0 = ctx.uid0.text,
+            ),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemPsEventdate.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemPsEventdate.kt
index 70b5024dbd..a41a4977d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemPsEventdate.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemPsEventdate.kt
@@ -58,7 +58,7 @@ internal class ProgramItemPsEventdate : ProgramExpressionItem() {
             AnalyticsType.ENROLLMENT, null ->
                 ProgramIndicatorSQLUtils.getEventColumnForEnrollmentWhereClause(
                     column = EventTableInfo.Columns.EVENT_DATE,
-                    programStageId = programStageId
+                    programStageId = programStageId,
                 )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt
index 344afa03cf..3d04900b3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt
@@ -92,14 +92,14 @@ internal class ProgramItemStageElement : ProgramExpressionItem() {
 
         val valueCastExpression = getColumnValueCast(
             TrackedEntityDataValueTableInfo.Columns.VALUE,
-            dataElement.valueType()
+            dataElement.valueType(),
         )
 
         val selectExpression = ProgramIndicatorSQLUtils.getTrackerDataValueWhereClause(
             column = valueCastExpression,
             programStageUid = programStageId,
             dataElementUid = dataElementId,
-            programIndicator = visitor.programIndicatorSQLContext!!.programIndicator
+            programIndicator = visitor.programIndicatorSQLContext!!.programIndicator,
         )
 
         return if (visitor.state.replaceNulls) {
@@ -117,8 +117,8 @@ internal class ProgramItemStageElement : ProgramExpressionItem() {
             DimensionalItemId(
                 dimensionalItemType = DimensionalItemType.TRACKED_ENTITY_DATA_VALUE,
                 id0 = stageId,
-                id1 = dataElementId
-            )
+                id1 = dataElementId,
+            ),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Ceil.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Ceil.kt
index 9268ec2901..1c5695baac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Ceil.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Ceil.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal.function
 
-import kotlin.math.ceil
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext
+import kotlin.math.ceil
 
 internal class D2Ceil : ExpressionItem {
     override fun evaluate(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Floor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Floor.kt
index 5d968b4ed7..a52ddf57b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Floor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Floor.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal.function
 
-import kotlin.math.floor
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext
+import kotlin.math.floor
 
 internal class D2Floor : ExpressionItem {
     override fun evaluate(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2HasValue.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2HasValue.kt
index e548bf8c83..d94d9733f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2HasValue.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2HasValue.kt
@@ -47,7 +47,7 @@ internal class D2HasValue : ProgramExpressionItem() {
             is ProgramItemStageElement -> hasProgramItemStageElement(ctx, visitor)
             is ProgramItemAttribute -> hasProgramAttribute(ctx, visitor)
             else -> throw ParserExceptionWithoutContext(
-                "First argument not supported for d2:hasValue... function: ${ctx.text}"
+                "First argument not supported for d2:hasValue... function: ${ctx.text}",
             )
         }
     }
@@ -77,7 +77,7 @@ internal class D2HasValue : ProgramExpressionItem() {
             is ProgramItemStageElement -> hasProgramItemStageElementSQL(ctx, visitor)
             is ProgramItemAttribute -> hasProgramAttributeSQL(ctx, visitor)
             else -> throw ParserExceptionWithoutContext(
-                "First argument not supported for d2:hasValue... function: ${ctx.text}"
+                "First argument not supported for d2:hasValue... function: ${ctx.text}",
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Modulus.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Modulus.kt
index b67e4b9e7f..c3f18a9520 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Modulus.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Modulus.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal.function
 
-import java.util.*
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext
+import java.util.*
 
 internal class D2Modulus : ExpressionItem {
     override fun evaluate(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt
index a53fad81d3..7b244d7b06 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2RelationshipCount.kt
@@ -72,7 +72,7 @@ internal class D2RelationshipCount : ExpressionItem {
                         "FROM ${EnrollmentTableInfo.TABLE_INFO.name()} " +
                         "WHERE ${EnrollmentTableInfo.Columns.UID} = $event.${EventTableInfo.Columns.ENROLLMENT})",
                     enrollmentQuery = "= $event.${EventTableInfo.Columns.ENROLLMENT}",
-                    eventQuery = "= $event.${EventTableInfo.Columns.UID}"
+                    eventQuery = "= $event.${EventTableInfo.Columns.UID}",
                 )
             AnalyticsType.ENROLLMENT, null ->
                 RelationshipCountQueries(
@@ -81,7 +81,7 @@ internal class D2RelationshipCount : ExpressionItem {
                     eventQuery = "IN (SELECT ${EventTableInfo.Columns.UID} " +
                         "FROM ${EventTableInfo.TABLE_INFO.name()} " +
                         "WHERE ${EventTableInfo.Columns.ENROLLMENT} = " +
-                        "$enrollment.${EnrollmentTableInfo.Columns.UID})"
+                        "$enrollment.${EnrollmentTableInfo.Columns.UID})",
                 )
         }
     }
@@ -89,6 +89,6 @@ internal class D2RelationshipCount : ExpressionItem {
     internal data class RelationshipCountQueries(
         val teiQuery: String,
         val enrollmentQuery: String,
-        val eventQuery: String
+        val eventQuery: String,
     )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Round.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Round.kt
index 3c36f1ec58..2177172937 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Round.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/D2Round.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal.function
 
-import kotlin.math.roundToInt
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext
+import kotlin.math.roundToInt
 
 internal class D2Round : ExpressionItem {
     override fun evaluate(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/ProgramCountFunction.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/ProgramCountFunction.kt
index 1dc6d191ab..27b368b1bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/ProgramCountFunction.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/function/ProgramCountFunction.kt
@@ -69,7 +69,7 @@ internal abstract class ProgramCountFunction : ProgramExpressionItem() {
 
         val valueCastExpression = getColumnValueCast(
             TrackedEntityDataValueTableInfo.Columns.VALUE,
-            dataElement.valueType()
+            dataElement.valueType(),
         )
 
         val conditionalSql = getConditionalSql(ctx, visitor)
@@ -93,7 +93,7 @@ internal abstract class ProgramCountFunction : ProgramExpressionItem() {
     private fun validateCountFunctionArgs(ctx: ExprContext) {
         if (getProgramArgType(ctx) !is ProgramItemStageElement) {
             throw ParserExceptionWithoutContext(
-                "First argument not supported for d2:count... functions: ${ctx.text}"
+                "First argument not supported for d2:count... functions: ${ctx.text}",
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/ProgramVariableItem.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/ProgramVariableItem.kt
index ec8e01b47a..b65c69db1f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/ProgramVariableItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/ProgramVariableItem.kt
@@ -81,7 +81,7 @@ internal class ProgramVariableItem : ProgramExpressionItem() {
             ExpressionParser.V_VALUE_COUNT to VValueCount(),
             ExpressionParser.V_ZERO_POS_VALUE_COUNT to VZeroPosValueCount(),
             ExpressionParser.V_PROGRAM_STAGE_ID to VProgramStageId(),
-            ExpressionParser.V_PROGRAM_STAGE_NAME to VProgramStageName()
+            ExpressionParser.V_PROGRAM_STAGE_NAME to VProgramStageName(),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VCurrentDate.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VCurrentDate.kt
index 09721e980b..e12590c6f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VCurrentDate.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VCurrentDate.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal.variable
 
-import java.util.*
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext
+import java.util.*
 
 internal class VCurrentDate : ExpressionItem {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VDueDate.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VDueDate.kt
index 406d13825f..82e4df3c84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VDueDate.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VDueDate.kt
@@ -48,7 +48,7 @@ internal class VDueDate : ProgramExpressionItem() {
                 "$event.${EventTableInfo.Columns.DUE_DATE}"
             AnalyticsType.ENROLLMENT, null ->
                 ProgramIndicatorSQLUtils.getEventColumnForEnrollmentWhereClause(
-                    column = EventTableInfo.Columns.DUE_DATE
+                    column = EventTableInfo.Columns.DUE_DATE,
                 )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentDate.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentDate.kt
index 329ddee5d1..8898d2f505 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentDate.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentDate.kt
@@ -48,7 +48,7 @@ internal class VEnrollmentDate : ExpressionItem {
         return when (visitor.programIndicatorSQLContext!!.programIndicator.analyticsType()) {
             AnalyticsType.EVENT ->
                 ProgramIndicatorSQLUtils.getEnrollmentColumnForEventWhereClause(
-                    column = EnrollmentTableInfo.Columns.ENROLLMENT_DATE
+                    column = EnrollmentTableInfo.Columns.ENROLLMENT_DATE,
                 )
             AnalyticsType.ENROLLMENT, null ->
                 "$enrollment.${EnrollmentTableInfo.Columns.ENROLLMENT_DATE}"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentStatus.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentStatus.kt
index da3d355e91..dc2d7b48c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentStatus.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEnrollmentStatus.kt
@@ -45,7 +45,7 @@ internal class VEnrollmentStatus : ExpressionItem {
         return when (visitor.programIndicatorSQLContext!!.programIndicator.analyticsType()) {
             AnalyticsType.EVENT ->
                 ProgramIndicatorSQLUtils.getEnrollmentColumnForEventWhereClause(
-                    column = EnrollmentTableInfo.Columns.STATUS
+                    column = EnrollmentTableInfo.Columns.STATUS,
                 )
             AnalyticsType.ENROLLMENT, null ->
                 "$enrollment.${EnrollmentTableInfo.Columns.STATUS}"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventDate.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventDate.kt
index e6b986321a..78229fbe1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventDate.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventDate.kt
@@ -48,7 +48,7 @@ internal class VEventDate : ProgramExpressionItem() {
                 "$event.${EventTableInfo.Columns.EVENT_DATE}"
             AnalyticsType.ENROLLMENT, null ->
                 ProgramIndicatorSQLUtils.getEventColumnForEnrollmentWhereClause(
-                    column = EventTableInfo.Columns.EVENT_DATE
+                    column = EventTableInfo.Columns.EVENT_DATE,
                 )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventStatus.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventStatus.kt
index 0cb6bfc755..6fd2b4e0f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventStatus.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VEventStatus.kt
@@ -47,7 +47,7 @@ internal class VEventStatus : ProgramExpressionItem() {
                 "$event.${EventTableInfo.Columns.STATUS}"
             AnalyticsType.ENROLLMENT, null ->
                 ProgramIndicatorSQLUtils.getEventColumnForEnrollmentWhereClause(
-                    column = EventTableInfo.Columns.STATUS
+                    column = EventTableInfo.Columns.STATUS,
                 )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VIncidentDate.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VIncidentDate.kt
index 42777c3589..224a8d14b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VIncidentDate.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VIncidentDate.kt
@@ -48,7 +48,7 @@ internal class VIncidentDate : ExpressionItem {
         return when (visitor.programIndicatorSQLContext!!.programIndicator.analyticsType()) {
             AnalyticsType.EVENT ->
                 ProgramIndicatorSQLUtils.getEnrollmentColumnForEventWhereClause(
-                    column = EnrollmentTableInfo.Columns.INCIDENT_DATE
+                    column = EnrollmentTableInfo.Columns.INCIDENT_DATE,
                 )
             AnalyticsType.ENROLLMENT, null ->
                 "$enrollment.${EnrollmentTableInfo.Columns.INCIDENT_DATE}"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageId.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageId.kt
index 0f4fa06f1a..4473f5341a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageId.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageId.kt
@@ -46,7 +46,7 @@ internal class VProgramStageId : ProgramExpressionItem() {
                 "${ProgramIndicatorSQLUtils.event}.${EventTableInfo.Columns.PROGRAM_STAGE}"
             AnalyticsType.ENROLLMENT, null ->
                 ProgramIndicatorSQLUtils.getEventColumnForEnrollmentWhereClause(
-                    column = EventTableInfo.Columns.PROGRAM_STAGE
+                    column = EventTableInfo.Columns.PROGRAM_STAGE,
                 )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageName.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageName.kt
index 481dcc372f..5454f6c3f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageName.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VProgramStageName.kt
@@ -58,7 +58,7 @@ internal class VProgramStageName : ProgramExpressionItem() {
                         "FROM ${ProgramStageTableInfo.TABLE_INFO.name()} ps " +
                         "WHERE ps.${IdentifiableColumns.UID} = " +
                         EventTableInfo.Columns.PROGRAM_STAGE +
-                        ")"
+                        ")",
                 )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VTeiCount.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VTeiCount.kt
index 1950362b1b..0934eaf0b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VTeiCount.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VTeiCount.kt
@@ -47,7 +47,7 @@ internal class VTeiCount : ExpressionItem {
         val teiSelector = when (visitor.programIndicatorSQLContext!!.programIndicator.analyticsType()) {
             AnalyticsType.EVENT ->
                 ProgramIndicatorSQLUtils.getEnrollmentColumnForEventWhereClause(
-                    column = EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE
+                    column = EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
                 )
             AnalyticsType.ENROLLMENT, null ->
                 "$enrollment.${EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE}"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VValueCount.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VValueCount.kt
index a6abe0e1d5..e822a401a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VValueCount.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VValueCount.kt
@@ -48,7 +48,7 @@ internal class VValueCount : ExpressionItem {
     override fun getSql(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
         return ProgramIndicatorSQLUtils.valueCountExpression(
             itemIds = visitor.itemIds,
-            programIndicator = visitor.programIndicatorSQLContext!!.programIndicator
+            programIndicator = visitor.programIndicatorSQLContext!!.programIndicator,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VZeroPosValueCount.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VZeroPosValueCount.kt
index 6849637154..79ea17644c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VZeroPosValueCount.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/variable/VZeroPosValueCount.kt
@@ -49,7 +49,7 @@ internal class VZeroPosValueCount : ExpressionItem {
         return ProgramIndicatorSQLUtils.valueCountExpression(
             itemIds = visitor.itemIds,
             programIndicator = visitor.programIndicatorSQLContext!!.programIndicator,
-            conditionalValueExpression = " >= 0"
+            conditionalValueExpression = " >= 0",
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageQueryCriteriaFields.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageQueryCriteriaFields.kt
index 9ada248505..ff70ea94d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageQueryCriteriaFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageQueryCriteriaFields.kt
@@ -59,6 +59,6 @@ internal object ProgramStageQueryCriteriaFields {
             fh.nestedField<ProgramStageWorkingListEventDataFilter>(DATA_FILTERS)
                 .with(ProgramStageWorkingListEventDataFilterFields.allFields),
             fh.nestedField<ProgramStageWorkingListAttributeValueFilter>(ATTRIBUTE_VALUE_FILTER)
-                .with(ProgramStageWorkingListAttributeValueFilterFields.allFields)
+                .with(ProgramStageWorkingListAttributeValueFilterFields.allFields),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt
index a132bbe847..0042b898bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterChildrenAppender.kt
@@ -36,7 +36,8 @@ import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingLis
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
 
 internal class ProgramStageWorkingListAttributeValueFilterChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<ProgramStageWorkingList, ProgramStageWorkingListAttributeValueFilter>
+    private val childStore:
+    SingleParentChildStore<ProgramStageWorkingList, ProgramStageWorkingListAttributeValueFilter>,
 ) : ChildrenAppender<ProgramStageWorkingList>() {
 
     override fun appendChildren(m: ProgramStageWorkingList): ProgramStageWorkingList {
@@ -53,8 +54,8 @@ internal class ProgramStageWorkingListAttributeValueFilterChildrenAppender priva
             return ProgramStageWorkingListAttributeValueFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    ProgramStageWorkingListAttributeValueFilterStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> ProgramStageWorkingListAttributeValueFilter.create(cursor) }
+                    ProgramStageWorkingListAttributeValueFilterStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> ProgramStageWorkingListAttributeValueFilter.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
index 87c608b345..5025b1c15e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
@@ -44,7 +44,7 @@ internal class ProgramStageWorkingListAttributeValueFilterEntityDIModule {
     @Provides
     @Reusable
     fun handler(
-        store: ProgramStageWorkingListAttributeValueFilterStore
+        store: ProgramStageWorkingListAttributeValueFilterStore,
     ): ProgramStageWorkingListAttributeValueFilterHandler {
         return ProgramStageWorkingListAttributeValueFilterHandler(store)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterFields.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterFields.kt
index 8f0d8087dd..3c72a8d87f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterFields.kt
@@ -48,6 +48,6 @@ object ProgramStageWorkingListAttributeValueFilterFields {
             fh.field<String>(ItemFilterTableInfo.Columns.EQ),
             fh.field<String>(API_IN),
             fh.field<String>(ItemFilterTableInfo.Columns.LIKE),
-            fh.field<String>(ItemFilterTableInfo.Columns.DATE_FILTER)
+            fh.field<String>(ItemFilterTableInfo.Columns.DATE_FILTER),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
index c34f54b3eb..3fd002060d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
 
 internal class ProgramStageWorkingListAttributeValueFilterHandler(
-    store: ProgramStageWorkingListAttributeValueFilterStore
+    store: ProgramStageWorkingListAttributeValueFilterStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramStageWorkingListAttributeValueFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
index 4a0b78a50f..3ea77b54cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingLis
 
 @Suppress("MagicNumber")
 internal class ProgramStageWorkingListAttributeValueFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageWorkingListAttributeValueFilterStore,
     ObjectWithoutUidStoreImpl<ProgramStageWorkingListAttributeValueFilter>(
         databaseAdapter,
@@ -48,7 +48,7 @@ internal class ProgramStageWorkingListAttributeValueFilterStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { ProgramStageWorkingListAttributeValueFilter.create(it) }
+        { ProgramStageWorkingListAttributeValueFilter.create(it) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: ProgramStageWorkingListAttributeValueFilter, w: StatementWrapper ->
@@ -74,7 +74,7 @@ internal class ProgramStageWorkingListAttributeValueFilterStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ItemFilterTableInfo.TABLE_INFO,
-            ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST
+            ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
index 3079441a56..9a75405f32 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
@@ -29,20 +29,20 @@ package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageWorkingListCall @Inject internal constructor(
     private val service: ProgramStageWorkingListService,
     private val handler: ProgramStageWorkingListHandler,
     private val apiDownloader: APIDownloader,
-    private val versionManager: DHISVersionManager
+    private val versionManager: DHISVersionManager,
 ) : UidsCall<ProgramStageWorkingList> {
     override fun download(uids: Set<String>): Single<List<ProgramStageWorkingList>> {
         val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
@@ -51,13 +51,13 @@ internal class ProgramStageWorkingListCall @Inject internal constructor(
             apiDownloader.downloadPartitioned(
                 uids,
                 MAX_UID_LIST_SIZE,
-                handler
+                handler,
             ) { partitionUids: Set<String> ->
                 service.getProgramStageWorkingLists(
                     ProgramStageWorkingListFields.programUid.`in`(partitionUids),
                     accessDataReadFilter,
                     ProgramStageWorkingListFields.allFields,
-                    false
+                    false,
                 )
             }
         } else {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt
index 957edd76a3..514d5f515a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListDataFilterChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingLis
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
 
 internal class ProgramStageWorkingListDataFilterChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<ProgramStageWorkingList, ProgramStageWorkingListEventDataFilter>
+    private val childStore: SingleParentChildStore<ProgramStageWorkingList, ProgramStageWorkingListEventDataFilter>,
 ) : ChildrenAppender<ProgramStageWorkingList>() {
 
     override fun appendChildren(m: ProgramStageWorkingList): ProgramStageWorkingList {
@@ -51,8 +51,8 @@ internal class ProgramStageWorkingListDataFilterChildrenAppender private constru
             return ProgramStageWorkingListDataFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    ProgramStageWorkingListEventDataFilterStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> ProgramStageWorkingListEventDataFilter.create(cursor) }
+                    ProgramStageWorkingListEventDataFilterStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> ProgramStageWorkingListEventDataFilter.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
index 599a069f2c..6161beca12 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
@@ -53,13 +53,13 @@ internal class ProgramStageWorkingListEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        databaseAdapter: DatabaseAdapter
+        databaseAdapter: DatabaseAdapter,
     ): Map<String, ChildrenAppender<ProgramStageWorkingList>> {
         return mapOf(
             ProgramStageQueryCriteriaFields.DATA_FILTERS to
                 ProgramStageWorkingListDataFilterChildrenAppender.create(databaseAdapter),
             ProgramStageQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER to
-                ProgramStageWorkingListAttributeValueFilterChildrenAppender.create(databaseAdapter)
+                ProgramStageWorkingListAttributeValueFilterChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterFields.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterFields.kt
index 89465f4070..2c62cc6713 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterFields.kt
@@ -46,6 +46,6 @@ object ProgramStageWorkingListEventDataFilterFields {
             fh.field<String>(Columns.EQ),
             fh.field<String>(API_IN),
             fh.field<String>(Columns.LIKE),
-            fh.field<String>(Columns.DATE_FILTER)
+            fh.field<String>(Columns.DATE_FILTER),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
index e84abf6871..75871ce926 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
 
 internal class ProgramStageWorkingListEventDataFilterHandler(
-    store: ProgramStageWorkingListEventDataFilterStore
+    store: ProgramStageWorkingListEventDataFilterStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramStageWorkingListEventDataFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
index eb3b00ea61..0415fa401e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingLis
 
 @Suppress("MagicNumber")
 internal class ProgramStageWorkingListEventDataFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageWorkingListEventDataFilterStore,
     ObjectWithoutUidStoreImpl<ProgramStageWorkingListEventDataFilter>(
         databaseAdapter,
@@ -48,7 +48,7 @@ internal class ProgramStageWorkingListEventDataFilterStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { ProgramStageWorkingListEventDataFilter.create(it) }
+        { ProgramStageWorkingListEventDataFilter.create(it) },
     ) {
 
     companion object {
@@ -75,7 +75,7 @@ internal class ProgramStageWorkingListEventDataFilterStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ItemFilterTableInfo.TABLE_INFO,
-            ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST
+            ItemFilterTableInfo.Columns.PROGRAM_STAGE_WORKING_LIST,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListFields.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListFields.kt
index 3d120334a7..3319b01fb3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListFields.kt
@@ -49,7 +49,7 @@ object ProgramStageWorkingListFields {
             fh.nestedFieldWithUid(ProgramStageWorkingListTableInfo.Columns.PROGRAM),
             fh.nestedFieldWithUid(ProgramStageWorkingListTableInfo.Columns.PROGRAM_STAGE),
             fh.nestedField<ProgramStageQueryCriteria>(PROGRAM_STAGE_QUERY_CRITERIA)
-                .with(ProgramStageQueryCriteriaFields.allFields)
+                .with(ProgramStageQueryCriteriaFields.allFields),
         )
         .build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
index de920fc3e5..06724524cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageWorkingListHandler @Inject constructor(
     store: ProgramStageWorkingListStore,
     private val eventDataFilterHandler: ProgramStageWorkingListEventDataFilterHandler,
-    private val attributeValueFilterHandler: ProgramStageWorkingListAttributeValueFilterHandler
+    private val attributeValueFilterHandler: ProgramStageWorkingListAttributeValueFilterHandler,
 ) : IdentifiableHandlerImpl<ProgramStageWorkingList>(store) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<ProgramStageWorkingList>
+        oCollection: Collection<ProgramStageWorkingList>,
     ): Collection<ProgramStageWorkingList> {
         store.delete()
         return super.beforeCollectionHandled(oCollection)
@@ -51,10 +51,10 @@ internal class ProgramStageWorkingListHandler @Inject constructor(
         if (action !== HandleAction.Delete && o.programStageQueryCriteria() != null) {
             o.programStageQueryCriteria()?.let { criteria ->
                 eventDataFilterHandler.handleMany(
-                    criteria.dataFilters()
+                    criteria.dataFilters(),
                 ) { edf -> edf.toBuilder().programStageWorkingList(o.uid()).build() }
                 attributeValueFilterHandler.handleMany(
-                    criteria.attributeValueFilters()
+                    criteria.attributeValueFilters(),
                 ) { avf -> avf.toBuilder().programStageWorkingList(o.uid()).build() }
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt
index 2616810e3a..84f2f66af9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramStageWorkingListModuleWiper @Inject constructor(
-    private val tableWiper: TableWiper
+    private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             ProgramStageWorkingListTableInfo.TABLE_INFO,
-            ItemFilterTableInfo.TABLE_INFO
+            ItemFilterTableInfo.TABLE_INFO,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
index 13e4867944..fe732c8874 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
@@ -33,7 +33,7 @@ import dagger.Module
     includes = [
         ProgramStageWorkingListEntityDIModule::class,
         ProgramStageWorkingListEventDataFilterEntityDIModule::class,
-        ProgramStageWorkingListAttributeValueFilterEntityDIModule::class
-    ]
+        ProgramStageWorkingListAttributeValueFilterEntityDIModule::class,
+    ],
 )
 internal class ProgramStageWorkingListPackageDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt
index c038129291..648c0aa5b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt
@@ -43,6 +43,6 @@ internal interface ProgramStageWorkingListService {
         @Query("filter") @Where uids: Filter<ProgramStageWorkingList, String>,
         @Query("filter") accessDataReadFilter: String,
         @Query("fields") @Which fields: Fields<ProgramStageWorkingList>,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Payload<ProgramStageWorkingList>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
index c4de42429e..95adb26edd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingLis
 
 @Suppress("MagicNumber")
 internal class ProgramStageWorkingListStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramStageWorkingListStore,
     IdentifiableObjectStoreImpl<ProgramStageWorkingList>(
         databaseAdapter,
         ProgramStageWorkingListTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ProgramStageWorkingList.create(cursor) }
+        { cursor: Cursor -> ProgramStageWorkingList.create(cursor) },
     ) {
 
     companion object {
@@ -59,21 +59,21 @@ internal class ProgramStageWorkingListStoreImpl(
                     w.bind(10, o.programStageQueryCriteria()?.eventStatus())
                     w.bind(
                         11,
-                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventCreatedAt())
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventCreatedAt()),
                     )
                     w.bind(
                         12,
-                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventOccurredAt())
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventOccurredAt()),
                     )
                     w.bind(
                         13,
-                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventScheduledAt())
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.eventScheduledAt()),
                     )
                     w.bind(14, o.programStageQueryCriteria()?.enrollmentStatus())
                     w.bind(15, DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrolledAt()))
                     w.bind(
                         16,
-                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrollmentOccurredAt())
+                        DateFilterPeriodColumnAdapter.serialize(o.programStageQueryCriteria()?.enrollmentOccurredAt()),
                     )
                     w.bind(17, o.programStageQueryCriteria()?.order())
                     w.bind(18, StringListColumnAdapter.serialize(o.programStageQueryCriteria()?.displayColumnOrder()))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListTableInfo.kt
index f4cecb1a76..8e4cfc46dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListTableInfo.kt
@@ -61,7 +61,7 @@ internal object ProgramStageWorkingListTableInfo {
                 DISPLAY_COLUMN_ORDER,
                 ORG_UNIT,
                 OU_MODE,
-                ASSIGNED_USER_MODE
+                ASSIGNED_USER_MODE,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipTransformer.kt
index 49ea2da4b8..5f956ada26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipTransformer.kt
@@ -72,15 +72,15 @@ internal object NewTrackerImporterRelationshipTransformer :
                 item.hasTrackedEntityInstance() ->
                     builder.trackedEntity(
                         NewTrackerImporterRelationshipItemTrackedEntity.builder().trackedEntity(item.elementUid())
-                            .build()
+                            .build(),
                     ).build()
                 item.hasEnrollment() ->
                     builder.enrollment(
-                        NewTrackerImporterRelationshipItemEnrollment.builder().enrollment(item.elementUid()).build()
+                        NewTrackerImporterRelationshipItemEnrollment.builder().enrollment(item.elementUid()).build(),
                     ).build()
                 item.hasEvent() ->
                     builder.event(
-                        NewTrackerImporterRelationshipItemEvent.builder().event(item.elementUid()).build()
+                        NewTrackerImporterRelationshipItemEvent.builder().event(item.elementUid()).build(),
                     ).build()
                 else -> null
             }
@@ -98,19 +98,19 @@ internal object NewTrackerImporterRelationshipTransformer :
                     builder.trackedEntityInstance(
                         RelationshipItemTrackedEntityInstance.builder()
                             .trackedEntityInstance(item.trackedEntity()?.trackedEntity())
-                            .build()
+                            .build(),
                     ).build()
                 item.enrollment() != null ->
                     builder.enrollment(
                         RelationshipItemEnrollment.builder()
                             .enrollment(item.enrollment()?.enrollment())
-                            .build()
+                            .build(),
                     ).build()
                 item.event() != null ->
                     builder.event(
                         RelationshipItemEvent.builder()
                             .event(item.event()?.event())
-                            .build()
+                            .build(),
                     ).build()
                 else -> null
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.kt
index 067bc0a4cb..93b4310ae1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipFields.kt
@@ -50,6 +50,6 @@ internal object RelationshipFields {
         fh.field<String>(BaseIdentifiableObject.CREATED),
         fh.field<String>(BaseIdentifiableObject.LAST_UPDATED),
         fh.nestedField<RelationshipItem>(FROM).with(RelationshipItemFields.allFields),
-        fh.nestedField<RelationshipItem>(TO).with(RelationshipItemFields.allFields)
+        fh.nestedField<RelationshipItem>(TO).with(RelationshipItemFields.allFields),
     ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
index 395a54b14c..ab9b5bcd21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
@@ -29,16 +29,16 @@
 package org.hisp.dhis.android.core.relationship
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.program.ProgramCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 internal class RelationshipServiceImpl @Inject constructor(
     private val programRepository: ProgramCollectionRepository,
     private val programStageRepository: ProgramStageCollectionRepository,
-    private val trackedEntityTypeRepository: TrackedEntityTypeCollectionRepository
+    private val trackedEntityTypeRepository: TrackedEntityTypeCollectionRepository,
 ) : RelationshipService {
     override fun hasAccessPermission(relationshipType: RelationshipType): Boolean {
         val fromAccess = relationshipType.fromConstraint()?.let { constraintAccess(it) } ?: false
@@ -54,7 +54,7 @@ internal class RelationshipServiceImpl @Inject constructor(
     }
 
     private fun constraintAccess(
-        constraint: RelationshipConstraint
+        constraint: RelationshipConstraint,
     ): Boolean = when (constraint.relationshipEntity()) {
         RelationshipEntityType.PROGRAM_INSTANCE -> {
             val programUid = constraint.program()?.uid()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
index b50eca75f2..84136d6568 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.relationship
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -45,6 +44,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollecti
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeFields
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import javax.inject.Inject
 
 @Reusable
 class RelationshipTypeCollectionRepository @Inject internal constructor(
@@ -53,7 +53,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<RelationshipType>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<RelationshipType, RelationshipTypeCollectionRepository>(
     store,
     childrenAppenders,
@@ -65,9 +65,9 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
             enrollmentStore,
             eventStore,
             childrenAppenders,
-            s
+            s,
         )
-    }
+    },
 ) {
     fun byBidirectional(): BooleanFilterConnector<RelationshipTypeCollectionRepository> {
         return cf.bool(RelationshipTypeTableInfo.Columns.BIDIRECTIONAL)
@@ -77,7 +77,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
     fun byConstraint(
         relationshipEntityType: RelationshipEntityType,
         relationshipEntityUid: String,
-        relationshipConstraintType: RelationshipConstraintType? = null
+        relationshipConstraintType: RelationshipConstraintType? = null,
     ): RelationshipTypeCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inTableWhere(
             RelationshipConstraintTableInfo.TABLE_INFO.name(),
@@ -86,10 +86,10 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
                 if (relationshipConstraintType != null) {
                     appendKeyStringValue(
                         RelationshipConstraintTableInfo.Columns.CONSTRAINT_TYPE,
-                        relationshipConstraintType
+                        relationshipConstraintType,
                     )
                 }
-            }
+            },
         )
     }
 
@@ -102,7 +102,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
         val trackedEntityInstance = teiStore.selectByUid(trackedEntityInstanceUid)
         return cf.subQuery(IdentifiableColumns.UID).rawSubQuery(
             FilterItemOperator.IN,
-            availableForTrackedEntityInstanceRawQuery(trackedEntityInstance)
+            availableForTrackedEntityInstanceRawQuery(trackedEntityInstance),
         )
     }
 
@@ -115,7 +115,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
         val enrollment = enrollmentStore.selectByUid(enrollmentUid)
         return cf.subQuery(IdentifiableColumns.UID).rawSubQuery(
             FilterItemOperator.IN,
-            availableForEnrollmentRawQuery(enrollment)
+            availableForEnrollmentRawQuery(enrollment),
         )
     }
 
@@ -128,7 +128,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
         val event = eventStore.selectByUid(eventUid)
         return cf.subQuery(IdentifiableColumns.UID).rawSubQuery(
             FilterItemOperator.IN,
-            availableForEventRawQuery(event)
+            availableForEventRawQuery(event),
         )
     }
 
@@ -138,12 +138,12 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
 
     private fun constraintClauseBuilder(
         relationshipEntityType: RelationshipEntityType,
-        relationshipEntityUid: String
+        relationshipEntityUid: String,
     ): WhereClauseBuilder {
         return WhereClauseBuilder()
             .appendKeyStringValue(
                 RelationshipConstraintTableInfo.Columns.RELATIONSHIP_ENTITY,
-                relationshipEntityType
+                relationshipEntityType,
             )
             .appendKeyStringValue(getRelationshipEntityColumn(relationshipEntityType), relationshipEntityUid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
index 95e945b338..b7399102c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
+import javax.inject.Inject
 
 @Reusable
 internal class EnrollmentRelationshipOrphanCleaner @Inject constructor(
     relationshipStore: RelationshipStore,
-    relationshipRepository: RelationshipCollectionRepository
+    relationshipRepository: RelationshipCollectionRepository,
 ) : RelationshipOrphanCleaner<Enrollment, Relationship>(relationshipStore, relationshipRepository) {
     override fun getItem(uid: String): RelationshipItem {
         return RelationshipHelper.enrollmentItem(uid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
index f38870d1c4..7b4b7df86d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
+import javax.inject.Inject
 
 @Reusable
 internal class EventRelationshipOrphanCleaner @Inject internal constructor(
     relationshipStore: RelationshipStore,
-    relationshipRepository: RelationshipCollectionRepository
+    relationshipRepository: RelationshipCollectionRepository,
 ) : RelationshipOrphanCleaner<Event, Relationship>(relationshipStore, relationshipRepository) {
     override fun getItem(uid: String): RelationshipItem {
         return RelationshipHelper.eventItem(uid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipFields.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipFields.kt
index 6a7a747e60..0a4ecbd210 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipFields.kt
@@ -50,6 +50,6 @@ internal object NewRelationshipFields {
         fh.field<String>(CREATED_AT),
         fh.field<String>(UPDATED_AT),
         fh.nestedField<NewTrackerImporterRelationshipItem>(FROM).with(NewRelationshipItemFields.allFields),
-        fh.nestedField<NewTrackerImporterRelationshipItem>(TO).with(NewRelationshipItemFields.allFields)
+        fh.nestedField<NewTrackerImporterRelationshipItem>(TO).with(NewRelationshipItemFields.allFields),
     ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipItemFields.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipItemFields.kt
index 810fe7771b..02eeb9ed87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipItemFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/NewRelationshipItemFields.kt
@@ -47,6 +47,6 @@ internal object NewRelationshipItemFields {
             fh.nestedField<NewTrackerImporterRelationshipItemEnrollment>(ENROLLMENT)
                 .with(NewRelationshipItemEnrollmentFields.enrollment),
             fh.nestedField<NewTrackerImporterRelationshipItemEvent>(EVENT)
-                .with(NewRelationshipItemEventFields.event)
+                .with(NewRelationshipItemEventFields.event),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
index bec5ff2c6e..519b2daca0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.relationship.RelationshipConstraint
 
 internal class RelationshipConstraintHandler(
-    store: RelationshipConstraintStore
+    store: RelationshipConstraintStore,
 ) : ObjectWithoutUidHandlerImpl<RelationshipConstraint>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
index 8dcd25e176..86b795705e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipConstraint
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintTableInfo
 
 internal class RelationshipConstraintStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : RelationshipConstraintStore,
     ObjectWithoutUidStoreImpl<RelationshipConstraint>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class RelationshipConstraintStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> RelationshipConstraint.create(cursor) }
+        { cursor: Cursor -> RelationshipConstraint.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
index e9e2bc1c60..7a86a5eaa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentPersistenceCallFactory
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.relationship.*
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePersistenceCallFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import javax.inject.Inject
 
 @Reusable
 internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
@@ -46,7 +46,7 @@ internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
     private val teiPersistenceCallFactory: TrackedEntityInstancePersistenceCallFactory,
     private val enrollmentPersistenceCallFactory: EnrollmentPersistenceCallFactory,
     private val eventPersistenceCallFactory: EventPersistenceCallFactory,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
     suspend fun downloadAndPersist(relatives: RelationshipItemRelatives) {
         downloadRelativeEvents(relatives)
@@ -63,7 +63,7 @@ internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
                 trackerParentCallFactory.getEventCall().getRelationshipEntityCall(uid)
             }.fold(
                 onSuccess = { eventPayload -> events.addAll(eventPayload.items()) },
-                onFailure = { failedEvents.add(uid) }
+                onFailure = { failedEvents.add(uid) },
             )
         }
 
@@ -85,7 +85,7 @@ internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
                 trackerParentCallFactory.getEnrollmentCall().getRelationshipEntityCall(uid)
             }.fold(
                 onSuccess = { enrollment -> enrollments.add(enrollment) },
-                onFailure = { failedEnrollments.add(uid) }
+                onFailure = { failedEnrollments.add(uid) },
             )
         }
 
@@ -107,7 +107,7 @@ internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
                 trackerParentCallFactory.getTrackedEntityCall().getRelationshipEntityCall(uid)
             }.fold(
                 onSuccess = { teiPayload -> teis.addAll(teiPayload.items()) },
-                onFailure = { failedTeis.add(uid) }
+                onFailure = { failedTeis.add(uid) },
             )
         }
 
@@ -122,16 +122,16 @@ internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
             val builder = RelationshipItem.builder()
             when (elementType) {
                 RelationshipItemTableInfo.Columns.EVENT -> builder.event(
-                    RelationshipItemEvent.builder().event(uid).build()
+                    RelationshipItemEvent.builder().event(uid).build(),
                 )
 
                 RelationshipItemTableInfo.Columns.ENROLLMENT -> builder.enrollment(
-                    RelationshipItemEnrollment.builder().enrollment(uid).build()
+                    RelationshipItemEnrollment.builder().enrollment(uid).build(),
                 )
 
                 RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE -> builder.trackedEntityInstance(
                     RelationshipItemTrackedEntityInstance.builder()
-                        .trackedEntityInstance(uid).build()
+                        .trackedEntityInstance(uid).build(),
                 )
 
                 else -> {}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
index 8831d0096a..cb766e852f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
@@ -46,10 +46,10 @@ internal class RelationshipEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        itemChildrenAppender: RelationshipItemChildrenAppender
+        itemChildrenAppender: RelationshipItemChildrenAppender,
     ): Map<String, ChildrenAppender<Relationship>> {
         return mapOf(
-            RelationshipFields.ITEMS to itemChildrenAppender
+            RelationshipFields.ITEMS to itemChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
index 945d65f476..42b5bea240 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
@@ -28,32 +28,32 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
+import javax.inject.Inject
 
 @Reusable
 internal class RelationshipHandler @Inject constructor(
     relationshipStore: RelationshipStore,
     private val relationshipItemStore: RelationshipItemStore,
     private val relationshipItemHandler: RelationshipItemHandler,
-    private val storeSelector: RelationshipItemElementStoreSelector
+    private val storeSelector: RelationshipItemElementStoreSelector,
 ) : IdentifiableHandlerImpl<Relationship>(relationshipStore) {
 
     override fun afterObjectHandled(o: Relationship, action: HandleAction) {
         relationshipItemHandler.handle(
             o.from()!!.toBuilder()
                 .relationship(ObjectWithUid.create(o.uid()))
-                .relationshipItemType(RelationshipConstraintType.FROM).build()
+                .relationshipItemType(RelationshipConstraintType.FROM).build(),
         )
         relationshipItemHandler.handle(
             o.to()!!.toBuilder()
                 .relationship(ObjectWithUid.create(o.uid()))
-                .relationshipItemType(RelationshipConstraintType.TO).build()
+                .relationshipItemType(RelationshipConstraintType.TO).build(),
         )
     }
 
@@ -75,7 +75,7 @@ internal class RelationshipHandler @Inject constructor(
     private fun getExistingRelationshipUid(relationship: Relationship): String? {
         val existingRelationshipUidsForPair = relationshipItemStore.getRelationshipUidsForItems(
             relationship.from()!!,
-            relationship.to()!!
+            relationship.to()!!,
         )
         for (existingRelationshipUid in existingRelationshipUidsForPair) {
             val existingRelationship = store.selectByUid(existingRelationshipUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
index e38ab5bfd1..c11db11906 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
@@ -36,16 +35,17 @@ import org.hisp.dhis.android.core.imports.internal.BaseImportSummaryHelper.getRe
 import org.hisp.dhis.android.core.imports.internal.RelationshipImportSummary
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
+import javax.inject.Inject
 
 @Reusable class RelationshipImportHandler @Inject internal constructor(
     private val relationshipStore: RelationshipStore,
     private val dataStatePropagator: DataStatePropagator,
-    private val relationshipRepository: RelationshipCollectionRepository
+    private val relationshipRepository: RelationshipCollectionRepository,
 ) {
 
     fun handleRelationshipImportSummaries(
         importSummaries: List<RelationshipImportSummary?>?,
-        relationships: List<Relationship>
+        relationships: List<Relationship>,
     ) {
         importSummaries?.filterNotNull()?.forEach { importSummary ->
             importSummary.reference()?.let { relationshipUid ->
@@ -70,7 +70,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 
     private fun processIgnoredRelationships(
         importSummaries: List<RelationshipImportSummary?>?,
-        relationships: List<Relationship>
+        relationships: List<Relationship>,
     ) {
         val processedRelationships = getReferences(importSummaries)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
index e6751c3f60..052291db44 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
@@ -28,24 +28,24 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
+import javax.inject.Inject
 
 @Reusable
 internal class RelationshipItemChildrenAppender @Inject constructor(
-    private val store: RelationshipItemStore
+    private val store: RelationshipItemStore,
 ) : ChildrenAppender<Relationship>() {
 
     override fun appendChildren(relationship: Relationship): Relationship {
         val fromItem = store.getForRelationshipUidAndConstraintType(
             relationship.uid()!!,
-            RelationshipConstraintType.FROM
+            RelationshipConstraintType.FROM,
         )
         val toItem = store.getForRelationshipUidAndConstraintType(
             relationship.uid()!!,
-            RelationshipConstraintType.TO
+            RelationshipConstraintType.TO,
         )
         return relationship.toBuilder()
             .from(fromItem)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
index 434e34cf21..ef561a4236 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 internal class RelationshipItemElementStoreSelectorImpl(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
-    private val eventStore: EventStore
+    private val eventStore: EventStore,
 ) : RelationshipItemElementStoreSelector {
     override fun getElementStore(item: RelationshipItem?): StoreWithState<*> {
         return if (item!!.hasTrackedEntityInstance()) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
index 95fe92080e..b29a8ceb2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
@@ -54,12 +54,12 @@ internal class RelationshipItemEntityDIModule {
     fun storeSelector(
         trackedEntityInstanceStore: TrackedEntityInstanceStore,
         enrollmentStore: EnrollmentStore,
-        eventStore: EventStore
+        eventStore: EventStore,
     ): RelationshipItemElementStoreSelector {
         return RelationshipItemElementStoreSelectorImpl(
             trackedEntityInstanceStore,
             enrollmentStore,
-            eventStore
+            eventStore,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemFields.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemFields.kt
index 86f3623120..75bff5b32f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemFields.kt
@@ -36,11 +36,11 @@ internal object RelationshipItemFields {
     val allFields: Fields<RelationshipItem> = Fields.builder<RelationshipItem>()
         .fields(
             fh.nestedField<RelationshipItemTrackedEntityInstance>(
-                RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE
+                RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
             ).with(RelationshipItemTrackedEntityInstanceFields.trackedEntityInstance),
             fh.nestedField<RelationshipItemEnrollment>(RelationshipItemTableInfo.Columns.ENROLLMENT)
                 .with(RelationshipItemEnrollmentFields.enrollment),
             fh.nestedField<RelationshipItemEvent>(RelationshipItemTableInfo.Columns.EVENT)
-                .with(RelationshipItemEventFields.event)
+                .with(RelationshipItemEventFields.event),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
index a2b39dcfe9..c1e458b1d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandler
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 
 internal class RelationshipItemHandler(
-    store: RelationshipItemStore
+    store: RelationshipItemStore,
 ) : ObjectWithoutUidHandlerImpl<RelationshipItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStore.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStore.kt
index 4a607dcf8d..10af188fee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStore.kt
@@ -37,7 +37,7 @@ internal interface RelationshipItemStore : ObjectWithoutUidStore<RelationshipIte
 
     fun getForRelationshipUidAndConstraintType(
         uid: String,
-        constraintType: RelationshipConstraintType
+        constraintType: RelationshipConstraintType,
     ): RelationshipItem?
 
     fun getForRelationshipUid(relationshipUid: String): List<RelationshipItem>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
index a32092b3e4..36685142c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import android.database.Cursor
-import java.util.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
@@ -39,9 +38,10 @@ import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
+import java.util.*
 
 internal class RelationshipItemStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : RelationshipItemStore,
     ObjectWithoutUidStoreImpl<RelationshipItem>(
         databaseAdapter,
@@ -49,7 +49,7 @@ internal class RelationshipItemStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> RelationshipItem.create(cursor) }
+        { cursor: Cursor -> RelationshipItem.create(cursor) },
     ) {
 
     @Suppress("NestedBlockDepth")
@@ -74,7 +74,7 @@ internal class RelationshipItemStoreImpl(
 
     override fun getForRelationshipUidAndConstraintType(
         uid: String,
-        constraintType: RelationshipConstraintType
+        constraintType: RelationshipConstraintType,
     ): RelationshipItem? {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(RelationshipItemTableInfo.Columns.RELATIONSHIP, uid)
@@ -94,11 +94,11 @@ internal class RelationshipItemStoreImpl(
         val whereFromClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                trackedEntityInstanceUids
+                trackedEntityInstanceUids,
             )
             .appendKeyStringValue(
                 RelationshipItemTableInfo.Columns.RELATIONSHIP_ITEM_TYPE,
-                RelationshipConstraintType.FROM
+                RelationshipConstraintType.FROM,
             )
             .build()
 
@@ -109,7 +109,7 @@ internal class RelationshipItemStoreImpl(
             .appendInKeyStringValues(RelationshipItemTableInfo.Columns.RELATIONSHIP, relationshipUids)
             .appendKeyStringValue(
                 RelationshipItemTableInfo.Columns.RELATIONSHIP_ITEM_TYPE,
-                RelationshipConstraintType.TO
+                RelationshipConstraintType.TO,
             )
             .appendIsNotNullValue(RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
             .build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt
index 063811bfa2..b07163ff85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt
@@ -28,23 +28,23 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
+import javax.inject.Inject
 
 @Reusable
 internal class RelationshipManager @Inject constructor(
     private var relationshipStore: RelationshipStore,
     private val relationshipItemStore: RelationshipItemStore,
-    private val relationshipVersionManager: RelationshipDHISVersionManager
+    private val relationshipVersionManager: RelationshipDHISVersionManager,
 ) {
 
     fun getByItem(
         searchItem: RelationshipItem,
         includeDeleted: Boolean,
-        onlyAccessible: Boolean
+        onlyAccessible: Boolean,
     ): List<Relationship> {
         val relationships = relationshipItemStore.getByItem(searchItem)
             .mapNotNull { item ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
index adc51fce6b..3012c7247c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipOrphanCleaner.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.relationship.*
 
 internal abstract class RelationshipOrphanCleaner<O : ObjectWithUidInterface, R : BaseRelationship>(
     private val relationshipStore: RelationshipStore,
-    private val relationshipRepository: RelationshipCollectionRepository
+    private val relationshipRepository: RelationshipCollectionRepository,
 ) : OrphanCleaner<O, R> {
     abstract fun getItem(uid: String): RelationshipItem
     abstract fun relationships(relationships: Collection<R>): Collection<Relationship>
@@ -61,7 +61,7 @@ internal abstract class RelationshipOrphanCleaner<O : ObjectWithUidInterface, R
 
     private fun isInRelationshipList(
         target: Relationship,
-        list: Collection<Relationship>
+        list: Collection<Relationship>,
     ): Boolean {
         return list.any { relationship ->
             target.from() != null && target.to() != null && relationship.from() != null && relationship.to() != null &&
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
index 265b9e9b8c..517d2a31ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
@@ -38,8 +38,8 @@ import retrofit2.Retrofit
         RelationshipConstraintEntityDIModule::class,
         RelationshipEntityDIModule::class,
         RelationshipItemEntityDIModule::class,
-        RelationshipTypeEntityDIModule::class
-    ]
+        RelationshipTypeEntityDIModule::class,
+    ],
 )
 internal class RelationshipPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
index 93a0ca8038..c3a0a1e627 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import java.net.HttpURLConnection.*
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -42,6 +40,8 @@ import org.hisp.dhis.android.core.imports.internal.RelationshipDeleteWebResponse
 import org.hisp.dhis.android.core.imports.internal.RelationshipWebResponse
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerPostStateManager
+import java.net.HttpURLConnection.*
+import javax.inject.Inject
 
 @Reusable
 internal class RelationshipPostCall @Inject internal constructor(
@@ -50,7 +50,7 @@ internal class RelationshipPostCall @Inject internal constructor(
     private val relationshipImportHandler: RelationshipImportHandler,
     private val dataStatePropagator: DataStatePropagator,
     private val trackerStateManager: TrackerPostStateManager,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
 
     fun deleteRelationships(relationships: List<Relationship>): Flow<D2Progress> = flow {
@@ -59,7 +59,7 @@ internal class RelationshipPostCall @Inject internal constructor(
             val response = coroutineAPICallExecutor.wrap(
                 storeError = true,
                 acceptedErrorCodes = listOf(HTTP_NOT_FOUND),
-                errorClass = RelationshipDeleteWebResponse::class.java
+                errorClass = RelationshipDeleteWebResponse::class.java,
             ) {
                 relationshipService.deleteRelationship(relationship.uid()!!)
             }
@@ -77,7 +77,7 @@ internal class RelationshipPostCall @Inject internal constructor(
                 },
                 onFailure = {
                     handleDeleteRelationshipError(relationship.uid()!!)
-                }
+                },
             )
 
             dataStatePropagator.propagateRelationshipUpdate(relationship)
@@ -97,19 +97,19 @@ internal class RelationshipPostCall @Inject internal constructor(
                 val payload = RelationshipPayload.builder().relationships(relationships).build()
                 trackerStateManager.setPayloadStates(
                     relationships = relationships,
-                    forcedState = State.UPLOADING
+                    forcedState = State.UPLOADING,
                 )
                 val httpResponse = coroutineAPICallExecutor.wrap(
                     storeError = true,
                     acceptedErrorCodes = listOf(HTTP_CONFLICT),
-                    errorClass = RelationshipWebResponse::class.java
+                    errorClass = RelationshipWebResponse::class.java,
                 ) {
                     relationshipService.postRelationship(payload)
                 }.getOrThrow()
 
                 relationshipImportHandler.handleRelationshipImportSummaries(
                     importSummaries = httpResponse.response()?.importSummaries(),
-                    relationships = relationships
+                    relationships = relationships,
                 )
                 emit(progressManager.increaseProgress(Relationship::class.java, false))
             } catch (e: Exception) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStore.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStore.kt
index dcceb25c4e..ddf5555eb5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStore.kt
@@ -38,6 +38,6 @@ internal interface RelationshipStore : IdentifiableDeletableDataObjectStore<Rela
 
     fun getRelationshipsByItem(
         relationshipItem: RelationshipItem,
-        type: RelationshipConstraintType?
+        type: RelationshipConstraintType?,
     ): List<Relationship>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
index 44ec0c7360..fc02ceb644 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
@@ -40,20 +40,20 @@ import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
 import org.hisp.dhis.android.core.relationship.RelationshipTableInfo
 
 internal class RelationshipStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : RelationshipStore,
     IdentifiableDeletableDataObjectStoreImpl<Relationship>(
         databaseAdapter,
         RelationshipTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Relationship.create(cursor) }
+        { cursor: Cursor -> Relationship.create(cursor) },
     ) {
 
     override fun getRelationshipsByItem(relationshipItem: RelationshipItem): List<Relationship> {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(
                 "RelationshipItem." + relationshipItem.elementType(),
-                relationshipItem.elementUid()
+                relationshipItem.elementUid(),
             )
             .build()
 
@@ -69,7 +69,7 @@ internal class RelationshipStoreImpl(
 
     override fun getRelationshipsByItem(
         relationshipItem: RelationshipItem,
-        type: RelationshipConstraintType?
+        type: RelationshipConstraintType?,
     ): List<Relationship> {
         val relationshipTable = RelationshipTableInfo.TABLE_INFO.name()
         val itemTable = RelationshipItemTableInfo.TABLE_INFO.name()
@@ -77,7 +77,7 @@ internal class RelationshipStoreImpl(
         val builder = WhereClauseBuilder()
             .appendKeyStringValue(
                 "$itemTable.${relationshipItem.elementType()}",
-                relationshipItem.elementUid()
+                relationshipItem.elementUid(),
             )
 
         val whereClause =
@@ -86,7 +86,7 @@ internal class RelationshipStoreImpl(
             } else {
                 builder.appendKeyStringValue(
                     "$itemTable.${RelationshipItemTableInfo.Columns.RELATIONSHIP_ITEM_TYPE}",
-                    type.name
+                    type.name,
                 ).build()
             }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelper.kt
index ce8988f3df..a9c4fdd4b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelper.kt
@@ -68,7 +68,7 @@ object RelationshipTypeCollectionRepositoryHelper {
             .appendOrInSubQuery(
                 Columns.PROGRAM,
                 "SELECT ${EnrollmentTableInfo.Columns.PROGRAM} FROM ${EnrollmentTableInfo.TABLE_INFO.name()}" +
-                    " WHERE ${EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE} == '${tei.uid()}'"
+                    " WHERE ${EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE} == '${tei.uid()}'",
             )
             .build()
     }
@@ -108,7 +108,7 @@ object RelationshipTypeCollectionRepositoryHelper {
                     WhereClauseBuilder()
                         .appendOrKeyStringValue(Columns.PROGRAM, it.program())
                         .appendOrKeyStringValue(Columns.PROGRAM_STAGE, it.programStage())
-                        .build()
+                        .build(),
                 )
             }
         }
@@ -118,7 +118,7 @@ object RelationshipTypeCollectionRepositoryHelper {
 
     private fun <T> availableForItemRawQuery(
         t: T?,
-        availableForItem: (T, RelationshipConstraintType?) -> String
+        availableForItem: (T, RelationshipConstraintType?) -> String,
     ): String {
         return t?.let {
             "SELECT DISTINCT ${RelationshipTypeTableInfo.Columns.UID} " +
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
index 47bec06187..be5a229787 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
@@ -47,21 +47,21 @@ internal class RelationshipTypeEntityDIModule {
     @Reusable
     fun handler(
         relationshipTypeStore: RelationshipTypeStore,
-        relationshipConstraintHandler: RelationshipConstraintHandler
+        relationshipConstraintHandler: RelationshipConstraintHandler,
     ): RelationshipTypeHandler {
         return RelationshipTypeHandler(
             relationshipTypeStore,
-            relationshipConstraintHandler
+            relationshipConstraintHandler,
         )
     }
 
     @Provides
     @Reusable
     fun childrenAppenders(
-        constraintStore: RelationshipConstraintStore
+        constraintStore: RelationshipConstraintStore,
     ): Map<String, ChildrenAppender<RelationshipType>> {
         return mapOf(
-            RelationshipTypeFields.CONSTRAINTS to RelationshipConstraintChildrenAppender(constraintStore)
+            RelationshipTypeFields.CONSTRAINTS to RelationshipConstraintChildrenAppender(constraintStore),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
index 70ec3dd2a2..7e301b8198 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipType
 
 internal class RelationshipTypeHandler constructor(
     relationshipTypeStore: RelationshipTypeStore,
-    private val relationshipConstraintHandler: RelationshipConstraintHandler
+    private val relationshipConstraintHandler: RelationshipConstraintHandler,
 ) : IdentifiableHandlerImpl<RelationshipType>(relationshipTypeStore) {
 
     override fun afterObjectHandled(o: RelationshipType, action: HandleAction) {
@@ -47,7 +47,7 @@ internal class RelationshipTypeHandler constructor(
     private fun handleConstraint(
         relationshipType: RelationshipType,
         downloadedConstraint: RelationshipConstraint?,
-        type: RelationshipConstraintType
+        type: RelationshipConstraintType,
     ) {
         if (downloadedConstraint != null) {
             val fromConstraintToHanldle = downloadedConstraint.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
index b13bb8e811..af38c7bbcf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.relationship.RelationshipTypeTableInfo
 
 @Suppress("MagicNumber")
 internal class RelationshipTypeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : RelationshipTypeStore,
     IdentifiableObjectStoreImpl<RelationshipType>(
         databaseAdapter,
         RelationshipTypeTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> RelationshipType.create(cursor) }
+        { cursor: Cursor -> RelationshipType.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<RelationshipType> =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
index a085759135..a5798ee51c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import javax.inject.Inject
 
 @Reusable
 internal class TEIRelationshipOrphanCleaner @Inject internal constructor(
     relationshipStore: RelationshipStore,
-    relationshipRepository: RelationshipCollectionRepository
+    relationshipRepository: RelationshipCollectionRepository,
 ) : RelationshipOrphanCleaner<TrackedEntityInstance, Relationship>(relationshipStore, relationshipRepository) {
     override fun getItem(uid: String): RelationshipItem {
         return RelationshipHelper.teiItem(uid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
index 9758bdfb20..babbcb6956 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.resource.internal
 
 import androidx.annotation.VisibleForTesting
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import java.util.Date
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 
 @Singleton
 internal class ResourceHandler @Inject constructor(private val resourceStore: ResourceStore) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
index d152ddf32b..44797a9b8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 
 internal class ResourceStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ResourceStore,
     ObjectWithoutUidStoreImpl<Resource>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class ResourceStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> Resource.create(cursor) }
+        { cursor: Cursor -> Resource.create(cursor) },
     ) {
     override fun getLastUpdated(type: Resource.Type): String? {
         val whereClause = WhereClauseBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationScope.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationScope.kt
index cdd97f9a1a..7cfcbd55e7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationScope.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationScope.kt
@@ -31,5 +31,5 @@ package org.hisp.dhis.android.core.settings
 enum class AnalyticsDhisVisualizationScope {
     HOME,
     PROGRAM,
-    DATA_SET
+    DATA_SET,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationTableInfo.kt
index 2e8c46e12e..bdf6151182 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationTableInfo.kt
@@ -56,7 +56,7 @@ object AnalyticsDhisVisualizationTableInfo {
                 GROUP_UID,
                 GROUP_NAME,
                 NAME,
-                TIME_STAMP
+                TIME_STAMP,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
index 31c9b1eb0a..af5427af59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationScope.HOME
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationScope.PROGRAM
 
 fun generateGroups(
-    analyticsDhisVisualizations: List<AnalyticsDhisVisualization>
+    analyticsDhisVisualizations: List<AnalyticsDhisVisualization>,
 ): AnalyticsDhisVisualizationsSetting {
     val visualizationsByScope: Map<AnalyticsDhisVisualizationScope?, List<AnalyticsDhisVisualization>> =
         analyticsDhisVisualizations.groupBy { it.scope() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ChartType.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/ChartType.kt
index b71cbcc4e5..90cd45831c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ChartType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ChartType.kt
@@ -32,5 +32,5 @@ enum class ChartType {
     LINE,
     TABLE,
     WHO_NUTRITION,
-    SINGLE_VALUE
+    SINGLE_VALUE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
index 910aa88a90..369b30fdf1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.settings
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.LatestAppVersionCall
 import org.hisp.dhis.android.core.settings.internal.LatestAppVersionStore
+import javax.inject.Inject
 
 @Reusable
 class LatestAppVersionObjectRepository @Inject internal constructor(
     private val store: LatestAppVersionStore,
-    latestAppVersionCall: LatestAppVersionCall
+    latestAppVersionCall: LatestAppVersionCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<LatestAppVersion>(latestAppVersionCall),
     ReadOnlyWithDownloadObjectRepository<LatestAppVersion> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionTableInfo.kt
index 67233117c6..3966d139cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionTableInfo.kt
@@ -50,7 +50,7 @@ object LatestAppVersionTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 VERSION,
-                DOWNLOAD_URL
+                DOWNLOAD_URL,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettings.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettings.kt
index b1733bcb3f..23625291a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettings.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettings.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.settings
 data class SystemSettings(
     val keyFlag: String?,
     val keyStyle: String?,
-    val keyBingMapsApiKey: String?
+    val keyBingMapsApiKey: String?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionChartType.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionChartType.kt
index 98dd81c1e4..e76fdd07ab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionChartType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionChartType.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.settings
 enum class WHONutritionChartType {
     WFA,
     WFH,
-    HFA
+    HFA,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionComponent.kt
index 6c1c23e44c..9fee7ed943 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/WHONutritionComponent.kt
@@ -29,5 +29,5 @@ package org.hisp.dhis.android.core.settings
 
 enum class WHONutritionComponent {
     X,
-    Y
+    Y,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
index 24ffe5b463..a50e12bad4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
@@ -29,17 +29,17 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsDhisVisualizationSettingHandler @Inject constructor(
-    store: AnalyticsDhisVisualizationStore
+    store: AnalyticsDhisVisualizationStore,
 ) : ObjectWithoutUidHandlerImpl<AnalyticsDhisVisualization>(store) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<AnalyticsDhisVisualization>
+        oCollection: Collection<AnalyticsDhisVisualization>,
     ): Collection<AnalyticsDhisVisualization> {
         store.delete()
         return oCollection
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
index 5081e0e34f..12e2b44178 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsDhisVisualizationStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsDhisVisualizationStore,
     ObjectWithoutUidStoreImpl<AnalyticsDhisVisualization>(
         databaseAdapter,
@@ -47,7 +47,7 @@ internal class AnalyticsDhisVisualizationStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> AnalyticsDhisVisualization.create(cursor) }
+        { cursor: Cursor -> AnalyticsDhisVisualization.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index 235e937071..1b82da13d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
 import org.hisp.dhis.android.core.settings.AnalyticsSettings
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsSettingCall @Inject constructor(
@@ -43,7 +43,7 @@ internal class AnalyticsSettingCall @Inject constructor(
     private val analyticsDhisVisualizationsSettingHandler: AnalyticsDhisVisualizationSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
-    private val appVersionManager: SettingsAppInfoManager
+    private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<AnalyticsSettings>() {
 
     override fun fetch(storeError: Boolean): Single<AnalyticsSettings> {
@@ -55,7 +55,7 @@ internal class AnalyticsSettingCall @Inject constructor(
                             .errorDescription("Analytics settings not found")
                             .errorCode(D2ErrorCode.URL_NOT_FOUND)
                             .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                            .build()
+                            .build(),
                     )
                 }
                 else -> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
index 520e2fee0a..c254d4f5ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiAttributeHandler @Inject constructor(
-    store: AnalyticsTeiAttributeStore
+    store: AnalyticsTeiAttributeStore,
 ) : LinkHandlerImpl<AnalyticsTeiAttribute, AnalyticsTeiAttribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
index 8c593a4637..d1098987e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiAttributeTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsTeiAttributeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsTeiAttributeStore,
     LinkStoreImpl<AnalyticsTeiAttribute>(
         databaseAdapter,
         AnalyticsTeiAttributeTableInfo.TABLE_INFO,
         AnalyticsTeiAttributeTableInfo.Columns.TEI_SETTING,
         BINDER,
-        { cursor: Cursor -> AnalyticsTeiAttribute.create(cursor) }
+        { cursor: Cursor -> AnalyticsTeiAttribute.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
index fb6c47cd65..799b09287d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
@@ -36,13 +35,14 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.hisp.dhis.android.core.settings.internal.SettingsAppHelper.buildAnalyticsTeiSetting
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiDataChildrenAppender @Inject constructor(
     private val analyticsTeiDataElementStore: AnalyticsTeiDataElementStore,
     private val analyticsTeiIndicatorStore: AnalyticsTeiIndicatorStore,
     private val analyticsTeiAttributeStore: AnalyticsTeiAttributeStore,
-    private val analyticsTeiWHONutritionDataStore: AnalyticsTeiWHONutritionDataStore
+    private val analyticsTeiWHONutritionDataStore: AnalyticsTeiWHONutritionDataStore,
 ) : ChildrenAppender<AnalyticsTeiSetting>() {
 
     companion object {
@@ -67,7 +67,7 @@ internal class AnalyticsTeiDataChildrenAppender @Inject constructor(
             dataElements!!,
             indicators!!,
             attributes!!,
-            whoNutritionData!!
+            whoNutritionData!!,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
index a03d44ebc4..7cc7d5f0e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiDataElementHandler @Inject constructor(
-    store: AnalyticsTeiDataElementStore
+    store: AnalyticsTeiDataElementStore,
 ) : LinkHandlerImpl<AnalyticsTeiDataElement, AnalyticsTeiDataElement>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
index 1b8aa24297..ca14be182e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElementTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsTeiDataElementStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsTeiDataElementStore,
     LinkStoreImpl<AnalyticsTeiDataElement>(
         databaseAdapter,
         AnalyticsTeiDataElementTableInfo.TABLE_INFO,
         AnalyticsTeiDataElementTableInfo.Columns.TEI_SETTING,
         BINDER,
-        { cursor: Cursor -> AnalyticsTeiDataElement.create(cursor) }
+        { cursor: Cursor -> AnalyticsTeiDataElement.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
index 6676def00a..fca605c530 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiIndicatorHandler @Inject constructor(
-    store: AnalyticsTeiIndicatorStore
+    store: AnalyticsTeiIndicatorStore,
 ) : LinkHandlerImpl<AnalyticsTeiIndicator, AnalyticsTeiIndicator>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
index ca3686ff1d..061fea00c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicatorTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsTeiIndicatorStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsTeiIndicatorStore,
     LinkStoreImpl<AnalyticsTeiIndicator>(
         databaseAdapter,
         AnalyticsTeiIndicatorTableInfo.TABLE_INFO,
         AnalyticsTeiIndicatorTableInfo.Columns.TEI_SETTING,
         BINDER,
-        { cursor: Cursor -> AnalyticsTeiIndicator.create(cursor) }
+        { cursor: Cursor -> AnalyticsTeiIndicator.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
index 4e0f923a97..7e88551ca3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiSettingHandler @Inject constructor(
@@ -39,11 +39,11 @@ internal class AnalyticsTeiSettingHandler @Inject constructor(
     private val teiDataElementHandler: AnalyticsTeiDataElementHandler,
     private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler,
     private val teiAttributeHandler: AnalyticsTeiAttributeHandler,
-    private val whoNutritionDataHandler: AnalyticsTeiWHONutritionDataHandler
+    private val whoNutritionDataHandler: AnalyticsTeiWHONutritionDataHandler,
 ) : ObjectWithoutUidHandlerImpl<AnalyticsTeiSetting>(store) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<AnalyticsTeiSetting>
+        oCollection: Collection<AnalyticsTeiSetting>,
     ): Collection<AnalyticsTeiSetting> {
         store.delete()
         return oCollection
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
index 2946df1f80..591306a863 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiSettingTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsTeiSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsTeiSettingStore,
     ObjectWithoutUidStoreImpl<AnalyticsTeiSetting>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class AnalyticsTeiSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> AnalyticsTeiSetting.create(cursor) }
+        { cursor: Cursor -> AnalyticsTeiSetting.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
index 3df816d388..26e6007bb5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionItem
 import org.hisp.dhis.android.core.settings.WHONutritionComponent
+import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiWHONutritionDataHandler @Inject constructor(
     store: AnalyticsTeiWHONutritionDataStore,
     private val teiDataElementHandler: AnalyticsTeiDataElementHandler,
-    private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler
+    private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler,
 ) : LinkHandlerImpl<AnalyticsTeiWHONutritionData, AnalyticsTeiWHONutritionData>(store) {
 
     override fun afterObjectHandled(o: AnalyticsTeiWHONutritionData) {
@@ -61,14 +61,14 @@ internal class AnalyticsTeiWHONutritionDataHandler @Inject constructor(
 
     private fun getDataElements(
         item: AnalyticsTeiWHONutritionItem?,
-        whoComponent: WHONutritionComponent
+        whoComponent: WHONutritionComponent,
     ): List<AnalyticsTeiDataElement> {
         return item?.dataElements()?.map { it.toBuilder().whoComponent(whoComponent).build() } ?: emptyList()
     }
 
     private fun getIndicators(
         item: AnalyticsTeiWHONutritionItem?,
-        whoComponent: WHONutritionComponent
+        whoComponent: WHONutritionComponent,
     ): List<AnalyticsTeiIndicator> {
         return item?.indicators()?.map { it.toBuilder().whoComponent(whoComponent).build() } ?: emptyList()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
index 2097a1f073..4feac35168 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionDataTableInfo
 
 @Suppress("MagicNumber")
 internal class AnalyticsTeiWHONutritionDataStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AnalyticsTeiWHONutritionDataStore,
     LinkStoreImpl<AnalyticsTeiWHONutritionData>(
         databaseAdapter,
         AnalyticsTeiWHONutritionDataTableInfo.TABLE_INFO,
         AnalyticsTeiWHONutritionDataTableInfo.Columns.TEI_SETTING,
         BINDER,
-        { cursor: Cursor -> AnalyticsTeiWHONutritionData.create(cursor) }
+        { cursor: Cursor -> AnalyticsTeiWHONutritionData.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index 8580738b9b..ed1fceb33b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -30,12 +30,12 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AppearanceSettings
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class AppearanceSettingCall @Inject constructor(
@@ -43,7 +43,7 @@ internal class AppearanceSettingCall @Inject constructor(
     private val programConfigurationSettingHandler: ProgramConfigurationSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
-    private val appVersionManager: SettingsAppInfoManager
+    private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<AppearanceSettings>() {
 
     override fun fetch(storeError: Boolean): Single<AppearanceSettings> {
@@ -55,7 +55,7 @@ internal class AppearanceSettingCall @Inject constructor(
                             .errorDescription("Appearance settings not found")
                             .errorCode(D2ErrorCode.URL_NOT_FOUND)
                             .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                            .build()
+                            .build(),
                     )
                 }
                 SettingsAppDataStoreVersion.V2_0 -> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
index 512b31162c..294c57a6c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
@@ -29,10 +29,10 @@ package org.hisp.dhis.android.core.settings.internal
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import java.net.HttpURLConnection
 import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import java.net.HttpURLConnection
 
 internal abstract class BaseSettingCall<T> : CompletableProvider {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index 19ea64e7f3..f12844a4bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.settings.DataSetSettings
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetSettingCall @Inject constructor(
     private val dataSetSettingHandler: DataSetSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
-    private val appVersionManager: SettingsAppInfoManager
+    private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<DataSetSettings>() {
 
     override fun fetch(storeError: Boolean): Single<DataSetSettings> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
index 6a0ec7dc62..fdba162a3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.DataSetSetting
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetSettingHandler @Inject constructor(
-    store: DataSetSettingStore
+    store: DataSetSettingStore,
 ) : ObjectWithoutUidHandlerImpl<DataSetSetting>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<DataSetSetting>): Collection<DataSetSetting> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
index 8b6138e97d..29c11ad5bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.settings.DataSetSetting
 import org.hisp.dhis.android.core.settings.DataSetSettingTableInfo
 
 internal class DataSetSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetSettingStore,
     ObjectWithoutUidStoreImpl<DataSetSetting>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class DataSetSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> DataSetSetting.create(cursor) }
+        { cursor: Cursor -> DataSetSetting.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
index 0ed8d09b88..21677335d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
@@ -29,13 +29,13 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.FilterSetting
+import javax.inject.Inject
 
 @Reusable
 internal class FilterSettingHandler @Inject constructor(
-    store: FilterSettingStore
+    store: FilterSettingStore,
 ) : ObjectWithoutUidHandlerImpl<FilterSetting>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<FilterSetting>): Collection<FilterSetting> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
index f7d4eae25c..4db3d28ede 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.settings.FilterSettingTableInfo
 
 @Suppress("MagicNumber")
 internal class FilterSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : FilterSettingStore,
     ObjectWithoutUidStoreImpl<FilterSetting>(
         databaseAdapter,
@@ -47,7 +47,7 @@ internal class FilterSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> FilterSetting.create(cursor) }
+        { cursor: Cursor -> FilterSetting.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 072c25d08d..79766ae3b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.settings.GeneralSettings
+import javax.inject.Inject
 
 @Reusable
 internal class GeneralSettingCall @Inject constructor(
     private val generalSettingHandler: GeneralSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
-    private val appVersionManager: SettingsAppInfoManager
+    private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<GeneralSettings>() {
 
     private var cachedValue: GeneralSettings? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
index ecd50c7a87..6f6a9846ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.GeneralSettings
+import javax.inject.Inject
 
 @Reusable
 internal class GeneralSettingHandler @Inject constructor(store: GeneralSettingStore) :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
index 5cdfe7b69f..c3fac7b89c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.settings.GeneralSettings
 
 @Suppress("MagicNumber")
 internal class GeneralSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : GeneralSettingStore,
     ObjectWithoutUidStoreImpl<GeneralSettings>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class GeneralSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> GeneralSettings.create(cursor) }
+        { cursor: Cursor -> GeneralSettings.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index 59bbfdb603..cf03fd649d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -30,15 +30,15 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.settings.LatestAppVersion
+import javax.inject.Inject
 
 @Reusable
 internal class LatestAppVersionCall @Inject constructor(
     private val latestAppVersionHandler: LatestAppVersionHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor
+    private val apiCallExecutor: RxAPICallExecutor,
 ) : BaseSettingCall<LatestAppVersion>() {
 
     override fun fetch(storeError: Boolean): Single<LatestAppVersion> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
index 4bc80b611f..faba797617 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
@@ -29,9 +29,9 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.LatestAppVersion
+import javax.inject.Inject
 
 @Reusable
 internal class LatestAppVersionHandler @Inject constructor(store: LatestAppVersionStore) :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
index 1ac3c89b11..2dd97bfe8b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo
 
 @Suppress("MagicNumber")
 internal class LatestAppVersionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : LatestAppVersionStore,
     ObjectWithoutUidStoreImpl<LatestAppVersion>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class LatestAppVersionStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> LatestAppVersion.create(cursor) }
+        { cursor: Cursor -> LatestAppVersion.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
index a58bc9deaf..2b86def64c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
@@ -29,17 +29,17 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramConfigurationSettingHandler @Inject constructor(
-    store: ProgramConfigurationSettingStore
+    store: ProgramConfigurationSettingStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramConfigurationSetting>(store) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<ProgramConfigurationSetting>
+        oCollection: Collection<ProgramConfigurationSetting>,
     ): Collection<ProgramConfigurationSetting> {
         store.delete()
         return oCollection
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
index baec168926..6948bb7488 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
 
 @Suppress("MagicNumber")
 internal class ProgramConfigurationSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramConfigurationSettingStore,
     ObjectWithoutUidStoreImpl<ProgramConfigurationSetting>(
         databaseAdapter,
@@ -47,7 +47,7 @@ internal class ProgramConfigurationSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> ProgramConfigurationSetting.create(cursor) }
+        { cursor: Cursor -> ProgramConfigurationSetting.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index f3335812e5..df7cf78a77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.settings.ProgramSettings
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramSettingCall @Inject constructor(
     private val programSettingHandler: ProgramSettingHandler,
     private val settingAppService: SettingAppService,
     private val apiCallExecutor: RxAPICallExecutor,
-    private val appVersionManager: SettingsAppInfoManager
+    private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<ProgramSettings>() {
 
     override fun fetch(storeError: Boolean): Single<ProgramSettings> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
index 2ae091ce37..168e783869 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.ProgramSetting
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramSettingHandler @Inject constructor(store: ProgramSettingStore) :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
index c118679227..4f5f60b573 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettingTableInfo
 
 internal class ProgramSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramSettingStore,
     ObjectWithoutUidStoreImpl<ProgramSetting>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class ProgramSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> ProgramSetting.create(cursor) }
+        { cursor: Cursor -> ProgramSetting.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
index 9dd743a9db..a83e35438c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.settings.*
 import org.hisp.dhis.android.core.settings.AppearanceSettings
+import javax.inject.Inject
 
 internal class SettingAppService @Inject constructor(
-    private val settingService: SettingService
+    private val settingService: SettingService,
 ) {
 
     fun info(): Single<SettingsAppInfo> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
index fce7f44744..567ce5415f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
@@ -30,8 +30,8 @@ package org.hisp.dhis.android.core.settings.internal
 import android.annotation.SuppressLint
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import javax.inject.Inject
 
 @Reusable
 internal class SettingModuleDownloader @Inject constructor(
@@ -41,7 +41,7 @@ internal class SettingModuleDownloader @Inject constructor(
     private val analyticsSettingCall: AnalyticsSettingCall,
     private val userSettingsCall: UserSettingsCall,
     private val appearanceSettingCall: AppearanceSettingCall,
-    private val latestAppVersionCall: LatestAppVersionCall
+    private val latestAppVersionCall: LatestAppVersionCall,
 ) : UntypedModuleDownloader {
 
     @SuppressLint("CheckResult")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt
index a35f824a59..6d8b365c33 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt
@@ -44,8 +44,8 @@ import retrofit2.Retrofit
         FilterSettingEntityDIModule::class,
         SystemSettingEntityDIModule::class,
         ProgramConfigurationSettingEntityDIModule::class,
-        LatestAppVersionDIModule::class
-    ]
+        LatestAppVersionDIModule::class,
+    ],
 )
 internal class SettingPackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppDataStoreVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppDataStoreVersion.kt
index 64a2674102..78bb9d6bbf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppDataStoreVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppDataStoreVersion.kt
@@ -34,5 +34,5 @@ internal enum class SettingsAppDataStoreVersion {
     V1_1,
 
     @JsonProperty("2.0")
-    V2_0
+    V2_0,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt
index 5ef7fabbb6..d224ee9395 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppHelper.kt
@@ -102,7 +102,7 @@ internal object SettingsAppHelper {
     }
 
     fun getProgramConfigurationSettingList(
-        appearanceSettings: AppearanceSettings
+        appearanceSettings: AppearanceSettings,
     ): List<ProgramConfigurationSetting> {
         val list = mutableListOf<ProgramConfigurationSetting>()
         appearanceSettings.programConfiguration()?.let { settings ->
@@ -114,7 +114,7 @@ internal object SettingsAppHelper {
                     entry.value.toBuilder()
                         .uid(entry.key)
                         .build()
-                } ?: emptyList()
+                } ?: emptyList(),
             )
         }
         return list
@@ -180,7 +180,7 @@ internal object SettingsAppHelper {
         teiDataElements: List<AnalyticsTeiDataElement>,
         teiIndicators: List<AnalyticsTeiIndicator>,
         teiAttributes: List<AnalyticsTeiAttribute>,
-        teiWhoNutritionData: List<AnalyticsTeiWHONutritionData>
+        teiWhoNutritionData: List<AnalyticsTeiWHONutritionData>,
     ): List<AnalyticsTeiSetting> {
         return teiSettings.map {
             buildAnalyticsTeiSetting(it, teiDataElements, teiIndicators, teiAttributes, teiWhoNutritionData)
@@ -193,7 +193,7 @@ internal object SettingsAppHelper {
         teiDataElements: List<AnalyticsTeiDataElement>,
         teiIndicators: List<AnalyticsTeiIndicator>,
         teiAttributes: List<AnalyticsTeiAttribute>,
-        teiWhoNutritionData: List<AnalyticsTeiWHONutritionData>
+        teiWhoNutritionData: List<AnalyticsTeiWHONutritionData>,
     ): AnalyticsTeiSetting {
         return when (teiSetting.type()) {
             ChartType.WHO_NUTRITION -> {
@@ -221,18 +221,18 @@ internal object SettingsAppHelper {
         teiSetting: AnalyticsTeiSetting,
         whoComponent: WHONutritionComponent,
         teiDataElements: List<AnalyticsTeiDataElement>,
-        teiIndicators: List<AnalyticsTeiIndicator>
+        teiIndicators: List<AnalyticsTeiIndicator>,
     ): AnalyticsTeiWHONutritionItem {
         return AnalyticsTeiWHONutritionItem.builder()
             .dataElements(
                 teiDataElements.filter {
                     it.teiSetting() == teiSetting.uid() && it.whoComponent() == whoComponent
-                }
+                },
             )
             .indicators(
                 teiIndicators.filter {
                     it.teiSetting() == teiSetting.uid() && it.whoComponent() == whoComponent
-                }
+                },
             )
             .build()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
index 8be2469e24..70933cb2f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
@@ -30,15 +30,15 @@ package org.hisp.dhis.android.core.settings.internal
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import dagger.Reusable
 import io.reactivex.Single
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class SettingsAppInfoCall @Inject constructor(
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor
+    private val apiCallExecutor: RxAPICallExecutor,
 ) {
     companion object {
         const val unknown = "unknown"
@@ -68,7 +68,7 @@ internal class SettingsAppInfoCall @Inject constructor(
     private fun fetchV1GeneralSettings(storeError: Boolean): Single<SettingsAppVersion> {
         return apiCallExecutor.wrapSingle(
             settingAppService.generalSettings(SettingsAppDataStoreVersion.V1_1),
-            storeError
+            storeError,
         )
             .map<SettingsAppVersion> {
                 SettingsAppVersion.Valid(SettingsAppDataStoreVersion.V1_1, unknown)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
index babad54c3d..fb4ac900c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 internal class SettingsAppInfoManagerImpl @Inject constructor(
-    private val settingsAppInfoCall: SettingsAppInfoCall
+    private val settingsAppInfoCall: SettingsAppInfoCall,
 ) : SettingsAppInfoManager {
 
     private var settingsAppVersion: SettingsAppVersion? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index 173961ed21..dbe37f58a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -29,12 +29,12 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class SynchronizationSettingCall @Inject constructor(
@@ -44,7 +44,7 @@ internal class SynchronizationSettingCall @Inject constructor(
     private val generalSettingCall: GeneralSettingCall,
     private val dataSetSettingCall: DataSetSettingCall,
     private val programSettingCall: ProgramSettingCall,
-    private val appVersionManager: SettingsAppInfoManager
+    private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<SynchronizationSettings>() {
 
     override fun fetch(storeError: Boolean): Single<SynchronizationSettings> {
@@ -61,7 +61,7 @@ internal class SynchronizationSettingCall @Inject constructor(
                                 .errorDescription("Synchronization settings not found")
                                 .errorCode(D2ErrorCode.URL_NOT_FOUND)
                                 .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                                .build()
+                                .build(),
                         )
                     } else {
                         Single.just(
@@ -70,7 +70,7 @@ internal class SynchronizationSettingCall @Inject constructor(
                                 .metadataSync(generalSettings?.metadataSync())
                                 .dataSetSettings(dataSetSettings)
                                 .programSettings(programSettings)
-                                .build()
+                                .build(),
                         )
                     }
                 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
index 4bf58139fa..2694f881fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import javax.inject.Inject
 
 @Reusable
 internal class SynchronizationSettingHandler @Inject constructor(
     store: SynchronizationSettingStore,
     private val dataSetSettingHandler: DataSetSettingHandler,
-    private val programSettingHandler: ProgramSettingHandler
+    private val programSettingHandler: ProgramSettingHandler,
 ) : ObjectWithoutUidHandlerImpl<SynchronizationSettings>(store) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<SynchronizationSettings>
+        oCollection: Collection<SynchronizationSettings>,
     ): Collection<SynchronizationSettings> {
         removeExistingValue()
         return oCollection
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
index fafd999267..78a0480ad2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.settings.SynchronizationSettings
 
 @Suppress("MagicNumber")
 internal class SynchronizationSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SynchronizationSettingStore,
     ObjectWithoutUidStoreImpl<SynchronizationSettings>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class SynchronizationSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> SynchronizationSettings.create(cursor) }
+        { cursor: Cursor -> SynchronizationSettings.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
index 45498d27f4..0a86aa741c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
@@ -29,24 +29,24 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields.allFields
+import javax.inject.Inject
 
 @Reusable
 internal class SystemSettingCall @Inject constructor(
     private val apiDownloader: APIDownloader,
     private val handler: SystemSettingHandler,
     private val service: SettingService,
-    private val settingsSplitter: SystemSettingsSplitter
+    private val settingsSplitter: SystemSettingsSplitter,
 ) : ListCall<SystemSetting> {
 
     override fun download(): Single<List<SystemSetting>> {
         return apiDownloader.downloadList(
             handler = handler,
-            downloader = service.getSystemSettingsSingle(allFields).map(settingsSplitter::splitSettings)
+            downloader = service.getSystemSettingsSingle(allFields).map(settingsSplitter::splitSettings),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
index a70203c54d..cedf263a91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.SystemSetting
+import javax.inject.Inject
 
 @Reusable
 internal class SystemSettingHandler @Inject constructor(
-    store: SystemSettingStore
+    store: SystemSettingStore,
 ) : ObjectWithoutUidHandlerImpl<SystemSetting>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
index e9a3ec23c3..9782d32178 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.SystemSettingTableInfo
 
 internal class SystemSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SystemSettingStore,
     ObjectWithoutUidStoreImpl<SystemSetting>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class SystemSettingStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> SystemSetting.create(cursor) }
+        { cursor: Cursor -> SystemSetting.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsFields.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsFields.kt
index a74cd0fd89..2e313d2fdb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsFields.kt
@@ -41,11 +41,11 @@ internal object SystemSettingsFields {
     val allFields: Fields<SystemSettings> = Fields.builder<SystemSettings>()
         .fields(
             fh.field<String>(KEY_FLAG),
-            fh.field<String>(KEY_STYLE)
+            fh.field<String>(KEY_STYLE),
         ).build()
 
     val bingApiKey: Fields<SystemSettings> = Fields.builder<SystemSettings>()
         .fields(
-            fh.field<Any>(KEY_BING_MAPS_API_KEY)
+            fh.field<Any>(KEY_BING_MAPS_API_KEY),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt
index 70f4889059..a104c48103 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.SystemSettings
+import javax.inject.Inject
 
 @Reusable
 internal class SystemSettingsSplitter @Inject constructor() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
index b21639e2df..015a0aec47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ObjectCall
 import org.hisp.dhis.android.core.settings.UserSettings
+import javax.inject.Inject
 
 @Reusable
 class UserSettingsCall @Inject internal constructor(
     private val handler: UserSettingsHandler,
     private val service: SettingService,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : ObjectCall<UserSettings> {
 
     override fun download(): Single<UserSettings> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
index 829eb99080..829b50647a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.UserSettings
+import javax.inject.Inject
 
 @Reusable
 internal class UserSettingsHandler @Inject constructor(
-    store: UserSettingsStore
+    store: UserSettingsStore,
 ) : ObjectWithoutUidHandlerImpl<UserSettings>(store) {
 
     override fun beforeObjectHandled(o: UserSettings): UserSettings {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
index c748a0f68a..613c1dc0e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.settings.UserSettings
 import org.hisp.dhis.android.core.settings.UserSettingsTableInfo
 
 internal class UserSettingsStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : UserSettingsStore,
     ObjectWithoutUidStoreImpl<UserSettings>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class UserSettingsStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> UserSettings.create(cursor) }
+        { cursor: Cursor -> UserSettings.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
index 7f92e3eee4..e51d0442a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
 import org.hisp.dhis.android.core.common.State
@@ -59,6 +58,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.user.AuthenticatedUserObjectRepository
 import org.hisp.dhis.smscompression.models.SMSMetadata
+import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
 internal class LocalDbRepositoryImpl @Inject constructor(
@@ -77,7 +77,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
     private val metadataIdsStore: MetadataIdsStore,
     private val smsConfigStore: SMSConfigStore,
     private val ongoingSubmissionsStore: OngoingSubmissionsStore,
-    private val dataStatePropagator: DataStatePropagator
+    private val dataStatePropagator: DataStatePropagator,
 ) : LocalDbRepository {
 
     override fun getUserName(): Single<String> {
@@ -214,7 +214,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
                     relationship.toBuilder()
                         .from(fromItem)
                         .to(toItem)
-                        .build()
+                        .build(),
                 )
             }
         }
@@ -271,7 +271,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
         dataset: String,
         orgUnit: String,
         period: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<SMSDataValueSet> {
         return dataSetsStore.getDataValues(dataset, orgUnit, period, attributeOptionComboUid)
             .map { values: List<DataValue?>? ->
@@ -287,7 +287,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
         dataset: String,
         orgUnit: String,
         period: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Boolean {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.DATA_SET, dataset)
@@ -295,7 +295,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
             .appendKeyStringValue(DataSetCompleteRegistrationTableInfo.Columns.PERIOD, period)
             .appendKeyStringValue(
                 DataSetCompleteRegistrationTableInfo.Columns.ATTRIBUTE_OPTION_COMBO,
-                attributeOptionComboUid
+                attributeOptionComboUid,
             )
             .appendKeyNumberValue(DataSetCompleteRegistrationTableInfo.Columns.DELETED, 0)
             .build()
@@ -307,7 +307,7 @@ internal class LocalDbRepositoryImpl @Inject constructor(
         orgUnit: String,
         period: String,
         attributeOptionComboUid: String,
-        state: State
+        state: State,
     ): Completable {
         return Completable.mergeArray(
             dataSetsStore.updateDataSetValuesState(
@@ -315,15 +315,15 @@ internal class LocalDbRepositoryImpl @Inject constructor(
                 orgUnit,
                 period,
                 attributeOptionComboUid,
-                state
+                state,
             ),
             dataSetsStore.updateDataSetCompleteRegistrationState(
                 dataSetId,
                 orgUnit,
                 period,
                 attributeOptionComboUid,
-                state
-            )
+                state,
+            ),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
index 6ad80e6dc5..ee221b3bb0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
@@ -30,15 +30,15 @@ package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.smscompression.SMSConsts
 import org.hisp.dhis.smscompression.models.SMSMetadata
+import javax.inject.Inject
 
 @Reusable
 internal class MetadataIdsStore @Inject constructor(
     private val smsMetadataIdsStore: SMSMetadataIdStore,
-    private val smsConfigStore: SMSConfigStore
+    private val smsConfigStore: SMSConfigStore,
 ) {
     fun getMetadataIds(): Single<SMSMetadata> {
         return Single.fromCallable {
@@ -72,7 +72,7 @@ internal class MetadataIdsStore @Inject constructor(
 
     private fun getIds(
         map: Map<SMSConsts.MetadataType, List<SMSMetadata.ID>>,
-        type: SMSConsts.MetadataType
+        type: SMSConsts.MetadataType,
     ): List<SMSMetadata.ID> {
         return map[type] ?: emptyList()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
index 40c77a32d7..8e053ba439 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
@@ -32,15 +32,15 @@ import android.util.Pair
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository.TooManySubmissionsException
 import org.hisp.dhis.android.core.sms.domain.repository.internal.SubmissionType
+import javax.inject.Inject
 
 @Reusable
 internal class OngoingSubmissionsStore @Inject constructor(
     private val smsOngoingSubmissionStore: SMSOngoingSubmissionStore,
-    private val smsConfigStore: SMSConfigStore
+    private val smsConfigStore: SMSConfigStore,
 ) {
     private var ongoingSubmissions: Map<Int, SubmissionType>? = null
     private var lastGeneratedSubmissionId: Int? = null
@@ -119,7 +119,7 @@ internal class OngoingSubmissionsStore @Inject constructor(
     fun generateNextSubmissionId(): Single<Int> {
         return Single.zip<Map<Int, SubmissionType>, Int, Pair<Map<Int, SubmissionType>, Int>>(
             getOngoingSubmissions(),
-            getLastGeneratedSubmissionId()
+            getLastGeneratedSubmissionId(),
         ) { a: Map<Int, SubmissionType>?, b: Int? -> Pair.create(a, b) }
             .flatMap { ids: Pair<Map<Int, SubmissionType>, Int> ->
                 val ongoingIds: Collection<Int> = ids.first.keys
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigKey.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigKey.kt
index 7af7dfee84..f5b96bb376 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigKey.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigKey.kt
@@ -35,5 +35,5 @@ internal enum class SMSConfigKey {
     METADATA_CONFIG,
     MODULE_ENABLED,
     WAIT_FOR_RESULT,
-    LAST_SUBMISSION_ID
+    LAST_SUBMISSION_ID,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt
index 9486f79c40..50ed7b3420 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.datastore.KeyValuePair
 
 @Suppress("MagicNumber")
 internal class SMSConfigStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SMSConfigStore,
     ObjectWithoutUidStoreImpl<KeyValuePair>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class SMSConfigStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor -> KeyValuePair.create(cursor) }
+        { cursor -> KeyValuePair.create(cursor) },
     ) {
 
     override fun get(key: SMSConfigKey): String? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigTableInfo.kt
index 25062b4c1e..552769bd69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSConfigTableInfo.kt
@@ -50,14 +50,14 @@ internal object SMSConfigTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 KEY,
-                VALUE
+                VALUE,
             )
         }
 
         override fun whereUpdate(): Array<String> {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
-                KEY
+                KEY,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt
index 3fe8526454..9bb96c75a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdStoreImpl.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 
 @Suppress("MagicNumber")
 internal class SMSMetadataIdStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SMSMetadataIdStore,
     ObjectWithoutUidStoreImpl<SMSMetadataId>(
         databaseAdapter,
@@ -44,7 +44,7 @@ internal class SMSMetadataIdStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> SMSMetadataId.create(cursor) }
+        { cursor: Cursor -> SMSMetadataId.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdTableInfo.kt
index b1c56305f3..8d8d7cfcb6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSMetadataIdTableInfo.kt
@@ -50,7 +50,7 @@ internal object SMSMetadataIdTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 TYPE,
-                UID
+                UID,
             )
         }
 
@@ -58,7 +58,7 @@ internal object SMSMetadataIdTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 TYPE,
-                UID
+                UID,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt
index ea96deaf33..f07db1d836 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionStoreImpl.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 
 @Suppress("MagicNumber")
 internal class SMSOngoingSubmissionStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SMSOngoingSubmissionStore,
     ObjectWithoutUidStoreImpl<SMSOngoingSubmission>(
         databaseAdapter,
@@ -43,7 +43,7 @@ internal class SMSOngoingSubmissionStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor -> SMSOngoingSubmission.create(cursor) }
+        { cursor -> SMSOngoingSubmission.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionTableInfo.kt
index 56dce1d660..880a3364ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/SMSOngoingSubmissionTableInfo.kt
@@ -50,14 +50,14 @@ internal object SMSOngoingSubmissionTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 SUBMISSION_ID,
-                TYPE
+                TYPE,
             )
         }
 
         override fun whereUpdate(): Array<String> {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
-                SUBMISSION_ID
+                SUBMISSION_ID,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/ApiService.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/ApiService.kt
index e373941c06..816875ae52 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/ApiService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/ApiService.kt
@@ -44,7 +44,7 @@ interface ApiService {
         @Query("users:fields") users: String?,
         @Query("trackedEntityTypes:fields") trackedEntityTypes: String?,
         @Query("trackedEntityAttributes:fields") trackedEntityAttributes: String?,
-        @Query("programs:fields") programs: String?
+        @Query("programs:fields") programs: String?,
     ): Single<MetadataResponse>
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImpl.kt
index 8d8fbaffb9..206459c754 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImpl.kt
@@ -30,17 +30,17 @@ package org.hisp.dhis.android.core.sms.data.webapirepository.internal
 
 import android.util.Log
 import io.reactivex.Single
-import java.util.*
 import org.hisp.dhis.android.core.sms.data.webapirepository.internal.MetadataResponse.MetadataId
 import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository
 import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository.GetMetadataIdsConfig
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.smscompression.models.SMSMetadata
+import java.util.*
 
 internal class WebApiRepositoryImpl(
     private val apiService: ApiService,
-    private val dhisVersionManager: DHISVersionManager
+    private val dhisVersionManager: DHISVersionManager,
 ) : WebApiRepository {
 
     override fun getMetadataIds(config: GetMetadataIdsConfig): Single<SMSMetadata> {
@@ -83,7 +83,7 @@ internal class WebApiRepositoryImpl(
             `val`(c.users),
             `val`(c.trackedEntityTypes),
             `val`(c.trackedEntityAttributes),
-            `val`(c.programs)
+            `val`(c.programs),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt
index 371c9d612a..5640d5e793 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt
@@ -28,23 +28,23 @@
 package org.hisp.dhis.android.core.sms.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigTableInfo
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdTableInfo
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class SMSModuleWiper @Inject internal constructor(
-    private val tableWiper: TableWiper
+    private val tableWiper: TableWiper,
 ) : ModuleWiper {
 
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             SMSMetadataIdTableInfo.TABLE_INFO,
             SMSConfigTableInfo.TABLE_INFO,
-            SMSOngoingSubmissionTableInfo.TABLE_INFO
+            SMSOngoingSubmissionTableInfo.TABLE_INFO,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt
index fd34654d9d..28cbefc438 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISPatchVersion.kt
@@ -68,7 +68,8 @@ enum class DHISPatchVersion(val majorVersion: DHISVersion, val strValue: String,
 
     V2_40_0(DHISVersion.V2_40, "2.40.0", SMSVersion.V2),
 
-    V2_41_0(DHISVersion.V2_41, "2.41.0", SMSVersion.V2);
+    V2_41_0(DHISVersion.V2_41, "2.41.0", SMSVersion.V2),
+    ;
 
     companion object {
         @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
index 6d1c0c9f79..b6ab8eab72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
@@ -40,7 +40,8 @@ enum class DHISVersion(internal val prefix: String) {
     V2_38("2.38"),
     V2_39("2.39"),
     V2_40("2.40"),
-    V2_41("2.41");
+    V2_41("2.41"),
+    ;
 
     companion object {
         @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SMSVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SMSVersion.kt
index ff08b10a50..43e26d0e24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SMSVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SMSVersion.kt
@@ -29,7 +29,8 @@ package org.hisp.dhis.android.core.systeminfo
 
 enum class SMSVersion(val intValue: Int) {
     V1(1),
-    V2(2);
+    V2(2),
+    ;
 
     companion object {
         @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
index fde32c2540..1d3e2874dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import javax.inject.Inject
-import javax.inject.Singleton
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
@@ -36,10 +34,12 @@ import org.hisp.dhis.android.core.systeminfo.DHISPatchVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SMSVersion
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 class DHISVersionManagerImpl @Inject internal constructor(
-    private val systemInfoStore: SystemInfoStore
+    private val systemInfoStore: SystemInfoStore,
 ) : DHISVersionManager {
     private var version: DHISVersion? = null
     private var patchVersion: DHISPatchVersion? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
index a6ef2c60d5..fef2489a03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
+import javax.inject.Inject
 
 @Reusable
 class PingCall @Inject internal constructor(
     private val pingService: PingService,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : DownloadProvider {
 
     override suspend fun download(storeError: Boolean) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
index 3d53c8cb75..a1f9a6b517 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
@@ -40,6 +39,7 @@ import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.DHISVersion.Companion.allowedVersionsAsStr
 import org.hisp.dhis.android.core.systeminfo.DHISVersion.Companion.isAllowedVersion
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import javax.inject.Inject
 
 @Reusable
 class SystemInfoCall @Inject internal constructor(
@@ -47,7 +47,7 @@ class SystemInfoCall @Inject internal constructor(
     private val systemInfoService: SystemInfoService,
     private val resourceHandler: ResourceHandler,
     private val versionManager: DHISVersionManagerImpl,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : DownloadProvider {
 
     override suspend fun download(storeError: Boolean) {
@@ -65,13 +65,13 @@ class SystemInfoCall @Inject internal constructor(
                         .errorDescription(
                             "Server DHIS version (" + version + ") not valid. " +
                                 "Allowed versions: " +
-                                CollectionsHelper.commaAndSpaceSeparatedArrayValues(allowedVersionsAsStr())
+                                CollectionsHelper.commaAndSpaceSeparatedArrayValues(allowedVersionsAsStr()),
                         )
                         .build()
                 }
                 insertOrUpdateSystemInfo(systemInfo)
             },
-            onFailure = { throw it }
+            onFailure = { throw it },
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
index bf39696915..d6609a5927 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import javax.inject.Inject
 
 @Reusable
 internal class SystemInfoHandler @Inject constructor(
-    store: SystemInfoStore
+    store: SystemInfoStore,
 ) : ObjectWithoutUidHandlerImpl<SystemInfo>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
index f926e4f26d..10fd4f6ef9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedSuspendModuleDownloader
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
+import javax.inject.Inject
 
 @Reusable
 internal class SystemInfoModuleDownloader @Inject internal constructor(
-    private val systemInfoCall: SystemInfoCall
+    private val systemInfoCall: SystemInfoCall,
 ) : UntypedSuspendModuleDownloader {
 
     override suspend fun downloadMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
index dc8cf019a1..dd4c510a34 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.systeminfo.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SystemInfoModule
 import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
+import javax.inject.Inject
 
 @Reusable
 class SystemInfoModuleImpl @Inject internal constructor(
     private val versionManager: DHISVersionManager,
-    private val systemInfo: SystemInfoObjectRepository
+    private val systemInfo: SystemInfoObjectRepository,
 ) : SystemInfoModule {
     override fun versionManager(): DHISVersionManager {
         return versionManager
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
index b2f09a9341..5aa982bafa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
@@ -37,8 +37,8 @@ import retrofit2.Retrofit
 @Module(
     includes = [
         PingEntityDIModule::class,
-        SystemInfoEntityDIModule::class
-    ]
+        SystemInfoEntityDIModule::class,
+    ],
 )
 internal class SystemInfoPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
index 5c4d9a0ef5..aea89d303e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoService.kt
@@ -36,6 +36,6 @@ import retrofit2.http.Query
 internal fun interface SystemInfoService {
     @GET("system/info")
     suspend fun getSystemInfo(
-        @Query("fields") @Which fields: Fields<SystemInfo>
+        @Query("fields") @Which fields: Fields<SystemInfo>,
     ): SystemInfo
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
index 8caa94ab8e..e7e6fac3f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.hisp.dhis.android.core.systeminfo.SystemInfoTableInfo
 
 internal class SystemInfoStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : SystemInfoStore,
     ObjectWithoutUidStoreImpl<SystemInfo>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class SystemInfoStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> SystemInfo.create(cursor) }
+        { cursor: Cursor -> SystemInfo.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/NewTrackerImporterTrackedEntityTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/NewTrackerImporterTrackedEntityTransformer.kt
index 2f6eeec011..e0219d8966 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/NewTrackerImporterTrackedEntityTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/NewTrackerImporterTrackedEntityTransformer.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.trackedentity.ownership.NewTrackerImporterProg
 internal object NewTrackerImporterTrackedEntityTransformer {
     fun transform(
         o: TrackedEntityInstance,
-        tetAttributeMap: Map<String, List<String>>
+        tetAttributeMap: Map<String, List<String>>,
     ): NewTrackerImporterTrackedEntity {
         val teiAttributes = o.trackedEntityAttributeValues() ?: emptyList()
         val typeAttributes = tetAttributeMap[o.trackedEntityType()] ?: emptyList()
@@ -62,7 +62,7 @@ internal object NewTrackerImporterTrackedEntityTransformer {
     }
 
     fun deTransform(
-        o: NewTrackerImporterTrackedEntity
+        o: NewTrackerImporterTrackedEntity,
     ): TrackedEntityInstance {
         val enrollments = o.enrollments()?.map {
             NewTrackerImporterEnrollmentTransformer.deTransform(it)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkTableInfo.kt
index 3eb1b27cb9..de83dc56d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeLegendSetLinkTableInfo.kt
@@ -50,7 +50,7 @@ class TrackedEntityAttributeLegendSetLinkTableInfo {
         val CHILD_PROJECTION = LinkTableChildProjection(
             LegendSetTableInfo.TABLE_INFO,
             Columns.TRACKED_ENTITY_ATTRIBUTE,
-            Columns.LEGEND_SET
+            Columns.LEGEND_SET,
         )
     }
 
@@ -60,7 +60,7 @@ class TrackedEntityAttributeLegendSetLinkTableInfo {
                 super.all(),
                 TRACKED_ENTITY_ATTRIBUTE,
                 LEGEND_SET,
-                SORT_ORDER
+                SORT_ORDER,
             )
         }
 
@@ -69,7 +69,7 @@ class TrackedEntityAttributeLegendSetLinkTableInfo {
                 super.all(),
                 TRACKED_ENTITY_ATTRIBUTE,
                 LEGEND_SET,
-                SORT_ORDER
+                SORT_ORDER,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index d05f9c148c..ce68e1a759 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
-import java.util.Date
-import javax.inject.Inject
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -67,6 +65,8 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import java.util.Date
+import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
 @Reusable
@@ -80,8 +80,10 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val generalSettingObjectRepository: GeneralSettingObjectRepository,
     private val reservedValueSettingStore: ReservedValueSettingStore,
     private val executor: D2CallExecutor,
-    private val reservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
-        TrackedEntityAttributeReservedValueQuery>
+    private val reservedValueQueryCallFactory: QueryCallFactory<
+        TrackedEntityAttributeReservedValue,
+        TrackedEntityAttributeReservedValueQuery,
+        >,
 ) {
     private val d2ProgressManager = D2ProgressManager(null)
 
@@ -128,7 +130,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
      */
     fun blockingDownloadReservedValues(
         attributeUid: String,
-        numberOfValuesToFillUp: Int?
+        numberOfValuesToFillUp: Int?,
     ) {
         runBlocking { downloadReservedValuesFlow(attributeUid, numberOfValuesToFillUp).collect() }
     }
@@ -150,14 +152,14 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
     fun downloadReservedValues(
         attributeUid: String,
-        numberOfValuesToFillUp: Int?
+        numberOfValuesToFillUp: Int?,
     ): Observable<D2Progress> {
         return downloadReservedValuesFlow(attributeUid, numberOfValuesToFillUp).asObservable()
     }
 
     private fun downloadReservedValuesFlow(
         attributeUid: String,
-        numberOfValuesToFillUp: Int?
+        numberOfValuesToFillUp: Int?,
     ) = flow {
         emitAll(downloadValuesForOrgUnits(attributeUid, numberOfValuesToFillUp))
     }
@@ -185,7 +187,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     }
 
     private fun downloadAllReservedValuesFlow(
-        numberOfValuesToFillUp: Int?
+        numberOfValuesToFillUp: Int?,
     ) = flow {
         val flows = generatedAttributes.map { attribute ->
             downloadValuesForOrgUnits(attribute.uid(), numberOfValuesToFillUp)
@@ -233,9 +235,9 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         val orderByClause = OrderByClauseBuilder.orderByFromItems(
             listOf(
                 RepositoryScopeOrderByItem.builder().column(IdentifiableColumns.DISPLAY_NAME)
-                    .direction(RepositoryScope.OrderByDirection.ASC).build()
+                    .direction(RepositoryScope.OrderByDirection.ASC).build(),
             ),
-            CoreColumns.ID
+            CoreColumns.ID,
         )
         val trackedEntityAttributes = trackedEntityAttributeStore.selectWhere(whereClause, orderByClause)
         val reservedValueSummaries: MutableList<ReservedValueSummary> = ArrayList()
@@ -249,8 +251,8 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
                         .numberOfValuesToFillUp(
                             getFillUpToValue(
                                 null,
-                                trackedEntityAttribute.uid()
-                            )
+                                trackedEntityAttribute.uid(),
+                            ),
                         )
                     reservedValueSummaries.add(builder.build())
                 }
@@ -266,13 +268,13 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private fun increaseProgress(): D2Progress {
         return d2ProgressManager.increaseProgress(
             TrackedEntityAttributeReservedValue::class.java,
-            false
+            false,
         )
     }
 
     private suspend fun downloadValuesForOrgUnits(
         attribute: String,
-        numberOfValuesToFillUp: Int?
+        numberOfValuesToFillUp: Int?,
     ): Flow<D2Progress> = flow {
         val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
 
@@ -284,7 +286,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
                     attribute,
                     organisationUnit,
                     numberOfValuesToFillUp,
-                    true
+                    true,
                 )
                 emit(increaseProgress())
             }
@@ -299,7 +301,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         attribute: String,
         organisationUnit: OrganisationUnit?,
         minNumberOfValuesToHave: Int?,
-        storeError: Boolean
+        storeError: Boolean,
     ) = coroutineScope {
         // Using local date. It's not worth it to make a system info call
         store.deleteExpired(Date())
@@ -308,7 +310,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         val remainingValues = store.count(
             attribute,
             if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
-            pattern
+            pattern,
         )
 
         // If number of values is explicitly specified, we use that value as threshold.
@@ -321,7 +323,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
                 organisationUnit,
                 numberToReserve,
                 pattern,
-                storeError
+                storeError,
             )
         }
     }
@@ -331,7 +333,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         organisationUnit: OrganisationUnit?,
         numberToReserve: Int,
         pattern: String?,
-        storeError: Boolean
+        storeError: Boolean,
     ) {
         executor.executeD2Call(
             reservedValueQueryCallFactory.create(
@@ -339,10 +341,10 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
                     trackedEntityAttributeUid,
                     numberToReserve,
                     organisationUnit,
-                    pattern
-                )
+                    pattern,
+                ),
             ),
-            storeError
+            storeError,
         )
 
         if (pattern != null) {
@@ -355,25 +357,25 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
             ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM,
             WhereClauseBuilder().appendKeyStringValue(
                 ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                attribute
-            ).build()
+                attribute,
+            ).build(),
         )
         val linkedOrgunitUids = organisationUnitProgramLinkStore.selectStringColumnsWhereClause(
             OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
             WhereClauseBuilder().appendInKeyStringValues(
                 OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
-                linkedProgramUids
-            ).build()
+                linkedProgramUids,
+            ).build(),
         )
         val captureOrgunits = userOrganisationUnitLinkStore.queryOrganisationUnitUidsByScope(
-            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
+            OrganisationUnit.Scope.SCOPE_DATA_CAPTURE,
         )
         linkedOrgunitUids.toMutableList().retainAll(captureOrgunits)
         return organisationUnitStore.selectWhere(
             WhereClauseBuilder().appendInKeyStringValues(
                 IdentifiableColumns.UID,
-                linkedOrgunitUids
-            ).build()
+                linkedOrgunitUids,
+            ).build(),
         )
     }
 
@@ -407,7 +409,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
             }
         } else {
             reservedValueSettingStore.updateOrInsert(
-                ReservedValueSetting.builder().uid(attribute).numberOfValuesToReserve(minNumberOfValuesToHave).build()
+                ReservedValueSetting.builder().uid(attribute).numberOfValuesToReserve(minNumberOfValuesToHave).build(),
             )
             minNumberOfValuesToHave
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37.kt
index 4285061640..991df3ae25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37.kt
@@ -28,9 +28,9 @@
 
 package org.hisp.dhis.android.core.trackedentity
 
-import java.util.*
 import org.hisp.dhis.android.core.common.*
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import java.util.*
 
 internal data class TrackedEntityInstanceFilterAPI37(
     val id: String,
@@ -46,7 +46,7 @@ internal data class TrackedEntityInstanceFilterAPI37(
     val enrollmentStatus: EnrollmentStatus?,
     val followup: Boolean?,
     val enrollmentCreatedPeriod: FilterPeriod?,
-    val eventFilters: List<TrackedEntityInstanceEventFilter>?
+    val eventFilters: List<TrackedEntityInstanceEventFilter>?,
 ) {
     fun toTrackedEntityInstanceFilter(): TrackedEntityInstanceFilter =
         TrackedEntityInstanceFilter.builder()
@@ -71,9 +71,9 @@ internal data class TrackedEntityInstanceFilterAPI37(
                                 .endBuffer(it.periodTo())
                                 .type(DatePeriodType.RELATIVE)
                                 .build()
-                        }
+                        },
                     )
-                    .build()
+                    .build(),
             )
             .eventFilters(eventFilters)
             .build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
index a34f231d41..f7e3b99463 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
@@ -68,8 +68,8 @@ import retrofit2.Retrofit
         TrackedEntityInstanceSyncEntityDIModule::class,
         TrackedEntityTypeEntityDIModule::class,
         TrackedEntityTypeAttributeEntityDIModule::class,
-        AttributeValueFilterEntityDIModule::class
-    ]
+        AttributeValueFilterEntityDIModule::class,
+    ],
 )
 internal class TrackedEntityPackageDIModule {
     @Provides
@@ -87,7 +87,7 @@ internal class TrackedEntityPackageDIModule {
     @Provides
     @Reusable
     fun dataValueCallFactory(
-        impl: TrackedEntityAttributeReservedValueEndpointCallFactory
+        impl: TrackedEntityAttributeReservedValueEndpointCallFactory,
     ): QueryCallFactory<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery> {
         return impl
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
index 17eda9d87c..ead0c64f5a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
+import javax.inject.Inject
 
 @Reusable
 internal class AttributeValueFilterHandler @Inject constructor(
-    store: AttributeValueFilterStore
+    store: AttributeValueFilterStore,
 ) : ObjectWithoutUidHandlerImpl<AttributeValueFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
index ec427ebeb4..17765672c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 
 @Suppress("MagicNumber")
 internal class AttributeValueFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AttributeValueFilterStore,
     ObjectWithoutUidStoreImpl<AttributeValueFilter>(
         databaseAdapter,
@@ -48,7 +48,7 @@ internal class AttributeValueFilterStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { AttributeValueFilter.create(it) }
+        { AttributeValueFilter.create(it) },
     ) {
 
     companion object {
@@ -75,7 +75,7 @@ internal class AttributeValueFilterStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             ItemFilterTableInfo.TABLE_INFO,
-            ItemFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER
+            ItemFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/EntityQueryCriteriaFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/EntityQueryCriteriaFields.kt
index 6b3bb2dc66..8eadcefd6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/EntityQueryCriteriaFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/EntityQueryCriteriaFields.kt
@@ -63,6 +63,6 @@ internal object EntityQueryCriteriaFields {
                 .with(DateFilterPeriodFields.allFields),
             fh.nestedField<DateFilterPeriod>(Columns.ENROLLMENT_CREATED_DATE)
                 .with(DateFilterPeriodFields.allFields),
-            fh.nestedField<AttributeValueFilter>(ATTRIBUTE_VALUE_FILTER).with(AttributeValueFilterFields.allFields)
+            fh.nestedField<AttributeValueFilter>(ATTRIBUTE_VALUE_FILTER).with(AttributeValueFilterFields.allFields),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityAttributeValueFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityAttributeValueFields.kt
index f6d6504dcc..48bc953578 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityAttributeValueFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityAttributeValueFields.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityAttributeValue
+import java.util.*
 
 internal object NewTrackedEntityAttributeValueFields {
     private const val ATTRIBUTE = "attribute"
@@ -46,6 +46,6 @@ internal object NewTrackedEntityAttributeValueFields {
                 fh.field<String>(ATTRIBUTE),
                 fh.field<String>(VALUE),
                 fh.field<Date>(CREATED_AT),
-                fh.field<Date>(UPDATED_AT)
+                fh.field<Date>(UPDATED_AT),
             ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityDataValueFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityDataValueFields.kt
index 2d242b6e72..b0c16e63c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityDataValueFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityDataValueFields.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityDataValue
+import java.util.*
 
 internal object NewTrackedEntityDataValueFields {
     private const val DATA_ELEMENT = "dataElement"
@@ -50,6 +50,6 @@ internal object NewTrackedEntityDataValueFields {
                 fh.field<String>(VALUE),
                 fh.field<Date>(CREATED_AT),
                 fh.field<Date>(UPDATED_AT),
-                fh.field<Boolean>(PROVIDED_ELSEWHERE)
+                fh.field<Boolean>(PROVIDED_ELSEWHERE),
             ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index b8a4366278..0a3163cb3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -46,11 +45,12 @@ import org.hisp.dhis.android.core.trackedentity.search.TrackerQueryResult
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
 import org.hisp.dhis.android.core.util.simpleDateFormat
+import javax.inject.Inject
 
 @Reusable
 internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
     private val trackedExporterService: TrackerExporterService,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : TrackedEntityEndpointCallFactory() {
 
     override suspend fun getCollectionCall(query: TrackerAPIQuery): Payload<TrackedEntityInstance> {
@@ -68,7 +68,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
             pageSize = query.pageSize,
             lastUpdatedStartDate = query.lastUpdatedStr,
             includeAllAttributes = true,
-            includeDeleted = true
+            includeDeleted = true,
         ).let { mapPayload(it) }
     }
 
@@ -81,7 +81,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
             programStatus = getProgramStatus(query),
             programStartDate = getProgramStartDate(query),
             includeAllAttributes = true,
-            includeDeleted = true
+            includeDeleted = true,
         ).let { NewTrackerImporterTrackedEntityTransformer.deTransform(it) }
     }
 
@@ -91,7 +91,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
             fields = NewTrackedEntityInstanceFields.asRelationshipFields,
             orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name,
             includeAllAttributes = true,
-            includeDeleted = true
+            includeDeleted = true,
         ).let { mapPayload(it) }
     }
 
@@ -104,21 +104,21 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
             if (events.isEmpty()) {
                 TrackerQueryResult(
                     trackedEntities = emptyList(),
-                    exhausted = true
+                    exhausted = true,
                 )
             } else {
                 val teiQuery = getPostEventTeiQuery(query, events)
                 val instances = getTrackedEntityQuery(teiQuery)
                 TrackerQueryResult(
                     trackedEntities = instances,
-                    exhausted = events.size < query.pageSize
+                    exhausted = events.size < query.pageSize,
                 )
             }
         } else {
             val instances = getTrackedEntityQuery(query)
             TrackerQueryResult(
                 trackedEntities = instances,
-                exhausted = instances.size < query.pageSize
+                exhausted = instances.size < query.pageSize,
             )
         }
     }
@@ -135,7 +135,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
 
     private suspend fun getEventQueryForOrgunit(
         query: TrackedEntityInstanceQueryOnline,
-        orgunit: String?
+        orgunit: String?,
     ): List<NewTrackerImporterEvent> {
         return coroutineAPICallExecutor.wrap(storeError = false) {
             trackedExporterService.getEvents(
@@ -164,14 +164,14 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
                 page = query.page,
                 updatedAfter = query.lastUpdatedStartDate.simpleDateFormat(),
                 updatedBefore = query.lastUpdatedEndDate.simpleDateFormat(),
-                includeDeleted = query.includeDeleted
+                includeDeleted = query.includeDeleted,
             )
         }.getOrThrow().instances
     }
 
     private suspend fun getTrackedEntityQuery(query: TrackedEntityInstanceQueryOnline): List<TrackedEntityInstance> {
         return coroutineAPICallExecutor.wrap(
-            errorCatcher = TrackedEntityInstanceQueryErrorCatcher()
+            errorCatcher = TrackedEntityInstanceQueryErrorCatcher(),
         ) {
             val uidsStr = query.uids?.joinToString(";")
 
@@ -201,7 +201,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
                 paging = query.paging,
                 page = query.page,
                 pageSize = query.pageSize,
-                includeAllAttributes = true
+                includeAllAttributes = true,
             )
 
             mapPayload(payload)
@@ -210,7 +210,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
 
     private fun getPostEventTeiQuery(
         query: TrackedEntityInstanceQueryOnline,
-        events: List<NewTrackerImporterEvent>
+        events: List<NewTrackerImporterEvent>,
     ): TrackedEntityInstanceQueryOnline {
         return TrackedEntityInstanceQueryOnline(
             page = query.page,
@@ -224,7 +224,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
             attributeFilter = query.attributeFilter,
             order = query.order,
             trackedEntityType = query.trackedEntityType,
-            includeDeleted = query.includeDeleted
+            includeDeleted = query.includeDeleted,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityInstanceFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityInstanceFields.kt
index 031def03ec..8fb27a48c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityInstanceFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityInstanceFields.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper
 import org.hisp.dhis.android.core.common.Geometry
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.relationship.internal.NewRelationshipFields
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntity
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import java.util.*
 
 internal object NewTrackedEntityInstanceFields {
     private const val UID = "trackedEntity"
@@ -62,7 +62,7 @@ internal object NewTrackedEntityInstanceFields {
                 .with(NewRelationshipFields.allFields),
             fh.nestedField<NewTrackerImporterEnrollment>(ENROLLMENTS)
                 .with(NewEnrollmentFields.allFields),
-            fh.nestedField<ProgramOwner>(PROGRAM_OWNERS)
+            fh.nestedField<ProgramOwner>(PROGRAM_OWNERS),
         ).build()
 
     val asRelationshipFields: Fields<NewTrackerImporterTrackedEntity> = commonFields().build()
@@ -79,7 +79,7 @@ internal object NewTrackedEntityInstanceFields {
             fh.field<Geometry>(GEOMETRY),
             fh.field<Boolean>(DELETED),
             fh.nestedField<NewTrackerImporterTrackedEntityAttributeValue>(TRACKED_ENTITY_ATTRIBUTE_VALUES)
-                .with(NewTrackedEntityAttributeValueFields.allFields)
+                .with(NewTrackedEntityAttributeValueFields.allFields),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayload.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayload.kt
index a261b78f2a..ca68c1e439 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayload.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayload.kt
@@ -40,7 +40,7 @@ internal data class NewTrackerImporterPayload(
     val relationships: MutableList<NewTrackerImporterRelationship> = mutableListOf(),
 
     @JsonIgnore
-    val fileResourcesMap: Map<String, List<String>> = mutableMapOf()
+    val fileResourcesMap: Map<String, List<String>> = mutableMapOf(),
 ) {
     @JsonIgnore
     fun isEmpty(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayloadWrapper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayloadWrapper.kt
index a574b04f9d..472571d050 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayloadWrapper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterPayloadWrapper.kt
@@ -33,5 +33,5 @@ internal data class NewTrackerImporterPayloadWrapper(
     val deleted: NewTrackerImporterPayload = NewTrackerImporterPayload(),
     val updated: NewTrackerImporterPayload = NewTrackerImporterPayload(),
 
-    val programOwners: Map<String, List<ProgramOwner>> = emptyMap()
+    val programOwners: Map<String, List<ProgramOwner>> = emptyMap(),
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
index bdd4a41d8e..81d699d039 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor.accessEvents
@@ -42,30 +41,31 @@ import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityT
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor.accessEnrollments
+import javax.inject.Inject
 
 @Reusable
 internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject internal constructor(
     private val programTrackedEntityAttributeStore: ProgramTrackedEntityAttributeStore,
     private val trackedEntityTypeAttributeStore: TrackedEntityTypeAttributeStore,
-    private val oldTrackerImporterPayloadGenerator: OldTrackerImporterPayloadGenerator
+    private val oldTrackerImporterPayloadGenerator: OldTrackerImporterPayloadGenerator,
 ) {
 
     fun getTrackedEntityPayload(
-        instances: List<TrackedEntityInstance>
+        instances: List<TrackedEntityInstance>,
     ): NewTrackerImporterPayloadWrapper {
         val oldPayload = oldTrackerImporterPayloadGenerator.getTrackedEntityInstancePayload(instances)
         return transformPayload(oldPayload)
     }
 
     fun getEventPayload(
-        events: List<Event>
+        events: List<Event>,
     ): NewTrackerImporterPayloadWrapper {
         val oldPayload = oldTrackerImporterPayloadGenerator.getEventPayload(events)
         return transformPayload(oldPayload)
     }
 
     private fun transformPayload(
-        oldPayload: OldTrackerImporterPayload
+        oldPayload: OldTrackerImporterPayload,
     ): NewTrackerImporterPayloadWrapper {
         val wrapper = NewTrackerImporterPayloadWrapper(programOwners = oldPayload.programOwners)
 
@@ -98,7 +98,7 @@ internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject inter
     private fun addTrackedEntityToWrapper(
         wrapper: NewTrackerImporterPayloadWrapper,
         instance: TrackedEntityInstance,
-        tetAttributeMap: Map<String, List<String>>
+        tetAttributeMap: Map<String, List<String>>,
     ) {
         if (instance.syncState() != State.SYNCED) {
             val transformed = NewTrackerImporterTrackedEntityTransformer.transform(instance, tetAttributeMap)
@@ -116,7 +116,7 @@ internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject inter
         wrapper: NewTrackerImporterPayloadWrapper,
         enrollment: Enrollment,
         attributes: List<TrackedEntityAttributeValue>?,
-        programAttributeMap: Map<String, List<String>>
+        programAttributeMap: Map<String, List<String>>,
     ) {
         if (enrollment.syncState() != State.SYNCED) {
             val transformed =
@@ -133,7 +133,7 @@ internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject inter
 
     private fun addEventToWrapper(
         wrapper: NewTrackerImporterPayloadWrapper,
-        event: Event
+        event: Event,
     ) {
         if (event.syncState() != State.SYNCED) {
             val transformed = NewTrackerImporterEventTransformer.transform(event)
@@ -149,7 +149,7 @@ internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject inter
 
     private fun addRelationshipToWrapper(
         wrapper: NewTrackerImporterPayloadWrapper,
-        relationship: Relationship
+        relationship: Relationship,
     ) {
         val transformed = NewTrackerImporterRelationshipTransformer.transform(relationship)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
index 91ce53dd95..f65ded479c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.internal.EventStore
@@ -36,6 +35,7 @@ import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObject
+import javax.inject.Inject
 
 @Reusable
 internal class NewTrackerImporterTrackedEntityPostStateManager @Inject internal constructor(
@@ -44,7 +44,7 @@ internal class NewTrackerImporterTrackedEntityPostStateManager @Inject internal
     private val eventStore: EventStore,
     private val relationshipStore: RelationshipStore,
     private val fileResourceStore: FileResourceStore,
-    private val h: StatePersistorHelper
+    private val h: StatePersistorHelper,
 ) {
 
     fun restoreStates(payload: NewTrackerImporterPayload) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
index afffc9c341..8f857e7192 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -37,11 +36,12 @@ import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQuer
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryScopeOrderByItem
 import org.hisp.dhis.android.core.trackedentity.search.TrackerQueryResult
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
+import javax.inject.Inject
 
 @Reusable
 internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
     private val trackedEntityInstanceService: TrackedEntityInstanceService,
-    private val queryCallFactory: TrackedEntityInstanceQueryCallFactory
+    private val queryCallFactory: TrackedEntityInstanceQueryCallFactory,
 ) : TrackedEntityEndpointCallFactory() {
 
     override suspend fun getCollectionCall(query: TrackerAPIQuery): Payload<TrackedEntityInstance> {
@@ -59,7 +59,7 @@ internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
             pageSize = query.pageSize,
             lastUpdatedStartDate = query.lastUpdatedStr,
             includeAllAttributes = true,
-            includeDeleted = true
+            includeDeleted = true,
         )
     }
 
@@ -72,7 +72,7 @@ internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
             programStatus = getProgramStatus(query),
             programStartDate = getProgramStartDate(query),
             includeAllAttributes = true,
-            includeDeleted = true
+            includeDeleted = true,
         )
     }
 
@@ -82,7 +82,7 @@ internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
             trackedEntityInstance = uid,
             orgUnitMode = OrganisationUnitMode.ACCESSIBLE.name,
             includeAllAttributes = true,
-            includeDeleted = true
+            includeDeleted = true,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
index 4bd4405923..37a7225e20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.event.Event
@@ -41,15 +40,16 @@ import org.hisp.dhis.android.core.imports.internal.ItemsWithFileResources
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 internal class OldTrackerImporterFileResourcesPostCall @Inject internal constructor(
     private val fileResourcePostCall: FileResourcePostCall,
-    private val fileResourceHelper: FileResourceHelper
+    private val fileResourceHelper: FileResourceHelper,
 ) {
 
     suspend fun uploadTrackedEntityFileResources(
-        trackedEntityInstances: List<TrackedEntityInstance>
+        trackedEntityInstances: List<TrackedEntityInstance>,
     ): ItemsWithFileResources<TrackedEntityInstance> {
         val fileResources = fileResourceHelper.getUploadableFileResources()
 
@@ -65,7 +65,7 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
     }
 
     suspend fun uploadEventsFileResources(
-        events: List<Event>
+        events: List<Event>,
     ): ItemsWithFileResources<Event> {
         val fileResources = fileResourceHelper.getUploadableFileResources()
 
@@ -82,7 +82,7 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
 
     private suspend fun uploadTrackedEntityInstance(
         trackedEntityInstance: TrackedEntityInstance,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): Pair<TrackedEntityInstance, List<String>> {
         val uploadedFileResources = mutableListOf<String>()
         val updatedAttributes = trackedEntityInstance.trackedEntityAttributeValues()?.map { attributeValue ->
@@ -107,13 +107,13 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
                 .insertEnrollments(trackedEntityInstance.toBuilder(), updatedEnrollments)
                 .trackedEntityAttributeValues(updatedAttributes)
                 .build(),
-            uploadedFileResources
+            uploadedFileResources,
         )
     }
 
     private suspend fun uploadEnrollment(
         enrollment: Enrollment,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): Pair<Enrollment, List<String>> {
         val uploadedFileResources = mutableListOf<String>()
         val updatedEvents = EnrollmentInternalAccessor.accessEvents(enrollment)
@@ -125,13 +125,13 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
 
         return Pair(
             EnrollmentInternalAccessor.insertEvents(enrollment.toBuilder(), updatedEvents).build(),
-            uploadedFileResources
+            uploadedFileResources,
         )
     }
 
     private suspend fun uploadEvent(
         event: Event,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): Pair<Event, List<String>> {
         val uploadedFileResources = mutableListOf<String>()
         val updatedDataValues = event.trackedEntityDataValues()?.map { dataValue ->
@@ -146,7 +146,7 @@ internal class OldTrackerImporterFileResourcesPostCall @Inject internal construc
 
         return Pair(
             event.toBuilder().trackedEntityDataValues(updatedDataValues).build(),
-            uploadedFileResources
+            uploadedFileResources,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayload.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayload.kt
index c4b7166c3c..dda6c72872 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayload.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayload.kt
@@ -38,7 +38,7 @@ internal data class OldTrackerImporterPayload(
     val trackedEntityInstances: List<TrackedEntityInstance> = emptyList(),
     val events: List<Event> = emptyList(),
     val relationships: List<Relationship> = emptyList(),
-    val programOwners: Map<String, List<ProgramOwner>> = emptyMap()
+    val programOwners: Map<String, List<ProgramOwner>> = emptyMap(),
 ) {
     fun isEmpty(): Boolean = trackedEntityInstances.isEmpty() && events.isEmpty() && relationships.isEmpty()
 
@@ -48,7 +48,7 @@ internal data class OldTrackerImporterPayload(
         return OldTrackerImporterPayload(
             trackedEntityInstances = concat(trackedEntityInstances, other.trackedEntityInstances),
             events = concat(events, other.events),
-            relationships = concat(relationships, other.relationships)
+            relationships = concat(relationships, other.relationships),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
index 1e86e86d23..cd779e417e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
@@ -50,6 +49,7 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions", "LongParameterList")
@@ -65,7 +65,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
     private val trackedEntityTypeStore: TrackedEntityTypeStore,
     private val relationshipTypeStore: RelationshipTypeStore,
     private val programStore: ProgramStore,
-    private val programOwnerStore: ProgramOwnerStore
+    private val programOwnerStore: ProgramOwnerStore,
 ) {
 
     private data class ExtraData(
@@ -73,11 +73,11 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
         val enrollmentMap: Map<String, List<Enrollment>>,
         val attributeValueMap: Map<String, List<TrackedEntityAttributeValue>>,
         val notes: List<Note>,
-        val relationships: List<Relationship>
+        val relationships: List<Relationship>,
     )
 
     fun getTrackedEntityInstancePayload(
-        trackedEntityInstances: List<TrackedEntityInstance>
+        trackedEntityInstances: List<TrackedEntityInstance>,
     ): OldTrackerImporterPayload {
         val extraData = getExtraData()
 
@@ -87,12 +87,12 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
         return generatePayload(
             payload = OldTrackerImporterPayload(trackedEntityInstances = recreatedTeis),
-            extraData = extraData
+            extraData = extraData,
         )
     }
 
     fun getEventPayload(
-        events: List<Event>
+        events: List<Event>,
     ): OldTrackerImporterPayload {
         val extraData = getExtraData()
 
@@ -102,13 +102,13 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
         return generatePayload(
             payload = OldTrackerImporterPayload(events = recreatedEvents),
-            extraData = extraData
+            extraData = extraData,
         )
     }
 
     private fun generatePayload(
         payload: OldTrackerImporterPayload,
-        extraData: ExtraData
+        extraData: ExtraData,
     ): OldTrackerImporterPayload {
         return payload
             .run { addRelationships(this, extraData) }
@@ -118,10 +118,10 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
     private fun addRelationships(
         payload: OldTrackerImporterPayload,
-        extraData: ExtraData
+        extraData: ExtraData,
     ): OldTrackerImporterPayload {
         val payloadWithRelationships = payload.copy(
-            relationships = extractRelationships(payload, extraData)
+            relationships = extractRelationships(payload, extraData),
         )
 
         return addRelatedItems(payloadWithRelationships, extraData)
@@ -129,7 +129,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
     private fun addRelatedItems(
         payload: OldTrackerImporterPayload,
-        extraData: ExtraData
+        extraData: ExtraData,
     ): OldTrackerImporterPayload {
         var accPayload = payload
         var relatedItems = getMissingItems(payload, extraData)
@@ -145,7 +145,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
     @Suppress("NestedBlockDepth")
     private fun getMissingItems(
         payload: OldTrackerImporterPayload,
-        extraData: ExtraData
+        extraData: ExtraData,
     ): OldTrackerImporterPayload {
         val relatedItems = payload.relationships.flatMap { listOf(it.from(), it.to()) }
 
@@ -192,7 +192,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
         return OldTrackerImporterPayload(
             trackedEntityInstances = trackedEntityInstances,
-            events = events
+            events = events,
         ).run {
             copy(relationships = extractRelationships(this, extraData))
         }
@@ -246,20 +246,20 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
                 WhereClauseBuilder()
                     .appendInKeyStringValues(
                         DataColumns.SYNC_STATE,
-                        State.uploadableStatesIncludingError().map { it.name }
+                        State.uploadableStatesIncludingError().map { it.name },
                     )
-                    .build()
+                    .build(),
             ),
             relationships = relationshipRepository.bySyncState()
                 .`in`(State.uploadableStatesIncludingError().toList())
                 .withItems()
-                .blockingGet()
+                .blockingGet(),
         )
     }
 
     private fun extractRelationships(
         payload: OldTrackerImporterPayload,
-        extraData: ExtraData
+        extraData: ExtraData,
     ): List<Relationship> {
         val teiItems = payload.trackedEntityInstances.map {
             RelationshipHelper.teiItem(it.uid())
@@ -297,7 +297,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
     private fun getTrackedEntityInstance(
         trackedEntityInstance: TrackedEntityInstance,
-        extraData: ExtraData
+        extraData: ExtraData,
     ): TrackedEntityInstance {
         val enrollmentsRecreated = getEnrollments(extraData, trackedEntityInstance.uid())
         val attributeValues = extraData.attributeValueMap[trackedEntityInstance.uid()]
@@ -309,7 +309,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
     private fun getEnrollments(
         extraData: ExtraData,
-        trackedEntityInstanceUid: String
+        trackedEntityInstanceUid: String,
     ): List<Enrollment> {
         return extraData.enrollmentMap[trackedEntityInstanceUid]?.map { enrollment ->
             val events = extraData.eventMap[enrollment.uid()]?.map { event ->
@@ -344,11 +344,11 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
             val programOwnerWhere = WhereClauseBuilder()
                 .appendInKeyStringValues(
                     ProgramOwnerTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                    payload.trackedEntityInstances.map { it.uid() }
+                    payload.trackedEntityInstances.map { it.uid() },
                 )
                 .appendInKeyEnumValues(
                     DataColumns.SYNC_STATE,
-                    State.uploadableStatesIncludingError().toList()
+                    State.uploadableStatesIncludingError().toList(),
                 )
                 .build()
 
@@ -391,7 +391,7 @@ internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
 
         return payload.copy(
             trackedEntityInstances = prunedTrackedEntityInstances,
-            events = payload.events + pendingEvents
+            events = payload.events + pendingEvents,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
index 4a34a801ec..5f91b08c58 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import java.net.HttpURLConnection.HTTP_CONFLICT
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -50,6 +48,8 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipPostCall
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterProgramOwnerPostCall
+import java.net.HttpURLConnection.HTTP_CONFLICT
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -64,25 +64,25 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
     private val relationshipPostCall: RelationshipPostCall,
     private val fileResourcePostCall: OldTrackerImporterFileResourcesPostCall,
     private val programOwnerPostCall: TrackerImporterProgramOwnerPostCall,
-    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
+    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper,
 ) {
 
     fun uploadTrackedEntityInstances(
-        trackedEntityInstances: List<TrackedEntityInstance>
+        trackedEntityInstances: List<TrackedEntityInstance>,
     ): Flow<D2Progress> {
         val payload = trackerImporterPayloadGenerator.getTrackedEntityInstancePayload(trackedEntityInstances)
         return uploadPayload(payload)
     }
 
     fun uploadEvents(
-        events: List<Event>
+        events: List<Event>,
     ): Flow<D2Progress> {
         val payload = trackerImporterPayloadGenerator.getEventPayload(events)
         return uploadPayload(payload)
     }
 
     private fun uploadPayload(
-        payload: OldTrackerImporterPayload
+        payload: OldTrackerImporterPayload,
     ): Flow<D2Progress> = flow {
         val partitionedRelationships = payload.relationships.partition { it.deleted()!! }
 
@@ -96,7 +96,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
 
     @Suppress("TooGenericExceptionCaught")
     private fun postTrackedEntityInstances(
-        trackedEntityInstances: List<TrackedEntityInstance>
+        trackedEntityInstances: List<TrackedEntityInstance>,
     ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
         val teiPartitions = trackedEntityInstances
@@ -122,7 +122,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
             } catch (e: Exception) {
                 trackerStateManager.restorePayloadStates(
                     trackedEntityInstances = partition.items,
-                    fileResources = partition.fileResources
+                    fileResources = partition.fileResources,
                 )
                 if (e is D2Error && e.isOffline) {
                     throw e
@@ -134,18 +134,18 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
     }
 
     private suspend fun postPartition(
-        trackedEntityInstances: List<TrackedEntityInstance>
+        trackedEntityInstances: List<TrackedEntityInstance>,
     ): TEIWebResponseHandlerSummary {
         trackerStateManager.setPayloadStates(
             trackedEntityInstances = trackedEntityInstances,
-            forcedState = State.UPLOADING
+            forcedState = State.UPLOADING,
         )
         val trackedEntityInstancePayload = TrackedEntityInstancePayload.create(trackedEntityInstances)
 
         val response = coroutineAPICallExecutor.wrap(
             storeError = true,
             acceptedErrorCodes = listOf(HTTP_CONFLICT),
-            errorClass = TEIWebResponse::class.java
+            errorClass = TEIWebResponse::class.java,
         ) {
             trackedEntityInstanceService.postTrackedEntityInstances(trackedEntityInstancePayload, "SYNC")
         }
@@ -157,7 +157,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
 
     @Suppress("TooGenericExceptionCaught")
     private fun postEvents(
-        events: List<Event>
+        events: List<Event>,
     ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
 
@@ -171,7 +171,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
 
             trackerStateManager.setPayloadStates(
                 events = payload.events,
-                forcedState = State.UPLOADING
+                forcedState = State.UPLOADING,
             )
 
             val strategy = "SYNC"
@@ -179,14 +179,14 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
                 val webResponse = coroutineAPICallExecutor.wrap(
                     storeError = true,
                     acceptedErrorCodes = listOf(HTTP_CONFLICT),
-                    errorClass = EventWebResponse::class.java
+                    errorClass = EventWebResponse::class.java,
                 ) {
                     eventService.postEvents(payload, strategy)
                 }.getOrThrow()
 
                 eventImportHandler.handleEventImportSummaries(
                     eventImportSummaries = webResponse.response()?.importSummaries(),
-                    events = payload.events
+                    events = payload.events,
                 )
 
                 fileResourcePostCall.updateFileResourceStates(validEvents.fileResources)
@@ -195,7 +195,7 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
             } catch (e: Exception) {
                 trackerStateManager.restorePayloadStates(
                     events = payload.events,
-                    fileResources = validEvents.fileResources
+                    fileResources = validEvents.fileResources,
                 )
                 throw e
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt
index 73dabe88f8..600df9788b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 
 internal class ProgramOwnerChildrenAppender constructor(
-    private val childStore: ObjectWithoutUidStore<ProgramOwner>
+    private val childStore: ObjectWithoutUidStore<ProgramOwner>,
 ) : ChildrenAppender<TrackedEntityInstance>() {
 
     override fun appendChildren(tei: TrackedEntityInstance): TrackedEntityInstance {
@@ -43,7 +43,7 @@ internal class ProgramOwnerChildrenAppender constructor(
         val programOwners = childStore.selectWhere(
             WhereClauseBuilder()
                 .appendKeyStringValue(ProgramOwnerTableInfo.Columns.TRACKED_ENTITY_INSTANCE, tei.uid())
-                .build()
+                .build(),
         )
         return builder.programOwners(programOwners).build()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
index 3627cec81f..2f79c02005 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
@@ -34,13 +34,13 @@ import org.hisp.dhis.android.core.trackedentity.ReservedValueSetting
 import org.hisp.dhis.android.core.trackedentity.ReservedValueSettingTableInfo
 
 internal class ReservedValueSettingStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ReservedValueSettingStore,
     IdentifiableObjectStoreImpl<ReservedValueSetting>(
         databaseAdapter,
         ReservedValueSettingTableInfo.TABLE_INFO,
         BINDER,
-        { ReservedValueSetting.create(it) }
+        { ReservedValueSetting.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt
index 1ea5795e2b..3975a4c2bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
 import org.hisp.dhis.android.core.common.DataObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 internal class StatePersistorHelper @Inject internal constructor() {
@@ -41,7 +41,7 @@ internal class StatePersistorHelper @Inject internal constructor() {
     fun <O> addState(
         stateMap: MutableMap<State, MutableList<String>>,
         o: O,
-        forcedState: State?
+        forcedState: State?,
     ) where O : DataObject, O : ObjectWithUidInterface {
         val s = getStateToSet(o, forcedState)
         if (!stateMap.containsKey(s)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
index feae290c23..f8f1d304e3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityAttributeHandler @Inject constructor(
     trackedEntityAttributeStore: TrackedEntityAttributeStore,
-    private val trackedEntityAttributeLegendSetLinkHandler: TrackedEntityAttributeLegendSetLinkHandler
+    private val trackedEntityAttributeLegendSetLinkHandler: TrackedEntityAttributeLegendSetLinkHandler,
 ) : IdentifiableHandlerImpl<TrackedEntityAttribute>(trackedEntityAttributeStore) {
     override fun beforeObjectHandled(o: TrackedEntityAttribute): TrackedEntityAttribute {
         val builder = o.toBuilder()
@@ -55,7 +55,7 @@ internal class TrackedEntityAttributeHandler @Inject constructor(
         if (o.legendSets() != null) {
             trackedEntityAttributeLegendSetLinkHandler.handleMany(
                 o.uid(),
-                o.legendSets()
+                o.legendSets(),
             ) { legendSet: ObjectWithUid, sortOrder: Int? ->
                 TrackedEntityAttributeLegendSetLink.builder()
                     .legendSet(legendSet.uid())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt
index c5f5b60d10..f7efaa9f79 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLinkTableInfo
 
 internal class TrackedEntityAttributeLegendSetChildrenAppender(
-    private val linkChildStore: ObjectWithUidChildStore<TrackedEntityAttribute>
+    private val linkChildStore: ObjectWithUidChildStore<TrackedEntityAttribute>,
 ) : ChildrenAppender<TrackedEntityAttribute>() {
 
     override fun appendChildren(m: TrackedEntityAttribute): TrackedEntityAttribute {
@@ -51,8 +51,8 @@ internal class TrackedEntityAttributeLegendSetChildrenAppender(
                 StoreFactory.objectWithUidChildStore(
                     databaseAdapter,
                     TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO,
-                    TrackedEntityAttributeLegendSetLinkTableInfo.CHILD_PROJECTION
-                )
+                    TrackedEntityAttributeLegendSetLinkTableInfo.CHILD_PROJECTION,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
index a55b07a733..10c4e12d0b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
@@ -48,7 +48,7 @@ internal class TrackedEntityAttributeLegendSetDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<TrackedEntityAttribute>> {
         return mapOf(
             TrackedEntityAttributeFields.LEGEND_SETS to
-                TrackedEntityAttributeLegendSetChildrenAppender.create(databaseAdapter)
+                TrackedEntityAttributeLegendSetChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
index 9ce5e0cebc..224a919fd8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityAttributeLegendSetLinkHandler @Inject constructor(
-    store: TrackedEntityAttributeLegendSetLinkStore
+    store: TrackedEntityAttributeLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, TrackedEntityAttributeLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
index 2af8a870c4..136de7b962 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
@@ -38,14 +38,14 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetL
 
 @Suppress("MagicNumber")
 internal class TrackedEntityAttributeLegendSetLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityAttributeLegendSetLinkStore,
     LinkStoreImpl<TrackedEntityAttributeLegendSetLink>(
         databaseAdapter,
         TrackedEntityAttributeLegendSetLinkTableInfo.TABLE_INFO,
         TrackedEntityAttributeLegendSetLinkTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
         BINDER,
-        { cursor: Cursor -> TrackedEntityAttributeLegendSetLink.create(cursor) }
+        { cursor: Cursor -> TrackedEntityAttributeLegendSetLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
index a61fd7c81c..272b399027 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityAttributeReservedValueHandler @Inject constructor(
-    store: TrackedEntityAttributeReservedValueStore
+    store: TrackedEntityAttributeReservedValueStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeReservedValue>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt
index d5e96c7822..74a5a1ea7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStore.kt
@@ -27,9 +27,9 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.Date
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import java.util.Date
 
 internal interface TrackedEntityAttributeReservedValueStore :
     ObjectWithoutUidStore<TrackedEntityAttributeReservedValue> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
index 4b58f647e8..3653514f68 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import android.database.Cursor
-import java.util.Date
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
@@ -39,10 +38,11 @@ import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo.Columns
+import java.util.Date
 
 @Suppress("MagicNumber")
 internal class TrackedEntityAttributeReservedValueStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityAttributeReservedValueStore,
     ObjectWithoutUidStoreImpl<TrackedEntityAttributeReservedValue>(
         databaseAdapter,
@@ -50,7 +50,7 @@ internal class TrackedEntityAttributeReservedValueStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> TrackedEntityAttributeReservedValue.create(cursor) }
+        { cursor: Cursor -> TrackedEntityAttributeReservedValue.create(cursor) },
     ) {
 
     override fun deleteExpired(serverDate: Date) {
@@ -58,7 +58,7 @@ internal class TrackedEntityAttributeReservedValueStoreImpl(
         super.deleteWhere(
             "${Columns.EXPIRY_DATE} < $serverDateStr OR " +
                 "( ${Columns.TEMPORAL_VALIDITY_DATE} < $serverDateStr AND " +
-                "${Columns.TEMPORAL_VALIDITY_DATE} IS NOT NULL );"
+                "${Columns.TEMPORAL_VALIDITY_DATE} IS NOT NULL );",
         )
     }
 
@@ -81,7 +81,7 @@ internal class TrackedEntityAttributeReservedValueStoreImpl(
     private fun where(
         ownerUid: String,
         organisationUnit: String?,
-        pattern: String?
+        pattern: String?,
     ): String {
         val builder = WhereClauseBuilder()
             .appendKeyStringValue(Columns.OWNER_UID, ownerUid)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
index 0dbe7f5cc8..2e0307cd31 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
 
 @Suppress("MagicNumber")
 internal class TrackedEntityAttributeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityAttributeStore,
     IdentifiableObjectStoreImpl<TrackedEntityAttribute>(
         databaseAdapter,
         TrackedEntityAttributeTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> TrackedEntityAttribute.create(cursor) }
+        { cursor: Cursor -> TrackedEntityAttribute.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt
index 0cb32ba4cc..09db305f0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 internal class TrackedEntityAttributeValueChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<TrackedEntityInstance, TrackedEntityAttributeValue>
+    private val childStore: SingleParentChildStore<TrackedEntityInstance, TrackedEntityAttributeValue>,
 ) : ChildrenAppender<TrackedEntityInstance>() {
     override fun appendChildren(m: TrackedEntityInstance): TrackedEntityInstance {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class TrackedEntityAttributeValueChildrenAppender private constructor(
             return TrackedEntityAttributeValueChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    TrackedEntityAttributeValueStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) }
+                    TrackedEntityAttributeValueStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueFields.kt
index 7daf2db83e..bedd6610b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueFields.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
+import java.util.*
 
 internal object TrackedEntityAttributeValueFields {
     const val ATTRIBUTE = "attribute"
@@ -42,6 +42,6 @@ internal object TrackedEntityAttributeValueFields {
             fh.field<String>(ATTRIBUTE),
             fh.field<String>(TrackedEntityAttributeValueTableInfo.Columns.VALUE),
             fh.field<Date>(TrackedEntityAttributeValueTableInfo.Columns.CREATED),
-            fh.field<Date>(TrackedEntityAttributeValueTableInfo.Columns.LAST_UPDATED)
+            fh.field<Date>(TrackedEntityAttributeValueTableInfo.Columns.LAST_UPDATED),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
index d682cdd1ef..adaab84918 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityAttributeValueHandler @Inject constructor(
-    store: TrackedEntityAttributeValueStore
+    store: TrackedEntityAttributeValueStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeValue>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStore.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStore.kt
index f72976e7e5..f166bcd21e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStore.kt
@@ -35,18 +35,18 @@ internal interface TrackedEntityAttributeValueStore : ObjectWithoutUidStore<Trac
     fun queryByTrackedEntityInstance(trackedEntityInstanceUid: String): List<TrackedEntityAttributeValue>
     fun deleteByInstanceAndNotInAttributes(
         trackedEntityInstanceUid: String,
-        trackedEntityAttributeUids: List<String>
+        trackedEntityAttributeUids: List<String>,
     )
     fun deleteByInstanceAndNotInProgramAttributes(
         trackedEntityInstanceUid: String,
         trackedEntityAttributeUids: List<String>,
-        program: String
+        program: String,
     )
     fun deleteByInstanceAndNotInAccessibleAttributes(
         trackedEntityInstanceUid: String,
         trackedEntityAttributeUids: List<String>,
         teiType: String,
-        programs: List<String>
+        programs: List<String>,
     )
 
     fun removeDeletedAttributeValuesByInstance(trackedEntityInstanceUid: String)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
index cd8954779f..cbc552e1ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
@@ -45,7 +45,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTable
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo
 
 internal class TrackedEntityAttributeValueStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityAttributeValueStore,
     ObjectWithoutUidStoreImpl<TrackedEntityAttributeValue>(
         databaseAdapter,
@@ -53,7 +53,7 @@ internal class TrackedEntityAttributeValueStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) }
+        { cursor: Cursor -> TrackedEntityAttributeValue.create(cursor) },
     ) {
 
     override fun queryTrackedEntityAttributeValueToPost(): Map<String, List<TrackedEntityAttributeValue>> {
@@ -69,8 +69,8 @@ internal class TrackedEntityAttributeValueStoreImpl(
     private fun teiInUploadableState(): String {
         val states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
             CollectionsHelper.withSingleQuotationMarksArray(
-                asStringList(uploadableStatesIncludingError().asList())
-            )
+                asStringList(uploadableStatesIncludingError().asList()),
+            ),
         )
         return "(" + TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE +
             "." +
@@ -81,23 +81,23 @@ internal class TrackedEntityAttributeValueStoreImpl(
     override fun queryByTrackedEntityInstance(trackedEntityInstanceUid: String): List<TrackedEntityAttributeValue> {
         val selectByTrackedEntityInstanceQuery = WhereClauseBuilder().appendKeyStringValue(
             TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-            trackedEntityInstanceUid
+            trackedEntityInstanceUid,
         ).build()
         return selectWhere(selectByTrackedEntityInstanceQuery)
     }
 
     override fun deleteByInstanceAndNotInAttributes(
         trackedEntityInstanceUid: String,
-        trackedEntityAttributeUids: List<String>
+        trackedEntityAttributeUids: List<String>,
     ) {
         val deleteWhereQuery = WhereClauseBuilder()
             .appendKeyStringValue(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                trackedEntityInstanceUid
+                trackedEntityInstanceUid,
             )
             .appendNotInKeyStringValues(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                trackedEntityAttributeUids
+                trackedEntityAttributeUids,
             )
             .build()
         deleteWhere(deleteWhereQuery)
@@ -106,22 +106,22 @@ internal class TrackedEntityAttributeValueStoreImpl(
     override fun deleteByInstanceAndNotInProgramAttributes(
         trackedEntityInstanceUid: String,
         trackedEntityAttributeUids: List<String>,
-        program: String
+        program: String,
     ) {
         val deleteWhereQuery = WhereClauseBuilder()
             .appendKeyStringValue(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                trackedEntityInstanceUid
+                trackedEntityInstanceUid,
             )
             .appendNotInKeyStringValues(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                trackedEntityAttributeUids
+                trackedEntityAttributeUids,
             )
             .appendInSubQuery(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
                 "SELECT ${ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE} " +
                     "FROM ${ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name()} " +
-                    "WHERE ${ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM} = '$program'"
+                    "WHERE ${ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM} = '$program'",
             )
             .build()
         deleteWhere(deleteWhereQuery)
@@ -131,17 +131,17 @@ internal class TrackedEntityAttributeValueStoreImpl(
         trackedEntityInstanceUid: String,
         trackedEntityAttributeUids: List<String>,
         teiType: String,
-        programs: List<String>
+        programs: List<String>,
     ) {
         val programsStr = programs.joinToString(separator = ",", prefix = "'", postfix = "'")
         val deleteWhereQuery = WhereClauseBuilder()
             .appendKeyStringValue(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                trackedEntityInstanceUid
+                trackedEntityInstanceUid,
             )
             .appendNotInKeyStringValues(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
-                trackedEntityAttributeUids
+                trackedEntityAttributeUids,
             )
             .appendInSubQuery(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
@@ -151,7 +151,7 @@ internal class TrackedEntityAttributeValueStoreImpl(
                     "UNION ALL " +
                     "SELECT ${TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE} " +
                     "FROM ${TrackedEntityTypeAttributeTableInfo.TABLE_INFO.name()} " +
-                    "WHERE ${TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE} = '$teiType'"
+                    "WHERE ${TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE} = '$teiType'",
             )
             .build()
         deleteWhere(deleteWhereQuery)
@@ -161,7 +161,7 @@ internal class TrackedEntityAttributeValueStoreImpl(
         val deleteWhereQuery = WhereClauseBuilder()
             .appendKeyStringValue(
                 TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                trackedEntityInstanceUid
+                trackedEntityInstanceUid,
             )
             .appendIsNullValue(TrackedEntityAttributeValueTableInfo.Columns.VALUE)
             .build()
@@ -197,7 +197,7 @@ internal class TrackedEntityAttributeValueStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             TrackedEntityAttributeValueTableInfo.TABLE_INFO,
-            TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE
+            TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt
index db03881029..f7bcdc67b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 
 internal class TrackedEntityDataValueChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<Event, TrackedEntityDataValue>
+    private val childStore: SingleParentChildStore<Event, TrackedEntityDataValue>,
 ) : ChildrenAppender<Event>() {
     override fun appendChildren(m: Event): Event {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class TrackedEntityDataValueChildrenAppender private constructor(
             return TrackedEntityDataValueChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    TrackedEntityDataValueStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> TrackedEntityDataValue.create(cursor) }
+                    TrackedEntityDataValueStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> TrackedEntityDataValue.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueFields.kt
index e2a169a59d..f329fc7b61 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueFields.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import java.util.*
 
 internal object TrackedEntityDataValueFields {
     private val fh = FieldsHelper<TrackedEntityDataValue>()
@@ -43,6 +43,6 @@ internal object TrackedEntityDataValueFields {
             fh.field<String>(TrackedEntityDataValueTableInfo.Columns.VALUE),
             fh.field<Date>(TrackedEntityDataValueTableInfo.Columns.CREATED),
             fh.field<Date>(TrackedEntityDataValueTableInfo.Columns.LAST_UPDATED),
-            fh.field<Boolean>(TrackedEntityDataValueTableInfo.Columns.PROVIDED_ELSEWHERE)
+            fh.field<Boolean>(TrackedEntityDataValueTableInfo.Columns.PROVIDED_ELSEWHERE),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
index 6435780281..9e3b751767 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityDataValueHandler @Inject constructor(
-    private val trackedEntityDataValueStore: TrackedEntityDataValueStore
+    private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityDataValue>(trackedEntityDataValueStore) {
     fun removeEventDataValues(eventUid: String?) {
         trackedEntityDataValueStore.deleteByEvent(eventUid!!)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
index 0dc225afe2..2dd0f5747a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
@@ -45,7 +45,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
 
 @Suppress("TooManyFunctions")
 internal class TrackedEntityDataValueStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityDataValueStore,
     ObjectWithoutUidStoreImpl<TrackedEntityDataValue>(
         databaseAdapter,
@@ -53,12 +53,12 @@ internal class TrackedEntityDataValueStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> TrackedEntityDataValue.create(cursor) }
+        { cursor: Cursor -> TrackedEntityDataValue.create(cursor) },
     ) {
 
     override fun deleteByEventAndNotInDataElements(
         eventUid: String,
-        dataElementUids: List<String>
+        dataElementUids: List<String>,
     ): Boolean {
         val whereClause = WhereClauseBuilder()
             .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
@@ -101,7 +101,7 @@ internal class TrackedEntityDataValueStoreImpl(
             .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
             .appendNotInSubQuery(
                 TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT,
-                getInProgramStageDataElementsSubQuery(eventUid)
+                getInProgramStageDataElementsSubQuery(eventUid),
             ).build()
 
         deleteWhere(queryStatement)
@@ -110,8 +110,8 @@ internal class TrackedEntityDataValueStoreImpl(
     private fun eventInUploadableState(): String {
         val states = CollectionsHelper.commaAndSpaceSeparatedArrayValues(
             CollectionsHelper.withSingleQuotationMarksArray(
-                uploadableStatesIncludingError().map { it.name }
-            )
+                uploadableStatesIncludingError().map { it.name },
+            ),
         )
         return "(Event." + EventTableInfo.Columns.AGGREGATED_SYNC_STATE + " IN (" + states + "))"
     }
@@ -129,7 +129,7 @@ internal class TrackedEntityDataValueStoreImpl(
             .appendKeyStringValue(TrackedEntityDataValueTableInfo.Columns.EVENT, eventUid)
             .appendInSubQuery(
                 TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT,
-                getInProgramStageDataElementsSubQuery(eventUid)
+                getInProgramStageDataElementsSubQuery(eventUid),
             ).build()
 
         return selectWhere(queryStatement)
@@ -176,7 +176,7 @@ internal class TrackedEntityDataValueStoreImpl(
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
             TrackedEntityDataValueTableInfo.TABLE_INFO,
-            TrackedEntityDataValueTableInfo.Columns.EVENT
+            TrackedEntityDataValueTableInfo.Columns.EVENT,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
index 0c4a613ef2..f29a9384d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -36,17 +35,18 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(
     private val enrollmentStore: EnrollmentStore,
-    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
+    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper,
 ) {
 
     fun deleteOrphan(
         parent: TrackedEntityInstance?,
         children: Collection<Enrollment>?,
-        program: String?
+        program: String?,
     ): Boolean {
         return if (parent != null && children != null) {
             val orphanEnrollmentsClause = WhereClauseBuilder().run {
@@ -54,7 +54,7 @@ internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(
                 appendNotInKeyStringValues(EnrollmentTableInfo.Columns.UID, children.map { it.uid() })
                 appendInKeyEnumValues(
                     EnrollmentTableInfo.Columns.SYNC_STATE,
-                    listOf(State.SYNCED, State.SYNCED_VIA_SMS)
+                    listOf(State.SYNCED, State.SYNCED_VIA_SMS),
                 )
                 if (program != null) {
                     appendKeyStringValue(EnrollmentTableInfo.Columns.PROGRAM, program)
@@ -83,7 +83,7 @@ internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(
     private fun isAccessibleByGlass(enrollment: Enrollment, program: String?): Boolean {
         val isProtected = breakTheGlassHelper.isProtectedInSearchScope(
             program = enrollment.program(),
-            organisationUnit = enrollment.organisationUnit()
+            organisationUnit = enrollment.organisationUnit(),
         )
 
         return !isProtected || enrollment.program() == program
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallErrorCatcher.kt
index 9d10a677e7..a7db2d45ea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceCallErrorCatcher.kt
@@ -27,13 +27,13 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.io.IOException
-import kotlin.Throws
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import retrofit2.Response
+import java.io.IOException
+import kotlin.Throws
 
 internal class TrackedEntityInstanceCallErrorCatcher : APICallErrorCatcher {
     override fun mustBeStored(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index f28cf1ef8e..a03680b4af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -42,6 +41,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerDownloadCall
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceDownloadCall @Inject constructor(
@@ -52,12 +52,12 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     private val queryFactory: TrackerQueryBundleFactory,
     private val trackerCallFactory: TrackerParentCallFactory,
     private val persistenceCallFactory: TrackedEntityInstancePersistenceCallFactory,
-    private val lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager
+    private val lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager,
 ) : TrackerDownloadCall<TrackedEntityInstance, TrackerQueryBundle>(
     userOrganisationUnitLinkStore,
     systemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory,
-    coroutineCallExecutor
+    coroutineCallExecutor,
 ) {
     override fun getBundles(params: ProgramDataDownloadParams): List<TrackerQueryBundle> {
         return queryFactory.getQueries(params)
@@ -72,7 +72,7 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     override fun persistItems(
         items: List<TrackedEntityInstance>,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ) {
         persistenceCallFactory.persistTEIs(items, params, relatives).blockingAwait()
     }
@@ -84,13 +84,13 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     override suspend fun queryByUids(
         bundle: TrackerQueryBundle,
         overwrite: Boolean,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): ItemsWithPagingResult {
         val result = ItemsWithPagingResult(0, true, null, false)
 
         val teiQuery = TrackerAPIQuery(
             commonParams = bundle.commonParams(),
-            programStatus = bundle.programStatus()
+            programStatus = bundle.programStatus(),
         )
 
         for (uid in bundle.commonParams().uids) {
@@ -104,7 +104,7 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
                         hasAllAttributes = !useEntityEndpoint,
                         overwrite = overwrite,
                         asRelationship = false,
-                        program = teiQuery.commonParams.program
+                        program = teiQuery.commonParams.program,
                     )
 
                     persistItems(listOf(tei), persistParams, relatives)
@@ -124,12 +124,12 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
     private suspend fun querySingleTei(
         uid: String,
         useEntityEndpoint: Boolean,
-        query: TrackerAPIQuery
+        query: TrackerAPIQuery,
     ): Result<TrackedEntityInstance?, D2Error> {
         return if (useEntityEndpoint) {
             coroutineCallExecutor.wrap(
                 storeError = true,
-                errorCatcher = TrackedEntityInstanceCallErrorCatcher()
+                errorCatcher = TrackedEntityInstanceCallErrorCatcher(),
             ) {
                 trackerCallFactory.getTrackedEntityCall().getEntityCall(uid, query)
             }
@@ -145,16 +145,16 @@ internal class TrackedEntityInstanceDownloadCall @Inject constructor(
         bundle: TrackerQueryBundle,
         program: String?,
         orgunitUid: String?,
-        limit: Int
+        limit: Int,
     ): TrackerAPIQuery {
         return TrackerAPIQuery(
             commonParams = bundle.commonParams().copy(
                 program = program,
-                limit = limit
+                limit = limit,
             ),
             programStatus = bundle.programStatus(),
             lastUpdatedStr = lastUpdatedManager.getLastUpdatedStr(bundle.commonParams()),
-            orgUnit = orgunitUid
+            orgUnit = orgunitUid,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
index 553778e4cf..c2ce313af4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -39,19 +38,20 @@ import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams
 import org.hisp.dhis.android.core.settings.EnrollmentScope
 import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress
+import javax.inject.Inject
 
 @Reusable
 class TrackedEntityInstanceDownloader @Inject internal constructor(
     scope: RepositoryScope,
-    private val downloadCall: TrackedEntityInstanceDownloadCall
+    private val downloadCall: TrackedEntityInstanceDownloadCall,
 ) : BaseRepositoryImpl<TrackedEntityInstanceDownloader>(
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
         TrackedEntityInstanceDownloader(
             s,
-            downloadCall
+            downloadCall,
         )
-    }
+    },
 ) {
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index 3458cf5306..44dd971294 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -61,13 +61,13 @@ internal class TrackedEntityInstanceEntityDIModule {
     @Reusable
     fun childrenAppenders(
         databaseAdapter: DatabaseAdapter,
-        programOwnerStore: ProgramOwnerStore
+        programOwnerStore: ProgramOwnerStore,
     ): Map<String, ChildrenAppender<TrackedEntityInstance>> {
         return mapOf(
             TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES to
                 TrackedEntityAttributeValueChildrenAppender.create(databaseAdapter),
             TrackedEntityInstanceFields.PROGRAM_OWNERS to
-                ProgramOwnerChildrenAppender(programOwnerStore)
+                ProgramOwnerChildrenAppender(programOwnerStore),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
index f05e5acca0..17205d4ace 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceEventFilterHandler @Inject constructor(
-    store: TrackedEntityInstanceEventFilterStore
+    store: TrackedEntityInstanceEventFilterStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityInstanceEventFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
index e4269cdc49..a140f85576 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
@@ -38,7 +38,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 
 @Suppress("MagicNumber")
 internal class TrackedEntityInstanceEventFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityInstanceEventFilterStore,
     ObjectWithoutUidStoreImpl<TrackedEntityInstanceEventFilter>(
         databaseAdapter,
@@ -46,7 +46,7 @@ internal class TrackedEntityInstanceEventFilterStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { TrackedEntityInstanceEventFilter.create(it) }
+        { TrackedEntityInstanceEventFilter.create(it) },
     ) {
 
     companion object {
@@ -64,7 +64,7 @@ internal class TrackedEntityInstanceEventFilterStoreImpl(
 
         val CHILD_PROJECTION = SingleParentChildProjection(
             TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
-            TrackedEntityInstanceEventFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER
+            TrackedEntityInstanceEventFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCE_FILTER,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFields.kt
index f9dae9b068..c3f19083ea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFields.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.fields.internal.FieldsHelper
 import org.hisp.dhis.android.core.common.Geometry
@@ -39,6 +38,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import java.util.*
 
 internal object TrackedEntityInstanceFields {
     const val UID = "trackedEntityInstance"
@@ -58,7 +58,7 @@ internal object TrackedEntityInstanceFields {
                 .with(RelationshipFields.allFields),
             fh.nestedField<Enrollment>(ENROLLMENTS)
                 .with(EnrollmentFields.allFields),
-            fh.nestedField<ProgramOwner>(PROGRAM_OWNERS)
+            fh.nestedField<ProgramOwner>(PROGRAM_OWNERS),
         ).build()
 
     val asRelationshipFields: Fields<TrackedEntityInstance> = commonFields().build()
@@ -76,7 +76,7 @@ internal object TrackedEntityInstanceFields {
             fh.field<Geometry>(GEOMETRY),
             fh.field<Boolean>(DELETED),
             fh.nestedField<TrackedEntityAttributeValue>(TRACKED_ENTITY_ATTRIBUTE_VALUES)
-                .with(TrackedEntityAttributeValueFields.allFields)
+                .with(TrackedEntityAttributeValueFields.allFields),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt
index a58ce814a4..c12848fb76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 
 internal class TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<TrackedEntityInstanceFilter, AttributeValueFilter>
+    private val childStore: SingleParentChildStore<TrackedEntityInstanceFilter, AttributeValueFilter>,
 ) : ChildrenAppender<TrackedEntityInstanceFilter>() {
 
     override fun appendChildren(m: TrackedEntityInstanceFilter): TrackedEntityInstanceFilter {
@@ -49,8 +49,8 @@ internal class TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender p
                 singleParentChildStore(
                     databaseAdapter,
                     AttributeValueFilterStoreImpl.CHILD_PROJECTION,
-                    AttributeValueFilter::create
-                )
+                    AttributeValueFilter::create,
+                ),
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
index c0845c0072..f5ac508c60 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
@@ -29,20 +29,20 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import javax.inject.Inject
 
 @Reusable
 class TrackedEntityInstanceFilterCall @Inject internal constructor(
     private val service: TrackedEntityInstanceFilterService,
     private val handler: TrackedEntityInstanceFilterHandler,
     private val apiDownloader: APIDownloader,
-    private val versionManager: DHISVersionManager
+    private val versionManager: DHISVersionManager,
 ) : UidsCall<TrackedEntityInstanceFilter> {
     override fun download(uids: Set<String>): Single<List<TrackedEntityInstanceFilter>> {
         val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
@@ -51,13 +51,13 @@ class TrackedEntityInstanceFilterCall @Inject internal constructor(
             apiDownloader.downloadPartitioned(
                 uids,
                 MAX_UID_LIST_SIZE,
-                handler
+                handler,
             ) { partitionUids: Set<String> ->
                 service.getTrackedEntityInstanceFilters(
                     TrackedEntityInstanceFilterFields.programUid.`in`(partitionUids),
                     accessDataReadFilter,
                     TrackedEntityInstanceFilterFields.allFields,
-                    false
+                    false,
                 )
             }
         } else {
@@ -70,10 +70,10 @@ class TrackedEntityInstanceFilterCall @Inject internal constructor(
                         TrackedEntityInstanceFilterFields.programUid.`in`(partitionUids),
                         accessDataReadFilter,
                         TrackedEntityInstanceFilterFields.allFieldsAPI37,
-                        false
+                        false,
                     )
                 },
-                { it.toTrackedEntityInstanceFilter() }
+                { it.toTrackedEntityInstanceFilter() },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
index 001f2612ae..8a1e9dbaba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
@@ -46,13 +46,13 @@ internal class TrackedEntityInstanceFilterEntityDIModule {
     @Provides
     @Reusable
     fun childrenAppenders(
-        databaseAdapter: DatabaseAdapter
+        databaseAdapter: DatabaseAdapter,
     ): Map<String, ChildrenAppender<TrackedEntityInstanceFilter>> {
         return mapOf(
             TrackedEntityInstanceFilterFields.EVENT_FILTERS to
                 TrackedEntityInstanceFilterEvenFilterChildrenAppender.create(databaseAdapter),
             EntityQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER to
-                TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.create(databaseAdapter)
+                TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt
index f8681e4638..644ddddd45 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEvenFilterChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 
 internal class TrackedEntityInstanceFilterEvenFilterChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<TrackedEntityInstanceFilter, TrackedEntityInstanceEventFilter>
+    private val childStore: SingleParentChildStore<TrackedEntityInstanceFilter, TrackedEntityInstanceEventFilter>,
 ) : ChildrenAppender<TrackedEntityInstanceFilter>() {
 
     override fun appendChildren(m: TrackedEntityInstanceFilter): TrackedEntityInstanceFilter {
@@ -49,8 +49,8 @@ internal class TrackedEntityInstanceFilterEvenFilterChildrenAppender private con
             return TrackedEntityInstanceFilterEvenFilterChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    TrackedEntityInstanceEventFilterStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> TrackedEntityInstanceEventFilter.create(cursor) }
+                    TrackedEntityInstanceEventFilterStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> TrackedEntityInstanceEventFilter.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterFields.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterFields.kt
index c7c2f46a18..b04dfd8e30 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterFields.kt
@@ -56,19 +56,19 @@ object TrackedEntityInstanceFilterFields {
             fh.field<String>(TrackedEntityInstanceFilterTableInfo.Columns.DESCRIPTION),
             fh.field<Int>(TrackedEntityInstanceFilterTableInfo.Columns.SORT_ORDER),
             fh.nestedField<TrackedEntityInstanceEventFilter>(EVENT_FILTERS)
-                .with(TrackedEntityInstanceEventFilterFields.allFields)
+                .with(TrackedEntityInstanceEventFilterFields.allFields),
         )
 
     val allFields: Fields<TrackedEntityInstanceFilter> = commonFields
         .fields(
             fh.nestedField<EntityQueryCriteria>(ENTITY_QUERY_CRITERIA)
-                .with(EntityQueryCriteriaFields.allFields)
+                .with(EntityQueryCriteriaFields.allFields),
         ).build()
 
     val allFieldsAPI37: Fields<TrackedEntityInstanceFilter> = commonFields
         .fields(
             fh.field<EnrollmentStatus>(TrackedEntityInstanceFilterTableInfo.Columns.ENROLLMENT_STATUS),
             fh.field<Boolean>(FOLLOW_UP),
-            fh.field<FilterPeriod>(ENROLLMENT_CREATED_PERIOD)
+            fh.field<FilterPeriod>(ENROLLMENT_CREATED_PERIOD),
         ).build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
index e4769cf9ca..044b31f8b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
@@ -28,22 +28,22 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceFilterHandler @Inject constructor(
     trackedEntityInstanceFilterStore: TrackedEntityInstanceFilterStore,
     private val trackedEntityInstanceEventFilterHandler: TrackedEntityInstanceEventFilterHandler,
-    private val attributeValueFilterHandler: AttributeValueFilterHandler
+    private val attributeValueFilterHandler: AttributeValueFilterHandler,
 ) : IdentifiableHandlerImpl<TrackedEntityInstanceFilter>(trackedEntityInstanceFilterStore) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<TrackedEntityInstanceFilter>
+        oCollection: Collection<TrackedEntityInstanceFilter>,
     ): Collection<TrackedEntityInstanceFilter> {
         store.delete()
         return super.beforeCollectionHandled(oCollection)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
index 8473c44ce9..b776437be5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTable
 
 @Suppress("MagicNumber")
 internal class TrackedEntityInstanceFilterStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityInstanceFilterStore,
     IdentifiableObjectStoreImpl<TrackedEntityInstanceFilter>(
         databaseAdapter,
         TrackedEntityInstanceFilterTableInfo.TABLE_INFO,
         BINDER,
-        { TrackedEntityInstanceFilter.create(it) }
+        { TrackedEntityInstanceFilter.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
index dd487ea709..9fa6ad4e75 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import android.util.Log
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -44,6 +43,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerHandler
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceHandler @Inject constructor(
@@ -55,22 +55,22 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
     private val enrollmentHandler: EnrollmentHandler,
     private val programOwnerHandler: ProgramOwnerHandler,
     private val enrollmentOrphanCleaner: TrackedEntityEnrollmentOrphanCleaner,
-    private val relationshipOrphanCleaner: TEIRelationshipOrphanCleaner
+    private val relationshipOrphanCleaner: TEIRelationshipOrphanCleaner,
 ) : IdentifiableDataHandlerImpl<TrackedEntityInstance>(
     trackedEntityInstanceStore,
     relationshipVersionManager,
-    relationshipHandler
+    relationshipHandler,
 ) {
     override fun beforeObjectHandled(
         o: TrackedEntityInstance,
-        params: IdentifiableDataHandlerParams
+        params: IdentifiableDataHandlerParams,
     ): TrackedEntityInstance {
         return if (GeometryHelper.isValid(o.geometry())) {
             o
         } else {
             Log.i(
                 this.javaClass.simpleName,
-                "TrackedEntityInstance " + o.uid() + " has invalid geometry value"
+                "TrackedEntityInstance " + o.uid() + " has invalid geometry value",
             )
             o.toBuilder().geometry(null).build()
         }
@@ -80,11 +80,11 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
         o: TrackedEntityInstance,
         action: HandleAction?,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ) {
         if (action !== HandleAction.Delete) {
             trackedEntityAttributeValueHandler.handleMany(
-                o.trackedEntityAttributeValues()
+                o.trackedEntityAttributeValues(),
             ) { value: TrackedEntityAttributeValue ->
                 value.toBuilder().trackedEntityInstance(o.uid()).build()
             }
@@ -100,7 +100,7 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
                 val thisParams = IdentifiableDataHandlerParams(
                     hasAllAttributes = false,
                     params.overwrite,
-                    asRelationship = false
+                    asRelationship = false,
                 )
                 enrollmentHandler.handleMany(enrollments, thisParams, relatives)
                 enrollmentOrphanCleaner.deleteOrphan(o, enrollments, params.program)
@@ -134,7 +134,7 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
                     trackedEntityAttributeValueStore.deleteByInstanceAndNotInProgramAttributes(
                         tei.uid(),
                         attributeUids,
-                        params.program
+                        params.program,
                     )
                 }
                 else -> {
@@ -145,7 +145,7 @@ internal class TrackedEntityInstanceHandler @Inject constructor(
                         trackedEntityInstanceUid = tei.uid(),
                         trackedEntityAttributeUids = attributeUids,
                         teiType = tei.trackedEntityType()!!,
-                        programs = programs
+                        programs = programs,
                     )
                 }
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt
index cd94ae2850..0cf49c13e7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
@@ -48,6 +46,8 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
@@ -59,7 +59,7 @@ internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
     private val dataStatePropagator: DataStatePropagator,
     private val relationshipDHISVersionManager: RelationshipDHISVersionManager,
     private val relationshipRepository: RelationshipCollectionRepository,
-    private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore
+    private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
 ) {
 
     private val alreadyDeletedInServerRegex =
@@ -68,7 +68,7 @@ internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
     @Suppress("NestedBlockDepth")
     fun handleTrackedEntityInstanceImportSummaries(
         teiImportSummaries: List<TEIImportSummary?>?,
-        instances: List<TrackedEntityInstance>
+        instances: List<TrackedEntityInstance>,
     ): TEIWebResponseHandlerSummary {
         val summary = TEIWebResponseHandlerSummary()
         val processedTeis = mutableListOf<String>()
@@ -118,14 +118,14 @@ internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
     private fun handleEnrollmentImportSummaries(
         teiImportSummary: TEIImportSummary,
         instances: List<TrackedEntityInstance>,
-        teiState: State
+        teiState: State,
     ): TEIWebResponseHandlerSummary {
         return teiImportSummary.enrollments()?.importSummaries()?.let { importSummaries ->
             val teiUid = teiImportSummary.reference()
             enrollmentImportHandler.handleEnrollmentImportSummary(
                 importSummaries,
                 getEnrollments(teiUid, instances),
-                teiState
+                teiState,
             )
         } ?: TEIWebResponseHandlerSummary()
     }
@@ -138,13 +138,13 @@ internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
                     .conflict(teiImportSummary.description())
                     .displayDescription(teiImportSummary.description())
                     .value(teiImportSummary.reference())
-                    .build()
+                    .build(),
             )
         }
         teiImportSummary.conflicts()?.forEach { importConflict ->
             trackerImportConflicts.add(
                 trackerImportConflictParser
-                    .getTrackedEntityInstanceConflict(importConflict, getConflictBuilder(teiImportSummary))
+                    .getTrackedEntityInstanceConflict(importConflict, getConflictBuilder(teiImportSummary)),
             )
         }
 
@@ -164,7 +164,7 @@ internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
 
     private fun processIgnoredTEIs(
         processedTEIs: List<String>,
-        instances: List<TrackedEntityInstance>
+        instances: List<TrackedEntityInstance>,
     ): List<TrackedEntityInstance> {
         return instances.filterNot { processedTEIs.contains(it.uid()) }.onEach { instance ->
             trackerImportConflictStore.deleteTrackedEntityConflicts(instance.uid())
@@ -182,7 +182,7 @@ internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
 
     private fun getEnrollments(
         trackedEntityInstanceUid: String?,
-        instances: List<TrackedEntityInstance>
+        instances: List<TrackedEntityInstance>,
     ): List<Enrollment> {
         return instances.find { it.uid() == trackedEntityInstanceUid }?.let {
             TrackedEntityInstanceInternalAccessor.accessEnrollments(it)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
index 5ed8364d09..385ca3e9bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceLastUpdatedManager @Inject constructor(
     store: TrackedEntityInstanceSyncStore,
-    private val resourceHandler: ResourceHandler
+    private val resourceHandler: ResourceHandler,
 ) : TrackerSyncLastUpdatedManager<TrackedEntityInstanceSync>(store) {
 
     fun update(trackerQuery: TrackerQueryBundle) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
index 81acca8744..f6d1c88835 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
@@ -29,22 +29,22 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstancePersistenceCallFactory @Inject constructor(
     private val trackedEntityInstanceHandler: TrackedEntityInstanceHandler,
     private val uidsHelper: TrackedEntityInstanceUidHelper,
-    private val organisationUnitDownloader: OrganisationUnitModuleDownloader
+    private val organisationUnitDownloader: OrganisationUnitModuleDownloader,
 ) {
     fun persistTEIs(
         trackedEntityInstances: List<TrackedEntityInstance>,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): Completable {
         return persistTEIsInternal(trackedEntityInstances, params, relatives)
     }
@@ -53,7 +53,7 @@ internal class TrackedEntityInstancePersistenceCallFactory @Inject constructor(
         val params = IdentifiableDataHandlerParams(
             hasAllAttributes = false,
             overwrite = false,
-            asRelationship = true
+            asRelationship = true,
         )
         return persistTEIsInternal(trackedEntityInstances, params, relatives = null)
     }
@@ -61,13 +61,13 @@ internal class TrackedEntityInstancePersistenceCallFactory @Inject constructor(
     private fun persistTEIsInternal(
         trackedEntityInstances: List<TrackedEntityInstance>,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives?
+        relatives: RelationshipItemRelatives?,
     ): Completable {
         return Completable.defer {
             trackedEntityInstanceHandler.handleMany(
                 trackedEntityInstances,
                 params,
-                relatives
+                relatives,
             )
             if (uidsHelper.hasMissingOrganisationUnitUids(trackedEntityInstances)) {
                 organisationUnitDownloader.refreshOrganisationUnits()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
index 705ad4812b..b41daf91f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
@@ -29,18 +29,18 @@ package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterPostCall
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstancePostParentCall @Inject internal constructor(
     private val oldTrackerImporterCall: OldTrackerImporterPostCall,
     private val trackerImporterCall: TrackerImporterPostCall,
-    private val trackerParentCallHelper: TrackerPostParentCallHelper
+    private val trackerParentCallHelper: TrackerPostParentCallHelper,
 ) {
 
     fun uploadTrackedEntityInstances(trackedEntityInstances: List<TrackedEntityInstance>): Observable<D2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
index 875f79a630..4e72c9af86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import java.util.Date
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceProjectionTransformer @Inject constructor() :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
index 1b571383c2..e43f059bab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceService.kt
@@ -40,7 +40,7 @@ internal interface TrackedEntityInstanceService {
     @POST(TRACKED_ENTITY_INSTANCES)
     suspend fun postTrackedEntityInstances(
         @Body trackedEntityInstances: TrackedEntityInstancePayload?,
-        @Query(STRATEGY) strategy: String?
+        @Query(STRATEGY) strategy: String?,
     ): TEIWebResponse
 
     @GET(TRACKED_ENTITY_INSTANCES)
@@ -49,7 +49,7 @@ internal interface TrackedEntityInstanceService {
         @Query(OU_MODE) orgUnitMode: String?,
         @Query(FIELDS) @Which fields: Fields<TrackedEntityInstance>,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean
+        @Query(INCLUDE_DELETED) includeDeleted: Boolean,
     ): Payload<TrackedEntityInstance>
 
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTACE}")
@@ -61,7 +61,7 @@ internal interface TrackedEntityInstanceService {
         @Query(PROGRAM_START_DATE) programStartDate: String?,
         @Query(FIELDS) @Which fields: Fields<TrackedEntityInstance>,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean
+        @Query(INCLUDE_DELETED) includeDeleted: Boolean,
     ): TrackedEntityInstance
 
     @GET(TRACKED_ENTITY_INSTANCES)
@@ -79,7 +79,7 @@ internal interface TrackedEntityInstanceService {
         @Query(PAGE_SIZE) pageSize: Int,
         @Query(LAST_UPDATED_START_DATE) lastUpdatedStartDate: String?,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean
+        @Query(INCLUDE_DELETED) includeDeleted: Boolean,
     ): Payload<TrackedEntityInstance>
 
     @GET("$TRACKED_ENTITY_INSTANCES/query")
@@ -107,7 +107,7 @@ internal interface TrackedEntityInstanceService {
         @Query(ORDER) order: String?,
         @Query(PAGING) paging: Boolean,
         @Query(PAGE) page: Int,
-        @Query(PAGE_SIZE) pageSize: Int
+        @Query(PAGE_SIZE) pageSize: Int,
     ): SearchGrid
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
index cbcd6b8a01..297e8fd099 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
@@ -42,13 +42,13 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
 
 internal class TrackedEntityInstanceStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityInstanceStore,
     IdentifiableDeletableDataObjectStoreImpl<TrackedEntityInstance>(
         databaseAdapter,
         TrackedEntityInstanceTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> TrackedEntityInstance.create(cursor) }
+        { cursor: Cursor -> TrackedEntityInstance.create(cursor) },
     ) {
     override fun queryTrackedEntityInstancesToSync(): List<TrackedEntityInstance> {
         val uploadableStatesString = uploadableStatesIncludingError().map { it.name }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
index c6e32373ea..31b4352c41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 
 internal class TrackedEntityInstanceSyncStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityInstanceSyncStore,
     ObjectWithoutUidStoreImpl<TrackedEntityInstanceSync>(
         databaseAdapter,
@@ -43,7 +43,7 @@ internal class TrackedEntityInstanceSyncStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         DELETE_UPDATE_BINDER,
-        { cursor: Cursor -> TrackedEntityInstanceSync.create(cursor) }
+        { cursor: Cursor -> TrackedEntityInstanceSync.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
index 92b10c4b13..998088e316 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
@@ -28,27 +28,27 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceUidHelperImpl @Inject constructor(
-    private val organisationUnitStore: OrganisationUnitStore
+    private val organisationUnitStore: OrganisationUnitStore,
 ) : TrackedEntityInstanceUidHelper {
 
     override fun hasMissingOrganisationUnitUids(
-        trackedEntityInstances: Collection<TrackedEntityInstance>
+        trackedEntityInstances: Collection<TrackedEntityInstance>,
     ): Boolean {
         return getMissingOrganisationUnitUids(trackedEntityInstances).isNotEmpty()
     }
 
     override fun getMissingOrganisationUnitUids(
-        trackedEntityInstances: Collection<TrackedEntityInstance>
+        trackedEntityInstances: Collection<TrackedEntityInstance>,
     ): Set<String> {
         val uids = trackedEntityInstances.flatMap {
             val enrollments = TrackedEntityInstanceInternalAccessor.accessEnrollments(it)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
index 54203cdbde..38ea3888a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipManager
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -48,7 +48,7 @@ internal class TrackedEntityModuleImpl @Inject constructor(
     private val trackedEntityInstanceDownloader: TrackedEntityInstanceDownloader,
     private val trackedEntityInstanceQuery: TrackedEntityInstanceQueryCollectionRepository,
     private val trackedEntityInstanceService: TrackedEntityInstanceService,
-    private val ownershipManager: OwnershipManager
+    private val ownershipManager: OwnershipManager,
 ) : TrackedEntityModule {
 
     override fun trackedEntityTypes(): TrackedEntityTypeCollectionRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt
index 5d07a100fe..6da04f7699 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityModuleWiper @Inject constructor(private val tableWiper: TableWiper) : ModuleWiper {
@@ -42,7 +42,7 @@ internal class TrackedEntityModuleWiper @Inject constructor(private val tableWip
             TrackedEntityAttributeTableInfo.TABLE_INFO,
             TrackedEntityTypeTableInfo.TABLE_INFO,
             TrackedEntityInstanceFilterTableInfo.TABLE_INFO,
-            TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO
+            TrackedEntityInstanceEventFilterTableInfo.TABLE_INFO,
         )
     }
 
@@ -52,7 +52,7 @@ internal class TrackedEntityModuleWiper @Inject constructor(private val tableWip
             TrackedEntityInstanceSyncTableInfo.TABLE_INFO,
             TrackedEntityDataValueTableInfo.TABLE_INFO,
             TrackedEntityAttributeValueTableInfo.TABLE_INFO,
-            TrackedEntityAttributeReservedValueTableInfo.TABLE_INFO
+            TrackedEntityAttributeReservedValueTableInfo.TABLE_INFO,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt
index 08b64eebc8..c9ceab7d2a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeChildrenAppender.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 
 internal class TrackedEntityTypeAttributeChildrenAppender private constructor(
-    private val childStore: SingleParentChildStore<TrackedEntityType, TrackedEntityTypeAttribute>
+    private val childStore: SingleParentChildStore<TrackedEntityType, TrackedEntityTypeAttribute>,
 ) : ChildrenAppender<TrackedEntityType>() {
     override fun appendChildren(m: TrackedEntityType): TrackedEntityType {
         val builder = m.toBuilder()
@@ -49,8 +49,8 @@ internal class TrackedEntityTypeAttributeChildrenAppender private constructor(
             return TrackedEntityTypeAttributeChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    TrackedEntityTypeAttributeStoreImpl.CHILD_PROJECTION
-                ) { cursor: Cursor -> TrackedEntityTypeAttribute.create(cursor) }
+                    TrackedEntityTypeAttributeStoreImpl.CHILD_PROJECTION,
+                ) { cursor: Cursor -> TrackedEntityTypeAttribute.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
index 1ccfe8c7b3..a7efe07aaa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityTypeAttributeHandler @Inject constructor(
-    store: TrackedEntityTypeAttributeStore
+    store: TrackedEntityTypeAttributeStore,
 ) : OrderedLinkHandlerImpl<TrackedEntityTypeAttribute, TrackedEntityTypeAttribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
index c54c38482b..96a041c939 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
@@ -37,14 +37,14 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo
 
 internal class TrackedEntityTypeAttributeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityTypeAttributeStore,
     LinkStoreImpl<TrackedEntityTypeAttribute>(
         databaseAdapter,
         TrackedEntityTypeAttributeTableInfo.TABLE_INFO,
         TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE,
         BINDER,
-        { cursor: Cursor -> TrackedEntityTypeAttribute.create(cursor) }
+        { cursor: Cursor -> TrackedEntityTypeAttribute.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: TrackedEntityTypeAttribute, w: StatementWrapper ->
@@ -57,7 +57,7 @@ internal class TrackedEntityTypeAttributeStoreImpl(
         }
         val CHILD_PROJECTION = SingleParentChildProjection(
             TrackedEntityTypeAttributeTableInfo.TABLE_INFO,
-            TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE
+            TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
index 3a09a4399d..987e7d4a23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityTypeCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<TrackedEntityType>(
     tableName = TrackedEntityTypeTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
index 947a684ea1..184b696996 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
@@ -47,7 +47,7 @@ internal class TrackedEntityTypeEntityDIModule {
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<TrackedEntityType>> {
         return mapOf(
             TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES to
-                TrackedEntityTypeAttributeChildrenAppender.create(databaseAdapter)
+                TrackedEntityTypeAttributeChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
index 20fcb38606..ab11a31417 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
@@ -28,22 +28,22 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityTypeHandler @Inject constructor(
     trackedEntityTypeStore: TrackedEntityTypeStore,
     private val attributeHandler: TrackedEntityTypeAttributeHandler,
-    private val collectionCleaner: TrackedEntityTypeCollectionCleaner
+    private val collectionCleaner: TrackedEntityTypeCollectionCleaner,
 ) : IdentifiableHandlerImpl<TrackedEntityType>(trackedEntityTypeStore) {
     override fun afterObjectHandled(o: TrackedEntityType, action: HandleAction) {
         attributeHandler.handleMany(
             o.uid(),
-            o.trackedEntityTypeAttributes()
+            o.trackedEntityTypeAttributes(),
         ) { trackedEntityTypeAttribute: TrackedEntityTypeAttribute, sortOrder: Int? ->
             trackedEntityTypeAttribute.toBuilder().sortOrder(sortOrder).build()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
index c9a51782c3..d02d5daa6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
 
 @Suppress("MagicNumber")
 internal class TrackedEntityTypeStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityTypeStore,
     IdentifiableObjectStoreImpl<TrackedEntityType>(
         databaseAdapter,
         TrackedEntityTypeTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> TrackedEntityType.create(cursor) }
+        { cursor: Cursor -> TrackedEntityType.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt
index 9199b500e3..baf97a3cdb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentEndpointCallFactory
 import org.hisp.dhis.android.core.enrollment.internal.NewEnrollmentEndpointCallFactory
 import org.hisp.dhis.android.core.enrollment.internal.OldEnrollmentEndpointCallFactory
@@ -36,6 +35,7 @@ import org.hisp.dhis.android.core.event.internal.EventEndpointCallFactory
 import org.hisp.dhis.android.core.event.internal.NewEventEndpointCallFactory
 import org.hisp.dhis.android.core.event.internal.OldEventEndpointCallFactory
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerParentCallFactory @Inject constructor(
@@ -45,7 +45,7 @@ internal class TrackerParentCallFactory @Inject constructor(
     private val newEnrollmentEndpointCallFactory: NewEnrollmentEndpointCallFactory,
     private val oldEventEndpointCallFactory: OldEventEndpointCallFactory,
     private val newEventEndpointCallFactory: NewEventEndpointCallFactory,
-    private val trackerParentCallHelper: TrackerPostParentCallHelper
+    private val trackerParentCallHelper: TrackerPostParentCallHelper,
 ) {
 
     fun getTrackedEntityCall(): TrackedEntityEndpointCallFactory {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
index 243d0c9176..ecf347894a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
@@ -39,6 +38,7 @@ import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerPostStateManager @Inject internal constructor(
@@ -47,14 +47,14 @@ internal class TrackerPostStateManager @Inject internal constructor(
     private val eventStore: EventStore,
     private val relationshipStore: RelationshipStore,
     private val fileResourceStore: FileResourceStore,
-    private val h: StatePersistorHelper
+    private val h: StatePersistorHelper,
 ) {
 
     fun restorePayloadStates(
         trackedEntityInstances: List<TrackedEntityInstance> = emptyList(),
         events: List<Event> = emptyList(),
         relationships: List<Relationship> = emptyList(),
-        fileResources: List<String> = emptyList()
+        fileResources: List<String> = emptyList(),
     ) {
         setPayloadStates(trackedEntityInstances, events, relationships, fileResources, null)
     }
@@ -65,7 +65,7 @@ internal class TrackerPostStateManager @Inject internal constructor(
         events: List<Event> = emptyList(),
         relationships: List<Relationship> = emptyList(),
         fileResources: List<String> = emptyList(),
-        forcedState: State?
+        forcedState: State?,
     ) {
         val teiMap: MutableMap<State, MutableList<String>> = mutableMapOf()
         val enrollmentMap: MutableMap<State, MutableList<String>> = mutableMapOf()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
index a80272d192..eaf0c47e64 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerQueryBundleFactory @Inject constructor(
     programStore: ProgramStore,
     programSettingsObjectRepository: ProgramSettingsObjectRepository,
     lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager,
-    commonHelper: TrackerQueryFactoryCommonHelper
+    commonHelper: TrackerQueryFactoryCommonHelper,
 ) : TrackerQueryFactory<TrackerQueryBundle, TrackedEntityInstanceSync>(
     programStore,
     programSettingsObjectRepository,
@@ -48,7 +48,8 @@ internal class TrackerQueryBundleFactory @Inject constructor(
     commonHelper,
     ProgramType.WITH_REGISTRATION,
     { params: ProgramDataDownloadParams,
-        programSettings: ProgramSettings? ->
+            programSettings: ProgramSettings?,
+        ->
         TrackerQueryBundleInternalFactory(commonHelper, params, programSettings)
-    }
+    },
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt
index 99bb56a2bc..5b61f560f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleInternalFactory.kt
@@ -35,18 +35,18 @@ import org.hisp.dhis.android.core.settings.ProgramSettings
 internal class TrackerQueryBundleInternalFactory constructor(
     commonHelper: TrackerQueryFactoryCommonHelper,
     params: ProgramDataDownloadParams,
-    programSettings: ProgramSettings?
+    programSettings: ProgramSettings?,
 ) : TrackerQueryInternalFactory<TrackerQueryBundle>(commonHelper, params, programSettings) {
 
     override fun queryInternal(
         programs: List<String>,
         programUid: String?,
-        orgUnitByLimitExtractor: () -> List<String>
+        orgUnitByLimitExtractor: () -> List<String>,
     ): List<TrackerQueryBundle> {
         val limit = commonHelper.getLimit(
             params,
             programSettings,
-            programUid
+            programUid,
         ) { it?.teiDownload() }
         if (limit == 0 || programs.isEmpty()) {
             return emptyList()
@@ -57,7 +57,7 @@ internal class TrackerQueryBundleInternalFactory constructor(
             programs,
             programUid,
             limit,
-            orgUnitByLimitExtractor
+            orgUnitByLimitExtractor,
         ) { it?.enrollmentDateDownload() }
 
         val programStatus = getProgramStatus(params, programSettings, programUid)
@@ -68,7 +68,7 @@ internal class TrackerQueryBundleInternalFactory constructor(
 
         return commonHelper.divideByOrgUnits(
             commonParams.orgUnitsBeforeDivision,
-            commonParams.hasLimitByOrgUnit
+            commonParams.hasLimitByOrgUnit,
         ) { builder.orgUnits(it).build() }
     }
 
@@ -76,7 +76,7 @@ internal class TrackerQueryBundleInternalFactory constructor(
     private fun getProgramStatus(
         params: ProgramDataDownloadParams,
         programSettings: ProgramSettings?,
-        programUid: String?
+        programUid: String?,
     ): EnrollmentStatus? {
         if (params.programStatus() != null &&
             (commonHelper.isGlobal(params, programUid) || commonHelper.isUserDefinedProgram(params, programUid))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParams.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParams.kt
index aa16f84786..e77a64e508 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParams.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParams.kt
@@ -37,5 +37,5 @@ internal data class TrackerQueryCommonParams(
     val hasLimitByOrgUnit: Boolean,
     val ouMode: OrganisationUnitMode,
     val orgUnitsBeforeDivision: List<String>,
-    val limit: Int
+    val limit: Int,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt
index e507b182cf..488261a4f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactory.kt
@@ -42,8 +42,8 @@ internal abstract class TrackerQueryFactory<T, S : TrackerBaseSync> constructor(
     private val programType: ProgramType,
     private val internalFactoryCreator: (
         params: ProgramDataDownloadParams,
-        programSettings: ProgramSettings?
-    ) -> TrackerQueryInternalFactory<T>
+        programSettings: ProgramSettings?,
+    ) -> TrackerQueryInternalFactory<T>,
 ) {
 
     @Suppress("NestedBlockDepth")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
index a30936c1cf..99ef96a049 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -42,12 +40,14 @@ import org.hisp.dhis.android.core.settings.LimitScope
 import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import java.util.*
+import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
 @Reusable
 internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
-    private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore
+    private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore,
 ) {
 
     private fun getRootCaptureOrgUnitUids(): List<String> {
@@ -71,7 +71,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     private fun getOrganisationUnits(
         params: ProgramDataDownloadParams,
         hasLimitByOrgUnit: Boolean,
-        byLimitExtractor: () -> List<String>
+        byLimitExtractor: () -> List<String>,
     ): Pair<OrganisationUnitMode, List<String>> {
         return when {
             params.orgUnits().size > 0 ->
@@ -89,7 +89,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     fun hasLimitByOrgUnit(
         params: ProgramDataDownloadParams,
         programSettings: ProgramSettings?,
-        programUid: String?
+        programUid: String?,
     ): Boolean {
         if (params.limitByOrgunit() != null) {
             return params.limitByOrgunit()!!
@@ -116,7 +116,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
         params: ProgramDataDownloadParams,
         programSettings: ProgramSettings?,
         programUid: String?,
-        downloadExtractor: (ProgramSetting?) -> Int?
+        downloadExtractor: (ProgramSetting?) -> Int?,
     ): Int {
         val configLimit = getConfigLimit(params, programSettings, programUid, downloadExtractor)
 
@@ -132,7 +132,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
         params: ProgramDataDownloadParams,
         programSettings: ProgramSettings?,
         programUid: String?,
-        downloadExtractor: (ProgramSetting?) -> Int?
+        downloadExtractor: (ProgramSetting?) -> Int?,
     ): Int {
         if (params.limit() != null) {
             when {
@@ -140,7 +140,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
                     val download = params.limit()!! - specificEvents(
                         params,
                         programSettings,
-                        downloadExtractor
+                        downloadExtractor,
                     )
                     return if (download > 0) download else 0
                 }
@@ -170,7 +170,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     private fun specificEvents(
         params: ProgramDataDownloadParams,
         programSettings: ProgramSettings?,
-        downloadExtractor: (ProgramSetting?) -> Int?
+        downloadExtractor: (ProgramSetting?) -> Int?,
     ): Int {
         return programSettings?.specificSettings()?.map { settings ->
             val scope = settings.value.settingDownload()
@@ -207,7 +207,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     fun <O> divideByOrgUnits(
         orgUnits: List<String>,
         hasLimitByOrgUnit: Boolean,
-        builder: (List<String>) -> O
+        builder: (List<String>) -> O,
     ): List<O> {
         return if (hasLimitByOrgUnit && orgUnits.isNotEmpty()) {
             orgUnits.map { builder.invoke(listOf(it)) }
@@ -219,7 +219,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
     private fun getStartDate(
         programSettings: ProgramSettings?,
         programUid: String?,
-        downloadPeriodAccessor: (ProgramSetting?) -> DownloadPeriod?
+        downloadPeriodAccessor: (ProgramSetting?) -> DownloadPeriod?,
     ): String? {
         var period: DownloadPeriod? = null
         if (programSettings != null) {
@@ -247,13 +247,13 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
         programUid: String?,
         limit: Int,
         orgUnitByLimitExtractor: () -> List<String>,
-        periodExtractor: (ProgramSetting?) -> DownloadPeriod?
+        periodExtractor: (ProgramSetting?) -> DownloadPeriod?,
     ): TrackerQueryCommonParams {
         val hasLimitByOrgUnit = hasLimitByOrgUnit(params, programSettings, programUid)
         val (ouMode, orgUnits) = getOrganisationUnits(
             params,
             hasLimitByOrgUnit,
-            orgUnitByLimitExtractor
+            orgUnitByLimitExtractor,
         )
 
         return TrackerQueryCommonParams(
@@ -264,7 +264,7 @@ internal class TrackerQueryFactoryCommonHelper @Inject constructor(
             hasLimitByOrgUnit,
             ouMode,
             orgUnits,
-            limit
+            limit,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryInternalFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryInternalFactory.kt
index 136eaa11e2..92bc1fd99c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryInternalFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryInternalFactory.kt
@@ -33,11 +33,11 @@ import org.hisp.dhis.android.core.settings.ProgramSettings
 internal abstract class TrackerQueryInternalFactory<T>(
     protected val commonHelper: TrackerQueryFactoryCommonHelper,
     protected val params: ProgramDataDownloadParams,
-    protected val programSettings: ProgramSettings?
+    protected val programSettings: ProgramSettings?,
 ) {
 
     fun queryGlobal(
-        programs: List<String>
+        programs: List<String>,
     ): List<T> {
         return queryInternal(programs, null) {
             commonHelper.getCaptureOrgUnitUids()
@@ -45,7 +45,7 @@ internal abstract class TrackerQueryInternalFactory<T>(
     }
 
     fun queryPerProgram(
-        programUid: String?
+        programUid: String?,
     ): List<T> {
         return queryInternal(listOf(programUid!!), programUid) {
             commonHelper.getLinkedCaptureOrgUnitUids(programUid)
@@ -55,6 +55,6 @@ internal abstract class TrackerQueryInternalFactory<T>(
     protected abstract fun queryInternal(
         programs: List<String>,
         programUid: String?,
-        orgUnitByLimitExtractor: () -> List<String>
+        orgUnitByLimitExtractor: () -> List<String>,
     ): List<T>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt
index caa75c1d80..4b3229bdcb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerSyncLastUpdatedManager.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import java.util.Date
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
@@ -37,6 +36,7 @@ import org.hisp.dhis.android.core.settings.DownloadPeriod
 import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSyncTableInfo.Columns
+import java.util.Date
 
 internal open class TrackerSyncLastUpdatedManager<S : TrackerBaseSync>(private val store: ObjectWithoutUidStore<S>) {
     private lateinit var syncMap: Map<Pair<String?, Int>, S>
@@ -106,7 +106,7 @@ internal open class TrackerSyncLastUpdatedManager<S : TrackerBaseSync>(private v
     fun update(sync: S) {
         val builder = WhereClauseBuilder().appendKeyNumberValue(
             Columns.ORGANISATION_UNIT_IDS_HASH,
-            sync.organisationUnitIdsHash()
+            sync.organisationUnitIdsHash(),
         )
         val finalBuilder =
             if (sync.program() == null) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
index ed9a7d320e..a98401b708 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
@@ -29,8 +29,6 @@
 package org.hisp.dhis.android.core.trackedentity.ownership
 
 import io.reactivex.Completable
-import java.util.*
-import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
@@ -42,13 +40,15 @@ import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import java.util.*
+import javax.inject.Inject
 
 internal class OwnershipManagerImpl @Inject constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val ownershipService: OwnershipService,
     private val dataStatePropagator: DataStatePropagator,
     private val programTempOwnerStore: ProgramTempOwnerStore,
-    private val programOwnerStore: ProgramOwnerStore
+    private val programOwnerStore: ProgramOwnerStore,
 ) : OwnershipManager {
 
     override fun breakGlass(trackedEntityInstance: String, program: String, reason: String): Completable {
@@ -69,7 +69,7 @@ internal class OwnershipManagerImpl @Inject constructor(
                             .reason(reason)
                             .created(Date())
                             .validUntil(getValidUntil())
-                            .build()
+                            .build(),
                     )
                 } else {
                     throw D2Error.builder()
@@ -87,7 +87,7 @@ internal class OwnershipManagerImpl @Inject constructor(
                     .errorDescription(e.errorDescription())
                     .httpErrorCode(e.httpErrorCode())
                     .build()
-            }
+            },
         )
     }
 
@@ -116,7 +116,7 @@ internal class OwnershipManagerImpl @Inject constructor(
         val mostRecent = programTempOwnerStore.selectWhere(
             filterWhereClause = whereClause,
             orderByClause = ProgramTempOwnerTableInfo.Columns.CREATED + " " + RepositoryScope.OrderByDirection.DESC,
-            limit = 1
+            limit = 1,
         )
 
         val previousReason = mostRecent.firstOrNull()?.reason() ?: "<Previous reason not found>"
@@ -128,7 +128,7 @@ internal class OwnershipManagerImpl @Inject constructor(
     private suspend fun postBreakGlass(
         trackedEntityInstance: String,
         program: String,
-        reason: String
+        reason: String,
     ): Result<HttpMessageResponse, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = true) {
             ownershipService.breakGlass(trackedEntityInstance, program, reason)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt
index 4b3926a541..7bd9e3f442 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipService.kt
@@ -38,14 +38,14 @@ internal interface OwnershipService {
     suspend fun breakGlass(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String,
         @Query(PROGRAM) program: String,
-        @Query(REASON) reason: String
+        @Query(REASON) reason: String,
     ): HttpMessageResponse
 
     @PUT("$OWNERSHIP_URL/transfer")
     suspend fun transfer(
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String,
         @Query(PROGRAM) program: String,
-        @Query(ORG_UNIT) ou: String
+        @Query(ORG_UNIT) ou: String,
     ): HttpMessageResponse
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
index 8d63e2f24b..7deef8994b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.trackedentity.ownership
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramOwnerHandler @Inject constructor(
-    store: ProgramOwnerStore
+    store: ProgramOwnerStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramOwner>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
index 33ba8a55f5..7a313e649b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.trackedentity.ownership
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import javax.inject.Inject
 
 @Reusable
 internal class ProgramOwnerPostCall @Inject constructor(
     private val ownershipService: OwnershipService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val programOwnerStore: ProgramOwnerStore,
-    private val dataStatePropagator: DataStatePropagator
+    private val dataStatePropagator: DataStatePropagator,
 ) {
 
     suspend fun uploadProgramOwner(programOwner: ProgramOwner) {
@@ -46,7 +46,7 @@ internal class ProgramOwnerPostCall @Inject constructor(
             ownershipService.transfer(
                 programOwner.trackedEntityInstance(),
                 programOwner.program(),
-                programOwner.ownerOrgUnit()
+                programOwner.ownerOrgUnit(),
             )
         }
 
@@ -57,13 +57,13 @@ internal class ProgramOwnerPostCall @Inject constructor(
                     val syncedProgramOwner = programOwner.toBuilder().syncState(State.SYNCED).build()
                     programOwnerStore.updateOrInsertWhere(syncedProgramOwner)
                     dataStatePropagator.refreshTrackedEntityInstanceAggregatedSyncState(
-                        programOwner.trackedEntityInstance()
+                        programOwner.trackedEntityInstance(),
                     )
                 }
             },
             onFailure = {
                 // TODO Create a record in TEI
-            }
+            },
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
index b9ca27d6ed..1d977f9cf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 
 @Suppress("MagicNumber")
 internal class ProgramOwnerStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramOwnerStore,
     ObjectWithoutUidStoreImpl<ProgramOwner>(
         databaseAdapter,
@@ -42,7 +42,7 @@ internal class ProgramOwnerStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { ProgramOwner.create(it) }
+        { ProgramOwner.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerTableInfo.kt
index fa8dec3b1f..291f31d4ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerTableInfo.kt
@@ -51,7 +51,7 @@ internal object ProgramOwnerTableInfo {
                 PROGRAM,
                 TRACKED_ENTITY_INSTANCE,
                 OWNER_ORGUNIT,
-                SYNC_STATE
+                SYNC_STATE,
             )
         }
 
@@ -59,7 +59,7 @@ internal object ProgramOwnerTableInfo {
             return CollectionsHelper.appendInNewArray(
                 super.all(),
                 PROGRAM,
-                TRACKED_ENTITY_INSTANCE
+                TRACKED_ENTITY_INSTANCE,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
index 6586af3c48..6e90876f0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 
 @Suppress("MagicNumber")
 internal class ProgramTempOwnerStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ProgramTempOwnerStore,
     ObjectWithoutUidStoreImpl<ProgramTempOwner>(
         databaseAdapter,
@@ -43,7 +43,7 @@ internal class ProgramTempOwnerStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { ProgramTempOwner.create(it) }
+        { ProgramTempOwner.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerTableInfo.kt
index 2fc6606da9..4721fc061d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerTableInfo.kt
@@ -51,7 +51,7 @@ internal object ProgramTempOwnerTableInfo {
                 TRACKED_ENTITY_INSTANCE,
                 CREATED,
                 VALID_UNTIL,
-                REASON
+                REASON,
             )
         }
 
@@ -60,7 +60,7 @@ internal object ProgramTempOwnerTableInfo {
                 super.all(),
                 PROGRAM,
                 TRACKED_ENTITY_INSTANCE,
-                CREATED
+                CREATED,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
index 580c6c6a36..3d25a0a8e7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
@@ -53,11 +51,13 @@ import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
 import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions")
 internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
-    private val dateFilterPeriodHelper: DateFilterPeriodHelper
+    private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
     private val teiAlias = "tei"
     private val enrollmentAlias = "en"
@@ -86,7 +86,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
     fun getUidsWhereClause(
         scope: TrackedEntityInstanceQueryRepositoryScope,
         excludeList: Set<String>?,
-        limit: Int
+        limit: Int,
     ): String {
         val selectSubQuery = getSqlQuery(scope, excludeList, limit, teiUid)
         return WhereClauseBuilder()
@@ -99,7 +99,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
         scope: TrackedEntityInstanceQueryRepositoryScope,
         excludeList: Set<String>?,
         limit: Int,
-        columns: String
+        columns: String,
     ): String {
         var queryStr = "SELECT DISTINCT $columns FROM ${TrackedEntityInstanceTableInfo.TABLE_INFO.name()} $teiAlias"
 
@@ -127,7 +127,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                     EventTableInfo.TABLE_INFO.name(),
                     eventAlias,
                     dot(enrollmentAlias, IdentifiableColumns.UID),
-                    dot(eventAlias, EventTableInfo.Columns.ENROLLMENT)
+                    dot(eventAlias, EventTableInfo.Columns.ENROLLMENT),
                 )
                 appendEventWhere(where, scope)
             }
@@ -146,7 +146,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                 OrganisationUnitTableInfo.TABLE_INFO.name(),
                 orgunitAlias,
                 joinOrgunitColum,
-                dot(orgunitAlias, IdentifiableColumns.UID)
+                dot(orgunitAlias, IdentifiableColumns.UID),
             )
             appendOrgunitWhere(where, scope)
         }
@@ -154,14 +154,14 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
         if (scope.trackedEntityType() != null) {
             where.appendKeyStringValue(
                 dot(teiAlias, TrackedEntityInstanceTableInfo.Columns.TRACKED_ENTITY_TYPE),
-                escapeQuotes(scope.trackedEntityType())
+                escapeQuotes(scope.trackedEntityType()),
             )
         }
 
         if (!scope.uids().isNullOrEmpty()) {
             where.appendInKeyStringValues(
                 dot(teiAlias, TrackedEntityInstanceTableInfo.Columns.UID),
-                scope.uids()
+                scope.uids(),
             )
         }
 
@@ -213,20 +213,20 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             appendDateFilter(
                 where = where,
                 column = dot(enrollmentAlias, enrollmentDate),
-                dateFilterPeriod = scope.programDate()!!
+                dateFilterPeriod = scope.programDate()!!,
             )
         }
         if (scope.incidentDate() != null) {
             appendDateFilter(
                 where = where,
                 column = dot(enrollmentAlias, incidentDate),
-                dateFilterPeriod = scope.incidentDate()!!
+                dateFilterPeriod = scope.incidentDate()!!,
             )
         }
         if (scope.enrollmentStatus() != null) {
             where.appendInKeyEnumValues(
                 dot(enrollmentAlias, EnrollmentTableInfo.Columns.STATUS),
-                scope.enrollmentStatus()
+                scope.enrollmentStatus(),
             )
         }
         if (!scope.includeDeleted()) {
@@ -271,7 +271,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                 "EXISTS($ownerOrguitIsInCaptureScope) " +
                 "OR " +
                 "EXISTS($hasAnyNotExpiredOwnershipRecord)" +
-                ") ELSE 1 END "
+                ") ELSE 1 END ",
         )
     }
 
@@ -298,13 +298,13 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             OrganisationUnitMode.DESCENDANTS -> scope.orgUnits().forEach { orgUnit ->
                 inner.appendOrKeyLikeStringValue(
                     dot(orgunitAlias, OrganisationUnitTableInfo.Columns.PATH),
-                    "%" + escapeQuotes(orgUnit) + "%"
+                    "%" + escapeQuotes(orgUnit) + "%",
                 )
             }
             OrganisationUnitMode.CHILDREN -> scope.orgUnits().forEach { orgUnit ->
                 inner.appendOrKeyStringValue(
                     dot(orgunitAlias, OrganisationUnitTableInfo.Columns.PARENT),
-                    escapeQuotes(orgUnit)
+                    escapeQuotes(orgUnit),
                 )
 
                 // TODO Include orgunit?
@@ -318,8 +318,8 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                         UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
                         UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
                         UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                        OrganisationUnit.Scope.SCOPE_DATA_CAPTURE.name
-                    )
+                        OrganisationUnit.Scope.SCOPE_DATA_CAPTURE.name,
+                    ),
                 )
             OrganisationUnitMode.SELECTED -> scope.orgUnits().forEach { orgUnit ->
                 inner.appendOrKeyStringValue(dot(orgunitAlias, IdentifiableColumns.UID), escapeQuotes(orgUnit))
@@ -351,7 +351,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                     dot(teiAlias, IdentifiableColumns.UID),
                     dot(teavAlias, TrackedEntityAttributeValueTableInfo.Columns.VALUE),
                     query.operator().sqlOperator,
-                    valueStr
+                    valueStr,
                 )
 
                 where.appendExistsSubQuery(sub)
@@ -368,7 +368,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                 dot(teavAlias, trackedEntityAttribute), escapeQuotes(item.key()),
                 dot(teavAlias, TrackedEntityAttributeValueTableInfo.Columns.VALUE),
                 item.operator().sqlOperator,
-                getFilterItemValueStr(item)
+                getFilterItemValueStr(item),
             )
 
             where.appendExistsSubQuery(sub)
@@ -391,7 +391,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             eventCreatedDate = scope.eventCreatedDate(),
             eventStatusList = scope.eventStatus(),
             eventDate = scope.eventDate(),
-            dueDate = scope.dueDate()
+            dueDate = scope.dueDate(),
         )
 
         val innerClause = WhereClauseBuilder()
@@ -421,7 +421,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             eventCreatedDate = null,
             eventStatusList = eventFilter.eventStatus(),
             eventDate = eventFilter.eventDate(),
-            dueDate = null
+            dueDate = null,
         )
 
         return if (innerClause.isEmpty) null else innerClause.build()
@@ -432,7 +432,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
         eventCreatedDate: DateFilterPeriod?,
         eventStatusList: List<EventStatus>?,
         eventDate: DateFilterPeriod?,
-        dueDate: DateFilterPeriod?
+        dueDate: DateFilterPeriod?,
     ) {
         if (eventStatusList == null) {
             appendEventDates(where, eventDate, EventTableInfo.Columns.EVENT_DATE)
@@ -448,7 +448,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                         appendEventDates(statusWhere, eventDate, EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendInKeyEnumValues(
                             dot(eventAlias, EventTableInfo.Columns.STATUS),
-                            listOf(EventStatus.ACTIVE, EventStatus.SCHEDULE, EventStatus.OVERDUE)
+                            listOf(EventStatus.ACTIVE, EventStatus.SCHEDULE, EventStatus.OVERDUE),
                         )
                     }
                     EventStatus.COMPLETED, EventStatus.VISITED -> {
@@ -460,11 +460,11 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                         statusWhere.appendIsNullValue(EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendInKeyEnumValues(
                             dot(eventAlias, EventTableInfo.Columns.STATUS),
-                            listOf(EventStatus.SCHEDULE, EventStatus.OVERDUE)
+                            listOf(EventStatus.SCHEDULE, EventStatus.OVERDUE),
                         )
                         statusWhere.appendKeyGreaterOrEqStringValue(
                             "date(${dot(eventAlias, EventTableInfo.Columns.DUE_DATE)})",
-                            nowStr
+                            nowStr,
                         )
                     }
                     EventStatus.OVERDUE -> {
@@ -472,11 +472,11 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                         statusWhere.appendIsNullValue(EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendInKeyEnumValues(
                             dot(eventAlias, EventTableInfo.Columns.STATUS),
-                            listOf(EventStatus.SCHEDULE, EventStatus.OVERDUE)
+                            listOf(EventStatus.SCHEDULE, EventStatus.OVERDUE),
                         )
                         statusWhere.appendKeyLessThanStringValue(
                             "date(${dot(eventAlias, EventTableInfo.Columns.DUE_DATE)})",
-                            nowStr
+                            nowStr,
                         )
                     }
                     EventStatus.SKIPPED -> {
@@ -495,13 +495,13 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
     private fun appendEventDates(
         where: WhereClauseBuilder,
         date: DateFilterPeriod?,
-        refDate: String
+        refDate: String,
     ) {
         if (date != null) {
             appendDateFilter(
                 where = where,
                 column = dot(eventAlias, refDate),
-                dateFilterPeriod = date
+                dateFilterPeriod = date,
             )
         }
     }
@@ -509,7 +509,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
     private fun appendDateFilter(
         where: WhereClauseBuilder,
         column: String,
-        dateFilterPeriod: DateFilterPeriod
+        dateFilterPeriod: DateFilterPeriod,
     ) {
         val dateColumnStr = "date($column)"
 
@@ -526,7 +526,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
 
     private fun appendAssignedUserMode(
         where: WhereClauseBuilder,
-        mode: AssignedUserMode
+        mode: AssignedUserMode,
     ) {
         val assignedUserColumn = dot(eventAlias, EventTableInfo.Columns.ASSIGNED_USER)
         when (mode) {
@@ -534,7 +534,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                 val subquery = String.format(
                     "(SELECT %s FROM %s LIMIT 1)",
                     AuthenticatedUserTableInfo.Columns.USER,
-                    AuthenticatedUserTableInfo.TABLE_INFO.name()
+                    AuthenticatedUserTableInfo.TABLE_INFO.name(),
                 )
                 where.appendKeyOperatorValue(assignedUserColumn, "IN", subquery)
             }
@@ -547,7 +547,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
 
     private fun appendDataValues(
         where: WhereClauseBuilder,
-        dataValues: List<RepositoryScopeFilterItem>
+        dataValues: List<RepositoryScopeFilterItem>,
     ) {
         dataValues
             .groupBy { it.key() }
@@ -611,7 +611,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                     orderByEnrollmentField(
                         scope.program(),
                         EnrollmentTableInfo.Columns.INCIDENT_DATE,
-                        item.direction()
+                        item.direction(),
                     )
 
                 TrackedEntityInstanceQueryScopeOrderColumn.Type.ENROLLMENT_STATUS ->
@@ -646,7 +646,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             dot(teiAlias, IdentifiableColumns.UID),
             programClause,
             EnrollmentTableInfo.Columns.ENROLLMENT_DATE,
-            dir.name
+            dir.name,
         )
     }
 
@@ -664,7 +664,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             dot(teiAlias, IdentifiableColumns.UID),
             programClause,
             EventTableInfo.Columns.EVENT_DATE, EventTableInfo.Columns.DUE_DATE,
-            dir.name
+            dir.name,
         )
     }
 
@@ -677,7 +677,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE,
             CollectionsHelper.withSingleQuotationMarks(item.column().value()),
             TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-            dot(teiAlias, IdentifiableColumns.UID)
+            dot(teiAlias, IdentifiableColumns.UID),
         )
         return "$attOrder ${item.direction().name}"
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineResult.kt
index ac9614528a..be653f917e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineResult.kt
@@ -34,5 +34,5 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 data class TrackedEntityInstanceOnlineResult(
     val items: List<Result<TrackedEntityInstance, D2Error>>,
-    val exhausted: Boolean
+    val exhausted: Boolean,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index 5eda2b0c04..ead7375fc0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import dagger.Reusable
-import java.text.ParseException
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventInternalAccessor
@@ -45,6 +43,8 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnlineHelper.Companion.toAPIFilterFormat
 import org.hisp.dhis.android.core.util.simpleDateFormat
+import java.text.ParseException
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
@@ -52,7 +52,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     private val eventService: EventService,
     private val mapper: SearchGridMapper,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
-    private val dhisVersionManager: DHISVersionManager
+    private val dhisVersionManager: DHISVersionManager,
 ) {
     suspend fun getCall(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
         return queryTrackedEntityInstances(query)
@@ -67,21 +67,21 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
             if (events.isEmpty()) {
                 TrackerQueryResult(
                     trackedEntities = emptyList(),
-                    exhausted = true
+                    exhausted = true,
                 )
             } else {
                 val teiQuery = getPostEventTeiQuery(query, events)
                 val instances = getTrackedEntityQuery(teiQuery)
                 TrackerQueryResult(
                     trackedEntities = instances,
-                    exhausted = events.size < query.pageSize
+                    exhausted = events.size < query.pageSize,
                 )
             }
         } else {
             val instances = getTrackedEntityQuery(query)
             TrackerQueryResult(
                 trackedEntities = instances,
-                exhausted = instances.size < query.pageSize
+                exhausted = instances.size < query.pageSize,
             )
         }
     }
@@ -98,7 +98,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
 
     private suspend fun getEventQueryForOrgunit(
         query: TrackedEntityInstanceQueryOnline,
-        orgunit: String?
+        orgunit: String?,
     ): List<Event> {
         return coroutineAPICallExecutor.wrap(storeError = false) {
             eventService.getEvents(
@@ -122,7 +122,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
                 page = query.page,
                 lastUpdatedStartDate = query.lastUpdatedStartDate.simpleDateFormat(),
                 lastUpdatedEndDate = query.lastUpdatedEndDate.simpleDateFormat(),
-                includeDeleted = query.includeDeleted
+                includeDeleted = query.includeDeleted,
             )
         }.getOrThrow().items()
     }
@@ -133,7 +133,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
         return try {
             coroutineAPICallExecutor.wrap(
                 storeError = false,
-                errorCatcher = TrackedEntityInstanceQueryErrorCatcher()
+                errorCatcher = TrackedEntityInstanceQueryErrorCatcher(),
             ) {
                 trackedEntityService.query(
                     trackedEntityInstance = uidsStr,
@@ -159,7 +159,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
                     order = query.order,
                     paging = query.paging,
                     pageSize = query.pageSize,
-                    page = query.page
+                    page = query.page,
                 )
             }.getOrThrow().let { mapper.transform(it) }
         } catch (pe: ParseException) {
@@ -193,7 +193,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     companion object {
         internal fun getPostEventTeiQuery(
             query: TrackedEntityInstanceQueryOnline,
-            events: List<Event>
+            events: List<Event>,
         ): TrackedEntityInstanceQueryOnline {
             return query.copy(
                 uids = events.mapNotNull { EventInternalAccessor.accessTrackedEntityInstance(it) }.distinct(),
@@ -203,7 +203,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
                 eventEndDate = null,
                 dueStartDate = null,
                 dueEndDate = null,
-                programStage = null
+                programStage = null,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 99edcc9353..4eba2aec64 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import kotlin.collections.HashSet
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -41,6 +40,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import kotlin.collections.HashSet
 
 internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val store: TrackedEntityInstanceStore,
@@ -49,7 +49,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper
+    private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
 ) {
     private val baseOnlineQueries: List<TrackedEntityInstanceQueryOnline> = onlineHelper.fromScope(scope)
     private val onlineQueryStatusMap: MutableMap<TrackedEntityInstanceQueryOnline, OnlineQueryStatus> = HashMap()
@@ -99,7 +99,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         val sqlQuery = localQueryHelper.getSqlQuery(
             scope,
             returnedUidsOffline,
-            requestedLoadSize
+            requestedLoadSize,
         )
         val instances = store.selectRawQuery(sqlQuery)
         returnedUidsOffline.addAll(instances.map { it.uid() })
@@ -124,7 +124,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
 
     private fun getOnlineQueryResults(
         baseOnlineQuery: TrackedEntityInstanceQueryOnline,
-        requestLoadSize: Int
+        requestLoadSize: Int,
     ): List<Result<TrackedEntityInstance, D2Error>> {
         val status = onlineQueryStatusMap[baseOnlineQuery]!!
         if (status.isExhausted) {
@@ -135,7 +135,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         val onlineQuery = baseOnlineQuery.copy(
             page = page,
             pageSize = requestLoadSize,
-            paging = true
+            paging = true,
         )
         val queryInstances = queryOnline(onlineQuery)
 
@@ -163,7 +163,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
     }
 
     private fun queryOnline(
-        onlineQuery: TrackedEntityInstanceQueryOnline
+        onlineQuery: TrackedEntityInstanceQueryOnline,
     ): TrackedEntityInstanceOnlineResult {
         return try {
             val cachedInstances = if (scope.allowOnlineCache()) onlineCache[onlineQuery] else null
@@ -175,14 +175,14 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
                 .let { result ->
                     TrackedEntityInstanceOnlineResult(
                         items = result.trackedEntities.map { Result.Success(it) },
-                        exhausted = result.exhausted
+                        exhausted = result.exhausted,
                     )
                 }
                 .also { onlineCache[onlineQuery] = it }
         } catch (e: D2Error) {
             TrackedEntityInstanceOnlineResult(
                 items = listOf(Result.Failure(e)),
-                exhausted = true
+                exhausted = true,
             )
         }
     }
@@ -193,9 +193,9 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
             childrenAppenders,
             ChildrenSelection(
                 setOf(
-                    TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES
-                )
-            )
+                    TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES,
+                ),
+            ),
         )
     }
 
@@ -206,5 +206,5 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
 
 private data class OnlineQueryStatus(
     var requestedItems: Int = 0,
-    var isExhausted: Boolean = false
+    var isExhausted: Boolean = false,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
index 4bc2ba80d3..cf00a37342 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
@@ -42,7 +42,7 @@ internal class TrackedEntityInstanceQueryDataSource constructor(
     childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
     onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    localQueryHelper: TrackedEntityInstanceLocalQueryHelper
+    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
 ) : ItemKeyedDataSource<TrackedEntityInstance, TrackedEntityInstance>() {
 
     private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
@@ -52,12 +52,12 @@ internal class TrackedEntityInstanceQueryDataSource constructor(
         childrenAppenders,
         onlineCache,
         onlineHelper,
-        localQueryHelper
+        localQueryHelper,
     )
 
     override fun loadInitial(
         params: LoadInitialParams<TrackedEntityInstance>,
-        callback: LoadInitialCallback<TrackedEntityInstance>
+        callback: LoadInitialCallback<TrackedEntityInstance>,
     ) {
         dataFetcher.refresh()
         callback.onResult(loadPages(params.requestedLoadSize))
@@ -65,14 +65,14 @@ internal class TrackedEntityInstanceQueryDataSource constructor(
 
     override fun loadAfter(
         params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance>
+        callback: LoadCallback<TrackedEntityInstance>,
     ) {
         callback.onResult(loadPages(params.requestedLoadSize))
     }
 
     override fun loadBefore(
         params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance>
+        callback: LoadCallback<TrackedEntityInstance>,
     ) {
         // do nothing
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
index 6f4281c3bd..e32bc07553 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
@@ -43,9 +43,11 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
     childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
     onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    localQueryHelper: TrackedEntityInstanceLocalQueryHelper
+    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
 ) : PageKeyedDataSource<
-    TrackedEntityInstance, Result<@JvmSuppressWildcards TrackedEntityInstance, @JvmSuppressWildcards D2Error>>() {
+    TrackedEntityInstance,
+    Result<@JvmSuppressWildcards TrackedEntityInstance, @JvmSuppressWildcards D2Error>,
+    >() {
 
     private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
         store,
@@ -54,12 +56,12 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
         childrenAppenders,
         onlineCache,
         onlineHelper,
-        localQueryHelper
+        localQueryHelper,
     )
 
     override fun loadInitial(
         params: LoadInitialParams<TrackedEntityInstance>,
-        callback: LoadInitialCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
+        callback: LoadInitialCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
     ) {
         dataFetcher.refresh()
         val result = loadPages(params.requestedLoadSize)
@@ -68,7 +70,7 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
 
     override fun loadAfter(
         params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
+        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
     ) {
         val result = loadPages(params.requestedLoadSize)
         callback.onResult(result, getKey(result))
@@ -76,7 +78,7 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
 
     override fun loadBefore(
         params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
+        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
     ) {
         // do nothing
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt
index e638fce38d..729f0d2cda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt
@@ -30,9 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.search
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import java.util.concurrent.TimeUnit
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
+import java.util.concurrent.TimeUnit
 
 @Module
 internal class TrackedEntityInstanceQueryEntityDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcher.kt
index eb678087b9..23a1640440 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcher.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import com.fasterxml.jackson.core.JsonProcessingException
 import com.fasterxml.jackson.databind.JsonMappingException
-import java.io.IOException
-import javax.net.ssl.HttpsURLConnection
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import retrofit2.Response
+import java.io.IOException
+import javax.net.ssl.HttpsURLConnection
 
 internal class TrackedEntityInstanceQueryErrorCatcher : APICallErrorCatcher {
     override fun mustBeStored(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
index 15c13a05c6..5a3a802690 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
@@ -28,12 +28,12 @@
 
 package org.hisp.dhis.android.core.trackedentity.search
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import java.util.*
 
 internal data class TrackedEntityInstanceQueryOnline(
     val page: Int,
@@ -63,5 +63,5 @@ internal data class TrackedEntityInstanceQueryOnline(
     val uids: List<String>? = null,
     val lastUpdatedStartDate: Date? = null,
     val lastUpdatedEndDate: Date? = null,
-    val order: String? = null
+    val order: String? = null,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index 2b3d7ff6e1..d1291a3645 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
@@ -39,9 +38,10 @@ import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import javax.inject.Inject
 
 internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
-    private val dateFilterPeriodHelper: DateFilterPeriodHelper
+    private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
 
     fun fromScope(scope: TrackedEntityInstanceQueryRepositoryScope): List<TrackedEntityInstanceQueryOnline> {
@@ -64,7 +64,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
                         eventFilter.eventDate()?.let {
                             copy(
                                 eventStartDate = dateFilterPeriodHelper.getStartDate(it),
-                                eventEndDate = dateFilterPeriodHelper.getEndDate(it)
+                                eventEndDate = dateFilterPeriodHelper.getEndDate(it),
                             )
                         } ?: this
                     }
@@ -75,7 +75,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
     @Throws(D2Error::class, Exception::class)
     fun queryOnlineBlocking(
         trackerParentCallFactory: TrackerParentCallFactory,
-        scope: TrackedEntityInstanceQueryRepositoryScope
+        scope: TrackedEntityInstanceQueryRepositoryScope,
     ): List<TrackedEntityInstance> {
         return fromScope(scope).foldRight(emptyList()) { queryOnline, acc ->
             val noPagingQuery = queryOnline.copy(paging = false)
@@ -97,7 +97,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
 
     @Suppress("ComplexMethod")
     private fun getBaseQuery(
-        scope: TrackedEntityInstanceQueryRepositoryScope
+        scope: TrackedEntityInstanceQueryRepositoryScope,
     ): TrackedEntityInstanceQueryOnline {
         val query = scope.query()?.let { query -> query.operator().apiUpperOperator + ":" + query.value() }
 
@@ -120,7 +120,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
             followUp = scope.followUp(),
             includeDeleted = scope.includeDeleted(),
             trackedEntityType = scope.trackedEntityType(),
-            order = toAPIOrderFormat(scope.order())
+            order = toAPIOrderFormat(scope.order()),
         ).run {
             scope.program()?.let {
                 copy(
@@ -134,7 +134,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
                     eventStartDate = scope.eventDate()?.let { dateFilterPeriodHelper.getStartDate(it) },
                     eventEndDate = scope.eventDate()?.let { dateFilterPeriodHelper.getEndDate(it) },
                     dueStartDate = scope.dueDate()?.let { dateFilterPeriodHelper.getStartDate(it) },
-                    dueEndDate = scope.dueDate()?.let { dateFilterPeriodHelper.getEndDate(it) }
+                    dueEndDate = scope.dueDate()?.let { dateFilterPeriodHelper.getEndDate(it) },
                 )
             } ?: this
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
index 9ed2f409b0..4154ffd1e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
@@ -43,16 +42,17 @@ import org.hisp.dhis.android.core.programstageworkinglist.internal.AttributeValu
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject constructor(
-    private val dateFilterPeriodHelper: DateFilterPeriodHelper
+    private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
 
     @Suppress("ComplexMethod")
     fun addTrackedEntityInstanceFilter(
         scope: TrackedEntityInstanceQueryRepositoryScope,
-        filter: TrackedEntityInstanceFilter
+        filter: TrackedEntityInstanceFilter,
     ): TrackedEntityInstanceQueryRepositoryScope {
         val builder = scope.toBuilder()
 
@@ -78,7 +78,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
     private fun applyEventFilters(
         builder: TrackedEntityInstanceQueryRepositoryScope.Builder,
-        eventFilters: List<TrackedEntityInstanceEventFilter>
+        eventFilters: List<TrackedEntityInstanceEventFilter>,
     ) {
         val filters = eventFilters.map { eventFilter ->
             val eventBuilder = TrackedEntityInstanceQueryEventFilter.builder()
@@ -111,7 +111,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
     @Suppress("ComplexMethod")
     private fun applyAttributeValueFilter(
         builder: TrackedEntityInstanceQueryRepositoryScope.Builder,
-        filter: AttributeValueFilter?
+        filter: AttributeValueFilter?,
     ) {
         filter?.let {
             val existingFilters = builder.build().filter()
@@ -126,7 +126,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
     @Suppress("ComplexMethod")
     fun addProgramStageWorkingList(
         scope: TrackedEntityInstanceQueryRepositoryScope,
-        workingList: ProgramStageWorkingList
+        workingList: ProgramStageWorkingList,
     ): TrackedEntityInstanceQueryRepositoryScope {
         val builder = scope.toBuilder()
 
@@ -156,7 +156,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
     private fun applyDataValueFilter(
         builder: TrackedEntityInstanceQueryRepositoryScope.Builder,
-        filter: ProgramStageWorkingListEventDataFilter?
+        filter: ProgramStageWorkingListEventDataFilter?,
     ) {
         filter?.let {
             val existingFilters = builder.build().dataValue()
@@ -169,7 +169,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
     private fun getCommonFilterOperators(
         filterBuilder: RepositoryScopeFilterItem.Builder,
-        filter: FilterOperators
+        filter: FilterOperators,
     ): List<RepositoryScopeFilterItem> {
         val filterItems: MutableList<RepositoryScopeFilterItem> = mutableListOf()
 
@@ -213,7 +213,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
     private fun getAttributeValueFilterOperators(
         filterBuilder: RepositoryScopeFilterItem.Builder,
-        filter: AttributeValueFilter
+        filter: AttributeValueFilter,
     ): List<RepositoryScopeFilterItem> {
         val filterItems: MutableList<RepositoryScopeFilterItem> = mutableListOf()
 
@@ -229,7 +229,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
     private fun applyOrder(
         builder: TrackedEntityInstanceQueryRepositoryScope.Builder,
-        order: String
+        order: String,
     ) {
         val items = order.split(",").mapNotNull { orderItem ->
             val orderTokens = orderItem.split(":")
@@ -268,7 +268,7 @@ internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject construct
 
     fun addFilter(
         scope: TrackedEntityInstanceQueryRepositoryScope,
-        filter: RepositoryScopeFilterItem
+        filter: RepositoryScopeFilterItem,
     ): TrackedEntityInstanceQueryRepositoryScope {
         val otherFilters = scope.filter().filterNot { it.key() == filter.key() && it.operator() == filter.operator() }
         return scope.toBuilder().filter(otherFilters + filter).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackerQueryResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackerQueryResult.kt
index a692ea52c1..2ead3ffb53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackerQueryResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackerQueryResult.kt
@@ -32,5 +32,5 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 data class TrackerQueryResult(
     val trackedEntities: List<TrackedEntityInstance>,
-    val exhausted: Boolean
+    val exhausted: Boolean,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerExporterVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerExporterVersion.kt
index df2194706d..a9c9fe43a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerExporterVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerExporterVersion.kt
@@ -33,5 +33,5 @@ import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 enum class TrackerExporterVersion {
     @JsonEnumDefaultValue
     V1,
-    V2
+    V2,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerImporterVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerImporterVersion.kt
index 98ccf089b0..415b93c474 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerImporterVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerImporterVersion.kt
@@ -33,5 +33,5 @@ import com.fasterxml.jackson.annotation.JsonEnumDefaultValue
 enum class TrackerImporterVersion {
     @JsonEnumDefaultValue
     V1,
-    V2
+    V2,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
index c8a68457b6..952531cbaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
@@ -28,14 +28,14 @@
 
 package org.hisp.dhis.android.core.tracker
 
-import javax.inject.Inject
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import javax.inject.Inject
 
 internal class TrackerPostParentCallHelper @Inject constructor(
     private val dhisVersionManager: DHISVersionManager,
-    private val synchronizationSettingStore: SynchronizationSettingStore
+    private val synchronizationSettingStore: SynchronizationSettingStore,
 ) {
 
     fun useNewTrackerImporter(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerAPIQuery.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerAPIQuery.kt
index 9a652b87ea..dcd3eff1dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerAPIQuery.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerAPIQuery.kt
@@ -39,9 +39,9 @@ internal data class TrackerAPIQuery(
     val lastUpdatedStr: String? = null,
     override val page: Int = 1,
     override val pageSize: Int = DEFAULT_PAGE_SIZE,
-    override val paging: Boolean = true
+    override val paging: Boolean = true,
 ) : BaseQueryKt(
     page,
     pageSize,
-    paging
+    paging,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerD2ProgressManager.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerD2ProgressManager.kt
index 62de609dbc..b832a2357a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerD2ProgressManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerD2ProgressManager.kt
@@ -82,7 +82,7 @@ internal class TrackerD2ProgressManager(totalCalls: Int?) : D2ProgressManager(to
             .programs(
                 progress.programs().mapValues {
                     it.value.copy(isComplete = true).addSyncStatus(D2ProgressSyncStatus.SUCCESS)
-                }
+                },
             )
             .build()
             .also { progress = it }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index af6f0b583f..2480f344ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -27,10 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.exporter
 
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.flow
@@ -48,13 +44,17 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelative
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 @Suppress("TooManyFunctions")
 internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val systemInfoModuleDownloader: SystemInfoModuleDownloader,
     private val relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
 
     fun download(params: ProgramDataDownloadParams): Flow<TrackerD2Progress> = channelFlow {
@@ -76,7 +76,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private fun downloadInternal(
         params: ProgramDataDownloadParams,
         progressManager: TrackerD2ProgressManager,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): Flow<TrackerD2Progress> = flow {
         val bundles: List<Q> = getBundles(params)
         val programs = bundles.flatMap { it.commonParams().programs }
@@ -127,7 +127,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         bundle: Q,
         params: ProgramDataDownloadParams,
         bundleResult: BundleResult,
-        iterationCount: Int
+        iterationCount: Int,
     ): Boolean {
         return params.limitByProgram() != true &&
             bundleResult.bundleCount < bundle.commonParams().limit &&
@@ -141,7 +141,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         params: ProgramDataDownloadParams,
         bundleResult: BundleResult,
         relatives: RelationshipItemRelatives,
-        progressManager: TrackerD2ProgressManager
+        progressManager: TrackerD2ProgressManager,
     ): IterationResult {
         val iterationResult = IterationResult()
         val limitPerCombo = getBundleLimit(bundle, params, bundleResult)
@@ -162,7 +162,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 bundleResult,
                 bundleLimit,
                 relatives,
-                progressManager
+                progressManager,
             )
             iterationResult.successfulSync = iterationResult.successfulSync && result.successfulSync
         }
@@ -178,7 +178,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         bundleResult: BundleResult,
         limit: Int,
         relatives: RelationshipItemRelatives,
-        progressManager: TrackerD2ProgressManager
+        progressManager: TrackerD2ProgressManager,
     ): IterationResult {
         val iterationResult = IterationResult()
 
@@ -192,7 +192,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                         limit,
                         bundleProgram.itemCount,
                         params.overwrite(),
-                        relatives
+                        relatives,
                     )
 
                     bundleResult.bundleCount += result.count
@@ -231,7 +231,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     private fun getBundleLimit(
         bundle: Q,
         params: ProgramDataDownloadParams,
-        bundleResult: BundleResult
+        bundleResult: BundleResult,
     ): Int {
         return when {
             params.uids().isNotEmpty() -> params.uids().size
@@ -255,7 +255,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         combinationLimit: Int,
         downloadedCount: Int,
         overwrite: Boolean,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): ItemsWithPagingResult {
         return try {
             getItemsWithPaging(trackerQueryBuilder, combinationLimit, downloadedCount, overwrite, relatives)
@@ -271,7 +271,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         combinationLimit: Int,
         downloadedCount: Int,
         overwrite: Boolean,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): ItemsWithPagingResult {
         var downloadedItemsForCombination = 0
         var emptyProgram = false
@@ -281,7 +281,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         for (paging in pagingList) {
             val pageQuery = query.copy(
                 pageSize = paging.pageSize(),
-                page = paging.page()
+                page = paging.page(),
             )
 
             val items = getItems(pageQuery)
@@ -292,7 +292,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
                 hasAllAttributes = true,
                 overwrite = overwrite,
                 asRelationship = false,
-                program = pageQuery.commonParams.program
+                program = pageQuery.commonParams.program,
             )
 
             persistItems(itemsToPersist, persistParams, relatives)
@@ -312,7 +312,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         return if (paging.isFullPage && pageItems.size > paging.previousItemsToSkipCount()) {
             val toIndex = min(
                 pageItems.size,
-                paging.pageSize() - paging.posteriorItemsToSkipCount()
+                paging.pageSize() - paging.posteriorItemsToSkipCount(),
             )
             pageItems.subList(paging.previousItemsToSkipCount(), toIndex)
         } else {
@@ -322,7 +322,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
 
     private fun downloadRelationships(
         progressManager: TrackerD2ProgressManager,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): Flow<TrackerD2Progress> = flow {
         relationshipDownloadAndPersistCallFactory.downloadAndPersist(relatives)
         emit(progressManager.increaseProgress(TrackedEntityInstance::class.java, false))
@@ -345,7 +345,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
         var count: Int,
         var successfulSync: Boolean,
         var d2Error: D2Error?,
-        var emptyProgram: Boolean
+        var emptyProgram: Boolean,
     )
 
     protected class ItemsByProgramCount(val program: String, var itemCount: Int)
@@ -353,11 +353,11 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     protected class BundleResult(
         var bundleCount: Int,
         var bundleOrgUnitPrograms: MutableMap<String, MutableList<ItemsByProgramCount>>,
-        var bundleOrgUnitsToDownload: MutableList<String?>
+        var bundleOrgUnitsToDownload: MutableList<String?>,
     )
 
     protected class IterationResult(
-        var successfulSync: Boolean = true
+        var successfulSync: Boolean = true,
     )
 
     companion object {
@@ -372,7 +372,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     protected abstract fun persistItems(
         items: List<T>,
         params: IdentifiableDataHandlerParams,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     )
 
     protected abstract fun updateLastUpdated(bundle: Q)
@@ -380,13 +380,13 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
     protected abstract suspend fun queryByUids(
         bundle: Q,
         overwrite: Boolean,
-        relatives: RelationshipItemRelatives
+        relatives: RelationshipItemRelatives,
     ): ItemsWithPagingResult
 
     protected abstract fun getQuery(
         bundle: Q,
         program: String?,
         orgunitUid: String?,
-        limit: Int
+        limit: Int,
     ): TrackerAPIQuery
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
index 572c0d54fb..cd493a39d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterService.kt
@@ -43,7 +43,7 @@ internal interface TrackerExporterService {
         @Query(TRACKED_ENTITY_INSTACE) trackedEntityInstance: String?,
         @Query(OU_MODE) orgUnitMode: String?,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean
+        @Query(INCLUDE_DELETED) includeDeleted: Boolean,
     ): NTIPayload<NewTrackerImporterTrackedEntity>
 
     @GET("$TRACKED_ENTITY_INSTANCES/{$TRACKED_ENTITY_INSTACE}")
@@ -55,7 +55,7 @@ internal interface TrackerExporterService {
         @Query(PROGRAM_STATUS) programStatus: String?,
         @Query(ENROLLMENT_ENROLLED_AFTER) programStartDate: String?,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean
+        @Query(INCLUDE_DELETED) includeDeleted: Boolean,
     ): NewTrackerImporterTrackedEntity
 
     @GET(TRACKED_ENTITY_INSTANCES)
@@ -86,13 +86,13 @@ internal interface TrackerExporterService {
         @Query(PAGE) page: Int,
         @Query(PAGE_SIZE) pageSize: Int,
         @Query(INCLUDE_ALL_ATTRIBUTES) includeAllAttributes: Boolean,
-        @Query(INCLUDE_DELETED) includeDeleted: Boolean = false
+        @Query(INCLUDE_DELETED) includeDeleted: Boolean = false,
     ): NTIPayload<NewTrackerImporterTrackedEntity>
 
     @GET("$ENROLLMENTS/{$ENROLLMENT}")
     suspend fun getEnrollmentSingle(
         @Path(ENROLLMENT) enrollmentUid: String,
-        @Query(FIELDS) @Which fields: Fields<NewTrackerImporterEnrollment>
+        @Query(FIELDS) @Which fields: Fields<NewTrackerImporterEnrollment>,
     ): NewTrackerImporterEnrollment
 
     @GET(EVENTS)
@@ -123,14 +123,14 @@ internal interface TrackerExporterService {
         @Query(UPDATED_AFTER) updatedAfter: String?,
         @Query(UPDATED_BEFORE) updatedBefore: String? = null,
         @Query(INCLUDE_DELETED) includeDeleted: Boolean,
-        @Query(EVENT) eventUid: String? = null
+        @Query(EVENT) eventUid: String? = null,
     ): NTIPayload<NewTrackerImporterEvent>
 
     @GET(EVENTS)
     suspend fun getEventSingle(
         @Query(FIELDS) @Which fields: Fields<NewTrackerImporterEvent>,
         @Query(EVENT) eventUid: String,
-        @Query(OU_MODE) orgUnitMode: String
+        @Query(OU_MODE) orgUnitMode: String,
     ): NTIPayload<NewTrackerImporterEvent>
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/ImporterError.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/ImporterError.kt
index 9cf4b35ad9..d0c2df5905 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/ImporterError.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/ImporterError.kt
@@ -45,15 +45,15 @@ internal enum class ImporterError(val regex: Regex) {
     E1014(
         Regex(
             "Provided Program: `(.*)`, is a Program without registration. " +
-                "An Enrollment cannot be created into Program without registration."
-        )
+                "An Enrollment cannot be created into Program without registration.",
+        ),
     ),
     E1015(Regex("TrackedEntityInstance: `(.*)`, already has an active Enrollment in Program `(.*)`.")),
     E1016(
         Regex(
             "TrackedEntityInstance: `(.*)`, already has an enrollment in Program: `(.*)`, and this " +
-                "program only allows enrolling one time."
-        )
+                "program only allows enrolling one time.",
+        ),
     ),
     E1018(Regex("Attribute: `(.*)`, is mandatory in program `(.*)` but not declared in enrollment `(.*)`.")),
     E1019(Regex("Only Program attributes is allowed for enrollment; Non valid attribute: `(.*)`.")),
@@ -97,16 +97,16 @@ internal enum class ImporterError(val regex: Regex) {
     E1086(
         Regex(
             "Event: `(.*)`, has a program: `(.*)`, that is a registration but its ProgramStage is not " +
-                "valid or missing."
-        )
+                "valid or missing.",
+        ),
     ),
     E1087(Regex("Event: `(.*)`, could not find DataElement: `(.*)`, linked to a data value.")),
     E1088(Regex("Event: `(.*)`, program: `(.*)`, and ProgramStage: `(.*)`, could not be found.")),
     E1089(Regex("Event: `(.*)`, references a Program Stage `(.*)` that does not belong to Program `(.*)`.")),
     E1090(
         Regex(
-            "Attribute: `(.*)`, is mandatory in tracked entity type `(.*)` but not declared in tracked entity `(.*)`."
-        )
+            "Attribute: `(.*)`, is mandatory in tracked entity type `(.*)` but not declared in tracked entity `(.*)`.",
+        ),
     ),
     E1091(Regex("User: `(.*)`, has no data write access to Program: `(.*)`.")),
     E1095(Regex("User: `(.*)`, has no data write access to ProgramStage: `(.*)`.")),
@@ -118,8 +118,8 @@ internal enum class ImporterError(val regex: Regex) {
     E1104(Regex("User: `(.*)`, has no data read access to program: `(.*)`, TrackedEntityType: `(.*)`.")),
     E1112(
         Regex(
-            "Attribute value: `(.*)`, is set to confidential but system is not properly configured to encrypt data."
-        )
+            "Attribute value: `(.*)`, is set to confidential but system is not properly configured to encrypt data.",
+        ),
     ),
     E1113(Regex("Enrollment: `(.*)`, is already deleted and cannot be modified.")),
     E1114(Regex("TrackedEntity: `(.*)`, is already deleted and cannot be modified.")),
@@ -154,15 +154,15 @@ internal enum class ImporterError(val regex: Regex) {
     E1307(
         Regex(
             "Generated by program rule (`(.*)`) - Unable to assign value to data element `(.*)`. " +
-                "The provided value must be empty or match the calculated value `(.*)`"
-        )
+                "The provided value must be empty or match the calculated value `(.*)`",
+        ),
     ),
     E1308(Regex("Generated by program rule (`(.*)`) - DataElement `(.*)` is being replaced in event `(.*)`")),
     E1309(
         Regex(
             "Generated by program rule (`(.*)`) - Unable to assign value to attribute `(.*)`. " +
-                "The provided value must be empty or match the calculated value `(.*)`"
-        )
+                "The provided value must be empty or match the calculated value `(.*)`",
+        ),
     ),
     E1310(Regex("Generated by program rule (`(.*)`) - Attribute `(.*)` is being replaced in tei `(.*)`")),
     E1311(Regex("Referral events need to have at least one complete relationship.")),
@@ -172,8 +172,8 @@ internal enum class ImporterError(val regex: Regex) {
     E4000(Regex("Relationship: `(.*)` cannot link to itself")),
     E4001(
         Regex(
-            "Relationship Item `(.*)` for Relationship `(.*)` is invalid: an Item can link only one Tracker entity."
-        )
+            "Relationship Item `(.*)` for Relationship `(.*)` is invalid: an Item can link only one Tracker entity.",
+        ),
     ),
     E4003(Regex("There are duplicated relationships.")),
     E4004(Regex("Missing required relationship property: 'relationshipType'.")),
@@ -187,8 +187,8 @@ internal enum class ImporterError(val regex: Regex) {
     E4013(Regex("Relationship Type `(.*)` constraint is missing (.*).")),
     E4014(
         Regex(
-            "Relationship Type `(.*)` constraint requires a Tracked Entity having type `(.*)` but `(.*)` was found."
-        )
+            "Relationship Type `(.*)` constraint requires a Tracked Entity having type `(.*)` but `(.*)` was found.",
+        ),
     ),
     E4015(Regex("Relationship: `(.*)`, already exists.")),
     E4016(Regex("Relationship: `(.*)`, do not exist.")),
@@ -196,5 +196,5 @@ internal enum class ImporterError(val regex: Regex) {
     E4018(Regex("Relationship: `(.*)`, linking (.*): `(.*)` to (.*): `(.*)` already exists.")),
     E5000(Regex("\"(.*)\" `(.*)` cannot be persisted because \"(.*)\" `(.*)` referenced by it cannot be persisted.")),
     E5001(Regex("\"(.*)\" `(.*)` cannot be deleted because \"(.*)\" `(.*)` referenced by it cannot be deleted.")),
-    E9999(Regex("N/A"))
+    E9999(Regex("N/A")),
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
index 1423d41795..e5edee7aaa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
 import io.reactivex.Observable
-import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
@@ -44,6 +42,8 @@ import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterTrackedEntityPostStateManager
+import javax.inject.Inject
+import kotlin.time.Duration.Companion.seconds
 
 internal const val ATTEMPTS_AFTER_UPLOAD = 90
 internal const val ATTEMPTS_WHEN_QUERYING = 1
@@ -57,7 +57,7 @@ internal class JobQueryCall @Inject internal constructor(
     private val trackerJobObjectStore: TrackerJobObjectStore,
     private val handler: JobReportHandler,
     private val fileResourceHandler: JobReportFileResourceHandler,
-    private val stateManager: NewTrackerImporterTrackedEntityPostStateManager
+    private val stateManager: NewTrackerImporterTrackedEntityPostStateManager,
 ) {
 
     fun queryPendingJobs(): Observable<D2Progress> = flow {
@@ -87,7 +87,7 @@ internal class JobQueryCall @Inject internal constructor(
         jobId: String,
         jobObjects: List<TrackerJobObject>,
         isLastJob: Boolean,
-        attempts: Int
+        attempts: Int,
     ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
 
@@ -123,7 +123,7 @@ internal class JobQueryCall @Inject internal constructor(
     private suspend fun downloadAndHandle(jobId: String, jobObjects: List<TrackerJobObject>) {
         val jobReport = coroutineAPICallExecutor.wrap(
             storeError = false,
-            errorCatcher = JobQueryErrorCatcher()
+            errorCatcher = JobQueryErrorCatcher(),
         ) {
             service.getJobReport(jobId)
         }.getOrThrow()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryErrorCatcher.kt
index e822e5fe05..978ad31572 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryErrorCatcher.kt
@@ -28,10 +28,10 @@
 
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import java.net.HttpURLConnection
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import retrofit2.Response
+import java.net.HttpURLConnection
 
 internal class JobQueryErrorCatcher : APICallErrorCatcher {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReport.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReport.kt
index 1dfb23bf18..b4bea7f608 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReport.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReport.kt
@@ -34,47 +34,47 @@ internal data class JobImportCount(
     val updated: Int,
     val deleted: Int,
     val ignored: Int,
-    val total: Int
+    val total: Int,
 )
 
 internal data class JobValidationError(
     val uid: String,
     val trackerType: TrackerImporterObjectType,
     val errorCode: String,
-    val message: String
+    val message: String,
 )
 
 internal data class JobValidationReport(
-    val errorReports: List<JobValidationError>
+    val errorReports: List<JobValidationError>,
 )
 
 internal data class JobObjectReport(
     val errorReports: List<String>,
     val index: Int,
     val trackerType: TrackerImporterObjectType,
-    val uid: String
+    val uid: String,
 )
 
 internal data class JobTypeReport(
     val trackerType: String,
     val stats: JobImportCount,
-    val objectReports: List<JobObjectReport>
+    val objectReports: List<JobObjectReport>,
 )
 
 internal data class JobTypeReportMap(
     @JsonProperty("TRACKED_ENTITY") val trackedEntity: JobTypeReport,
     @JsonProperty("EVENT") val event: JobTypeReport,
     @JsonProperty("RELATIONSHIP") val relationship: JobTypeReport,
-    @JsonProperty("ENROLLMENT") val enrollment: JobTypeReport
+    @JsonProperty("ENROLLMENT") val enrollment: JobTypeReport,
 )
 
 internal data class JobBundleReport(
-    val typeReportMap: JobTypeReportMap
+    val typeReportMap: JobTypeReportMap,
 )
 
 internal data class JobReport(
     val status: String,
     val validationReport: JobValidationReport,
     val stats: JobImportCount?,
-    val bundleReport: JobBundleReport?
+    val bundleReport: JobBundleReport?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
index 2c8e7b7212..37e58d34b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DataColumns
@@ -40,6 +39,7 @@ import org.hisp.dhis.android.core.note.NoteTableInfo
 import org.hisp.dhis.android.core.note.internal.NoteStore
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
+import javax.inject.Inject
 
 @Reusable
 internal class JobReportEnrollmentHandler @Inject internal constructor(
@@ -47,7 +47,7 @@ internal class JobReportEnrollmentHandler @Inject internal constructor(
     private val enrollmentStore: EnrollmentStore,
     private val conflictStore: TrackerImportConflictStore,
     private val conflictHelper: TrackerConflictHelper,
-    relationshipStore: RelationshipStore
+    relationshipStore: RelationshipStore,
 ) : JobReportTypeHandler(relationshipStore) {
 
     fun handleEnrollmentNotes(enrollmentUid: String, state: State) {
@@ -55,7 +55,7 @@ internal class JobReportEnrollmentHandler @Inject internal constructor(
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 DataColumns.SYNC_STATE,
-                State.uploadableStatesIncludingError().map { it.name }
+                State.uploadableStatesIncludingError().map { it.name },
             )
             .appendKeyStringValue(NoteTableInfo.Columns.ENROLLMENT, enrollmentUid).build()
         for (note in noteStore.selectWhere(whereClause)) {
@@ -84,7 +84,7 @@ internal class JobReportEnrollmentHandler @Inject internal constructor(
                         .tableReference(EnrollmentTableInfo.TABLE_INFO.name())
                         .enrollment(errorReport.uid)
                         .trackedEntityInstance(enrollment.trackedEntityInstance())
-                        .build()
+                        .build(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
index a14a344392..6b93b2e728 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DataColumns
@@ -42,6 +41,7 @@ import org.hisp.dhis.android.core.note.internal.NoteStore
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
+import javax.inject.Inject
 
 @Reusable
 internal class JobReportEventHandler @Inject internal constructor(
@@ -51,7 +51,7 @@ internal class JobReportEventHandler @Inject internal constructor(
     private val eventStore: EventStore,
     private val enrollmentStore: EnrollmentStore,
     private val conflictHelper: TrackerConflictHelper,
-    relationshipStore: RelationshipStore
+    relationshipStore: RelationshipStore,
 ) : JobReportTypeHandler(relationshipStore) {
 
     override fun handleObject(uid: String, state: State): HandleAction {
@@ -79,7 +79,7 @@ internal class JobReportEventHandler @Inject internal constructor(
                         .trackedEntityInstance(trackedEntityInstanceUid)
                         .enrollment(event.enrollment())
                         .event(errorReport.uid)
-                        .build()
+                        .build(),
                 )
             }
         }
@@ -100,7 +100,7 @@ internal class JobReportEventHandler @Inject internal constructor(
         val whereClause = WhereClauseBuilder()
             .appendInKeyStringValues(
                 DataColumns.SYNC_STATE,
-                State.uploadableStatesIncludingError().map { it.name }
+                State.uploadableStatesIncludingError().map { it.name },
             )
             .appendKeyStringValue(NoteTableInfo.Columns.EVENT, eventUid).build()
         for (note in noteStore.selectWhere(whereClause)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
index 8668e903c2..fc2f839c45 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceHelper
+import javax.inject.Inject
 
 @Reusable
 internal class JobReportFileResourceHandler @Inject internal constructor(
-    private val fileResourceHelper: FileResourceHelper
+    private val fileResourceHelper: FileResourceHelper,
 ) {
     fun updateFileResourceStates(jobObjects: List<TrackerJobObject>) {
         val progress = D2ProgressManager(null)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
index ee911524ae..7184d9ab89 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.common.internal.DataStateUidHolder
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.*
+import javax.inject.Inject
 
 @Reusable
 internal class JobReportHandler @Inject internal constructor(
@@ -39,7 +39,7 @@ internal class JobReportHandler @Inject internal constructor(
     private val enrollmentHandler: JobReportEnrollmentHandler,
     private val trackedEntityHandler: JobReportTrackedEntityHandler,
     private val relationshipHandler: JobReportRelationshipHandler,
-    private val dataStatePropagator: DataStatePropagator
+    private val dataStatePropagator: DataStatePropagator,
 ) {
 
     fun handle(o: JobReport, jobObjects: List<TrackerJobObject>) {
@@ -55,7 +55,7 @@ internal class JobReportHandler @Inject internal constructor(
 
     private fun handleErrors(
         o: JobReport,
-        jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>
+        jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>,
     ) {
         o.validationReport.errorReports.forEach { errorReport ->
             jobObjectsMap[Pair(errorReport.trackerType, errorReport.uid)]?.let {
@@ -66,7 +66,7 @@ internal class JobReportHandler @Inject internal constructor(
 
     private fun handleSuccesses(
         o: JobReport,
-        jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>
+        jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>,
     ) {
         if (o.bundleReport != null) {
             val typeMap = o.bundleReport.typeReportMap
@@ -79,7 +79,7 @@ internal class JobReportHandler @Inject internal constructor(
 
     private fun handleNotPresent(
         o: JobReport,
-        jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>
+        jobObjectsMap: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>,
     ) {
         val presentSuccesses = if (o.bundleReport == null) {
             emptySet<Pair<TrackerImporterObjectType, String>>()
@@ -106,7 +106,7 @@ internal class JobReportHandler @Inject internal constructor(
     private fun applySuccess(
         typeReport: JobTypeReport,
         jobObjects: Map<Pair<TrackerImporterObjectType, String>, TrackerJobObject>,
-        typeHandler: JobReportTypeHandler
+        typeHandler: JobReportTypeHandler,
     ) {
         typeReport.objectReports
             .mapNotNull { jobObjects[Pair(it.trackerType, it.uid)] }
@@ -118,7 +118,7 @@ internal class JobReportHandler @Inject internal constructor(
             jobObjects.filter { it.trackerType() == TRACKED_ENTITY }.map { it.objectUid() },
             jobObjects.filter { it.trackerType() == ENROLLMENT }.map { it.objectUid() },
             jobObjects.filter { it.trackerType() == EVENT }.map { it.objectUid() },
-            jobObjects.filter { it.trackerType() == RELATIONSHIP }.map { it.objectUid() }
+            jobObjects.filter { it.trackerType() == RELATIONSHIP }.map { it.objectUid() },
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt
index af8f4bacb3..8d062e71d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
+import javax.inject.Inject
 
 @Reusable
 internal class JobReportRelationshipHandler @Inject internal constructor(
-    relationshipStore: RelationshipStore
+    relationshipStore: RelationshipStore,
 ) : JobReportTypeHandler(relationshipStore) {
 
     override fun handleObject(uid: String, state: State): HandleAction {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt
index b37b546458..88c9d25a94 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
@@ -37,6 +36,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import javax.inject.Inject
 
 @Reusable
 internal class JobReportTrackedEntityHandler @Inject internal constructor(
@@ -44,7 +44,7 @@ internal class JobReportTrackedEntityHandler @Inject internal constructor(
     private val conflictStore: TrackerImportConflictStore,
     private val trackedEntityStore: TrackedEntityInstanceStore,
     private val conflictHelper: TrackerConflictHelper,
-    relationshipStore: RelationshipStore
+    relationshipStore: RelationshipStore,
 ) : JobReportTypeHandler(relationshipStore) {
 
     override fun handleObject(uid: String, state: State): HandleAction {
@@ -65,7 +65,7 @@ internal class JobReportTrackedEntityHandler @Inject internal constructor(
                 conflictStore.insert(
                     conflictHelper.getConflictBuilder(errorReport)
                         .tableReference(TrackedEntityInstanceTableInfo.TABLE_INFO.name())
-                        .trackedEntityInstance(errorReport.uid).build()
+                        .trackedEntityInstance(errorReport.uid).build(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTypeHandler.kt
index dac2aea842..88877a176b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTypeHandler.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 
 internal abstract class JobReportTypeHandler constructor(
-    protected val relationshipStore: RelationshipStore
+    protected val relationshipStore: RelationshipStore,
 ) {
 
     fun handleSuccess(jo: TrackerJobObject) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt
index ac469de365..fef02bd120 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.tracker.importer.internal
 
 import android.content.Context
 import dagger.Reusable
-import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
 import org.hisp.dhis.android.core.tracker.importer.internal.interpreters.InterpreterSelector
+import java.util.*
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerConflictHelper @Inject constructor(
     val context: Context,
-    private val interpreterSelector: InterpreterSelector
+    private val interpreterSelector: InterpreterSelector,
 ) {
 
     fun getConflictBuilder(errorReport: JobValidationError): TrackerImportConflict.Builder {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
index 904319b30d..93e98ac9ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
@@ -41,6 +40,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAcc
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipManagerImpl
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
@@ -48,7 +48,7 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val enrollmentStore: EnrollmentStore,
     private val programStore: ProgramStore,
-    private val ownershipManagerImpl: OwnershipManagerImpl
+    private val ownershipManagerImpl: OwnershipManagerImpl,
 ) {
 
     /**
@@ -56,7 +56,7 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
      */
     fun getGlassErrors(
         summary: TEIWebResponseHandlerSummary,
-        instances: List<TrackedEntityInstance>
+        instances: List<TrackedEntityInstance>,
     ): List<TrackedEntityInstance> {
         return summary.enrollments.ignored.filter { enrollment ->
             isProtectedInSearchScope(enrollment.program(), enrollment.organisationUnit())
@@ -106,12 +106,12 @@ internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
                 glassErrors.trackedEntities.addAll(
                     payload.trackedEntities.filter {
                         it.uid() == enrollment.trackedEntity()
-                    }
+                    },
                 )
                 glassErrors.events.addAll(
                     payload.events.filter {
                         it.enrollment() == enrollment.uid()
-                    }
+                    },
                 )
             }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
index 42b7c858b6..f8f5f666e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollment
 import org.hisp.dhis.android.core.event.NewTrackerImporterEvent
 import org.hisp.dhis.android.core.fileresource.FileResource
@@ -40,15 +39,16 @@ import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntity
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayloadWrapper
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerImporterFileResourcesPostCall @Inject internal constructor(
     private val fileResourcePostCall: FileResourcePostCall,
-    private val fileResourceHelper: FileResourceHelper
+    private val fileResourceHelper: FileResourceHelper,
 ) {
 
     suspend fun uploadFileResources(
-        payloadWrapper: NewTrackerImporterPayloadWrapper
+        payloadWrapper: NewTrackerImporterPayloadWrapper,
     ): NewTrackerImporterPayloadWrapper {
         val fileResources = fileResourceHelper.getUploadableFileResources()
 
@@ -57,14 +57,14 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
         } else {
             payloadWrapper.copy(
                 deleted = uploadPayloadFileResources(payloadWrapper.deleted, fileResources),
-                updated = uploadPayloadFileResources(payloadWrapper.updated, fileResources)
+                updated = uploadPayloadFileResources(payloadWrapper.updated, fileResources),
             )
         }
     }
 
     private suspend fun uploadPayloadFileResources(
         payload: NewTrackerImporterPayload,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): NewTrackerImporterPayload {
         val uploadedAttributes = uploadAttributes(payload.trackedEntities, payload.enrollments, fileResources)
         val uploadedDataValues = uploadDataValues(payload.events, fileResources)
@@ -73,14 +73,14 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
             trackedEntities = uploadedAttributes.first.toMutableList(),
             enrollments = uploadedAttributes.second.toMutableList(),
             events = uploadedDataValues.first.toMutableList(),
-            fileResourcesMap = uploadedAttributes.third + uploadedDataValues.second
+            fileResourcesMap = uploadedAttributes.third + uploadedDataValues.second,
         )
     }
 
     private suspend fun uploadAttributes(
         entities: List<NewTrackerImporterTrackedEntity>,
         enrollments: List<NewTrackerImporterEnrollment>,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): Triple<List<NewTrackerImporterTrackedEntity>, List<NewTrackerImporterEnrollment>, Map<String, List<String>>> {
         // Map from original uid to new uid (the uid from the server)
         val uploadedFileResourcesMap = mutableMapOf<String, FileResource>()
@@ -95,7 +95,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
                     attributeValues = entity.trackedEntityAttributeValues(),
                     fileResources = fileResources,
                     uploadedFileResources = uploadedFileResourcesMap,
-                    fileResourcesByEntity = fileResourcesByEntity
+                    fileResourcesByEntity = fileResourcesByEntity,
                 )
                 entity.toBuilder().trackedEntityAttributeValues(updatedAttributes).build()
             }
@@ -108,7 +108,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
                     attributeValues = enrollment.attributes(),
                     fileResources = fileResources,
                     uploadedFileResources = uploadedFileResourcesMap,
-                    fileResourcesByEntity = fileResourcesByEntity
+                    fileResourcesByEntity = fileResourcesByEntity,
                 )
                 enrollment.toBuilder().attributes(updatedAttributes).build()
             }
@@ -122,7 +122,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
         attributeValues: List<NewTrackerImporterTrackedEntityAttributeValue>?,
         fileResources: List<FileResource>,
         uploadedFileResources: MutableMap<String, FileResource>,
-        fileResourcesByEntity: MutableMap<String, List<String>>
+        fileResourcesByEntity: MutableMap<String, List<String>>,
     ): List<NewTrackerImporterTrackedEntityAttributeValue>? {
         val entityFileResources = mutableListOf<String>()
         val updatedAttributes = attributeValues?.map { attributeValue ->
@@ -151,7 +151,7 @@ internal class TrackerImporterFileResourcesPostCall @Inject internal constructor
 
     private suspend fun uploadDataValues(
         events: List<NewTrackerImporterEvent>,
-        fileResources: List<FileResource>
+        fileResources: List<FileResource>,
     ): Pair<List<NewTrackerImporterEvent>, Map<String, List<String>>> {
         val uploadedFileResources = mutableMapOf<String, List<String>>()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterObjectType.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterObjectType.kt
index f37fff53b9..7affc50c7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterObjectType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterObjectType.kt
@@ -31,5 +31,5 @@ internal enum class TrackerImporterObjectType {
     EVENT,
     TRACKED_ENTITY,
     ENROLLMENT,
-    RELATIONSHIP
+    RELATIONSHIP,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index 3f79acfea3..b02affaa13 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import java.util.Date
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -50,6 +48,8 @@ import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjec
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.EVENT
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.RELATIONSHIP
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.TRACKED_ENTITY
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerImporterPostCall @Inject internal constructor(
@@ -61,22 +61,22 @@ internal class TrackerImporterPostCall @Inject internal constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val jobQueryCall: JobQueryCall,
     private val jobObjectHandler: TrackerJobObjectHandler,
-    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper
+    private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper,
 ) {
     fun uploadTrackedEntityInstances(
-        filteredTrackedEntityInstances: List<TrackedEntityInstance>
+        filteredTrackedEntityInstances: List<TrackedEntityInstance>,
     ): Flow<D2Progress> {
         return postPayloadWrapper(payloadGenerator.getTrackedEntityPayload(filteredTrackedEntityInstances))
     }
 
     fun uploadEvents(
-        filteredEvents: List<Event>
+        filteredEvents: List<Event>,
     ): Flow<D2Progress> {
         return postPayloadWrapper(payloadGenerator.getEventPayload(filteredEvents))
     }
 
     private fun postPayloadWrapper(
-        payloadWrapper: NewTrackerImporterPayloadWrapper
+        payloadWrapper: NewTrackerImporterPayloadWrapper,
     ): Flow<D2Progress> = flow {
         val payload = fileResourcesPostCall.uploadFileResources(payloadWrapper)
 
@@ -88,7 +88,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
 
     private fun doPostCall(
         payload: NewTrackerImporterPayload,
-        importStrategy: String
+        importStrategy: String,
     ): Flow<D2Progress> = flow {
         if (payload.isEmpty()) {
             emit(D2ProgressManager(null).increaseProgress(NewTrackerImporterPayload::class.java, true))
@@ -106,7 +106,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
 
     private fun doPost(
         payload: NewTrackerImporterPayload,
-        importStrategy: String
+        importStrategy: String,
     ): Flow<D2Progress> = flow {
         stateManager.setStates(payload, State.UPLOADING)
 
@@ -117,13 +117,13 @@ internal class TrackerImporterPostCall @Inject internal constructor(
             onFailure = {
                 stateManager.restoreStates(payload)
                 throw it
-            }
+            },
         )
     }
 
     private suspend fun doPostCallInternal(
         payload: NewTrackerImporterPayload,
-        importStrategy: String
+        importStrategy: String,
     ): Result<String, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = true) {
             service.postTrackerPayload(payload, ATOMIC_MODE_OBJECT, importStrategy)
@@ -136,7 +136,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
 
     private fun generateJobObjects(
         payload: NewTrackerImporterPayload,
-        jobUid: String
+        jobUid: String,
     ): List<TrackerJobObject> {
         val builder = TrackerJobObject
             .builder()
@@ -156,7 +156,7 @@ internal class TrackerImporterPostCall @Inject internal constructor(
         builder: TrackerJobObject.Builder,
         objectType: TrackerImporterObjectType,
         objects: List<ObjectWithUidInterface>,
-        fileResourcesMap: Map<String, List<String>>
+        fileResourcesMap: Map<String, List<String>>,
     ): List<TrackerJobObject> {
         return objects.map {
             builder
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
index c3148253b9..9c1e78656a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -40,17 +39,18 @@ import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerPostCall
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerImporterProgramOwnerPostCall @Inject constructor(
     private val programOwnerPostCall: ProgramOwnerPostCall,
     private val programOwnerStore: ProgramOwnerStore,
-    private val trackedEntityInstanceStore: TrackedEntityInstanceStore
+    private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
 ) {
 
     fun uploadProgramOwners(
         programOwners: Map<String, List<ProgramOwner>>,
-        onlyExistingTeis: Boolean = false
+        onlyExistingTeis: Boolean = false,
     ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
index c964a4b54b..70394a2973 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterService.kt
@@ -48,7 +48,7 @@ internal interface TrackerImporterService {
     suspend fun postTrackerPayload(
         @Body payload: NewTrackerImporterPayload,
         @Query(ATOMIC_MODE) atomicMode: String,
-        @Query(IMPORT_STRATEGY) importStrategy: String
+        @Query(IMPORT_STRATEGY) importStrategy: String,
     ): ObjectWithUidWebResponse
 
     @GET("$JOBS_URL{jobId}/report")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt
index 0080352937..6badd2a3a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class TrackerJobModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
@@ -40,7 +40,7 @@ class TrackerJobModuleWiper @Inject internal constructor(private val tableWiper:
 
     override fun wipeData() {
         tableWiper.wipeTables(
-            TrackerJobObjectTableInfo.TABLE_INFO
+            TrackerJobObjectTableInfo.TABLE_INFO,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
index 961311fba1..2cf8ddeaa8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
@@ -29,10 +29,10 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
+import javax.inject.Inject
 
 @Reusable
 internal class TrackerJobObjectHandler @Inject constructor(
-    store: TrackerJobObjectStore
+    store: TrackerJobObjectStore,
 ) : ObjectWithoutUidHandlerImpl<TrackerJobObject>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
index 8fd4cfdc77..36348b0783 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
@@ -36,7 +36,7 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 
 @Suppress("MagicNumber")
 internal class TrackerJobObjectStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : TrackerJobObjectStore,
     ObjectWithoutUidStoreImpl<TrackerJobObject>(
         databaseAdapter,
@@ -44,7 +44,7 @@ internal class TrackerJobObjectStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         DELETE_UPDATE_BINDER,
-        { TrackerJobObject.create(it) }
+        { TrackerJobObject.create(it) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/DefaultInterpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/DefaultInterpreter.kt
index 2fcb0d680f..07b9113a1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/DefaultInterpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/DefaultInterpreter.kt
@@ -32,7 +32,7 @@ import android.content.Context
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class DefaultInterpreter internal constructor(
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = 0
     override fun displayDescription(context: Context, error: JobValidationError): String {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1000Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1000Interpreter.kt
index c5ea6849d4..b4e198d8ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1000Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1000Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1000Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     // User: `User (DXyJmlo9rge)`, has no write access to OrganisationUnit: `OrganisationUnit (DiszpKrYNg8)`.
     override val unformattedDescription = R.string.E1000
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1001Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1001Interpreter.kt
index 723b0eeb47..967ec061ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1001Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1001Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1001Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1001
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1002Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1002Interpreter.kt
index fcd6450993..269ab44643 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1002Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1002Interpreter.kt
@@ -33,15 +33,15 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1002Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1002
     override fun companions(error: JobValidationError): List<String> {
         val trackedEntityInstanceUid = interpreterHelper.parseIdentifiableUid(
-            regex.find(error.message)!!.groupValues.last()
+            regex.find(error.message)!!.groupValues.last(),
         )
         val trackedEntityTypeDisplayName = interpreterHelper.trackedEntityTypeDisplayName(
-            interpreterHelper.trackedEntityInstance(trackedEntityInstanceUid).trackedEntityType()!!
+            interpreterHelper.trackedEntityInstance(trackedEntityInstanceUid).trackedEntityType()!!,
         )
         return listOf(trackedEntityTypeDisplayName, trackedEntityTypeDisplayName, trackedEntityInstanceUid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1003Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1003Interpreter.kt
index 7c24442c75..6fee9650e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1003Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1003Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1003Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1003
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1005Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1005Interpreter.kt
index 49d5080545..0d940f1209 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1005Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1005Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1005Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1005
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1006Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1006Interpreter.kt
index d2679ce5e6..0d1969b476 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1006Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1006Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1006Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     // "Attribute: `Kv4fmHVAzwX`, does not exist."
     override val unformattedDescription = R.string.E1006
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1007Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1007Interpreter.kt
index a8ff210954..c2e1b9279d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1007Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1007Interpreter.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.R
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1007Interpreter internal constructor(
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1007
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1008Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1008Interpreter.kt
index 1835d03d6a..3161fdb638 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1008Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1008Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1008Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1008
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1009Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1009Interpreter.kt
index cd84f1b830..78e43c2476 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1009Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1009Interpreter.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.R
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1009Interpreter internal constructor(
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1009
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1032Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1032Interpreter.kt
index db758919e2..ee99e0e90c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1032Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1032Interpreter.kt
@@ -33,13 +33,13 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1032Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1032
     override fun companions(error: JobValidationError): List<String> {
         return listOf(
             interpreterHelper.programStageDisplayName(interpreterHelper.programStageUid(error.uid)),
-            error.uid
+            error.uid,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1063Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1063Interpreter.kt
index 019f780e61..82c84c828a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1063Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1063Interpreter.kt
@@ -33,12 +33,12 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1063Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1063
     override fun companions(error: JobValidationError): List<String> {
         val trackedEntityTypeDisplayName = interpreterHelper.trackedEntityTypeDisplayName(
-            interpreterHelper.trackedEntityInstance(error.uid).trackedEntityType()!!
+            interpreterHelper.trackedEntityInstance(error.uid).trackedEntityType()!!,
         )
         return listOf(trackedEntityTypeDisplayName, trackedEntityTypeDisplayName, error.uid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1064Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1064Interpreter.kt
index 999539db52..a075ac33eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1064Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1064Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1064Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1064
     override fun companions(error: JobValidationError): List<String> {
@@ -43,7 +43,7 @@ internal class E1064Interpreter internal constructor(
         return listOf(
             attributeValue,
             interpreterHelper.trackedEntityAttributeStoreDisplayName(attributeUid),
-            attributeUid
+            attributeUid,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1069Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1069Interpreter.kt
index fdcd087ce7..eb8f8df358 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1069Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1069Interpreter.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1069Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1069
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1081Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1081Interpreter.kt
index c0d5ed9729..402b80518a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1081Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1081Interpreter.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.R
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1081Interpreter internal constructor(
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1081
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1084Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1084Interpreter.kt
index 3e743f5df2..ae55813e15 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1084Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1084Interpreter.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.R
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1084Interpreter internal constructor(
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1084
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1100Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1100Interpreter.kt
index 2c6613baa2..56b472c764 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1100Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1100Interpreter.kt
@@ -33,12 +33,12 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1100Interpreter internal constructor(
     private val interpreterHelper: InterpreterHelper,
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1100
     override fun companions(error: JobValidationError): List<String> {
         val trackedEntityTypeDisplayName = interpreterHelper.trackedEntityTypeDisplayName(
-            interpreterHelper.trackedEntityInstance(error.uid).trackedEntityType()!!
+            interpreterHelper.trackedEntityInstance(error.uid).trackedEntityType()!!,
         )
         return listOf(trackedEntityTypeDisplayName, trackedEntityTypeDisplayName, error.uid)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1103Interpreter.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1103Interpreter.kt
index cb3ee8d233..e799d6a22a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1103Interpreter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/E1103Interpreter.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.R
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 
 internal class E1103Interpreter internal constructor(
-    override val regex: Regex
+    override val regex: Regex,
 ) : ErrorCodeInterpreter {
     override val unformattedDescription = R.string.E1103
     override fun companions(error: JobValidationError): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
index 2dcd33e1fa..4e98381607 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.tracker.importer.internal.interpreters
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.program.internal.ProgramStageStore
@@ -38,6 +37,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import javax.inject.Inject
 
 @Reusable
 internal class InterpreterHelper @Inject internal constructor(
@@ -47,7 +47,7 @@ internal class InterpreterHelper @Inject internal constructor(
     private val programStageStore: ProgramStageStore,
     private val organisationUnitStore: OrganisationUnitStore,
     private val trackedEntityTypeStore: TrackedEntityTypeStore,
-    private val trackedEntityAttributeStore: TrackedEntityAttributeStore
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
 ) {
 
     fun trackedEntityInstance(teiUid: String): TrackedEntityInstance {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt
index b87ef05aa4..58cc7e5938 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.tracker.importer.internal.interpreters
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.tracker.importer.internal.ImporterError
+import javax.inject.Inject
 
 @Reusable
 internal class InterpreterSelector @Inject internal constructor(
-    private val interpreterHelper: InterpreterHelper
+    private val interpreterHelper: InterpreterHelper,
 ) {
     fun getInterpreter(error: ImporterError): ErrorCodeInterpreter {
         return when (error) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
index 9f660a4093..eae4399cee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.usecase
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseCall
+import javax.inject.Inject
 
 @Reusable
 internal class UseCaseModuleDownloader @Inject constructor(
-    private val stockUseCaseCall: StockUseCaseCall
+    private val stockUseCaseCall: StockUseCaseCall,
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt
index 90803cd2f6..b04069943b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.usecase.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.usecase.UseCaseModule
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseCollectionRepository
+import javax.inject.Inject
 
 @Reusable
 internal class UseCaseModuleImpl @Inject internal constructor(
-    private val stockUseCases: StockUseCaseCollectionRepository
+    private val stockUseCases: StockUseCaseCollectionRepository,
 ) : UseCaseModule {
     override fun stockUseCases(): StockUseCaseCollectionRepository {
         return stockUseCases
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt
index 2550458fca..0a006f2614 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.usecase.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class UseCaseModuleWiper @Inject internal constructor(
-    private val tableWiper: TableWiper
+    private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             StockUseCaseTableInfo.TABLE_INFO,
-            StockUseCaseTransactionTableInfo.TABLE_INFO
+            StockUseCaseTransactionTableInfo.TABLE_INFO,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
index da07ebcf17..240f5bc68b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
@@ -39,8 +39,8 @@ import retrofit2.Retrofit
 @Module(
     includes = [
         StockUseCaseEntityDIModule::class,
-        StockUseCaseTransactionEntityDIModule::class
-    ]
+        StockUseCaseTransactionEntityDIModule::class,
+    ],
 )
 internal class UseCasePackageDIModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCase.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCase.kt
index ca114c01a0..ea1d309b2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCase.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCase.kt
@@ -37,7 +37,7 @@ data class StockUseCase(
     val programType: String,
     val description: String,
     val stockOnHand: String,
-    val transactions: List<StockUseCaseTransaction>
+    val transactions: List<StockUseCaseTransaction>,
 ) : ObjectWithUidInterface {
     override fun uid(): String {
         return programUid
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index cf61360c8f..593fa48f56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.usecase.stock
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
@@ -36,23 +35,27 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransformer
+import javax.inject.Inject
 
 @Reusable
 class StockUseCaseCollectionRepository @Inject internal constructor(
     store: StockUseCaseStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<InternalStockUseCase>>,
     scope: RepositoryScope,
-    transformer: StockUseCaseTransformer
+    transformer: StockUseCaseTransformer,
 ) : ReadOnlyWithUidCollectionRepository<StockUseCase> by
-ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<InternalStockUseCase, StockUseCase,
-    StockUseCaseCollectionRepository>(
+ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
+    InternalStockUseCase,
+    StockUseCase,
+    StockUseCaseCollectionRepository,
+    >(
     store,
     childrenAppenders,
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
         StockUseCaseCollectionRepository(store, childrenAppenders, s, transformer)
     },
-    transformer
+    transformer,
 ) {
     private val cf: FilterConnectorFactory<StockUseCaseCollectionRepository> =
         FilterConnectorFactory(scope) { s: RepositoryScope ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTableInfo.kt
index da9e3959f4..0e3a4e1926 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTableInfo.kt
@@ -53,7 +53,7 @@ object StockUseCaseTableInfo {
                 ITEM_DESCRIPTION,
                 PROGRAM_TYPE,
                 DESCRIPTION,
-                STOCK_ON_HAND
+                STOCK_ON_HAND,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt
index 1a3fcd089f..dcf812f257 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransaction.kt
@@ -35,26 +35,26 @@ sealed class StockUseCaseTransaction {
         override val sortOrder: Int,
         override val transactionType: TransactionType,
         val distributedTo: String,
-        val stockDistributed: String
+        val stockDistributed: String,
     ) : StockUseCaseTransaction()
 
     data class Discarded(
         override val sortOrder: Int,
         override val transactionType: TransactionType,
-        val stockDiscarded: String
+        val stockDiscarded: String,
     ) : StockUseCaseTransaction()
 
     data class Correction(
         override val sortOrder: Int,
         override val transactionType: TransactionType,
-        val stockCount: String
+        val stockCount: String,
     ) : StockUseCaseTransaction()
 
     companion object {
         enum class TransactionType {
             DISTRIBUTED,
             DISCARDED,
-            CORRECTED
+            CORRECTED,
         }
 
         internal fun transformFrom(t: InternalStockUseCaseTransaction): StockUseCaseTransaction {
@@ -64,7 +64,7 @@ sealed class StockUseCaseTransaction {
                         t.sortOrder(),
                         type,
                         t.distributedTo()!!,
-                        t.stockDistributed()!!
+                        t.stockDistributed()!!,
                     )
                 TransactionType.DISCARDED -> Discarded(t.sortOrder(), type, t.stockDiscarded()!!)
                 TransactionType.CORRECTED -> Correction(t.sortOrder(), type, t.stockCount()!!)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransactionTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransactionTableInfo.kt
index 74c2928dfa..a92eb9f429 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransactionTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseTransactionTableInfo.kt
@@ -54,7 +54,7 @@ object StockUseCaseTransactionTableInfo {
                 DISTRIBUTED_TO,
                 STOCK_DISTRIBUTED,
                 STOCK_DISCARDED,
-                STOCK_COUNT
+                STOCK_COUNT,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index e050e45468..90834cf1f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -29,16 +29,16 @@ package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.settings.internal.BaseSettingCall
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
+import javax.inject.Inject
 
 @Reusable
 internal class StockUseCaseCall @Inject constructor(
     private val stockUseCaseHandler: StockUseCaseHandler,
     private val stockUseCaseService: StockUseCaseService,
-    private val apiCallExecutor: RxAPICallExecutor
+    private val apiCallExecutor: RxAPICallExecutor,
 ) : BaseSettingCall<List<InternalStockUseCase>>() {
 
     override fun fetch(storeError: Boolean): Single<List<InternalStockUseCase>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
index 3ff4114b87..6cf0e9c435 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
+import javax.inject.Inject
 
 @Reusable
 internal class StockUseCaseHandler @Inject constructor(
     store: StockUseCaseStore,
-    private val transactionLinkHandler: StockUseCaseTransactionLinkHandler
+    private val transactionLinkHandler: StockUseCaseTransactionLinkHandler,
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<InternalStockUseCase>(store) {
 
     override fun beforeCollectionHandled(
-        oCollection: Collection<InternalStockUseCase>
+        oCollection: Collection<InternalStockUseCase>,
     ): Collection<InternalStockUseCase> {
         store.delete()
         transactionLinkHandler.resetAllLinks()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
index 14d27fb989..3188d4dc6f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
@@ -37,13 +37,13 @@ import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
 
 @Suppress("MagicNumber")
 internal class StockUseCaseStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : StockUseCaseStore,
     IdentifiableObjectStoreImpl<InternalStockUseCase>(
         databaseAdapter,
         StockUseCaseTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> InternalStockUseCase.create(cursor) }
+        { cursor: Cursor -> InternalStockUseCase.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
index 5db00d1629..df9ea686bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAp
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 
 internal class StockUseCaseTransactionChildrenAppender(
-    private val transactionLinkStore: StockUseCaseTransactionLinkStore
+    private val transactionLinkStore: StockUseCaseTransactionLinkStore,
 ) : ChildrenAppender<InternalStockUseCase>() {
 
     override fun appendChildren(internalStockUseCase: InternalStockUseCase): InternalStockUseCase {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
index fb31410034..6cf53815d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
+import javax.inject.Inject
 
 @Reusable
 internal class StockUseCaseTransactionLinkHandler @Inject constructor(
-    store: StockUseCaseTransactionLinkStore
+    store: StockUseCaseTransactionLinkStore,
 ) : LinkHandlerImpl<InternalStockUseCaseTransaction, InternalStockUseCaseTransaction>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
index a358b56176..864e1b1ff6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
@@ -38,20 +38,21 @@ import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
 
 @Suppress("MagicNumber")
 internal class StockUseCaseTransactionLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : StockUseCaseTransactionLinkStore,
     LinkStoreImpl<InternalStockUseCaseTransaction>(
         databaseAdapter,
         StockUseCaseTransactionTableInfo.TABLE_INFO,
         StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID,
         BINDER,
-        { cursor: Cursor -> InternalStockUseCaseTransaction.create(cursor) }
+        { cursor: Cursor -> InternalStockUseCaseTransaction.create(cursor) },
     ) {
 
     companion object {
         private val BINDER: StatementBinder<InternalStockUseCaseTransaction> =
             StatementBinder<InternalStockUseCaseTransaction> { o: InternalStockUseCaseTransaction,
-                w: StatementWrapper ->
+                                                               w: StatementWrapper,
+                ->
                 w.bind(1, o.programUid())
                 w.bind(2, o.sortOrder())
                 w.bind(3, o.transactionType())
@@ -63,7 +64,7 @@ internal class StockUseCaseTransactionLinkStoreImpl(
 
         val CHILD_PROJECTION: SingleParentChildProjection = SingleParentChildProjection(
             StockUseCaseTransactionTableInfo.TABLE_INFO,
-            StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID
+            StockUseCaseTransactionTableInfo.Columns.PROGRAM_UID,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
index 97f8106df5..16357ff57a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransaction
+import javax.inject.Inject
 
 @Reusable
 internal class StockUseCaseTransformer @Inject constructor() : TwoWayTransformer<InternalStockUseCase, StockUseCase> {
@@ -44,7 +44,7 @@ internal class StockUseCaseTransformer @Inject constructor() : TwoWayTransformer
             o.programType(),
             o.description(),
             o.stockOnHand(),
-            o.transactions()?.map { StockUseCaseTransaction.transformFrom(it) } ?: emptyList()
+            o.transactions()?.map { StockUseCaseTransaction.transformFrom(it) } ?: emptyList(),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AccountDeletionReason.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AccountDeletionReason.kt
index 82478ef20b..f84f4a5748 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AccountDeletionReason.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AccountDeletionReason.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.user
 
 enum class AccountDeletionReason {
     ACCOUNT_DISABLED,
-    APPLICATION_REQUEST
+    APPLICATION_REQUEST,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AccountManager.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AccountManager.kt
index 98e0704649..c9d465a812 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AccountManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AccountManager.kt
@@ -29,9 +29,9 @@
 package org.hisp.dhis.android.core.user
 
 import io.reactivex.Observable
-import kotlin.jvm.Throws
 import org.hisp.dhis.android.core.configuration.internal.DatabaseAccount
 import org.hisp.dhis.android.core.maintenance.D2Error
+import kotlin.jvm.Throws
 
 interface AccountManager {
     fun getAccounts(): List<DatabaseAccount>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index 507161a52d..880afc4ca4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
@@ -37,18 +36,19 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserCredentialsFields
 import org.hisp.dhis.android.core.user.internal.UserStore
 import org.hisp.dhis.android.core.user.internal.UserUserCredentialsTransformer
+import javax.inject.Inject
 
 @Reusable
 class UserCredentialsObjectRepository @Inject internal constructor(
     store: UserStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
     scope: RepositoryScope,
-    transformer: UserUserCredentialsTransformer
+    transformer: UserUserCredentialsTransformer,
 ) : ReadOnlyObjectRepository<UserCredentials> by ReadOnlyWithTransformerObjectRepositoryImpl(
     store,
     childrenAppenders,
     scope,
-    transformer
+    transformer,
 ) {
 
     private val cf: FilterConnectorFactory<UserCredentialsObjectRepository> = FilterConnectorFactory(scope) { s ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt
index b6777ecf93..752008b7a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerHelper.kt
@@ -54,7 +54,7 @@ internal object AccountManagerHelper {
         NoteTableInfo.TABLE_INFO,
         ProgramOwnerTableInfo.TABLE_INFO,
         RelationshipTableInfo.TABLE_INFO,
-        DataStoreEntryTableInfo.TABLE_INFO
+        DataStoreEntryTableInfo.TABLE_INFO,
     )
 
     private val syncStateQuery =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
index 0a0ca3168d..d031772615 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
@@ -32,7 +32,6 @@ import android.content.Context
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
@@ -46,6 +45,7 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AccountManager
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions")
@@ -55,7 +55,7 @@ internal class AccountManagerImpl @Inject constructor(
     private val databaseAdapterFactory: DatabaseAdapterFactory,
     private val credentialsSecureStore: CredentialsSecureStore,
     private val logOutCall: LogOutCall,
-    private val context: Context
+    private val context: Context,
 ) : AccountManager {
     private val accountDeletionSubject = PublishSubject.create<AccountDeletionReason>()
 
@@ -119,7 +119,7 @@ internal class AccountManagerImpl @Inject constructor(
         val loggedAccount = DatabaseConfigurationHelper.getLoggedAccount(
             configuration,
             credentials.username,
-            credentials.serverUrl
+            credentials.serverUrl,
         )
         val updatedConfiguration = DatabaseConfigurationHelper.removeAccount(configuration, listOf(loggedAccount))
         databasesConfigurationStore.set(updatedConfiguration)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
index d377e56068..6286d1e05f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo
 
 internal class AuthenticatedUserStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AuthenticatedUserStore,
     ObjectWithoutUidStoreImpl<AuthenticatedUser>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class AuthenticatedUserStoreImpl(
         BINDER,
         WHERE_UPDATE_BINDER,
         WHERE_DELETE_BINDER,
-        { cursor: Cursor -> AuthenticatedUser.create(cursor) }
+        { cursor: Cursor -> AuthenticatedUser.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
index 2365d99b3c..6928def29f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.user.Authority
+import javax.inject.Inject
 
 @Reusable
 internal class AuthorityHandler @Inject constructor(
-    store: AuthorityStore
+    store: AuthorityStore,
 ) : ObjectWithoutUidHandlerImpl<Authority>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
index 356d03d8ae..e3a9a8c6bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.user.Authority
 import org.hisp.dhis.android.core.user.AuthorityTableInfo
 
 internal class AuthorityStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : AuthorityStore,
     ObjectWithoutUidStoreImpl<Authority>(
         databaseAdapter,
@@ -45,7 +45,7 @@ internal class AuthorityStoreImpl(
         BINDER,
         WHERE_BINDER,
         WHERE_BINDER,
-        { cursor: Cursor -> Authority.create(cursor) }
+        { cursor: Cursor -> Authority.create(cursor) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: Authority, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 6a6372ce25..0671ecc41d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.authentication.internal.UserIdAuthenticatorHelper
@@ -48,6 +47,7 @@ import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -65,7 +65,7 @@ internal class LogInCall @Inject internal constructor(
     private val databaseManager: LogInDatabaseManager,
     private val exceptions: LogInExceptions,
     private val accountManager: AccountManagerImpl,
-    private val versionManager: DHISVersionManager
+    private val versionManager: DHISVersionManager,
 ) {
     fun logIn(username: String?, password: String?, serverUrl: String?): Single<User> {
         return Single.fromCallable {
@@ -86,7 +86,7 @@ internal class LogInCall @Inject internal constructor(
 
         val authenticateCall = userService.authenticate(
             UserIdAuthenticatorHelper.basic(username!!, password!!),
-            UserFields.allFieldsWithoutOrgUnit(null)
+            UserFields.allFieldsWithoutOrgUnit(null),
         )
 
         val credentials = Credentials(username, trimmedServerUrl!!, password, null)
@@ -177,7 +177,7 @@ internal class LogInCall @Inject internal constructor(
 
         val authenticateCall = userService.authenticate(
             "Bearer ${openIDConnectState.idToken}",
-            UserFields.allFieldsWithoutOrgUnit(versionManager.getVersion())
+            UserFields.allFieldsWithoutOrgUnit(versionManager.getVersion()),
         )
 
         var credentials: Credentials? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
index 1e84467be9..dc955ef3e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
@@ -29,14 +29,14 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
+import javax.inject.Inject
 
 @Reusable
 internal class LogInDatabaseManager @Inject internal constructor(
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
-    private val generalSettingCall: GeneralSettingCall
+    private val generalSettingCall: GeneralSettingCall,
 ) {
 
     fun loadDatabaseOnline(serverUrl: String, username: String): Completable {
@@ -45,14 +45,14 @@ internal class LogInDatabaseManager @Inject internal constructor(
                 multiUserDatabaseManager.loadExistingChangingEncryptionIfRequiredOtherwiseCreateNew(
                     serverUrl,
                     username,
-                    encrypt
+                    encrypt,
                 )
             }
             .doOnError {
                 multiUserDatabaseManager.loadExistingKeepingEncryptionOtherwiseCreateNew(
                     serverUrl,
                     username,
-                    false
+                    false,
                 )
             }
             .ignoreElement()
@@ -62,7 +62,7 @@ internal class LogInDatabaseManager @Inject internal constructor(
     fun loadExistingKeepingEncryption(serverUrl: String, username: String): Boolean {
         return multiUserDatabaseManager.loadExistingKeepingEncryption(
             serverUrl,
-            username
+            username,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt
index e3cf4d6f15..0fd61c9a4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import javax.inject.Inject
 
 @Reusable
 internal class LogInExceptions @Inject internal constructor(
-    private val credentialsSecureStore: CredentialsSecureStore
+    private val credentialsSecureStore: CredentialsSecureStore,
 ) {
 
     @Throws(D2Error::class)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt
index 1633fc06b3..69f9ee2973 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.user.internal
 
 import io.reactivex.Completable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -36,12 +35,13 @@ import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import javax.inject.Inject
 
 class LogOutCall @Inject internal constructor(
     private val databaseAdapter: DatabaseAdapter,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
     private val credentialsSecureStore: CredentialsSecureStore,
-    private val userIdStore: UserIdInMemoryStore
+    private val userIdStore: UserIdInMemoryStore,
 ) {
 
     fun logOut(): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt
index 5fe9b14e67..1c62c762b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt
@@ -29,8 +29,6 @@ package org.hisp.dhis.android.core.user.internal
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import dagger.Reusable
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIErrorMapper
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
@@ -38,12 +36,14 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import retrofit2.HttpException
 import retrofit2.Response
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooGenericExceptionCaught")
 internal class UserAccountDisabledErrorCatcher @Inject constructor(
     private val objectMapper: ObjectMapper,
-    private val accountManager: AccountManagerImpl
+    private val accountManager: AccountManagerImpl,
 ) : APICallErrorCatcher {
 
     override fun mustBeStored(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt
index 36ad2c8dc7..b52afa719c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt
@@ -30,14 +30,14 @@ package org.hisp.dhis.android.core.user.internal
 import android.util.Log
 import com.fasterxml.jackson.databind.ObjectMapper
 import dagger.Reusable
-import java.lang.Exception
-import java.net.HttpURLConnection
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIErrorMapper
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import retrofit2.Response
+import java.lang.Exception
+import java.net.HttpURLConnection
+import javax.inject.Inject
 
 @Reusable
 internal class UserAuthenticateCallErrorCatcher @Inject constructor(private val objectMapper: ObjectMapper) :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index a22a0cf182..ca8472852f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -29,13 +29,13 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import dagger.Reusable
-import java.util.concurrent.Callable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
+import java.util.concurrent.Callable
+import javax.inject.Inject
 
 @Reusable
 internal class UserCall @Inject constructor(
@@ -43,13 +43,13 @@ internal class UserCall @Inject constructor(
     private val apiCallExecutor: APICallExecutor,
     private val userService: UserService,
     private val userHandler: UserHandler,
-    private val dhisVersionManager: DHISVersionManager
+    private val dhisVersionManager: DHISVersionManager,
 ) : Callable<User> {
 
     @Throws(D2Error::class)
     override fun call(): User {
         val user = apiCallExecutor.executeObjectCall(
-            userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()))
+            userService.getUser(UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion())),
         )
 
         val transaction = genericCallData.databaseAdapter().beginNewTransaction()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
index 4bbb180d72..20fafabaa2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
@@ -46,7 +46,7 @@ internal class UserEntityDIModule {
     @Reusable
     fun childrenAppenders(userRoleChildrenAppender: UserRoleChildrenAppender): Map<String, ChildrenAppender<User>> {
         return mapOf(
-            UserFields.USER_ROLES to userRoleChildrenAppender
+            UserFields.USER_ROLES to userRoleChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserFields.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserFields.kt
index adfd082cca..b995cd96e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserFields.kt
@@ -87,7 +87,7 @@ object UserFields {
     private fun commonFields(): Fields.Builder<User> {
         return Fields.builder<User>().fields(
             uid, code, name, displayName, created, lastUpdated, birthday, education, gender, jobTitle, surname,
-            firstName, introduction, employer, interests, languages, email, phoneNumber, nationality, deleted
+            firstName, introduction, employer, interests, languages, email, phoneNumber, nationality, deleted,
         )
     }
 
@@ -123,7 +123,7 @@ object UserFields {
         return getBaseFields(version)
             .fields(
                 organisationUnits.with(OrganisationUnitFields.fieldsInUserCall),
-                teiSearchOrganisationUnits.with(OrganisationUnitFields.fieldsInUserCall)
+                teiSearchOrganisationUnits.with(OrganisationUnitFields.fieldsInUserCall),
             )
             .build()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
index 38d7f965c3..a0d296ce3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
@@ -28,17 +28,17 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 internal class UserHandler @Inject constructor(
     userStore: UserStore,
     private val userRoleHandler: UserRoleHandler,
-    private val userRoleCollectionCleaner: UserRoleCollectionCleaner
+    private val userRoleCollectionCleaner: UserRoleCollectionCleaner,
 ) : IdentifiableHandlerImpl<User>(userStore) {
 
     override fun beforeObjectHandled(o: User): User {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
index 5a23f23512..1eb709d94c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
@@ -33,5 +33,5 @@ import javax.inject.Inject
 @Reusable
 internal class UserInternalModule @Inject constructor(
     val userCall: UserCall,
-    val logInCall: LogInCall
+    val logInCall: LogInCall,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index 6f660e28c4..526afac53b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -30,10 +30,10 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions", "LongParameterList")
@@ -47,7 +47,7 @@ internal class UserModuleImpl @Inject constructor(
     private val userCredentials: UserCredentialsObjectRepository,
     private val user: UserObjectRepository,
     private val accountManager: AccountManagerImpl,
-    private val openIDConnectHandler: OpenIDConnectHandlerImpl
+    private val openIDConnectHandler: OpenIDConnectHandlerImpl,
 ) : UserModule {
 
     override fun authenticatedUser(): AuthenticatedUserObjectRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
index c0d0f6af8e..3a9ebc493d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+import javax.inject.Inject
 
 @Reusable
 internal class UserOrganisationUnitLinkHandler @Inject constructor(
-    store: UserOrganisationUnitLinkStore
+    store: UserOrganisationUnitLinkStore,
 ) : LinkHandlerImpl<OrganisationUnit, UserOrganisationUnitLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStore.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStore.kt
index 571f8b5c00..26f28a6a75 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStore.kt
@@ -27,11 +27,11 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import java.lang.RuntimeException
-import kotlin.Throws
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+import java.lang.RuntimeException
+import kotlin.Throws
 
 internal interface UserOrganisationUnitLinkStore : LinkStore<UserOrganisationUnitLink> {
     @Throws(RuntimeException::class)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
index 3301466add..48432a318f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
@@ -38,14 +38,14 @@ import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 
 internal class UserOrganisationUnitLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : UserOrganisationUnitLinkStore,
     LinkStoreImpl<UserOrganisationUnitLink>(
         databaseAdapter,
         UserOrganisationUnitLinkTableInfo.TABLE_INFO,
         UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
         BINDER,
-        { cursor: Cursor -> UserOrganisationUnitLink.create(cursor) }
+        { cursor: Cursor -> UserOrganisationUnitLink.create(cursor) },
     ) {
 
     @Throws(RuntimeException::class)
@@ -56,8 +56,8 @@ internal class UserOrganisationUnitLinkStoreImpl(
                 .appendKeyNumberValue(UserOrganisationUnitLinkTableInfo.Columns.ROOT, 1)
                 .appendKeyStringValue(
                     UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                    OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
-                ).build()
+                    OrganisationUnit.Scope.SCOPE_DATA_CAPTURE,
+                ).build(),
         )
     }
 
@@ -67,8 +67,8 @@ internal class UserOrganisationUnitLinkStoreImpl(
             WhereClauseBuilder()
                 .appendKeyStringValue(
                     UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                    scope.name
-                ).build()
+                    scope.name,
+                ).build(),
         )
     }
 
@@ -79,8 +79,8 @@ internal class UserOrganisationUnitLinkStoreImpl(
                 .appendKeyNumberValue(UserOrganisationUnitLinkTableInfo.Columns.USER_ASSIGNED, 1)
                 .appendKeyStringValue(
                     UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                    scope.name
-                ).build()
+                    scope.name,
+                ).build(),
         )
     }
 
@@ -89,7 +89,7 @@ internal class UserOrganisationUnitLinkStoreImpl(
             .appendKeyStringValue(UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT, organisationUnit)
             .appendKeyStringValue(
                 UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                OrganisationUnit.Scope.SCOPE_DATA_CAPTURE
+                OrganisationUnit.Scope.SCOPE_DATA_CAPTURE,
             )
             .build()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt
index 268c951058..6d966b6ec9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt
@@ -39,8 +39,8 @@ import retrofit2.Retrofit
         AuthorityEntityDIModule::class,
         UserRoleEntityDIModule::class,
         UserEntityDIModule::class,
-        UserOrganisationUnitLinkEntityDIModule::class
-    ]
+        UserOrganisationUnitLinkEntityDIModule::class,
+    ],
 )
 internal class UserPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
index 858871616f..ba16a9a283 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.User
+import javax.inject.Inject
 
 @Reusable
 internal class UserRoleChildrenAppender @Inject constructor(
-    private val store: UserRoleStore
+    private val store: UserRoleStore,
 ) : ChildrenAppender<User>() {
     override fun appendChildren(user: User): User {
         val builder = user.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
index 724d38a54c..c14704eb7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.user.UserRole
 import org.hisp.dhis.android.core.user.UserRoleTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class UserRoleCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<UserRole>(
     tableName = UserRoleTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
index 28ff22044b..9f089951a7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.UserRole
+import javax.inject.Inject
 
 @Reusable
 internal class UserRoleHandler @Inject constructor(
-    store: UserRoleStore
+    store: UserRoleStore,
 ) : IdentifiableHandlerImpl<UserRole>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
index c1bfdb8cf9..faa8429f59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
@@ -37,13 +37,13 @@ import org.hisp.dhis.android.core.user.UserRole
 import org.hisp.dhis.android.core.user.UserRoleTableInfo
 
 internal class UserRoleStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : UserRoleStore,
     IdentifiableObjectStoreImpl<UserRole>(
         databaseAdapter,
         UserRoleTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> UserRole.create(cursor) }
+        { cursor: Cursor -> UserRole.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<UserRole> = object : IdentifiableStatementBinder<UserRole>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
index a291dc572d..ad5a14291d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.user.UserTableInfo
 
 @Suppress("MagicNumber")
 internal class UserStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : UserStore,
     IdentifiableObjectStoreImpl<User>(
         databaseAdapter,
         UserTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> User.create(cursor) }
+        { cursor: Cursor -> User.create(cursor) },
     ) {
     companion object {
         private val BINDER: StatementBinder<User> = object : IdentifiableStatementBinder<User>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
index 3e9d4633a9..5c14af9be0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
@@ -29,10 +29,10 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserCredentials
+import javax.inject.Inject
 
 @Reusable
 internal class UserUserCredentialsTransformer @Inject constructor() : TwoWayTransformer<User, UserCredentials> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/IntentWithRequestCode.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/IntentWithRequestCode.kt
index 7f09a25543..7b32b82fd5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/IntentWithRequestCode.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/IntentWithRequestCode.kt
@@ -32,5 +32,5 @@ import android.content.Intent
 
 data class IntentWithRequestCode(
     val intent: Intent,
-    val requestCode: Int
+    val requestCode: Int,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectConfig.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectConfig.kt
index bc3a163448..b6ef288b1c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectConfig.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectConfig.kt
@@ -35,5 +35,5 @@ data class OpenIDConnectConfig(
     val redirectUri: Uri,
     val discoveryUri: Uri?,
     val authorizationUri: String?,
-    val tokenUrl: String?
+    val tokenUrl: String?,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
index 181d294f7e..eeb2223e39 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
@@ -34,10 +34,10 @@ import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
-import javax.inject.Inject
 import net.openid.appauth.*
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.LogInCall
+import javax.inject.Inject
 
 private const val RC_AUTH = 2021
 
@@ -45,7 +45,7 @@ private const val RC_AUTH = 2021
 internal class OpenIDConnectHandlerImpl @Inject constructor(
     private val context: Context,
     private val logInCall: LogInCall,
-    private val logoutHandler: OpenIDConnectLogoutHandler
+    private val logoutHandler: OpenIDConnectLogoutHandler,
 ) : OpenIDConnectHandler {
 
     override fun logIn(config: OpenIDConnectConfig): Single<IntentWithRequestCode> {
@@ -64,7 +64,7 @@ internal class OpenIDConnectHandlerImpl @Inject constructor(
     override fun handleLogInResponse(
         serverUrl: String,
         intent: Intent?,
-        requestCode: Int
+        requestCode: Int,
     ): Single<User> {
         return if (requestCode == RC_AUTH && intent != null) {
             val ex = AuthorizationException.fromIntent(intent)
@@ -86,7 +86,7 @@ internal class OpenIDConnectHandlerImpl @Inject constructor(
     override fun blockingHandleLogInResponse(
         serverUrl: String,
         intent: Intent?,
-        requestCode: Int
+        requestCode: Int,
     ): User {
         return handleLogInResponse(serverUrl, intent, requestCode).blockingGet()
     }
@@ -99,7 +99,7 @@ internal class OpenIDConnectHandlerImpl @Inject constructor(
         return Single.create { emitter ->
             val authService = AuthorizationService(context)
             authService.performTokenRequest(
-                tokenRequest
+                tokenRequest,
             ) { tokenResponse, tokenEx ->
                 authService.dispose()
                 val authState = AuthState()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt
index bc9767fe74..19567b281a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt
@@ -31,12 +31,12 @@ package org.hisp.dhis.android.core.user.openid
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
+import javax.inject.Inject
 
 @Reusable
 internal class OpenIDConnectLogoutHandler @Inject constructor(
-    private val credentialsSecureStore: CredentialsSecureStore
+    private val credentialsSecureStore: CredentialsSecureStore,
 ) {
 
     private val logOutSubject = PublishSubject.create<Unit>()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectRequestHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectRequestHelper.kt
index b1bab065ea..59902decc9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectRequestHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectRequestHelper.kt
@@ -61,25 +61,25 @@ internal class OpenIDConnectRequestHelper(private val config: OpenIDConnectConfi
     private fun loadAuthConfig(): Single<AuthorizationServiceConfiguration> {
         return if (config.authorizationUri == null || config.tokenUrl == null) {
             Single.error<AuthorizationServiceConfiguration>(
-                RuntimeException("Either discoveryUri or (authorizationUri and tokenUri) must be defined")
+                RuntimeException("Either discoveryUri or (authorizationUri and tokenUri) must be defined"),
             )
         } else {
             Single.just(
                 AuthorizationServiceConfiguration(
                     Uri.parse(config.authorizationUri),
-                    Uri.parse(config.tokenUrl)
-                )
+                    Uri.parse(config.tokenUrl),
+                ),
             )
         }
     }
 
     private fun buildRequest(
-        authServiceConfiguration: AuthorizationServiceConfiguration
+        authServiceConfiguration: AuthorizationServiceConfiguration,
     ): AuthorizationRequest = AuthorizationRequest.Builder(
         authServiceConfiguration,
         config.clientId,
         ResponseTypeValues.CODE,
-        config.redirectUri
+        config.redirectUri,
     ).apply {
         setScope("openid email profile")
     }.build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt
index 4c18dfe1c8..3bc93be92d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt
@@ -31,15 +31,15 @@ package org.hisp.dhis.android.core.user.openid
 import android.content.Context
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import net.openid.appauth.AuthState
 import net.openid.appauth.AuthorizationException
 import net.openid.appauth.AuthorizationService
+import javax.inject.Inject
 
 @Reusable
 internal class OpenIDConnectTokenRefresher @Inject constructor(
     private val context: Context,
-    private val logoutHandler: OpenIDConnectLogoutHandler
+    private val logoutHandler: OpenIDConnectLogoutHandler,
 ) {
 
     fun blockingGetFreshToken(authState: AuthState): String {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/util/DateExtensions.kt b/core/src/main/java/org/hisp/dhis/android/core/util/DateExtensions.kt
index 73bd71db56..8724228125 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/util/DateExtensions.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/util/DateExtensions.kt
@@ -28,8 +28,8 @@
 
 package org.hisp.dhis.android.core.util
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import java.util.*
 
 internal fun Date?.simpleDateFormat(): String? {
     return this?.let { DateUtils.SIMPLE_DATE_FORMAT.format(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/ValidationEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/ValidationEngine.kt
index ca84f88568..33397fe0e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/ValidationEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/ValidationEngine.kt
@@ -44,7 +44,7 @@ interface ValidationEngine {
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<ValidationResult>
 
     /**
@@ -63,6 +63,6 @@ interface ValidationEngine {
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): ValidationResult
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
index d7d3b95371..82fa48f7eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.validation.engine.internal
 
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantCollectionRepository
@@ -47,6 +46,7 @@ import org.hisp.dhis.android.core.validation.ValidationRuleCollectionRepository
 import org.hisp.dhis.android.core.validation.engine.ValidationEngine
 import org.hisp.dhis.android.core.validation.engine.ValidationResult
 import org.hisp.dhis.android.core.validation.engine.ValidationResult.ValidationResultStatus
+import javax.inject.Inject
 
 internal class ValidationEngineImpl @Inject constructor(
     private val validationExecutor: ValidationExecutor,
@@ -55,13 +55,13 @@ internal class ValidationEngineImpl @Inject constructor(
     private val constantRepository: ConstantCollectionRepository,
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
     private val periodHelper: PeriodHelper,
-    private val orgunitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore
+    private val orgunitGroupLinkStore: OrganisationUnitOrganisationUnitGroupLinkStore,
 ) : ValidationEngine {
     override fun validate(
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): Single<ValidationResult> {
         return Single.fromCallable { blockingValidate(dataSetUid, periodId, orgUnitUid, attributeOptionComboUid) }
     }
@@ -70,7 +70,7 @@ internal class ValidationEngineImpl @Inject constructor(
         dataSetUid: String,
         periodId: String,
         orgUnitUid: String,
-        attributeOptionComboUid: String
+        attributeOptionComboUid: String,
     ): ValidationResult {
         val rules = getValidationRulesForDataSetValidation(dataSetUid)
 
@@ -80,7 +80,7 @@ internal class ValidationEngineImpl @Inject constructor(
                 dataSetUid,
                 attributeOptionComboUid,
                 orgUnitUid,
-                periodId
+                periodId,
             )
             val orgunitGroupMap = orgunitGroupMap
             val organisationUnit = getOrganisationUnit(orgUnitUid)
@@ -113,7 +113,7 @@ internal class ValidationEngineImpl @Inject constructor(
         dataSetUid: String,
         attributeOptionComboUid: String,
         orgUnitUid: String,
-        periodId: String
+        periodId: String,
     ): Map<DimensionalItemObject, Double> {
         val dataValues = dataValueRepository
             .byDataSetUid(dataSetUid)
@@ -137,7 +137,7 @@ internal class ValidationEngineImpl @Inject constructor(
 
     private val orgunitGroupMap: Map<String, Int>
         get() = orgunitGroupLinkStore.groupAndGetCountBy(
-            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP
+            OrganisationUnitOrganisationUnitGroupLinkTableInfo.Columns.ORGANISATION_UNIT_GROUP,
         )
 
     private fun getPeriod(periodId: String): Period {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
index 7e896730eb..70693e5214 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.validation.engine.internal
 
-import javax.inject.Inject
-import javax.inject.Singleton
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
@@ -39,6 +37,8 @@ import org.hisp.dhis.android.core.validation.ValidationRuleExpression
 import org.hisp.dhis.android.core.validation.ValidationRuleOperator
 import org.hisp.dhis.android.core.validation.engine.ValidationResultSideEvaluation
 import org.hisp.dhis.android.core.validation.engine.ValidationResultViolation
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @Singleton
 internal class ValidationExecutor @Inject constructor(private val expressionService: ExpressionService) {
@@ -47,7 +47,7 @@ internal class ValidationExecutor @Inject constructor(private val expressionServ
         organisationUnit: OrganisationUnit?,
         context: ExpressionServiceContext,
         period: Period,
-        attributeOptionComboId: String?
+        attributeOptionComboId: String?,
     ): ValidationResultViolation? {
         return if (shouldSkipOrgunitLevel(rule, organisationUnit)) {
             null
@@ -55,12 +55,12 @@ internal class ValidationExecutor @Inject constructor(private val expressionServ
             val leftSideValue = expressionService.getExpressionValue(
                 rule.leftSide().expression(),
                 context,
-                rule.leftSide().missingValueStrategy()
+                rule.leftSide().missingValueStrategy(),
             ) as Double?
             val rightSideValue = expressionService.getExpressionValue(
                 rule.rightSide().expression(),
                 context,
-                rule.rightSide().missingValueStrategy()
+                rule.rightSide().missingValueStrategy(),
             ) as Double?
 
             if (isViolation(rule, leftSideValue, rightSideValue)) {
@@ -112,7 +112,7 @@ internal class ValidationExecutor @Inject constructor(private val expressionServ
     private fun buildSideResult(
         value: Double?,
         side: ValidationRuleExpression,
-        context: ExpressionServiceContext
+        context: ExpressionServiceContext,
     ): ValidationResultSideEvaluation {
         return ValidationResultSideEvaluation.builder()
             .value(value)
@@ -124,7 +124,7 @@ internal class ValidationExecutor @Inject constructor(private val expressionServ
 
     private fun shouldSkipOrgunitLevel(
         rule: ValidationRule,
-        organisationUnit: OrganisationUnit?
+        organisationUnit: OrganisationUnit?,
     ): Boolean {
         return rule.organisationUnitLevels().isNotEmpty() &&
             organisationUnit != null &&
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
index 68678d1509..598689b8ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
+import javax.inject.Inject
 
 @Reusable
 internal class DataSetValidationRuleLinkHandler @Inject constructor(
-    store: DataSetValidationRuleLinkStore
+    store: DataSetValidationRuleLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, DataSetValidationRuleLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
index 0afd7eca96..bb0ccf037c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLinkTableInfo
 
 internal class DataSetValidationRuleLinkStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : DataSetValidationRuleLinkStore,
     LinkStoreImpl<DataSetValidationRuleLink>(
         databaseAdapter,
         DataSetValidationRuleLinkTableInfo.TABLE_INFO,
         DataSetValidationRuleLinkTableInfo.Columns.DATA_SET,
         BINDER,
-        { cursor: Cursor -> DataSetValidationRuleLink.create(cursor) }
+        { cursor: Cursor -> DataSetValidationRuleLink.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
index af54e4ce76..b3fa25ae9c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
@@ -38,8 +38,8 @@ import retrofit2.Retrofit
     includes = [
         DataSetValidationRuleLinkEntityDIModule::class,
         ValidationEngineEntityDIModule::class,
-        ValidationRuleEntityDIModule::class
-    ]
+        ValidationRuleEntityDIModule::class,
+    ],
 )
 internal class ValidationPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
index 6914762d7e..743fab5c38 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.validation.ValidationRule
 import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class ValidationRuleCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<ValidationRule>(
     tableName = ValidationRuleTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
index 3295380f12..92f061756b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
@@ -28,14 +28,14 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.validation.ValidationRule
+import javax.inject.Inject
 
 @Reusable
 internal class ValidationRuleHandler @Inject constructor(
     store: ValidationRuleStore,
-    private val collectionCleaner: ValidationRuleCollectionCleaner
+    private val collectionCleaner: ValidationRuleCollectionCleaner,
 ) : IdentifiableHandlerImpl<ValidationRule>(store) {
     override fun afterCollectionHandled(oCollection: Collection<ValidationRule>?) {
         collectionCleaner.deleteNotPresent(oCollection)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
index 60387d8163..067d56dee8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
 
 @Suppress("MagicNumber")
 internal class ValidationRuleStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ValidationRuleStore,
     IdentifiableObjectStoreImpl<ValidationRule>(
         databaseAdapter,
         ValidationRuleTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> ValidationRule.create(cursor) }
+        { cursor: Cursor -> ValidationRule.create(cursor) },
     ) {
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/DataDimensionItemType.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/DataDimensionItemType.kt
index d75a1de17f..99899bcde6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/DataDimensionItemType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/DataDimensionItemType.kt
@@ -36,5 +36,5 @@ enum class DataDimensionItemType {
     PROGRAM_DATA_ELEMENT,
     PROGRAM_ATTRIBUTE,
     EXPRESSION_DIMENSION_ITEM,
-    VALIDATION_RULE
+    VALIDATION_RULE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/DigitGroupSeparator.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/DigitGroupSeparator.kt
index 79f1252c5a..71bd85bced 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/DigitGroupSeparator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/DigitGroupSeparator.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.visualization
 enum class DigitGroupSeparator {
     COMMA,
     SPACE,
-    NONE
+    NONE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/DimensionItemType.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/DimensionItemType.kt
index 2df68d6df0..95098b89f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/DimensionItemType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/DimensionItemType.kt
@@ -39,5 +39,5 @@ enum class DimensionItemType {
     VALIDATION_RULE,
     PERIOD,
     ORGANISATION_UNIT,
-    CATEGORY_OPTION
+    CATEGORY_OPTION,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/DisplayDensity.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/DisplayDensity.kt
index 757f1d13d7..0506fa8766 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/DisplayDensity.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/DisplayDensity.kt
@@ -31,5 +31,5 @@ enum class DisplayDensity {
     COMFORTABLE,
     NORMAL,
     COMPACT,
-    NONE
+    NONE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/HideEmptyItemStrategy.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/HideEmptyItemStrategy.kt
index 20791b7e2f..589e86aeee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/HideEmptyItemStrategy.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/HideEmptyItemStrategy.kt
@@ -32,7 +32,8 @@ enum class HideEmptyItemStrategy {
     BEFORE_FIRST,
     AFTER_LAST,
     BEFORE_FIRST_AFTER_LAST,
-    ALL;
+    ALL,
+    ;
 
     open fun isHide(): Boolean {
         return this == BEFORE_FIRST || this == AFTER_LAST || this == BEFORE_FIRST_AFTER_LAST || this == ALL
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/LayoutPosition.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/LayoutPosition.kt
index 7b58d17942..51ec386405 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/LayoutPosition.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/LayoutPosition.kt
@@ -31,5 +31,5 @@ package org.hisp.dhis.android.core.visualization
 enum class LayoutPosition {
     COLUMN,
     ROW,
-    FILTER
+    FILTER,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStrategy.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStrategy.kt
index 0036329116..52eec82507 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStrategy.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStrategy.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.visualization
 
 enum class LegendStrategy {
     FIXED,
-    BY_DATA_ITEM
+    BY_DATA_ITEM,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStyle.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStyle.kt
index 99197170e9..a894bd1c9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStyle.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/LegendStyle.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.visualization
 
 enum class LegendStyle {
     FILL,
-    TEXT
+    TEXT,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt
index 39161b055b..8b1c6c436f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36.kt
@@ -28,9 +28,9 @@
 
 package org.hisp.dhis.android.core.visualization
 
-import java.util.*
 import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.common.ObjectWithUid
+import java.util.*
 
 internal data class VisualizationAPI36(
     val id: String,
@@ -71,7 +71,7 @@ internal data class VisualizationAPI36(
     val aggregationType: AggregationType?,
     val columns: List<VisualizationDimension>,
     val rows: List<VisualizationDimension>,
-    val filters: List<VisualizationDimension>
+    val filters: List<VisualizationDimension>,
 ) {
     fun toVisualization(): Visualization =
         Visualization.builder()
@@ -114,7 +114,7 @@ internal data class VisualizationAPI36(
                     .style(legendDisplayStyle)
                     .strategy(legendDisplayStrategy)
                     .showKey(false)
-                    .build()
+                    .build(),
             )
             .columns(columns)
             .rows(rows)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt
index 0efb35d8f4..8a835b99da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDimensionItemTableInfo.kt
@@ -53,7 +53,7 @@ object VisualizationDimensionItemTableInfo {
                 POSITION,
                 DIMENSION,
                 DIMENSION_ITEM,
-                DIMENSION_ITEM_TYPE
+                DIMENSION_ITEM_TYPE,
             )
         }
 
@@ -64,7 +64,7 @@ object VisualizationDimensionItemTableInfo {
                 POSITION,
                 DIMENSION,
                 DIMENSION_ITEM,
-                DIMENSION_ITEM_TYPE
+                DIMENSION_ITEM_TYPE,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationTableInfo.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationTableInfo.kt
index 722f7f8798..7fca6da6ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationTableInfo.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationTableInfo.kt
@@ -79,7 +79,7 @@ object VisualizationTableInfo {
                 LEGEND_STYLE,
                 LEGEND_SET_ID,
                 LEGEND_STRATEGY,
-                AGGREGATION_TYPE
+                AGGREGATION_TYPE,
             )
         }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationType.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationType.kt
index 668c916ba6..d2999baa85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationType.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationType.kt
@@ -43,5 +43,5 @@ enum class VisualizationType {
     SINGLE_VALUE,
     PIVOT_TABLE,
     SCATTER,
-    BUBBLE
+    BUBBLE,
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
index 4f6f6096ee..7c2bd2ae3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
@@ -37,13 +36,14 @@ import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.visualization.Visualization
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationCall @Inject constructor(
     private val handler: VisualizationHandler,
     private val service: VisualizationService,
     private val dhis2VersionManager: DHISVersionManager,
-    private val apiDownloader: APIDownloader
+    private val apiDownloader: APIDownloader,
 ) : UidsCall<Visualization> {
 
     companion object {
@@ -59,13 +59,13 @@ internal class VisualizationCall @Inject constructor(
                 apiDownloader.downloadPartitioned(
                     uids,
                     MAX_UID_LIST_SIZE,
-                    handler
+                    handler,
                 ) { partitionUids: Set<String> ->
                     service.getSingleVisualization(
                         partitionUids.first(),
                         VisualizationFields.allFields,
                         accessFilter = accessFilter,
-                        paging = false
+                        paging = false,
                     )
                         .map { Payload(listOf(it)) }
                         .onErrorReturnItem(Payload())
@@ -74,13 +74,13 @@ internal class VisualizationCall @Inject constructor(
                 apiDownloader.downloadPartitioned(
                     uids,
                     MAX_UID_LIST_SIZE,
-                    handler
+                    handler,
                 ) { partitionUids: Set<String> ->
                     service.getSingleVisualizations36(
                         partitionUids.first(),
                         VisualizationFields.allFieldsAPI36,
                         accessFilter = accessFilter,
-                        paging = false
+                        paging = false,
                     )
                         .map { Payload(listOf(it.toVisualization())) }
                         .onErrorReturnItem(Payload())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
index 1d9f9b1d76..b125064d60 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
@@ -28,16 +28,16 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationCollectionCleaner @Inject constructor(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<Visualization>(
     tableName = VisualizationTableInfo.TABLE_INFO.name(),
-    databaseAdapter = databaseAdapter
+    databaseAdapter = databaseAdapter,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationColumnsRowsFiltersChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationColumnsRowsFiltersChildrenAppender.kt
index b71acb0ef2..b0030a3216 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationColumnsRowsFiltersChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationColumnsRowsFiltersChildrenAppender.kt
@@ -40,7 +40,7 @@ import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
 
 internal class VisualizationColumnsRowsFiltersChildrenAppender private constructor(
-    private val linkChildStore: SingleParentChildStore<Visualization, VisualizationDimensionItem>
+    private val linkChildStore: SingleParentChildStore<Visualization, VisualizationDimensionItem>,
 ) : ChildrenAppender<Visualization>() {
     override fun appendChildren(visualization: Visualization): Visualization {
         val items = linkChildStore.getChildren(visualization)
@@ -67,15 +67,15 @@ internal class VisualizationColumnsRowsFiltersChildrenAppender private construct
     companion object {
         private val CHILD_PROJECTION = SingleParentChildProjection(
             VisualizationDimensionItemTableInfo.TABLE_INFO,
-            VisualizationDimensionItemTableInfo.Columns.VISUALIZATION
+            VisualizationDimensionItemTableInfo.Columns.VISUALIZATION,
         )
 
         fun create(databaseAdapter: DatabaseAdapter): ChildrenAppender<Visualization> {
             return VisualizationColumnsRowsFiltersChildrenAppender(
                 singleParentChildStore(
                     databaseAdapter,
-                    CHILD_PROJECTION
-                ) { cursor: Cursor -> VisualizationDimensionItem.create(cursor) }
+                    CHILD_PROJECTION,
+                ) { cursor: Cursor -> VisualizationDimensionItem.create(cursor) },
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt
index bf77f22aec..6ba17c9850 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionFields.kt
@@ -43,7 +43,7 @@ internal object VisualizationDimensionFields {
             .fields(
                 fh.field<String>(BaseIdentifiableObject.UID),
                 fh.nestedField<VisualizationDimensionItem>(ITEMS)
-                    .with(VisualizationDimensionItemFields.allFields)
+                    .with(VisualizationDimensionItemFields.allFields),
             )
             .build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt
index b332ee3d16..8f99d66df2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemFields.kt
@@ -41,7 +41,7 @@ internal object VisualizationDimensionItemFields {
         Fields.builder<VisualizationDimensionItem>()
             .fields(
                 fh.field<String>(DIMENSION_ITEM),
-                fh.field<String>(DIMENSION_ITEM_TYPE)
+                fh.field<String>(DIMENSION_ITEM_TYPE),
             )
             .build()
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
index 2385d3ccac..5865931dd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
@@ -29,11 +29,11 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationDimensionItemHandler @Inject constructor(
-    store: VisualizationDimensionItemStore
+    store: VisualizationDimensionItemStore,
 ) : LinkHandlerImpl<VisualizationDimensionItem, VisualizationDimensionItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
index 1dad541871..331f0686d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
@@ -36,14 +36,14 @@ import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableI
 
 @Suppress("MagicNumber")
 internal class VisualizationDimensionItemStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : VisualizationDimensionItemStore,
     LinkStoreImpl<VisualizationDimensionItem>(
         databaseAdapter,
         VisualizationDimensionItemTableInfo.TABLE_INFO,
         VisualizationDimensionItemTableInfo.Columns.VISUALIZATION,
         BINDER,
-        { VisualizationDimensionItem.create(it) }
+        { VisualizationDimensionItem.create(it) },
     ) {
     companion object {
         private val BINDER = StatementBinder { o: VisualizationDimensionItem, w: StatementWrapper ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
index 1db7986d0e..4406bc76af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
@@ -47,7 +47,7 @@ internal class VisualizationEntityDIModule {
     @Reusable
     fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Visualization>> {
         return mapOf(
-            VisualizationFields.ITEMS to VisualizationColumnsRowsFiltersChildrenAppender.create(databaseAdapter)
+            VisualizationFields.ITEMS to VisualizationColumnsRowsFiltersChildrenAppender.create(databaseAdapter),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt
index 8efd06d828..4807c12ad3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationFields.kt
@@ -58,7 +58,7 @@ internal object VisualizationFields {
         get() =
             commonFields()
                 .fields(
-                    fh.field<VisualizationLegend>(LEGEND)
+                    fh.field<VisualizationLegend>(LEGEND),
                 )
                 .build()
 
@@ -68,7 +68,7 @@ internal object VisualizationFields {
                 .fields(
                     fh.field<String>(LEGEND_DISPLAY_STRATEGY),
                     fh.field<String>(LEGEND_DISPLAY_STYLE),
-                    fh.nestedFieldWithUid(LEGEND_SET)
+                    fh.nestedFieldWithUid(LEGEND_SET),
                 ).build()
 
     private fun commonFields(): Fields.Builder<Visualization> =
@@ -98,6 +98,6 @@ internal object VisualizationFields {
                 fh.field<DigitGroupSeparator>(VisualizationTableInfo.Columns.DIGIT_GROUP_SEPARATOR),
                 fh.nestedField<VisualizationDimension>(COLUMNS).with(VisualizationDimensionFields.allFields),
                 fh.nestedField<VisualizationDimension>(ROWS).with(VisualizationDimensionFields.allFields),
-                fh.nestedField<VisualizationDimension>(FILTERS).with(VisualizationDimensionFields.allFields)
+                fh.nestedField<VisualizationDimension>(FILTERS).with(VisualizationDimensionFields.allFields),
             )
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
index 2fde746733..03ad9b9a72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.visualization.LayoutPosition
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationHandler @Inject constructor(
     store: VisualizationStore,
     private val visualizationCollectionCleaner: VisualizationCollectionCleaner,
-    private val itemHandler: VisualizationDimensionItemHandler
+    private val itemHandler: VisualizationDimensionItemHandler,
 ) : IdentifiableHandlerImpl<Visualization>(store) {
 
     override fun afterObjectHandled(o: Visualization, action: HandleAction) {
@@ -60,7 +60,7 @@ internal class VisualizationHandler @Inject constructor(
 
     private fun toItems(
         dimensions: List<VisualizationDimension>?,
-        position: LayoutPosition
+        position: LayoutPosition,
     ): List<VisualizationDimensionItem> {
         return dimensions?.map { dimension ->
             if (dimension.items().isNullOrEmpty()) {
@@ -68,7 +68,7 @@ internal class VisualizationHandler @Inject constructor(
                     VisualizationDimensionItem.builder()
                         .position(position)
                         .dimension(dimension.id())
-                        .build()
+                        .build(),
                 )
             } else {
                 dimension.items()!!.map { item ->
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
index 1a1e15e7c5..bbfbf3c5f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
@@ -33,5 +33,5 @@ import javax.inject.Inject
 
 @Reusable
 internal class VisualizationInternalModule @Inject internal constructor(
-    @field:VisibleForTesting val visualizationCall: VisualizationCall
+    @field:VisibleForTesting val visualizationCall: VisualizationCall,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index 89fecb72a5..3fdf65157b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -29,15 +29,15 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
 import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.visualization.Visualization
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationModuleDownloader @Inject internal constructor(
     private val visualizationCall: VisualizationCall,
-    private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore
+    private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore,
 ) :
     TypedModuleDownloader<List<Visualization>> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt
index c7306a6660..523647e5d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.visualization.VisualizationCollectionRepository
 import org.hisp.dhis.android.core.visualization.VisualizationModule
+import javax.inject.Inject
 
 @Reusable
 internal class VisualizationModuleImpl @Inject internal constructor(
-    private val visualizations: VisualizationCollectionRepository
+    private val visualizations: VisualizationCollectionRepository,
 ) : VisualizationModule {
 
     override fun visualizations(): VisualizationCollectionRepository = visualizations
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
index e465bac131..94a4f6ba4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
@@ -28,18 +28,18 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import javax.inject.Inject
 
 @Reusable
 class VisualizationModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             VisualizationTableInfo.TABLE_INFO,
-            VisualizationDimensionItemTableInfo.TABLE_INFO
+            VisualizationDimensionItemTableInfo.TABLE_INFO,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
index b70233312d..0557e98fa7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
@@ -36,8 +36,8 @@ import retrofit2.Retrofit
 @Module(
     includes = [
         VisualizationEntityDIModule::class,
-        VisualizationDimensionItemEntityDIModule::class
-    ]
+        VisualizationDimensionItemEntityDIModule::class,
+    ],
 )
 internal class VisualizationPackageDIModule {
     @Provides
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt
index e90c78e9d4..7e29d5464b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt
@@ -43,7 +43,7 @@ internal interface VisualizationService {
         @Path(VISUALIZATION_UID) uid: String,
         @Query("fields") @Which fields: Fields<Visualization>,
         @Query("filter") accessFilter: String,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<Visualization>
 
     @GET("$VISUALIZATIONS/{$VISUALIZATION_UID}")
@@ -51,7 +51,7 @@ internal interface VisualizationService {
         @Path(VISUALIZATION_UID) uid: String,
         @Query("fields") @Which fields: Fields<Visualization>,
         @Query("filter") accessFilter: String,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Single<VisualizationAPI36>
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
index d7823e2a90..fcb4178133 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
@@ -38,13 +38,13 @@ import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
 
 @Suppress("MagicNumber")
 internal class VisualizationStoreImpl(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : VisualizationStore,
     IdentifiableObjectStoreImpl<Visualization>(
         databaseAdapter,
         VisualizationTableInfo.TABLE_INFO,
         BINDER,
-        { cursor: Cursor -> Visualization.create(cursor) }
+        { cursor: Cursor -> Visualization.create(cursor) },
     ) {
     companion object {
         private val BINDER = object : IdentifiableStatementBinder<Visualization>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt
index a053ea7fa8..0fd655c97c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.wipe.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.attribute.internal.AttributeModuleWiper
 import org.hisp.dhis.android.core.category.internal.CategoryModuleWiper
 import org.hisp.dhis.android.core.common.internal.CommonModuleWiper
@@ -62,6 +61,7 @@ import org.hisp.dhis.android.core.usecase.internal.UseCaseModuleWiper
 import org.hisp.dhis.android.core.user.internal.UserModuleWiper
 import org.hisp.dhis.android.core.validation.internal.ValidationModuleWiper
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleWiper
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
@@ -98,7 +98,7 @@ internal class D2ModuleWipers @Inject constructor(
     trackerJob: TrackerJobModuleWiper,
     user: UserModuleWiper,
     validation: ValidationModuleWiper,
-    visualization: VisualizationModuleWiper
+    visualization: VisualizationModuleWiper,
 ) {
     val wipers: List<ModuleWiper>
 
@@ -136,7 +136,7 @@ internal class D2ModuleWipers @Inject constructor(
             trackerJob,
             user,
             validation,
-            visualization
+            visualization,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt
index b8569970b3..3defe0f4bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.wipe.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
+import javax.inject.Inject
 
 @Reusable
 class TableWiper @Inject constructor(private val databaseAdapter: DatabaseAdapter) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt
index ef0bca8622..c5a8c20ef2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt
@@ -39,7 +39,7 @@ internal class WipeDIModule {
     @Reusable
     fun wipeModule(
         d2CallExecutor: D2CallExecutor,
-        moduleWipers: D2ModuleWipers
+        moduleWipers: D2ModuleWipers,
     ): WipeModule {
         return WipeModuleImpl(d2CallExecutor, moduleWipers.wipers)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt
index 64c263fb3c..78dce2b498 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 
 internal class WipeModuleImpl(
     private val d2CallExecutor: D2CallExecutor,
-    private val moduleWipers: List<ModuleWiper>
+    private val moduleWipers: List<ModuleWiper>,
 ) : WipeModule {
     @Throws(D2Error::class)
     override fun wipeEverything() {
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueConflictSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueConflictSamples.kt
index de248e4761..d7ec377b48 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueConflictSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueConflictSamples.kt
@@ -28,11 +28,11 @@
 
 package org.hisp.dhis.android.core.data.datavalue
 
-import java.text.ParseException
-import java.util.Date
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.ImportStatus
+import java.text.ParseException
+import java.util.Date
 
 object DataValueConflictSamples {
 
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt
index 5ceb71a50c..7ddf20aac6 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueSamples.kt
@@ -40,7 +40,7 @@ object DataValueSamples {
         period: String,
         categoryOptionCombo: String,
         attributeOptionCombo: String,
-        value: String
+        value: String,
     ): DataValue {
         return DataValue.builder()
             .id(1L)
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueUtils.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueUtils.kt
index 1ab631b357..35c30b97db 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueUtils.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/datavalue/DataValueUtils.kt
@@ -37,7 +37,7 @@ object DataValueUtils {
 
     val dataSets: List<DataSet> = listOf(
         DataSetSamples.getDataSet(),
-        DataSetSamples.getDataSet().toBuilder().uid("TuL8IOPzpHh").build()
+        DataSetSamples.getDataSet().toBuilder().uid("TuL8IOPzpHh").build(),
     )
 
     val periodIds: List<String> = listOf("201712", "2017")
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventDataFilterSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventDataFilterSamples.kt
index 0e0ebfc76d..30852dec92 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventDataFilterSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventDataFilterSamples.kt
@@ -27,13 +27,13 @@
  */
 package org.hisp.dhis.android.core.data.event
 
-import java.text.ParseException
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DatePeriodType
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.event.EventDataFilter
+import java.text.ParseException
+import java.util.*
 
 internal object EventDataFilterSamples {
     fun get(): EventDataFilter {
@@ -53,7 +53,7 @@ internal object EventDataFilterSamples {
                     .startDate(getSimpleDate("2014-05-01"))
                     .endDate(getSimpleDate("2019-03-20"))
                     .type(DatePeriodType.ABSOLUTE)
-                    .build()
+                    .build(),
             )
             .build()
     }
@@ -78,7 +78,7 @@ internal object EventDataFilterSamples {
                     .startDate(getSimpleDate("2014-05-01"))
                     .endDate(getSimpleDate("2019-03-20"))
                     .type(DatePeriodType.ABSOLUTE)
-                    .build()
+                    .build(),
             )
             .build()
     }
@@ -91,7 +91,7 @@ internal object EventDataFilterSamples {
                     .startBuffer(-5)
                     .endBuffer(5)
                     .type(DatePeriodType.RELATIVE)
-                    .build()
+                    .build(),
             )
             .build()
     }
@@ -103,7 +103,7 @@ internal object EventDataFilterSamples {
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.LAST_WEEK)
                     .type(DatePeriodType.RELATIVE)
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventFilterSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventFilterSamples.kt
index e6bc8c7a97..b7e36f7689 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventFilterSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/event/EventFilterSamples.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.data.event
 
-import java.text.ParseException
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriod
@@ -38,6 +36,8 @@ import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.event.EventQueryCriteria
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import java.text.ParseException
+import java.util.*
 
 internal object EventFilterSamples {
     @JvmStatic
@@ -69,28 +69,28 @@ internal object EventFilterSamples {
                             .startDate(getSimpleDate("2014-05-01"))
                             .endDate(getSimpleDate("2014-05-01"))
                             .type(DatePeriodType.ABSOLUTE)
-                            .build()
+                            .build(),
                     )
                     .dueDate(
                         DateFilterPeriod.builder()
                             .period(RelativePeriod.LAST_2_SIXMONTHS)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
                     .lastUpdatedDate(
                         DateFilterPeriod.builder()
                             .startBuffer(-5)
                             .endBuffer(5)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
                     .completedDate(
                         DateFilterPeriod.builder()
                             .period(RelativePeriod.TODAY)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/fileresource/FileResourceSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/fileresource/FileResourceSamples.kt
index 252be80d22..c5492560f7 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/fileresource/FileResourceSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/fileresource/FileResourceSamples.kt
@@ -27,12 +27,12 @@
  */
 package org.hisp.dhis.android.core.data.fileresource
 
-import java.text.ParseException
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomain
+import java.text.ParseException
+import java.util.*
 
 object FileResourceSamples {
     fun get(): FileResource {
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/maps/MapLayerImageryProviderSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/maps/MapLayerImageryProviderSamples.kt
index 71d64a117b..75a458840b 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/maps/MapLayerImageryProviderSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/maps/MapLayerImageryProviderSamples.kt
@@ -47,8 +47,8 @@ object MapLayerImageryProviderSamples {
                         .bbox(listOf(90.0, 180.0))
                         .zoomMax(7)
                         .zoomMin(0)
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSectionSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSectionSamples.kt
index cfad250e8a..910b107153 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSectionSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramSectionSamples.kt
@@ -48,12 +48,12 @@ object ProgramSectionSamples {
                 renderType(
                     SectionRendering.create(
                         SectionDeviceRendering.create(
-                            SectionRenderingType.SEQUENTIAL
+                            SectionRenderingType.SEQUENTIAL,
                         ),
                         SectionDeviceRendering.create(
-                            SectionRenderingType.LISTING
-                        )
-                    )
+                            SectionRenderingType.LISTING,
+                        ),
+                    ),
                 )
             }.build()
         }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt
index 02863bf659..d948872b93 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt
@@ -45,12 +45,12 @@ object ProgramStageSectionSamples {
                 renderType(
                     SectionRendering.create(
                         SectionDeviceRendering.create(
-                            SectionRenderingType.SEQUENTIAL
+                            SectionRenderingType.SEQUENTIAL,
                         ),
                         SectionDeviceRendering.create(
-                            SectionRenderingType.LISTING
-                        )
-                    )
+                            SectionRenderingType.LISTING,
+                        ),
+                    ),
                 )
                 programStage(ObjectWithUid.create("program_stage_uid"))
             }.build()
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterSamples.kt
index 9edd29e0be..8e4ed5d8fd 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListAttributeValueFilterSamples.kt
@@ -52,7 +52,7 @@ internal object ProgramStageWorkingListAttributeValueFilterSamples {
                     .startDate(parseDate("2014-05-01"))
                     .endDate(parseDate("2019-03-20"))
                     .type(DatePeriodType.ABSOLUTE)
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListEventDataFilterSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListEventDataFilterSamples.kt
index 8f09d37e4a..4176299e69 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListEventDataFilterSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListEventDataFilterSamples.kt
@@ -50,7 +50,7 @@ internal object ProgramStageWorkingListEventDataFilterSamples {
                     .startDate(parseDate("2014-05-01"))
                     .endDate(parseDate("2019-03-20"))
                     .type(DatePeriodType.ABSOLUTE)
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListSamples.kt
index 188191cec6..6c6e75fddc 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/programstageworkinglist/ProgramStageWorkingListSamples.kt
@@ -55,45 +55,45 @@ object ProgramStageWorkingListSamples {
                             .startDate(parseDate("2014-05-01"))
                             .endDate(parseDate("2014-05-01"))
                             .type(DatePeriodType.ABSOLUTE)
-                            .build()
+                            .build(),
                     )
                     .eventOccurredAt(
                         DateFilterPeriod.builder()
                             .period(RelativePeriod.LAST_10_FINANCIAL_YEARS)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
                     .eventScheduledAt(
                         DateFilterPeriod.builder()
                             .startBuffer(-5)
                             .endBuffer(5)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
                     .enrollmentStatus(EnrollmentStatus.ACTIVE)
                     .enrolledAt(
                         DateFilterPeriod.builder()
                             .period(RelativePeriod.TODAY)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
                     .enrollmentOccurredAt(
                         DateFilterPeriod.builder()
                             .period(RelativePeriod.LAST_2_SIXMONTHS)
                             .type(DatePeriodType.RELATIVE)
-                            .build()
+                            .build(),
                     )
                     .order("order")
                     .displayColumnOrder(
                         listOf(
                             "column1",
-                            "column2"
-                        )
+                            "column2",
+                        ),
                     )
                     .orgUnit("orgunit")
                     .ouMode(OrganisationUnitMode.ACCESSIBLE)
                     .assignedUserMode(AssignedUserMode.CURRENT)
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/relationship/RelationshipTypeSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/relationship/RelationshipTypeSamples.kt
index d1fb8ffb8b..f2c77705c7 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/relationship/RelationshipTypeSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/relationship/RelationshipTypeSamples.kt
@@ -101,6 +101,6 @@ object RelationshipTypeSamples {
     val typeMap: Map<String, RelationshipType> = mapOf(
         RELATIONSHIP_TYPE_UID_1 to RELATIONSHIP_TYPE_1,
         RELATIONSHIP_TYPE_UID_2 to RELATIONSHIP_TYPE_2,
-        RELATIONSHIP_TYPE_UID_3 to RELATIONSHIP_TYPE_3
+        RELATIONSHIP_TYPE_UID_3 to RELATIONSHIP_TYPE_3,
     )
 }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/AnalyticsSettingsSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/AnalyticsSettingsSamples.kt
index dac10f9a22..50f5644d3b 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/AnalyticsSettingsSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/AnalyticsSettingsSamples.kt
@@ -95,9 +95,9 @@ object AnalyticsSettingsSamples {
                         AnalyticsTeiWHONutritionGenderValues.builder()
                             .female("female")
                             .male("male")
-                            .build()
+                            .build(),
                     )
-                    .build()
+                    .build(),
             )
             .x(AnalyticsTeiWHONutritionItem.builder().build())
             .y(AnalyticsTeiWHONutritionItem.builder().build())
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/LatestAppVersionSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/LatestAppVersionSamples.kt
index 0a9d3e9a6b..9d34d51ba1 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/LatestAppVersionSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/LatestAppVersionSamples.kt
@@ -33,7 +33,7 @@ object LatestAppVersionSamples {
     val latestAppVersion: LatestAppVersion = LatestAppVersion.builder()
         .id(1L)
         .downloadURL(
-            "https://github.com/dhis2/dhis2-android-capture-app/releases/download/2.7.1.1/dhis2-v2.7.1.1.apk"
+            "https://github.com/dhis2/dhis2-android-capture-app/releases/download/2.7.1.1/dhis2-v2.7.1.1.apk",
         )
         .version("v2.7.1.1")
         .build()
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/AttributeValueFilterSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/AttributeValueFilterSamples.kt
index 145727a8ca..63a9797804 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/AttributeValueFilterSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/AttributeValueFilterSamples.kt
@@ -27,13 +27,13 @@
  */
 package org.hisp.dhis.android.core.data.trackedentity
 
-import java.text.ParseException
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DatePeriodType
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
+import java.text.ParseException
+import java.util.*
 
 internal object AttributeValueFilterSamples {
     fun get(): AttributeValueFilter {
@@ -55,7 +55,7 @@ internal object AttributeValueFilterSamples {
                     .startDate(getSimpleDate("2014-05-01"))
                     .endDate(getSimpleDate("2019-03-20"))
                     .type(DatePeriodType.ABSOLUTE)
-                    .build()
+                    .build(),
             )
             .build()
     }
@@ -82,7 +82,7 @@ internal object AttributeValueFilterSamples {
                     .startDate(getSimpleDate("2014-05-01"))
                     .endDate(getSimpleDate("2019-03-20"))
                     .type(DatePeriodType.ABSOLUTE)
-                    .build()
+                    .build(),
             )
             .build()
     }
@@ -95,7 +95,7 @@ internal object AttributeValueFilterSamples {
                     .startBuffer(-5)
                     .endBuffer(5)
                     .type(DatePeriodType.RELATIVE)
-                    .build()
+                    .build(),
             )
             .build()
     }
@@ -107,7 +107,7 @@ internal object AttributeValueFilterSamples {
                 DateFilterPeriod.builder()
                     .period(RelativePeriod.LAST_WEEK)
                     .type(DatePeriodType.RELATIVE)
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
index ee7b8ff702..8d0c358230 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
@@ -42,7 +42,7 @@ internal object TrackerQueryCommonParamsSamples {
             false,
             OrganisationUnitMode.ACCESSIBLE,
             listOf(),
-            50
+            50,
         )
     }
 }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/ownership/ProgramTempOwnerSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/ownership/ProgramTempOwnerSamples.kt
index 329220a78d..f1ddd726e3 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/ownership/ProgramTempOwnerSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/trackedentity/ownership/ProgramTempOwnerSamples.kt
@@ -27,9 +27,9 @@
  */
 package org.hisp.dhis.android.core.data.trackedentity.ownership
 
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwner
+import java.util.*
 
 object ProgramTempOwnerSamples {
 
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt
index 1d9afc8cc2..56875031e1 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/utils/FillPropertiesTestUtils.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.data.utils
 
-import java.text.ParseException
-import java.util.*
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.BaseNameableObject
+import java.text.ParseException
+import java.util.*
 
 /**
  * A collection of convenience functions/abstractions to be used by the tests.
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/visualization/VisualizationSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/visualization/VisualizationSamples.kt
index 9952630592..a4990a8d01 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/visualization/VisualizationSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/visualization/VisualizationSamples.kt
@@ -75,7 +75,7 @@ internal object VisualizationSamples {
                 .showKey(false)
                 .strategy(LegendStrategy.FIXED)
                 .style(LegendStyle.FILL)
-                .build()
+                .build(),
         )
         .displayDensity(DisplayDensity.NORMAL)
         .digitGroupSeparator(DigitGroupSeparator.COMMA)
@@ -92,8 +92,8 @@ internal object VisualizationSamples {
                             VisualizationDimensionItem.builder()
                                 .dimensionItem("cYeuwXTCPkU")
                                 .dimensionItemType(DataDimensionItemType.DATA_ELEMENT.name)
-                                .build()
-                        )
+                                .build(),
+                        ),
                     )
                     .build(),
                 VisualizationDimension.builder()
@@ -107,11 +107,11 @@ internal object VisualizationSamples {
                             VisualizationDimensionItem.builder()
                                 .dimensionItem("wbrDrL2aYEc")
                                 .dimensionItemType("CATEGORY_OPTION")
-                                .build()
-                        )
+                                .build(),
+                        ),
                     )
-                    .build()
-            )
+                    .build(),
+            ),
         )
         .rows(
             listOf(
@@ -134,11 +134,11 @@ internal object VisualizationSamples {
                             VisualizationDimensionItem.builder()
                                 .dimensionItem(RelativePeriod.LAST_12_MONTHS.name)
                                 .dimensionItemType("PERIOD")
-                                .build()
-                        )
+                                .build(),
+                        ),
                     )
-                    .build()
-            )
+                    .build(),
+            ),
         )
         .filters(
             listOf(
@@ -152,11 +152,11 @@ internal object VisualizationSamples {
                                 .build(),
                             VisualizationDimensionItem.builder()
                                 .dimensionItem("USER_ORGUNIT")
-                                .build()
-                        )
+                                .build(),
+                        ),
                     )
-                    .build()
-            )
+                    .build(),
+            ),
         )
         .aggregationType(AggregationType.SUM)
         .build()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt
index 733d4760a7..66930649e8 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelperShould.kt
@@ -52,7 +52,7 @@ class AnalyticsOrganisationUnitHelperShould {
         userOrganisationUnitStore,
         organisationUnitStore,
         organisationUnitLevelStore,
-        organisationUnitOrganisationUnitGroupLinkStore
+        organisationUnitOrganisationUnitGroupLinkStore,
     )
 
     @Test
@@ -62,11 +62,11 @@ class AnalyticsOrganisationUnitHelperShould {
 
         whenever(
             userOrganisationUnitStore
-                .queryAssignedOrganisationUnitUidsByScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
+                .queryAssignedOrganisationUnitUidsByScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE),
         ) doReturn unorderedList
 
         whenever(
-            organisationUnitStore.selectUidsWhere(any(), any())
+            organisationUnitStore.selectUidsWhere(any(), any()),
         ) doReturn orderedList
 
         val relativeUids = helper.getRelativeOrganisationUnitUids(RelativeOrganisationUnit.USER_ORGUNIT)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelperShould.kt
index ef1156fb57..2babaeaa9c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelperShould.kt
@@ -37,12 +37,12 @@ import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.analytics.aggregated.AbsoluteDimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
-import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceHelperSamples as s
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceHelperSamples as s
 
 @RunWith(JUnit4::class)
 class AnalyticsServiceDimensionHelperShould {
@@ -69,9 +69,9 @@ class AnalyticsServiceDimensionHelperShould {
                 s.categoryItem1_1,
                 s.orgunitAbsolute,
                 s.categoryItem1_2,
-                s.categoryItem2_1
+                s.categoryItem2_1,
             ),
-            filters = listOf()
+            filters = listOf(),
         )
 
         val dimensionSet = helper.getQueryDimensions(params)
@@ -81,7 +81,7 @@ class AnalyticsServiceDimensionHelperShould {
             Dimension.Period,
             Dimension.OrganisationUnit,
             Dimension.Category(s.categoryItem1_1.uid),
-            Dimension.Category(s.categoryItem2_1.uid)
+            Dimension.Category(s.categoryItem2_1.uid),
         )
     }
 
@@ -95,15 +95,15 @@ class AnalyticsServiceDimensionHelperShould {
                 s.periodAbsolute2,
                 s.orgunitAbsolute,
                 s.categoryItem1_1,
-                s.categoryItem1_2
+                s.categoryItem1_2,
             ),
-            filters = listOf()
+            filters = listOf(),
         )
         val dimensionsMap = mapOf(
             Dimension.Period to listOf(s.periodAbsolute1, s.periodAbsolute2),
             Dimension.Data to listOf(s.dataElementItem1, s.indicatorItem),
             Dimension.OrganisationUnit to listOf(s.orgunitAbsolute),
-            Dimension.Category(s.categoryItem1_1.uid) to listOf(s.categoryItem1_1, s.categoryItem1_2)
+            Dimension.Category(s.categoryItem1_1.uid) to listOf(s.categoryItem1_1, s.categoryItem1_2),
         )
 
         val items = helper.getEvaluationItems(params, dimensionsMap)
@@ -116,7 +116,7 @@ class AnalyticsServiceDimensionHelperShould {
             item(s.periodAbsolute2, s.dataElementItem1, s.orgunitAbsolute, s.categoryItem1_1),
             item(s.periodAbsolute2, s.dataElementItem1, s.orgunitAbsolute, s.categoryItem1_2),
             item(s.periodAbsolute2, s.indicatorItem, s.orgunitAbsolute, s.categoryItem1_1),
-            item(s.periodAbsolute2, s.indicatorItem, s.orgunitAbsolute, s.categoryItem1_2)
+            item(s.periodAbsolute2, s.indicatorItem, s.orgunitAbsolute, s.categoryItem1_2),
         )
     }
 
@@ -127,20 +127,20 @@ class AnalyticsServiceDimensionHelperShould {
                 s.dataElementItem1,
                 s.periodAbsolute1,
                 s.orgunitAbsolute,
-                s.categoryItem1_1
+                s.categoryItem1_1,
             ),
-            filters = listOf()
+            filters = listOf(),
         )
         val dimensionsMap = mapOf(
             Dimension.Period to listOf(s.periodAbsolute1),
             Dimension.Data to listOf(s.dataElementItem1),
-            Dimension.Category(s.categoryItem1_1.uid) to listOf(s.categoryItem1_1)
+            Dimension.Category(s.categoryItem1_1.uid) to listOf(s.categoryItem1_1),
         )
 
         val items = helper.getEvaluationItems(params, dimensionsMap)
 
         assertThat(items).containsExactly(
-            item(s.periodAbsolute1, s.dataElementItem1, s.categoryItem1_1)
+            item(s.periodAbsolute1, s.dataElementItem1, s.categoryItem1_1),
         )
     }
 
@@ -156,7 +156,7 @@ class AnalyticsServiceDimensionHelperShould {
         val dimensionItems = listOf(
             s.dataElementItem1,
             s.periodLast3Days,
-            s.orgunitAbsolute
+            s.orgunitAbsolute,
         )
         val dimensions = listOf(Dimension.Data, Dimension.Period, Dimension.OrganisationUnit)
 
@@ -168,10 +168,10 @@ class AnalyticsServiceDimensionHelperShould {
                 Dimension.Period to listOf(
                     DimensionItem.PeriodItem.Absolute("20210701"),
                     DimensionItem.PeriodItem.Absolute("20210702"),
-                    DimensionItem.PeriodItem.Absolute("20210703")
+                    DimensionItem.PeriodItem.Absolute("20210703"),
                 ),
-                Dimension.OrganisationUnit to listOf(s.orgunitAbsolute)
-            )
+                Dimension.OrganisationUnit to listOf(s.orgunitAbsolute),
+            ),
         )
     }
 
@@ -183,7 +183,7 @@ class AnalyticsServiceDimensionHelperShould {
         val dimensionItems = listOf(
             s.dataElementItem1,
             s.periodAbsolute1,
-            s.orgunitLevel3
+            s.orgunitLevel3,
         )
         val dimensions = listOf(Dimension.Data, Dimension.Period, Dimension.OrganisationUnit)
 
@@ -196,16 +196,16 @@ class AnalyticsServiceDimensionHelperShould {
                 Dimension.OrganisationUnit to listOf(
                     DimensionItem.OrganisationUnitItem.Absolute("orgunit1"),
                     DimensionItem.OrganisationUnitItem.Absolute("orgunit2"),
-                    DimensionItem.OrganisationUnitItem.Absolute("orgunit3")
-                )
-            )
+                    DimensionItem.OrganisationUnitItem.Absolute("orgunit3"),
+                ),
+            ),
         )
     }
 
     private fun item(vararg items: AbsoluteDimensionItem): AnalyticsServiceEvaluationItem {
         return AnalyticsServiceEvaluationItem(
             dimensionItems = items.toList(),
-            filters = listOf()
+            filters = listOf(),
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
index 6529714d3b..a86fb84b40 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelperShould.kt
@@ -31,7 +31,6 @@ package org.hisp.dhis.android.core.analytics.aggregated.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceHelperSamples as s
 import org.hisp.dhis.android.core.analytics.aggregated.mock.AggregatedSamples
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
@@ -51,6 +50,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeS
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceHelperSamples as s
 
 @RunWith(JUnit4::class)
 class AnalyticsServiceMetadataHelperShould {
@@ -88,7 +88,7 @@ class AnalyticsServiceMetadataHelperShould {
         programIndicatorRepository,
         analyticsOrganisationUnitHelper,
         parentPeriodGenerator,
-        periodHelper
+        periodHelper,
     )
 
     @Test
@@ -100,8 +100,8 @@ class AnalyticsServiceMetadataHelperShould {
         val evaluationItems = listOf(
             AnalyticsServiceEvaluationItem(
                 dimensionItems = listOf(s.categoryItem1_1, s.categoryItem1_2),
-                filters = listOf()
-            )
+                filters = listOf(),
+            ),
         )
 
         val metadataMap = helper.getMetadata(evaluationItems)
@@ -109,7 +109,7 @@ class AnalyticsServiceMetadataHelperShould {
         assertThat(metadataMap.keys).containsExactly(
             s.categoryItem1_1.uid,
             s.categoryItem1_1.categoryOption,
-            s.categoryItem1_2.categoryOption
+            s.categoryItem1_2.categoryOption,
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt
index 2a809320bf..e5b6060d47 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelperShould.kt
@@ -63,7 +63,7 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
     private val helper = AnalyticsVisualizationsServiceDimensionHelper(
         categoryStore,
         categoryOptionLinkStore,
-        organisationUnitLevelStore
+        organisationUnitLevelStore,
     )
 
     @Test
@@ -76,10 +76,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid1)
                             .dimensionItemType(DimensionItemType.DATA_ELEMENT.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -103,10 +103,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem("$uid1.$uid2")
                             .dimensionItemType(DimensionItemType.DATA_ELEMENT_OPERAND.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -132,10 +132,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid1)
                             .dimensionItemType(DimensionItemType.INDICATOR.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -159,10 +159,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid1)
                             .dimensionItemType(DimensionItemType.PROGRAM_INDICATOR.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -186,10 +186,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem("$uid1.$uid2")
                             .dimensionItemType(DimensionItemType.PROGRAM_DATA_ELEMENT.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -215,10 +215,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem("$uid1.$uid2")
                             .dimensionItemType(DimensionItemType.PROGRAM_ATTRIBUTE.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -244,10 +244,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid1)
                             .dimensionItemType(DimensionItemType.EXPRESSION_DIMENSION_ITEM.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dataDimensions)
@@ -279,10 +279,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                             .build(),
                         VisualizationDimensionItem.builder()
                             .dimensionItem("LEVEL-1")
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         whenever(organisationUnitLevelStore.selectOneWhere(anyString())) doReturn orgUnitLevel
@@ -314,10 +314,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                             .build(),
                         VisualizationDimensionItem.builder()
                             .dimensionItem(RelativeOrganisationUnit.USER_ORGUNIT_GRANDCHILDREN.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(orgunitDimensions)
@@ -328,7 +328,7 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
         assertThat(relative.map { it.relative }).containsExactly(
             RelativeOrganisationUnit.USER_ORGUNIT,
             RelativeOrganisationUnit.USER_ORGUNIT_CHILDREN,
-            RelativeOrganisationUnit.USER_ORGUNIT_GRANDCHILDREN
+            RelativeOrganisationUnit.USER_ORGUNIT_GRANDCHILDREN,
         )
     }
 
@@ -354,10 +354,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(RelativePeriod.LAST_MONTH.name)
                             .dimensionItemType(DimensionItemType.PERIOD.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(periodDimensions)
@@ -385,10 +385,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid3)
                             .dimensionItemType(DimensionItemType.CATEGORY_OPTION.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         whenever(categoryStore.selectByUid(uid1)) doReturn category
@@ -417,8 +417,8 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid2)
                             .dimensionItemType(DimensionItemType.PERIOD.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
                 .build(),
             VisualizationDimension.builder()
@@ -428,10 +428,10 @@ class AnalyticsVisualizationsServiceDimensionHelperShould {
                         VisualizationDimensionItem.builder()
                             .dimensionItem(uid3)
                             .dimensionItemType(DimensionItemType.ORGANISATION_UNIT.name)
-                            .build()
-                    )
+                            .build(),
+                    ),
                 )
-                .build()
+                .build(),
         )
 
         val dimensionItems = helper.getDimensionItems(dimensions)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelperShould.kt
index ebac01aba6..949a6d4dfd 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/AnalyticsDimensionHelperShould.kt
@@ -44,11 +44,11 @@ class AnalyticsDimensionHelperShould {
         val item = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem("dataElement1"),
-                DimensionItem.PeriodItem.Absolute("periodId")
+                DimensionItem.PeriodItem.Absolute("periodId"),
             ),
             filters = listOf(
-                DimensionItem.OrganisationUnitItem.Absolute("orgunit")
-            )
+                DimensionItem.OrganisationUnitItem.Absolute("orgunit"),
+            ),
         )
 
         val dataItem = AnalyticsDimensionHelper.getSingleItemByDimension<DimensionItem.DataItem>(item)
@@ -69,9 +69,9 @@ class AnalyticsDimensionHelperShould {
         val item = AnalyticsServiceEvaluationItem(
             dimensionItems = listOf(
                 DimensionItem.DataItem.DataElementItem("dataElement1"),
-                DimensionItem.DataItem.DataElementItem("dataElement2")
+                DimensionItem.DataItem.DataElementItem("dataElement2"),
             ),
-            filters = listOf()
+            filters = listOf(),
         )
 
         AnalyticsDimensionHelper.getSingleItemByDimension<DimensionItem.DataItem>(item)
@@ -83,8 +83,8 @@ class AnalyticsDimensionHelperShould {
             dimensionItems = listOf(),
             filters = listOf(
                 DimensionItem.DataItem.DataElementItem("dataElement1"),
-                DimensionItem.DataItem.DataElementItem("dataElement2")
-            )
+                DimensionItem.DataItem.DataElementItem("dataElement2"),
+            ),
         )
 
         val dataItem = AnalyticsDimensionHelper.getSingleItemByDimension<DimensionItem.DataItem>(item)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
index b906b04e07..6c93eb169b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorMock.kt
@@ -38,7 +38,7 @@ internal class CoroutineAPICallExecutorMock : CoroutineAPICallExecutor {
         acceptedErrorCodes: List<Int>?,
         errorCatcher: APICallErrorCatcher?,
         errorClass: Class<P>?,
-        block: suspend () -> P
+        block: suspend () -> P,
     ): Result<P, D2Error> {
         return try {
             Result.Success(block.invoke())
@@ -52,7 +52,7 @@ internal class CoroutineAPICallExecutorMock : CoroutineAPICallExecutor {
                         D2Error.builder()
                             .errorCode(D2ErrorCode.UNEXPECTED)
                             .errorDescription("Unexpected error")
-                            .build()
+                            .build(),
                     )
             }
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
index cbf689e63a..7ddc72fcb5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorShould.kt
@@ -60,7 +60,7 @@ class CoroutineAPICallExecutorShould {
             userAccountDisabledErrorCatcher = userAccountDisabledErrorCatcher,
             errorStore = errorStore,
             databaseAdapter = databaseAdapter,
-            foreignKeyCleaner = foreignKeyCleaner
+            foreignKeyCleaner = foreignKeyCleaner,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/DateUtilsShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/DateUtilsShould.kt
index 61f9c4b253..9e8990fd78 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/DateUtilsShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/DateUtilsShould.kt
@@ -53,7 +53,7 @@ class DateUtilsShould {
             OffsetCase(1, PeriodType.SixMonthly, "2022-09-08T12:34:00.000"),
             OffsetCase(-1, PeriodType.SixMonthly, "2021-09-08T12:34:00.000"),
             OffsetCase(1, PeriodType.Yearly, "2023-03-08T12:34:00.000"),
-            OffsetCase(-1, PeriodType.Yearly, "2021-03-08T12:34:00.000")
+            OffsetCase(-1, PeriodType.Yearly, "2021-03-08T12:34:00.000"),
         ).forEach {
             val result = DateUtils.dateWithOffset(refDate, it.periods, it.type)
             assertThat(DateUtils.DATE_FORMAT.format(result)).isEqualTo(it.expected)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/ResultShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/ResultShould.kt
index 523e2b49e6..4df3476b3e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/ResultShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/ResultShould.kt
@@ -1,75 +1,75 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.helpers
-
-import com.google.common.truth.Truth
-import org.hisp.dhis.android.core.common.valuetype.validation.failures.IntegerPositiveFailure
-import org.hisp.dhis.android.core.common.valuetype.validation.validators.IntegerPositiveValidator
-import org.junit.Assert.fail
-import org.junit.Test
-
-class ResultShould {
-
-    private val validator = IntegerPositiveValidator
-
-    @Test
-    fun `Should return the same value when succeeding using when`() {
-        val value = "5"
-        when (val result = validator.validate(value)) {
-            is Result.Success -> Truth.assertThat(result.value).isEqualTo(value)
-            is Result.Failure -> fail()
-        }
-    }
-
-    @Test
-    fun `Should return a failure when the validator fails`() {
-        val value = "-5"
-        when (val result = validator.validate(value)) {
-            is Result.Success -> fail()
-            is Result.Failure -> Truth.assertThat(result.failure).isEqualTo(IntegerPositiveFailure.ValueIsNegative)
-        }
-    }
-
-    @Test
-    fun `Should return the same value when succeeding using fold`() {
-        val value = "5"
-        validator.validate(value).fold(
-            onSuccess = {
-                Truth.assertThat(it).isEqualTo(value)
-            },
-            onFailure = {
-                fail()
-            }
-        )
-    }
-
-    @Test
-    fun `Should succeed when entering the right value`() {
-        Truth.assertThat(validator.validate("5").succeeded).isTrue()
-    }
-}
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.helpers
+
+import com.google.common.truth.Truth
+import org.hisp.dhis.android.core.common.valuetype.validation.failures.IntegerPositiveFailure
+import org.hisp.dhis.android.core.common.valuetype.validation.validators.IntegerPositiveValidator
+import org.junit.Assert.fail
+import org.junit.Test
+
+class ResultShould {
+
+    private val validator = IntegerPositiveValidator
+
+    @Test
+    fun `Should return the same value when succeeding using when`() {
+        val value = "5"
+        when (val result = validator.validate(value)) {
+            is Result.Success -> Truth.assertThat(result.value).isEqualTo(value)
+            is Result.Failure -> fail()
+        }
+    }
+
+    @Test
+    fun `Should return a failure when the validator fails`() {
+        val value = "-5"
+        when (val result = validator.validate(value)) {
+            is Result.Success -> fail()
+            is Result.Failure -> Truth.assertThat(result.failure).isEqualTo(IntegerPositiveFailure.ValueIsNegative)
+        }
+    }
+
+    @Test
+    fun `Should return the same value when succeeding using fold`() {
+        val value = "5"
+        validator.validate(value).fold(
+            onSuccess = {
+                Truth.assertThat(it).isEqualTo(value)
+            },
+            onFailure = {
+                fail()
+            },
+        )
+    }
+
+    @Test
+    fun `Should succeed when entering the right value`() {
+        Truth.assertThat(validator.validate("5").succeeded).isTrue()
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitionerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitionerShould.kt
index c0b807c505..1e877cbe04 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitionerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitionerShould.kt
@@ -41,7 +41,7 @@ class MultiDimensionalPartitionerShould {
             partitioner.partition(4, values),
             """
             [[[A1,A2]]]
-        """
+        """,
         )
     }
 
@@ -52,7 +52,7 @@ class MultiDimensionalPartitionerShould {
             partitioner.partition(4, values),
             """
             [[[A1,A2,A3,A4]]]
-        """
+        """,
         )
     }
 
@@ -64,7 +64,7 @@ class MultiDimensionalPartitionerShould {
             """
             [[[A1,A2]],
             [[A3,A4,A5]]]
-        """
+        """,
         )
     }
 
@@ -76,7 +76,7 @@ class MultiDimensionalPartitionerShould {
             partitioner.partition(4, valuesA, valuesB),
             """
             [[[A1,A2],[B1]]]
-        """
+        """,
         )
     }
 
@@ -88,7 +88,7 @@ class MultiDimensionalPartitionerShould {
             partitioner.partition(4, valuesA, valuesB),
             """
             [[[A1,A2],[B1,B2]]]
-        """
+        """,
         )
     }
 
@@ -101,7 +101,7 @@ class MultiDimensionalPartitionerShould {
             """
             [[[A1,A2],[B1]],
             [[A1,A2],[B2,B3]]]
-        """
+        """,
         )
     }
 
@@ -114,7 +114,7 @@ class MultiDimensionalPartitionerShould {
             """
             [[[A1],[B1,B2,B3]],
             [[A2,A3],[B1]],
-            [[A2,A3],[B2,B3]]]"""
+            [[A2,A3],[B2,B3]]]""",
         )
     }
 
@@ -128,7 +128,7 @@ class MultiDimensionalPartitionerShould {
                [[[A1],[B1,B2]],
                [[A1],[B3,B4]],
                [[A1],[B5,B6]],
-               [[A1],[B7,B8]]]"""
+               [[A1],[B7,B8]]]""",
         )
     }
 
@@ -154,7 +154,7 @@ class MultiDimensionalPartitionerShould {
                     [[A2], [B3], [C2, C3]],
                     [[A3], [B2], [C2, C3]],
                     [[A3], [B3], [C2, C3]]]
-                """
+                """,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactoryShould.kt
index dac057b224..234dc049bd 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/json/internal/ObjectMapperFactoryShould.kt
@@ -29,11 +29,11 @@ package org.hisp.dhis.android.core.arch.json.internal
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.common.truth.Truth.assertThat
-import java.util.*
 import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory.objectMapper
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.junit.Before
 import org.junit.Test
+import java.util.*
 
 class ObjectMapperFactoryShould {
 
@@ -66,7 +66,7 @@ class ObjectMapperFactoryShould {
             "2020-12-01T12:34:56" to "2020-12-01T12:34:56.000",
             "2020-12-01T12:34:56" to "2020-12-01T12:34:56.000",
             "2020-12-01T12:34" to "2020-12-01T12:34:00.000",
-            "2020-12-01" to "2020-12-01T00:00:00.000"
+            "2020-12-01" to "2020-12-01T00:00:00.000",
         ).forEach { (source, expected) ->
             val sourceDate = objectMapper.readValue("\"$source\"", Date::class.java)
             val expectedDate = BaseIdentifiableObject.parseDate(expected)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt
index ab52462d96..93e21e34c0 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStoreShould.kt
@@ -56,8 +56,8 @@ class ChunkedSecureStoreShould {
                 "otherKey_[LEN]_",
                 "otherKey_[1]_",
                 "sampleKey_[3]",
-                "OTHER_CONFIG"
-            )
+                "OTHER_CONFIG",
+            ),
         )
 
         chunkedSecureStore.removeData("sampleKey")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryOptionComboServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryOptionComboServiceShould.kt
index 318d24a64e..447ea4c711 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/category/CategoryOptionComboServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/category/CategoryOptionComboServiceShould.kt
@@ -60,7 +60,7 @@ class CategoryOptionComboServiceShould {
         whenever(
             categoryOptionRepository
                 .byCategoryOptionComboUid(categoryOptionComboUid)
-                .blockingGet()
+                .blockingGet(),
         ) doReturn listOf(option1, option2)
 
         whenever(option1.access()) doReturn AccessHelper.createForDataWrite(true)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
index 13b0955a2c..275cbc6eee 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandlerShould.kt
@@ -71,7 +71,7 @@ class CategoryComboHandlerShould {
             categoryComboStore,
             optionComboHandler,
             categoryCategoryComboLinkHandler,
-            categoryOptionCleaner
+            categoryOptionCleaner,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
index 4aa2fed087..3d27132a79 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerShould.kt
@@ -85,7 +85,7 @@ class TrackerDataManagerShould {
             relationshipStore,
             relationshipChildrenAppender,
             dataStatePropagator,
-            programOwnerStore
+            programOwnerStore,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationHelperShould.kt
index b3fc3328d3..292321b03c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationHelperShould.kt
@@ -85,13 +85,13 @@ class DatabasesConfigurationHelperShould {
         nameGenerator,
         object : DateProvider {
             override val dateStr: String = DATE
-        }
+        },
     )
 
     @Test
     fun get_logged_configuration_when_one_server_user() {
         assertThat(
-            DatabaseConfigurationHelper.getLoggedAccount(singleServerSingleUserConfig, username1, url1)
+            DatabaseConfigurationHelper.getLoggedAccount(singleServerSingleUserConfig, username1, url1),
         ).isSameInstanceAs(userConfig11)
     }
 
@@ -139,7 +139,7 @@ class DatabasesConfigurationHelperShould {
         val config = helper.addAccount(singleServerSingleUserConfig, url2, username2, false)
         assertThat(
             DatabaseConfigurationHelper
-                .getLoggedAccount(config, username2, url2)
+                .getLoggedAccount(config, username2, url2),
         ).isEqualTo(userConfig22)
     }
 
@@ -149,7 +149,7 @@ class DatabasesConfigurationHelperShould {
             buildUserConfiguration("user1", "2021-06-01T00:01:04.000"),
             buildUserConfiguration("user2", "2021-09-02T00:01:04.000"),
             buildUserConfiguration("user3", "2020-08-05T00:01:04.000"),
-            buildUserConfiguration("user4", "2020-08-09T00:01:04.000")
+            buildUserConfiguration("user4", "2020-08-09T00:01:04.000"),
         )
 
         val keepFiveAccounts = DatabaseConfigurationHelper.getOldestAccounts(accounts, 5)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationUtil.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationUtil.kt
index a5d469ebaa..36b7442acb 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationUtil.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/DatabasesConfigurationUtil.kt
@@ -32,7 +32,7 @@ object DatabasesConfigurationUtil {
     fun buildUserConfiguration(
         username: String,
         creationDate: String,
-        serverUrl: String = "server"
+        serverUrl: String = "server",
     ): DatabaseAccount {
         return DatabaseAccount.builder()
             .username(username)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
index 0144b80bbc..2ca760c2dc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2ManagerUnitShould.kt
@@ -70,7 +70,7 @@ class MultiUserDatabaseManagerForD2ManagerUnitShould : BaseCallShould() {
             databaseAdapter,
             migration,
             databaseAdapterFactory,
-            databaseConfigurationStore
+            databaseConfigurationStore,
         )
         whenever(databaseConfigurationStore.get()).doReturn(databasesConfiguration)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
index 5db9094e8e..3ceeb14bc4 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerUnitShould.kt
@@ -89,7 +89,7 @@ class MultiUserDatabaseManagerUnitShould : BaseCallShould() {
             databaseConfigurationSecureStore,
             configurationHelper,
             databaseAdapterFactory,
-            databaseExport
+            databaseExport,
         )
     }
 
@@ -144,8 +144,8 @@ class MultiUserDatabaseManagerUnitShould : BaseCallShould() {
                     buildUserConfiguration("user1", "2021-06-01T00:01:04.000"),
                     buildUserConfiguration("user2", "2021-09-02T00:01:04.000"),
                     buildUserConfiguration("user3", "2020-08-05T00:01:04.000"),
-                    buildUserConfiguration("user4", "2020-08-09T00:01:04.000")
-                )
+                    buildUserConfiguration("user4", "2020-08-09T00:01:04.000"),
+                ),
             )
             .build()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/migration/DatabasesConfigurationOldShould.kt b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/migration/DatabasesConfigurationOldShould.kt
index e5317c029e..5f63a71f7b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/migration/DatabasesConfigurationOldShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/configuration/internal/migration/DatabasesConfigurationOldShould.kt
@@ -56,7 +56,7 @@ class DatabasesConfigurationOldShould :
     @Test
     fun equal_when_deserialize_serialize_deserialize() {
         val configuration = deserialize(
-            DatabasesConfigurationOld::class.java
+            DatabasesConfigurationOld::class.java,
         )
         val serialized = serialize(configuration)
         val deserialized = deserialize(serialized, DatabasesConfigurationOld::class.java)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt
index 2626455d61..3ba31a470e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandlerShould.kt
@@ -74,7 +74,7 @@ class DataElementHandlerShould {
             dataElementStore,
             attributeHandler,
             dataElementAttributeValueLinkHandler,
-            dataElementLegendSetLinkHandler
+            dataElementLegendSetLinkHandler,
         )
         dataElements = listOf(dataElement)
         legendSets = listOf(legendSet)
@@ -134,7 +134,7 @@ class DataElementHandlerShould {
         Mockito.verify(dataElementAttributeValueLinkHandler).handleMany(
             eq(dataElement.uid()),
             eq(listOf(attribute) as Collection<Attribute>),
-            any()
+            any(),
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt
index 8519cabcc5..aaa83853a5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt
@@ -33,8 +33,6 @@ import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import java.util.*
-import kotlin.time.Duration.Companion.days
 import kotlinx.datetime.Clock
 import org.hisp.dhis.android.core.arch.helpers.AccessHelper
 import org.hisp.dhis.android.core.category.CategoryOption
@@ -50,6 +48,8 @@ import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito
+import java.util.*
+import kotlin.time.Duration.Companion.days
 
 class DataSetInstanceServiceShould {
 
@@ -89,7 +89,7 @@ class DataSetInstanceServiceShould {
         periodHelper = periodHelper,
         categoryOptionComboService = categoryOptionComboService,
         periodGenerator = periodGenerator,
-        categoryOptionRepository = categoryOptionRepository
+        categoryOptionRepository = categoryOptionRepository,
     )
 
     @Before
@@ -125,7 +125,7 @@ class DataSetInstanceServiceShould {
 
         val isPeriodInOrgUnitRange = dataSetInstanceService.blockingIsPeriodInOrgUnitRange(
             period = firstPeriod,
-            orgUnitUid = orgUnitUid
+            orgUnitUid = orgUnitUid,
         )
         assertThat(isPeriodInOrgUnitRange).isTrue()
     }
@@ -141,7 +141,7 @@ class DataSetInstanceServiceShould {
         whenever(categoryOptionComboService.isInOptionRange(categories, firstPeriod.startDate())) doReturn true
         whenever(categoryOptionComboService.isInOptionRange(categories, firstPeriod.endDate())) doReturn true
         assertThat(
-            dataSetInstanceService.blockingIsPeriodInCategoryOptionRange(firstPeriod, attOptionComboUid)
+            dataSetInstanceService.blockingIsPeriodInCategoryOptionRange(firstPeriod, attOptionComboUid),
         ).isTrue()
     }
 
@@ -149,7 +149,7 @@ class DataSetInstanceServiceShould {
     fun `Should return true if attributeOptionCombo Assign To OrgUnit`() {
         whenever(categoryOptionComboService.blockingIsAssignedToOrgUnit(attOptionComboUid, orgUnitUid)).doReturn(true)
         assertThat(
-            dataSetInstanceService.blockingIsAttributeOptionComboAssignToOrgUnit(attOptionComboUid, orgUnitUid)
+            dataSetInstanceService.blockingIsAttributeOptionComboAssignToOrgUnit(attOptionComboUid, orgUnitUid),
         ).isTrue()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictSamples.kt
index 16daa5f768..3346702ee0 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/DataValueImportConflictSamples.kt
@@ -34,17 +34,17 @@ object DataValueImportConflictSamples {
 
     fun invalidDataElementType(): ImportConflict = ImportConflict.create(
         "40L",
-        "Data value is not a positive integer, must match data element type: vANAXwtLwcT"
+        "Data value is not a positive integer, must match data element type: vANAXwtLwcT",
     )
 
     fun pastExpiryDate(): ImportConflict = ImportConflict.create(
         "202104",
-        "Current date is past expiry days for period 202104 and data set: BfMAe6Itzgt"
+        "Current date is past expiry days for period 202104 and data set: BfMAe6Itzgt",
     )
 
     fun periodAfterLatestOpenFuture(): ImportConflict = ImportConflict.create(
         "202111",
-        "Period: 202111 is after latest open future period: 202105 for data element: UOlfIjgN8X6"
+        "Period: 202111 is after latest open future period: 202105 for data element: UOlfIjgN8X6",
     )
 
     fun indexedImportConflict(): ImportConflict = ImportConflict.create(
@@ -52,6 +52,6 @@ object DataValueImportConflictSamples {
         "Value must match data element's `UOlfIjgN8X6` type constraints: Data value is not numeric",
         "E7619",
         "value",
-        listOf(1, 3)
+        listOf(1, 3),
     )
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflictShould.kt b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflictShould.kt
index 87705a2c8f..9122513c9b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflictShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/IndexedDataValueConflictShould.kt
@@ -58,7 +58,7 @@ internal class IndexedDataValueConflictShould {
     fun `Should return no data value conflicts`() {
         val result = indexedDataValueConflict.getDataValues(
             conflict.toBuilder().indexes(emptyList()).build(),
-            dataValues
+            dataValues,
         )
         assert(result.isEmpty())
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflictShould.kt b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflictShould.kt
index a929d333d6..1dc5b0c5f1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflictShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/PeriodAfterLatestOpenFutureConflictShould.kt
@@ -46,7 +46,7 @@ internal class PeriodAfterLatestOpenFutureConflictShould {
     @Test
     fun `Should match error messages`() {
         assert(
-            periodAfterLatestOpenFutureConflict.matches(DataValueImportConflictSamples.periodAfterLatestOpenFuture())
+            periodAfterLatestOpenFutureConflict.matches(DataValueImportConflictSamples.periodAfterLatestOpenFuture()),
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
index ef59977a20..ab9160de33 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactoryShould.kt
@@ -85,7 +85,7 @@ class AggregatedDataCallBundleFactoryShould {
             dataSetSettingsObjectRepository,
             periodManager,
             aggregatedDataSyncStore,
-            lastUpdatedCalculator
+            lastUpdatedCalculator,
         )
     }
 
@@ -101,7 +101,7 @@ class AggregatedDataCallBundleFactoryShould {
             dataSetSettings,
             rootOrgUnits,
             allOrgUnits,
-            emptyMap()
+            emptyMap(),
         )
 
         assertThat(bundles.size).isEqualTo(1)
@@ -120,7 +120,7 @@ class AggregatedDataCallBundleFactoryShould {
             dataSetSettings,
             rootOrgUnits,
             allOrgUnits,
-            emptyMap()
+            emptyMap(),
         )
 
         assertThat(bundles.size).isEqualTo(2)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculatorShould.kt
index 83bbee7564..062a765f97 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculatorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculatorShould.kt
@@ -30,11 +30,11 @@ package org.hisp.dhis.android.core.domain.aggregated.data.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.junit.Before
 import org.junit.Test
+import java.util.*
 
 class AggregatedDataSyncLastUpdatedCalculatorShould {
     private val dataSet: DataSet = DataSetSamples.dataSet
@@ -75,7 +75,7 @@ class AggregatedDataSyncLastUpdatedCalculatorShould {
             dataSet,
             pastPeriods,
             dataSet.openFuturePeriods()!!,
-            organisationUnitsHash
+            organisationUnitsHash,
         )
         assertThat(lastUpdated).isEqualTo(expectedLastUpdated)
     }
@@ -96,7 +96,7 @@ class AggregatedDataSyncLastUpdatedCalculatorShould {
             dataSet,
             pastPeriods,
             dataSet.openFuturePeriods()!!,
-            organisationUnitsHash
+            organisationUnitsHash,
         )
         assertThat(lastUpdated).isNull()
     }
@@ -108,7 +108,7 @@ class AggregatedDataSyncLastUpdatedCalculatorShould {
             dataSet,
             pastPeriods,
             dataSet.openFuturePeriods()!! + 1,
-            organisationUnitsHash
+            organisationUnitsHash,
         )
         assertThat(lastUpdated).isNull()
     }
@@ -120,7 +120,7 @@ class AggregatedDataSyncLastUpdatedCalculatorShould {
             dataSet,
             pastPeriods,
             dataSet.openFuturePeriods()!! - 1,
-            organisationUnitsHash
+            organisationUnitsHash,
         )
         assertThat(lastUpdated).isEqualTo(expectedLastUpdated)
     }
@@ -132,7 +132,7 @@ class AggregatedDataSyncLastUpdatedCalculatorShould {
             dataSet,
             pastPeriods + 1,
             dataSet.openFuturePeriods()!!,
-            organisationUnitsHash
+            organisationUnitsHash,
         )
         assertThat<Date>(lastUpdated).isNull()
     }
@@ -144,7 +144,7 @@ class AggregatedDataSyncLastUpdatedCalculatorShould {
             dataSet,
             pastPeriods - 1,
             dataSet.openFuturePeriods()!!,
-            organisationUnitsHash
+            organisationUnitsHash,
         )
         assertThat(lastUpdated).isEqualTo(expectedLastUpdated)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 9ad3613f72..9c7f725aa1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -111,17 +111,17 @@ class MetadataCallShould : BaseCallShould() {
         whenever(useCaseModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(userDownloader.downloadMetadata()).thenReturn(Single.just(user))
         whenever(programDownloader.downloadMetadata()).thenReturn(
-            Completable.complete()
+            Completable.complete(),
         )
         whenever(organisationUnitDownloader.downloadMetadata(same(user))).thenReturn(
-            Completable.complete()
+            Completable.complete(),
         )
         whenever(dataSetDownloader.downloadMetadata()).thenReturn(
-            Completable.complete()
+            Completable.complete(),
         )
         whenever(programIndicatorModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(visualizationDownloader.downloadMetadata()).thenReturn(
-            Single.just(emptyList())
+            Single.just(emptyList()),
         )
         whenever(legendSetModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(expressionDimensIndicatorModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
@@ -153,7 +153,7 @@ class MetadataCallShould : BaseCallShould() {
             multiUserDatabaseManager,
             credentialsSecureStore,
             legendSetModuleDownloader,
-            expressionDimensIndicatorModuleDownloader
+            expressionDimensIndicatorModuleDownloader,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
index dd5c776fbd..c4bb1cb898 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentServiceShould.kt
@@ -87,7 +87,7 @@ class EnrollmentServiceShould {
         whenever(enrollmentRepository.uid(enrollmentUid).blockingGet()) doReturn enrollment
         whenever(
             trackedEntityInstanceRepository
-                .uid(trackedEntityInstanceUid).blockingGet()
+                .uid(trackedEntityInstanceUid).blockingGet(),
         ) doReturn trackedEntityInstance
         whenever(programRepository.uid(programUid).blockingGet()) doReturn program
 
@@ -101,7 +101,7 @@ class EnrollmentServiceShould {
             organisationUnitRepository,
             eventCollectionRepository,
             programStageCollectionRepository,
-            programTempOwnerStore
+            programTempOwnerStore,
         )
     }
 
@@ -155,7 +155,7 @@ class EnrollmentServiceShould {
             organisationUnitRepository
                 .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
                 .uid(organisationUnitId)
-                .blockingExists()
+                .blockingExists(),
         ) doReturn true
 
         val access = enrollmentService.blockingGetEnrollmentAccess(trackedEntityInstanceUid, programUid)
@@ -170,7 +170,7 @@ class EnrollmentServiceShould {
             organisationUnitRepository
                 .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
                 .uid(organisationUnitId)
-                .blockingExists()
+                .blockingExists(),
         ) doReturn false
         whenever(programTempOwnerStore.selectWhere(any())) doReturn listOf(programTempOwner)
         whenever(programTempOwner.validUntil()) doReturn DateUtils.DATE_FORMAT.parse("1999-01-01T00:00:00.000")
@@ -187,7 +187,7 @@ class EnrollmentServiceShould {
             organisationUnitRepository
                 .byOrganisationUnitScope(OrganisationUnit.Scope.SCOPE_DATA_CAPTURE)
                 .uid(organisationUnitId)
-                .blockingExists()
+                .blockingExists(),
         ) doReturn false
         whenever(programTempOwnerStore.selectWhere(any())) doReturn listOf(programTempOwner)
         whenever(programTempOwner.validUntil()) doReturn DateUtils.DATE_FORMAT.parse("2999-01-01T00:00:00.000")
@@ -202,20 +202,20 @@ class EnrollmentServiceShould {
         whenever(enrollment.program()) doReturn programUid
 
         whenever(
-            programStageCollectionRepository.byProgramUid().eq(programUid)
+            programStageCollectionRepository.byProgramUid().eq(programUid),
         ) doReturn programStageCollectionRepository
         whenever(
-            programStageCollectionRepository.byAccessDataWrite().isTrue
+            programStageCollectionRepository.byAccessDataWrite().isTrue,
         ) doReturn programStageCollectionRepository
         whenever(
-            programStageCollectionRepository.get()
+            programStageCollectionRepository.get(),
         ) doReturn Single.just(getProgramStages())
 
         whenever(
-            eventCollectionRepository.byEnrollmentUid().eq(enrollmentUid)
+            eventCollectionRepository.byEnrollmentUid().eq(enrollmentUid),
         ) doReturn eventCollectionRepository
         whenever(
-            eventCollectionRepository.byDeleted().isFalse
+            eventCollectionRepository.byDeleted().isFalse,
         ) doReturn eventCollectionRepository
         whenever(eventCollectionRepository.get()) doReturn Single.just(getEventList())
 
@@ -228,20 +228,20 @@ class EnrollmentServiceShould {
         whenever(enrollment.program()) doReturn programUid
 
         whenever(
-            programStageCollectionRepository.byProgramUid().eq(programUid)
+            programStageCollectionRepository.byProgramUid().eq(programUid),
         ) doReturn programStageCollectionRepository
         whenever(
-            programStageCollectionRepository.byAccessDataWrite().isTrue
+            programStageCollectionRepository.byAccessDataWrite().isTrue,
         ) doReturn programStageCollectionRepository
         whenever(
-            programStageCollectionRepository.get()
+            programStageCollectionRepository.get(),
         ) doReturn Single.just(getProgramStages())
 
         whenever(
-            eventCollectionRepository.byEnrollmentUid().eq(enrollmentUid)
+            eventCollectionRepository.byEnrollmentUid().eq(enrollmentUid),
         ) doReturn eventCollectionRepository
         whenever(
-            eventCollectionRepository.byDeleted().isFalse
+            eventCollectionRepository.byDeleted().isFalse,
         ) doReturn eventCollectionRepository
         whenever(eventCollectionRepository.get()) doReturn Single.just(getEventList())
 
@@ -256,7 +256,7 @@ class EnrollmentServiceShould {
         Event.builder()
             .uid("eventUid2")
             .programStage("2")
-            .build()
+            .build(),
     )
 
     private fun getProgramStages() = listOf(
@@ -269,6 +269,6 @@ class EnrollmentServiceShould {
             .access(Access.create(true, true, DataAccess.create(true, true)))
             .uid("2")
             .repeatable(true)
-            .build()
+            .build(),
     )
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
index 8dcf2f95bf..6be3b9b063 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
@@ -84,7 +84,7 @@ class EnrollmentHandlerShould {
         enrollmentHandler = EnrollmentHandler(
             relationshipVersionManager, relationshipHandler, noteVersionManager,
             enrollmentStore, eventHandler, eventCleaner, noteHandler, noteUniquenessManager,
-            relationshipOrphanCleaner
+            relationshipOrphanCleaner,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt
index 1c55e17cdc..a3233dfeaf 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandlerShould.kt
@@ -85,7 +85,7 @@ class EnrollmentImportHandlerShould {
             trackerImportConflictStore,
             trackerImportConflictParser,
             jobReportEnrollmentHandler,
-            dataStatePropagator
+            dataStatePropagator,
         )
 
         whenever(enrollment.trackedEntityInstance()).thenReturn("tei_uid")
@@ -153,7 +153,7 @@ class EnrollmentImportHandlerShould {
         val response = enrollmentImportHandler.handleEnrollmentImportSummary(
             listOf(importSummary),
             enrollments,
-            teiState
+            teiState,
         )
 
         assertThat(response.enrollments.ignored.size).isEqualTo(1)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventFilterShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/EventFilterShould.kt
index a3bb7c3542..f0dc21efeb 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/EventFilterShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventFilterShould.kt
@@ -57,10 +57,10 @@ class EventFilterShould : BaseObjectShould("event/event_filter.json"), ObjectSho
         assertThat(eventFilter.eventQueryCriteria()!!.ouMode()).isEqualTo(OrganisationUnitMode.ACCESSIBLE)
 
         assertThat(
-            eventFilter.eventQueryCriteria()!!.eventDate()!!.startDate()
+            eventFilter.eventQueryCriteria()!!.eventDate()!!.startDate(),
         ).isEqualTo(DateUtils.SIMPLE_DATE_FORMAT.parse("2014-05-01"))
         assertThat(
-            eventFilter.eventQueryCriteria()!!.eventDate()!!.endDate()
+            eventFilter.eventQueryCriteria()!!.eventDate()!!.endDate(),
         ).isEqualTo(DateUtils.SIMPLE_DATE_FORMAT.parse("2014-05-01"))
         assertThat(eventFilter.eventQueryCriteria()!!.eventDate()!!.type()).isEqualTo(DatePeriodType.ABSOLUTE)
 
@@ -80,8 +80,8 @@ class EventFilterShould : BaseObjectShould("event/event_filter.json"), ObjectSho
                 "status",
                 "assignedUser",
                 "qrur9Dvnyt5",
-                "oZg33kd9taw"
-            )
+                "oZg33kd9taw",
+            ),
         )
         assertThat(eventFilter.eventQueryCriteria()!!.events()).isEqualTo(listOf("event1Uid", "event2Uid"))
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt
index 9dd1c2f08b..3c93a6334f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/EventServiceShould.kt
@@ -83,7 +83,7 @@ class EventServiceShould {
         enrollmentService,
         organisationUnitService,
         categoryOptionComboService,
-        eventDateUtils
+        eventDateUtils,
     )
 
     private val firstJanuary = BaseIdentifiableObject.DATE_FORMAT.parse("2020-01-01T00:00:00.000")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt
index 402b2004c7..00e57e0a78 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventDateUtilsShould.kt
@@ -31,7 +31,6 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import java.util.Calendar
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
@@ -40,6 +39,7 @@ import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.junit.Before
 import org.junit.Test
+import java.util.Calendar
 
 class EventDateUtilsShould {
 
@@ -61,8 +61,8 @@ class EventDateUtilsShould {
             periodHelper.blockingGetPeriodForPeriodTypeAndDate(
                 PeriodType.Monthly,
                 thirdJanuary,
-                1
-            )
+                1,
+            ),
         ) doReturn february
         whenever(february.startDate()) doReturn firstFebruary
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
index c9754ccf35..275db13ba9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallShould.kt
@@ -96,21 +96,21 @@ class EventEndpointCallShould {
             commonParams = get(),
             page = page,
             pageSize = pageCount,
-            paging = true
+            paging = true,
         )
         return givenACallForQuery(eventQuery)
     }
 
     private suspend fun givenACallForQuery(eventQuery: TrackerAPIQuery): Payload<Event> {
         return OldEventEndpointCallFactory(
-            retrofit.create(EventService::class.java)
+            retrofit.create(EventService::class.java),
         ).getCollectionCall(eventQuery)
     }
 
     private suspend fun givenAEventCallByOrgUnitAndProgram(
         orgUnit: String,
         program: String?,
-        startDate: String? = null
+        startDate: String? = null,
     ): Payload<Event> {
         val eventQuery = TrackerAPIQuery(
             commonParams = TrackerQueryCommonParams(
@@ -121,9 +121,9 @@ class EventEndpointCallShould {
                 false,
                 OrganisationUnitMode.SELECTED,
                 listOf(orgUnit),
-                10
+                10,
             ),
-            orgUnit = orgUnit
+            orgUnit = orgUnit,
         )
 
         return givenACallForQuery(eventQuery)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
index ef5c91fcbc..ab677fbae6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventHandlerShould.kt
@@ -88,7 +88,7 @@ class EventHandlerShould {
             noteHandler,
             noteVersionManager,
             noteUniquenessManager,
-            relationshipOrphanCleaner
+            relationshipOrphanCleaner,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt
index 4598b2e949..506e852f8f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventImportHandlerShould.kt
@@ -77,7 +77,7 @@ class EventImportHandlerShould {
             trackerImportConflictStore,
             trackerImportConflictParser,
             jobReportEventHandler,
-            dataStatePropagator
+            dataStatePropagator,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
index b68217b201..27e6172300 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactoryShould.kt
@@ -85,13 +85,13 @@ class EventQueryBundleFactoryShould {
 
         val commonHelper = TrackerQueryFactoryCommonHelper(
             userOrganisationUnitLinkStore,
-            organisationUnitProgramLinkLinkStore
+            organisationUnitProgramLinkLinkStore,
         )
         bundleFactory = EventQueryBundleFactory(
             programStore,
             programSettingsObjectRepository,
             lastUpdatedManager,
-            commonHelper
+            commonHelper,
         )
     }
 
@@ -172,8 +172,8 @@ class EventQueryBundleFactoryShould {
         whenever(organisationUnitProgramLinkLinkStore.selectWhere(any())).doReturn(
             listOf(
                 OrganisationUnitProgramLink.builder().program(p1).organisationUnit(ou1).build(),
-                OrganisationUnitProgramLink.builder().program(p1).organisationUnit(ou2).build()
-            )
+                OrganisationUnitProgramLink.builder().program(p1).organisationUnit(ou2).build(),
+            ),
         )
 
         val bundles = bundleFactory.getQueries(params)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapterShould.kt b/core/src/test/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapterShould.kt
index 56fdd1adc8..c10a03dbdf 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapterShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapterShould.kt
@@ -59,7 +59,7 @@ class EventCollectionRepositoryAdapterShould {
             eventRepository,
             ouRepository,
             userRepository,
-            dateFilterPeriodHelper
+            dateFilterPeriodHelper,
         )
 
         whenever(ouRepository.blockingGetUids()) doReturn orgunitDescendants
@@ -121,8 +121,8 @@ class EventCollectionRepositoryAdapterShould {
                     EventQueryScopeOrderByItem.builder()
                         .column(EventQueryScopeOrderColumn.COMPLETED_DATE)
                         .direction(RepositoryScope.OrderByDirection.DESC)
-                        .build()
-                )
+                        .build(),
+                ),
             ).build()
 
         val intermediateRepository: EventCollectionRepository = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflictShould.kt b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflictShould.kt
index d9cd92af35..fa72e7b66a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflictShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/InvalidAttributeValueTypeConflictShould.kt
@@ -49,7 +49,7 @@ internal class InvalidAttributeValueTypeConflictShould : BaseConflictShould() {
             .isTrue()
         assertThat(
             InvalidAttributeValueTypeConflict
-                .getTrackedEntityAttribute(TrackedImportConflictSamples.invalidFileAttribute(value)).isNullOrBlank()
+                .getTrackedEntityAttribute(TrackedImportConflictSamples.invalidFileAttribute(value)).isNullOrBlank(),
         ).isTrue()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedImportConflictSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedImportConflictSamples.kt
index 6ec5241b70..315176f816 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedImportConflictSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackedImportConflictSamples.kt
@@ -34,77 +34,77 @@ object TrackedImportConflictSamples {
     fun missingMandatoryAttribute(attributeUid: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.attribute",
-            "Missing mandatory attribute $attributeUid"
+            "Missing mandatory attribute $attributeUid",
         )
     }
 
     fun badAttributePattern(): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value does not match the attribute pattern"
+            "Value does not match the attribute pattern",
         )
     }
 
     fun invalidNumericAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not a valid numeric type for attribute $attributeUid"
+            "Value '$value' is not a valid numeric type for attribute $attributeUid",
         )
     }
 
     fun invalidBooleanAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not a valid boolean type for attribute $attributeUid"
+            "Value '$value' is not a valid boolean type for attribute $attributeUid",
         )
     }
 
     fun invalidTrueOnlyAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not true (true-only type) for attribute $attributeUid"
+            "Value '$value' is not true (true-only type) for attribute $attributeUid",
         )
     }
 
     fun invalidDateAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not a valid date for attribute $attributeUid"
+            "Value '$value' is not a valid date for attribute $attributeUid",
         )
     }
 
     fun invalidDatetimeAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not a valid datetime for attribute $attributeUid"
+            "Value '$value' is not a valid datetime for attribute $attributeUid",
         )
     }
 
     fun invalidUsernameAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not a valid username for attribute $attributeUid"
+            "Value '$value' is not a valid username for attribute $attributeUid",
         )
     }
 
     fun invalidFileAttribute(value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not the uid of a file"
+            "Value '$value' is not the uid of a file",
         )
     }
 
     fun invalidAttributeOption(attributeUid: String, value: String, optionSetUid: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Value '$value' is not a valid option for attribute $attributeUid and option set $optionSetUid"
+            "Value '$value' is not a valid option for attribute $attributeUid and option set $optionSetUid",
         )
     }
 
     fun nonUniqueAttribute(attributeUid: String, value: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "Non-unique attribute value '$value' for attribute $attributeUid"
+            "Non-unique attribute value '$value' for attribute $attributeUid",
         )
     }
 
@@ -112,7 +112,7 @@ object TrackedImportConflictSamples {
         return ImportConflict.create(
             teiUid,
             "Tracked entity instance $teiUid cannot be deleted as it has associated enrollments and user does" +
-                " not have authority F_TEI_CASCADE_DELETE"
+                " not have authority F_TEI_CASCADE_DELETE",
         )
     }
 
@@ -120,14 +120,14 @@ object TrackedImportConflictSamples {
         return ImportConflict.create(
             enrollmentUid,
             "Enrollment $enrollmentUid cannot be deleted as it has associated events and user does not" +
-                " have authority: F_ENROLLMENT_CASCADE_DELETE"
+                " have authority: F_ENROLLMENT_CASCADE_DELETE",
         )
     }
 
     fun fileResourceAlreadyAssigned(fileResourceUid: String): ImportConflict {
         return ImportConflict.create(
             "Attribute.value",
-            "File resource with uid '$fileResourceUid' has already been assigned to a different object"
+            "File resource with uid '$fileResourceUid' has already been assigned to a different object",
         )
     }
 
@@ -162,7 +162,7 @@ object TrackedImportConflictSamples {
     fun teiHasInvalidType(teiUid: String, relationshipUid: String): ImportConflict {
         return ImportConflict.create(
             relationshipUid,
-            "TrackedEntityInstance '$teiUid' has invalid TrackedEntityType."
+            "TrackedEntityInstance '$teiUid' has invalid TrackedEntityType.",
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
index 3e9f654b69..05f2389594 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/indicator/IndicatorShould.kt
@@ -29,14 +29,14 @@
 package org.hisp.dhis.android.core.indicator
 
 import com.google.common.truth.Truth
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.BaseObjectShould
 import org.hisp.dhis.android.core.common.ObjectShould
 import org.hisp.dhis.android.core.common.ObjectStyle
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class IndicatorShould : BaseObjectShould("indicators/indicator.json"), ObjectShould {
     @Test
@@ -45,24 +45,24 @@ class IndicatorShould : BaseObjectShould("indicators/indicator.json"), ObjectSho
         val indicator = objectMapper.readValue(jsonStream, Indicator::class.java)
         Truth.assertThat(indicator.code()).isEqualTo("IN_52462")
         Truth.assertThat(indicator.lastUpdated()).isEqualTo(
-            BaseIdentifiableObject.DATE_FORMAT.parse("2013-03-21T11:17:44.926")
+            BaseIdentifiableObject.DATE_FORMAT.parse("2013-03-21T11:17:44.926"),
         )
         Truth.assertThat(indicator.uid()).isEqualTo("ReUHfIn0pTQ")
         Truth.assertThat(indicator.created()).isEqualTo(
-            BaseIdentifiableObject.DATE_FORMAT.parse("2012-11-05T09:16:29.054")
+            BaseIdentifiableObject.DATE_FORMAT.parse("2012-11-05T09:16:29.054"),
         )
         Truth.assertThat(indicator.name()).isEqualTo("ANC 1-3 Dropout Rate")
         Truth.assertThat(indicator.shortName()).isEqualTo("ANC 1-3 Dropout Rate")
         Truth.assertThat(indicator.description()).isEqualTo(
             "Indicates the percentage of clients dropping" +
                 " out between the 1st and the 3rd ANC visit. Calculated as the difference between" +
-                " ANC1 and ANC3 by the ANC 1 visits."
+                " ANC1 and ANC3 by the ANC 1 visits.",
         )
         Truth.assertThat(indicator.deleted()).isNull()
         Truth.assertThat(indicator.annualized()).isFalse()
         Truth.assertThat(indicator.numerator()).isEqualTo(
             "#{fbfJHSPpUQD.pq2XI5kz2BY}+#" +
-                "{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}"
+                "{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
         )
         Truth.assertThat(indicator.numeratorDescription()).isEqualTo("ANC1-ANC3")
         Truth.assertThat(indicator.denominator())
diff --git a/core/src/test/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluatorShould.kt
index b009497335..95527c062f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluatorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluatorShould.kt
@@ -81,23 +81,23 @@ class DataSetIndicatorEvaluatorShould {
         val context = getContextForValueMap(
             mapOf(
                 diObject1 to 5.0,
-                diObject2 to 10.0
-            )
+                diObject2 to 10.0,
+            ),
         )
 
         whenever(indicatorType.factor()) doReturn 1
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(0.5)
 
         whenever(indicatorType.factor()) doReturn 100
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(50)
 
         whenever(indicatorType.factor()) doReturn -10
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(-5)
     }
 
@@ -106,12 +106,12 @@ class DataSetIndicatorEvaluatorShould {
         val context = getContextForValueMap(
             mapOf(
                 diObject1 to 10.0,
-                diObject2 to 3.0
-            )
+                diObject2 to 3.0,
+            ),
         )
 
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(3.33)
     }
 
@@ -122,12 +122,12 @@ class DataSetIndicatorEvaluatorShould {
         val context = getContextForValueMap(
             mapOf(
                 diObject1 to 10.0,
-                diObject2 to 3.0
-            )
+                diObject2 to 3.0,
+            ),
         )
 
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(3.333)
     }
 
@@ -135,12 +135,12 @@ class DataSetIndicatorEvaluatorShould {
     fun evaluate_null_numerator() {
         val context = getContextForValueMap(
             mapOf(
-                diObject2 to 10.0
-            )
+                diObject2 to 10.0,
+            ),
         )
 
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(0.0)
     }
 
@@ -148,12 +148,12 @@ class DataSetIndicatorEvaluatorShould {
     fun evaluate_null_denominator() {
         val context = getContextForValueMap(
             mapOf(
-                diObject1 to 10.0
-            )
+                diObject1 to 10.0,
+            ),
         )
 
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(0.0)
     }
 
@@ -162,12 +162,12 @@ class DataSetIndicatorEvaluatorShould {
         val context = getContextForValueMap(
             mapOf(
                 diObject1 to 10.0,
-                diObject2 to 0.0
-            )
+                diObject2 to 0.0,
+            ),
         )
 
         assertThat(
-            evaluator.evaluate(indicator, indicatorType, context)
+            evaluator.evaluate(indicator, indicatorType, context),
         ).isEqualTo(0.0)
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
index a0e6523684..614aa3c020 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
@@ -31,8 +31,6 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
 import io.reactivex.Single
-import java.io.IOException
-import java.util.*
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -44,6 +42,8 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import java.io.IOException
+import java.util.*
 
 @RunWith(JUnit4::class)
 class OrganisationUnitCallUnitShould {
@@ -120,7 +120,7 @@ class OrganisationUnitCallUnitShould {
             organisationUnitDisplayPathTransformer,
             userOrganisationUnitLinkStore,
             organisationUnitStore,
-            collectionCleaner
+            collectionCleaner,
         )
             .download(user)
 
@@ -134,8 +134,8 @@ class OrganisationUnitCallUnitShould {
                 orderCaptor.capture(),
                 pagingCaptor.capture(),
                 pageSizeCaptor.capture(),
-                pageCaptor.capture()
-            )
+                pageCaptor.capture(),
+            ),
         ).doReturn(Single.just(organisationUnitPayload))
         whenever(organisationUnitPayload.items()).doReturn(organisationUnits)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
index b7127b1e20..1da29b2c46 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
@@ -70,7 +70,7 @@ class OrganisationUnitHandlerShould {
             organisationUnitProgramLinkHandler,
             dataSetDataSetOrganisationUnitLinkHandler,
             organisationUnitGroupHandler,
-            organisationUnitGroupLinkHandler
+            organisationUnitGroupLinkHandler,
         )
         whenever(user.uid()).doReturn("test_user_uid")
         whenever(program.uid()).doReturn(programUid)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt
index 694dc61354..2cdffdcc04 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ExpressionServiceShould.kt
@@ -81,7 +81,7 @@ class ExpressionServiceShould {
             dataElementStore,
             categoryOptionComboStore,
             organisationUnitGroupStore,
-            programStageStore
+            programStageStore,
         )
         constantMap = mapOf(constantId to constant)
 
@@ -96,17 +96,17 @@ class ExpressionServiceShould {
     fun evaluate_dataelements() {
         val expression = deOperand(dataElementId1, categoryOptionComboId1) + " + " + deOperand(
             dataElementId2,
-            categoryOptionComboId2
+            categoryOptionComboId2,
         )
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
             DataElementOperandObject(dataElementId1, categoryOptionComboId1) to 5.0,
-            DataElementOperandObject(dataElementId2, categoryOptionComboId2) to 3.0
+            DataElementOperandObject(dataElementId2, categoryOptionComboId2) to 3.0,
         )
 
         val result = service.getExpressionValue(
             expression,
             ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10),
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double?
 
         assertThat(result).isEqualTo(8.0)
@@ -116,14 +116,14 @@ class ExpressionServiceShould {
     fun evaluate_constants() {
         val expression = de(dataElementId1) + " + " + constant(constantId)
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
-            DataElementOperandObject(dataElementId1, null) to 5.0
+            DataElementOperandObject(dataElementId1, null) to 5.0,
         )
         whenever(constant.value()).thenReturn(4.0)
 
         val result = service.getExpressionValue(
             expression,
             ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10),
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double?
 
         assertThat(result).isEqualTo(9.0)
@@ -134,12 +134,12 @@ class ExpressionServiceShould {
         val expression = de(dataElementId1) + " + " + de(dataElementId2)
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
             DataElementOperandObject(dataElementId1, null) to 5.0,
-            DataElementOperandObject(dataElementId2, null) to 3.0
+            DataElementOperandObject(dataElementId2, null) to 3.0,
         )
         val result = service.getExpressionValue(
             expression,
             ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10),
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double?
 
         assertThat(result).isEqualTo(8.0)
@@ -149,12 +149,12 @@ class ExpressionServiceShould {
     fun evaluate_days() {
         val expression = de(dataElementId1) + " + " + days
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
-            DataElementOperandObject(dataElementId1, null) to 5.0
+            DataElementOperandObject(dataElementId1, null) to 5.0,
         )
         val result = service.getExpressionValue(
             expression,
             ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10),
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double?
 
         assertThat(result).isEqualTo(15.0)
@@ -164,15 +164,15 @@ class ExpressionServiceShould {
     fun evaluate_orgunit_groups() {
         val expression = de(dataElementId1) + " + " + oug(orgunitGroupId)
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
-            DataElementOperandObject(dataElementId1, null) to 5.0
+            DataElementOperandObject(dataElementId1, null) to 5.0,
         )
         val orgunitMap: Map<String, Int> = mapOf(
-            orgunitGroupId to 20
+            orgunitGroupId to 20,
         )
         val result = service.getExpressionValue(
             expression,
             ExpressionServiceContext(valueMap, constantMap, orgunitMap, 10),
-            MissingValueStrategy.NEVER_SKIP
+            MissingValueStrategy.NEVER_SKIP,
         ) as Double?
 
         assertThat(result).isEqualTo(25.0)
@@ -182,18 +182,18 @@ class ExpressionServiceShould {
     fun evaluate_missing_strategies_with_some_missing_values() {
         val expression = de(dataElementId1) + " + " + de(dataElementId2)
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
-            DataElementOperandObject(dataElementId1, null) to 5.0
+            DataElementOperandObject(dataElementId1, null) to 5.0,
         )
 
         mapOf(
             MissingValueStrategy.NEVER_SKIP to 5.0,
             MissingValueStrategy.SKIP_IF_ANY_VALUE_MISSING to null,
-            MissingValueStrategy.SKIP_IF_ALL_VALUES_MISSING to 5.0
+            MissingValueStrategy.SKIP_IF_ALL_VALUES_MISSING to 5.0,
         ).forEach { (strategy, expected) ->
             val result = service.getExpressionValue(
                 expression,
                 ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10),
-                strategy
+                strategy,
             ) as Double?
 
             assertThat(result).isEqualTo(expected)
@@ -208,12 +208,12 @@ class ExpressionServiceShould {
         mapOf(
             MissingValueStrategy.NEVER_SKIP to 0.0,
             MissingValueStrategy.SKIP_IF_ANY_VALUE_MISSING to null,
-            MissingValueStrategy.SKIP_IF_ALL_VALUES_MISSING to null
+            MissingValueStrategy.SKIP_IF_ALL_VALUES_MISSING to null,
         ).forEach { (strategy, expected) ->
             val result = service.getExpressionValue(
                 expression,
                 ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10),
-                strategy
+                strategy,
             ) as Double?
 
             assertThat(result).isEqualTo(expected)
@@ -296,7 +296,7 @@ class ExpressionServiceShould {
     fun get_dataelement_operands_ids() {
         val expression = deOperand(dataElementId1, categoryOptionComboId1) + " + " + deOperand(
             dataElementId2,
-            categoryOptionComboId2
+            categoryOptionComboId2,
         )
         val dataElementOperands = service.getDataElementOperands(expression)
         assertThat(dataElementOperands.size).isEqualTo(2)
@@ -369,10 +369,10 @@ class ExpressionServiceShould {
             days
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
             DataElementOperandObject(dataElementId1, categoryOptionComboId1) to 5.0,
-            DataElementObject(dataElementId2) to 3.0
+            DataElementObject(dataElementId2) to 3.0,
         )
         val orgunitMap: Map<String, Int> = mapOf(
-            orgunitGroupId to 20
+            orgunitGroupId to 20,
         )
         val context = ExpressionServiceContext(valueMap, constantMap, orgunitMap, 10)
         whenever(constant.value()).thenReturn(3.14)
@@ -386,7 +386,7 @@ class ExpressionServiceShould {
     fun regenerate_expression_with_missing_items() {
         val expression = deOperand(dataElementId1, categoryOptionComboId1) + " + " + de(dataElementId2)
         val valueMap: Map<DimensionalItemObject, Double> = mapOf(
-            DataElementOperandObject(dataElementId1, categoryOptionComboId1) to 5.0
+            DataElementOperandObject(dataElementId1, categoryOptionComboId1) to 5.0,
         )
         val context = ExpressionServiceContext(valueMap, constantMap, emptyMap(), 10)
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt
index 2d4e3146b3..dce418add1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtilsShould.kt
@@ -39,7 +39,7 @@ class ParserUtilsShould {
         mapOf(
             "2022-12-10" to listOf(2022, 12, 10, "2022-12-10"),
             "2022-05-08" to listOf(2022, 5, 8, "2022-05-08"),
-            "2022-5-8" to listOf(2022, 5, 8, "2022-05-08")
+            "2022-5-8" to listOf(2022, 5, 8, "2022-05-08"),
         ).forEach { (str, tokens) ->
             val date = ParserUtils.parseExpressionDate(str)
             assertThat(date.year).isEqualTo(tokens[0])
@@ -55,7 +55,7 @@ class ParserUtilsShould {
             "",
             "null",
             "2022-08",
-            "2022-13-35"
+            "2022-13-35",
         ).forEach {
             assertThrows(ParserExceptionWithoutContext::class.java) { ParserUtils.parseExpressionDate(it) }
         }
@@ -69,7 +69,7 @@ class ParserUtilsShould {
             "2022Q4" to 4,
             "2022BiW13" to 13,
             "2022S2" to 2,
-            "2022NovS1" to 1
+            "2022NovS1" to 1,
         ).forEach { (periodId, trailingDigits) ->
             assertThat(ParserUtils.getTrailingDigits(periodId)).isEqualTo(trailingDigits)
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt
index 0f76555fa9..13038ba754 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelperShould.kt
@@ -47,7 +47,7 @@ class ExpressionHelperShould {
     fun map_data_elements_only() {
         val dataValues: List<DataValue> = listOf(
             dv(dataElement1, cocDefault, "4"),
-            dv(dataElement2, cocDefault, "6")
+            dv(dataElement2, cocDefault, "6"),
         )
         val valueMap = getValueMap(dataValues)
         Truth.assertThat(valueMap.keys.size).isEqualTo(4)
@@ -63,7 +63,7 @@ class ExpressionHelperShould {
             dv(dataElement1, coc1, "4"),
             dv(dataElement1, coc2, "5"),
             dv(dataElement2, coc1, "6"),
-            dv(dataElement2, coc2, "7")
+            dv(dataElement2, coc2, "7"),
         )
         val valueMap = getValueMap(dataValues)
         Truth.assertThat(valueMap.keys.size).isEqualTo(6)
@@ -81,7 +81,7 @@ class ExpressionHelperShould {
             dv(dataElement1, coc1, "4"),
             dv(dataElement1, coc2, "5"),
             dv(dataElement2, coc1, "text1"),
-            dv(dataElement2, coc2, "text2")
+            dv(dataElement2, coc2, "text2"),
         )
         val valueMap = getValueMap(dataValues)
         Truth.assertThat(valueMap.keys.size).isEqualTo(3)
@@ -101,7 +101,7 @@ class ExpressionHelperShould {
     private fun assertContainsEntry(
         valueMap: Map<DimensionalItemObject, Double>,
         dataElementId: String,
-        value: Double
+        value: Double,
     ) {
         assertContainsEntry(valueMap, dataElementId, null, value)
     }
@@ -110,7 +110,7 @@ class ExpressionHelperShould {
         valueMap: Map<DimensionalItemObject, Double>,
         dataElementId: String,
         categoryOptionComboId: String?,
-        value: Double
+        value: Double,
     ) {
         val key =
             if (categoryOptionComboId == null) {
@@ -128,7 +128,7 @@ class ExpressionHelperShould {
     private fun assertNotContainsEntry(
         valueMap: Map<DimensionalItemObject, Double>,
         dataElementId: String,
-        categoryOptionComboId: String?
+        categoryOptionComboId: String?,
     ) {
         val key =
             if (categoryOptionComboId == null) {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/period/internal/InPeriodQueryHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/period/internal/InPeriodQueryHelperShould.kt
index cc6daca277..c13c23b53e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/period/internal/InPeriodQueryHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/period/internal/InPeriodQueryHelperShould.kt
@@ -53,14 +53,14 @@ class InPeriodQueryHelperShould {
         val datePeriods: List<DatePeriod> = listOf(
             DatePeriod.create(date1, date2),
             DatePeriod.create(date3, date4),
-            DatePeriod.create(date5, date6)
+            DatePeriod.create(date5, date6),
         )
 
         val inPeriodQuery = buildInPeriodsQuery("COL1", datePeriods, formatter)
         Truth.assertThat(inPeriodQuery).isEqualTo(
             "(COL1 >= '2001-12-24T12:24:25.203' AND COL1 <= '2002-12-24T12:24:25.203') OR " +
                 "(COL1 >= '2003-12-24T12:24:25.203' AND COL1 <= '2004-12-24T12:24:25.203') OR " +
-                "(COL1 >= '2005-12-24T12:24:25.203' AND COL1 <= '2006-12-24T12:24:25.203')"
+                "(COL1 >= '2005-12-24T12:24:25.203' AND COL1 <= '2006-12-24T12:24:25.203')",
         )
     }
 
@@ -76,13 +76,13 @@ class InPeriodQueryHelperShould {
 
         val datePeriods: List<DatePeriod> = listOf(
             DatePeriod.create(date1, date2),
-            DatePeriod.create(date3, date4)
+            DatePeriod.create(date3, date4),
         )
 
         val inPeriodQuery = buildInPeriodsQuery("date(COL1)", datePeriods, formatter)
         Truth.assertThat(inPeriodQuery).isEqualTo(
             "(date(COL1) >= '2001-12-24' AND date(COL1) <= '2002-12-24') OR " +
-                "(date(COL1) >= '2003-12-24' AND date(COL1) <= '2004-12-24')"
+                "(date(COL1) >= '2003-12-24' AND date(COL1) <= '2004-12-24')",
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/period/internal/PeriodGeneratorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/period/internal/PeriodGeneratorShould.kt
index 9fe068edff..748bf1275a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/period/internal/PeriodGeneratorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/period/internal/PeriodGeneratorShould.kt
@@ -30,11 +30,11 @@ package org.hisp.dhis.android.core.period.internal
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
-import java.util.*
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import java.util.*
 
 @RunWith(JUnit4::class)
 class PeriodGeneratorShould {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt b/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt
index ff31b9c758..a7e03f3537 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt
@@ -68,25 +68,31 @@ class RelativePeriodGeneratorImplShould {
                 RelativePeriod.LAST_SIX_MONTH,
                 RelativePeriod.LAST_QUARTER,
                 RelativePeriod.LAST_YEAR,
-                RelativePeriod.LAST_FINANCIAL_YEAR -> assertThat(periods.size).isEqualTo(1)
+                RelativePeriod.LAST_FINANCIAL_YEAR,
+                -> assertThat(periods.size).isEqualTo(1)
 
                 RelativePeriod.LAST_2_SIXMONTHS -> assertThat(periods.size).isEqualTo(2)
 
                 RelativePeriod.LAST_3_DAYS,
-                RelativePeriod.LAST_3_MONTHS -> assertThat(periods.size).isEqualTo(3)
+                RelativePeriod.LAST_3_MONTHS,
+                -> assertThat(periods.size).isEqualTo(3)
 
                 RelativePeriod.LAST_4_WEEKS,
                 RelativePeriod.LAST_4_BIWEEKS,
-                RelativePeriod.LAST_4_QUARTERS -> assertThat(periods.size).isEqualTo(4)
+                RelativePeriod.LAST_4_QUARTERS,
+                -> assertThat(periods.size).isEqualTo(4)
 
                 RelativePeriod.LAST_5_YEARS,
-                RelativePeriod.LAST_5_FINANCIAL_YEARS -> assertThat(periods.size).isEqualTo(5)
+                RelativePeriod.LAST_5_FINANCIAL_YEARS,
+                -> assertThat(periods.size).isEqualTo(5)
 
                 RelativePeriod.LAST_10_YEARS,
-                RelativePeriod.LAST_10_FINANCIAL_YEARS -> assertThat(periods.size).isEqualTo(10)
+                RelativePeriod.LAST_10_FINANCIAL_YEARS,
+                -> assertThat(periods.size).isEqualTo(10)
 
                 RelativePeriod.LAST_6_MONTHS,
-                RelativePeriod.LAST_6_BIMONTHS -> assertThat(periods.size).isEqualTo(6)
+                RelativePeriod.LAST_6_BIMONTHS,
+                -> assertThat(periods.size).isEqualTo(6)
 
                 RelativePeriod.LAST_7_DAYS -> assertThat(periods.size).isEqualTo(7)
                 RelativePeriod.LAST_14_DAYS -> assertThat(periods.size).isEqualTo(14)
@@ -96,18 +102,22 @@ class RelativePeriodGeneratorImplShould {
                 RelativePeriod.LAST_180_DAYS -> assertThat(periods.size).isEqualTo(180)
 
                 RelativePeriod.LAST_12_WEEKS,
-                RelativePeriod.LAST_12_MONTHS -> assertThat(periods.size).isEqualTo(12)
+                RelativePeriod.LAST_12_MONTHS,
+                -> assertThat(periods.size).isEqualTo(12)
 
                 RelativePeriod.LAST_52_WEEKS,
-                RelativePeriod.WEEKS_THIS_YEAR -> assertThat(periods.size).isEqualTo(52)
+                RelativePeriod.WEEKS_THIS_YEAR,
+                -> assertThat(periods.size).isEqualTo(52)
 
                 RelativePeriod.MONTHS_THIS_YEAR,
-                RelativePeriod.MONTHS_LAST_YEAR -> assertThat(periods.size).isEqualTo(12)
+                RelativePeriod.MONTHS_LAST_YEAR,
+                -> assertThat(periods.size).isEqualTo(12)
 
                 RelativePeriod.BIMONTHS_THIS_YEAR -> assertThat(periods.size).isEqualTo(6)
 
                 RelativePeriod.QUARTERS_THIS_YEAR,
-                RelativePeriod.QUARTERS_LAST_YEAR -> assertThat(periods.size).isEqualTo(4)
+                RelativePeriod.QUARTERS_LAST_YEAR,
+                -> assertThat(periods.size).isEqualTo(4)
             }
         }
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorShould.kt
index 2483a8ecc5..8074bbb898 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/ProgramIndicatorShould.kt
@@ -41,10 +41,10 @@ class ProgramIndicatorShould : BaseObjectShould("program/program_indicator.json"
     override fun map_from_json_string() {
         val programIndicator = objectMapper.readValue(jsonStream, ProgramIndicator::class.java)
         Truth.assertThat(programIndicator.created()).isEqualTo(
-            BaseIdentifiableObject.DATE_FORMAT.parse("2015-09-21T23:35:50.945")
+            BaseIdentifiableObject.DATE_FORMAT.parse("2015-09-21T23:35:50.945"),
         )
         Truth.assertThat(programIndicator.lastUpdated()).isEqualTo(
-            BaseIdentifiableObject.DATE_FORMAT.parse("2015-09-21T23:47:57.820")
+            BaseIdentifiableObject.DATE_FORMAT.parse("2015-09-21T23:47:57.820"),
         )
         Truth.assertThat(programIndicator.uid()).isEqualTo("GSae40Fyppf")
         Truth.assertThat(programIndicator.name()).isEqualTo("Age at visit")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index a63d63260a..e6e60cb952 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -31,7 +31,6 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
-import javax.net.ssl.HttpsURLConnection
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
@@ -55,6 +54,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.ArgumentMatchers
 import retrofit2.Response
+import javax.net.ssl.HttpsURLConnection
 
 @RunWith(JUnit4::class)
 class ProgramModuleDownloaderShould : BaseCallShould() {
@@ -84,7 +84,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         super.setUp()
         errorResponse = Response.error<Any>(
             HttpsURLConnection.HTTP_CLIENT_TIMEOUT,
-            ResponseBody.create("application/json".toMediaTypeOrNull(), "{}")
+            ResponseBody.create("application/json".toMediaTypeOrNull(), "{}"),
         )
 
         // Calls
@@ -114,7 +114,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
             optionSetCall,
             optionCall,
             optionGroupCall,
-            organisationUnitProgramLinkLinkStore
+            organisationUnitProgramLinkLinkStore,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/AnalyticsBoundaryParserShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/AnalyticsBoundaryParserShould.kt
index 6cd5931170..605fba6282 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/AnalyticsBoundaryParserShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/AnalyticsBoundaryParserShould.kt
@@ -48,7 +48,7 @@ class AnalyticsBoundaryParserShould {
             "INVALID_STRING" to null,
             "#{a3kGcGDCuk6}" to null,
             "A{GPkGfbmy}" to null,
-            "PS_EVENTDATE:3MvHHogjR" to null
+            "PS_EVENTDATE:3MvHHogjR" to null,
         )
             .forEach {
                 assertThat(AnalyticsBoundaryParser.parseBoundaryTarget(it.key)).isEqualTo(it.value)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt
index c159c2e182..e11c44e728 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt
@@ -31,7 +31,6 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import java.text.ParseException
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.ValueType
@@ -50,6 +49,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
+import java.text.ParseException
 
 /**
  * Unit test for in-memory program indicator executor.
@@ -85,7 +85,7 @@ class ProgramIndicatorExecutorShould {
 
     private val attributeValueMap: Map<String, TrackedEntityAttributeValue> = mapOf(
         attributeUid1 to attributeValue1,
-        attributeUid2 to attributeValue2
+        attributeUid2 to attributeValue2,
     )
 
     private val event1: Event = mock()
@@ -94,7 +94,7 @@ class ProgramIndicatorExecutorShould {
 
     private val eventsMap: Map<String, List<Event>> = mapOf(
         programStage1 to listOf(event1),
-        programStage2 to listOf(event2_1, event2_2)
+        programStage2 to listOf(event2_1, event2_2),
     )
 
     private val dataValue1: TrackedEntityDataValue = mock()
@@ -114,7 +114,7 @@ class ProgramIndicatorExecutorShould {
         programIndicatorContext,
         dataElementStore,
         trackedEntityAttributeStore,
-        programStageStore
+        programStageStore,
     )
 
     @Before
@@ -179,7 +179,7 @@ class ProgramIndicatorExecutorShould {
     fun evaluate_data_elements_with_value_count() {
         setExpression(
             "(${de(programStage1, dataElementUid1)} + ${de(programStage2, dataElementUid2)}) / " +
-                `var`("value_count")
+                `var`("value_count"),
         )
         whenever(dataValue1.value()) doReturn "4.5"
         whenever(dataValue2_2.value()) doReturn "1.9"
@@ -192,7 +192,7 @@ class ProgramIndicatorExecutorShould {
     fun evaluate_data_elements_with_zero_pos_value_count() {
         setExpression(
             "(${de(programStage1, dataElementUid1)} + ${de(programStage2, dataElementUid2)}) / " +
-                `var`("zero_pos_value_count")
+                `var`("zero_pos_value_count"),
         )
         whenever(dataValue1.value()) doReturn "7.5"
         whenever(dataValue2_2.value()) doReturn "-1.5"
diff --git a/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt
index 0612066a18..a92697f073 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandlerShould.kt
@@ -61,7 +61,7 @@ class ProgramStageWorkingListHandlerShould {
         handler = ProgramStageWorkingListHandler(
             programStageWorkingListStore,
             eventDataFilterHandler,
-            attributeValueFilterHandler
+            attributeValueFilterHandler,
         )
 
         eventDataFilters = listOf(eventDataFilter)
@@ -88,7 +88,7 @@ class ProgramStageWorkingListHandlerShould {
         ProgramStageWorkingListHandler(
             programStageWorkingListStore,
             eventDataFilterHandler,
-            attributeValueFilterHandler
+            attributeValueFilterHandler,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipShould.kt
index c820da589c..f24642ba07 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/NewTrackerImporterRelationshipShould.kt
@@ -42,10 +42,10 @@ class NewTrackerImporterRelationshipShould : BaseObjectShould("relationship/new_
         assertThat(relationship.uid()).isEqualTo("VdjOfugUb9y")
         assertThat(relationship.relationshipType()).isEqualTo("mxZDvSZYxlw")
         assertThat(relationship.createdAt()).isEqualTo(
-            BaseIdentifiableObject.DATE_FORMAT.parse("2021-07-26T13:34:46.887")
+            BaseIdentifiableObject.DATE_FORMAT.parse("2021-07-26T13:34:46.887"),
         )
         assertThat(relationship.updatedAt()).isEqualTo(
-            BaseIdentifiableObject.DATE_FORMAT.parse("2021-07-26T15:34:46.887")
+            BaseIdentifiableObject.DATE_FORMAT.parse("2021-07-26T15:34:46.887"),
         )
         assertThat(relationship.bidirectional()).isTrue()
         assertThat(relationship.from()?.event()?.event()).isEqualTo("mOFppqD2q8d")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipServiceShould.kt
index f4d4b940b1..898c8dfc05 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/RelationshipServiceShould.kt
@@ -34,7 +34,7 @@ class RelationshipServiceShould {
         relationshipService = RelationshipServiceImpl(
             programRepository,
             programStageRepository,
-            trackedEntityTypeRepository
+            trackedEntityTypeRepository,
         )
     }
 
@@ -43,7 +43,7 @@ class RelationshipServiceShould {
         val bidirectionalRelationship = relationshipType(
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
-            true
+            true,
         )
 
         mockTeTypeAccessResponse(fromAccess = true, toAccess = true)
@@ -55,7 +55,7 @@ class RelationshipServiceShould {
         val bidirectionalRelationship = relationshipType(
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
-            true
+            true,
         )
 
         mockTeTypeAccessResponse(fromAccess = false, toAccess = true)
@@ -70,19 +70,19 @@ class RelationshipServiceShould {
         val teTypeRelationship = relationshipType(
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
-            true
+            true,
         )
 
         val programRelationship = relationshipType(
             RelationshipEntityType.PROGRAM_INSTANCE,
             RelationshipEntityType.PROGRAM_INSTANCE,
-            true
+            true,
         )
 
         val programStageRelationship = relationshipType(
             RelationshipEntityType.PROGRAM_STAGE_INSTANCE,
             RelationshipEntityType.PROGRAM_STAGE_INSTANCE,
-            true
+            true,
         )
 
         mockTeTypeAccessResponse(fromAccess = true, toAccess = true)
@@ -103,7 +103,7 @@ class RelationshipServiceShould {
         val unidirectionalRelationship = relationshipType(
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
-            false
+            false,
         )
         mockTeTypeAccessResponse(fromAccess = true, toAccess = false)
 
@@ -115,7 +115,7 @@ class RelationshipServiceShould {
         val unidirectionalRelationship = relationshipType(
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
             RelationshipEntityType.TRACKED_ENTITY_INSTANCE,
-            false
+            false,
         )
         mockTeTypeAccessResponse(fromAccess = false, toAccess = false)
 
@@ -124,35 +124,35 @@ class RelationshipServiceShould {
 
     private fun mockTeTypeAccessResponse(fromAccess: Boolean, toAccess: Boolean) {
         whenever(
-            trackedEntityTypeRepository.uid(any()).blockingGet()
+            trackedEntityTypeRepository.uid(any()).blockingGet(),
         ) doReturnConsecutively listOf(
             TrackedEntityType.builder().uid("from").access(accessData(fromAccess)).build(),
-            TrackedEntityType.builder().uid("to").access(accessData(toAccess)).build()
+            TrackedEntityType.builder().uid("to").access(accessData(toAccess)).build(),
         )
     }
 
     private fun mockProgramAccessResponse(fromAccess: Boolean, toAccess: Boolean) {
         whenever(
-            programRepository.uid(any()).blockingGet()
+            programRepository.uid(any()).blockingGet(),
         ) doReturnConsecutively listOf(
             Program.builder().uid("from").access(accessData(fromAccess)).build(),
-            Program.builder().uid("to").access(accessData(toAccess)).build()
+            Program.builder().uid("to").access(accessData(toAccess)).build(),
         )
     }
 
     private fun mockProgramStageAccessResponse(fromAccess: Boolean, toAccess: Boolean) {
         whenever(
-            programStageRepository.uid(any()).blockingGet()
+            programStageRepository.uid(any()).blockingGet(),
         ) doReturnConsecutively listOf(
             ProgramStage.builder().uid("from").access(accessData(fromAccess)).build(),
-            ProgramStage.builder().uid("to").access(accessData(toAccess)).build()
+            ProgramStage.builder().uid("to").access(accessData(toAccess)).build(),
         )
     }
 
     private fun relationshipType(
         fromType: RelationshipEntityType,
         toType: RelationshipEntityType,
-        bidirectional: Boolean
+        bidirectional: Boolean,
     ) = RelationshipType.builder()
         .uid("relationshipType")
         .fromToName("from")
@@ -160,21 +160,21 @@ class RelationshipServiceShould {
         .fromConstraint(
             relationshipConstraint(
                 RelationshipConstraintType.FROM,
-                fromType
-            )
+                fromType,
+            ),
         )
         .toConstraint(
             relationshipConstraint(
                 RelationshipConstraintType.TO,
-                toType
-            )
+                toType,
+            ),
         )
         .bidirectional(bidirectional)
         .build()
 
     private fun relationshipConstraint(
         relationshipConstraintType: RelationshipConstraintType,
-        relationshipEntityType: RelationshipEntityType
+        relationshipEntityType: RelationshipEntityType,
     ) = RelationshipConstraint.builder()
         .relationshipType(ObjectWithUid.create("${relationshipConstraintType.name}_relationshipType"))
         .constraintType(relationshipConstraintType)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
index c5a6c27a08..c10b3333ad 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandlerShould.kt
@@ -71,7 +71,7 @@ class RelationshipHandlerShould {
             relationshipStore,
             relationshipItemStore,
             relationshipItemHandler,
-            storeSelector
+            storeSelector,
         )
         whenever(storeSelector.getElementStore(any())).thenReturn(itemElementStore)
         whenever(itemElementStore.exists(RelationshipSamples.FROM_UID)).thenReturn(true)
@@ -81,8 +81,8 @@ class RelationshipHandlerShould {
         whenever(
             relationshipItemStore.getRelationshipUidsForItems(
                 RelationshipSamples.fromItem,
-                RelationshipSamples.toItem
-            )
+                RelationshipSamples.toItem,
+            ),
         ).thenReturn(listOf(RelationshipSamples.UID))
         whenever(relationshipItemStore.getRelationshipUidsForItems(tei3Item, tei4Item)).thenReturn(emptyList())
         whenever(relationshipStore.selectByUid(RelationshipSamples.UID)).thenReturn(RelationshipSamples.get230())
@@ -124,11 +124,11 @@ class RelationshipHandlerShould {
         relationshipHandler.handle(existingRelationship)
         verify(relationshipItemHandler).handle(
             RelationshipSamples.fromItem.toBuilder().relationship(ObjectWithUid.create(existingRelationship.uid()))
-                .relationshipItemType(RelationshipConstraintType.FROM).build()
+                .relationshipItemType(RelationshipConstraintType.FROM).build(),
         )
         verify(relationshipItemHandler).handle(
             RelationshipSamples.toItem.toBuilder().relationship(ObjectWithUid.create(existingRelationship.uid()))
-                .relationshipItemType(RelationshipConstraintType.TO).build()
+                .relationshipItemType(RelationshipConstraintType.TO).build(),
         )
     }
 
@@ -138,12 +138,12 @@ class RelationshipHandlerShould {
         verify(relationshipItemHandler).handle(
             RelationshipSamples.fromItem.toBuilder()
                 .relationship(ObjectWithUid.create(existingRelationshipWithNewUid.uid()))
-                .relationshipItemType(RelationshipConstraintType.FROM).build()
+                .relationshipItemType(RelationshipConstraintType.FROM).build(),
         )
         verify(relationshipItemHandler).handle(
             RelationshipSamples.toItem.toBuilder()
                 .relationship(ObjectWithUid.create(existingRelationshipWithNewUid.uid()))
-                .relationshipItemType(RelationshipConstraintType.TO).build()
+                .relationshipItemType(RelationshipConstraintType.TO).build(),
         )
     }
 
@@ -152,11 +152,11 @@ class RelationshipHandlerShould {
         relationshipHandler.handle(newRelationship)
         verify(relationshipItemHandler).handle(
             tei3Item.toBuilder().relationship(ObjectWithUid.create(newRelationship.uid()))
-                .relationshipItemType(RelationshipConstraintType.FROM).build()
+                .relationshipItemType(RelationshipConstraintType.FROM).build(),
         )
         verify(relationshipItemHandler).handle(
             tei4Item.toBuilder().relationship(ObjectWithUid.create(newRelationship.uid()))
-                .relationshipItemType(RelationshipConstraintType.TO).build()
+                .relationshipItemType(RelationshipConstraintType.TO).build(),
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt
index 38956fe74e..4cf8c10f2f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandlerShould.kt
@@ -87,7 +87,7 @@ class RelationshipImportHandlerShould {
 
         relationshipImportHandler.handleRelationshipImportSummaries(
             listOf(importSummary),
-            relationships
+            relationships,
         )
 
         verify(relationshipStore, times(1)).setSyncStateOrDelete("test_uid", State.SYNCED)
@@ -101,7 +101,7 @@ class RelationshipImportHandlerShould {
 
         relationshipImportHandler.handleRelationshipImportSummaries(
             listOf(importSummary),
-            relationships
+            relationships,
         )
 
         verify(relationshipStore, times(1)).setSyncStateOrDelete("test_uid", State.TO_UPDATE)
@@ -118,7 +118,7 @@ class RelationshipImportHandlerShould {
 
         relationshipImportHandler.handleRelationshipImportSummaries(
             listOf(importSummary),
-            relationships
+            relationships,
         )
 
         verify(relationshipStore, times(1)).setSyncStateOrDelete("test_uid", State.SYNCED)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelperShould.kt
index 37e3cf42c3..b72697e563 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCollectionRepositoryHelperShould.kt
@@ -76,7 +76,7 @@ class RelationshipTypeCollectionRepositoryHelperShould {
                 "AND (program IS NULL " +
                 "OR program IN (SELECT program FROM Enrollment WHERE trackedEntityInstance == '$teiUid'))" +
                 ")" +
-                ")"
+                ")",
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV1Should.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV1Should.kt
index a81b9eeeb5..e0ed4fb101 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV1Should.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV1Should.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.settings
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.common.BaseObjectShould
 import org.hisp.dhis.android.core.common.ObjectShould
 import org.hisp.dhis.android.core.period.PeriodType
 import org.junit.Assert.fail
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class AnalyticsSettingV1Should : BaseObjectShould("settings/analytics_settings.json"), ObjectShould {
 
@@ -59,13 +59,13 @@ class AnalyticsSettingV1Should : BaseObjectShould("settings/analytics_settings.j
                     assertThat(
                         tei.data()?.dataElements()?.any { dataElement ->
                             dataElement.dataElement() == "sWoqcoByYmD" && dataElement.programStage() == "dBwrot7S420"
-                        }
+                        },
                     ).isTrue()
 
                     assertThat(
                         tei.data()?.dataElements()?.any { dataElement ->
                             dataElement.dataElement() == "Ok9OQpitjQr" && dataElement.programStage() == "dBwrot7S421"
-                        }
+                        },
                     ).isTrue()
                 }
                 "XQUhloISaQJ" -> {
@@ -75,7 +75,7 @@ class AnalyticsSettingV1Should : BaseObjectShould("settings/analytics_settings.j
                     assertThat(
                         tei.data()?.indicators()?.first()?.let {
                             it.indicator() == "GSae40Fyppf" && it.programStage() == "dBwrot7S420"
-                        }
+                        },
                     ).isTrue()
 
                     assertThat(tei.data()?.attributes()?.size).isEqualTo(1)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV2Should.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV2Should.kt
index fcb8260e3b..6556258f95 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV2Should.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AnalyticsSettingV2Should.kt
@@ -29,12 +29,12 @@
 package org.hisp.dhis.android.core.settings
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.common.BaseObjectShould
 import org.hisp.dhis.android.core.common.ObjectShould
 import org.hisp.dhis.android.core.period.PeriodType
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class AnalyticsSettingV2Should : BaseObjectShould("settings/analytics_settings_v2.json"), ObjectShould {
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/LatestAppVersionSettingsShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/LatestAppVersionSettingsShould.kt
index 7bc93f1cbc..c27da227ce 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/LatestAppVersionSettingsShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/LatestAppVersionSettingsShould.kt
@@ -40,7 +40,7 @@ class LatestAppVersionSettingsShould : BaseObjectShould("settings/latest_app_ver
 
         Truth.assertThat(latestAppVersion.version()).isEqualTo("v2.7.1.1")
         Truth.assertThat(latestAppVersion.downloadURL()).isEqualTo(
-            "https://github.com/dhis2/dhis2-android-capture-app/releases/download/2.7.1.1/dhis2-v2.7.1.1.apk"
+            "https://github.com/dhis2/dhis2-android-capture-app/releases/download/2.7.1.1/dhis2-v2.7.1.1.apk",
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
index 7008b8d2af..f4fc377329 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
@@ -62,7 +62,7 @@ class AnalyticsSettingCallShould {
             analyticsDhisVisualizationsSettingHandler,
             service,
             apiCallExecutor,
-            appVersionManager
+            appVersionManager,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
index 778b25b4c9..f625ce1a02 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandlerShould.kt
@@ -60,7 +60,7 @@ class AnalyticsTeiSettingHandlerShould {
             teiDataElementHandler,
             teiIndicatorHandler,
             teiAttributeHandler,
-            whoDataHandler
+            whoDataHandler,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
index 0030953726..3e817c6708 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandlerShould.kt
@@ -53,7 +53,7 @@ class AnalyticsTeiWHONutritionDataHandlerShould {
         analyticsTeiSettingHandler = AnalyticsTeiWHONutritionDataHandler(
             store,
             teiDataElementHandler,
-            teiIndicatorHandler
+            teiIndicatorHandler,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
index 2eb9ec6eec..b074d2f81f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
@@ -61,7 +61,7 @@ class AppearanceSettingsCallShould {
             programConfigurationHandler,
             service,
             apiCallExecutor,
-            appVersionManager
+            appVersionManager,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
index af71d4ba24..811297cbce 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
@@ -65,7 +65,7 @@ class SynchronizationSettingCallShould {
             generalSettingCall,
             dataSetSettingCall,
             programSettingCall,
-            appVersionManager
+            appVersionManager,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
index e3dfce3563..98b219e088 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingsHandlerShould.kt
@@ -54,7 +54,7 @@ class SynchronizationSettingsHandlerShould {
         synchronizationSettingsHandler = SynchronizationSettingHandler(
             synchronizationSettingStore,
             dataSetSettingHandler,
-            programSettingHandler
+            programSettingHandler,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SystemSettingSplitterShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SystemSettingSplitterShould.kt
index 35d2366f4f..2601fef651 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SystemSettingSplitterShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SystemSettingSplitterShould.kt
@@ -39,7 +39,7 @@ class SystemSettingSplitterShould {
     private val settings: SystemSettings = SystemSettings(
         keyFlag = "aFlag",
         keyStyle = "aStyle",
-        keyBingMapsApiKey = null
+        keyBingMapsApiKey = null,
     )
 
     private val systemSettingsSplitter = SystemSettingsSplitter()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt b/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt
index cc297ab90e..e31df71103 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/sms/data/webapirepository/internal/WebApiRepositoryImplShould.kt
@@ -63,7 +63,7 @@ class WebApiRepositoryImplShould {
             notNull(),
             notNull(),
             notNull(),
-            notNull()
+            notNull(),
         )
     }
 
@@ -79,7 +79,7 @@ class WebApiRepositoryImplShould {
             isNull(),
             notNull(),
             notNull(),
-            notNull()
+            notNull(),
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
index 98d30aa7c3..9dfc86ec61 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.systeminfo.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import java.util.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -47,6 +46,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import java.util.*
 
 @RunWith(JUnit4::class)
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -74,7 +74,7 @@ class SystemInfoCallShould {
             systemInfoService,
             resourceHandler,
             versionManager,
-            coroutineAPICallExecutor
+            coroutineAPICallExecutor,
         )
 
         whenever(systemInfo.version()).thenReturn("2.29")
@@ -113,7 +113,7 @@ class SystemInfoCallShould {
         }
 
         verifyThrowD2Error(
-            block = { systemInfoSyncCall.download(true) }
+            block = { systemInfoSyncCall.download(true) },
         )
 
         verifyNoMoreInteractions(systemInfoHandler)
@@ -133,7 +133,7 @@ class SystemInfoCallShould {
         whenever(systemInfo.version()).thenReturn("2.28")
 
         verifyThrowD2Error(
-            block = { systemInfoSyncCall.download(true) }
+            block = { systemInfoSyncCall.download(true) },
         )
     }
 
@@ -143,7 +143,7 @@ class SystemInfoCallShould {
 
         verifyThrowD2Error(
             block = { systemInfoSyncCall.download(true) },
-            code = D2ErrorCode.INVALID_DHIS_VERSION
+            code = D2ErrorCode.INVALID_DHIS_VERSION,
         )
 
         verify(systemInfoHandler, never()).handle(systemInfo)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37Should.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37Should.kt
index d0de297551..d65c31b1e1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37Should.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterAPI37Should.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.common.ObjectShould
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class TrackedEntityInstanceFilterAPI37Should :
     TrackedEntityInstanceFilterCommonShould("trackedentity/tracked_entity_instance_filter_v_37.json"),
@@ -41,7 +41,7 @@ class TrackedEntityInstanceFilterAPI37Should :
     override fun map_from_json_string() {
         val trackedEntityInstanceFilterAPI37 = objectMapper.readValue(
             jsonStream,
-            TrackedEntityInstanceFilterAPI37::class.java
+            TrackedEntityInstanceFilterAPI37::class.java,
         )
 
         teiFilterCommonAsserts(trackedEntityInstanceFilterAPI37.toTrackedEntityInstanceFilter())
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceShould.kt
index 7a58e20a5f..679587113b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceShould.kt
@@ -41,10 +41,10 @@ class TrackedEntityInstanceShould : BaseObjectShould("trackedentity/tracked_enti
         val trackedEntityInstance = objectMapper.readValue(jsonStream, TrackedEntityInstance::class.java)
 
         assertThat(trackedEntityInstance.lastUpdated()).isEqualTo(
-            DateUtils.DATE_FORMAT.parse("2015-10-15T11:32:27.242")
+            DateUtils.DATE_FORMAT.parse("2015-10-15T11:32:27.242"),
         )
         assertThat(trackedEntityInstance.created()).isEqualTo(
-            DateUtils.DATE_FORMAT.parse("2014-06-06T20:44:21.375")
+            DateUtils.DATE_FORMAT.parse("2014-06-06T20:44:21.375"),
         )
 
         assertThat(trackedEntityInstance.uid()).isEqualTo("PgmUFEQYZdt")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
index eb91831a43..afbc6eabb8 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandlerShould.kt
@@ -108,7 +108,7 @@ class TrackedEntityInstanceHandlerShould {
             enrollmentHandler,
             programOwnerHandler,
             enrollmentCleaner,
-            relationshipCleaner
+            relationshipCleaner,
         )
     }
 
@@ -151,8 +151,8 @@ class TrackedEntityInstanceHandlerShould {
         whenever(trackedEntityInstanceStore.updateOrInsert(any())).doReturn(HandleAction.Update)
         whenever(trackedEntityInstance.trackedEntityAttributeValues()).doReturn(
             listOf(
-                TrackedEntityAttributeValue.builder().trackedEntityAttribute("att").build()
-            )
+                TrackedEntityAttributeValue.builder().trackedEntityAttribute("att").build(),
+            ),
         )
 
         trackedEntityInstanceHandler.handleMany(listOf(trackedEntityInstance), params, relationshipItemRelatives)
@@ -197,7 +197,7 @@ class TrackedEntityInstanceHandlerShould {
             listOf(relationship),
             TEI_UID,
             relatives,
-            relationshipHandler
+            relationshipHandler,
         )
     }
 
@@ -233,7 +233,7 @@ class TrackedEntityInstanceHandlerShould {
         verify(trackedEntityAttributeValueStore, times(1)).deleteByInstanceAndNotInProgramAttributes(
             any(),
             any(),
-            any()
+            any(),
         )
         verifyNoMoreInteractions(trackedEntityAttributeValueStore)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt
index fc50143e07..7089b2495a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandlerShould.kt
@@ -87,7 +87,7 @@ class TrackedEntityInstanceImportHandlerShould {
         trackedEntityInstanceImportHandler = TrackedEntityInstanceImportHandler(
             trackedEntityInstanceStore, enrollmentImportHandler, trackerImportConflictStore,
             trackerImportConflictParser, relationshipStore, dataStatePropagator, relationshipDHISVersionManager,
-            relationshipCollectionRepository, trackedEntityAttributeValueStore
+            relationshipCollectionRepository, trackedEntityAttributeValueStore,
         )
 
         whenever(trackedEntityInstanceStore.setSyncStateOrDelete(any(), any())).doReturn(HandleAction.Update)
@@ -106,7 +106,7 @@ class TrackedEntityInstanceImportHandlerShould {
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
             listOf(importSummary),
-            instances
+            instances,
         )
 
         verify(trackedEntityInstanceStore, times(1))
@@ -120,7 +120,7 @@ class TrackedEntityInstanceImportHandlerShould {
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
             listOf(importSummary),
-            instances
+            instances,
         )
 
         verify(trackedEntityInstanceStore, times(1))
@@ -138,14 +138,14 @@ class TrackedEntityInstanceImportHandlerShould {
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
             listOf(importSummary),
-            instances
+            instances,
         )
 
         verify(trackedEntityInstanceStore, times(1)).setSyncStateOrDelete(sampleTeiUid, State.SYNCED)
         verify(enrollmentImportHandler, times(1)).handleEnrollmentImportSummary(
             eq(enrollmentSummaries),
             anyList(),
-            eq(State.SYNCED)
+            eq(State.SYNCED),
         )
     }
 
@@ -159,7 +159,7 @@ class TrackedEntityInstanceImportHandlerShould {
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
             listOf(importSummary),
-            instances
+            instances,
         )
 
         verify(trackedEntityInstanceStore, times(1)).setSyncStateOrDelete(sampleTeiUid, State.SYNCED)
@@ -176,7 +176,7 @@ class TrackedEntityInstanceImportHandlerShould {
 
         val response = trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
             listOf(importSummary),
-            instances
+            instances,
         )
 
         assertThat(response.teis.ignored.size).isEqualTo(1)
@@ -197,7 +197,7 @@ class TrackedEntityInstanceImportHandlerShould {
 
         trackedEntityInstanceImportHandler.handleTrackedEntityInstanceImportSummaries(
             listOf(importSummary),
-            teis
+            teis,
         )
 
         verify(trackedEntityInstanceStore, times(1)).setSyncStateOrDelete(sampleTeiUid, State.SYNCED)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
index 2c50ad1e3f..41f8b0b96c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceQueryFactoryShould.kt
@@ -67,7 +67,7 @@ class TrackedEntityInstanceQueryFactoryShould {
     private val links = listOf(
         OrganisationUnitProgramLink.builder().organisationUnit(ou1c1).program(p1).build(),
         OrganisationUnitProgramLink.builder().organisationUnit(ou1c1).program(p2).build(),
-        OrganisationUnitProgramLink.builder().organisationUnit(ou2).program(p2).build()
+        OrganisationUnitProgramLink.builder().organisationUnit(ou2).program(p2).build(),
     )
 
     // Object to test
@@ -82,19 +82,19 @@ class TrackedEntityInstanceQueryFactoryShould {
         whenever(organisationUnitProgramLinkLinkStore.selectWhere(any()))
             .thenReturn(links)
         whenever(programStore.getUidsByProgramType(any())).thenReturn(
-            listOf(p1, p2, p3)
+            listOf(p1, p2, p3),
         )
         whenever(programSettingsObjectRepository.blockingGet()).thenReturn(programSettings)
 
         val commonHelper = TrackerQueryFactoryCommonHelper(
             userOrganisationUnitLinkStore,
-            organisationUnitProgramLinkLinkStore
+            organisationUnitProgramLinkLinkStore,
         )
         queryFactory = TrackerQueryBundleFactory(
             programStore,
             programSettingsObjectRepository,
             lastUpdatedManager,
-            commonHelper
+            commonHelper,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
index c65d46db18..9f0f9ed023 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryCommonParamsSamples.kt
@@ -41,7 +41,7 @@ internal object TrackerQueryCommonParamsSamples {
             false,
             OrganisationUnitMode.ACCESSIBLE,
             listOf(),
-            50
+            50,
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
index 70a8e8d11a..ae2847a208 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerShould.kt
@@ -67,7 +67,7 @@ class OwnershipManagerShould {
             ownershipService,
             dataStatePropagator,
             programTempOwnerStore,
-            programOwnerStore
+            programOwnerStore,
         )
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryPageUserModeMatcher.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryPageUserModeMatcher.kt
index 5c4beb05ec..1090afdbd9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryPageUserModeMatcher.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryPageUserModeMatcher.kt
@@ -33,7 +33,7 @@ import org.mockito.ArgumentMatcher
 internal class QueryPageUserModeMatcher(
     private val page: Int,
     private val pageSize: Int,
-    private val assignedUserMode: AssignedUserMode
+    private val assignedUserMode: AssignedUserMode,
 ) : ArgumentMatcher<TrackedEntityInstanceQueryOnline> {
 
     override fun matches(query: TrackedEntityInstanceQueryOnline?): Boolean {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryUserModeMatcher.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryUserModeMatcher.kt
index 1a5e160ba3..7ffcb75f4d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryUserModeMatcher.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/QueryUserModeMatcher.kt
@@ -31,7 +31,7 @@ import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.mockito.ArgumentMatcher
 
 internal class QueryUserModeMatcher(
-    private val assignedUserMode: AssignedUserMode
+    private val assignedUserMode: AssignedUserMode,
 ) : ArgumentMatcher<TrackedEntityInstanceQueryOnline> {
 
     override fun matches(query: TrackedEntityInstanceQueryOnline?): Boolean {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt
index 7727bf7ad8..0fa6fca11e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt
@@ -28,9 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.*
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
 import org.hisp.dhis.android.core.common.*
@@ -42,6 +39,9 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
 
 @RunWith(JUnit4::class)
 class TrackedEntityInstanceLocalQueryHelperShould {
@@ -64,7 +64,7 @@ class TrackedEntityInstanceLocalQueryHelperShould {
             .orgUnits(listOf("DiszpKrYNg8"))
             .orgUnitMode(OrganisationUnitMode.DESCENDANTS)
             .query(
-                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("female").build()
+                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("female").build(),
             )
             .build()
 
@@ -85,10 +85,10 @@ class TrackedEntityInstanceLocalQueryHelperShould {
                     .type(DatePeriodType.ABSOLUTE)
                     .startDate(format.parse("2019-04-15"))
                     .endDate(format.parse("2019-05-19"))
-                    .build()
+                    .build(),
             )
             .query(
-                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("female").build()
+                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("female").build(),
             )
             .build()
 
@@ -104,7 +104,7 @@ class TrackedEntityInstanceLocalQueryHelperShould {
             .states(listOf(State.SYNCED, State.TO_POST, State.TO_UPDATE))
             .program(programUid)
             .query(
-                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("female").build()
+                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("female").build(),
             )
             .build()
 
@@ -189,7 +189,7 @@ class TrackedEntityInstanceLocalQueryHelperShould {
                     .type(DatePeriodType.ABSOLUTE)
                     .startDate(Date())
                     .endDate(Date())
-                    .build()
+                    .build(),
             )
             .eventStatus(listOf(EventStatus.ACTIVE)).build()
 
@@ -231,8 +231,8 @@ class TrackedEntityInstanceLocalQueryHelperShould {
                         .key("key")
                         .operator(FilterItemOperator.IN)
                         .value(FilterOperatorsHelper.listToStr(listOf("element1", "element2")))
-                        .build()
-                )
+                        .build(),
+                ),
             )
             .build()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index c94c683bb2..4df0fd4649 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -29,9 +29,6 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import java.text.ParseException
-import java.util.*
-import javax.net.ssl.HttpsURLConnection
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
@@ -61,6 +58,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.invocation.InvocationOnMock
+import java.text.ParseException
+import java.util.*
+import javax.net.ssl.HttpsURLConnection
 
 @RunWith(JUnit4::class)
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -108,7 +108,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             assignedUserMode = AssignedUserMode.ANY,
             paging = false,
             page = 2,
-            pageSize = 33
+            pageSize = 33,
         )
 
         whenServiceQuery { searchGrid }
@@ -123,7 +123,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             eventService,
             mapper,
             coroutineAPICallExecutor,
-            dhisVersionManager
+            dhisVersionManager,
         )
     }
 
@@ -209,7 +209,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     fun should_query_events_if_data_value_filter() = runTest {
         val events = listOf(
             EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid1"), "tei1").build(),
-            EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid2"), "tei2").build()
+            EventInternalAccessor.insertTrackedEntityInstance(Event.builder().uid("uid2"), "tei2").build(),
         )
         whenever(eventPayload.items()).doReturn(events)
 
@@ -219,8 +219,8 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
                     .key("dataElement")
                     .operator(FilterItemOperator.EQ)
                     .value("2")
-                    .build()
-            )
+                    .build(),
+            ),
         )
 
         callFactory.getCall(query)
@@ -241,9 +241,9 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
                     .key("dataElement")
                     .operator(FilterItemOperator.EQ)
                     .value("2")
-                    .build()
+                    .build(),
             ),
-            orgUnits = listOf("orgunit1", "orgunit2")
+            orgUnits = listOf("orgunit1", "orgunit2"),
         )
 
         callFactory.getCall(query)
@@ -253,7 +253,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
 
     private fun verifyService(
         query: TrackedEntityInstanceQueryOnline,
-        expectedStatus: EventStatus? = query.eventStatus
+        expectedStatus: EventStatus? = query.eventStatus,
     ) = runBlocking {
         verify(trackedEntityService).query(
             eq(query.uids?.joinToString(";")),
@@ -279,7 +279,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             eq(query.order),
             eq(query.paging),
             eq(query.page),
-            eq(query.pageSize)
+            eq(query.pageSize),
         )
     }
 
@@ -315,7 +315,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             eq(query.lastUpdatedStartDate.simpleDateFormat()),
             eq(query.lastUpdatedEndDate.simpleDateFormat()),
             eq(query.includeDeleted),
-            eq(null)
+            eq(null),
         )
     }
 
@@ -346,7 +346,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
                     anyOrNull(),
                     anyOrNull(),
                     anyOrNull(),
-                    anyOrNull()
+                    anyOrNull(),
                 )
             }.doAnswer(answer)
         }
@@ -377,7 +377,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
                     anyOrNull(),
                     anyOrNull(),
                     anyOrNull(),
-                    anyOrNull()
+                    anyOrNull(),
                 )
             }.doAnswer(answer)
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 35c94cd174..9b9d380217 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.trackedentity.search
 import androidx.paging.ItemKeyedDataSource
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import java.util.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
@@ -51,6 +50,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.*
 import org.mockito.ArgumentMatchers.anyString
+import java.util.*
 
 @RunWith(JUnit4::class)
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -85,18 +85,18 @@ class TrackedEntityInstanceQueryDataSourceShould {
         offlineObjects = listOf(
             TrackedEntityInstance.builder().uid("offline1").build(),
             TrackedEntityInstance.builder().uid("offline2").build(),
-            TrackedEntityInstance.builder().uid("offline3").build()
+            TrackedEntityInstance.builder().uid("offline3").build(),
         )
         onlineObjects1 = listOf(
             TrackedEntityInstance.builder().uid("online1").build(),
             TrackedEntityInstance.builder().uid("offline2").build(),
             TrackedEntityInstance.builder().uid("online3").build(),
             TrackedEntityInstance.builder().uid("online4").build(),
-            TrackedEntityInstance.builder().uid("online5").build()
+            TrackedEntityInstance.builder().uid("online5").build(),
         )
         onlineObjects2 = listOf(
             TrackedEntityInstance.builder().uid("online5").build(),
-            TrackedEntityInstance.builder().uid("online6").build()
+            TrackedEntityInstance.builder().uid("online6").build(),
         )
         whenever(store.selectRawQuery(any())).doReturn(offlineObjects)
 
@@ -135,11 +135,11 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
-            initialCallback
+            initialCallback,
         )
         verify(onlineCallFactory)
             .getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.ANY)))
@@ -157,11 +157,11 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
-            initialCallback
+            initialCallback,
         )
         verify(store).selectRawQuery(anyString())
         verify(initialCallback).onResult(offlineObjects)
@@ -178,11 +178,11 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
-            initialCallback
+            initialCallback,
         )
         verify(store).selectRawQuery(anyString())
         verifyNoMoreInteractions(store)
@@ -201,7 +201,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
 
         onlineCallFactory.stub {
@@ -214,7 +214,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
 
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, 4, false),
-            initialCallback
+            initialCallback,
         )
         verify(store).selectRawQuery(anyString())
         verifyNoMoreInteractions(store)
@@ -236,11 +236,11 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
         dataSource1.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
-            initialCallback
+            initialCallback,
         )
         verify(onlineCallFactory).getQueryCall(any())
 
@@ -251,11 +251,11 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
         dataSource2.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
-            initialCallback
+            initialCallback,
         )
         verifyNoMoreInteractions(onlineCallFactory)
     }
@@ -270,11 +270,11 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
-            initialCallback
+            initialCallback,
         )
         verify(store).selectRawQuery(anyString())
         verifyNoMoreInteractions(store)
@@ -282,7 +282,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
         verify(onlineCallFactory).getQueryCall(argThat(QueryUserModeMatcher(AssignedUserMode.CURRENT)))
         verifyNoMoreInteractions(onlineCallFactory)
         verify(initialCallback).onResult(
-            captureInstances.capture()
+            captureInstances.capture(),
         )
         assertThat(captureInstances.firstValue.size).isEqualTo(8)
     }
@@ -301,7 +301,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
 
         onlineCallFactory.stub {
@@ -314,7 +314,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
 
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, 5, false),
-            initialCallback
+            initialCallback,
         )
         verify(store).selectRawQuery(anyString())
         verifyNoMoreInteractions(store)
@@ -334,7 +334,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     private fun emptyScopeWithModes(
-        vararg assignedUserModes: AssignedUserMode
+        vararg assignedUserModes: AssignedUserMode,
     ): TrackedEntityInstanceQueryRepositoryScope {
         val eventFilters = assignedUserModes.map {
             TrackedEntityInstanceQueryEventFilter.builder().assignedUserMode(it).build()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcherShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcherShould.kt
index 264abf86ac..b815367080 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcherShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryErrorCatcherShould.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
-import javax.net.ssl.HttpsURLConnection
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import retrofit2.Response
+import javax.net.ssl.HttpsURLConnection
 
 @RunWith(JUnit4::class)
 class TrackedEntityInstanceQueryErrorCatcherShould {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt
index 523a5a6a8e..98f62eab7b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelperShould.kt
@@ -57,7 +57,7 @@ class TrackedEntityInstanceQueryOnlineHelperShould {
     fun parse_query_in_api_format() {
         val scope = queryBuilder
             .query(
-                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("filter").build()
+                RepositoryScopeFilterItem.builder().key("").operator(FilterItemOperator.LIKE).value("filter").build(),
             )
             .build()
         val onlineQueries = onlineHelper.fromScope(scope)
@@ -70,15 +70,15 @@ class TrackedEntityInstanceQueryOnlineHelperShould {
     fun parse_filters_using_in_operator() {
         val list = listOf(
             "nom,app",
-            "nom-app"
+            "nom-app",
         )
 
         val scope = queryBuilder
             .filter(
                 listOf(
                     RepositoryScopeFilterItem.builder()
-                        .key("filterItem1").operator(FilterItemOperator.IN).value(listToStr(list)).build()
-                )
+                        .key("filterItem1").operator(FilterItemOperator.IN).value(listToStr(list)).build(),
+                ),
             ).build()
 
         val onlineQueries = onlineHelper.fromScope(scope)
@@ -93,14 +93,14 @@ class TrackedEntityInstanceQueryOnlineHelperShould {
         val list = listOf(
             "nom,app",
             "nom:app",
-            "nom;app"
+            "nom;app",
         )
 
         val expectedList = listOf(
             "filterItemIN:in:nom/,app;nom/:app;nom/;app",
             "filterItemLIKE1:like:nom/,app",
             "filterItemLIKE2:like:nom/:app",
-            "filterItemLIKE3:like:nom/;app"
+            "filterItemLIKE3:like:nom/;app",
         )
 
         val scope = queryBuilder
@@ -113,8 +113,8 @@ class TrackedEntityInstanceQueryOnlineHelperShould {
                     RepositoryScopeFilterItem.builder()
                         .key("filterItemLIKE2").operator(FilterItemOperator.LIKE).value(list[1]).build(),
                     RepositoryScopeFilterItem.builder()
-                        .key("filterItemLIKE3").operator(FilterItemOperator.LIKE).value(list[2]).build()
-                )
+                        .key("filterItemLIKE3").operator(FilterItemOperator.LIKE).value(list[2]).build(),
+                ),
             ).build()
 
         val formattedQueries = toAPIFilterFormat(scope.filter(), false)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt
index 84fcb0cbe5..e9bc8ba66d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelperShould.kt
@@ -77,9 +77,9 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
                         DateFilterPeriod.builder()
                             .startBuffer(-2)
                             .endBuffer(5)
-                            .build()
+                            .build(),
                     )
-                    .build()
+                    .build(),
             )
             .build()
 
@@ -106,8 +106,8 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
                         .programStage(programStage1).eventStatus(EventStatus.ACTIVE).build(),
                     TrackedEntityInstanceEventFilter.builder()
                         .programStage(programStage2).assignedUserMode(AssignedUserMode.CURRENT)
-                        .eventCreatedPeriod(FilterPeriod.create(-5, 2)).build()
-                )
+                        .eventCreatedPeriod(FilterPeriod.create(-5, 2)).build(),
+                ),
             )
             .entityQueryCriteria(EntityQueryCriteria.builder().build())
             .build()
@@ -137,8 +137,8 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
             .enrollmentStatus(listOf(EnrollmentStatus.ACTIVE))
             .eventFilters(
                 listOf(
-                    TrackedEntityInstanceQueryEventFilter.builder().assignedUserMode(AssignedUserMode.CURRENT).build()
-                )
+                    TrackedEntityInstanceQueryEventFilter.builder().assignedUserMode(AssignedUserMode.CURRENT).build(),
+                ),
             )
             .build()
 
@@ -147,8 +147,8 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
             .program(ObjectWithUid.create(programId))
             .eventFilters(
                 listOf(
-                    TrackedEntityInstanceEventFilter.builder().assignedUserMode(AssignedUserMode.ANY).build()
-                )
+                    TrackedEntityInstanceEventFilter.builder().assignedUserMode(AssignedUserMode.ANY).build(),
+                ),
             )
             .entityQueryCriteria(EntityQueryCriteria.builder().build())
             .build()
@@ -179,10 +179,10 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
                             AttributeValueFilter.builder()
                                 .attribute("attribute2")
                                 .eq("eq_str")
-                                .build()
-                        )
+                                .build(),
+                        ),
                     )
-                    .build()
+                    .build(),
             )
             .build()
 
@@ -193,12 +193,12 @@ class TrackedEntityInstanceQueryRepositoryScopeHelperShould {
         assertThat(
             filters.any {
                 it.operator() == FilterItemOperator.LIKE && it.key() == "attribute1" && it.value() == "like_str"
-            }
+            },
         ).isTrue()
         assertThat(
             filters.any {
                 it.operator() == FilterItemOperator.EQ && it.key() == "attribute2" && it.value() == "eq_str"
-            }
+            },
         ).isTrue()
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportErrorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportErrorShould.kt
index 5f2d4ba995..fc3429f827 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportErrorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportErrorShould.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.Inject
 import org.hisp.dhis.android.core.common.BaseObjectShould
 import org.hisp.dhis.android.core.common.ObjectShould
@@ -38,6 +36,8 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobReport
 import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class JobReportErrorShould : BaseObjectShould("tracker/importer/jobreport-error.json"), ObjectShould {
 
@@ -58,8 +58,8 @@ class JobReportErrorShould : BaseObjectShould("tracker/importer/jobreport-error.
                 "PXi7gfVIk1p",
                 TrackerImporterObjectType.EVENT,
                 "E1033",
-                "Event: `PXi7gfVIk1p`, Enrollment value is NULL."
-            )
+                "Event: `PXi7gfVIk1p`, Enrollment value is NULL.",
+            ),
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportSuccessShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportSuccessShould.kt
index 1eac07da51..77c7a1bc35 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportSuccessShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/JobReportSuccessShould.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.tracker.importer
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.Inject
 import org.hisp.dhis.android.core.common.BaseObjectShould
 import org.hisp.dhis.android.core.common.ObjectShould
@@ -39,6 +37,8 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobReport
 import org.hisp.dhis.android.core.tracker.importer.internal.JobTypeReport
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class JobReportSuccessShould : BaseObjectShould("tracker/importer/jobreport-success.json"), ObjectShould {
 
@@ -58,29 +58,29 @@ class JobReportSuccessShould : BaseObjectShould("tracker/importer/jobreport-succ
             JobTypeReport(
                 "TRACKED_ENTITY",
                 JobImportCount(3, 3, 2, 2, 10),
-                emptyList()
-            )
+                emptyList(),
+            ),
         )
         assertThat(bundleReport.typeReportMap.event).isEqualTo(
             JobTypeReport(
                 "EVENT",
                 JobImportCount(2, 2, 2, 2, 8),
-                listOf(JobObjectReport(emptyList(), 0, TrackerImporterObjectType.EVENT, "UavzrupW3lZ"))
-            )
+                listOf(JobObjectReport(emptyList(), 0, TrackerImporterObjectType.EVENT, "UavzrupW3lZ")),
+            ),
         )
         assertThat(bundleReport.typeReportMap.relationship).isEqualTo(
             JobTypeReport(
                 "RELATIONSHIP",
                 JobImportCount(1, 1, 1, 1, 4),
-                emptyList()
-            )
+                emptyList(),
+            ),
         )
         assertThat(bundleReport.typeReportMap.enrollment).isEqualTo(
             JobTypeReport(
                 "ENROLLMENT",
                 JobImportCount(0, 0, 0, 0, 0),
-                emptyList()
-            )
+                emptyList(),
+            ),
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerConflictHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerConflictHelperShould.kt
index fa33f08725..6b34795edc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerConflictHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerConflictHelperShould.kt
@@ -74,7 +74,7 @@ class TrackerConflictHelperShould {
             "PXi7gfVIk1p",
             TrackerImporterObjectType.EVENT,
             "E1032",
-            "Event: `PXi7gfVIk1p`, do not exist."
+            "Event: `PXi7gfVIk1p`, do not exist.",
         )
         private val wrongCodeErrorReport = errorReport.copy(errorCode = "WrongCode")
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
index a08bfaf63c..9581db80f0 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/tracker/importer/TrackerImporterFileResourcesPostCallShould.kt
@@ -71,15 +71,15 @@ class TrackerImporterFileResourcesPostCallShould {
                     NewTrackerImporterTrackedEntity.builder()
                         .uid("tei_uid")
                         .trackedEntityAttributeValues(listOf(attributeValue))
-                        .build()
+                        .build(),
                 ),
                 enrollments = mutableListOf(
                     NewTrackerImporterEnrollment.builder()
                         .uid("enrollment_uid")
                         .attributes(listOf(attributeValue))
-                        .build()
-                )
-            )
+                        .build(),
+                ),
+            ),
         )
 
         val fValue = FileResourceValue.AttributeValue(attributeValue.trackedEntityAttribute()!!)
@@ -103,7 +103,7 @@ class TrackerImporterFileResourcesPostCallShould {
     fun setUp() {
         fileResourcePostCall = TrackerImporterFileResourcesPostCall(
             fileResourcesPostCall,
-            fileResourceHelper
+            fileResourceHelper,
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/InternalStockUseCaseShould.kt b/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/InternalStockUseCaseShould.kt
index c15bedb62f..73b037698d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/InternalStockUseCaseShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/InternalStockUseCaseShould.kt
@@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.usecase.stock
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.common.truth.Truth
-import java.io.InputStream
 import org.hisp.dhis.android.core.Inject
 import org.junit.Test
+import java.io.InputStream
 
 class InternalStockUseCaseShould {
     private var objectMapper: ObjectMapper = Inject.objectMapper()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
index 298ca6a8fc..c8f0b1cac2 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.user.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
 import org.hisp.dhis.android.core.common.BaseCallShould
@@ -41,6 +40,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import retrofit2.Call
 import retrofit2.Response
+import java.util.concurrent.Callable
 
 @RunWith(JUnit4::class)
 class AuthorityEndpointCallShould : BaseCallShould() {
@@ -60,7 +60,7 @@ class AuthorityEndpointCallShould : BaseCallShould() {
             genericCallData,
             apiCallExecutor,
             handler,
-            retrofit.create(AuthorityService::class.java)
+            retrofit.create(AuthorityService::class.java),
         ).create()
         whenever(retrofitCall.execute()).thenReturn(Response.success(payload))
         whenever(authorityService.authorities).thenReturn(retrofitCall)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 4a0bf9f2f7..5203c5d058 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -125,7 +125,7 @@ class LogInCallUnitShould : BaseCallShould() {
             userService, credentialsSecureStore, userIdStore, userHandler, authenticatedUserStore,
             systemInfoCall, userStore, apiCallErrorCatcher,
             LogInDatabaseManager(multiUserDatabaseManager, generalSettingCall),
-            LogInExceptions(credentialsSecureStore), accountManager, versionManager
+            LogInExceptions(credentialsSecureStore), accountManager, versionManager,
         ).logIn(username, password, serverUrl)
     }
 
@@ -170,8 +170,8 @@ class LogInCallUnitShould : BaseCallShould() {
         whenever(
             userService.authenticate(
                 credentialsCaptor.capture(),
-                filterCaptor.capture()
-            )
+                filterCaptor.capture(),
+            ),
         ).thenReturn(authenticateAPICall)
         logInSingle.blockingGet()
         assertThat(okhttp3.Credentials.basic(USERNAME, PASSWORD)).isEqualTo(credentialsCaptor.firstValue)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 24e088c772..9d3e0ecf74 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.nhaarman.mockitokotlin2.*
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -41,6 +40,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import retrofit2.Call
+import java.util.concurrent.Callable
 
 @RunWith(JUnit4::class)
 class UserCallShould : BaseCallShould() {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36Should.kt b/core/src/test/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36Should.kt
index e1d6cc0753..40b3ade028 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36Should.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/visualization/VisualizationAPI36Should.kt
@@ -28,11 +28,11 @@
 package org.hisp.dhis.android.core.visualization
 
 import com.google.common.truth.Truth.assertThat
-import java.io.IOException
-import java.text.ParseException
 import org.hisp.dhis.android.core.common.BaseObjectShould
 import org.hisp.dhis.android.core.common.ObjectShould
 import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
 
 class VisualizationAPI36Should : BaseObjectShould("visualization/visualization_api_36.json"), ObjectShould {
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
index 3b1d14276c..f1e2e2dbbe 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandlerShould.kt
@@ -53,7 +53,7 @@ class VisualizationHandlerShould {
         visualizationHandler = VisualizationHandler(
             visualizationStore,
             visualizationCollectionCleaner,
-            visualizationDimensionItemHandler
+            visualizationDimensionItemHandler,
         )
 
         whenever(visualization.columns()).doReturn(listOf(visualizationDimension))

From 02d1f8f1ac0fcae156bbdb2737f9d7760242f719 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 25 Aug 2023 09:12:54 +0200
Subject: [PATCH 190/478] [ANDROSDK-1740] disable no unit return check

---
 .editorconfig                                                   | 1 +
 .../object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt | 2 +-
 .../object/internal/ReadWriteWithUidObjectRepositoryImpl.kt     | 2 +-
 .../core/period/internal/RelativePeriodGeneratorImplShould.kt   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 48292c58eb..a89f087cf6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,3 +2,4 @@
 max_line_length = 120
 ktlint_standard_no-wildcard-imports = disabled
 ktlint_standard_package-name = disabled
+ktlint_standard_no-unit-return = disabled
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
index 13a87fc3c9..8863951370 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
@@ -116,7 +116,7 @@ abstract class ReadWriteWithUidDataObjectRepositoryImpl<M, R : ReadOnlyObjectRep
     }
 
     @Throws(D2Error::class)
-    override fun updateObject(m: M) {
+    override fun updateObject(m: M): Unit {
         super.updateObject(m)
         propagateState(m, HandleAction.Update)
         return Unit()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
index 55691005c1..164d8d39ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
@@ -52,7 +52,7 @@ open class ReadWriteWithUidObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<
 
     @Throws(D2Error::class)
     @Suppress("TooGenericExceptionCaught")
-    protected open fun updateObject(m: M) {
+    protected open fun updateObject(m: M): Unit {
         return try {
             store.update(m)
             Unit()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt b/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt
index a7e03f3537..1b3367afa1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/period/internal/RelativePeriodGeneratorImplShould.kt
@@ -45,7 +45,7 @@ class RelativePeriodGeneratorImplShould {
     }
 
     @Test
-    @Suppress("ComplexMethod")
+    @Suppress("ComplexMethod", "LongMethod")
     fun `Should create relative periods for all period types`() {
         RelativePeriod.values().forEach { relativePeriod ->
             val periods = periodGenerator.generateRelativePeriods(relativePeriod)

From 35e654f18c299b66a58448c77718a97aefae6a04 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 25 Aug 2023 10:58:22 +0200
Subject: [PATCH 191/478] [ANDROSDK-1740] refactor file creation

---
 .../core/arch/helpers/FileResourceDirectoryHelper.kt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
index a8e2e29081..b5cf3af07f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/FileResourceDirectoryHelper.kt
@@ -56,7 +56,11 @@ object FileResourceDirectoryHelper {
 
     internal fun getFileResourceDirectory(context: Context, subfolder: String?): File {
         val childPath = subfolder?.let { "$FilesDir/$it" } ?: FilesDir
-        return File(context.filesDir, childPath)
+        val file = File(context.filesDir, childPath)
+        if (!file.exists()) {
+            file.mkdirs()
+        }
+        return file
     }
 
     internal fun deleteRootFileResourceDirectory(context: Context) {
@@ -86,7 +90,11 @@ object FileResourceDirectoryHelper {
 
     private fun getFileCacheResourceDirectory(context: Context, subfolder: String?): File {
         val childPath = subfolder?.let { "$CacheDir/$it" } ?: CacheDir
-        return File(context.cacheDir, childPath)
+        val file = File(context.cacheDir, childPath)
+        if (!file.exists()) {
+            file.mkdirs()
+        }
+        return file
     }
 
     internal fun getSubfolderName(databaseName: String): String {

From 78959b4ea40795bbbdbb3af643cdf574c84858b8 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 25 Aug 2023 13:37:19 +0200
Subject: [PATCH 192/478] [ANDROSDK-1740] rebase with develop

---
 .../api/authentication/internal/OpenIDConnectAuthenticator.kt   | 2 +-
 .../authentication/internal/PasswordAndCookieAuthenticator.kt   | 2 +-
 .../java/org/hisp/dhis/android/core/arch/helpers/UserHelper.kt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
index 11b5502435..0694a033a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
@@ -71,7 +71,7 @@ internal class OpenIDConnectAuthenticator @Inject constructor(
     private fun addTokenHeader(builder: Request.Builder, token: String): Request.Builder {
         return builder.addHeader(
             UserIdAuthenticatorHelper.AUTHORIZATION_KEY,
-            "Bearer $token"
+            "Bearer $token",
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
index bbbb9dbfba..7aa0e492e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
@@ -73,7 +73,7 @@ internal class PasswordAndCookieAuthenticator @Inject constructor(
     private fun addPasswordHeader(builder: Request.Builder, credentials: Credentials): Request.Builder {
         return builder.addHeader(
             UserIdAuthenticatorHelper.AUTHORIZATION_KEY,
-            UserIdAuthenticatorHelper.basic(credentials)
+            UserIdAuthenticatorHelper.basic(credentials),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UserHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UserHelper.kt
index 825c7fc35a..95c1be82fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UserHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/UserHelper.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.arch.helpers
 
+import okio.ByteString
 import java.nio.charset.StandardCharsets
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import okio.ByteString
 
 object UserHelper {
     /**

From 7e302c939629b29cd68ae925ceed76f148aaee43 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 28 Aug 2023 10:20:24 +0200
Subject: [PATCH 193/478] [ANDROSDK-1717] Checks

---
 .../internal/AbstractFilterConnector.kt       | 10 +++---
 .../internal/BaseAbstractFilterConnector.kt   | 10 +++---
 .../internal/BaseStringFilterConnector.kt     |  6 ++--
 .../internal/BaseSubQueryFilterConnector.kt   |  4 +--
 .../filters/internal/BoolFilterConnector.kt   |  2 +-
 .../internal/BooleanFilterConnector.kt        |  6 ++--
 .../internal/DeletedFilterConnector.kt        |  6 ++--
 .../filters/internal/DoubleFilterConnector.kt |  6 ++--
 .../filters/internal/EnumFilterConnector.kt   |  6 ++--
 .../filters/internal/EqFilterConnector.kt     |  2 +-
 .../internal/FilterConnectorFactory.kt        | 34 +++++++++++++------
 .../internal/IntegerFilterConnector.kt        |  6 ++--
 .../filters/internal/LongFilterConnector.kt   |  6 ++--
 .../OrganisationUnitFilterConnector.kt        |  2 +-
 .../filters/internal/PeriodFilterConnector.kt |  4 +--
 .../internal/PeriodsFilterConnector.kt        | 10 +++---
 .../filters/internal/StringFilterConnector.kt |  6 ++--
 .../internal/SubQueryFilterConnector.kt       | 19 ++++++-----
 .../internal/UnwrappedEqInFilterConnector.kt  |  8 +++--
 .../internal/ValueSubQueryFilterConnector.kt  |  2 +-
 .../paging/internal/RepositoryDataSource.kt   | 17 ++++++----
 .../scope/internal/RepositoryScopeHelper.kt   |  2 +-
 22 files changed, 107 insertions(+), 67 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
index 4360cce2c7..554ee7406f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/AbstractFilterConnector.kt
@@ -39,13 +39,13 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 abstract class AbstractFilterConnector<R : BaseRepository, V> internal constructor(
     private val repositoryFactory: BaseRepositoryFactory<R>,
     protected val scope: RepositoryScope,
-    val key: String
+    val key: String,
 ) {
     abstract fun wrapValue(value: V?): String?
     fun updatedUnwrappedScope(operator: FilterItemOperator, valueStr: String?): RepositoryScope {
         return RepositoryScopeHelper.withFilterItem(
             scope,
-            RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build()
+            RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build(),
         )
     }
 
@@ -56,11 +56,11 @@ abstract class AbstractFilterConnector<R : BaseRepository, V> internal construct
     fun updatePassedScope(
         operator: FilterItemOperator,
         valueStr: String?,
-        scope: RepositoryScope
+        scope: RepositoryScope,
     ): RepositoryScope {
         return RepositoryScopeHelper.withFilterItem(
             scope,
-            RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build()
+            RepositoryScopeFilterItem.builder().key(key).operator(operator).value(valueStr).build(),
         )
     }
 
@@ -71,7 +71,7 @@ abstract class AbstractFilterConnector<R : BaseRepository, V> internal construct
     private fun updatedUnwrappedScope(whereClause: String): RepositoryScope {
         return RepositoryScopeHelper.withComplexFilterItem(
             scope,
-            RepositoryScopeComplexFilterItem.builder().whereQuery(whereClause).build()
+            RepositoryScopeComplexFilterItem.builder().whereQuery(whereClause).build(),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
index 1d34d48e83..1589c48463 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseAbstractFilterConnector.kt
@@ -35,9 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : AbstractFilterConnector<R, V>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
@@ -68,7 +70,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
     fun `in`(values: Collection<V>?): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
-            "(" + getCommaSeparatedValues(values) + ")"
+            "(" + getCommaSeparatedValues(values) + ")",
         )
     }
 
@@ -92,7 +94,7 @@ abstract class BaseAbstractFilterConnector<R : BaseRepository, V> internal const
     fun notIn(values: Collection<V>?): R {
         return newWithUnwrappedScope(
             FilterItemOperator.NOT_IN,
-            "(" + getCommaSeparatedValues(values) + ")"
+            "(" + getCommaSeparatedValues(values) + ")",
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
index 73a84abe38..cfd8609e20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseStringFilterConnector.kt
@@ -34,9 +34,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class BaseStringFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, String?>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
 
     override fun wrapValue(value: String?): String? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
index c4d61bcb29..7acb6fae0b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BaseSubQueryFilterConnector.kt
@@ -38,12 +38,12 @@ abstract class BaseSubQueryFilterConnector<R : BaseRepository> internal construc
     scope: RepositoryScope,
     key: String,
     private val linkTable: String,
-    private val linkParent: String
+    private val linkParent: String,
 ) : AbstractFilterConnector<R, String>(repositoryFactory, scope, key) {
     protected fun inTableWhere(clauseBuilder: WhereClauseBuilder): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
-            "(SELECT DISTINCT $linkParent FROM $linkTable WHERE ${clauseBuilder.build()})"
+            "(SELECT DISTINCT $linkParent FROM $linkTable WHERE ${clauseBuilder.build()})",
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt
index 6b847c6141..b0cbd41338 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BoolFilterConnector.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
 class BoolFilterConnector<R : BaseRepository> internal constructor(
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, Boolean>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, Boolean>,
 ) {
     val isTrue: R
         /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
index eaea258108..5872b63d41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/BooleanFilterConnector.kt
@@ -34,9 +34,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class BooleanFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, Boolean?>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     val isTrue: R
         /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
index ef2f3d5c6a..30987e2cf1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DeletedFilterConnector.kt
@@ -34,9 +34,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class DeletedFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, String>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     val isFalse: R
         /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
index e86ae81039..a50fabe7e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/DoubleFilterConnector.kt
@@ -35,9 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 class DoubleFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, Double?>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
index d164239269..17467cb0a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EnumFilterConnector.kt
@@ -34,9 +34,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 class EnumFilterConnector<R : BaseRepository, E : Enum<E>> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, E>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     override fun wrapValue(value: E?): String? {
         return value?.let { "'" + it.name + "'" }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
index 0bfc9127f6..f0962e7d7b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/EqFilterConnector.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.arch.repositories.filters.internal
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 
 class EqFilterConnector<R : BaseRepository, T> internal constructor(
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, T?>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, T?>,
 ) {
     fun eq(value: T?): R {
         return repositoryFactory.updated(value)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
index 68fe6eba2b..4d8c1e2cc0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -37,10 +37,9 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem
 
 @SuppressWarnings("TooManyFunctions")
-
 class FilterConnectorFactory<R : BaseRepository> internal constructor(
     private val scope: RepositoryScope,
-    private val repositoryFactory: BaseRepositoryFactory<R>
+    private val repositoryFactory: BaseRepositoryFactory<R>,
 ) {
     fun string(key: String): StringFilterConnector<R> {
         return StringFilterConnector(repositoryFactory, scope, key)
@@ -97,10 +96,17 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
         linkParent: String,
         linkChild: String,
         dataElementColumn: String,
-        dataElementId: String
+        dataElementId: String,
     ): ValueSubQueryFilterConnector<R> {
         return ValueSubQueryFilterConnector(
-            repositoryFactory, scope, key, linkTable, linkParent, linkChild, dataElementColumn, dataElementId
+            repositoryFactory,
+            scope,
+            key,
+            linkTable,
+            linkParent,
+            linkChild,
+            dataElementColumn,
+            dataElementId,
         )
     }
 
@@ -121,7 +127,7 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
         externalLink: String,
         ownLink: String,
         direction: OrderByDirection,
-        additionalWhereClause: String? = null
+        additionalWhereClause: String? = null,
     ): R {
         val connectedAdditionalWhere = if (additionalWhereClause == null) "" else " AND $additionalWhereClause"
         val column = String.format(
@@ -130,7 +136,7 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
             externalTable,
             externalLink,
             ownLink,
-            connectedAdditionalWhere
+            connectedAdditionalWhere,
         )
         val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, _: String ->
             val ownLinkKey = contentValues.getAsString(ownLink)
@@ -140,7 +146,7 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
                 externalTable,
                 externalLink,
                 ownLinkKey,
-                connectedAdditionalWhere
+                connectedAdditionalWhere,
             )
         }
         val item =
@@ -153,17 +159,25 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
         condition: String?,
         ifTrueColumn: String?,
         ifFalseColumn: String?,
-        direction: OrderByDirection?
+        direction: OrderByDirection?,
     ): R {
         val column = String.format(
-            "(CASE WHEN %s %s THEN %s ELSE %s END)", conditionalColumn, condition, ifTrueColumn, ifFalseColumn
+            "(CASE WHEN %s %s THEN %s ELSE %s END)",
+            conditionalColumn,
+            condition,
+            ifTrueColumn,
+            ifFalseColumn,
         )
         val extractor = RepositoryScopeKeyOrderExtractor { contentValues: ContentValues, _: String ->
             val conditionalValue = contentValues.getAsString(conditionalColumn)
             val ifTrueValue = contentValues.getAsString(ifTrueColumn)
             val ifFalseValue = contentValues.getAsString(ifFalseColumn)
             String.format(
-                "(CASE WHEN '%s' %s THEN '%s' ELSE '%s' END)", conditionalValue, condition, ifTrueValue, ifFalseValue
+                "(CASE WHEN '%s' %s THEN '%s' ELSE '%s' END)",
+                conditionalValue,
+                condition,
+                ifTrueValue,
+                ifFalseValue,
             )
         }
         val item =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
index 96401adb19..ba1bb24bb3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/IntegerFilterConnector.kt
@@ -35,9 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 class IntegerFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, Int>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
index 7afbb65fb5..7a05a6cb93 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/LongFilterConnector.kt
@@ -35,9 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 class LongFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, Long>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt
index 6269254e46..612f6dd5d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/OrganisationUnitFilterConnector.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.OrganisationUnitFilter
 import org.hisp.dhis.android.core.common.RelativeOrganisationUnit
 
 class OrganisationUnitFilterConnector<R : BaseRepository> internal constructor(
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<OrganisationUnitFilter>>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<OrganisationUnitFilter>>,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt
index c2ebb326d9..9cadf0195f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodFilterConnector.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.Date
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DatePeriodType
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.period.DatePeriod
 import org.hisp.dhis.android.core.period.Period
+import java.util.Date
 
 class PeriodFilterConnector<R : BaseRepository> internal constructor(
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, DateFilterPeriod>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, DateFilterPeriod>,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt
index 60d685baf2..167e35c83c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/PeriodsFilterConnector.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.filters.internal
 
-import java.util.Date
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
 import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DatePeriodType
 import org.hisp.dhis.android.core.common.RelativePeriod
 import org.hisp.dhis.android.core.period.DatePeriod
 import org.hisp.dhis.android.core.period.Period
+import java.util.Date
 
 class PeriodsFilterConnector<R : BaseRepository> internal constructor(
-    private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<DateFilterPeriod>>
+    private val repositoryFactory: ScopedRepositoryFilterFactory<R, List<DateFilterPeriod>>,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
@@ -73,7 +73,7 @@ class PeriodsFilterConnector<R : BaseRepository> internal constructor(
             filters.add(
                 DateFilterPeriod.builder()
                     .startDate(period.startDate()).endDate(period.endDate())
-                    .type(DatePeriodType.ABSOLUTE).build()
+                    .type(DatePeriodType.ABSOLUTE).build(),
             )
         }
         return repositoryFactory.updated(filters)
@@ -91,7 +91,7 @@ class PeriodsFilterConnector<R : BaseRepository> internal constructor(
             filters.add(
                 DateFilterPeriod.builder()
                     .startDate(period.startDate()).endDate(period.endDate())
-                    .type(DatePeriodType.ABSOLUTE).build()
+                    .type(DatePeriodType.ABSOLUTE).build(),
             )
         }
         return repositoryFactory.updated(filters)
@@ -108,7 +108,7 @@ class PeriodsFilterConnector<R : BaseRepository> internal constructor(
         val filters: MutableList<DateFilterPeriod> = ArrayList()
         for (relative in relativePeriods) {
             filters.add(
-                DateFilterPeriod.builder().period(relative).type(DatePeriodType.RELATIVE).build()
+                DateFilterPeriod.builder().period(relative).type(DatePeriodType.RELATIVE).build(),
             )
         }
         return repositoryFactory.updated(filters)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
index 9f98f57faa..d63bf3b54f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/StringFilterConnector.kt
@@ -35,9 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 class StringFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, String>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     /**
      * Returns a new repository whose scope is the one of the current repository plus the new filter being applied.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
index 33cc58a437..04f932e486 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/SubQueryFilterConnector.kt
@@ -36,9 +36,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 class SubQueryFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : BaseAbstractFilterConnector<R, String>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     override fun wrapValue(value: String?): String? {
         return value
@@ -48,7 +50,7 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
         linkTable: String,
         linkParent: String,
         linkChild: String,
-        children: List<String>
+        children: List<String>,
     ): R {
         val clauseBuilder = WhereClauseBuilder().appendInKeyStringValues(linkChild, children)
         return inTableWhere(linkTable, linkParent, clauseBuilder)
@@ -57,13 +59,14 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
     fun inTableWhere(
         linkTable: String,
         linkParent: String,
-        clauseBuilder: WhereClauseBuilder
+        clauseBuilder: WhereClauseBuilder,
     ): R {
         return newWithWrappedScope(
             FilterItemOperator.IN,
-            "(SELECT DISTINCT $linkParent FROM $linkTable WHERE ${clauseBuilder.build()})"
+            "(SELECT DISTINCT $linkParent FROM $linkTable WHERE ${clauseBuilder.build()})",
         )
     }
+
     @SuppressWarnings("LongParameterList")
     fun inTwoLinkTable(
         linkTable1: String,
@@ -72,14 +75,14 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
         linkTable2: String,
         linkParent2: String,
         linkChild2: String,
-        children: List<String>
+        children: List<String>,
     ): R {
         val innerClauseBuilder = WhereClauseBuilder().appendInKeyStringValues(linkChild2, children)
         val innerClause = "SELECT DISTINCT $linkParent2 FROM $linkTable2 WHERE ${innerClauseBuilder.build()}"
         val whereClause = "$linkChild1 IN ($innerClause)"
         return newWithWrappedScope(
             FilterItemOperator.IN,
-            "(SELECT DISTINCT $linkParent1 FROM $linkTable1 WHERE $whereClause)"
+            "(SELECT DISTINCT $linkParent1 FROM $linkTable1 WHERE $whereClause)",
         )
     }
 
@@ -87,7 +90,7 @@ class SubQueryFilterConnector<R : BaseRepository> internal constructor(
         linkTable: String,
         linkParent: String,
         linkChild: String,
-        children: List<String>
+        children: List<String>,
     ): R {
         val repositoryScope = children.foldRight(scope) { child: String, scope: RepositoryScope ->
             val clause = WhereClauseBuilder().appendKeyStringValue(linkChild, child).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
index 82482ea65d..28cd42ccec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/UnwrappedEqInFilterConnector.kt
@@ -35,9 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 class UnwrappedEqInFilterConnector<R : BaseRepository> internal constructor(
     repositoryFactory: BaseRepositoryFactory<R>,
     scope: RepositoryScope,
-    key: String
+    key: String,
 ) : AbstractFilterConnector<R, String>(
-    repositoryFactory, scope, key
+    repositoryFactory,
+    scope,
+    key,
 ) {
     override fun wrapValue(value: String?): String? {
         return value
@@ -50,7 +52,7 @@ class UnwrappedEqInFilterConnector<R : BaseRepository> internal constructor(
     fun `in`(values: Collection<String>?): R {
         return newWithUnwrappedScope(
             FilterItemOperator.IN,
-            "(" + getCommaSeparatedValues(values) + ")"
+            "(" + getCommaSeparatedValues(values) + ")",
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
index 9de154b7ba..229711ca8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/ValueSubQueryFilterConnector.kt
@@ -42,7 +42,7 @@ class ValueSubQueryFilterConnector<R : BaseRepository> internal constructor(
     linkParent: String,
     private val linkChild: String,
     private val dataElementColumn: String,
-    private val dataElementId: String
+    private val dataElementId: String,
 ) : BaseSubQueryFilterConnector<R>(repositoryFactory, scope, key, linkTable, linkParent) {
     override fun wrapValue(value: String?): String {
         return "'" + escapeQuotes(value) + "'"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
index a1a3a7dd0b..5c311144f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
@@ -40,16 +40,16 @@ import org.hisp.dhis.android.core.common.CoreObject
 class RepositoryDataSource<M : CoreObject> internal constructor(
     private val store: ReadableStore<M>,
     private val scope: RepositoryScope,
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>
+    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
 ) : ItemKeyedDataSource<M, M>() {
     override fun loadInitial(params: LoadInitialParams<M>, callback: LoadInitialCallback<M>) {
         val whereClause = WhereClauseFromScopeBuilder(WhereClauseBuilder()).getWhereClause(
-            scope
+            scope,
         )
         val withoutChildren = store.selectWhere(
             whereClause,
             OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-            params.requestedLoadSize
+            params.requestedLoadSize,
         )
         callback.onResult(appendChildren(withoutChildren))
     }
@@ -65,16 +65,19 @@ class RepositoryDataSource<M : CoreObject> internal constructor(
     private fun loadPages(params: LoadParams<M>, callback: LoadCallback<M>, reversed: Boolean) {
         val whereClauseBuilder = WhereClauseBuilder()
         OrderByClauseBuilder.addSortingClauses(
-            whereClauseBuilder, scope.orderBy(),
-            params.key.toContentValues(), reversed, scope.pagingKey()
+            whereClauseBuilder,
+            scope.orderBy(),
+            params.key.toContentValues(),
+            reversed,
+            scope.pagingKey(),
         )
         val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(
-            scope
+            scope,
         )
         val withoutChildren = store.selectWhere(
             whereClause,
             OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-            params.requestedLoadSize
+            params.requestedLoadSize,
         )
         callback.onResult(appendChildren(withoutChildren))
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
index 108675be8c..3443268f2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
@@ -50,7 +50,7 @@ internal object RepositoryScopeHelper {
 
     fun withComplexFilterItem(
         scope: RepositoryScope,
-        item: RepositoryScopeComplexFilterItem
+        item: RepositoryScopeComplexFilterItem,
     ): RepositoryScope {
         return scope.toBuilder()
             .complexFilters(scope.complexFilters() + item)

From 93a59806719ddc9b5c3e0d9e0e513ebad6fb186d Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 29 Aug 2023 11:32:10 +0200
Subject: [PATCH 194/478] [ANDROSDK-1694] Remove initial programOwner post call

---
 .../internal/OldTrackerImporterPostCall.kt    |  3 +--
 .../internal/TrackerImporterPostCall.kt       |  3 +--
 .../TrackerImporterProgramOwnerPostCall.kt    | 20 +++++++++----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
index 5f91b08c58..011cbf173e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
@@ -86,12 +86,11 @@ internal class OldTrackerImporterPostCall @Inject internal constructor(
     ): Flow<D2Progress> = flow {
         val partitionedRelationships = payload.relationships.partition { it.deleted()!! }
 
-        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true))
         emitAll(relationshipPostCall.deleteRelationships(partitionedRelationships.first))
         emitAll(postTrackedEntityInstances(payload.trackedEntityInstances))
         emitAll(postEvents(payload.events))
         emitAll(relationshipPostCall.postRelationships(partitionedRelationships.second))
-        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = false))
+        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners))
     }
 
     @Suppress("TooGenericExceptionCaught")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index b02affaa13..3fc7d64f8b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -80,10 +80,9 @@ internal class TrackerImporterPostCall @Inject internal constructor(
     ): Flow<D2Progress> = flow {
         val payload = fileResourcesPostCall.uploadFileResources(payloadWrapper)
 
-        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = true))
         emitAll(doPostCall(payload.deleted, IMPORT_STRATEGY_DELETE))
         emitAll(doPostCall(payload.updated, IMPORT_STRATEGY_CREATE_AND_UPDATE))
-        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners, onlyExistingTeis = false))
+        emitAll(programOwnerPostCall.uploadProgramOwners(payload.programOwners))
     }
 
     private fun doPostCall(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
index 9c1e78656a..4edec20796 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
@@ -50,22 +50,20 @@ internal class TrackerImporterProgramOwnerPostCall @Inject constructor(
 
     fun uploadProgramOwners(
         programOwners: Map<String, List<ProgramOwner>>,
-        onlyExistingTeis: Boolean = false,
     ): Flow<D2Progress> = flow {
         val progressManager = D2ProgressManager(null)
 
-        programOwners.forEach { (tei, programOwners) ->
-            programOwners
-                .filter {
-                    val unsyncedOwner by lazy { selectWhere(it)?.syncState() != State.SYNCED }
-                    val existingTei by lazy {
-                        trackedEntityInstanceStore.selectByUid(tei)?.syncState() != State.TO_POST
-                    }
+        programOwners.forEach { (tei, teiProgramOwners) ->
+            val teiSyncState = trackedEntityInstanceStore.selectByUid(tei)?.aggregatedSyncState()
+            val uploadableTei = teiSyncState != null && teiSyncState != State.ERROR && teiSyncState != State.WARNING
 
-                    unsyncedOwner && (!onlyExistingTeis || existingTei)
-                }.forEach {
-                    programOwnerPostCall.uploadProgramOwner(it)
+            if (uploadableTei) {
+                teiProgramOwners.forEach {
+                    if (selectWhere(it)?.syncState() != State.SYNCED) {
+                        programOwnerPostCall.uploadProgramOwner(it)
+                    }
                 }
+            }
         }
 
         emit(progressManager.increaseProgress(ProgramOwner::class.java, false))

From d67b9de21e48326e9103555edd47da2344207a3d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 30 Aug 2023 13:02:01 +0200
Subject: [PATCH 195/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ory.java => TrackedEntityInstanceQueryCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/{TrackedEntityInstanceQueryCollectionRepository.java => TrackedEntityInstanceQueryCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt

From aa674ef971bf8e2bb34cd92283bd604f7219365c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 30 Aug 2023 13:02:02 +0200
Subject: [PATCH 196/478] [ANDROSDK-1717] Refactor
 TrackedEntityInstanceQueryCollectionRepository to kotlin

---
 ...EntityInstanceQueryCollectionRepository.kt | 731 +++++++++---------
 1 file changed, 356 insertions(+), 375 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 59967ab681..5d3f7d27c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -25,122 +25,90 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.search;
-
-import static org.hisp.dhis.android.core.common.DateFilterPeriodHelper.mergeDateFilterPeriods;
-
-import androidx.lifecycle.LiveData;
-import androidx.paging.DataSource;
-import androidx.paging.LivePagedListBuilder;
-import androidx.paging.PagedList;
-
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache;
-import org.hisp.dhis.android.core.arch.handlers.internal.Transformer;
-import org.hisp.dhis.android.core.arch.helpers.Result;
-import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BoolFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqLikeItemFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem;
-import org.hisp.dhis.android.core.common.AssignedUserMode;
-import org.hisp.dhis.android.core.common.DateFilterPeriod;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
-import org.hisp.dhis.android.core.event.EventStatus;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList;
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository;
-import org.hisp.dhis.android.core.systeminfo.DHISVersion;
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.trackedentity.search
+
+import androidx.lifecycle.LiveData
+import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor.appendInObjectCollection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BoolFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqLikeItemFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
+import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.common.DateFilterPeriod
+import org.hisp.dhis.android.core.common.DateFilterPeriodHelper.Companion.mergeDateFilterPeriods
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import java.util.Date
+import javax.inject.Inject
 
 @Reusable
-@SuppressWarnings({"PMD.GodClass", "PMD.ExcessiveImports", "PMD.ExcessivePublicCount"})
-public final class TrackedEntityInstanceQueryCollectionRepository
-        implements ReadOnlyWithUidCollectionRepository<TrackedEntityInstance> {
-
-    private final TrackedEntityInstanceStore store;
-    private final TrackerParentCallFactory trackerParentCallFactory;
-    private final Map<String, ChildrenAppender<TrackedEntityInstance>> childrenAppenders;
-    private final ScopedFilterConnectorFactory<TrackedEntityInstanceQueryCollectionRepository,
-            TrackedEntityInstanceQueryRepositoryScope> connectorFactory;
-    private final DHISVersionManager versionManager;
-    private final TrackedEntityInstanceFilterCollectionRepository filtersRepository;
-    private final ProgramStageWorkingListCollectionRepository workingListRepository;
-
-    private final TrackedEntityInstanceQueryRepositoryScope scope;
-    private final TrackedEntityInstanceQueryRepositoryScopeHelper scopeHelper;
-
-    private final D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult> onlineCache;
-    private final TrackedEntityInstanceQueryOnlineHelper onlineHelper;
-    private final TrackedEntityInstanceLocalQueryHelper localQueryHelper;
-
-    @Inject
-    TrackedEntityInstanceQueryCollectionRepository(
-            final TrackedEntityInstanceStore store,
-            final TrackerParentCallFactory trackerParentCallFactory,
-            final Map<String, ChildrenAppender<TrackedEntityInstance>> childrenAppenders,
-            final TrackedEntityInstanceQueryRepositoryScope scope,
-            final TrackedEntityInstanceQueryRepositoryScopeHelper scopeHelper,
-            final DHISVersionManager versionManager,
-            final TrackedEntityInstanceFilterCollectionRepository filtersRepository,
-            final ProgramStageWorkingListCollectionRepository workingListRepository,
-            final D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult> onlineCache,
-            final TrackedEntityInstanceQueryOnlineHelper onlineHelper,
-            final TrackedEntityInstanceLocalQueryHelper localQueryHelper) {
-        this.store = store;
-        this.trackerParentCallFactory = trackerParentCallFactory;
-        this.childrenAppenders = childrenAppenders;
-        this.scope = scope;
-        this.scopeHelper = scopeHelper;
-        this.versionManager = versionManager;
-        this.filtersRepository = filtersRepository;
-        this.workingListRepository = workingListRepository;
-        this.onlineCache = onlineCache;
-        this.onlineHelper = onlineHelper;
-        this.localQueryHelper = localQueryHelper;
-        this.connectorFactory = new ScopedFilterConnectorFactory<>(s ->
-                new TrackedEntityInstanceQueryCollectionRepository(store, trackerParentCallFactory, childrenAppenders,
-                        s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
-                        onlineHelper, localQueryHelper));
-    }
+class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
+    private val store: TrackedEntityInstanceStore,
+    private val trackerParentCallFactory: TrackerParentCallFactory,
+    private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    val scope: TrackedEntityInstanceQueryRepositoryScope,
+    private val scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
+    private val versionManager: DHISVersionManager,
+    private val filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
+    private val workingListRepository: ProgramStageWorkingListCollectionRepository,
+    private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
+    private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+) : ReadOnlyWithUidCollectionRepository<TrackedEntityInstance> {
+    private val connectorFactory:
+        ScopedFilterConnectorFactory<
+            TrackedEntityInstanceQueryCollectionRepository,
+            TrackedEntityInstanceQueryRepositoryScope,
+            > =
+        ScopedFilterConnectorFactory { s: TrackedEntityInstanceQueryRepositoryScope ->
+            TrackedEntityInstanceQueryCollectionRepository(
+                store, trackerParentCallFactory, childrenAppenders,
+                s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
+                onlineHelper, localQueryHelper,
+            )
+        }
 
     /**
      * Only TrackedEntityInstances coming from the server are shown in the list.
-     * <br><b>Important:</b> Internet connection is required to use this mode.
+     * <br></br>**Important:** Internet connection is required to use this mode.
      *
      * @return
      */
-    public TrackedEntityInstanceQueryCollectionRepository onlineOnly() {
-        return connectorFactory.eqConnector(v -> scope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()).eq(null);
+    fun onlineOnly(): TrackedEntityInstanceQueryCollectionRepository {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
+        }.eq(null)
     }
 
     /**
@@ -148,71 +116,83 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return
      */
-    public TrackedEntityInstanceQueryCollectionRepository offlineOnly() {
-        return connectorFactory.eqConnector(v -> scope.toBuilder().mode(RepositoryMode.OFFLINE_ONLY).build()).eq(null);
+    fun offlineOnly(): TrackedEntityInstanceQueryCollectionRepository {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.OFFLINE_ONLY).build()
+        }.eq(null)
     }
 
     /**
      * TrackedEntityInstances coming from the server are shown in first place. Once there are no more results online,
      * it continues with TrackedEntityInstances in local database.
-     * <br><b>Important:</b> Internet connection is required to use this mode.
+     * <br></br>**Important:** Internet connection is required to use this mode.
      *
      * @return
      */
-    public TrackedEntityInstanceQueryCollectionRepository onlineFirst() {
-        return connectorFactory.eqConnector(v -> scope.toBuilder().mode(RepositoryMode.ONLINE_FIRST).build()).eq(null);
+    fun onlineFirst(): TrackedEntityInstanceQueryCollectionRepository {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.ONLINE_FIRST).build()
+        }.eq(null)
     }
 
     /**
      * TrackedEntityInstances coming from local database are shown in first place. Once there are no more results, it
      * continues with TrackedEntityInstances coming from the server. This method may speed up the initial load.
-     * <br><b>Important:</b> Internet connection is required to use this mode.
+     * <br></br>**Important:** Internet connection is required to use this mode.
      *
      * @return
      */
-    public TrackedEntityInstanceQueryCollectionRepository offlineFirst() {
-        return connectorFactory.eqConnector(v -> scope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()).eq(null);
+    fun offlineFirst(): TrackedEntityInstanceQueryCollectionRepository {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
+        }.eq(null)
     }
 
     /**
      * Add an "attribute" filter to the query. If this method is called several times, conditions are appended with
      * AND connector.
-     * <p>
+     *
+     *
      * For example,
-     * <pre><br>.byAttribute("uid1").eq("value1")<br>.byAttribute("uid2").eq("value2")<br></pre>
-     * means that the instance must have attribute "uid1" with value "value1" <b>AND</b> attribute "uid2" with
+     * <pre><br></br>.byAttribute("uid1").eq("value1")<br></br>.byAttribute("uid2").eq("value2")<br></br></pre>
+     * means that the instance must have attribute "uid1" with value "value1" **AND** attribute "uid2" with
      * value "value2".
      *
      * @param attributeId Attribute uid to use in the filter
      * @return Repository connector
      */
-    public EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byAttribute(String attributeId) {
-        return byFilter(attributeId);
+    fun byAttribute(attributeId: String): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return byFilter(attributeId)
     }
 
     /**
      * Add a "filter" to the query. If this method is called several times, conditions are appended with
      * AND connector.
-     * <p>
+     *
+     *
      * For example,
-     * <pre><br>.byFilter("uid1").eq("value1")<br>.byFilter("uid2").eq("value2")<br></pre>
-     * means that the instance must have attribute "uid1" with value "value1" <b>AND</b> attribute "uid2" with
+     * <pre><br></br>.byFilter("uid1").eq("value1")<br></br>.byFilter("uid2").eq("value2")<br></br></pre>
+     * means that the instance must have attribute "uid1" with value "value1" **AND** attribute "uid2" with
      * value "value2".
      *
      * @param attributeId Attribute uid to use in the filter
      * @return Repository connector
      */
-    public EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byFilter(String attributeId) {
-        return connectorFactory.eqLikeItemC(attributeId, filterItem -> scopeHelper.addFilter(scope, filterItem));
+    fun byFilter(attributeId: String): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.eqLikeItemC(attributeId) { filterItem: RepositoryScopeFilterItem ->
+            scopeHelper.addFilter(scope, filterItem)
+        }
     }
 
     /**
-     * Search tracked entity instances with <b>any</b> attribute matching the query.
+     * Search tracked entity instances with **any** attribute matching the query.
      *
      * @return Repository connector
      */
-    public EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byQuery() {
-        return connectorFactory.eqLikeItemC("", filterItem -> scope.toBuilder().query(filterItem).build());
+    fun byQuery(): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.eqLikeItemC("") { filterItem: RepositoryScopeFilterItem ->
+            scope.toBuilder().query(filterItem).build()
+        }
     }
 
     /**
@@ -222,12 +202,10 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      * @param dataElement DataElement uid to use in the filter
      * @return Repository connector
      */
-    public EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byDataValue(String dataElement) {
-        return connectorFactory.eqLikeItemC(dataElement, filterItem -> {
-            List<RepositoryScopeFilterItem> dataValues = new ArrayList<>(scope.dataValue());
-            dataValues.add(filterItem);
-            return scope.toBuilder().dataValue(dataValues).build();
-        });
+    fun byDataValue(dataElement: String): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.eqLikeItemC(dataElement) { filterItem: RepositoryScopeFilterItem ->
+            scope.toBuilder().dataValue(scope.dataValue() + filterItem).build()
+        }
     }
 
     /**
@@ -235,8 +213,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> byProgram() {
-        return connectorFactory.eqConnector(programUid -> scope.toBuilder().program(programUid).build());
+    fun byProgram(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { programUid: String? -> scope.toBuilder().program(programUid).build() }
     }
 
     /**
@@ -244,8 +222,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> byProgramStage() {
-        return connectorFactory.eqConnector(uid -> scope.toBuilder().programStage(uid).build());
+    fun byProgramStage(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { uid: String? -> scope.toBuilder().programStage(uid).build() }
     }
 
     /**
@@ -253,112 +231,117 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> byOrgUnits() {
-        return connectorFactory.listConnector(orgunitUids -> scope.toBuilder().orgUnits(orgunitUids).build());
+    fun byOrgUnits(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.listConnector { scope.toBuilder().orgUnits(it).build() }
     }
 
     /**
-     * Define the organisation unit mode. See {@link OrganisationUnitMode} for more details on the modes.
+     * Define the organisation unit mode. See [OrganisationUnitMode] for more details on the modes.
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrganisationUnitMode> byOrgUnitMode() {
-        return connectorFactory.eqConnector(mode -> scope.toBuilder().orgUnitMode(mode).build());
+    fun byOrgUnitMode(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrganisationUnitMode> {
+        return connectorFactory.eqConnector { scope.toBuilder().orgUnitMode(it).build() }
     }
 
-    /**
-     * @deprecated use {@link #byProgramDate()} instead.
-     */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> byProgramStartDate() {
-        return connectorFactory.eqConnector(date -> byProgramDate().afterOrEqual(date).getScope());
+    @Deprecated("use {@link #byProgramDate()} instead.")
+    fun byProgramStartDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> {
+        return connectorFactory.eqConnector { byProgramDate().afterOrEqual(it!!).scope }
     }
 
-    /**
-     * @deprecated use {@link #byProgramDate()} instead.
-     */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> byProgramEndDate() {
-        return connectorFactory.eqConnector(date -> byProgramDate().beforeOrEqual(date).getScope());
+    @Deprecated("use {@link #byProgramDate()} instead.")
+    fun byProgramEndDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> {
+        return connectorFactory.eqConnector { byProgramDate().beforeOrEqual(it!!).scope }
     }
 
     /**
-     * Define an enrollment date filter. It only applies if a program has been specified in {@link #byProgram()}.
+     * Define an enrollment date filter. It only applies if a program has been specified in [.byProgram].
      *
      * @return Repository connector
      */
-    public PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byProgramDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod mergedFilter = mergeDateFilterPeriods(scope.programDate(), filter);
-            return scope.toBuilder().programDate(mergedFilter).build();
-        });
+    fun byProgramDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = mergeDateFilterPeriods(
+                scope.programDate(),
+                filter,
+            )
+            scope.toBuilder().programDate(mergedFilter).build()
+        }
     }
 
     /**
-     * Define an incident date filter. It only applies if a program has been specified in {@link #byProgram()}.
+     * Define an incident date filter. It only applies if a program has been specified in [.byProgram].
      *
      * @return Repository connector
      */
-    public PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byIncidentDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod mergedFilter = mergeDateFilterPeriods(scope.incidentDate(), filter);
-            return scope.toBuilder().incidentDate(mergedFilter).build();
-        });
+    fun byIncidentDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = mergeDateFilterPeriods(
+                scope.incidentDate(),
+                filter,
+            )
+            scope.toBuilder().incidentDate(mergedFilter).build()
+        }
     }
 
-    /**
-     * @deprecated use {@link #byEnrollmentStatus()} instead.
-     */
-    @Deprecated
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> byProgramStatus() {
-        return connectorFactory.eqConnector(status ->
-                scope.toBuilder().enrollmentStatus(Collections.singletonList(status)).build());
+    @Deprecated("use {@link #byEnrollmentStatus()} instead.")
+    fun byProgramStatus(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> {
+        return connectorFactory.eqConnector { status: EnrollmentStatus? ->
+            scope.toBuilder().enrollmentStatus(listOf(status)).build()
+        }
     }
 
     /**
-     * Filter by enrollment status. It only applies if a program has been specified in {@link #byProgram()}.
-     * <br><b>IMPORTANT:</b> this filter accepts a list of status, but only the first one will be used for the online
+     * Filter by enrollment status. It only applies if a program has been specified in [.byProgram].
+     * <br></br>**IMPORTANT:** this filter accepts a list of status, but only the first one will be used for the online
      * query because the web API does not support querying by multiple status.
      *
      * @return Repository connector
      */
-    public ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> byEnrollmentStatus() {
-        return connectorFactory.listConnector(statusList -> scope.toBuilder().enrollmentStatus(statusList).build());
+    fun byEnrollmentStatus(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> {
+        return connectorFactory.listConnector {
+            scope.toBuilder().enrollmentStatus(it).build()
+        }
     }
 
-    /**
-     * @deprecated use {@link #byEventDate()} instead.
-     */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> byEventStartDate() {
-        return connectorFactory.eqConnector(date -> byEventDate().afterOrEqual(date).getScope());
+    @Deprecated("use {@link #byEventDate()} instead.")
+    fun byEventStartDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> {
+        return connectorFactory.eqConnector {
+            byEventDate().afterOrEqual(it!!).scope
+        }
     }
 
-    /**
-     * @deprecated use {@link #byEventDate()} instead.
-     */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> byEventEndDate() {
-        return connectorFactory.eqConnector(date -> byEventDate().beforeOrEqual(date).getScope());
+    @Deprecated("use {@link #byEventDate()} instead.")
+    fun byEventEndDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> {
+        return connectorFactory.eqConnector {
+            byEventDate().beforeOrEqual(it!!).scope
+        }
     }
 
     /**
-     * Define an event date filter. It only applies if a program has been specified in {@link #byProgram()}.
+     * Define an event date filter. It only applies if a program has been specified in [.byProgram].
      *
      * @return Repository connector
      */
-    public PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byEventDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod mergedFilter = mergeDateFilterPeriods(scope.eventDate(), filter);
-            return scope.toBuilder().eventDate(mergedFilter).build();
-        });
+    fun byEventDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = mergeDateFilterPeriods(
+                scope.eventDate(),
+                filter,
+            )
+            scope.toBuilder().eventDate(mergedFilter).build()
+        }
     }
 
     /**
-     * Filter by event status. It only applies if a program has been specified in {@link #byProgram()}.
-     * <br><b>IMPORTANT:</b> this filter requires that eventStartDate {@link #byEventStartDate()} and eventEndDate
-     * {@link #byEventEndDate()} are defined.
+     * Filter by event status. It only applies if a program has been specified in [.byProgram].
+     * <br></br>**IMPORTANT:** this filter requires that eventStartDate [.byEventStartDate] and eventEndDate
+     * [.byEventEndDate] are defined.
      *
      * @return Repository connector
      */
-    public ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EventStatus> byEventStatus() {
-        return connectorFactory.listConnector(statusList -> scope.toBuilder().eventStatus(statusList).build());
+    fun byEventStatus(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EventStatus> {
+        return connectorFactory.listConnector { scope.toBuilder().eventStatus(it).build() }
     }
 
     /**
@@ -366,53 +349,53 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> byTrackedEntityType() {
-        return connectorFactory.eqConnector(type -> scope.toBuilder().trackedEntityType(type).build());
+    fun byTrackedEntityType(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { scope.toBuilder().trackedEntityType(it).build() }
     }
 
     /**
      * Whether to include or not deleted tracked entity instances.
-     * <br><b>IMPORTANT:</b> currently this filter only applies to <b>offline</b> instances.
+     * <br></br>**IMPORTANT:** currently this filter only applies to **offline** instances.
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Boolean> byIncludeDeleted() {
-        return connectorFactory.eqConnector(bool -> scope.toBuilder().includeDeleted(bool).build());
+    fun byIncludeDeleted(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Boolean> {
+        return connectorFactory.eqConnector { scope.toBuilder().includeDeleted(it).build() }
     }
 
     /**
      * Filter by sync status.
-     * <br><b>IMPORTANT:</b> using this filter forces <b>offlineOnly</b> mode.
+     * <br></br>**IMPORTANT:** using this filter forces **offlineOnly** mode.
      *
      * @return Repository connector
      */
-    public ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, State> byStates() {
-        return connectorFactory.listConnector(states -> scope.toBuilder().states(states).build());
+    fun byStates(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, State> {
+        return connectorFactory.listConnector { scope.toBuilder().states(it).build() }
     }
 
     /**
-     * Filter by follow up status. It only applies if a program has been specified in {@link #byProgram()}.
+     * Filter by follow up status. It only applies if a program has been specified in [.byProgram].
      *
      * @return Repository connector
      */
-    public BoolFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byFollowUp() {
-        return connectorFactory.booleanConnector(followUp -> scope.toBuilder().followUp(followUp).build());
+    fun byFollowUp(): BoolFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.booleanConnector { scope.toBuilder().followUp(it).build() }
     }
 
     /**
      * Filter by assigned user mode.
-     * <br><b>IMPORTANT:</b> this filter has effect if DHIS2 version is 2.32 or later. Otherwise, it is ignored.
+     * <br></br>**IMPORTANT:** this filter has effect if DHIS2 version is 2.32 or later. Otherwise, it is ignored.
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, AssignedUserMode> byAssignedUserMode() {
-        return connectorFactory.eqConnector(mode -> {
+    fun byAssignedUserMode(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, AssignedUserMode> {
+        return connectorFactory.eqConnector { mode: AssignedUserMode? ->
             if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
-                return scope.toBuilder().assignedUserMode(mode).build();
+                return@eqConnector scope.toBuilder().assignedUserMode(mode).build()
             } else {
-                return scope;
+                return@eqConnector scope
             }
-        });
+        }
     }
 
     /**
@@ -420,11 +403,14 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> byLastUpdatedDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod mergedFilter = mergeDateFilterPeriods(scope.lastUpdatedDate(), filter);
-            return scope.toBuilder().lastUpdatedDate(mergedFilter).build();
-        });
+    fun byLastUpdatedDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = mergeDateFilterPeriods(
+                scope.lastUpdatedDate(),
+                filter,
+            )
+            scope.toBuilder().lastUpdatedDate(mergedFilter).build()
+        }
     }
 
     /**
@@ -432,46 +418,46 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Boolean> allowOnlineCache() {
-        return connectorFactory.eqConnector(bool -> scope.toBuilder().allowOnlineCache(bool).build());
+    fun allowOnlineCache(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Boolean> {
+        return connectorFactory.eqConnector { scope.toBuilder().allowOnlineCache(it).build() }
     }
 
-    public ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> excludeUids() {
-        return connectorFactory.listConnector(list -> scope.toBuilder().excludedUids(new HashSet<>(list)).build());
+    fun excludeUids(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.listConnector { list: List<String> ->
+            scope.toBuilder().excludedUids(HashSet(list)).build()
+        }
     }
 
     /**
-     * Apply the filters defined in a {@link TrackedEntityInstanceFilter}. It will overwrite previous filters in case
+     * Apply the filters defined in a [TrackedEntityInstanceFilter]. It will overwrite previous filters in case
      * they overlap. In the same way, they could be overwritten by subsequent filters.
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> byTrackedEntityInstanceFilter() {
-        return connectorFactory.eqConnector(id -> {
-            TrackedEntityInstanceFilter filter =
-                    filtersRepository
-                            .withTrackedEntityInstanceEventFilters()
-                            .withAttributeValueFilters()
-                            .uid(id).blockingGet();
-            return scopeHelper.addTrackedEntityInstanceFilter(scope, filter);
-        });
+    fun byTrackedEntityInstanceFilter(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { id: String? ->
+            val filter = filtersRepository
+                .withTrackedEntityInstanceEventFilters()
+                .withAttributeValueFilters()
+                .uid(id).blockingGet()
+            scopeHelper.addTrackedEntityInstanceFilter(scope, filter!!)
+        }
     }
 
     /**
-     * Apply the filters defined in a {@link ProgramStageWorkingList}. It will overwrite previous filters in case
+     * Apply the filters defined in a [ProgramStageWorkingList]. It will overwrite previous filters in case
      * they overlap. In the same way, they could be overwritten by subsequent filters.
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> byProgramStageWorkingList() {
-        return connectorFactory.eqConnector(id -> {
-            ProgramStageWorkingList workingList =
-                    workingListRepository
-                            .withDataFilters()
-                            .withAttributeValueFilters()
-                            .uid(id).blockingGet();
-            return scopeHelper.addProgramStageWorkingList(scope, workingList);
-        });
+    fun byProgramStageWorkingList(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { id: String? ->
+            val workingList = workingListRepository
+                .withDataFilters()
+                .withAttributeValueFilters()
+                .uid(id).blockingGet()
+            scopeHelper.addProgramStageWorkingList(scope, workingList!!)
+        }
     }
 
     /**
@@ -480,9 +466,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByCreated() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.CREATED);
+    fun orderByCreated(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.CREATED)
     }
 
     /**
@@ -491,9 +476,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByLastUpdated() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.LAST_UPDATED);
+    fun orderByLastUpdated(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.LAST_UPDATED)
     }
 
     /**
@@ -501,9 +485,10 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByAttribute(String attr) {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.attribute(attr));
+    fun orderByAttribute(
+        attr: String,
+    ): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.attribute(attr))
     }
 
     /**
@@ -511,9 +496,11 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByOrganisationUnitName() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ORGUNIT_NAME);
+    fun orderByOrganisationUnitName(): EqFilterConnector<
+        TrackedEntityInstanceQueryCollectionRepository,
+        OrderByDirection,
+        > {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ORGUNIT_NAME)
     }
 
     /**
@@ -521,9 +508,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByEnrollmentDate() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_DATE);
+    fun orderByEnrollmentDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_DATE)
     }
 
     /**
@@ -531,9 +517,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByIncidentDate() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.INCIDENT_DATE);
+    fun orderByIncidentDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.INCIDENT_DATE)
     }
 
     /**
@@ -542,9 +527,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByEventDate() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.EVENT_DATE);
+    fun orderByEventDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.EVENT_DATE)
     }
 
     /**
@@ -552,9 +536,8 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByCompletedDate() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.COMPLETION_DATE);
+    fun orderByCompletedDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.COMPLETION_DATE)
     }
 
     /**
@@ -562,150 +545,148 @@ public final class TrackedEntityInstanceQueryCollectionRepository
      *
      * @return Repository connector
      */
-    public EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByEnrollmentStatus() {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS);
-    }
-
-
-    @Override
-    public LiveData<PagedList<TrackedEntityInstance>> getPaged(int pageSize) {
-        DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance> factory =
-                new DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance>() {
-                    @Override
-                    public DataSource<TrackedEntityInstance, TrackedEntityInstance> create() {
-                        return getDataSource();
-                    }
-                };
-
-        return new LivePagedListBuilder<>(factory, pageSize).build();
-    }
-
-    public DataSource<TrackedEntityInstance, TrackedEntityInstance> getDataSource() {
-        return new TrackedEntityInstanceQueryDataSource(store, trackerParentCallFactory, scope,
-                childrenAppenders, onlineCache, onlineHelper, localQueryHelper);
-    }
-
-    public DataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>> getResultDataSource() {
-        return new TrackedEntityInstanceQueryDataSourceResult(store, trackerParentCallFactory, scope,
-                childrenAppenders, onlineCache, onlineHelper, localQueryHelper);
+    fun orderByEnrollmentStatus(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS)
     }
 
-    public TrackedEntityInstanceQueryRepositoryScope getScope() {
-        return scope;
-    }
-
-    @Override
-    public List<TrackedEntityInstance> blockingGet() {
-        if (scope.mode().equals(RepositoryMode.OFFLINE_ONLY) || scope.mode().equals(RepositoryMode.OFFLINE_FIRST)) {
-            String sqlQuery = localQueryHelper.getSqlQuery(scope, scope.excludedUids(), -1);
-            List<TrackedEntityInstance> instances = store.selectRawQuery(sqlQuery);
-            return ChildrenAppenderExecutor.appendInObjectCollection(instances, childrenAppenders,
-                    new ChildrenSelection(Collections.singleton(
-                            TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES)));
+    override fun getPaged(pageSize: Int): LiveData<PagedList<TrackedEntityInstance>> {
+        val factory: DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance> =
+            object : DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance>() {
+                override fun create(): DataSource<TrackedEntityInstance, TrackedEntityInstance> {
+                    return dataSource
+                }
+            }
+        return LivePagedListBuilder(factory, pageSize).build()
+    }
+
+    val dataSource: DataSource<TrackedEntityInstance, TrackedEntityInstance>
+        get() = TrackedEntityInstanceQueryDataSource(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper,
+        )
+
+    val resultDataSource: DataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
+        get() = TrackedEntityInstanceQueryDataSourceResult(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper,
+        )
+
+    override fun blockingGet(): List<TrackedEntityInstance> {
+        return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
+            val sqlQuery = localQueryHelper.getSqlQuery(scope, scope.excludedUids(), -1)
+            val instances = store.selectRawQuery(sqlQuery)
+            appendInObjectCollection(
+                instances,
+                childrenAppenders,
+                ChildrenSelection(
+                    setOf(
+                        TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES,
+                    ),
+                ),
+            )
         } else {
             try {
-                return onlineHelper.queryOnlineBlocking(trackerParentCallFactory, scope);
-            } catch (D2Error e) {
-                throw new RuntimeException(e);
-            } catch (Exception e) {
-                return Collections.emptyList();
+                onlineHelper.queryOnlineBlocking(trackerParentCallFactory, scope)
+            } catch (e: D2Error) {
+                throw RuntimeException(e)
+            } catch (e: Exception) {
+                emptyList()
             }
         }
     }
 
-    @Override
-    public Single<List<TrackedEntityInstance>> get() {
-        return Single.fromCallable(this::blockingGet);
+    override fun get(): Single<List<TrackedEntityInstance>> {
+        return Single.fromCallable { blockingGet() }
     }
 
-    @Override
-    public Single<Integer> count() {
-        return Single.fromCallable(this::blockingCount);
+    override fun count(): Single<Int> {
+        return Single.fromCallable { blockingCount() }
     }
 
-    @Override
-    public int blockingCount() {
-        return blockingGet().size();
+    override fun blockingCount(): Int {
+        return blockingGet().size
     }
 
-    @Override
-    public Single<Boolean> isEmpty() {
-        return Single.fromCallable(this::blockingIsEmpty);
+    override fun isEmpty(): Single<Boolean> {
+        return Single.fromCallable { blockingIsEmpty() }
     }
 
-    @Override
-    public boolean blockingIsEmpty() {
-        return blockingCount() == 0;
+    override fun blockingIsEmpty(): Boolean {
+        return blockingCount() == 0
     }
 
-    @Override
-    public ReadOnlyObjectRepository<TrackedEntityInstance> one() {
-        return objectRepository(list -> list.isEmpty() ? null : list.get(0));
+    override fun one(): ReadOnlyObjectRepository<TrackedEntityInstance> {
+        return objectRepository(
+            object : Transformer<List<TrackedEntityInstance>, TrackedEntityInstance?> {
+                override fun transform(o: List<TrackedEntityInstance>): TrackedEntityInstance? {
+                    return o.firstOrNull()
+                }
+            },
+        )
     }
 
-    private EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderConnector(
-            TrackedEntityInstanceQueryScopeOrderColumn col) {
-        return connectorFactory.eqConnector(direction -> {
-            List<TrackedEntityInstanceQueryScopeOrderByItem> order = new ArrayList<>(scope.order());
-            order.add(TrackedEntityInstanceQueryScopeOrderByItem.builder().column(col).direction(direction).build());
-            return scope.toBuilder().order(order).build();
-        });
+    private fun orderConnector(
+        col: TrackedEntityInstanceQueryScopeOrderColumn,
+    ): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
+        return connectorFactory.eqConnector { direction: OrderByDirection? ->
+            val order = TrackedEntityInstanceQueryScopeOrderByItem.builder().column(col).direction(direction).build()
+            scope.toBuilder().order(scope.order() + order).build()
+        }
     }
 
-    @Override
-    public ReadOnlyObjectRepository<TrackedEntityInstance> uid(String uid) {
-        return objectRepository(list -> {
-            for (TrackedEntityInstance instance : list) {
-                if (uid.equals(instance.uid())) {
-                    return instance;
+    override fun uid(uid: String?): ReadOnlyObjectRepository<TrackedEntityInstance> {
+        return objectRepository(
+            object : Transformer<List<TrackedEntityInstance>, TrackedEntityInstance?> {
+                override fun transform(o: List<TrackedEntityInstance>): TrackedEntityInstance? {
+                    return o.find { uid == it.uid() }
                 }
-            }
-            return null;
-        });
+            },
+        )
     }
 
-    @Override
-    public Single<List<String>> getUids() {
-        return Single.fromCallable(this::blockingGetUids);
+    override fun getUids(): Single<List<String>> {
+        return Single.fromCallable { blockingGetUids() }
     }
 
-    @Override
-    public List<String> blockingGetUids() {
-        if (scope.mode().equals(RepositoryMode.OFFLINE_ONLY) || scope.mode().equals(RepositoryMode.OFFLINE_FIRST)) {
-            String sqlQuery = localQueryHelper.getUidsWhereClause(scope, scope.excludedUids(), -1);
-            return store.selectUidsWhere(sqlQuery);
+    override fun blockingGetUids(): List<String> {
+        return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
+            val sqlQuery = localQueryHelper.getUidsWhereClause(scope, scope.excludedUids(), -1)
+            store.selectUidsWhere(sqlQuery)
         } else {
-            List<TrackedEntityInstance> instances = blockingGet();
-            return new ArrayList<>(UidsHelper.getUids(instances));
+            ArrayList<String>(getUids(blockingGet()))
         }
     }
 
-    private ReadOnlyObjectRepository<TrackedEntityInstance> objectRepository(
-            Transformer<List<TrackedEntityInstance>, TrackedEntityInstance> transformer) {
-        return new ReadOnlyObjectRepository<TrackedEntityInstance>() {
-
-            @Override
-            public Single<TrackedEntityInstance> get() {
-                return Single.fromCallable(this::blockingGet);
+    private fun objectRepository(
+        transformer: Transformer<List<TrackedEntityInstance>, TrackedEntityInstance?>,
+    ): ReadOnlyObjectRepository<TrackedEntityInstance> {
+        return object : ReadOnlyObjectRepository<TrackedEntityInstance> {
+            override fun get(): Single<TrackedEntityInstance?> {
+                return Single.fromCallable { this.blockingGet() }
             }
 
-            @Override
-            public TrackedEntityInstance blockingGet() {
-                List<TrackedEntityInstance> list = TrackedEntityInstanceQueryCollectionRepository.this.blockingGet();
-                return transformer.transform(list);
+            override fun blockingGet(): TrackedEntityInstance? {
+                val list = this@TrackedEntityInstanceQueryCollectionRepository.blockingGet()
+                return transformer.transform(list)
             }
 
-            @Override
-            public Single<Boolean> exists() {
-                return Single.fromCallable(this::blockingExists);
+            override fun exists(): Single<Boolean> {
+                return Single.fromCallable { blockingExists() }
             }
 
-            @Override
-            public boolean blockingExists() {
-                return blockingGet() != null;
+            override fun blockingExists(): Boolean {
+                return blockingGet() != null
             }
-        };
+        }
     }
 }

From 2928bacc0ba5972111e69195e1c8bdd034a2a08e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 30 Aug 2023 13:05:24 +0200
Subject: [PATCH 197/478] [ANDROSDK-1717] Update to MutableMap

---
 .../search/TrackedEntityInstanceQueryCollectionRepository.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 5d3f7d27c6..19211264f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -76,7 +76,7 @@ import javax.inject.Inject
 class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
-    private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    private val childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
     val scope: TrackedEntityInstanceQueryRepositoryScope,
     private val scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
     private val versionManager: DHISVersionManager,

From c55f323f81cc9b9ac160665773929a6c74963c36 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 31 Aug 2023 11:13:43 +0200
Subject: [PATCH 198/478] [ANDROSDK-1712] refactor: - Rebase from develop fix:
 - UserCallShould.kt

---
 .../android/core/user/internal/LogInCall.kt   | 16 ++--------
 .../android/core/user/internal/UserCall.kt    | 10 +++---
 .../core/user/internal/UserModuleImpl.kt      |  3 +-
 .../android/core/user/internal/UserService.kt | 13 +++++---
 .../user/openid/OpenIDConnectHandlerImpl.kt   |  5 +--
 .../core/user/internal/LogInCallUnitShould.kt | 14 ++++----
 .../core/user/internal/UserCallShould.kt      | 32 +++++++++++--------
 gradle/wrapper/gradle-wrapper.properties      |  3 +-
 8 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index a8da90d460..eca8ffadba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -28,11 +28,7 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 import net.openid.appauth.AuthState
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
@@ -47,11 +43,11 @@ import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
+import javax.inject.Inject
 
 @Reusable
 @Suppress("LongParameterList")
 internal class LogInCall @Inject internal constructor(
-    private val apiCallExecutor: APICallExecutor,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
@@ -60,7 +56,6 @@ internal class LogInCall @Inject internal constructor(
     private val authenticatedUserStore: AuthenticatedUserStore,
     private val systemInfoCall: SystemInfoCall,
     private val userStore: UserStore,
-    private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher,
     private val databaseManager: LogInDatabaseManager,
     private val exceptions: LogInExceptions,
     private val accountManager: AccountManagerImpl,
@@ -81,18 +76,13 @@ internal class LogInCall @Inject internal constructor(
         val parsedServerUrl = ServerUrlParser.parse(trimmedServerUrl)
         ServerURLWrapper.setServerUrl(parsedServerUrl.toString())
 
-        val authenticateCall = userService.authenticate(
-            UserIdAuthenticatorHelper.basic(username!!, password!!),
-            UserFields.allFieldsWithoutOrgUnit(null),
-        )
-
-        val credentials = Credentials(username, trimmedServerUrl!!, password, null)
+        val credentials = Credentials(username!!, trimmedServerUrl!!, password, null)
 
         return try {
             val user = coroutineAPICallExecutor.wrap {
                 userService.authenticate(
                     okhttp3.Credentials.basic(username, password!!),
-                    UserFields.allFieldsWithoutOrgUnit(null)
+                    UserFields.allFieldsWithoutOrgUnit(null),
                 )
             }.getOrThrow()
             loginOnline(user, credentials)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index d328cf506d..b7d3ae3321 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -29,13 +29,14 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import dagger.Reusable
-import java.util.concurrent.Callable
-import javax.inject.Inject
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
+import java.util.concurrent.Callable
+import javax.inject.Inject
 
 @Reusable
 internal class UserCall @Inject constructor(
@@ -48,11 +49,10 @@ internal class UserCall @Inject constructor(
 
     @Throws(D2Error::class)
     override fun call(): User {
-
         val user = runBlocking {
             coroutineAPICallExecutor.wrap {
                 userService.getUser(
-                    UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion())
+                    UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()),
                 )
             }.getOrThrow()
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index d538520ca0..34c512478b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -30,10 +30,11 @@ package org.hisp.dhis.android.core.user.internal
 import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
-import javax.inject.Inject
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
+import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions", "LongParameterList")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
index 40fead1a75..1ee8a43a49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserService.kt
@@ -26,17 +26,20 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.core.user.internal;
+package org.hisp.dhis.android.core.user.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.user.User;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.user.User
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Query
 
 internal interface UserService {
     @GET("me")
     suspend fun authenticate(
         @Header("Authorization") credentials: String,
-        @Query("fields") @Which fields: Fields<User>
+        @Query("fields") @Which fields: Fields<User>,
     ): User
 
     @GET("me")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
index f8d1265908..8882dde1e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
@@ -34,10 +34,11 @@ import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
-import javax.inject.Inject
+import kotlinx.coroutines.runBlocking
 import net.openid.appauth.*
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.LogInCall
+import javax.inject.Inject
 
 private const val RC_AUTH = 2021
 
@@ -45,7 +46,7 @@ private const val RC_AUTH = 2021
 internal class OpenIDConnectHandlerImpl @Inject constructor(
     private val context: Context,
     private val logInCall: LogInCall,
-    private val logoutHandler: OpenIDConnectLogoutHandler
+    private val logoutHandler: OpenIDConnectLogoutHandler,
 ) : OpenIDConnectHandler {
 
     override fun logIn(config: OpenIDConnectConfig): Single<IntentWithRequestCode> {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index 2358c316da..ad1a521eaa 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -30,8 +30,8 @@ package org.hisp.dhis.android.core.user.internal
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Single
-import io.reactivex.observers.TestObserver
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
@@ -55,8 +55,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.*
-import org.mockito.stubbing.OngoingStubbing
-import retrofit2.Call
+import org.mockito.stubbing.Answer
 
 @RunWith(JUnit4::class)
 class LogInCallUnitShould : BaseCallShould() {
@@ -148,7 +147,7 @@ class LogInCallUnitShould : BaseCallShould() {
 
     private suspend fun <P> assertD2Error(
         errorCode: D2ErrorCode? = null,
-        block: suspend () -> P
+        block: suspend () -> P,
     ) {
         try {
             block.invoke()
@@ -162,8 +161,9 @@ class LogInCallUnitShould : BaseCallShould() {
     fun invoke_server_with_correct_parameters_after_call() = runTest {
         whenever(
             userService.authenticate(
-                credentialsCaptor.capture(), filterCaptor.capture(),
-            )
+                credentialsCaptor.capture(),
+                filterCaptor.capture(),
+            ),
         ).thenReturn(apiUser)
         login()
         assertThat(okhttp3.Credentials.basic(USERNAME, PASSWORD)).isEqualTo(credentialsCaptor.firstValue)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 62bb60ca30..9c5a636c6a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -25,13 +25,14 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-@file:OptIn(ExperimentalCoroutinesApi::class)
 
 package org.hisp.dhis.android.core.user.internal
 
 import com.nhaarman.mockitokotlin2.*
-import java.util.concurrent.Callable
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -42,16 +43,16 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import retrofit2.Call
-
+import org.mockito.stubbing.Answer
+import java.util.concurrent.Callable
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class UserCallShould : BaseCallShould() {
     private val userService: UserService = mock()
     private val userHandler: UserHandler = mock()
     private val userCall: User = mock()
     private val dhisVersionManager: DHISVersionManager = mock()
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = mock()
-
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val user: User = mock()
 
     private lateinit var userSyncCall: Callable<User>
@@ -59,17 +60,22 @@ class UserCallShould : BaseCallShould() {
     @Before
     override fun setUp() {
         super.setUp()
+        whenAPICall { userCall }
+
         userSyncCall = UserCall(genericCallData, coroutineAPICallExecutor, userService, userHandler, dhisVersionManager)
-        userService.stub {
-            onBlocking { getUser(any()) }.doReturn(userCall)
-        }
 
         whenever(dhisVersionManager.getVersion()).thenReturn(DHISVersion.V2_39)
     }
 
+    private fun whenAPICall(answer: Answer<User>) {
+        userService.stub {
+            onBlocking { getUser(any()) }.doAnswer(answer)
+        }
+    }
+
     @Test
     fun not_invoke_stores_on_call_io_exception() = runTest {
-        whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenThrow(d2Error)
+        whenAPICall { throw d2Error }
 
         try {
             userSyncCall.call()
@@ -85,7 +91,7 @@ class UserCallShould : BaseCallShould() {
 
     @Test
     fun not_invoke_handler_after_call_failure() = runTest {
-        whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenThrow(d2Error)
+        whenAPICall { throw d2Error }
         try {
             userSyncCall.call()
             Assert.fail("Call should't succeed")
@@ -100,7 +106,7 @@ class UserCallShould : BaseCallShould() {
 
     @Test
     fun invoke_handlers_on_success() = runTest {
-        whenever(coroutineAPICallExecutor.wrap { userCall }.getOrThrow()).thenReturn(user)
+        whenAPICall { user }
         userSyncCall.call()
         verify(userHandler).handle(eq(user))
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84a0b92f9a..f1e5473b84 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Aug 31 00:09:15 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 33098335a4c083fab76ae5fb7a8572dfdde5975a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:24:49 +0200
Subject: [PATCH 199/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...yCollectionRepository.java => CategoryCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/category/{CategoryCollectionRepository.java => CategoryCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt

From 9d51748731ab778ac5261fc3829fefb543f31a66 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:24:49 +0200
Subject: [PATCH 200/478] [ANDROSDK-1717] Refactor CategoryCollectionRepository
 to kotlin

---
 .../category/CategoryCollectionRepository.kt  | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
index b80e281cbf..403341a818 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
@@ -25,39 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.category;
+package org.hisp.dhis.android.core.category
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.category.internal.CategoryFields;
-import org.hisp.dhis.android.core.category.internal.CategoryStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryFields
+import org.hisp.dhis.android.core.category.internal.CategoryStore
+import javax.inject.Inject
 
 @Reusable
-public final class CategoryCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<Category, CategoryCollectionRepository> {
-
-    @Inject
-    CategoryCollectionRepository(final CategoryStore store,
-                                 final Map<String, ChildrenAppender<Category>> childrenAppenders,
-                                 final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new CategoryCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<CategoryCollectionRepository> byDataDimensionType() {
-        return cf.string(CategoryTableInfo.Columns.DATA_DIMENSION_TYPE);
+class CategoryCollectionRepository @Inject internal constructor(
+    store: CategoryStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Category>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Category, CategoryCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        CategoryCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDataDimensionType(): StringFilterConnector<CategoryCollectionRepository> {
+        return cf.string(CategoryTableInfo.Columns.DATA_DIMENSION_TYPE)
     }
 
-    public CategoryCollectionRepository withCategoryOptions() {
-        return cf.withChild(CategoryFields.CATEGORY_OPTIONS);
+    fun withCategoryOptions(): CategoryCollectionRepository {
+        return cf.withChild(CategoryFields.CATEGORY_OPTIONS)
     }
 }

From 3b7190ddae09b4d7fd32522919924df79bc61fe1 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:31:43 +0200
Subject: [PATCH 201/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...CollectionRepository.java => AuthorityCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/user/{AuthorityCollectionRepository.java => AuthorityCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt

From fa3038707d7126cb29a99f974b8bfc9c220b78a2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:31:44 +0200
Subject: [PATCH 202/478] [ANDROSDK-1717] Refactor
 AuthorityCollectionRepository to kotlin

---
 .../user/AuthorityCollectionRepository.kt     | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
index 47df708322..a529d23e00 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
@@ -25,35 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user
 
-package org.hisp.dhis.android.core.user;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.user.internal.AuthorityStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.user.internal.AuthorityStore
+import javax.inject.Inject
 
 @Reusable
-public final class AuthorityCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<Authority, AuthorityCollectionRepository> {
-
-    @Inject
-    AuthorityCollectionRepository(final AuthorityStore store,
-                                  final Map<String, ChildrenAppender<Authority>> childrenAppenders,
-                                  final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new AuthorityCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<AuthorityCollectionRepository> byName() {
-        return cf.string(AuthorityTableInfo.Columns.NAME);
+class AuthorityCollectionRepository @Inject internal constructor(
+    store: AuthorityStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Authority>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<Authority, AuthorityCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        AuthorityCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byName(): StringFilterConnector<AuthorityCollectionRepository> {
+        return cf.string(AuthorityTableInfo.Columns.NAME)
     }
-}
\ No newline at end of file
+}

From ff9d5d34954a63704a99e01f09ac1ee8c8e93fe0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:33:09 +0200
Subject: [PATCH 203/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ectionRepository.java => CategoryComboCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/category/{CategoryComboCollectionRepository.java => CategoryComboCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt

From 6370ae01a4dbf1ec7522989e86d5f5dccad06514 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:33:10 +0200
Subject: [PATCH 204/478] [ANDROSDK-1717] Refactor
 CategoryComboCollectionRepository to kotlin

---
 .../CategoryComboCollectionRepository.kt      | 65 ++++++++++---------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
index b0c9ab3b63..ecd3c3551f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
@@ -25,41 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.category;
+package org.hisp.dhis.android.core.category
 
-import static org.hisp.dhis.android.core.category.CategoryComboTableInfo.Columns;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.category.internal.CategoryComboFields;
-import org.hisp.dhis.android.core.category.internal.CategoryComboStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryComboFields
+import org.hisp.dhis.android.core.category.internal.CategoryComboStore
+import javax.inject.Inject
 
 @Reusable
-public final class CategoryComboCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryCombo, CategoryComboCollectionRepository> {
-
-    @Inject
-    CategoryComboCollectionRepository(final CategoryComboStore store,
-                                      final Map<String, ChildrenAppender<CategoryCombo>> childrenAppenders,
-                                      final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new CategoryComboCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public BooleanFilterConnector<CategoryComboCollectionRepository> byIsDefault() {
-        return cf.bool(Columns.IS_DEFAULT);
+class CategoryComboCollectionRepository @Inject internal constructor(
+    store: CategoryComboStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<CategoryCombo>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryCombo, CategoryComboCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        CategoryComboCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byIsDefault(): BooleanFilterConnector<CategoryComboCollectionRepository> {
+        return cf.bool(CategoryComboTableInfo.Columns.IS_DEFAULT)
     }
 
-    public CategoryComboCollectionRepository withCategories() {
-        return cf.withChild(CategoryComboFields.CATEGORIES);
+    fun withCategories(): CategoryComboCollectionRepository {
+        return cf.withChild(CategoryComboFields.CATEGORIES)
     }
-}
\ No newline at end of file
+}

From 147c3037c0b39e5516577aaedd5a3613d838eb33 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:34:31 +0200
Subject: [PATCH 205/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...tCollectionRepository.java => ConstantCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/{ConstantCollectionRepository.java => ConstantCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt

From 9dca2bb4345e0f899bab87ae190c142dc5f2064e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:34:32 +0200
Subject: [PATCH 206/478] [ANDROSDK-1717] Refactor ConstantCollectionRepository
 to kotlin

---
 .../constant/ConstantCollectionRepository.kt  | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
index ad8d2fc2d8..183ca947c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
@@ -25,36 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.constant;
+package org.hisp.dhis.android.core.constant
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.constant.internal.ConstantStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.constant.internal.ConstantStore
+import javax.inject.Inject
 
 @Reusable
-public final class ConstantCollectionRepository extends ReadOnlyIdentifiableCollectionRepositoryImpl<
-        Constant, ConstantCollectionRepository> {
-
-    @Inject
-    ConstantCollectionRepository(
-            final ConstantStore store,
-            final Map<String, ChildrenAppender<Constant>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ConstantCollectionRepository(store, childrenAppenders, s)));
+class ConstantCollectionRepository @Inject internal constructor(
+    store: ConstantStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Constant>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Constant, ConstantCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ConstantCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byValue(): DoubleFilterConnector<ConstantCollectionRepository> {
+        return cf.doubleC(ConstantTableInfo.Columns.VALUE)
     }
-
-    public DoubleFilterConnector<ConstantCollectionRepository> byValue() {
-        return cf.doubleC(ConstantTableInfo.Columns.VALUE);
-    }
-
-}
\ No newline at end of file
+}

From 5f04f5eac6ccbeb372ea6ce39c93691d54272f77 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:35:52 +0200
Subject: [PATCH 207/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...Repository.java => AnalyticsTeiSettingCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{AnalyticsTeiSettingCollectionRepository.java => AnalyticsTeiSettingCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt

From 46bc933534c5857cdc3814645435b54eeb4d6088 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:35:52 +0200
Subject: [PATCH 208/478] [ANDROSDK-1717] Refactor
 AnalyticsTeiSettingCollectionRepository to kotlin

---
 ...AnalyticsTeiSettingCollectionRepository.kt | 92 +++++++++----------
 1 file changed, 45 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
index abc8c0de99..2a806d6466 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2004-2023, University of Oslo
  *  All rights reserved.
@@ -26,65 +25,64 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.settings;
-
-import static org.hisp.dhis.android.core.settings.internal.AnalyticsTeiDataChildrenAppender.KEY;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.period.PeriodType;
-import org.hisp.dhis.android.core.settings.internal.AnalyticsTeiSettingStore;
-
-import java.util.Map;
+package org.hisp.dhis.android.core.settings
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.settings.internal.AnalyticsTeiDataChildrenAppender
+import org.hisp.dhis.android.core.settings.internal.AnalyticsTeiSettingStore
+import javax.inject.Inject
 
 @Reusable
-public class AnalyticsTeiSettingCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<AnalyticsTeiSetting, AnalyticsTeiSettingCollectionRepository> {
-
-    @Inject
-    AnalyticsTeiSettingCollectionRepository(AnalyticsTeiSettingStore store,
-                                            RepositoryScope scope,
-                                            Map<String, ChildrenAppender<AnalyticsTeiSetting>> childrenAppenders) {
-        super(store,
-                childrenAppenders,
-                scope.toBuilder().children(scope.children().withChild(KEY)).build(),
-                new FilterConnectorFactory<>(scope,
-                        s -> new AnalyticsTeiSettingCollectionRepository(store, s, childrenAppenders)));
-    }
-
-    public StringFilterConnector<AnalyticsTeiSettingCollectionRepository> byUid() {
-        return cf.string(AnalyticsTeiSettingTableInfo.Columns.UID);
+class AnalyticsTeiSettingCollectionRepository @Inject internal constructor(
+    store: AnalyticsTeiSettingStore,
+    scope: RepositoryScope,
+    childrenAppenders: MutableMap<String, ChildrenAppender<AnalyticsTeiSetting>>,
+) : ReadOnlyCollectionRepositoryImpl<AnalyticsTeiSetting, AnalyticsTeiSettingCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope.toBuilder().children(scope.children().withChild(AnalyticsTeiDataChildrenAppender.KEY)).build(),
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        AnalyticsTeiSettingCollectionRepository(
+            store,
+            s,
+            childrenAppenders,
+        )
+    },
+) {
+    fun byUid(): StringFilterConnector<AnalyticsTeiSettingCollectionRepository> {
+        return cf.string(AnalyticsTeiSettingTableInfo.Columns.UID)
     }
 
-    public StringFilterConnector<AnalyticsTeiSettingCollectionRepository> byName() {
-        return cf.string(AnalyticsTeiSettingTableInfo.Columns.NAME);
+    fun byName(): StringFilterConnector<AnalyticsTeiSettingCollectionRepository> {
+        return cf.string(AnalyticsTeiSettingTableInfo.Columns.NAME)
     }
 
-    public StringFilterConnector<AnalyticsTeiSettingCollectionRepository> byShortName() {
-        return cf.string(AnalyticsTeiSettingTableInfo.Columns.SHORT_NAME);
+    fun byShortName(): StringFilterConnector<AnalyticsTeiSettingCollectionRepository> {
+        return cf.string(AnalyticsTeiSettingTableInfo.Columns.SHORT_NAME)
     }
 
-    public StringFilterConnector<AnalyticsTeiSettingCollectionRepository> byProgram() {
-        return cf.string(AnalyticsTeiSettingTableInfo.Columns.PROGRAM);
+    fun byProgram(): StringFilterConnector<AnalyticsTeiSettingCollectionRepository> {
+        return cf.string(AnalyticsTeiSettingTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<AnalyticsTeiSettingCollectionRepository> byProgramStage() {
-        return cf.string(AnalyticsTeiSettingTableInfo.Columns.PROGRAM_STAGE);
+    fun byProgramStage(): StringFilterConnector<AnalyticsTeiSettingCollectionRepository> {
+        return cf.string(AnalyticsTeiSettingTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public EnumFilterConnector<AnalyticsTeiSettingCollectionRepository, PeriodType> byPeriod() {
-        return cf.enumC(AnalyticsTeiSettingTableInfo.Columns.PERIOD);
+    fun byPeriod(): EnumFilterConnector<AnalyticsTeiSettingCollectionRepository, PeriodType> {
+        return cf.enumC(AnalyticsTeiSettingTableInfo.Columns.PERIOD)
     }
 
-    public EnumFilterConnector<AnalyticsTeiSettingCollectionRepository, ChartType> byType() {
-        return cf.enumC(AnalyticsTeiSettingTableInfo.Columns.TYPE);
+    fun byType(): EnumFilterConnector<AnalyticsTeiSettingCollectionRepository, ChartType> {
+        return cf.enumC(AnalyticsTeiSettingTableInfo.Columns.TYPE)
     }
-}
\ No newline at end of file
+}

From bb53c4c0c27f7aa0539f2b606594e686dfe0f542 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:43:10 +0200
Subject: [PATCH 209/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ctionRepository.java => CategoryOptionCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/category/{CategoryOptionCollectionRepository.java => CategoryOptionCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt

From 720973df5d4144757bc6c26489f4979a01aeb7dd Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:43:11 +0200
Subject: [PATCH 210/478] [ANDROSDK-1717] Refactor
 CategoryOptionCollectionRepository to kotlin

---
 ...eadOnlyNameableCollectionRepositoryImpl.kt |  2 +-
 .../CategoryOptionCollectionRepository.kt     | 93 +++++++++----------
 2 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index a167ac8f19..230ae3912e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -39,7 +39,7 @@ import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.NameableColumns
 import org.hisp.dhis.android.core.common.NameableObject
 
-internal open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>>(
+open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
     store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
index b2493cdb66..cea75742df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
@@ -25,72 +25,69 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.category;
+package org.hisp.dhis.android.core.category
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.category.internal.CategoryOptionFields;
-import org.hisp.dhis.android.core.category.internal.CategoryOptionStore;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-
-import java.util.Collections;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryOptionFields
+import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import javax.inject.Inject
 
 @Reusable
-public final class CategoryOptionCollectionRepository
-        extends ReadOnlyNameableCollectionRepositoryImpl<CategoryOption, CategoryOptionCollectionRepository> {
-
-    @Inject
-    CategoryOptionCollectionRepository(final CategoryOptionStore store,
-                                       final Map<String, ChildrenAppender<CategoryOption>> childrenAppenders,
-                                       final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new CategoryOptionCollectionRepository(store, childrenAppenders, s)));
+class CategoryOptionCollectionRepository @Inject internal constructor(
+    store: CategoryOptionStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<CategoryOption>>,
+    scope: RepositoryScope
+) : ReadOnlyNameableCollectionRepositoryImpl<CategoryOption, CategoryOptionCollectionRepository>(
+    store, childrenAppenders, scope, FilterConnectorFactory(
+        scope
+    ) { s: RepositoryScope ->
+        CategoryOptionCollectionRepository(
+            store,
+            childrenAppenders,
+            s
+        )
     }
-
-    public DateFilterConnector<CategoryOptionCollectionRepository> byStartDate() {
-        return cf.date(CategoryOptionTableInfo.Columns.START_DATE);
+) {
+    fun byStartDate(): DateFilterConnector<CategoryOptionCollectionRepository> {
+        return cf.date(CategoryOptionTableInfo.Columns.START_DATE)
     }
 
-    public DateFilterConnector<CategoryOptionCollectionRepository> byEndDate() {
-        return cf.date(CategoryOptionTableInfo.Columns.END_DATE);
+    fun byEndDate(): DateFilterConnector<CategoryOptionCollectionRepository> {
+        return cf.date(CategoryOptionTableInfo.Columns.END_DATE)
     }
 
-    public BooleanFilterConnector<CategoryOptionCollectionRepository> byAccessDataWrite() {
-        return cf.bool(CategoryOptionTableInfo.Columns.ACCESS_DATA_WRITE);
+    fun byAccessDataWrite(): BooleanFilterConnector<CategoryOptionCollectionRepository> {
+        return cf.bool(CategoryOptionTableInfo.Columns.ACCESS_DATA_WRITE)
     }
 
-    public CategoryOptionCollectionRepository byCategoryUid(String categoryUid) {
+    fun byCategoryUid(categoryUid: String): CategoryOptionCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                CategoryCategoryOptionLinkTableInfo.TABLE_INFO.name(),
-                CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
-                CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY,
-                Collections.singletonList(categoryUid)
-        );
+            CategoryCategoryOptionLinkTableInfo.TABLE_INFO.name(),
+            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
+            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY, listOf(categoryUid)
+        )
     }
 
-    public CategoryOptionCollectionRepository byCategoryOptionComboUid(String categoryOptionComboUid) {
+    fun byCategoryOptionComboUid(categoryOptionComboUid: String): CategoryOptionCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO.name(),
-                CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
-                CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
-                Collections.singletonList(categoryOptionComboUid)
-        );
+            CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO.name(),
+            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
+            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO, listOf(categoryOptionComboUid)
+        )
     }
 
     /**
      * This method only return results in versions greater or equal to 2.37.
      * @return Collection repository
      */
-    public CategoryOptionCollectionRepository withOrganisationUnits() {
-        return cf.withChild(CategoryOptionFields.ORGANISATION_UNITS);
+    fun withOrganisationUnits(): CategoryOptionCollectionRepository {
+        return cf.withChild(CategoryOptionFields.ORGANISATION_UNITS)
     }
-}
+}
\ No newline at end of file

From 75cd4d43e4853ff4ea60df7282b02eb6b050492e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:43:48 +0200
Subject: [PATCH 211/478] [ANDROSDK-1717] Refactor
 CategoryOptionCollectionRepository to kotlin ktlintformat

---
 .../CategoryOptionCollectionRepository.kt     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
index cea75742df..c488f696e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
@@ -43,17 +43,20 @@ import javax.inject.Inject
 class CategoryOptionCollectionRepository @Inject internal constructor(
     store: CategoryOptionStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<CategoryOption>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<CategoryOption, CategoryOptionCollectionRepository>(
-    store, childrenAppenders, scope, FilterConnectorFactory(
-        scope
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
     ) { s: RepositoryScope ->
         CategoryOptionCollectionRepository(
             store,
             childrenAppenders,
-            s
+            s,
         )
-    }
+    },
 ) {
     fun byStartDate(): DateFilterConnector<CategoryOptionCollectionRepository> {
         return cf.date(CategoryOptionTableInfo.Columns.START_DATE)
@@ -71,7 +74,8 @@ class CategoryOptionCollectionRepository @Inject internal constructor(
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
             CategoryCategoryOptionLinkTableInfo.TABLE_INFO.name(),
             CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
-            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY, listOf(categoryUid)
+            CategoryCategoryOptionLinkTableInfo.Columns.CATEGORY,
+            listOf(categoryUid),
         )
     }
 
@@ -79,7 +83,8 @@ class CategoryOptionCollectionRepository @Inject internal constructor(
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
             CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO.name(),
             CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
-            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO, listOf(categoryOptionComboUid)
+            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
+            listOf(categoryOptionComboUid),
         )
     }
 
@@ -90,4 +95,4 @@ class CategoryOptionCollectionRepository @Inject internal constructor(
     fun withOrganisationUnits(): CategoryOptionCollectionRepository {
         return cf.withChild(CategoryOptionFields.ORGANISATION_UNITS)
     }
-}
\ No newline at end of file
+}

From e5b1fdba8cf403ecd65cd86f0bc68194eb71b35a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 11:55:50 +0200
Subject: [PATCH 212/478] [ANDROSDK-1717] Fix detekt

---
 .../TrackedEntityInstanceQueryCollectionRepository.kt       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 19211264f1..5bcb623bec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -73,6 +73,7 @@ import java.util.Date
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions", "LongParameterList")
 class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
@@ -581,6 +582,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
             localQueryHelper,
         )
 
+    @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
     override fun blockingGet(): List<TrackedEntityInstance> {
         return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
             val sqlQuery = localQueryHelper.getSqlQuery(scope, scope.excludedUids(), -1)
@@ -597,8 +599,8 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         } else {
             try {
                 onlineHelper.queryOnlineBlocking(trackerParentCallFactory, scope)
-            } catch (e: D2Error) {
-                throw RuntimeException(e)
+            } catch (d2error: D2Error) {
+                throw RuntimeException(d2error)
             } catch (e: Exception) {
                 emptyList()
             }

From 7853a06e7a608dc752c414d4ffca83b3b7db34b0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:06:23 +0200
Subject: [PATCH 213/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...tionRepository.java => DataSetInstanceCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/{DataSetInstanceCollectionRepository.java => DataSetInstanceCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt

From c5241cab3ad3de79f0375567bf805d72a1857ba8 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:06:24 +0200
Subject: [PATCH 214/478] [ANDROSDK-1717] Refactor
 DataSetInstanceCollectionRepository to kotlin

---
 .../DataSetInstanceCollectionRepository.kt    | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
index bfbb4660fd..212d9600e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
@@ -25,67 +25,67 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataset;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSQLStatementBuilder;
-import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceStore;
-import org.hisp.dhis.android.core.period.PeriodType;
-
-import java.util.Collections;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.dataset
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSQLStatementBuilder
+import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceStore
+import org.hisp.dhis.android.core.period.PeriodType
+import javax.inject.Inject
 
 @Reusable
-public final class DataSetInstanceCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<DataSetInstance, DataSetInstanceCollectionRepository> {
-
-    @Inject
-    public DataSetInstanceCollectionRepository(final DataSetInstanceStore store,
-                                               final RepositoryScope scope) {
-        super(store, Collections.emptyMap(), scope, new FilterConnectorFactory<>(scope,
-                s -> new DataSetInstanceCollectionRepository(store, s)));
-    }
-
-    public StringFilterConnector<DataSetInstanceCollectionRepository> byDataSetUid() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.DATASET_UID_ALIAS);
+class DataSetInstanceCollectionRepository @Inject internal constructor(
+    store: DataSetInstanceStore,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<DataSetInstance, DataSetInstanceCollectionRepository>(
+    store,
+    emptyMap(),
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        DataSetInstanceCollectionRepository(
+            store,
+            s,
+        )
+    },
+) {
+    fun byDataSetUid(): StringFilterConnector<DataSetInstanceCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.DATASET_UID_ALIAS)
     }
 
-    public StringFilterConnector<DataSetInstanceCollectionRepository> byPeriod() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.PERIOD_ALIAS);
+    fun byPeriod(): StringFilterConnector<DataSetInstanceCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.PERIOD_ALIAS)
     }
 
-    public EnumFilterConnector<DataSetInstanceCollectionRepository, PeriodType> byPeriodType() {
-        return cf.enumC(DataSetInstanceSQLStatementBuilder.PERIOD_TYPE_ALIAS);
+    fun byPeriodType(): EnumFilterConnector<DataSetInstanceCollectionRepository, PeriodType> {
+        return cf.enumC(DataSetInstanceSQLStatementBuilder.PERIOD_TYPE_ALIAS)
     }
 
-    public DateFilterConnector<DataSetInstanceCollectionRepository> byPeriodStartDate() {
-        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_START_DATE_ALIAS);
+    fun byPeriodStartDate(): DateFilterConnector<DataSetInstanceCollectionRepository> {
+        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_START_DATE_ALIAS)
     }
 
-    public DateFilterConnector<DataSetInstanceCollectionRepository> byPeriodEndDate() {
-        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_END_DATE_ALIAS);
+    fun byPeriodEndDate(): DateFilterConnector<DataSetInstanceCollectionRepository> {
+        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_END_DATE_ALIAS)
     }
 
-    public StringFilterConnector<DataSetInstanceCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.ORGANISATION_UNIT_UID_ALIAS);
+    fun byOrganisationUnitUid(): StringFilterConnector<DataSetInstanceCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.ORGANISATION_UNIT_UID_ALIAS)
     }
 
-    public StringFilterConnector<DataSetInstanceCollectionRepository> byAttributeOptionComboUid() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.ATTRIBUTE_OPTION_COMBO_UID_ALIAS);
+    fun byAttributeOptionComboUid(): StringFilterConnector<DataSetInstanceCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.ATTRIBUTE_OPTION_COMBO_UID_ALIAS)
     }
 
-    public EnumFilterConnector<DataSetInstanceCollectionRepository, State> byState() {
-        return cf.enumC(DataSetInstanceSQLStatementBuilder.STATE_ALIAS);
+    fun byState(): EnumFilterConnector<DataSetInstanceCollectionRepository, State> {
+        return cf.enumC(DataSetInstanceSQLStatementBuilder.STATE_ALIAS)
     }
-
-}
\ No newline at end of file
+}

From 043ecf5edf8c4fed193a1a38c3a21f46a563dfd1 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:08:02 +0200
Subject: [PATCH 215/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...orCollectionRepository.java => D2ErrorCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/{D2ErrorCollectionRepository.java => D2ErrorCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt

From 09b19b408151580ddc377a8a7174306242b080cb Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:08:03 +0200
Subject: [PATCH 216/478] [ANDROSDK-1717] Refactor D2ErrorCollectionRepository
 to kotlin

---
 .../D2ErrorCollectionRepository.kt            | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
index 1d188269a3..0cedd12a76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
@@ -25,58 +25,60 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.maintenance
 
-package org.hisp.dhis.android.core.maintenance;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
+import javax.inject.Inject
 
 @Reusable
-public final class D2ErrorCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<D2Error, D2ErrorCollectionRepository> {
-
-    @Inject
-    D2ErrorCollectionRepository(final D2ErrorStore store,
-                                final Map<String, ChildrenAppender<D2Error>> childrenAppenders,
-                                final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new D2ErrorCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<D2ErrorCollectionRepository> byUrl() {
-        return cf.string(D2ErrorTableInfo.Columns.URL);
+class D2ErrorCollectionRepository @Inject internal constructor(
+    store: D2ErrorStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<D2Error>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<D2Error, D2ErrorCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        D2ErrorCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byUrl(): StringFilterConnector<D2ErrorCollectionRepository> {
+        return cf.string(D2ErrorTableInfo.Columns.URL)
     }
 
-    public EnumFilterConnector<D2ErrorCollectionRepository, D2ErrorComponent> byD2ErrorComponent() {
-        return cf.enumC(D2ErrorTableInfo.Columns.ERROR_COMPONENT);
+    fun byD2ErrorComponent(): EnumFilterConnector<D2ErrorCollectionRepository, D2ErrorComponent> {
+        return cf.enumC(D2ErrorTableInfo.Columns.ERROR_COMPONENT)
     }
 
-    public EnumFilterConnector<D2ErrorCollectionRepository, D2ErrorCode> byD2ErrorCode() {
-        return cf.enumC(D2ErrorTableInfo.Columns.ERROR_CODE);
+    fun byD2ErrorCode(): EnumFilterConnector<D2ErrorCollectionRepository, D2ErrorCode> {
+        return cf.enumC(D2ErrorTableInfo.Columns.ERROR_CODE)
     }
 
-    public StringFilterConnector<D2ErrorCollectionRepository> byErrorDescription() {
-        return cf.string(D2ErrorTableInfo.Columns.ERROR_DESCRIPTION);
+    fun byErrorDescription(): StringFilterConnector<D2ErrorCollectionRepository> {
+        return cf.string(D2ErrorTableInfo.Columns.ERROR_DESCRIPTION)
     }
 
-    public IntegerFilterConnector<D2ErrorCollectionRepository> byHttpErrorCode() {
-        return cf.integer(D2ErrorTableInfo.Columns.HTTP_ERROR_CODE);
+    fun byHttpErrorCode(): IntegerFilterConnector<D2ErrorCollectionRepository> {
+        return cf.integer(D2ErrorTableInfo.Columns.HTTP_ERROR_CODE)
     }
 
-    public DateFilterConnector<D2ErrorCollectionRepository> byCreated() {
-        return cf.date(D2ErrorTableInfo.Columns.CREATED);
+    fun byCreated(): DateFilterConnector<D2ErrorCollectionRepository> {
+        return cf.date(D2ErrorTableInfo.Columns.CREATED)
     }
-}
\ No newline at end of file
+}

From 938ee90057c04ba40d2f0a1adbf2f2b6e5ba4613 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:09:24 +0200
Subject: [PATCH 217/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...Repository.java => CategoryOptionComboCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/category/{CategoryOptionComboCollectionRepository.java => CategoryOptionComboCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt

From d8351aff0b64a6611125c8dc9653441ff6cd59a6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:09:25 +0200
Subject: [PATCH 218/478] [ANDROSDK-1717] Refactor
 CategoryOptionComboCollectionRepository to kotlin

---
 ...CategoryOptionComboCollectionRepository.kt | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
index 9c58892c23..965d950323 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
@@ -25,52 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.category
 
-package org.hisp.dhis.android.core.category;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.category.internal.CategoryOptionComboFields;
-import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryOptionComboFields
+import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import javax.inject.Inject
 
 @Reusable
-public final class CategoryOptionComboCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryOptionCombo,
-                CategoryOptionComboCollectionRepository> {
-
-    @Inject
-    CategoryOptionComboCollectionRepository(
-            final CategoryOptionComboStore store,
-            final Map<String, ChildrenAppender<CategoryOptionCombo>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new CategoryOptionComboCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<CategoryOptionComboCollectionRepository> byCategoryComboUid() {
-        return cf.string(CategoryOptionComboTableInfo.Columns.CATEGORY_COMBO);
+class CategoryOptionComboCollectionRepository @Inject internal constructor(
+    store: CategoryOptionComboStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<CategoryOptionCombo>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryOptionCombo, CategoryOptionComboCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        CategoryOptionComboCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byCategoryComboUid(): StringFilterConnector<CategoryOptionComboCollectionRepository> {
+        return cf.string(CategoryOptionComboTableInfo.Columns.CATEGORY_COMBO)
     }
 
-    public CategoryOptionComboCollectionRepository byCategoryOptions(List<String> categoryOptionUids) {
+    fun byCategoryOptions(categoryOptionUids: List<String>): CategoryOptionComboCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).withThoseChildrenExactly(
-                CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO.name(),
-                CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
-                CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
-                categoryOptionUids);
+            CategoryOptionComboCategoryOptionLinkTableInfo.TABLE_INFO.name(),
+            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION_COMBO,
+            CategoryOptionComboCategoryOptionLinkTableInfo.Columns.CATEGORY_OPTION,
+            categoryOptionUids,
+        )
     }
 
-    public CategoryOptionComboCollectionRepository withCategoryOptions() {
-        return cf.withChild(CategoryOptionComboFields.CATEGORY_OPTIONS);
+    fun withCategoryOptions(): CategoryOptionComboCollectionRepository {
+        return cf.withChild(CategoryOptionComboFields.CATEGORY_OPTIONS)
     }
-}
\ No newline at end of file
+}

From 4e499b5cd4d869d3525606c1f48e4659aa067022 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:16:17 +0200
Subject: [PATCH 219/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...lectionRepository.java => DataApprovalCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataapproval/{DataApprovalCollectionRepository.java => DataApprovalCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt

From b5d34f4bf305baccc5ac94d2a19bbe23ecb6844b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:16:17 +0200
Subject: [PATCH 220/478] [ANDROSDK-1717] Refactor
 DataApprovalCollectionRepository to kotlin

---
 .../DataApprovalCollectionRepository.kt       | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
index c93e6d74ba..02770bddbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
@@ -25,55 +25,54 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataapproval
 
-package org.hisp.dhis.android.core.dataapproval;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalStore
+import javax.inject.Inject
 
 @Reusable
-public class DataApprovalCollectionRepository extends ReadOnlyCollectionRepositoryImpl<DataApproval,
-        DataApprovalCollectionRepository> {
-
-
-    @Inject
-    DataApprovalCollectionRepository(final DataApprovalStore dataApprovalStore,
-                                     final Map<String, ChildrenAppender<DataApproval>> childrenAppenders,
-                                     final RepositoryScope repositoryScope) {
-
-        super(dataApprovalStore, childrenAppenders, repositoryScope, new FilterConnectorFactory<>(repositoryScope,
-                s -> new DataApprovalCollectionRepository(dataApprovalStore, childrenAppenders, s)));
+class DataApprovalCollectionRepository @Inject internal constructor(
+    dataApprovalStore: DataApprovalStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<DataApproval>>,
+    repositoryScope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<DataApproval, DataApprovalCollectionRepository>(
+    dataApprovalStore,
+    childrenAppenders,
+    repositoryScope,
+    FilterConnectorFactory(
+        repositoryScope,
+    ) { s: RepositoryScope ->
+        DataApprovalCollectionRepository(
+            dataApprovalStore,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byWorkflowUid(): StringFilterConnector<DataApprovalCollectionRepository> {
+        return cf.string(DataApprovalTableInfo.Columns.WORKFLOW)
     }
 
-    public StringFilterConnector<DataApprovalCollectionRepository> byWorkflowUid() {
-        return cf.string(DataApprovalTableInfo.Columns.WORKFLOW);
+    fun byOrganisationUnitUid(): StringFilterConnector<DataApprovalCollectionRepository> {
+        return cf.string(DataApprovalTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public StringFilterConnector<DataApprovalCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(DataApprovalTableInfo.Columns.ORGANISATION_UNIT);
+    fun byPeriodId(): StringFilterConnector<DataApprovalCollectionRepository> {
+        return cf.string(DataApprovalTableInfo.Columns.PERIOD)
     }
 
-    public StringFilterConnector<DataApprovalCollectionRepository> byPeriodId() {
-        return cf.string(DataApprovalTableInfo.Columns.PERIOD);
+    fun byAttributeOptionComboUid(): StringFilterConnector<DataApprovalCollectionRepository> {
+        return cf.string(DataApprovalTableInfo.Columns.ATTRIBUTE_OPTION_COMBO)
     }
 
-    public StringFilterConnector<DataApprovalCollectionRepository> byAttributeOptionComboUid() {
-        return cf.string(DataApprovalTableInfo.Columns.ATTRIBUTE_OPTION_COMBO);
+    fun byState(): EnumFilterConnector<DataApprovalCollectionRepository, DataApprovalState> {
+        return cf.enumC(DataApprovalTableInfo.Columns.STATE)
     }
-
-    public EnumFilterConnector<DataApprovalCollectionRepository, DataApprovalState> byState() {
-        return cf.enumC(DataApprovalTableInfo.Columns.STATE);
-    }
-
 }

From 5771d834e1edc347866f3463dea9e1622b3abf73 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:18:56 +0200
Subject: [PATCH 221/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...llectionRepository.java => DataElementCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/{DataElementCollectionRepository.java => DataElementCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt

From 631970dc995aae090e7817cbe8376469536a52b0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:18:56 +0200
Subject: [PATCH 222/478] [ANDROSDK-1717] Refactor
 DataElementCollectionRepository to kotlin

---
 .../DataElementCollectionRepository.kt        | 109 +++++++++---------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
index 43620d6c1c..2cbc3ad16f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
@@ -25,82 +25,85 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataelement;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.dataelement.internal.DataElementFields;
-import org.hisp.dhis.android.core.dataelement.internal.DataElementStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.dataelement
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.dataelement.internal.DataElementFields
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import javax.inject.Inject
 
 @Reusable
-public final class DataElementCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<DataElement, DataElementCollectionRepository> {
-
-    @Inject
-    DataElementCollectionRepository(final DataElementStore store,
-                                    final Map<String, ChildrenAppender<DataElement>> childrenAppenders,
-                                    final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new DataElementCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public EnumFilterConnector<DataElementCollectionRepository, ValueType> byValueType() {
-        return cf.enumC(DataElementTableInfo.Columns.VALUE_TYPE);
+class DataElementCollectionRepository @Inject internal constructor(
+    store: DataElementStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<DataElement>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<DataElement, DataElementCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        DataElementCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byValueType(): EnumFilterConnector<DataElementCollectionRepository, ValueType> {
+        return cf.enumC(DataElementTableInfo.Columns.VALUE_TYPE)
     }
 
-    public BooleanFilterConnector<DataElementCollectionRepository> byZeroIsSignificant() {
-        return cf.bool(DataElementTableInfo.Columns.ZERO_IS_SIGNIFICANT);
+    fun byZeroIsSignificant(): BooleanFilterConnector<DataElementCollectionRepository> {
+        return cf.bool(DataElementTableInfo.Columns.ZERO_IS_SIGNIFICANT)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byAggregationType() {
-        return cf.string(DataElementTableInfo.Columns.AGGREGATION_TYPE);
+    fun byAggregationType(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.AGGREGATION_TYPE)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byFormName() {
-        return cf.string(DataElementTableInfo.Columns.FORM_NAME);
+    fun byFormName(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.FORM_NAME)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byDomainType() {
-        return cf.string(DataElementTableInfo.Columns.DOMAIN_TYPE);
+    fun byDomainType(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.DOMAIN_TYPE)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byDisplayFormName() {
-        return cf.string(DataElementTableInfo.Columns.DISPLAY_FORM_NAME);
+    fun byDisplayFormName(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.DISPLAY_FORM_NAME)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byOptionSetUid() {
-        return cf.string(DataElementTableInfo.Columns.OPTION_SET);
+    fun byOptionSetUid(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.OPTION_SET)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byCategoryComboUid() {
-        return cf.string(DataElementTableInfo.Columns.CATEGORY_COMBO);
+    fun byCategoryComboUid(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.CATEGORY_COMBO)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byFieldMask() {
-        return cf.string(DataElementTableInfo.Columns.FIELD_MASK);
+    fun byFieldMask(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.FIELD_MASK)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byColor() {
-        return cf.string(DataElementTableInfo.Columns.COLOR);
+    fun byColor(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<DataElementCollectionRepository> byIcon() {
-        return cf.string(DataElementTableInfo.Columns.ICON);
+    fun byIcon(): StringFilterConnector<DataElementCollectionRepository> {
+        return cf.string(DataElementTableInfo.Columns.ICON)
     }
 
-    public DataElementCollectionRepository withLegendSets() {
-        return cf.withChild(DataElementFields.LEGEND_SETS);
+    fun withLegendSets(): DataElementCollectionRepository {
+        return cf.withChild(DataElementFields.LEGEND_SETS)
     }
 }

From 33d77912863bd1e0cb14a220f03e321e9f3ea547 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:21:45 +0200
Subject: [PATCH 223/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...etCollectionRepository.java => DataSetCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/{DataSetCollectionRepository.java => DataSetCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt

From f3d6bf51e3d64061fba2847dca2c527150888bc4 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:21:45 +0200
Subject: [PATCH 224/478] [ANDROSDK-1717] Refactor DataSetCollectionRepository
 to kotlin

---
 .../dataset/DataSetCollectionRepository.kt    | 195 +++++++++---------
 1 file changed, 97 insertions(+), 98 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
index 18998292db..75667429c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
@@ -25,155 +25,154 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataset;
-
-import static org.hisp.dhis.android.core.dataset.DataSetTableInfo.Columns;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.dataset.internal.DataSetFields;
-import org.hisp.dhis.android.core.dataset.internal.DataSetStore;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.period.PeriodType;
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.dataset
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.dataset.internal.DataSetFields
+import org.hisp.dhis.android.core.dataset.internal.DataSetStore
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import javax.inject.Inject
 
 @Reusable
-public class DataSetCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<DataSet, DataSetCollectionRepository> {
-
-    @Inject
-    DataSetCollectionRepository(final DataSetStore store,
-                                final Map<String, ChildrenAppender<DataSet>> childrenAppenders,
-                                final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new DataSetCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public EnumFilterConnector<DataSetCollectionRepository, PeriodType> byPeriodType() {
-        return cf.enumC(Columns.PERIOD_TYPE);
+class DataSetCollectionRepository @Inject internal constructor(
+    store: DataSetStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<DataSet>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<DataSet, DataSetCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        DataSetCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byPeriodType(): EnumFilterConnector<DataSetCollectionRepository, PeriodType> {
+        return cf.enumC(DataSetTableInfo.Columns.PERIOD_TYPE)
     }
 
-    public StringFilterConnector<DataSetCollectionRepository> byCategoryComboUid() {
-        return cf.string(Columns.CATEGORY_COMBO);
+    fun byCategoryComboUid(): StringFilterConnector<DataSetCollectionRepository> {
+        return cf.string(DataSetTableInfo.Columns.CATEGORY_COMBO)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byMobile() {
-        return cf.bool(Columns.MOBILE);
+    fun byMobile(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.MOBILE)
     }
 
-    public IntegerFilterConnector<DataSetCollectionRepository> byVersion() {
-        return cf.integer(Columns.VERSION);
+    fun byVersion(): IntegerFilterConnector<DataSetCollectionRepository> {
+        return cf.integer(DataSetTableInfo.Columns.VERSION)
     }
 
-    public IntegerFilterConnector<DataSetCollectionRepository> byExpiryDays() {
-        return cf.integer(Columns.EXPIRY_DAYS);
+    fun byExpiryDays(): IntegerFilterConnector<DataSetCollectionRepository> {
+        return cf.integer(DataSetTableInfo.Columns.EXPIRY_DAYS)
     }
 
-    public IntegerFilterConnector<DataSetCollectionRepository> byTimelyDays() {
-        return cf.integer(Columns.TIMELY_DAYS);
+    fun byTimelyDays(): IntegerFilterConnector<DataSetCollectionRepository> {
+        return cf.integer(DataSetTableInfo.Columns.TIMELY_DAYS)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byNotifyCompletingUser() {
-        return cf.bool(Columns.NOTIFY_COMPLETING_USER);
+    fun byNotifyCompletingUser(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.NOTIFY_COMPLETING_USER)
     }
 
-    public IntegerFilterConnector<DataSetCollectionRepository> byOpenFuturePeriods() {
-        return cf.integer(Columns.OPEN_FUTURE_PERIODS);
+    fun byOpenFuturePeriods(): IntegerFilterConnector<DataSetCollectionRepository> {
+        return cf.integer(DataSetTableInfo.Columns.OPEN_FUTURE_PERIODS)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byFieldCombinationRequired() {
-        return cf.bool(Columns.FIELD_COMBINATION_REQUIRED);
+    fun byFieldCombinationRequired(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.FIELD_COMBINATION_REQUIRED)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byValidCompleteOnly() {
-        return cf.bool(Columns.VALID_COMPLETE_ONLY);
+    fun byValidCompleteOnly(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.VALID_COMPLETE_ONLY)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byNoValueRequiresComment() {
-        return cf.bool(Columns.NO_VALUE_REQUIRES_COMMENT);
+    fun byNoValueRequiresComment(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.NO_VALUE_REQUIRES_COMMENT)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> bySkipOffline() {
-        return cf.bool(Columns.SKIP_OFFLINE);
+    fun bySkipOffline(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.SKIP_OFFLINE)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byDataElementDecoration() {
-        return cf.bool(Columns.DATA_ELEMENT_DECORATION);
+    fun byDataElementDecoration(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.DATA_ELEMENT_DECORATION)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byRenderAsTabs() {
-        return cf.bool(Columns.RENDER_AS_TABS);
+    fun byRenderAsTabs(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.RENDER_AS_TABS)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byRenderHorizontally() {
-        return cf.bool(Columns.RENDER_HORIZONTALLY);
+    fun byRenderHorizontally(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.RENDER_HORIZONTALLY)
     }
 
-    public BooleanFilterConnector<DataSetCollectionRepository> byAccessDataWrite() {
-        return cf.bool(Columns.ACCESS_DATA_WRITE);
+    fun byAccessDataWrite(): BooleanFilterConnector<DataSetCollectionRepository> {
+        return cf.bool(DataSetTableInfo.Columns.ACCESS_DATA_WRITE)
     }
 
-    public StringFilterConnector<DataSetCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<DataSetCollectionRepository> {
+        return cf.string(DataSetTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<DataSetCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<DataSetCollectionRepository> {
+        return cf.string(DataSetTableInfo.Columns.ICON)
     }
 
-    public DataSetCollectionRepository byOrganisationUnitUid(String uid) {
-        return byOrganisationUnitList(Collections.singletonList(uid));
+    fun byOrganisationUnitUid(uid: String): DataSetCollectionRepository {
+        return byOrganisationUnitList(listOf(uid))
     }
 
-    public DataSetCollectionRepository byOrganisationUnitList(List<String> uids) {
+    fun byOrganisationUnitList(uids: List<String>): DataSetCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
-                DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                uids);
+            DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
+            DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            uids,
+        )
     }
 
-    public DataSetCollectionRepository byOrganisationUnitScope(OrganisationUnit.Scope scope) {
+    fun byOrganisationUnitScope(scope: OrganisationUnit.Scope): DataSetCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inTwoLinkTable(
-                DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
-                DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                Collections.singletonList(scope.name())
-        );
+            DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
+            DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
+            listOf(scope.name),
+        )
     }
 
-    public DataSetCollectionRepository withCompulsoryDataElementOperands() {
-        return cf.withChild(DataSetFields.COMPULSORY_DATA_ELEMENT_OPERANDS);
+    fun withCompulsoryDataElementOperands(): DataSetCollectionRepository {
+        return cf.withChild(DataSetFields.COMPULSORY_DATA_ELEMENT_OPERANDS)
     }
 
-    public DataSetCollectionRepository withDataInputPeriods() {
-        return cf.withChild(DataSetFields.DATA_INPUT_PERIODS);
+    fun withDataInputPeriods(): DataSetCollectionRepository {
+        return cf.withChild(DataSetFields.DATA_INPUT_PERIODS)
     }
 
-    public DataSetCollectionRepository withDataSetElements() {
-        return cf.withChild(DataSetFields.DATA_SET_ELEMENTS);
+    fun withDataSetElements(): DataSetCollectionRepository {
+        return cf.withChild(DataSetFields.DATA_SET_ELEMENTS)
     }
 
-    public DataSetCollectionRepository withIndicators() {
-        return cf.withChild(DataSetFields.INDICATORS);
+    fun withIndicators(): DataSetCollectionRepository {
+        return cf.withChild(DataSetFields.INDICATORS)
     }
 }

From 2e0d07fee7efb6c18cc8be6576212801195b424f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:23:38 +0200
Subject: [PATCH 225/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ository.java => DataSetInstanceSummaryCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/{DataSetInstanceSummaryCollectionRepository.java => DataSetInstanceSummaryCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt

From 3bb59599c09b932755f1b725d49eaa7353de7329 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:23:39 +0200
Subject: [PATCH 226/478] [ANDROSDK-1717] Refactor
 DataSetInstanceSummaryCollectionRepository to kotlin

---
 ...aSetInstanceSummaryCollectionRepository.kt | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
index 9824794054..1a201c1a01 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
@@ -25,67 +25,67 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.dataset;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSQLStatementBuilder;
-import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSummaryStore;
-import org.hisp.dhis.android.core.period.PeriodType;
-
-import java.util.Collections;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.dataset
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSQLStatementBuilder
+import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSummaryStore
+import org.hisp.dhis.android.core.period.PeriodType
+import javax.inject.Inject
 
 @Reusable
-public final class DataSetInstanceSummaryCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<DataSetInstanceSummary, DataSetInstanceSummaryCollectionRepository> {
-
-    @Inject
-    DataSetInstanceSummaryCollectionRepository(final DataSetInstanceSummaryStore store,
-                                               final RepositoryScope scope) {
-        super(store, Collections.emptyMap(), scope, new FilterConnectorFactory<>(scope,
-                s -> new DataSetInstanceSummaryCollectionRepository(store, s)));
-    }
-
-    public StringFilterConnector<DataSetInstanceSummaryCollectionRepository> byDataSetUid() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.DATASET_UID_ALIAS);
+class DataSetInstanceSummaryCollectionRepository @Inject internal constructor(
+    store: DataSetInstanceSummaryStore,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<DataSetInstanceSummary, DataSetInstanceSummaryCollectionRepository>(
+    store,
+    emptyMap(),
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        DataSetInstanceSummaryCollectionRepository(
+            store,
+            s,
+        )
+    },
+) {
+    fun byDataSetUid(): StringFilterConnector<DataSetInstanceSummaryCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.DATASET_UID_ALIAS)
     }
 
-    public StringFilterConnector<DataSetInstanceSummaryCollectionRepository> byPeriod() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.PERIOD_ALIAS);
+    fun byPeriod(): StringFilterConnector<DataSetInstanceSummaryCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.PERIOD_ALIAS)
     }
 
-    public EnumFilterConnector<DataSetInstanceSummaryCollectionRepository, PeriodType> byPeriodType() {
-        return cf.enumC(DataSetInstanceSQLStatementBuilder.PERIOD_TYPE_ALIAS);
+    fun byPeriodType(): EnumFilterConnector<DataSetInstanceSummaryCollectionRepository, PeriodType> {
+        return cf.enumC(DataSetInstanceSQLStatementBuilder.PERIOD_TYPE_ALIAS)
     }
 
-    public DateFilterConnector<DataSetInstanceSummaryCollectionRepository> byPeriodStartDate() {
-        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_START_DATE_ALIAS);
+    fun byPeriodStartDate(): DateFilterConnector<DataSetInstanceSummaryCollectionRepository> {
+        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_START_DATE_ALIAS)
     }
 
-    public DateFilterConnector<DataSetInstanceSummaryCollectionRepository> byPeriodEndDate() {
-        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_END_DATE_ALIAS);
+    fun byPeriodEndDate(): DateFilterConnector<DataSetInstanceSummaryCollectionRepository> {
+        return cf.date(DataSetInstanceSQLStatementBuilder.PERIOD_END_DATE_ALIAS)
     }
 
-    public StringFilterConnector<DataSetInstanceSummaryCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.ORGANISATION_UNIT_UID_ALIAS);
+    fun byOrganisationUnitUid(): StringFilterConnector<DataSetInstanceSummaryCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.ORGANISATION_UNIT_UID_ALIAS)
     }
 
-    public StringFilterConnector<DataSetInstanceSummaryCollectionRepository> byAttributeOptionComboUid() {
-        return cf.string(DataSetInstanceSQLStatementBuilder.ATTRIBUTE_OPTION_COMBO_UID_ALIAS);
+    fun byAttributeOptionComboUid(): StringFilterConnector<DataSetInstanceSummaryCollectionRepository> {
+        return cf.string(DataSetInstanceSQLStatementBuilder.ATTRIBUTE_OPTION_COMBO_UID_ALIAS)
     }
 
-    public EnumFilterConnector<DataSetInstanceSummaryCollectionRepository, State> byState() {
-        return cf.enumC(DataSetInstanceSQLStatementBuilder.STATE_ALIAS);
+    fun byState(): EnumFilterConnector<DataSetInstanceSummaryCollectionRepository, State> {
+        return cf.enumC(DataSetInstanceSQLStatementBuilder.STATE_ALIAS)
     }
-
-}
\ No newline at end of file
+}

From 12a06b64b6c5ec1ec71a5fca1fef71e01fc84062 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:33:12 +0200
Subject: [PATCH 227/478] [ANDROSDK-1717] Refactor
 DataValueConflictCollectionRepository to kotlin

---
 .../DataValueConflictCollectionRepository.kt  | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
new file mode 100644
index 0000000000..d1207fd65a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.datavalue
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.dataValueConflictKey
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.operator
+import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
+import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStore
+import org.hisp.dhis.android.core.imports.ImportStatus
+import javax.inject.Inject
+
+@Reusable
+class DataValueConflictCollectionRepository @Inject internal constructor(
+    store: DataValueConflictStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<DataValueConflict>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<DataValueConflict, DataValueConflictCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        DataValueConflictCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+),
+    ReadOnlyCollectionRepository<DataValueConflict> {
+
+    fun byDataSet(dataSetUid: String): DataValueConflictCollectionRepository {
+        return cf.subQuery(dataValueConflictKey)
+            .rawSubQuery(
+                operator,
+                whereClause(dataSetUid),
+            )
+    }
+
+    fun byConflict(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.CONFLICT)
+    }
+
+    fun byValue(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.VALUE)
+    }
+
+    fun byAttributeOptionCombo(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.ATTRIBUTE_OPTION_COMBO)
+    }
+
+    fun byCategoryOptionCombo(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.CATEGORY_OPTION_COMBO)
+    }
+
+    fun byDataElement(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.DATA_ELEMENT)
+    }
+
+    fun byPeriod(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.PERIOD)
+    }
+
+    fun byOrganisationUnitUid(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.ORG_UNIT)
+    }
+
+    fun byErrorCode(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.ERROR_CODE)
+    }
+
+    fun byDisplayDescription(): StringFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.string(DataValueConflictTableInfo.Columns.DISPLAY_DESCRIPTION)
+    }
+
+    fun byStatus(): EnumFilterConnector<DataValueConflictCollectionRepository, ImportStatus> {
+        return cf.enumC(DataValueConflictTableInfo.Columns.STATUS)
+    }
+
+    fun byCreated(): DateFilterConnector<DataValueConflictCollectionRepository> {
+        return cf.date(DataValueConflictTableInfo.Columns.CREATED)
+    }
+}

From 59d79c4a564aea8dd84b45ad8d245a996052bde3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:38:54 +0200
Subject: [PATCH 228/478] [ANDROSDK-1717] Delete
 DataValueConflictCollectionRepository.java

---
 ...DataValueConflictCollectionRepository.java | 116 ------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java
deleted file mode 100644
index 96c30f67e2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.datavalue;
-
-import static org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo.Columns;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStore;
-import org.hisp.dhis.android.core.imports.ImportStatus;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class DataValueConflictCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<DataValueConflict, DataValueConflictCollectionRepository>
-        implements ReadOnlyCollectionRepository<DataValueConflict> {
-
-    ObjectStore<DataValueConflict> store;
-
-    @Inject
-    DataValueConflictCollectionRepository(final DataValueConflictStore store,
-                                          final Map<String, ChildrenAppender<DataValueConflict>> childrenAppenders,
-                                          final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new DataValueConflictCollectionRepository(store, childrenAppenders, s)));
-        this.store = store;
-    }
-
-    public DataValueConflictCollectionRepository byDataSet(String dataSetUid) {
-        return cf.subQuery(DataValueByDataSetQueryHelper.getDataValueConflictKey())
-                .rawSubQuery(DataValueByDataSetQueryHelper.getOperator(),
-                        DataValueByDataSetQueryHelper.whereClause(dataSetUid));
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byConflict() {
-        return cf.string(Columns.CONFLICT);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byValue() {
-        return cf.string(Columns.VALUE);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byAttributeOptionCombo() {
-        return cf.string(Columns.ATTRIBUTE_OPTION_COMBO);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byCategoryOptionCombo() {
-        return cf.string(Columns.CATEGORY_OPTION_COMBO);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byDataElement() {
-        return cf.string(Columns.DATA_ELEMENT);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byPeriod() {
-        return cf.string(Columns.PERIOD);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(Columns.ORG_UNIT);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byErrorCode() {
-        return cf.string(Columns.ERROR_CODE);
-    }
-
-    public StringFilterConnector<DataValueConflictCollectionRepository> byDisplayDescription() {
-        return cf.string(Columns.DISPLAY_DESCRIPTION);
-    }
-
-    public EnumFilterConnector<DataValueConflictCollectionRepository, ImportStatus> byStatus() {
-        return cf.enumC(Columns.STATUS);
-    }
-
-    public DateFilterConnector<DataValueConflictCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
-    }
-}

From a4f1f8b121b8ee3d918088549e40cb507e4f731a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 12:50:15 +0200
Subject: [PATCH 229/478] [ANDROSDK-1717] Collapse returns on
 TEIQueryCollectionRepository

---
 .../TrackedEntityInstanceQueryCollectionRepository.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 5bcb623bec..2f6e4fce42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -391,10 +391,10 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
      */
     fun byAssignedUserMode(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, AssignedUserMode> {
         return connectorFactory.eqConnector { mode: AssignedUserMode? ->
-            if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
-                return@eqConnector scope.toBuilder().assignedUserMode(mode).build()
+            return@eqConnector if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
+               scope.toBuilder().assignedUserMode(mode).build()
             } else {
-                return@eqConnector scope
+                scope
             }
         }
     }

From 79644d6618a9413f800b94c6b08041b8daa0f5d3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 31 Aug 2023 13:16:20 +0200
Subject: [PATCH 230/478] [ANDROSDK-1717] Correct TooManyFunctions

---
 .../android/core/dataelement/DataElementCollectionRepository.kt  | 1 +
 .../dhis/android/core/dataset/DataSetCollectionRepository.kt     | 1 +
 .../core/datavalue/DataValueConflictCollectionRepository.kt      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
index 2cbc3ad16f..8b3ade0e33 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
@@ -41,6 +41,7 @@ import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class DataElementCollectionRepository @Inject internal constructor(
     store: DataElementStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataElement>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
index 75667429c6..96bc3dae11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
@@ -45,6 +45,7 @@ import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class DataSetCollectionRepository @Inject internal constructor(
     store: DataSetStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataSet>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
index d1207fd65a..1b5ab6948f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
@@ -44,6 +44,7 @@ import org.hisp.dhis.android.core.imports.ImportStatus
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class DataValueConflictCollectionRepository @Inject internal constructor(
     store: DataValueConflictStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<DataValueConflict>>,

From 85362de6a4d365d915641569078a4b6b18c5bcf2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 08:57:11 +0200
Subject: [PATCH 231/478] [ANDROSDK-1717] Correct wrong identation

---
 .../search/TrackedEntityInstanceQueryCollectionRepository.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 2f6e4fce42..234c50f40a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -392,7 +392,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
     fun byAssignedUserMode(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, AssignedUserMode> {
         return connectorFactory.eqConnector { mode: AssignedUserMode? ->
             return@eqConnector if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
-               scope.toBuilder().assignedUserMode(mode).build()
+                scope.toBuilder().assignedUserMode(mode).build()
             } else {
                 scope
             }

From 981ec80d73a91d98e93ffc5a7caffc5512dbfe5e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 10:08:58 +0200
Subject: [PATCH 232/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ollectionRepository.java => EnrollmentCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/enrollment/{EnrollmentCollectionRepository.java => EnrollmentCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt

From 9587d912b347e3422b09d60b63fe51a473db393f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 10:08:58 +0200
Subject: [PATCH 233/478] [ANDROSDK-1717] Refactor
 EnrollmentCollectionRepository to kotlin

---
 ...eadWriteWithUidCollectionRepositoryImpl.kt |   2 +-
 .../EnrollmentCollectionRepository.kt         | 210 +++++++++---------
 2 files changed, 102 insertions(+), 110 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index 689795fb2b..6d661d6ea9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -42,7 +42,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
-internal abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadOnlyCollectionRepository<M>>(
+abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadOnlyCollectionRepository<M>>internal constructor(
     store: IdentifiableObjectStore<M>,
     childrenAppenders: Map<String, ChildrenAppender<M>>,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
index 3b3d7bbd46..a39df65907 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
@@ -25,169 +25,161 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.enrollment;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.DataColumns;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo.Columns;
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentFields;
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentProjectionTransformer;
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.enrollment
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withUidFilterItem
+import org.hisp.dhis.android.core.common.DataColumns
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentFields
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentProjectionTransformer
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
+import javax.inject.Inject
 
 @Reusable
-public final class EnrollmentCollectionRepository extends ReadWriteWithUidCollectionRepositoryImpl
-        <Enrollment, EnrollmentCreateProjection, EnrollmentCollectionRepository> {
-
-    private final EnrollmentStore store;
-    private final TrackerDataManager trackerDataManager;
-
-    @Inject
-    EnrollmentCollectionRepository(
-            final EnrollmentStore store,
-            final Map<String, ChildrenAppender<Enrollment>> childrenAppenders,
-            final RepositoryScope scope,
-            final EnrollmentProjectionTransformer transformer,
-            final TrackerDataManager trackerDataManager) {
-        super(store, childrenAppenders, scope, transformer, new FilterConnectorFactory<>(scope, s ->
-                new EnrollmentCollectionRepository(store, childrenAppenders, s, transformer, trackerDataManager)));
-        this.store = store;
-        this.trackerDataManager = trackerDataManager;
-    }
-
-    @Override
-    protected void propagateState(Enrollment enrollment, HandleAction action) {
-        trackerDataManager.propagateEnrollmentUpdate(enrollment, action);
+class EnrollmentCollectionRepository @Inject internal constructor(
+    private val enrollmentStore: EnrollmentStore,
+    childrenAppenders: Map<String, ChildrenAppender<Enrollment>>,
+    scope: RepositoryScope,
+    transformer: EnrollmentProjectionTransformer,
+    private val trackerDataManager: TrackerDataManager,
+) : ReadWriteWithUidCollectionRepositoryImpl<Enrollment, EnrollmentCreateProjection, EnrollmentCollectionRepository>(
+    enrollmentStore,
+    childrenAppenders,
+    scope,
+    transformer,
+    FilterConnectorFactory(scope) { s: RepositoryScope ->
+        EnrollmentCollectionRepository(
+            enrollmentStore,
+            childrenAppenders,
+            s,
+            transformer,
+            trackerDataManager,
+        )
+    },
+) {
+    override fun propagateState(m: Enrollment, action: HandleAction?) {
+        trackerDataManager.propagateEnrollmentUpdate(m, action!!)
     }
 
-    @NonNull
-    @Override
-    public EnrollmentObjectRepository uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new EnrollmentObjectRepository(store, uid, childrenAppenders, updatedScope, trackerDataManager);
+    override fun uid(uid: String?): EnrollmentObjectRepository {
+        val updatedScope = withUidFilterItem(scope, uid)
+        return EnrollmentObjectRepository(enrollmentStore, uid, childrenAppenders, updatedScope, trackerDataManager)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byUid() {
-        return cf.string(EnrollmentTableInfo.Columns.UID);
+    fun byUid(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.UID)
     }
 
-    public DateFilterConnector<EnrollmentCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
+    fun byCreated(): DateFilterConnector<EnrollmentCollectionRepository> {
+        return cf.date(EnrollmentTableInfo.Columns.CREATED)
     }
 
-    public DateFilterConnector<EnrollmentCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<EnrollmentCollectionRepository> {
+        return cf.date(EnrollmentTableInfo.Columns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byCreatedAtClient() {
-        return cf.string(Columns.CREATED_AT_CLIENT);
+    fun byCreatedAtClient(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.CREATED_AT_CLIENT)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byLastUpdatedAtClient() {
-        return cf.string(Columns.LAST_UPDATED_AT_CLIENT);
+    fun byLastUpdatedAtClient(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.LAST_UPDATED_AT_CLIENT)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byOrganisationUnit() {
-        return cf.string(Columns.ORGANISATION_UNIT);
+    fun byOrganisationUnit(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byProgram() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgram(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.PROGRAM)
     }
 
-    public DateFilterConnector<EnrollmentCollectionRepository> byEnrollmentDate() {
-        return cf.simpleDate(Columns.ENROLLMENT_DATE);
+    fun byEnrollmentDate(): DateFilterConnector<EnrollmentCollectionRepository> {
+        return cf.simpleDate(EnrollmentTableInfo.Columns.ENROLLMENT_DATE)
     }
 
-    public DateFilterConnector<EnrollmentCollectionRepository> byIncidentDate() {
-        return cf.simpleDate(Columns.INCIDENT_DATE);
+    fun byIncidentDate(): DateFilterConnector<EnrollmentCollectionRepository> {
+        return cf.simpleDate(EnrollmentTableInfo.Columns.INCIDENT_DATE)
     }
 
-    public BooleanFilterConnector<EnrollmentCollectionRepository> byFollowUp() {
-        return cf.bool(Columns.FOLLOW_UP);
+    fun byFollowUp(): BooleanFilterConnector<EnrollmentCollectionRepository> {
+        return cf.bool(EnrollmentTableInfo.Columns.FOLLOW_UP)
     }
 
-    public EnumFilterConnector<EnrollmentCollectionRepository, EnrollmentStatus> byStatus() {
-        return cf.enumC(Columns.STATUS);
+    fun byStatus(): EnumFilterConnector<EnrollmentCollectionRepository, EnrollmentStatus> {
+        return cf.enumC(EnrollmentTableInfo.Columns.STATUS)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byTrackedEntityInstance() {
-        return cf.string(Columns.TRACKED_ENTITY_INSTANCE);
+    fun byTrackedEntityInstance(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
     }
 
-    public EnumFilterConnector<EnrollmentCollectionRepository, FeatureType> byGeometryType() {
-        return cf.enumC(EnrollmentTableInfo.Columns.GEOMETRY_TYPE);
+    fun byGeometryType(): EnumFilterConnector<EnrollmentCollectionRepository, FeatureType> {
+        return cf.enumC(EnrollmentTableInfo.Columns.GEOMETRY_TYPE)
     }
 
-    public StringFilterConnector<EnrollmentCollectionRepository> byGeometryCoordinates() {
-        return cf.string(EnrollmentTableInfo.Columns.GEOMETRY_COORDINATES);
+    fun byGeometryCoordinates(): StringFilterConnector<EnrollmentCollectionRepository> {
+        return cf.string(EnrollmentTableInfo.Columns.GEOMETRY_COORDINATES)
     }
 
-    public EnumFilterConnector<EnrollmentCollectionRepository, State> byAggregatedSyncState() {
-        return cf.enumC(DataColumns.AGGREGATED_SYNC_STATE);
+    fun byAggregatedSyncState(): EnumFilterConnector<EnrollmentCollectionRepository, State> {
+        return cf.enumC(DataColumns.AGGREGATED_SYNC_STATE)
     }
 
     /**
-     * Use {@link #byAggregatedSyncState()} instead.
+     * Use [.byAggregatedSyncState] instead.
      */
-    @Deprecated
-    public EnumFilterConnector<EnrollmentCollectionRepository, State> byState() {
-        return byAggregatedSyncState();
+    @Deprecated("", ReplaceWith("byAggregatedSyncState()"))
+    fun byState(): EnumFilterConnector<EnrollmentCollectionRepository, State> {
+        return byAggregatedSyncState()
     }
 
-    public EnumFilterConnector<EnrollmentCollectionRepository, State> bySyncState() {
-        return cf.enumC(DataColumns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<EnrollmentCollectionRepository, State> {
+        return cf.enumC(DataColumns.SYNC_STATE)
     }
 
-    public BooleanFilterConnector<EnrollmentCollectionRepository> byDeleted() {
-        return cf.bool(EnrollmentTableInfo.Columns.DELETED);
+    fun byDeleted(): BooleanFilterConnector<EnrollmentCollectionRepository> {
+        return cf.bool(EnrollmentTableInfo.Columns.DELETED)
     }
 
-    public EnrollmentCollectionRepository orderByCreated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.CREATED, direction);
+    fun orderByCreated(direction: OrderByDirection?): EnrollmentCollectionRepository {
+        return cf.withOrderBy(EnrollmentTableInfo.Columns.CREATED, direction)
     }
 
-    public EnrollmentCollectionRepository orderByLastUpdated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.LAST_UPDATED, direction);
+    fun orderByLastUpdated(direction: OrderByDirection?): EnrollmentCollectionRepository {
+        return cf.withOrderBy(EnrollmentTableInfo.Columns.LAST_UPDATED, direction)
     }
 
-    public EnrollmentCollectionRepository orderByCreatedAtClient(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.CREATED_AT_CLIENT, direction);
+    fun orderByCreatedAtClient(direction: OrderByDirection?): EnrollmentCollectionRepository {
+        return cf.withOrderBy(EnrollmentTableInfo.Columns.CREATED_AT_CLIENT, direction)
     }
 
-    public EnrollmentCollectionRepository orderByLastUpdatedAtClient(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.LAST_UPDATED_AT_CLIENT, direction);
+    fun orderByLastUpdatedAtClient(direction: OrderByDirection?): EnrollmentCollectionRepository {
+        return cf.withOrderBy(EnrollmentTableInfo.Columns.LAST_UPDATED_AT_CLIENT, direction)
     }
 
-    public EnrollmentCollectionRepository orderByEnrollmentDate(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.ENROLLMENT_DATE, direction);
+    fun orderByEnrollmentDate(direction: OrderByDirection?): EnrollmentCollectionRepository {
+        return cf.withOrderBy(EnrollmentTableInfo.Columns.ENROLLMENT_DATE, direction)
     }
 
-    public EnrollmentCollectionRepository orderByIncidentDate(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.INCIDENT_DATE, direction);
+    fun orderByIncidentDate(direction: OrderByDirection?): EnrollmentCollectionRepository {
+        return cf.withOrderBy(EnrollmentTableInfo.Columns.INCIDENT_DATE, direction)
     }
 
-    public EnrollmentCollectionRepository withNotes() {
-        return cf.withChild(EnrollmentFields.NOTES);
+    fun withNotes(): EnrollmentCollectionRepository {
+        return cf.withChild(EnrollmentFields.NOTES)
     }
-}
\ No newline at end of file
+}

From 49214f03d496ef741e90b469df271869af990666 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:01:41 +0200
Subject: [PATCH 234/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ventCollectionRepository.java => EventCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/event/{EventCollectionRepository.java => EventCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt

From 73011c94e82b4e2729a3c326634dca9f7d2c44e8 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:01:42 +0200
Subject: [PATCH 235/478] [ANDROSDK-1717] Refactor EventCollectionRepository to
 kotlin

---
 ...ectionRepositoryMockIntegrationShould.java |  10 +
 .../ReadWriteWithUidCollectionRepository.kt   |   6 +-
 ...eadWriteWithUidCollectionRepositoryImpl.kt |   8 +-
 .../core/event/EventCollectionRepository.kt   | 395 +++++++++---------
 4 files changed, 211 insertions(+), 208 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java
index 9eb31d23fc..5fe4d20866 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java
@@ -237,6 +237,16 @@ public void filter_by_state() {
         assertThat(events.size()).isEqualTo(4);
     }
 
+    @Test
+    public void filter_by_aggregated_sync_state() {
+        List<Event> events =
+                d2.eventModule().events()
+                        .byAggregatedSyncState().eq(State.SYNCED)
+                        .blockingGet();
+
+        assertThat(events.size()).isEqualTo(4);
+    }
+
     @Test
     public void filter_by_attribute_option_combo() {
         List<Event> events =
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt
index d15838c7fb..28f1daae99 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadWriteWithUidCollectionRepository.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.maintenance.D2Error
 
-interface ReadWriteWithUidCollectionRepository<M, C> :
+interface ReadWriteWithUidCollectionRepository<M, O> :
     ReadOnlyWithUidCollectionRepository<M> where M : CoreObject, M : ObjectWithUidInterface {
     /**
      * Adds a new object to the given collection in an asynchronous way based on the provided CreateProjection.
@@ -42,7 +42,7 @@ interface ReadWriteWithUidCollectionRepository<M, C> :
      * @param c the CreateProjection of the object to add
      * @return the Single with the UID
      */
-    fun add(c: C): Single<String>
+    fun add(o: O): Single<String>
 
     /**
      * Adds a new object to the given collection in a synchronous way based on the provided CreateProjection.
@@ -54,5 +54,5 @@ interface ReadWriteWithUidCollectionRepository<M, C> :
      * @return the UID
      */
     @Throws(D2Error::class)
-    fun blockingAdd(c: C): String
+    fun blockingAdd(o: O): String
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index 6d661d6ea9..a35b964ba1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -63,8 +63,8 @@ abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadOnlyCollec
      * @param projection the CreateProjection of the object to add
      * @return the Single with the UID
      */
-    override fun add(projection: P): Single<String> {
-        return Single.fromCallable { blockingAdd(projection) }
+    override fun add(o: P): Single<String> {
+        return Single.fromCallable { blockingAdd(o) }
     }
 
     /**
@@ -78,8 +78,8 @@ abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadOnlyCollec
      */
     @Throws(D2Error::class)
     @Suppress("TooGenericExceptionCaught")
-    override fun blockingAdd(c: P): String {
-        val obj = transformer.transform(c)
+    override fun blockingAdd(o: P): String {
+        val obj = transformer.transform(o)
         return try {
             store.insert(obj)
             propagateState(obj, HandleAction.Insert)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index fe9cf74dc8..3543aeb410 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -25,293 +25,286 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event;
-
-import static org.hisp.dhis.android.core.event.EventTableInfo.Columns;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.ValueSubQueryFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo;
-import org.hisp.dhis.android.core.event.internal.EventFields;
-import org.hisp.dhis.android.core.event.internal.EventPostParentCall;
-import org.hisp.dhis.android.core.event.internal.EventProjectionTransformer;
-import org.hisp.dhis.android.core.event.internal.EventStore;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo;
-import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall;
-import org.hisp.dhis.android.core.user.internal.UserStore;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
-
-@SuppressWarnings("PMD.ExcessiveImports")
+package org.hisp.dhis.android.core.event
+
+import dagger.Reusable
+import io.reactivex.Observable
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ValueSubQueryFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withUidFilterItem
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
+import org.hisp.dhis.android.core.event.internal.EventFields
+import org.hisp.dhis.android.core.event.internal.EventPostParentCall
+import org.hisp.dhis.android.core.event.internal.EventProjectionTransformer
+import org.hisp.dhis.android.core.event.internal.EventStore
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
+import org.hisp.dhis.android.core.user.internal.UserStore
+import javax.inject.Inject
+
 @Reusable
-public final class EventCollectionRepository
-        extends ReadWriteWithUidCollectionRepositoryImpl<Event, EventCreateProjection, EventCollectionRepository>
-        implements ReadWriteWithUploadWithUidCollectionRepository<Event, EventCreateProjection> {
-
-    private final EventPostParentCall postCall;
-
-    private final EventStore store;
-    private final UserStore userStore;
-    private final TrackerDataManager trackerDataManager;
-    private final JobQueryCall jobQueryCall;
-
-    @Inject
-    EventCollectionRepository(final EventStore store,
-                              final UserStore userStore,
-                              final Map<String, ChildrenAppender<Event>> childrenAppenders,
-                              final RepositoryScope scope,
-                              final EventPostParentCall postCall,
-                              final EventProjectionTransformer transformer,
-                              final TrackerDataManager trackerDataManager,
-                              final JobQueryCall jobQueryCall) {
-        super(store, childrenAppenders, scope, transformer,
-                new FilterConnectorFactory<>(scope, s -> new EventCollectionRepository(store, userStore,
-                        childrenAppenders, s, postCall, transformer, trackerDataManager, jobQueryCall)));
-        this.store = store;
-        this.userStore = userStore;
-        this.postCall = postCall;
-        this.trackerDataManager = trackerDataManager;
-        this.jobQueryCall = jobQueryCall;
-    }
-
-    @Override
-    public Observable<D2Progress> upload() {
+class EventCollectionRepository @Inject internal constructor(
+    private val eventStore: EventStore,
+    private val userStore: UserStore,
+    childrenAppenders: Map<String, ChildrenAppender<Event>>,
+    scope: RepositoryScope,
+    private val postCall: EventPostParentCall,
+    transformer: EventProjectionTransformer,
+    private val trackerDataManager: TrackerDataManager,
+    private val jobQueryCall: JobQueryCall,
+) : ReadWriteWithUidCollectionRepositoryImpl<Event, EventCreateProjection, EventCollectionRepository>(
+    eventStore,
+    childrenAppenders,
+    scope,
+    transformer,
+    FilterConnectorFactory(scope) { s: RepositoryScope ->
+        EventCollectionRepository(
+            eventStore,
+            userStore,
+            childrenAppenders,
+            s,
+            postCall,
+            transformer,
+            trackerDataManager,
+            jobQueryCall,
+        )
+    },
+),
+    ReadWriteWithUploadWithUidCollectionRepository<Event, EventCreateProjection> {
+    override fun upload(): Observable<D2Progress> {
         return Observable.concat(
-                jobQueryCall.queryPendingJobs(),
-                Observable.fromCallable(() -> byAggregatedSyncState().in(State.uploadableStatesIncludingError())
-                        .byEnrollmentUid().isNull()
-                        .blockingGetWithoutChildren())
-                        .flatMap(postCall::uploadEvents)
-        );
+            jobQueryCall.queryPendingJobs(),
+            Observable.fromCallable {
+                byAggregatedSyncState().`in`(*uploadableStatesIncludingError())
+                    .byEnrollmentUid().isNull
+                    .blockingGetWithoutChildren()
+            }
+                .flatMap { events: List<Event> -> postCall.uploadEvents(events) },
+        )
     }
 
-    @Override
-    public void blockingUpload() {
-        upload().blockingSubscribe();
+    override fun blockingUpload() {
+        upload().blockingSubscribe()
     }
 
-    @Override
-    protected void propagateState(Event event, HandleAction action) {
-        trackerDataManager.propagateEventUpdate(event, action);
+    override fun propagateState(m: Event, action: HandleAction?) {
+        trackerDataManager.propagateEventUpdate(m, action!!)
     }
 
-    @Override
-    public EventObjectRepository uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new EventObjectRepository(store, userStore, uid, childrenAppenders, updatedScope, trackerDataManager);
+    override fun uid(uid: String?): EventObjectRepository {
+        val updatedScope = withUidFilterItem(scope, uid)
+        return EventObjectRepository(eventStore, userStore, uid, childrenAppenders, updatedScope, trackerDataManager)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byUid() {
-        return cf.string(Columns.UID);
+    fun byUid(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.UID)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byEnrollmentUid() {
-        return cf.string(Columns.ENROLLMENT);
+    fun byEnrollmentUid(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.ENROLLMENT)
     }
 
-    public DateFilterConnector<EventCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
+    fun byCreated(): DateFilterConnector<EventCollectionRepository> {
+        return cf.date(EventTableInfo.Columns.CREATED)
     }
 
-    public DateFilterConnector<EventCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<EventCollectionRepository> {
+        return cf.date(EventTableInfo.Columns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byCreatedAtClient() {
-        return cf.string(Columns.CREATED_AT_CLIENT);
+    fun byCreatedAtClient(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.CREATED_AT_CLIENT)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byLastUpdatedAtClient() {
-        return cf.string(Columns.LAST_UPDATED_AT_CLIENT);
+    fun byLastUpdatedAtClient(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.LAST_UPDATED_AT_CLIENT)
     }
 
-    public EnumFilterConnector<EventCollectionRepository, EventStatus> byStatus() {
-        return cf.enumC(Columns.STATUS);
+    fun byStatus(): EnumFilterConnector<EventCollectionRepository, EventStatus> {
+        return cf.enumC(EventTableInfo.Columns.STATUS)
     }
 
-    public EnumFilterConnector<EventCollectionRepository, FeatureType> byGeometryType() {
-        return cf.enumC(Columns.GEOMETRY_TYPE);
+    fun byGeometryType(): EnumFilterConnector<EventCollectionRepository, FeatureType> {
+        return cf.enumC(EventTableInfo.Columns.GEOMETRY_TYPE)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byGeometryCoordinates() {
-        return cf.string(Columns.GEOMETRY_COORDINATES);
+    fun byGeometryCoordinates(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.GEOMETRY_COORDINATES)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byProgramUid() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgramUid(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byProgramStageUid() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStageUid(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(Columns.ORGANISATION_UNIT);
+    fun byOrganisationUnitUid(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public DateFilterConnector<EventCollectionRepository> byEventDate() {
-        return cf.simpleDate(Columns.EVENT_DATE);
+    fun byEventDate(): DateFilterConnector<EventCollectionRepository> {
+        return cf.simpleDate(EventTableInfo.Columns.EVENT_DATE)
     }
 
-    public DateFilterConnector<EventCollectionRepository> byCompleteDate() {
-        return cf.simpleDate(Columns.COMPLETE_DATE);
+    fun byCompleteDate(): DateFilterConnector<EventCollectionRepository> {
+        return cf.simpleDate(EventTableInfo.Columns.COMPLETE_DATE)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byCompletedBy() {
-        return cf.string(Columns.COMPLETED_BY);
+    fun byCompletedBy(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.COMPLETED_BY)
     }
 
-    public DateFilterConnector<EventCollectionRepository> byDueDate() {
-        return cf.simpleDate(Columns.DUE_DATE);
+    fun byDueDate(): DateFilterConnector<EventCollectionRepository> {
+        return cf.simpleDate(EventTableInfo.Columns.DUE_DATE)
     }
 
     /**
-     * @deprecated Use {@link #bySyncState()} instead.
-     *
      * @return
      */
-    @Deprecated
-    public EnumFilterConnector<EventCollectionRepository, State> byState() {
-        return bySyncState();
+    @Deprecated("Use {@link #bySyncState()} instead.", ReplaceWith("bySyncState()"))
+    fun byState(): EnumFilterConnector<EventCollectionRepository, State> {
+        return bySyncState()
     }
 
-    public EnumFilterConnector<EventCollectionRepository, State> bySyncState() {
-        return cf.enumC(Columns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<EventCollectionRepository, State> {
+        return cf.enumC(EventTableInfo.Columns.SYNC_STATE)
     }
 
-    public EnumFilterConnector<EventCollectionRepository, State> byAggregatedSyncState() {
-        return cf.enumC(Columns.AGGREGATED_SYNC_STATE);
+    fun byAggregatedSyncState(): EnumFilterConnector<EventCollectionRepository, State> {
+        return cf.enumC(EventTableInfo.Columns.AGGREGATED_SYNC_STATE)
     }
 
-    public StringFilterConnector<EventCollectionRepository> byAttributeOptionComboUid() {
-        return cf.string(Columns.ATTRIBUTE_OPTION_COMBO);
+    fun byAttributeOptionComboUid(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.ATTRIBUTE_OPTION_COMBO)
     }
 
-    public BooleanFilterConnector<EventCollectionRepository> byDeleted() {
-        return cf.bool(Columns.DELETED);
+    fun byDeleted(): BooleanFilterConnector<EventCollectionRepository> {
+        return cf.bool(EventTableInfo.Columns.DELETED)
     }
 
-    public EventCollectionRepository byTrackedEntityInstanceUids(List<String> uids) {
-        return cf.subQuery(Columns.ENROLLMENT).inLinkTable(
-                EnrollmentTableInfo.TABLE_INFO.name(),
-                IdentifiableColumns.UID,
-                EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                uids
-        );
+    fun byTrackedEntityInstanceUids(uids: List<String>): EventCollectionRepository {
+        return cf.subQuery(EventTableInfo.Columns.ENROLLMENT).inLinkTable(
+            EnrollmentTableInfo.TABLE_INFO.name(),
+            IdentifiableColumns.UID,
+            EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
+            uids,
+        )
     }
 
-    public ValueSubQueryFilterConnector<EventCollectionRepository> byDataValue(String dataElementId) {
+    fun byDataValue(dataElementId: String): ValueSubQueryFilterConnector<EventCollectionRepository> {
         return cf.valueSubQuery(
-                IdentifiableColumns.UID,
-                TrackedEntityDataValueTableInfo.TABLE_INFO.name(),
-                TrackedEntityDataValueTableInfo.Columns.EVENT,
-                TrackedEntityDataValueTableInfo.Columns.VALUE,
-                TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT,
-                dataElementId);
+            IdentifiableColumns.UID,
+            TrackedEntityDataValueTableInfo.TABLE_INFO.name(),
+            TrackedEntityDataValueTableInfo.Columns.EVENT,
+            TrackedEntityDataValueTableInfo.Columns.VALUE,
+            TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT,
+            dataElementId,
+        )
     }
 
-    public EventCollectionRepository byFollowUp(Boolean followUp) {
-        return cf.subQuery(Columns.ENROLLMENT).inLinkTable(
-                EnrollmentTableInfo.TABLE_INFO.name(),
-                IdentifiableColumns.UID,
-                EnrollmentTableInfo.Columns.FOLLOW_UP,
-                Collections.singletonList(followUp ? "1" : "0")
-        );    }
+    fun byFollowUp(followUp: Boolean): EventCollectionRepository {
+        return cf.subQuery(EventTableInfo.Columns.ENROLLMENT).inLinkTable(
+            EnrollmentTableInfo.TABLE_INFO.name(),
+            IdentifiableColumns.UID,
+            EnrollmentTableInfo.Columns.FOLLOW_UP,
+            listOf(if (followUp) "1" else "0"),
+        )
+    }
 
-    public StringFilterConnector<EventCollectionRepository> byAssignedUser() {
-        return cf.string(Columns.ASSIGNED_USER);
+    fun byAssignedUser(): StringFilterConnector<EventCollectionRepository> {
+        return cf.string(EventTableInfo.Columns.ASSIGNED_USER)
     }
 
-    public EventCollectionRepository withTrackedEntityDataValues() {
-        return cf.withChild(EventFields.TRACKED_ENTITY_DATA_VALUES);
+    fun withTrackedEntityDataValues(): EventCollectionRepository {
+        return cf.withChild(EventFields.TRACKED_ENTITY_DATA_VALUES)
     }
 
-    public EventCollectionRepository withNotes() {
-        return cf.withChild(EventFields.NOTES);
+    fun withNotes(): EventCollectionRepository {
+        return cf.withChild(EventFields.NOTES)
     }
 
-    public EventCollectionRepository orderByEventDate(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.EVENT_DATE, direction);
+    fun orderByEventDate(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.EVENT_DATE, direction)
     }
 
-    public EventCollectionRepository orderByDueDate(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.DUE_DATE, direction);
+    fun orderByDueDate(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.DUE_DATE, direction)
     }
 
-    public EventCollectionRepository orderByCompleteDate(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.COMPLETE_DATE, direction);
+    fun orderByCompleteDate(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.COMPLETE_DATE, direction)
     }
 
-    public EventCollectionRepository orderByCreated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.CREATED, direction);
+    fun orderByCreated(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.CREATED, direction)
     }
 
-    public EventCollectionRepository orderByLastUpdated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.LAST_UPDATED, direction);
+    fun orderByLastUpdated(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.LAST_UPDATED, direction)
     }
 
-    public EventCollectionRepository orderByCreatedAtClient(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.CREATED_AT_CLIENT, direction);
+    fun orderByCreatedAtClient(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.CREATED_AT_CLIENT, direction)
     }
 
-    public EventCollectionRepository orderByLastUpdatedAtClient(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.LAST_UPDATED_AT_CLIENT, direction);
+    fun orderByLastUpdatedAtClient(direction: OrderByDirection?): EventCollectionRepository {
+        return cf.withOrderBy(EventTableInfo.Columns.LAST_UPDATED_AT_CLIENT, direction)
     }
 
-    public EventCollectionRepository orderByOrganisationUnitName(RepositoryScope.OrderByDirection direction) {
+    fun orderByOrganisationUnitName(direction: OrderByDirection?): EventCollectionRepository {
         return cf.withExternalOrderBy(
-                OrganisationUnitTableInfo.TABLE_INFO.name(),
-                IdentifiableColumns.NAME,
-                IdentifiableColumns.UID,
-                Columns.ORGANISATION_UNIT,
-                direction);
+            OrganisationUnitTableInfo.TABLE_INFO.name(),
+            IdentifiableColumns.NAME,
+            IdentifiableColumns.UID,
+            EventTableInfo.Columns.ORGANISATION_UNIT,
+            direction!!,
+        )
     }
 
-    public EventCollectionRepository orderByTimeline(RepositoryScope.OrderByDirection direction) {
+    fun orderByTimeline(direction: OrderByDirection?): EventCollectionRepository {
         return cf.withConditionalOrderBy(
-                Columns.STATUS,
-                String.format("IN ('%s', '%s', '%s')", EventStatus.ACTIVE, EventStatus.COMPLETED, EventStatus.VISITED),
-                Columns.EVENT_DATE,
-                Columns.DUE_DATE,
-                direction
-        );
-    }
-
-    public EventCollectionRepository orderByDataElement(RepositoryScope.OrderByDirection direction,
-                                                        String dataElement) {
+            EventTableInfo.Columns.STATUS,
+            String.format("IN ('%s', '%s', '%s')", EventStatus.ACTIVE, EventStatus.COMPLETED, EventStatus.VISITED),
+            EventTableInfo.Columns.EVENT_DATE,
+            EventTableInfo.Columns.DUE_DATE,
+            direction,
+        )
+    }
+
+    fun orderByDataElement(
+        direction: OrderByDirection,
+        dataElement: String,
+    ): EventCollectionRepository {
         return cf.withExternalOrderBy(
-                TrackedEntityDataValueTableInfo.TABLE_INFO.name(),
-                TrackedEntityDataValueTableInfo.Columns.VALUE,
-                TrackedEntityDataValueTableInfo.Columns.EVENT,
-                Columns.UID,
-                direction,
-                TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT + " = '" + dataElement + "'");
+            TrackedEntityDataValueTableInfo.TABLE_INFO.name(),
+            TrackedEntityDataValueTableInfo.Columns.VALUE,
+            TrackedEntityDataValueTableInfo.Columns.EVENT,
+            EventTableInfo.Columns.UID,
+            direction,
+            TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT + " = '" + dataElement + "'",
+        )
     }
 
-    public int countTrackedEntityInstances() {
-        return store.countTeisWhereEvents(getWhereClause());
+    fun countTrackedEntityInstances(): Int {
+        return eventStore.countTeisWhereEvents(whereClause)
     }
-}
\ No newline at end of file
+}

From 91035585931c88bd2548de2678b5fcf14e092e0a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:19:51 +0200
Subject: [PATCH 236/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...llectionRepository.java => EventFilterCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/event/{EventFilterCollectionRepository.java => EventFilterCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt

From c27bf1c438f5e8e1771751eede303954f74ea5fd Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:19:51 +0200
Subject: [PATCH 237/478] [ANDROSDK-1717] Refactor
 EventFilterCollectionRepository to kotlin

---
 .../core/event/EventCollectionRepository.kt   |   3 +
 .../event/EventFilterCollectionRepository.kt  | 133 +++++++++---------
 2 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index 3543aeb410..4b5890472d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -60,6 +60,7 @@ import org.hisp.dhis.android.core.user.internal.UserStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class EventCollectionRepository @Inject internal constructor(
     private val eventStore: EventStore,
     private val userStore: UserStore,
@@ -88,6 +89,8 @@ class EventCollectionRepository @Inject internal constructor(
     },
 ),
     ReadWriteWithUploadWithUidCollectionRepository<Event, EventCreateProjection> {
+
+    @Suppress("SpreadOperator")
     override fun upload(): Observable<D2Progress> {
         return Observable.concat(
             jobQueryCall.queryPendingJobs(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
index 12835898f3..3ba3d572c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
@@ -25,102 +25,103 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.event;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.AssignedUserMode;
-import org.hisp.dhis.android.core.event.EventFilterTableInfo.Columns;
-import org.hisp.dhis.android.core.event.internal.EventFilterStore;
-import org.hisp.dhis.android.core.event.internal.EventQueryCriteriaFields;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.event
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.event.internal.EventFilterStore
+import org.hisp.dhis.android.core.event.internal.EventQueryCriteriaFields
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import javax.inject.Inject
 
 @Reusable
-public final class EventFilterCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<EventFilter, EventFilterCollectionRepository> {
-
-    @Inject
-    EventFilterCollectionRepository(
-            final EventFilterStore store,
-            final Map<String, ChildrenAppender<EventFilter>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new EventFilterCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<EventFilterCollectionRepository> byProgram() {
-        return cf.string(Columns.PROGRAM);
+@Suppress("TooManyFunctions")
+class EventFilterCollectionRepository @Inject internal constructor(
+    store: EventFilterStore,
+    childrenAppenders: Map<String, ChildrenAppender<EventFilter>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<EventFilter, EventFilterCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        EventFilterCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byProgram(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byProgramStage() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStage(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byDescription() {
-        return cf.string(Columns.DESCRIPTION);
+    fun byDescription(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.DESCRIPTION)
     }
 
-    public BooleanFilterConnector<EventFilterCollectionRepository> byFollowUp() {
-        return cf.bool(Columns.FOLLOW_UP);
+    fun byFollowUp(): BooleanFilterConnector<EventFilterCollectionRepository> {
+        return cf.bool(EventFilterTableInfo.Columns.FOLLOW_UP)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byOrganisationUnit() {
-        return cf.string(Columns.ORGANISATION_UNIT);
+    fun byOrganisationUnit(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public EnumFilterConnector<EventFilterCollectionRepository, OrganisationUnitMode> byOuMode() {
-        return cf.enumC(Columns.OU_MODE);
+    fun byOuMode(): EnumFilterConnector<EventFilterCollectionRepository, OrganisationUnitMode> {
+        return cf.enumC(EventFilterTableInfo.Columns.OU_MODE)
     }
 
-    public EnumFilterConnector<EventFilterCollectionRepository, AssignedUserMode> byAssignedUserMode() {
-        return cf.enumC(Columns.ASSIGNED_USER_MODE);
+    fun byAssignedUserMode(): EnumFilterConnector<EventFilterCollectionRepository, AssignedUserMode> {
+        return cf.enumC(EventFilterTableInfo.Columns.ASSIGNED_USER_MODE)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byOrder() {
-        return cf.string(Columns.ORDER);
+    fun byOrder(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.ORDER)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byDisplayColumnOrder() {
-        return cf.string(Columns.DISPLAY_COLUMN_ORDER);
+    fun byDisplayColumnOrder(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.DISPLAY_COLUMN_ORDER)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byEvents() {
-        return cf.string(Columns.EVENTS);
+    fun byEvents(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.EVENTS)
     }
 
-    public EnumFilterConnector<EventFilterCollectionRepository, EventStatus> byEventStatus() {
-        return cf.enumC(Columns.EVENT_STATUS);
+    fun byEventStatus(): EnumFilterConnector<EventFilterCollectionRepository, EventStatus> {
+        return cf.enumC(EventFilterTableInfo.Columns.EVENT_STATUS)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byEventDate() {
-        return cf.string(Columns.EVENT_DATE);
+    fun byEventDate(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.EVENT_DATE)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byDueDate() {
-        return cf.string(Columns.DUE_DATE);
+    fun byDueDate(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.DUE_DATE)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byLastUpdatedDate() {
-        return cf.string(Columns.LAST_UPDATED_DATE);
+    fun byLastUpdatedDate(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.LAST_UPDATED_DATE)
     }
 
-    public StringFilterConnector<EventFilterCollectionRepository> byCompletedDate() {
-        return cf.string(Columns.COMPLETED_DATE);
+    fun byCompletedDate(): StringFilterConnector<EventFilterCollectionRepository> {
+        return cf.string(EventFilterTableInfo.Columns.COMPLETED_DATE)
     }
 
-    public EventFilterCollectionRepository withEventDataFilters() {
-        return cf.withChild(EventQueryCriteriaFields.DATA_FILTERS);
+    fun withEventDataFilters(): EventFilterCollectionRepository {
+        return cf.withChild(EventQueryCriteriaFields.DATA_FILTERS)
     }
-}
\ No newline at end of file
+}

From f804677c0c7b6e174188d651c4089f0c8f65c1e1 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:20:14 +0200
Subject: [PATCH 238/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...Repository.java => ForeignKeyViolationCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/{ForeignKeyViolationCollectionRepository.java => ForeignKeyViolationCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt

From ded99e180ab17f6ef74152286902b3e4fe24965f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:20:15 +0200
Subject: [PATCH 239/478] [ANDROSDK-1717] Refactor
 ForeignKeyViolationCollectionRepository to kotlin

---
 ...ForeignKeyViolationCollectionRepository.kt | 86 ++++++++++---------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
index e6187b1a20..4d7af0227f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
@@ -25,64 +25,66 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.maintenance
 
-package org.hisp.dhis.android.core.maintenance;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyViolationStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyViolationStore
+import javax.inject.Inject
 
 @Reusable
-public final class ForeignKeyViolationCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<ForeignKeyViolation, ForeignKeyViolationCollectionRepository> {
-
-    @Inject
-    ForeignKeyViolationCollectionRepository(final ForeignKeyViolationStore store,
-                                            final Map<String, ChildrenAppender<ForeignKeyViolation>> childrenAppenders,
-                                            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ForeignKeyViolationCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byFromTable() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_TABLE);
+class ForeignKeyViolationCollectionRepository @Inject internal constructor(
+    store: ForeignKeyViolationStore,
+    childrenAppenders: Map<String, ChildrenAppender<ForeignKeyViolation>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<ForeignKeyViolation, ForeignKeyViolationCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ForeignKeyViolationCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byFromTable(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_TABLE)
     }
 
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byFromColumn() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_COLUMN);
+    fun byFromColumn(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_COLUMN)
     }
 
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byToTable() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.TO_TABLE);
+    fun byToTable(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.TO_TABLE)
     }
 
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byToColumn() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.TO_COLUMN);
+    fun byToColumn(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.TO_COLUMN)
     }
 
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byNotFoundValue() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.NOT_FOUND_VALUE);
+    fun byNotFoundValue(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.NOT_FOUND_VALUE)
     }
 
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byFromObjectUid() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_OBJECT_UID);
+    fun byFromObjectUid(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_OBJECT_UID)
     }
 
-    public StringFilterConnector<ForeignKeyViolationCollectionRepository> byFromObjectRow() {
-        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_OBJECT_ROW);
+    fun byFromObjectRow(): StringFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.string(ForeignKeyViolationTableInfo.Columns.FROM_OBJECT_ROW)
     }
 
-    public DateFilterConnector<ForeignKeyViolationCollectionRepository> byCreated() {
-        return cf.date(ForeignKeyViolationTableInfo.Columns.CREATED);
+    fun byCreated(): DateFilterConnector<ForeignKeyViolationCollectionRepository> {
+        return cf.date(ForeignKeyViolationTableInfo.Columns.CREATED)
     }
 }

From 1e079b69eeaa168b732a8fa0d5399db981a9914a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:20:30 +0200
Subject: [PATCH 240/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ectionRepository.java => IndicatorTypeCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/{IndicatorTypeCollectionRepository.java => IndicatorTypeCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt

From cdd70e7c3b78484c0c699623228506de20a0aeee Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:20:30 +0200
Subject: [PATCH 241/478] [ANDROSDK-1717] Refactor
 IndicatorTypeCollectionRepository to kotlin

---
 .../IndicatorTypeCollectionRepository.kt      | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
index 407f078811..f20d61c729 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
@@ -25,40 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator;
+package org.hisp.dhis.android.core.indicator
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.Columns;
-import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
+import javax.inject.Inject
 
 @Reusable
-public final class IndicatorTypeCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<IndicatorType, IndicatorTypeCollectionRepository> {
-
-    @Inject
-    IndicatorTypeCollectionRepository(final IndicatorTypeStore store,
-                                      final Map<String, ChildrenAppender<IndicatorType>> childrenAppenders,
-                                      final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new IndicatorTypeCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public BooleanFilterConnector<IndicatorTypeCollectionRepository> byNumber() {
-        return cf.bool(Columns.NUMBER);
+class IndicatorTypeCollectionRepository @Inject internal constructor(
+    store: IndicatorTypeStore,
+    childrenAppenders: Map<String, ChildrenAppender<IndicatorType>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<IndicatorType, IndicatorTypeCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        IndicatorTypeCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byNumber(): BooleanFilterConnector<IndicatorTypeCollectionRepository> {
+        return cf.bool(IndicatorTypeTableInfo.Columns.NUMBER)
     }
 
-    public IntegerFilterConnector<IndicatorTypeCollectionRepository> byFactor() {
-        return cf.integer(Columns.FACTOR);
+    fun byFactor(): IntegerFilterConnector<IndicatorTypeCollectionRepository> {
+        return cf.integer(IndicatorTypeTableInfo.Columns.FACTOR)
     }
 }

From 76c9eb348ca39dd561d569a55df280cfbc746ef3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:21:08 +0200
Subject: [PATCH 242/478] [ANDROSDK-1717] Supress to many functions in
 EnrollmentCollectionRepository

---
 .../android/core/enrollment/EnrollmentCollectionRepository.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
index a39df65907..b1f5239ba4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
@@ -49,6 +49,7 @@ import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class EnrollmentCollectionRepository @Inject internal constructor(
     private val enrollmentStore: EnrollmentStore,
     childrenAppenders: Map<String, ChildrenAppender<Enrollment>>,

From cfe79fcd62f16f5ab4262304a396bba714058b0e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:33:10 +0200
Subject: [PATCH 243/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...lectionRepository.java => FileResourceCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/fileresource/{FileResourceCollectionRepository.java => FileResourceCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt

From 382bfb074b4f86ddd7a133db0f91cdcd0b1eb43e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 11:33:10 +0200
Subject: [PATCH 244/478] [ANDROSDK-1717] Refactor
 FileResourceCollectionRepository to kotlin

---
 .../FileResourceCollectionRepository.kt       | 219 +++++++++---------
 1 file changed, 105 insertions(+), 114 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
index 61076bd5da..726a240da5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
@@ -25,155 +25,146 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.fileresource;
-
-import static org.hisp.dhis.android.core.fileresource.FileResourceTableInfo.Columns;
-
-import android.content.Context;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.LongFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
-import org.hisp.dhis.android.core.fileresource.internal.FileResourceProjectionTransformer;
-import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore;
-import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-
-import java.io.File;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.fileresource
+
+import android.content.Context
+import dagger.Reusable
+import io.reactivex.Observable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.LongFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withUidFilterItem
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceProjectionTransformer
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.saveFile
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import java.io.File
+import javax.inject.Inject
 
 @Reusable
-public final class FileResourceCollectionRepository
-        extends ReadWriteWithUidCollectionRepositoryImpl<FileResource, File, FileResourceCollectionRepository>
-        implements ReadWriteWithUidCollectionRepository<FileResource, File> {
-
-    private final IdentifiableDataObjectStore<FileResource> store;
-    private final Context context;
-
-    @Inject
-    FileResourceCollectionRepository(final FileResourceStore store,
-                                     final Map<String, ChildrenAppender<FileResource>> childrenAppenders,
-                                     final RepositoryScope scope,
-                                     final FileResourceProjectionTransformer transformer,
-                                     final DataStatePropagator dataStatePropagator,
-                                     final Context context) {
-        super(store, childrenAppenders, scope, transformer,
-                new FilterConnectorFactory<>(scope, s -> new FileResourceCollectionRepository(
-                        store, childrenAppenders, s, transformer, dataStatePropagator, context)));
-        this.store = store;
-        this.context = context;
-    }
+@Suppress("TooManyFunctions")
+class FileResourceCollectionRepository @Inject internal constructor(
+    private val fileResourceStore: FileResourceStore,
+    childrenAppenders: Map<String, ChildrenAppender<FileResource>>,
+    scope: RepositoryScope,
+    transformer: FileResourceProjectionTransformer,
+    dataStatePropagator: DataStatePropagator,
+    private val context: Context,
+) : ReadWriteWithUidCollectionRepositoryImpl<FileResource, File, FileResourceCollectionRepository>(
+    fileResourceStore,
+    childrenAppenders,
+    scope,
+    transformer,
+    FilterConnectorFactory(scope) { s: RepositoryScope ->
+        FileResourceCollectionRepository(
+            fileResourceStore,
+            childrenAppenders,
+            s,
+            transformer,
+            dataStatePropagator,
+            context,
+        )
+    },
+),
+    ReadWriteWithUidCollectionRepository<FileResource, File> {
 
     /**
-     * @deprecated FileResources are automatically uploaded when the parent object is uploaded. There is no need to
-     * manually upload the fileResources. Actually, it is risky to upload the fileResources independently: if the
-     * parent objects are not uploaded within two hours, the server will remove the orphan fileResources.
      * @return Progress
      */
-    @Deprecated
-    public Observable<D2Progress> upload() {
-        return Observable.empty();
+    @Deprecated(
+        """FileResources are automatically uploaded when the parent object is uploaded. There is no need to
+      manually upload the fileResources. Actually, it is risky to upload the fileResources independently: if the
+      parent objects are not uploaded within two hours, the server will remove the orphan fileResources.
+      """,
+    )
+    fun upload(): Observable<D2Progress> {
+        return Observable.empty()
     }
 
-    /**
-     * @deprecated Check {@link #upload()}.
-     */
-    @Deprecated
-    public void blockingUpload() {
-        upload().blockingSubscribe();
+    @Deprecated("Check {@link #upload()}.")
+    fun blockingUpload() {
+        upload().blockingSubscribe()
     }
 
-    @Override
-    public Single<String> add(File file) {
-        return Single.fromCallable(() -> blockingAdd(file));
+    override fun add(o: File): Single<String> {
+        return Single.fromCallable { blockingAdd(o) }
     }
 
-    @SuppressWarnings({"PMD.PreserveStackTrace"})
-    @Override
-    public String blockingAdd(File file) throws D2Error {
-        try {
-            String generatedUid = new UidGeneratorImpl().generate();
-            File dstFile = FileResourceUtil.saveFile(file, generatedUid, context);
-            FileResource fileResource = transformer.transform(dstFile).toBuilder().uid(generatedUid).build();
-            store.insert(fileResource);
-            return fileResource.uid();
-        } catch (Exception e) {
+    @Throws(D2Error::class)
+    @Suppress("TooGenericExceptionCaught")
+    override fun blockingAdd(o: File): String {
+        return try {
+            val generatedUid = UidGeneratorImpl().generate()
+            val dstFile = saveFile(o, generatedUid, context)
+            val fileResource = transformer.transform(dstFile).toBuilder().uid(generatedUid).build()
+            store.insert(fileResource)
+            fileResource.uid()!!
+        } catch (e: Exception) {
             throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.UNEXPECTED)
-                    .errorDescription("Unexpected exception adding file")
-                    .originalException(e)
-                    .build();
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.UNEXPECTED)
+                .errorDescription("Unexpected exception adding file")
+                .originalException(e)
+                .build()
         }
     }
 
-    @Override
-    public FileResourceObjectRepository uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new FileResourceObjectRepository(store, uid, childrenAppenders, updatedScope);
+    override fun uid(uid: String?): FileResourceObjectRepository {
+        val updatedScope = withUidFilterItem(scope, uid)
+        return FileResourceObjectRepository(fileResourceStore, uid, childrenAppenders, updatedScope)
     }
 
-    public StringFilterConnector<FileResourceCollectionRepository> byUid() {
-        return cf.string(Columns.UID);
+    fun byUid(): StringFilterConnector<FileResourceCollectionRepository> {
+        return cf.string(FileResourceTableInfo.Columns.UID)
     }
 
-    public StringFilterConnector<FileResourceCollectionRepository> byName() {
-        return cf.string(Columns.NAME);
+    fun byName(): StringFilterConnector<FileResourceCollectionRepository> {
+        return cf.string(FileResourceTableInfo.Columns.NAME)
     }
 
-    public DateFilterConnector<FileResourceCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<FileResourceCollectionRepository> {
+        return cf.date(FileResourceTableInfo.Columns.LAST_UPDATED)
     }
 
-    public EnumFilterConnector<FileResourceCollectionRepository, FileResourceDomain> byDomain() {
-        return cf.enumC(Columns.DOMAIN);
+    fun byDomain(): EnumFilterConnector<FileResourceCollectionRepository, FileResourceDomain> {
+        return cf.enumC(FileResourceTableInfo.Columns.DOMAIN)
     }
 
-    public StringFilterConnector<FileResourceCollectionRepository> byContentType() {
-        return cf.string(Columns.CONTENT_TYPE);
+    fun byContentType(): StringFilterConnector<FileResourceCollectionRepository> {
+        return cf.string(FileResourceTableInfo.Columns.CONTENT_TYPE)
     }
 
-    public LongFilterConnector<FileResourceCollectionRepository> byContentLength() {
-        return cf.longC(Columns.CONTENT_LENGTH);
+    fun byContentLength(): LongFilterConnector<FileResourceCollectionRepository> {
+        return cf.longC(FileResourceTableInfo.Columns.CONTENT_LENGTH)
     }
 
-    public StringFilterConnector<FileResourceCollectionRepository> byPath() {
-        return cf.string(Columns.PATH);
+    fun byPath(): StringFilterConnector<FileResourceCollectionRepository> {
+        return cf.string(FileResourceTableInfo.Columns.PATH)
     }
 
     /**
-     * @deprecated Use {@link #bySyncState()} instead.
-     *
      * @return
      */
-    @Deprecated
-    public EnumFilterConnector<FileResourceCollectionRepository, State> byState() {
-        return bySyncState();
+    @Deprecated("Use {@link #bySyncState()} instead.", ReplaceWith("bySyncState()"))
+    fun byState(): EnumFilterConnector<FileResourceCollectionRepository, State> {
+        return bySyncState()
     }
 
-    public EnumFilterConnector<FileResourceCollectionRepository, State> bySyncState() {
-        return cf.enumC(Columns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<FileResourceCollectionRepository, State> {
+        return cf.enumC(FileResourceTableInfo.Columns.SYNC_STATE)
     }
-}
\ No newline at end of file
+}

From 3c13abf3131d4c318562c19dfabc369b1525191e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 1 Sep 2023 12:06:18 +0200
Subject: [PATCH 245/478] [ANDROSDK-1717] Refactor to mutable maps

---
 .../android/core/enrollment/EnrollmentCollectionRepository.kt   | 2 +-
 .../hisp/dhis/android/core/event/EventCollectionRepository.kt   | 2 +-
 .../dhis/android/core/event/EventFilterCollectionRepository.kt  | 2 +-
 .../core/fileresource/FileResourceCollectionRepository.kt       | 2 +-
 .../android/core/indicator/IndicatorTypeCollectionRepository.kt | 2 +-
 .../core/maintenance/ForeignKeyViolationCollectionRepository.kt | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
index b1f5239ba4..80c260e3cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
@@ -52,7 +52,7 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class EnrollmentCollectionRepository @Inject internal constructor(
     private val enrollmentStore: EnrollmentStore,
-    childrenAppenders: Map<String, ChildrenAppender<Enrollment>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Enrollment>>,
     scope: RepositoryScope,
     transformer: EnrollmentProjectionTransformer,
     private val trackerDataManager: TrackerDataManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index 4b5890472d..69f5e3ddfc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -64,7 +64,7 @@ import javax.inject.Inject
 class EventCollectionRepository @Inject internal constructor(
     private val eventStore: EventStore,
     private val userStore: UserStore,
-    childrenAppenders: Map<String, ChildrenAppender<Event>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Event>>,
     scope: RepositoryScope,
     private val postCall: EventPostParentCall,
     transformer: EventProjectionTransformer,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
index 3ba3d572c9..0571faf5f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
@@ -45,7 +45,7 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class EventFilterCollectionRepository @Inject internal constructor(
     store: EventFilterStore,
-    childrenAppenders: Map<String, ChildrenAppender<EventFilter>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<EventFilter>>,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<EventFilter, EventFilterCollectionRepository>(
     store,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
index 726a240da5..c43ff1a30d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
@@ -58,7 +58,7 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class FileResourceCollectionRepository @Inject internal constructor(
     private val fileResourceStore: FileResourceStore,
-    childrenAppenders: Map<String, ChildrenAppender<FileResource>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<FileResource>>,
     scope: RepositoryScope,
     transformer: FileResourceProjectionTransformer,
     dataStatePropagator: DataStatePropagator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
index f20d61c729..509fa84bbb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
@@ -40,7 +40,7 @@ import javax.inject.Inject
 @Reusable
 class IndicatorTypeCollectionRepository @Inject internal constructor(
     store: IndicatorTypeStore,
-    childrenAppenders: Map<String, ChildrenAppender<IndicatorType>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<IndicatorType>>,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<IndicatorType, IndicatorTypeCollectionRepository>(
     store,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
index 4d7af0227f..77f79035e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
@@ -40,7 +40,7 @@ import javax.inject.Inject
 @Reusable
 class ForeignKeyViolationCollectionRepository @Inject internal constructor(
     store: ForeignKeyViolationStore,
-    childrenAppenders: Map<String, ChildrenAppender<ForeignKeyViolation>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ForeignKeyViolation>>,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<ForeignKeyViolation, ForeignKeyViolationCollectionRepository>(
     store,

From 894745c6e15fa6e85954a9218b03dfc050d1ee77 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 4 Sep 2023 10:09:59 +0200
Subject: [PATCH 246/478] [ANDROSDK-1717] Make dataElement nullable

---
 .../hisp/dhis/android/core/event/EventCollectionRepository.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index 69f5e3ddfc..0119546e26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -295,7 +295,7 @@ class EventCollectionRepository @Inject internal constructor(
 
     fun orderByDataElement(
         direction: OrderByDirection,
-        dataElement: String,
+        dataElement: String?,
     ): EventCollectionRepository {
         return cf.withExternalOrderBy(
             TrackedEntityDataValueTableInfo.TABLE_INFO.name(),

From ab1182fa1f55d2aff14698a0a0dd445870b4a985 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 5 Sep 2023 09:15:47 +0200
Subject: [PATCH 247/478] [ANDROSDK-1725] feature: - Add "description" and
 "displayDescription" to ProgramStageSection

---
 ...ectionRepositoryMockIntegrationShould.java | 21 +++++++++++++++++++
 core/src/main/assets/migrations/150.sql       |  4 ++++
 core/src/main/assets/snapshots/snapshot.sql   |  2 +-
 .../access/internal/BaseDatabaseOpenHelper.kt |  2 +-
 .../core/program/ProgramStageSection.java     | 12 +++++++++++
 .../program/ProgramStageSectionTableInfo.java |  6 +++++-
 ...gramStageSectionsCollectionRepository.java |  9 ++++++++
 .../internal/ProgramStageSectionFields.java   |  4 +++-
 .../program/program_stage_section.json        |  4 +++-
 9 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 core/src/main/assets/migrations/150.sql

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java
index 6bc4fac82d..8702b9185e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java
@@ -115,4 +115,25 @@ public void filter_by_mobile_render_type() {
         assertThat(stageSections.size()).isEqualTo(1);
     }
 
+    @Test
+    public void filter_by_description() {
+        List<ProgramStageSection> stageSections =
+                d2.programModule().programStageSections()
+                        .byDescription()
+                        .eq("description")
+                        .blockingGet();
+
+        assertThat(stageSections.size()).isEqualTo(1);
+    }
+
+    @Test
+    public void filter_by_display_description() {
+        List<ProgramStageSection> stageSections =
+                d2.programModule().programStageSections()
+                        .byDisplayDescription()
+                        .eq("display")
+                        .blockingGet();
+
+        assertThat(stageSections.size()).isEqualTo(1);
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/assets/migrations/150.sql b/core/src/main/assets/migrations/150.sql
new file mode 100644
index 0000000000..5ad4d6c699
--- /dev/null
+++ b/core/src/main/assets/migrations/150.sql
@@ -0,0 +1,4 @@
+# Add description and displayDescription properties in ProgramStageSection table (ANDROSDK-1725)
+
+ALTER TABLE ProgramStageSection ADD COLUMN description TEXT;
+ALTER TABLE ProgramStageSection ADD COLUMN displayDescription TEXT;
\ No newline at end of file
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index d211884d76..31a359c128 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -5,7 +5,7 @@ CREATE TABLE OptionSet (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL
 CREATE TABLE Option (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, optionSet TEXT NOT NULL, sortOrder INTEGER, color TEXT, icon TEXT, FOREIGN KEY (optionSet) REFERENCES OptionSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE INDEX optionset_optioncode ON Option(optionSet, code);
 CREATE TABLE TrackedEntityType (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, featureType TEXT, color TEXT, icon TEXT, accessDataWrite INTEGER);
-CREATE TABLE ProgramStageSection (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, sortOrder INTEGER, programStage TEXT NOT NULL, desktopRenderType TEXT, mobileRenderType TEXT, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
+CREATE TABLE ProgramStageSection (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, sortOrder INTEGER, programStage TEXT NOT NULL, desktopRenderType TEXT, mobileRenderType TEXT, description TEXT, displayDescription TEXT, KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE ProgramRuleVariable (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, useCodeForOptionSet INTEGER, program TEXT NOT NULL, programStage TEXT, dataElement TEXT, trackedEntityAttribute TEXT, programRuleVariableSourceType TEXT, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (trackedEntityAttribute) REFERENCES TrackedEntityAttribute (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE ProgramTrackedEntityAttribute (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, mandatory INTEGER, trackedEntityAttribute TEXT NOT NULL, allowFutureDate INTEGER, displayInList INTEGER, program TEXT NOT NULL, sortOrder INTEGER, searchable INTEGER, FOREIGN KEY (trackedEntityAttribute) REFERENCES TrackedEntityAttribute (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE Constant (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, value TEXT);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index eb16508388..c785b00655 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -59,6 +59,6 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     }
 
     companion object {
-        const val VERSION = 149
+        const val VERSION = 150
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java
index c1439fd75e..78f321927a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSection.java
@@ -78,6 +78,14 @@ public abstract class ProgramStageSection extends BaseIdentifiableObject impleme
     @ColumnAdapter(ObjectWithUidColumnAdapter.class)
     public abstract ObjectWithUid programStage();
 
+    @Nullable
+    @JsonProperty()
+    public abstract String description();
+
+    @Nullable
+    @JsonProperty()
+    public abstract String displayDescription();
+
     public static Builder builder() {
         return new $$AutoValue_ProgramStageSection.Builder();
     }
@@ -103,6 +111,10 @@ public abstract static class Builder  extends BaseIdentifiableObject.Builder<Bui
 
         public abstract Builder programStage(ObjectWithUid programStage);
 
+        public abstract Builder description(String description);
+
+        public abstract Builder displayDescription(String displayDescription);
+
         public abstract ProgramStageSection build();
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java
index 5502d7741b..6468439f2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionTableInfo.java
@@ -56,6 +56,8 @@ public static class Columns extends IdentifiableColumns {
         public static final String PROGRAM_STAGE = "programStage";
         public static final String DESKTOP_RENDER_TYPE = SectionRenderingColumnAdapter.DESKTOP_RENDER_TYPE;
         public static final String MOBILE_RENDER_TYPE = SectionRenderingColumnAdapter.MOBILE_RENDER_TYPE;
+        public static final String DESCRIPTION = "description";
+        public static final String DISPLAY_DESCRIPTION = "displayDescription";
 
         @Override
         public String[] all() {
@@ -63,7 +65,9 @@ public String[] all() {
                     SORT_ORDER,
                     PROGRAM_STAGE,
                     DESKTOP_RENDER_TYPE,
-                    MOBILE_RENDER_TYPE
+                    MOBILE_RENDER_TYPE,
+                    DESCRIPTION,
+                    DISPLAY_DESCRIPTION
             );
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
index e9063efcef..fd1fd5500d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
@@ -71,6 +71,14 @@ public StringFilterConnector<ProgramStageSectionsCollectionRepository> byMobileR
         return cf.string(ProgramStageSectionTableInfo.Columns.MOBILE_RENDER_TYPE);
     }
 
+    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byDescription() {
+        return cf.string(ProgramStageSectionTableInfo.Columns.DESCRIPTION);
+    }
+
+    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byDisplayDescription() {
+        return cf.string(ProgramStageSectionTableInfo.Columns.DISPLAY_DESCRIPTION);
+    }
+
     public ProgramStageSectionsCollectionRepository withProgramIndicators() {
         return cf.withChild(ProgramStageSectionFields.PROGRAM_INDICATORS);
     }
@@ -78,4 +86,5 @@ public ProgramStageSectionsCollectionRepository withProgramIndicators() {
     public ProgramStageSectionsCollectionRepository withDataElements() {
         return cf.withChild(ProgramStageSectionFields.DATA_ELEMENTS);
     }
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionFields.java
index 91a197ca3e..d8aa1a4756 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionFields.java
@@ -48,7 +48,9 @@ public final class ProgramStageSectionFields {
                     fh.<Integer>field(Columns.SORT_ORDER),
                     fh.nestedFieldWithUid(PROGRAM_INDICATORS),
                     fh.nestedFieldWithUid(DATA_ELEMENTS),
-                    fh.<SectionRendering>nestedField(RENDER_TYPE)
+                    fh.<SectionRendering>nestedField(RENDER_TYPE),
+                    fh.<String>field(Columns.DESCRIPTION),
+                    fh.<Boolean>field(Columns.DISPLAY_DESCRIPTION)
             ).build();
 
     private ProgramStageSectionFields() {
diff --git a/core/src/sharedTest/resources/program/program_stage_section.json b/core/src/sharedTest/resources/program/program_stage_section.json
index b7b18cdf71..7762a16a14 100644
--- a/core/src/sharedTest/resources/program/program_stage_section.json
+++ b/core/src/sharedTest/resources/program/program_stage_section.json
@@ -32,5 +32,7 @@
       "id": "mGHBXrtqSut"
     }
   ],
-  "translations": []
+  "translations": [],
+  "description": "default description",
+  "displayDescription": "default display description"
 }
\ No newline at end of file

From 688b1a8533a313ffe9392dc33aba5d5d5dd4796f Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 5 Sep 2023 10:01:56 +0200
Subject: [PATCH 248/478] [ANDROSDK-1712] fix: - Gradle wrapper version -
 LogInCall.kt API error catcher and authenticate coroutine call

---
 .../dhis/android/core/user/internal/LogInCall.kt  | 15 ++++++++-------
 gradle/wrapper/gradle-wrapper.properties          |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index eca8ffadba..5e517afec9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -60,6 +60,7 @@ internal class LogInCall @Inject internal constructor(
     private val exceptions: LogInExceptions,
     private val accountManager: AccountManagerImpl,
     private val versionManager: DHISVersionManager,
+    private val apiCallErrorCatcher: UserAuthenticateCallErrorCatcher,
 ) {
     suspend fun logIn(username: String?, password: String?, serverUrl: String?): User {
         return blockingLogIn(username, password, serverUrl)
@@ -79,7 +80,7 @@ internal class LogInCall @Inject internal constructor(
         val credentials = Credentials(username!!, trimmedServerUrl!!, password, null)
 
         return try {
-            val user = coroutineAPICallExecutor.wrap {
+            val user = coroutineAPICallExecutor.wrap(errorCatcher = apiCallErrorCatcher) {
                 userService.authenticate(
                     okhttp3.Credentials.basic(username, password!!),
                     UserFields.allFieldsWithoutOrgUnit(null),
@@ -165,14 +166,14 @@ internal class LogInCall @Inject internal constructor(
         val parsedServerUrl = ServerUrlParser.parse(trimmedServerUrl)
         ServerURLWrapper.setServerUrl(parsedServerUrl.toString())
 
-        val authenticateCall = userService.authenticate(
-            "Bearer ${openIDConnectState.idToken}",
-            UserFields.allFieldsWithoutOrgUnit(versionManager.getVersion()),
-        )
-
         var credentials: Credentials? = null
         return try {
-            val user = coroutineAPICallExecutor.wrap { authenticateCall }.getOrThrow()
+            val user = coroutineAPICallExecutor.wrap {
+                userService.authenticate(
+                    "Bearer ${openIDConnectState.idToken}",
+                    UserFields.allFieldsWithoutOrgUnit(versionManager.getVersion()),
+                )
+            }.getOrThrow()
             credentials = getOpenIdConnectCredentials(user, trimmedServerUrl!!, openIDConnectState)
             loginOnline(user, credentials)
         } catch (d2Error: D2Error) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f1e5473b84..a2a67a7b3d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 31 00:09:15 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 89b6f00e7017312cbb8ecf9426d9547f3c7e6276 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 5 Sep 2023 11:00:57 +0200
Subject: [PATCH 249/478] [ANDROSDK-1725] fix: - snapshot "FOREIGN" was
 mistakenly removed - add missing needed data for tests to work

---
 ...StageSectionCollectionRepositoryMockIntegrationShould.java | 4 ++--
 core/src/main/assets/snapshots/snapshot.sql                   | 2 +-
 .../core/program/internal/ProgramStageSectionStoreImpl.kt     | 2 ++
 .../android/core/data/program/ProgramStageSectionSamples.kt   | 2 ++
 core/src/sharedTest/resources/program/program_stages.json     | 4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java
index 8702b9185e..4dc81b6c7b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageSectionCollectionRepositoryMockIntegrationShould.java
@@ -120,7 +120,7 @@ public void filter_by_description() {
         List<ProgramStageSection> stageSections =
                 d2.programModule().programStageSections()
                         .byDescription()
-                        .eq("description")
+                        .like("description")
                         .blockingGet();
 
         assertThat(stageSections.size()).isEqualTo(1);
@@ -131,7 +131,7 @@ public void filter_by_display_description() {
         List<ProgramStageSection> stageSections =
                 d2.programModule().programStageSections()
                         .byDisplayDescription()
-                        .eq("display")
+                        .like("display")
                         .blockingGet();
 
         assertThat(stageSections.size()).isEqualTo(1);
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index 31a359c128..32175e1feb 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -5,7 +5,7 @@ CREATE TABLE OptionSet (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL
 CREATE TABLE Option (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, optionSet TEXT NOT NULL, sortOrder INTEGER, color TEXT, icon TEXT, FOREIGN KEY (optionSet) REFERENCES OptionSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE INDEX optionset_optioncode ON Option(optionSet, code);
 CREATE TABLE TrackedEntityType (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, featureType TEXT, color TEXT, icon TEXT, accessDataWrite INTEGER);
-CREATE TABLE ProgramStageSection (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, sortOrder INTEGER, programStage TEXT NOT NULL, desktopRenderType TEXT, mobileRenderType TEXT, description TEXT, displayDescription TEXT, KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
+CREATE TABLE ProgramStageSection (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, sortOrder INTEGER, programStage TEXT NOT NULL, desktopRenderType TEXT, mobileRenderType TEXT, description TEXT, displayDescription TEXT, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE ProgramRuleVariable (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, useCodeForOptionSet INTEGER, program TEXT NOT NULL, programStage TEXT, dataElement TEXT, trackedEntityAttribute TEXT, programRuleVariableSourceType TEXT, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (trackedEntityAttribute) REFERENCES TrackedEntityAttribute (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE ProgramTrackedEntityAttribute (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, mandatory INTEGER, trackedEntityAttribute TEXT NOT NULL, allowFutureDate INTEGER, displayInList INTEGER, program TEXT NOT NULL, sortOrder INTEGER, searchable INTEGER, FOREIGN KEY (trackedEntityAttribute) REFERENCES TrackedEntityAttribute (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE Constant (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, value TEXT);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
index d2b11de326..a1a423d4f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
@@ -57,6 +57,8 @@ internal class ProgramStageSectionStoreImpl(
                     w.bind(8, getUidOrNull(o.programStage()))
                     w.bind(9, o.renderType()?.desktop()?.type())
                     w.bind(10, o.renderType()?.mobile()?.type())
+                    w.bind(11, o.description())
+                    w.bind(12, o.displayDescription())
                 }
             }
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt
index d948872b93..98de364a4f 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramStageSectionSamples.kt
@@ -53,6 +53,8 @@ object ProgramStageSectionSamples {
                     ),
                 )
                 programStage(ObjectWithUid.create("program_stage_uid"))
+                description("description")
+                displayDescription("display description")
             }.build()
         }
 }
diff --git a/core/src/sharedTest/resources/program/program_stages.json b/core/src/sharedTest/resources/program/program_stages.json
index 2d595afa37..1a7460ac35 100644
--- a/core/src/sharedTest/resources/program/program_stages.json
+++ b/core/src/sharedTest/resources/program/program_stages.json
@@ -184,7 +184,9 @@
             {
               "id": "g9eOBujte1U"
             }
-          ]
+          ],
+          "description": "default description",
+          "displayDescription": "default display description"
         }
       ]
     },

From d8af1d76695a2f972ada7deb5333021adfb47848 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 5 Sep 2023 11:49:50 +0200
Subject: [PATCH 250/478] [ANDROSDK-1712] fix: - add apiErrorCatcher to test

---
 .../dhis/android/core/user/internal/LogInCallUnitShould.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index ad1a521eaa..a00e211a2f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -65,6 +65,7 @@ class LogInCallUnitShould : BaseCallShould() {
     private val authenticatedUserStore: AuthenticatedUserStore = mock()
     private val credentialsSecureStore: CredentialsSecureStore = mock()
     private val userIdStore: UserIdInMemoryStore = mock()
+    private val apiErrorCatcher: UserAuthenticateCallErrorCatcher = mock()
 
     private val credentialsCaptor: KArgumentCaptor<String> = argumentCaptor()
     private val filterCaptor: KArgumentCaptor<Fields<User>> = argumentCaptor()
@@ -115,7 +116,7 @@ class LogInCallUnitShould : BaseCallShould() {
             coroutineAPICallExecutor, userService, credentialsSecureStore,
             userIdStore, userHandler, authenticatedUserStore, systemInfoCall, userStore,
             LogInDatabaseManager(multiUserDatabaseManager, generalSettingCall),
-            LogInExceptions(credentialsSecureStore), accountManager, versionManager,
+            LogInExceptions(credentialsSecureStore), accountManager, versionManager, apiErrorCatcher,
         ).logIn(username, password, serverUrl)
     }
 

From 6bd48e67e674d10b845d514ae12aa187176e6a28 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 5 Sep 2023 15:14:06 +0200
Subject: [PATCH 251/478] [ANDROSDK-1712] fix: - add apiErrorCatcher
 loginOnline

---
 .../java/org/hisp/dhis/android/core/user/internal/LogInCall.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 5e517afec9..c0a350683f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -168,7 +168,7 @@ internal class LogInCall @Inject internal constructor(
 
         var credentials: Credentials? = null
         return try {
-            val user = coroutineAPICallExecutor.wrap {
+            val user = coroutineAPICallExecutor.wrap(errorCatcher = apiCallErrorCatcher) {
                 userService.authenticate(
                     "Bearer ${openIDConnectState.idToken}",
                     UserFields.allFieldsWithoutOrgUnit(versionManager.getVersion()),

From 2af133d1fa0bdb6ce3ecb124db040ca7470bc46d Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Tue, 5 Sep 2023 13:04:58 +0200
Subject: [PATCH 252/478] [ANDROSDK-1742] Update paging library to 3.2.0

---
 core/build.gradle.kts                         |   3 +-
 .../collection/PagingMockIntegrationShould.kt | 142 +++++++++---------
 ...llectionRepositoryMockIntegrationShould.kt |   8 +-
 .../ReadOnlyCollectionRepository.kt           |   8 +-
 .../ReadOnlyCollectionRepositoryImpl.kt       |  15 +-
 ...WithTransformerCollectionRepositoryImpl.kt |  15 +-
 .../EventQueryCollectionRepository.java       |   6 +-
 ...EntityInstanceQueryCollectionRepository.kt |  15 +-
 8 files changed, 114 insertions(+), 98 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 1400ad0581..0c3d66b053 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -56,7 +56,7 @@ val libraryDesugaring = "2.0.3"
 
 // android
 val annotation = "1.6.0"
-val paging = "2.1.2"
+val paging = "3.2.0"
 
 // java
 val jackson = "2.13.4"
@@ -222,6 +222,7 @@ dependencies {
         exclude(group = "junit") // Android has JUnit built in.
     }
     androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines")
+    androidTestImplementation("androidx.paging:paging-testing:$paging")
 
     debugImplementation("com.facebook.flipper:flipper:$flipper")
     debugImplementation("com.facebook.soloader:soloader:$soloader")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index 56a72dfc12..0b594ea353 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -28,20 +28,25 @@
 package org.hisp.dhis.android.core.arch.repositories.collection
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.paging.PagedList
-import com.jraska.livedata.TestObserver
+import androidx.paging.PagingData
+import androidx.paging.testing.asSnapshot
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(D2JunitRunner::class)
 class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
@@ -61,97 +66,96 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     }
 
     @Test
-    fun get_initial_objects_with_default_order_considering_prefetch_distance() {
-        val liveData = d2.categoryModule().categoryOptions().getPaged(2)
-
-        TestObserver.test(liveData)
-            .awaitValue()
-            .assertHasValue()
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[0] == allValues[0] }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1] == allValues[1] }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2] == allValues[2] }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3] == allValues[3] }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4] == allValues[4] }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5] == allValues[5] }
+    fun get_initial_objects_with_default_order_considering_prefetch_distance() = runTest {
+        val items: Flow<PagingData<CategoryOption>> = d2.categoryModule().categoryOptions().getPaged(2)
+
+        val itemsSnapshot: List<CategoryOption> = items.asSnapshot {
+            scrollTo(index = 5)
+        }
+
+        assertEquals(itemsSnapshot.size, 8)
+        assertEquals(itemsSnapshot[0], allValues[0])
+        assertEquals(itemsSnapshot[1], allValues[1])
+        assertEquals(itemsSnapshot[2], allValues[2])
+        assertEquals(itemsSnapshot[3], allValues[3])
+        assertEquals(itemsSnapshot[4], allValues[4])
+        assertEquals(itemsSnapshot[5], allValues[5])
     }
 
     @Test
-    fun get_initial_objects_ordered_by_display_name_asc() {
-        val liveData = d2.categoryModule().categoryOptions()
+    fun get_initial_objects_ordered_by_display_name_asc() = runTest {
+        val items = d2.categoryModule().categoryOptions()
             .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
             .getPaged(2)
 
-        TestObserver.test(liveData)
-            .awaitValue()
-            .assertHasValue()
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[0]!!.displayName() == "At PHU" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "Female" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "In Community" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "MCH Aides" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "Male" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "SECHN" }
+        val snapshot = items.asSnapshot {
+            scrollTo(index = 8)
+        }
+
+        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot[0].displayName(), "At PHU")
+        assertEquals(snapshot[1].displayName(), "Female")
+        assertEquals(snapshot[2].displayName(), "In Community")
+        assertEquals(snapshot[3].displayName(), "MCH Aides")
+        assertEquals(snapshot[4].displayName(), "Male")
+        assertEquals(snapshot[5].displayName(), "SECHN")
     }
 
     @Test
-    fun get_initial_objects_ordered_by_display_name_desc() {
-        val liveData = d2.categoryModule().categoryOptions()
+    fun get_initial_objects_ordered_by_display_name_desc() = runTest {
+        val items = d2.categoryModule().categoryOptions()
             .orderByDisplayName(RepositoryScope.OrderByDirection.DESC)
             .getPaged(2)
 
-        TestObserver.test(liveData)
-            .awaitValue()
-            .assertHasValue()
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
-            .assertValue { pagedList: PagedList<CategoryOption> ->
-                pagedList[0]!!.displayName() == "default display name"
-            }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "Trained TBA" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "SECHN" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "Male" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "MCH Aides" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "In Community" }
+        val snapshot = items.asSnapshot {
+            scrollTo(index = 8)
+        }
+
+        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot[0].displayName(), "default display name")
+        assertEquals(snapshot[1].displayName(), "Trained TBA")
+        assertEquals(snapshot[2].displayName(), "SECHN")
+        assertEquals(snapshot[3].displayName(), "Male")
+        assertEquals(snapshot[4].displayName(), "MCH Aides")
+        assertEquals(snapshot[5].displayName(), "In Community")
     }
 
     @Test
-    fun get_initial_objects_ordered_by_description_desc() {
-        val liveData = d2.categoryModule().categoryOptions()
+    fun get_initial_objects_ordered_by_description_desc() = runTest {
+        val items = d2.categoryModule().categoryOptions()
             .orderByDescription(RepositoryScope.OrderByDirection.DESC)
             .getPaged(2)
 
-        TestObserver.test(liveData)
-            .awaitValue()
-            .assertHasValue()
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
-            .assertValue { pagedList: PagedList<CategoryOption> ->
-                pagedList[0]!!.displayName() == "default display name"
-            }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "Female" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "Male" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "In Community" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "At PHU" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "MCH Aides" }
+        val snapshot = items.asSnapshot {
+            scrollTo(index = 8)
+        }
+
+        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot[0].displayName(), "default display name")
+        assertEquals(snapshot[1].displayName(), "Female")
+        assertEquals(snapshot[2].displayName(), "Male")
+        assertEquals(snapshot[3].displayName(), "In Community")
+        assertEquals(snapshot[4].displayName(), "At PHU")
+        assertEquals(snapshot[5].displayName(), "MCH Aides")
     }
 
     @Test
-    fun get_initial_objects_ordered_by_description_and_display_name_desc() {
-        val liveData = d2.categoryModule().categoryOptions()
+    fun get_initial_objects_ordered_by_description_and_display_name_desc() = runTest {
+        val items = d2.categoryModule().categoryOptions()
             .orderByDescription(RepositoryScope.OrderByDirection.DESC)
             .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
             .getPaged(2)
 
-        TestObserver.test(liveData)
-            .awaitValue()
-            .assertHasValue()
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
-            .assertValue { pagedList: PagedList<CategoryOption> ->
-                pagedList[0]!!.displayName() == "default display name"
-            }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "At PHU" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "Female" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "In Community" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "Male" }
-            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "MCH Aides" }
+        val snapshot = items.asSnapshot {
+            scrollTo(index = 8)
+        }
+
+        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot[0].displayName(), "default display name")
+        assertEquals(snapshot[1].displayName(), "At PHU")
+        assertEquals(snapshot[2].displayName(), "Female")
+        assertEquals(snapshot[3].displayName(), "In Community")
+        assertEquals(snapshot[4].displayName(), "Male")
+        assertEquals(snapshot[5].displayName(), "MCH Aides")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index 3c026cde3e..e7005d8624 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -28,13 +28,9 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.paging.PagedList
-import com.jraska.livedata.TestObserver
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Rule
-import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
@@ -44,7 +40,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     @get:Rule
     var rule: TestRule = InstantTaskExecutorRule()
 
-    @Test
+    /*@Test
     fun get_offline_initial_objects() {
         val liveData = d2.trackedEntityModule().trackedEntityInstanceQuery()
             .offlineOnly().getPaged(2)
@@ -53,5 +49,5 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
             .awaitValue()
             .assertHasValue()
             .assertValue { pagedList: PagedList<TrackedEntityInstance> -> pagedList.size == 2 }
-    }
+    }*/
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
index d54740678f..7ddd654a19 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
@@ -27,12 +27,12 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection
 
-import androidx.lifecycle.LiveData
-import androidx.paging.PagedList
+import androidx.paging.PagingData
 import io.reactivex.Single
+import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 
-interface ReadOnlyCollectionRepository<M> : BaseRepository {
+interface ReadOnlyCollectionRepository<M : Any> : BaseRepository {
     /**
      * Get the objects in scope in an asynchronous way, returning a `Single<List>`.
      *
@@ -54,7 +54,7 @@ interface ReadOnlyCollectionRepository<M> : BaseRepository {
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    fun getPaged(pageSize: Int): LiveData<PagedList<M>>
+    fun getPaged(pageSize: Int): Flow<PagingData<M>>
 
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index 5c5362a463..dc426b624d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -27,11 +27,12 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
-import androidx.paging.LivePagedListBuilder
-import androidx.paging.PagedList
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
 import io.reactivex.Single
+import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
@@ -99,13 +100,17 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    override fun getPaged(pageSize: Int): LiveData<PagedList<M>> {
+    override fun getPaged(pageSize: Int): Flow<PagingData<M>> {
         val factory: DataSource.Factory<M, M> = object : DataSource.Factory<M, M>() {
             override fun create(): DataSource<M, M> {
                 return dataSource
             }
         }
-        return LivePagedListBuilder(factory, pageSize).build()
+        return Pager(
+            config = PagingConfig(pageSize = pageSize),
+        ) {
+            factory.asPagingSourceFactory().invoke()
+        }.flow
     }
 
     val dataSource: DataSource<M, M>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index 195126524d..d6095da79b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -27,11 +27,12 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
-import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
-import androidx.paging.LivePagedListBuilder
-import androidx.paging.PagedList
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
 import io.reactivex.Single
+import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
@@ -107,13 +108,17 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    override fun getPaged(pageSize: Int): LiveData<PagedList<T>> {
+    override fun getPaged(pageSize: Int): Flow<PagingData<T>> {
         val factory: DataSource.Factory<M, T> = object : DataSource.Factory<M, T>() {
             override fun create(): DataSource<M, T> {
                 return dataSource
             }
         }
-        return LivePagedListBuilder(factory, pageSize).build()
+        return Pager(
+            config = PagingConfig(pageSize = pageSize),
+        ) {
+            factory.asPagingSourceFactory().invoke()
+        }.flow
     }
 
     val dataSource: DataSource<M, T>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
index a068b99071..ea17131800 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
@@ -27,9 +27,8 @@
  */
 package org.hisp.dhis.android.core.event.search;
 
-import androidx.lifecycle.LiveData;
 import androidx.paging.DataSource;
-import androidx.paging.PagedList;
+import androidx.paging.PagingData;
 
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository;
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector;
@@ -59,6 +58,7 @@
 
 import dagger.Reusable;
 import io.reactivex.Single;
+import kotlinx.coroutines.flow.Flow;
 
 @Reusable
 public final class EventQueryCollectionRepository implements ReadOnlyWithUidCollectionRepository<Event> {
@@ -267,7 +267,7 @@ public List<Event> blockingGet() {
     }
 
     @Override
-    public LiveData<PagedList<Event>> getPaged(int pageSize) {
+    public Flow<PagingData<Event>> getPaged(int pageSize) {
         return getEventCollectionRepository().getPaged(pageSize);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 234c50f40a..d8823c71bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -27,12 +27,13 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
-import androidx.paging.LivePagedListBuilder
-import androidx.paging.PagedList
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
 import dagger.Reusable
 import io.reactivex.Single
+import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -550,14 +551,18 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS)
     }
 
-    override fun getPaged(pageSize: Int): LiveData<PagedList<TrackedEntityInstance>> {
+    override fun getPaged(pageSize: Int): Flow<PagingData<TrackedEntityInstance>> {
         val factory: DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance> =
             object : DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance>() {
                 override fun create(): DataSource<TrackedEntityInstance, TrackedEntityInstance> {
                     return dataSource
                 }
             }
-        return LivePagedListBuilder(factory, pageSize).build()
+        return Pager(
+            config = PagingConfig(pageSize = pageSize),
+        ) {
+            factory.asPagingSourceFactory().invoke()
+        }.flow
     }
 
     val dataSource: DataSource<TrackedEntityInstance, TrackedEntityInstance>

From a6fcfa24bf9bb99239994580e561c46cbd4d3885 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Wed, 6 Sep 2023 09:45:50 +0200
Subject: [PATCH 253/478] [ANDROSDK-1742] update tests

---
 .../collection/PagingMockIntegrationShould.kt | 30 +++++++------------
 ...llectionRepositoryMockIntegrationShould.kt | 24 ++++++++++-----
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index 0b594ea353..d0d3463a28 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -69,11 +69,9 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     fun get_initial_objects_with_default_order_considering_prefetch_distance() = runTest {
         val items: Flow<PagingData<CategoryOption>> = d2.categoryModule().categoryOptions().getPaged(2)
 
-        val itemsSnapshot: List<CategoryOption> = items.asSnapshot {
-            scrollTo(index = 5)
-        }
+        val itemsSnapshot: List<CategoryOption> = items.asSnapshot()
 
-        assertEquals(itemsSnapshot.size, 8)
+        assertEquals(itemsSnapshot.size, 6)
         assertEquals(itemsSnapshot[0], allValues[0])
         assertEquals(itemsSnapshot[1], allValues[1])
         assertEquals(itemsSnapshot[2], allValues[2])
@@ -88,11 +86,9 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
             .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
             .getPaged(2)
 
-        val snapshot = items.asSnapshot {
-            scrollTo(index = 8)
-        }
+        val snapshot = items.asSnapshot()
 
-        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot.size, 6)
         assertEquals(snapshot[0].displayName(), "At PHU")
         assertEquals(snapshot[1].displayName(), "Female")
         assertEquals(snapshot[2].displayName(), "In Community")
@@ -107,11 +103,9 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
             .orderByDisplayName(RepositoryScope.OrderByDirection.DESC)
             .getPaged(2)
 
-        val snapshot = items.asSnapshot {
-            scrollTo(index = 8)
-        }
+        val snapshot = items.asSnapshot()
 
-        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot.size, 6)
         assertEquals(snapshot[0].displayName(), "default display name")
         assertEquals(snapshot[1].displayName(), "Trained TBA")
         assertEquals(snapshot[2].displayName(), "SECHN")
@@ -126,11 +120,9 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
             .orderByDescription(RepositoryScope.OrderByDirection.DESC)
             .getPaged(2)
 
-        val snapshot = items.asSnapshot {
-            scrollTo(index = 8)
-        }
+        val snapshot = items.asSnapshot()
 
-        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot.size, 6)
         assertEquals(snapshot[0].displayName(), "default display name")
         assertEquals(snapshot[1].displayName(), "Female")
         assertEquals(snapshot[2].displayName(), "Male")
@@ -146,11 +138,9 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
             .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
             .getPaged(2)
 
-        val snapshot = items.asSnapshot {
-            scrollTo(index = 8)
-        }
+        val snapshot = items.asSnapshot()
 
-        assertEquals(snapshot.size, 8)
+        assertEquals(snapshot.size, 6)
         assertEquals(snapshot[0].displayName(), "default display name")
         assertEquals(snapshot[1].displayName(), "At PHU")
         assertEquals(snapshot[2].displayName(), "Female")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index e7005d8624..a41b292afc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -28,9 +28,17 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.paging.PagingData
+import androidx.paging.testing.asSnapshot
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Assert.assertEquals
 import org.junit.Rule
+import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
@@ -40,14 +48,14 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     @get:Rule
     var rule: TestRule = InstantTaskExecutorRule()
 
-    /*@Test
-    fun get_offline_initial_objects() {
-        val liveData = d2.trackedEntityModule().trackedEntityInstanceQuery()
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun get_offline_initial_objects() = runTest {
+        val items: Flow<PagingData<TrackedEntityInstance>> = d2.trackedEntityModule().trackedEntityInstanceQuery()
             .offlineOnly().getPaged(2)
 
-        TestObserver.test(liveData)
-            .awaitValue()
-            .assertHasValue()
-            .assertValue { pagedList: PagedList<TrackedEntityInstance> -> pagedList.size == 2 }
-    }*/
+        val snapshot = items.asSnapshot()
+
+        assertEquals(snapshot.size, 2)
+    }
 }

From 385b3a1fab8b1d635a4c9b4f477b1bf7bf1714c4 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Thu, 7 Sep 2023 12:28:34 +0200
Subject: [PATCH 254/478] [ANDROSDK-1742] add new method getPagingData into
 ReadOnlyCollectionRepository

---
 .../collection/PagingMockIntegrationShould.kt | 119 ++++++++++++++++--
 ...llectionRepositoryMockIntegrationShould.kt |  17 ++-
 .../ReadOnlyCollectionRepository.kt           |  12 +-
 .../ReadOnlyCollectionRepositoryImpl.kt       |  18 ++-
 ...WithTransformerCollectionRepositoryImpl.kt |  17 ++-
 .../paging/internal/RepositoryDataSource.kt   |   1 +
 .../paging/internal/RepositoryPagingSource.kt |  78 ++++++++++++
 .../RepositoryPagingSourceWithTransformer.kt  |  81 ++++++++++++
 .../EventQueryCollectionRepository.java       |  12 +-
 .../TrackeEntityInstanceQueryPagingSource.kt  |  83 ++++++++++++
 ...EntityInstanceQueryCollectionRepository.kt |  25 +++-
 11 files changed, 441 insertions(+), 22 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index d0d3463a28..1258227045 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.arch.repositories.collection
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.paging.PagingData
+import androidx.paging.PagedList
 import androidx.paging.testing.asSnapshot
+import com.jraska.livedata.TestObserver
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -66,8 +66,103 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     }
 
     @Test
-    fun get_initial_objects_with_default_order_considering_prefetch_distance() = runTest {
-        val items: Flow<PagingData<CategoryOption>> = d2.categoryModule().categoryOptions().getPaged(2)
+    fun get_initial_objects_with_default_order_considering_prefetch_distance() {
+        val liveData = d2.categoryModule().categoryOptions().getPaged(2)
+
+        TestObserver.test(liveData)
+            .awaitValue()
+            .assertHasValue()
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[0] == allValues[0] }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1] == allValues[1] }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2] == allValues[2] }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3] == allValues[3] }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4] == allValues[4] }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5] == allValues[5] }
+    }
+
+    @Test
+    fun get_initial_objects_ordered_by_display_name_asc() {
+        val liveData = d2.categoryModule().categoryOptions()
+            .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
+            .getPaged(2)
+
+        TestObserver.test(liveData)
+            .awaitValue()
+            .assertHasValue()
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[0]!!.displayName() == "At PHU" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "Female" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "In Community" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "MCH Aides" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "Male" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "SECHN" }
+    }
+
+    @Test
+    fun get_initial_objects_ordered_by_display_name_desc() {
+        val liveData = d2.categoryModule().categoryOptions()
+            .orderByDisplayName(RepositoryScope.OrderByDirection.DESC)
+            .getPaged(2)
+
+        TestObserver.test(liveData)
+            .awaitValue()
+            .assertHasValue()
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
+            .assertValue { pagedList: PagedList<CategoryOption> ->
+                pagedList[0]!!.displayName() == "default display name"
+            }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "Trained TBA" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "SECHN" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "Male" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "MCH Aides" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "In Community" }
+    }
+
+    @Test
+    fun get_initial_objects_ordered_by_description_desc() {
+        val liveData = d2.categoryModule().categoryOptions()
+            .orderByDescription(RepositoryScope.OrderByDirection.DESC)
+            .getPaged(2)
+
+        TestObserver.test(liveData)
+            .awaitValue()
+            .assertHasValue()
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
+            .assertValue { pagedList: PagedList<CategoryOption> ->
+                pagedList[0]!!.displayName() == "default display name"
+            }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "Female" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "Male" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "In Community" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "At PHU" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "MCH Aides" }
+    }
+
+    @Test
+    fun get_initial_objects_ordered_by_description_and_display_name_desc() = runTest {
+        val liveData = d2.categoryModule().categoryOptions()
+            .orderByDescription(RepositoryScope.OrderByDirection.DESC)
+            .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
+            .getPaged(2)
+
+        TestObserver.test(liveData)
+            .awaitValue()
+            .assertHasValue()
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList.size == 6 }
+            .assertValue { pagedList: PagedList<CategoryOption> ->
+                pagedList[0]!!.displayName() == "default display name"
+            }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[1]!!.displayName() == "At PHU" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[2]!!.displayName() == "Female" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[3]!!.displayName() == "In Community" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "Male" }
+            .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "MCH Aides" }
+    }
+
+    @Test
+    fun get_pagingData_with_initial_objects_with_default_order_considering_prefetch_distance() = runTest {
+        val items = d2.categoryModule().categoryOptions().getPagingData(2)
 
         val itemsSnapshot: List<CategoryOption> = items.asSnapshot()
 
@@ -81,10 +176,10 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     }
 
     @Test
-    fun get_initial_objects_ordered_by_display_name_asc() = runTest {
+    fun get_pagingData_with_initial_objects_ordered_by_display_name_asc() = runTest {
         val items = d2.categoryModule().categoryOptions()
             .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
-            .getPaged(2)
+            .getPagingData(2)
 
         val snapshot = items.asSnapshot()
 
@@ -98,10 +193,10 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     }
 
     @Test
-    fun get_initial_objects_ordered_by_display_name_desc() = runTest {
+    fun get_pagingData_with_initial_objects_ordered_by_display_name_desc() = runTest {
         val items = d2.categoryModule().categoryOptions()
             .orderByDisplayName(RepositoryScope.OrderByDirection.DESC)
-            .getPaged(2)
+            .getPagingData(2)
 
         val snapshot = items.asSnapshot()
 
@@ -115,10 +210,10 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     }
 
     @Test
-    fun get_initial_objects_ordered_by_description_desc() = runTest {
+    fun get_pagingData_with_initial_objects_ordered_by_description_desc() = runTest {
         val items = d2.categoryModule().categoryOptions()
             .orderByDescription(RepositoryScope.OrderByDirection.DESC)
-            .getPaged(2)
+            .getPagingData(2)
 
         val snapshot = items.asSnapshot()
 
@@ -132,11 +227,11 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     }
 
     @Test
-    fun get_initial_objects_ordered_by_description_and_display_name_desc() = runTest {
+    fun get_pagingData_with_initial_objects_ordered_by_description_and_display_name_desc() = runTest {
         val items = d2.categoryModule().categoryOptions()
             .orderByDescription(RepositoryScope.OrderByDirection.DESC)
             .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
-            .getPaged(2)
+            .getPagingData(2)
 
         val snapshot = items.asSnapshot()
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index a41b292afc..e4a1e64393 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -28,8 +28,10 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.paging.PagedList
 import androidx.paging.PagingData
 import androidx.paging.testing.asSnapshot
+import com.jraska.livedata.TestObserver
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.test.runTest
@@ -50,9 +52,20 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
 
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
-    fun get_offline_initial_objects() = runTest {
-        val items: Flow<PagingData<TrackedEntityInstance>> = d2.trackedEntityModule().trackedEntityInstanceQuery()
+    fun get_offline_initial_objects() {
+        val liveData = d2.trackedEntityModule().trackedEntityInstanceQuery()
             .offlineOnly().getPaged(2)
+        TestObserver.test(liveData)
+            .awaitValue()
+            .assertHasValue()
+            .assertValue { pagedList: PagedList<TrackedEntityInstance> -> pagedList.size == 2 }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun get_PagingData_with_offline_initial_objects() = runTest {
+        val items: Flow<PagingData<TrackedEntityInstance>> = d2.trackedEntityModule().trackedEntityInstanceQuery()
+            .offlineOnly().getPagingData(2)
 
         val snapshot = items.asSnapshot()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
index 7ddd654a19..6fc97e38a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection
 
+import androidx.lifecycle.LiveData
+import androidx.paging.PagedList
 import androidx.paging.PagingData
 import io.reactivex.Single
 import kotlinx.coroutines.flow.Flow
@@ -54,7 +56,15 @@ interface ReadOnlyCollectionRepository<M : Any> : BaseRepository {
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    fun getPaged(pageSize: Int): Flow<PagingData<M>>
+    @Deprecated(message = "Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
+    fun getPaged(pageSize: Int): LiveData<PagedList<M>>
+
+    /**
+     * Uses Paging3 library and return a Flow
+     * @param pageSize Length of the page
+     * @return a Flow of PagingData elements
+     */
+    fun getPagingData(pageSize: Int): Flow<PagingData<M>>
 
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index dc426b624d..e3a1af98b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -27,10 +27,14 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
+import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
+import androidx.paging.PagingSource
 import io.reactivex.Single
 import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
@@ -42,6 +46,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectio
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
 import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource
+import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingSource
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
@@ -100,22 +105,31 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    override fun getPaged(pageSize: Int): Flow<PagingData<M>> {
+    @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
+    override fun getPaged(pageSize: Int): LiveData<PagedList<M>> {
         val factory: DataSource.Factory<M, M> = object : DataSource.Factory<M, M>() {
             override fun create(): DataSource<M, M> {
                 return dataSource
             }
         }
+        return LivePagedListBuilder(factory, pageSize).build()
+    }
+
+    override fun getPagingData(pageSize: Int): Flow<PagingData<M>> {
         return Pager(
             config = PagingConfig(pageSize = pageSize),
         ) {
-            factory.asPagingSourceFactory().invoke()
+            pagingSource
         }.flow
     }
 
+    @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
     val dataSource: DataSource<M, M>
         get() = RepositoryDataSource(store, scope, childrenAppenders)
 
+    private val pagingSource: PagingSource<M, M>
+        get() = RepositoryPagingSource(store, scope, childrenAppenders)
+
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
      * @return A `Single` object with the element count
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index d6095da79b..d272c1bbe3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -27,10 +27,14 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
+import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
+import androidx.paging.PagingSource
 import io.reactivex.Single
 import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
@@ -44,6 +48,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyWithTransformerObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSourceWithTransformer
+import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingSourceWithTransformer
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
@@ -108,22 +113,30 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
      * @param pageSize Length of the page
      * @return A LiveData object of PagedList of elements
      */
-    override fun getPaged(pageSize: Int): Flow<PagingData<T>> {
+    @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
+    override fun getPaged(pageSize: Int): LiveData<PagedList<T>> {
         val factory: DataSource.Factory<M, T> = object : DataSource.Factory<M, T>() {
             override fun create(): DataSource<M, T> {
                 return dataSource
             }
         }
+        return LivePagedListBuilder(factory, pageSize).build()
+    }
+
+    override fun getPagingData(pageSize: Int): Flow<PagingData<T>> {
         return Pager(
             config = PagingConfig(pageSize = pageSize),
         ) {
-            factory.asPagingSourceFactory().invoke()
+            pagingSource
         }.flow
     }
 
     val dataSource: DataSource<M, T>
         get() = RepositoryDataSourceWithTransformer(store, scope, childrenAppenders, transformer)
 
+    private val pagingSource: PagingSource<M, T>
+        get() = RepositoryPagingSourceWithTransformer(store, scope, childrenAppenders, transformer)
+
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
      * @return A `Single` object with the element count
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
index 5c311144f4..31f0b7d688 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
@@ -64,6 +64,7 @@ class RepositoryDataSource<M : CoreObject> internal constructor(
 
     private fun loadPages(params: LoadParams<M>, callback: LoadCallback<M>, reversed: Boolean) {
         val whereClauseBuilder = WhereClauseBuilder()
+
         OrderByClauseBuilder.addSortingClauses(
             whereClauseBuilder,
             scope.orderBy(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
new file mode 100644
index 0000000000..5a48a38969
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.repositories.paging.internal
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor.appendInObjectCollection
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
+import org.hisp.dhis.android.core.common.CoreObject
+
+class RepositoryPagingSource<M : CoreObject> internal constructor(
+    private val store: ReadableStore<M>,
+    private val scope: RepositoryScope,
+    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+) : PagingSource<M, M>() {
+
+    private val whereClauseBuilder = WhereClauseBuilder()
+    private val whereClauseFromScopeBuilder = WhereClauseFromScopeBuilder(whereClauseBuilder)
+
+    override fun getRefreshKey(state: PagingState<M, M>): M? {
+        return state.anchorPosition?.let { state.closestItemToPosition(it) }
+    }
+
+    override suspend fun load(params: LoadParams<M>): LoadResult<M, M> {
+        /*OrderByClauseBuilder.addSortingClauses(
+            whereClauseBuilder,
+            scope.orderBy(),
+            params.key?.toContentValues(),
+            false,
+            scope.pagingKey(),
+        )*/
+        val whereClause = whereClauseFromScopeBuilder.getWhereClause(
+            scope,
+        )
+        val withoutChildren = store.selectWhere(
+            whereClause,
+            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+            params.loadSize,
+        )
+
+        return LoadResult.Page(
+            data = appendInObjectCollection(withoutChildren, childrenAppenders, scope.children()),
+            prevKey = null,
+            nextKey = null,
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
new file mode 100644
index 0000000000..a4b02aa98e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.repositories.paging.internal
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
+import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
+import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
+import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
+import org.hisp.dhis.android.core.common.CoreObject
+
+internal class RepositoryPagingSourceWithTransformer<M : CoreObject, T : Any> internal constructor(
+    private val store: ReadableStore<M>,
+    private val scope: RepositoryScope,
+    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    private val transformer: TwoWayTransformer<M, T>,
+) : PagingSource<M, T>() {
+    override fun getRefreshKey(state: PagingState<M, T>): M? {
+        val item = state.anchorPosition?.let { state.closestItemToPosition(it) }
+        return item?.let { transformer.deTransform(it) }
+    }
+
+    override suspend fun load(params: LoadParams<M>): LoadResult<M, T> {
+        val whereClauseBuilder = WhereClauseBuilder()
+        OrderByClauseBuilder.addSortingClauses(
+            whereClauseBuilder,
+            scope.orderBy(),
+            params.key?.toContentValues(),
+            false,
+            scope.pagingKey(),
+        )
+        val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope)
+        val withoutChildren = store.selectWhere(
+            whereClause,
+            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+            params.loadSize,
+        )
+        val items = ChildrenAppenderExecutor.appendInObjectCollection(
+            withoutChildren,
+            childrenAppenders,
+            scope.children(),
+        ).map { transformer.transform(it) }
+
+        return LoadResult.Page(
+            data = items,
+            prevKey = null,
+            nextKey = null,
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
index ea17131800..1d68fdb7c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
@@ -27,7 +27,10 @@
  */
 package org.hisp.dhis.android.core.event.search;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
 import androidx.paging.DataSource;
+import androidx.paging.PagedList;
 import androidx.paging.PagingData;
 
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository;
@@ -266,11 +269,18 @@ public List<Event> blockingGet() {
         return getEventCollectionRepository().blockingGet();
     }
 
+    @NonNull
     @Override
-    public Flow<PagingData<Event>> getPaged(int pageSize) {
+    public LiveData<PagedList<Event>> getPaged(int pageSize) {
         return getEventCollectionRepository().getPaged(pageSize);
     }
 
+    @NonNull
+    @Override
+    public Flow<PagingData<Event>> getPagingData(int pageSize) {
+        return getEventCollectionRepository().getPagingData(pageSize);
+    }
+
     public DataSource<Event, Event> getDataSource() {
         return getEventCollectionRepository().getDataSource();
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
new file mode 100644
index 0000000000..d34a25de99
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
@@ -0,0 +1,83 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+
+internal class TrackeEntityInstanceQueryPagingSource(
+    store: TrackedEntityInstanceStore,
+    trackerParentCallFactory: TrackerParentCallFactory,
+    scope: TrackedEntityInstanceQueryRepositoryScope,
+    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
+    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+) : PagingSource<TrackedEntityInstance, TrackedEntityInstance>() {
+
+    private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
+        store,
+        trackerParentCallFactory,
+        scope,
+        childrenAppenders,
+        onlineCache,
+        onlineHelper,
+        localQueryHelper,
+    )
+
+    init {
+        dataFetcher.refresh()
+    }
+
+    override fun getRefreshKey(
+        state: PagingState<TrackedEntityInstance, TrackedEntityInstance>,
+    ): TrackedEntityInstance? {
+        return state.anchorPosition?.let { state.closestItemToPosition(it) }
+    }
+
+    override suspend fun load(
+        params: LoadParams<TrackedEntityInstance>,
+    ): LoadResult<TrackedEntityInstance, TrackedEntityInstance> {
+        val pages = dataFetcher.loadPages(params.loadSize)
+
+        return pages.firstOrNull { it is Result.Failure }?.let {
+            LoadResult.Error((it as Result.Failure).failure)
+        } ?: LoadResult.Page(
+            data = pages.map { it.getOrThrow() },
+            prevKey = null,
+            nextKey = null,
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index d8823c71bf..bf20d0f6ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -27,10 +27,14 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
+import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
+import androidx.paging.PagingSource
 import dagger.Reusable
 import io.reactivex.Single
 import kotlinx.coroutines.flow.Flow
@@ -551,17 +555,22 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS)
     }
 
-    override fun getPaged(pageSize: Int): Flow<PagingData<TrackedEntityInstance>> {
+    @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
+    override fun getPaged(pageSize: Int): LiveData<PagedList<TrackedEntityInstance>> {
         val factory: DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance> =
             object : DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance>() {
                 override fun create(): DataSource<TrackedEntityInstance, TrackedEntityInstance> {
                     return dataSource
                 }
             }
+        return LivePagedListBuilder(factory, pageSize).build()
+    }
+
+    override fun getPagingData(pageSize: Int): Flow<PagingData<TrackedEntityInstance>> {
         return Pager(
             config = PagingConfig(pageSize = pageSize),
         ) {
-            factory.asPagingSourceFactory().invoke()
+            pagingSource
         }.flow
     }
 
@@ -576,6 +585,18 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
             localQueryHelper,
         )
 
+    val pagingSource: PagingSource<TrackedEntityInstance, TrackedEntityInstance>
+        get() = TrackeEntityInstanceQueryPagingSource(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper,
+        )
+
+    @Deprecated("use getPagingdata")
     val resultDataSource: DataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
         get() = TrackedEntityInstanceQueryDataSourceResult(
             store,

From e9de12d2e7e824024aaad51043f4cee2dbbea594 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 09:25:15 +0200
Subject: [PATCH 255/478] Rename .java to .kt

---
 ...lFetcher.java => ListNoResourceWithErrorCatcherCallFetcher.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{ListNoResourceWithErrorCatcherCallFetcher.java => ListNoResourceWithErrorCatcherCallFetcher.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt

From dfc07a2e801f22ee5243b62888c6c344d06671ce Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 09:26:38 +0200
Subject: [PATCH 256/478] [ANDROSDK-1732] refactor: - ConstantModule calls from
 RxJava to Coroutines fix: - AuthorityEndpointCallFactory to access Kotlin
 properties style: - Added line to Eof

---
 .../factories/internal/ListCallFactoryImpl.kt | 11 +++--
 .../internal/ListCoroutineCallFactory.kt      | 33 +++++++++++++
 .../internal/ListCoroutineCallFactoryImpl.kt  | 47 +++++++++++++++++++
 .../fetchers/internal/CoroutineCallFetcher.kt | 36 ++++++++++++++
 ... PayloadNoResourceCoroutineCallFetcher.kt} | 16 +++----
 .../call/internal/EndpointCoroutineCall.kt    | 45 ++++++++++++++++++
 ...ransactionalNoResourceSyncCallProcessor.kt |  2 +-
 .../modules/internal/TypedModuleDownloader.kt |  2 +-
 ...ory.kt => ConstantCoroutineCallFactory.kt} | 27 +++++------
 .../internal/ConstantModuleDownloader.kt      | 18 +++----
 .../internal/ConstantPackageDIModule.kt       |  4 +-
 .../core/constant/internal/ConstantService.kt |  7 ++-
 .../AuthorityEndpointCallFactory.java         |  5 +-
 .../user/internal/UserModuleDownloader.kt     |  4 +-
 14 files changed, 209 insertions(+), 48 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{PayloadNoResourceCallFetcher.kt => PayloadNoResourceCoroutineCallFetcher.kt} (80%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantCallFactory.kt => ConstantCoroutineCallFactory.kt} (75%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
index aa71ac9a7e..32bef41466 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
@@ -27,21 +27,22 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
+import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
 
-internal abstract class ListCallFactoryImpl<P> protected constructor(
+internal abstract class ListCallFactoryImpl<P>(
     protected val data: GenericCallData,
     protected val apiCallExecutor: APICallExecutor
 ) : ListCallFactory<P> {
+
     override fun create(): Callable<List<P>> {
         return EndpointCall(fetcher(), processor())
     }
 
-    protected abstract fun fetcher(): CallFetcher<P>?
-    protected abstract fun processor(): CallProcessor<P>?
-}
\ No newline at end of file
+    protected abstract fun fetcher(): CallFetcher<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
new file mode 100644
index 0000000000..e54f2c932e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+interface ListCoroutineCallFactory<P> {
+    suspend fun create(): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
new file mode 100644
index 0000000000..e794f4a42a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
+    protected val data: GenericCallData,
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : ListCoroutineCallFactory<P> {
+    override suspend fun create(): List<P> {
+        val objects: List<P> = fetcher().invoke()
+        processor().process(objects)
+        return objects
+    }
+
+    protected abstract fun fetcher(): suspend () -> List<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
new file mode 100644
index 0000000000..1eae246c2c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
+
+import org.hisp.dhis.android.core.maintenance.D2Error
+
+interface CoroutineCallFetcher<P> {
+    @Throws(D2Error::class)
+    suspend fun fetch(): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
similarity index 80%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
index 59659ec1a8..f7262ae6bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.maintenance.D2Error
-import retrofit2.Call
 
-abstract class PayloadNoResourceCallFetcher<P> protected constructor(private val apiCallExecutor: APICallExecutor) :
-    CallFetcher<P> {
-    protected abstract val call: Call<Payload<P>?>
+internal abstract class PayloadNoResourceCoroutineCallFetcher<P> protected constructor(
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : CoroutineCallFetcher<P> {
+    protected abstract val call: Payload<P>?
     @Throws(D2Error::class)
-    override fun fetch(): List<P> {
-        return apiCallExecutor.executePayloadCall(call)
+    override suspend fun fetch(): List<P> {
+        return coroutineAPICallExecutor.wrap { call }.getOrThrow()?.items().orEmpty()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
new file mode 100644
index 0000000000..d4784f3824
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.internal
+
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+class EndpointCoroutineCall<P>(
+    private val fetcher: CoroutineCallFetcher<P>,
+    private val processor: CallProcessor<P>
+) {
+
+    @Throws(Exception::class)
+    suspend fun call(): List<P> {
+        val objects: List<P> = fetcher.fetch()
+        processor.process(objects)
+        return objects
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
index 40a29b70ce..159e1045d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
@@ -45,4 +45,4 @@ internal class TransactionalNoResourceSyncCallProcessor<O>(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index fdcfd8514b..1d97f767dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -31,4 +31,4 @@ import io.reactivex.Single
 
 interface TypedModuleDownloader<O> {
     fun downloadMetadata(): Single<O>?
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 3951ea57cb..7b537e2ccb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -28,29 +28,26 @@
 package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
 import org.hisp.dhis.android.core.constant.Constant
-import retrofit2.Call
-import javax.inject.Inject
 
 @Reusable
-internal class ConstantCallFactory @Inject constructor(
+internal class ConstantCoroutineCallFactory @Inject constructor(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: ConstantService,
     private val handler: ConstantHandler
-) : ListCallFactoryImpl<Constant>(data, apiCallExecutor) {
-    override fun fetcher(): CallFetcher<Constant> {
-        return object : PayloadNoResourceCallFetcher<Constant>(apiCallExecutor) {
-            override val call: Call<Payload<Constant>?>
-                get() = service.constants(ConstantFields.allFields, false)
+) : ListCoroutineCallFactoryImpl<Constant>(data, coroutineAPICallExecutor) {
+    override fun fetcher(): suspend () -> List<Constant> {
+        return suspend {
+            coroutineAPICallExecutor.wrap {
+                service.constants(ConstantFields.allFields, false)
+            }.getOrThrow()?.items().orEmpty()
         }
     }
 
@@ -60,4 +57,4 @@ internal class ConstantCallFactory @Inject constructor(
             handler
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index b6bcfc204d..3b9f94be8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -29,17 +29,19 @@ package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import javax.inject.Inject
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.constant.Constant
-import javax.inject.Inject
 
 @Reusable
-class ConstantModuleDownloader @Inject internal constructor(private val constantCallFactory: ConstantCallFactory) :
-    TypedModuleDownloader<List<Constant>?> {
-    override fun downloadMetadata(): Single<List<Constant>?> {
-        // TODO : rxSingle
-        return Single.fromCallable(
+class ConstantModuleDownloader @Inject internal constructor(
+    private val constantCallFactory: ConstantCoroutineCallFactory
+) :
+    TypedModuleDownloader<List<Constant>> {
+    override fun downloadMetadata(): Single<List<Constant>> {
+        return rxSingle {
             constantCallFactory.create()
-        )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
index e4dd7e389b..ac93f3baa5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.constant.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.constant.Constant
@@ -56,7 +56,7 @@ internal class ConstantPackageDIModule {
 
     @Provides
     @Reusable
-    fun constantCallFactory(impl: ConstantCallFactory): ListCallFactory<Constant> {
+    fun constantCallFactory(impl: ConstantCoroutineCallFactory): ListCoroutineCallFactory<Constant> {
         return impl
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index 73a6fa9da0..c92698f27b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.constant.Constant
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
 
 internal interface ConstantService {
     @GET("constants")
-    fun constants(
+    suspend fun constants(
         @Query("fields") @Which fields: Fields<Constant>,
         @Query("paging") paging: Boolean
-    ): Call<Payload<Constant>?>
-}
\ No newline at end of file
+    ): Payload<Constant>?
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
index 133af027dc..02e56ce4fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
@@ -60,7 +60,7 @@ final class AuthorityEndpointCallFactory extends ListCallFactoryImpl<Authority>
 
     @Override
     protected CallFetcher<Authority> fetcher() {
-        return new AuthorityCallFetcher(apiCallExecutor) {
+        return new AuthorityCallFetcher(getApiCallExecutor()) {
             @Override
             protected retrofit2.Call<List<String>> getCall() {
                 return service.getAuthorities();
@@ -70,6 +70,7 @@ protected retrofit2.Call<List<String>> getCall() {
 
     @Override
     protected CallProcessor<Authority> processor() {
-        return new AuthorityCallProcessor(data.databaseAdapter(), handler);
+        return new AuthorityCallProcessor(getData().databaseAdapter(), handler);
     }
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 962878da74..48653d2f69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.user.User
-import javax.inject.Inject
 
 @Reusable
 internal class UserModuleDownloader @Inject internal constructor(
@@ -45,4 +45,4 @@ internal class UserModuleDownloader @Inject internal constructor(
             user
         }
     }
-}
\ No newline at end of file
+}

From cb35429a99813a9fff8104e5001fdd853b905098 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 10:20:39 +0200
Subject: [PATCH 257/478] [ANDROSDK-1732] refactor: - Cleaned up some nullables
 - Simplify fetcher suspend call

---
 .../factories/internal/ListCoroutineCallFactoryImpl.kt    | 4 ++--
 .../core/arch/modules/internal/TypedModuleDownloader.kt   | 2 +-
 .../constant/internal/ConstantCoroutineCallFactory.kt     | 8 +++-----
 .../android/core/constant/internal/ConstantService.kt     | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
index e794f4a42a..bebe89365f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
@@ -37,11 +37,11 @@ internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
     protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) : ListCoroutineCallFactory<P> {
     override suspend fun create(): List<P> {
-        val objects: List<P> = fetcher().invoke()
+        val objects: List<P> = fetcher()
         processor().process(objects)
         return objects
     }
 
-    protected abstract fun fetcher(): suspend () -> List<P>
+    protected abstract suspend fun fetcher():  List<P>
     protected abstract fun processor(): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index 1d97f767dd..73a074b4a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.arch.modules.internal
 import io.reactivex.Single
 
 interface TypedModuleDownloader<O> {
-    fun downloadMetadata(): Single<O>?
+    fun downloadMetadata(): Single<O>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 7b537e2ccb..69ed70e7bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -43,12 +43,10 @@ internal class ConstantCoroutineCallFactory @Inject constructor(
     private val service: ConstantService,
     private val handler: ConstantHandler
 ) : ListCoroutineCallFactoryImpl<Constant>(data, coroutineAPICallExecutor) {
-    override fun fetcher(): suspend () -> List<Constant> {
-        return suspend {
-            coroutineAPICallExecutor.wrap {
+    override suspend fun fetcher():  List<Constant> {
+        return coroutineAPICallExecutor.wrap {
                 service.constants(ConstantFields.allFields, false)
-            }.getOrThrow()?.items().orEmpty()
-        }
+            }.getOrThrow().items()
     }
 
     override fun processor(): CallProcessor<Constant> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index c92698f27b..ba7b1902a2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -39,5 +39,5 @@ internal interface ConstantService {
     suspend fun constants(
         @Query("fields") @Which fields: Fields<Constant>,
         @Query("paging") paging: Boolean
-    ): Payload<Constant>?
+    ): Payload<Constant>
 }

From f9592a32d0a4b2a14db7f1076a5e89286fc5dde8 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 30 Jul 2023 21:02:19 +0200
Subject: [PATCH 258/478] Rename .java to .kt

---
 .../internal/{ListCallFactoryImpl.java => ListCallFactoryImpl.kt} | 0
 ...NoResourceCallFetcher.java => PayloadNoResourceCallFetcher.kt} | 0
 ...Processor.java => TransactionalNoResourceSyncCallProcessor.kt} | 0
 .../{TypedModuleDownloader.java => TypedModuleDownloader.kt}      | 0
 .../internal/{ConstantCallFactory.java => ConstantCallFactory.kt} | 0
 ...{ConstantModuleDownloader.java => ConstantModuleDownloader.kt} | 0
 .../internal/{ConstantService.java => ConstantService.kt}         | 0
 .../{UserModuleDownloader.java => UserModuleDownloader.kt}        | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{ListCallFactoryImpl.java => ListCallFactoryImpl.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{PayloadNoResourceCallFetcher.java => PayloadNoResourceCallFetcher.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/{TransactionalNoResourceSyncCallProcessor.java => TransactionalNoResourceSyncCallProcessor.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/{TypedModuleDownloader.java => TypedModuleDownloader.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantCallFactory.java => ConstantCallFactory.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantModuleDownloader.java => ConstantModuleDownloader.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantService.java => ConstantService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{UserModuleDownloader.java => UserModuleDownloader.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.java
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt

From 83ba12089c135374cb31e6699b8fefaba6353486 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 30 Jul 2023 21:02:19 +0200
Subject: [PATCH 259/478] [ANDROSDK-1732] refactor: - ConstantModule related
 classes to Kotlin

---
 .../factories/internal/ListCallFactoryImpl.kt | 44 +++++-------
 .../internal/PayloadNoResourceCallFetcher.kt  | 35 ++++-----
 ...ransactionalNoResourceSyncCallProcessor.kt | 41 +++++------
 .../modules/internal/TypedModuleDownloader.kt |  9 ++-
 .../constant/internal/ConstantCallFactory.kt  | 72 ++++++++-----------
 .../internal/ConstantModuleDownloader.kt      | 34 ++++-----
 .../core/constant/internal/ConstantService.kt | 27 ++++---
 .../user/internal/UserModuleDownloader.kt     | 43 +++++------
 8 files changed, 120 insertions(+), 185 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
index 811b6fba35..aa71ac9a7e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
@@ -25,33 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public abstract class ListCallFactoryImpl<P> implements ListCallFactory<P> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected ListCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create() {
-        return new EndpointCall<>(fetcher(), processor());
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
+
+internal abstract class ListCallFactoryImpl<P> protected constructor(
+    protected val data: GenericCallData,
+    protected val apiCallExecutor: APICallExecutor
+) : ListCallFactory<P> {
+    override fun create(): Callable<List<P>> {
+        return EndpointCall(fetcher(), processor())
     }
 
-    protected abstract CallFetcher<P> fetcher();
-    protected abstract CallProcessor<P> processor();
+    protected abstract fun fetcher(): CallFetcher<P>?
+    protected abstract fun processor(): CallProcessor<P>?
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
index d874edab31..88d421f5d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
@@ -25,27 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.fetchers.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.List;
-
-public abstract class PayloadNoResourceCallFetcher<P> implements CallFetcher<P> {
-
-    private final APICallExecutor apiCallExecutor;
-
-    protected PayloadNoResourceCallFetcher(APICallExecutor apiCallExecutor) {
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    protected abstract retrofit2.Call<Payload<P>> getCall();
-
-    @Override
-    public final List<P> fetch() throws D2Error {
-        return apiCallExecutor.executePayloadCall(getCall());
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.maintenance.D2Error
+import retrofit2.Call
+
+abstract class PayloadNoResourceCallFetcher<P> protected constructor(private val apiCallExecutor: APICallExecutor) :
+    CallFetcher<P> {
+    protected abstract val call: Call<Payload<P>?>?
+    @Throws(D2Error::class)
+    override fun fetch(): List<P> {
+        return apiCallExecutor.executePayloadCall(call)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
index 03349efeba..40a29b70ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
@@ -25,33 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.processors.internal
 
-package org.hisp.dhis.android.core.arch.call.processors.internal;
+import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.List;
-
-public class TransactionalNoResourceSyncCallProcessor<O> implements CallProcessor<O> {
-    private final DatabaseAdapter databaseAdapter;
-    private final Handler<O> handler;
-
-    public TransactionalNoResourceSyncCallProcessor(DatabaseAdapter databaseAdapter,
-                                                    Handler<O> handler) {
-        this.databaseAdapter = databaseAdapter;
-        this.handler = handler;
-    }
-
-    @Override
-    public final void process(final List<O> objectList) throws D2Error {
-        if (objectList != null && !objectList.isEmpty()) {
-            D2CallExecutor.create(databaseAdapter).executeD2CallTransactionally(() -> {
-                handler.handleMany(objectList);
-                return null;
-            });
+internal class TransactionalNoResourceSyncCallProcessor<O>(
+    private val databaseAdapter: DatabaseAdapter,
+    private val handler: Handler<O>
+) : CallProcessor<O> {
+    @Throws(D2Error::class)
+    override fun process(objectList: List<O>) {
+        if (objectList.isNotEmpty()) {
+            D2CallExecutor.create(databaseAdapter).executeD2CallTransactionally<Any?> {
+                handler.handleMany(objectList)
+                null
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index 8a8d2b4190..fdcfd8514b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -25,11 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.modules.internal
 
-package org.hisp.dhis.android.core.arch.modules.internal;
+import io.reactivex.Single
 
-import io.reactivex.Single;
-
-public interface TypedModuleDownloader<O> {
-   Single<O> downloadMetadata();
+interface TypedModuleDownloader<O> {
+    fun downloadMetadata(): Single<O>?
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
index 5c032a9413..654dab13f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
@@ -25,54 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.constant.internal
 
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
+import org.hisp.dhis.android.core.constant.Constant
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class ConstantCallFactory extends ListCallFactoryImpl<Constant> {
-
-    private final ConstantService service;
-    private final ConstantHandler handler;
-
-    @Inject
-    ConstantCallFactory(GenericCallData data,
-                        APICallExecutor apiCallExecutor,
-                        ConstantService service,
-                        ConstantHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
-    }
-
-    @Override
-    protected CallFetcher<Constant> fetcher() {
-        return new PayloadNoResourceCallFetcher<Constant>(apiCallExecutor) {
-            @Override
-            protected retrofit2.Call<Payload<Constant>> getCall() {
-                return service.constants(ConstantFields.allFields, Boolean.FALSE);
+internal class ConstantCallFactory @Inject constructor(
+    data: GenericCallData?,
+    apiCallExecutor: APICallExecutor?,
+    private val service: ConstantService,
+    private val handler: ConstantHandler
+) : ListCallFactoryImpl<Constant?>(data, apiCallExecutor) {
+    override fun fetcher(): CallFetcher<Constant?>? {
+        return object : PayloadNoResourceCallFetcher<Constant?>(apiCallExecutor) {
+            override fun getCall(): Call<Payload<Constant?>>? {
+                return service.constants(ConstantFields.allFields, false)
             }
-        };
+        }
     }
 
-    @Override
-    protected CallProcessor<Constant> processor() {
-        return new TransactionalNoResourceSyncCallProcessor<>(
-                data.databaseAdapter(),
-                handler
-        );
+    override fun processor(): CallProcessor<Constant?> {
+        return TransactionalNoResourceSyncCallProcessor(
+            data.databaseAdapter(),
+            handler
+        )
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index a41354ebe7..bcc45ee0b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -25,30 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.constant.internal;
+package org.hisp.dhis.android.core.constant.internal
 
-import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
+import org.hisp.dhis.android.core.constant.Constant
+import javax.inject.Inject
 
 @Reusable
-public class ConstantModuleDownloader implements TypedModuleDownloader<List<Constant>> {
-
-    private final ConstantCallFactory constantCallFactory;
-
-    @Inject
-    ConstantModuleDownloader(ConstantCallFactory constantCallFactory) {
-        this.constantCallFactory = constantCallFactory;
-    }
-
-    @Override
-    public Single<List<Constant>> downloadMetadata() {
-        return Single.fromCallable(constantCallFactory.create());
+class ConstantModuleDownloader @Inject internal constructor(private val constantCallFactory: ConstantCallFactory) :
+    TypedModuleDownloader<List<Constant>?> {
+    override fun downloadMetadata(): Single<List<Constant>?> {
+        return Single.fromCallable(
+            constantCallFactory.create()
+        )
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index 458fe184ff..84d168cb45 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -25,21 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.constant.internal
 
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.constant.Constant;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface ConstantService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.constant.Constant
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal interface ConstantService {
     @GET("constants")
-    Call<Payload<Constant>> constants(@Query("fields") @Which Fields<Constant> fields,
-                                      @Query("paging") boolean paging);
+    fun constants(
+        @Query("fields") @Which fields: Fields<Constant?>?,
+        @Query("paging") paging: Boolean
+    ): Call<Payload<Constant?>?>?
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 1de6e3092b..78b6912f83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -25,35 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user.internal
 
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader;
-import org.hisp.dhis.android.core.user.User;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
+import org.hisp.dhis.android.core.user.User
+import javax.inject.Inject
 
 @Reusable
-public class UserModuleDownloader implements TypedModuleDownloader<User> {
-
-    private final UserCall userCall;
-    private final AuthorityEndpointCallFactory authorityCallFactory;
-
-    @Inject
-    UserModuleDownloader(UserCall userCall, AuthorityEndpointCallFactory authorityCallFactory) {
-        this.userCall = userCall;
-        this.authorityCallFactory = authorityCallFactory;
-    }
-
-    @Override
-    public Single<User> downloadMetadata() {
-        return Single.fromCallable(() -> {
-            User user = userCall.call();
-            authorityCallFactory.create().call();
-            return user;
-        });
+internal class UserModuleDownloader @Inject internal constructor(
+    private val userCall: UserCall,
+    private val authorityCallFactory: AuthorityEndpointCallFactory
+) : TypedModuleDownloader<User?> {
+    override fun downloadMetadata(): Single<User> {
+        return Single.fromCallable {
+            val user = userCall.call()
+            authorityCallFactory.create().call()
+            user
+        }
     }
 }
\ No newline at end of file

From 6ca23d18c6f9e3aeba9aa3adffa32ddadf78aefa Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 16 Aug 2023 11:58:59 +0200
Subject: [PATCH 260/478] [ANDROSDK-1732] refactor: - ConstantModule network
 call to coroutines

---
 .../internal/PayloadNoResourceCallFetcher.kt    |  2 +-
 .../constant/internal/ConstantCallFactory.kt    | 17 ++++++++---------
 .../internal/ConstantModuleDownloader.kt        |  1 +
 .../core/constant/internal/ConstantService.kt   |  4 ++--
 .../core/user/internal/UserModuleDownloader.kt  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
index 88d421f5d8..59659ec1a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
@@ -34,7 +34,7 @@ import retrofit2.Call
 
 abstract class PayloadNoResourceCallFetcher<P> protected constructor(private val apiCallExecutor: APICallExecutor) :
     CallFetcher<P> {
-    protected abstract val call: Call<Payload<P>?>?
+    protected abstract val call: Call<Payload<P>?>
     @Throws(D2Error::class)
     override fun fetch(): List<P> {
         return apiCallExecutor.executePayloadCall(call)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
index 654dab13f8..3951ea57cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
@@ -42,20 +42,19 @@ import javax.inject.Inject
 
 @Reusable
 internal class ConstantCallFactory @Inject constructor(
-    data: GenericCallData?,
-    apiCallExecutor: APICallExecutor?,
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
     private val service: ConstantService,
     private val handler: ConstantHandler
-) : ListCallFactoryImpl<Constant?>(data, apiCallExecutor) {
-    override fun fetcher(): CallFetcher<Constant?>? {
-        return object : PayloadNoResourceCallFetcher<Constant?>(apiCallExecutor) {
-            override fun getCall(): Call<Payload<Constant?>>? {
-                return service.constants(ConstantFields.allFields, false)
-            }
+) : ListCallFactoryImpl<Constant>(data, apiCallExecutor) {
+    override fun fetcher(): CallFetcher<Constant> {
+        return object : PayloadNoResourceCallFetcher<Constant>(apiCallExecutor) {
+            override val call: Call<Payload<Constant>?>
+                get() = service.constants(ConstantFields.allFields, false)
         }
     }
 
-    override fun processor(): CallProcessor<Constant?> {
+    override fun processor(): CallProcessor<Constant> {
         return TransactionalNoResourceSyncCallProcessor(
             data.databaseAdapter(),
             handler
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index bcc45ee0b3..b6bcfc204d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -37,6 +37,7 @@ import javax.inject.Inject
 class ConstantModuleDownloader @Inject internal constructor(private val constantCallFactory: ConstantCallFactory) :
     TypedModuleDownloader<List<Constant>?> {
     override fun downloadMetadata(): Single<List<Constant>?> {
+        // TODO : rxSingle
         return Single.fromCallable(
             constantCallFactory.create()
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index 84d168cb45..73a6fa9da0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -38,7 +38,7 @@ import retrofit2.http.Query
 internal interface ConstantService {
     @GET("constants")
     fun constants(
-        @Query("fields") @Which fields: Fields<Constant?>?,
+        @Query("fields") @Which fields: Fields<Constant>,
         @Query("paging") paging: Boolean
-    ): Call<Payload<Constant?>?>?
+    ): Call<Payload<Constant>?>
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 78b6912f83..962878da74 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 internal class UserModuleDownloader @Inject internal constructor(
     private val userCall: UserCall,
     private val authorityCallFactory: AuthorityEndpointCallFactory
-) : TypedModuleDownloader<User?> {
+) : TypedModuleDownloader<User> {
     override fun downloadMetadata(): Single<User> {
         return Single.fromCallable {
             val user = userCall.call()

From 42200a84a289adaa94ab18cf20897c4f4e5d3a23 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 09:26:38 +0200
Subject: [PATCH 261/478] [ANDROSDK-1732] refactor: - ConstantModule calls from
 RxJava to Coroutines fix: - AuthorityEndpointCallFactory to access Kotlin
 properties style: - Added line to Eof

---
 .../factories/internal/ListCallFactoryImpl.kt | 11 +++--
 .../internal/ListCoroutineCallFactory.kt      | 33 +++++++++++++
 .../internal/ListCoroutineCallFactoryImpl.kt  | 47 +++++++++++++++++++
 .../fetchers/internal/CoroutineCallFetcher.kt | 36 ++++++++++++++
 ... PayloadNoResourceCoroutineCallFetcher.kt} | 16 +++----
 .../call/internal/EndpointCoroutineCall.kt    | 45 ++++++++++++++++++
 ...ransactionalNoResourceSyncCallProcessor.kt |  2 +-
 .../modules/internal/TypedModuleDownloader.kt |  2 +-
 ...ory.kt => ConstantCoroutineCallFactory.kt} | 27 +++++------
 .../internal/ConstantModuleDownloader.kt      | 18 +++----
 .../internal/ConstantPackageDIModule.kt       |  4 +-
 .../core/constant/internal/ConstantService.kt |  7 ++-
 .../AuthorityEndpointCallFactory.java         |  5 +-
 .../user/internal/UserModuleDownloader.kt     |  4 +-
 14 files changed, 209 insertions(+), 48 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{PayloadNoResourceCallFetcher.kt => PayloadNoResourceCoroutineCallFetcher.kt} (80%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
 rename core/src/main/java/org/hisp/dhis/android/core/constant/internal/{ConstantCallFactory.kt => ConstantCoroutineCallFactory.kt} (75%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
index aa71ac9a7e..32bef41466 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
@@ -27,21 +27,22 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
+import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
 
-internal abstract class ListCallFactoryImpl<P> protected constructor(
+internal abstract class ListCallFactoryImpl<P>(
     protected val data: GenericCallData,
     protected val apiCallExecutor: APICallExecutor
 ) : ListCallFactory<P> {
+
     override fun create(): Callable<List<P>> {
         return EndpointCall(fetcher(), processor())
     }
 
-    protected abstract fun fetcher(): CallFetcher<P>?
-    protected abstract fun processor(): CallProcessor<P>?
-}
\ No newline at end of file
+    protected abstract fun fetcher(): CallFetcher<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
new file mode 100644
index 0000000000..e54f2c932e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+interface ListCoroutineCallFactory<P> {
+    suspend fun create(): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
new file mode 100644
index 0000000000..e794f4a42a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
+    protected val data: GenericCallData,
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : ListCoroutineCallFactory<P> {
+    override suspend fun create(): List<P> {
+        val objects: List<P> = fetcher().invoke()
+        processor().process(objects)
+        return objects
+    }
+
+    protected abstract fun fetcher(): suspend () -> List<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
new file mode 100644
index 0000000000..1eae246c2c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
+
+import org.hisp.dhis.android.core.maintenance.D2Error
+
+interface CoroutineCallFetcher<P> {
+    @Throws(D2Error::class)
+    suspend fun fetch(): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
similarity index 80%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
index 59659ec1a8..f7262ae6bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.maintenance.D2Error
-import retrofit2.Call
 
-abstract class PayloadNoResourceCallFetcher<P> protected constructor(private val apiCallExecutor: APICallExecutor) :
-    CallFetcher<P> {
-    protected abstract val call: Call<Payload<P>?>
+internal abstract class PayloadNoResourceCoroutineCallFetcher<P> protected constructor(
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : CoroutineCallFetcher<P> {
+    protected abstract val call: Payload<P>?
     @Throws(D2Error::class)
-    override fun fetch(): List<P> {
-        return apiCallExecutor.executePayloadCall(call)
+    override suspend fun fetch(): List<P> {
+        return coroutineAPICallExecutor.wrap { call }.getOrThrow()?.items().orEmpty()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
new file mode 100644
index 0000000000..d4784f3824
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.internal
+
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+class EndpointCoroutineCall<P>(
+    private val fetcher: CoroutineCallFetcher<P>,
+    private val processor: CallProcessor<P>
+) {
+
+    @Throws(Exception::class)
+    suspend fun call(): List<P> {
+        val objects: List<P> = fetcher.fetch()
+        processor.process(objects)
+        return objects
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
index 40a29b70ce..159e1045d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
@@ -45,4 +45,4 @@ internal class TransactionalNoResourceSyncCallProcessor<O>(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index fdcfd8514b..1d97f767dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -31,4 +31,4 @@ import io.reactivex.Single
 
 interface TypedModuleDownloader<O> {
     fun downloadMetadata(): Single<O>?
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 3951ea57cb..7b537e2ccb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -28,29 +28,26 @@
 package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.PayloadNoResourceCallFetcher
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
 import org.hisp.dhis.android.core.constant.Constant
-import retrofit2.Call
-import javax.inject.Inject
 
 @Reusable
-internal class ConstantCallFactory @Inject constructor(
+internal class ConstantCoroutineCallFactory @Inject constructor(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: ConstantService,
     private val handler: ConstantHandler
-) : ListCallFactoryImpl<Constant>(data, apiCallExecutor) {
-    override fun fetcher(): CallFetcher<Constant> {
-        return object : PayloadNoResourceCallFetcher<Constant>(apiCallExecutor) {
-            override val call: Call<Payload<Constant>?>
-                get() = service.constants(ConstantFields.allFields, false)
+) : ListCoroutineCallFactoryImpl<Constant>(data, coroutineAPICallExecutor) {
+    override fun fetcher(): suspend () -> List<Constant> {
+        return suspend {
+            coroutineAPICallExecutor.wrap {
+                service.constants(ConstantFields.allFields, false)
+            }.getOrThrow()?.items().orEmpty()
         }
     }
 
@@ -60,4 +57,4 @@ internal class ConstantCallFactory @Inject constructor(
             handler
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index b6bcfc204d..3b9f94be8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -29,17 +29,19 @@ package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import javax.inject.Inject
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.constant.Constant
-import javax.inject.Inject
 
 @Reusable
-class ConstantModuleDownloader @Inject internal constructor(private val constantCallFactory: ConstantCallFactory) :
-    TypedModuleDownloader<List<Constant>?> {
-    override fun downloadMetadata(): Single<List<Constant>?> {
-        // TODO : rxSingle
-        return Single.fromCallable(
+class ConstantModuleDownloader @Inject internal constructor(
+    private val constantCallFactory: ConstantCoroutineCallFactory
+) :
+    TypedModuleDownloader<List<Constant>> {
+    override fun downloadMetadata(): Single<List<Constant>> {
+        return rxSingle {
             constantCallFactory.create()
-        )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
index f840f6c632..300922511d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.constant.internal
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactory
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.constant.Constant
@@ -56,7 +56,7 @@ internal class ConstantPackageDIModule {
 
     @Provides
     @Reusable
-    fun constantCallFactory(impl: ConstantCallFactory): ListCallFactory<Constant> {
+    fun constantCallFactory(impl: ConstantCoroutineCallFactory): ListCoroutineCallFactory<Constant> {
         return impl
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index 73a6fa9da0..c92698f27b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -31,14 +31,13 @@ import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.constant.Constant
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
 
 internal interface ConstantService {
     @GET("constants")
-    fun constants(
+    suspend fun constants(
         @Query("fields") @Which fields: Fields<Constant>,
         @Query("paging") paging: Boolean
-    ): Call<Payload<Constant>?>
-}
\ No newline at end of file
+    ): Payload<Constant>?
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
index 133af027dc..02e56ce4fa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
@@ -60,7 +60,7 @@ final class AuthorityEndpointCallFactory extends ListCallFactoryImpl<Authority>
 
     @Override
     protected CallFetcher<Authority> fetcher() {
-        return new AuthorityCallFetcher(apiCallExecutor) {
+        return new AuthorityCallFetcher(getApiCallExecutor()) {
             @Override
             protected retrofit2.Call<List<String>> getCall() {
                 return service.getAuthorities();
@@ -70,6 +70,7 @@ protected retrofit2.Call<List<String>> getCall() {
 
     @Override
     protected CallProcessor<Authority> processor() {
-        return new AuthorityCallProcessor(data.databaseAdapter(), handler);
+        return new AuthorityCallProcessor(getData().databaseAdapter(), handler);
     }
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 962878da74..48653d2f69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.user.User
-import javax.inject.Inject
 
 @Reusable
 internal class UserModuleDownloader @Inject internal constructor(
@@ -45,4 +45,4 @@ internal class UserModuleDownloader @Inject internal constructor(
             user
         }
     }
-}
\ No newline at end of file
+}

From 9fa43df40f0df3747593a54e8db7d4ba48a23090 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 10:20:39 +0200
Subject: [PATCH 262/478] [ANDROSDK-1732] refactor: - Cleaned up some nullables
 - Simplify fetcher suspend call

---
 .../factories/internal/ListCoroutineCallFactoryImpl.kt    | 4 ++--
 .../core/arch/modules/internal/TypedModuleDownloader.kt   | 2 +-
 .../constant/internal/ConstantCoroutineCallFactory.kt     | 8 +++-----
 .../android/core/constant/internal/ConstantService.kt     | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
index e794f4a42a..bebe89365f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
@@ -37,11 +37,11 @@ internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
     protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) : ListCoroutineCallFactory<P> {
     override suspend fun create(): List<P> {
-        val objects: List<P> = fetcher().invoke()
+        val objects: List<P> = fetcher()
         processor().process(objects)
         return objects
     }
 
-    protected abstract fun fetcher(): suspend () -> List<P>
+    protected abstract suspend fun fetcher():  List<P>
     protected abstract fun processor(): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index 1d97f767dd..73a074b4a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -30,5 +30,5 @@ package org.hisp.dhis.android.core.arch.modules.internal
 import io.reactivex.Single
 
 interface TypedModuleDownloader<O> {
-    fun downloadMetadata(): Single<O>?
+    fun downloadMetadata(): Single<O>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 7b537e2ccb..69ed70e7bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -43,12 +43,10 @@ internal class ConstantCoroutineCallFactory @Inject constructor(
     private val service: ConstantService,
     private val handler: ConstantHandler
 ) : ListCoroutineCallFactoryImpl<Constant>(data, coroutineAPICallExecutor) {
-    override fun fetcher(): suspend () -> List<Constant> {
-        return suspend {
-            coroutineAPICallExecutor.wrap {
+    override suspend fun fetcher():  List<Constant> {
+        return coroutineAPICallExecutor.wrap {
                 service.constants(ConstantFields.allFields, false)
-            }.getOrThrow()?.items().orEmpty()
-        }
+            }.getOrThrow().items()
     }
 
     override fun processor(): CallProcessor<Constant> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index c92698f27b..ba7b1902a2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -39,5 +39,5 @@ internal interface ConstantService {
     suspend fun constants(
         @Query("fields") @Which fields: Fields<Constant>,
         @Query("paging") paging: Boolean
-    ): Payload<Constant>?
+    ): Payload<Constant>
 }

From 383e1e396ab5d0e792410642c56890fe1babb8a5 Mon Sep 17 00:00:00 2001
From: andresmr <andres@dhis2.org>
Date: Fri, 8 Sep 2023 11:27:09 +0200
Subject: [PATCH 263/478] [ANDROSDK-1742] Update PagingSourceRepository
 implementations

---
 .../paging/internal/RepositoryPagingSource.kt | 61 ++++++++++-------
 .../RepositoryPagingSourceWithTransformer.kt  | 65 +++++++++++--------
 .../EventQueryCollectionRepository.java       |  1 +
 .../TrackeEntityInstanceQueryPagingSource.kt  |  6 +-
 4 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
index 5a48a38969..7e0e253838 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
@@ -38,6 +38,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAp
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
+import java.io.IOException
 
 class RepositoryPagingSource<M : CoreObject> internal constructor(
     private val store: ReadableStore<M>,
@@ -45,34 +46,46 @@ class RepositoryPagingSource<M : CoreObject> internal constructor(
     private val childrenAppenders: Map<String, ChildrenAppender<M>>,
 ) : PagingSource<M, M>() {
 
-    private val whereClauseBuilder = WhereClauseBuilder()
-    private val whereClauseFromScopeBuilder = WhereClauseFromScopeBuilder(whereClauseBuilder)
-
     override fun getRefreshKey(state: PagingState<M, M>): M? {
-        return state.anchorPosition?.let { state.closestItemToPosition(it) }
+        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
     }
 
     override suspend fun load(params: LoadParams<M>): LoadResult<M, M> {
-        /*OrderByClauseBuilder.addSortingClauses(
-            whereClauseBuilder,
-            scope.orderBy(),
-            params.key?.toContentValues(),
-            false,
-            scope.pagingKey(),
-        )*/
-        val whereClause = whereClauseFromScopeBuilder.getWhereClause(
-            scope,
-        )
-        val withoutChildren = store.selectWhere(
-            whereClause,
-            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-            params.loadSize,
-        )
+        try {
+            val whereClauseBuilder = WhereClauseBuilder()
+
+            params.key?.let { key ->
+                val reverse = when (params) {
+                    is LoadParams.Prepend -> true
+                    else -> false
+                }
+
+                OrderByClauseBuilder.addSortingClauses(
+                    whereClauseBuilder,
+                    scope.orderBy(),
+                    key.toContentValues(),
+                    reverse,
+                    scope.pagingKey(),
+                )
+            }
+
+            val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(
+                scope,
+            )
+            val withoutChildren = store.selectWhere(
+                whereClause,
+                OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+                params.loadSize,
+            )
 
-        return LoadResult.Page(
-            data = appendInObjectCollection(withoutChildren, childrenAppenders, scope.children()),
-            prevKey = null,
-            nextKey = null,
-        )
+            val items = appendInObjectCollection(withoutChildren, childrenAppenders, scope.children())
+            return LoadResult.Page(
+                data = items,
+                prevKey = items.firstOrNull(),
+                nextKey = items.getOrNull(params.loadSize - 1),
+            )
+        } catch (e: IOException) {
+            return LoadResult.Error(e)
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
index a4b02aa98e..890772ee47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
@@ -39,6 +39,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAp
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
+import java.io.IOException
 
 internal class RepositoryPagingSourceWithTransformer<M : CoreObject, T : Any> internal constructor(
     private val store: ReadableStore<M>,
@@ -47,35 +48,47 @@ internal class RepositoryPagingSourceWithTransformer<M : CoreObject, T : Any> in
     private val transformer: TwoWayTransformer<M, T>,
 ) : PagingSource<M, T>() {
     override fun getRefreshKey(state: PagingState<M, T>): M? {
-        val item = state.anchorPosition?.let { state.closestItemToPosition(it) }
-        return item?.let { transformer.deTransform(it) }
+        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
     }
 
     override suspend fun load(params: LoadParams<M>): LoadResult<M, T> {
-        val whereClauseBuilder = WhereClauseBuilder()
-        OrderByClauseBuilder.addSortingClauses(
-            whereClauseBuilder,
-            scope.orderBy(),
-            params.key?.toContentValues(),
-            false,
-            scope.pagingKey(),
-        )
-        val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope)
-        val withoutChildren = store.selectWhere(
-            whereClause,
-            OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-            params.loadSize,
-        )
-        val items = ChildrenAppenderExecutor.appendInObjectCollection(
-            withoutChildren,
-            childrenAppenders,
-            scope.children(),
-        ).map { transformer.transform(it) }
+        try {
+            val whereClauseBuilder = WhereClauseBuilder()
 
-        return LoadResult.Page(
-            data = items,
-            prevKey = null,
-            nextKey = null,
-        )
+            params.key?.let { key ->
+                val reverse = when (params) {
+                    is LoadParams.Prepend -> true
+                    else -> false
+                }
+
+                OrderByClauseBuilder.addSortingClauses(
+                    whereClauseBuilder,
+                    scope.orderBy(),
+                    key.toContentValues(),
+                    reverse,
+                    scope.pagingKey(),
+                )
+            }
+
+            val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope)
+            val withoutChildren = store.selectWhere(
+                whereClause,
+                OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
+                params.loadSize,
+            )
+            val items = ChildrenAppenderExecutor.appendInObjectCollection(
+                withoutChildren,
+                childrenAppenders,
+                scope.children(),
+            )
+
+            return LoadResult.Page(
+                data = items.map { transformer.transform(it) },
+                prevKey = items.firstOrNull(),
+                nextKey = items.getOrNull(params.loadSize - 1),
+            )
+        } catch (e: IOException) {
+            return LoadResult.Error(e)
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
index 1d68fdb7c3..70eedcff66 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
@@ -63,6 +63,7 @@
 import io.reactivex.Single;
 import kotlinx.coroutines.flow.Flow;
 
+@SuppressWarnings("PMD.ExcessiveImports")
 @Reusable
 public final class EventQueryCollectionRepository implements ReadOnlyWithUidCollectionRepository<Event> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
index d34a25de99..0a02cb127c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
@@ -64,7 +64,7 @@ internal class TrackeEntityInstanceQueryPagingSource(
     override fun getRefreshKey(
         state: PagingState<TrackedEntityInstance, TrackedEntityInstance>,
     ): TrackedEntityInstance? {
-        return state.anchorPosition?.let { state.closestItemToPosition(it) }
+        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
     }
 
     override suspend fun load(
@@ -76,8 +76,8 @@ internal class TrackeEntityInstanceQueryPagingSource(
             LoadResult.Error((it as Result.Failure).failure)
         } ?: LoadResult.Page(
             data = pages.map { it.getOrThrow() },
-            prevKey = null,
-            nextKey = null,
+            prevKey = pages.firstOrNull()?.getOrThrow(),
+            nextKey = pages.getOrNull(params.loadSize - 1)?.getOrThrow(),
         )
     }
 }

From db1f65ff69b27c27ea9ec0549802445190355c3b Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 12:56:10 +0200
Subject: [PATCH 264/478] [ANDROSDK-1732] refactor: - TypedModuleDownloader.kt
 to coroutines - MetadataCallShould.kt to handle new calls - MetadataCall.kt
 to handle coroutines for those that depend on TypedModuleDownloader.kt style:
 - Minor styling fixes

---
 .../factories/internal/ListCallFactoryImpl.kt |  4 +--
 .../internal/ListCoroutineCallFactoryImpl.kt  |  4 +--
 .../PayloadNoResourceCoroutineCallFetcher.kt  |  3 ++-
 .../call/internal/EndpointCoroutineCall.kt    |  2 +-
 ...ransactionalNoResourceSyncCallProcessor.kt |  2 +-
 .../modules/internal/TypedModuleDownloader.kt |  4 +--
 .../internal/ConstantCoroutineCallFactory.kt  | 12 ++++-----
 .../internal/ConstantModuleDownloader.kt      | 14 ++++------
 .../core/constant/internal/ConstantService.kt |  2 +-
 .../core/domain/metadata/MetadataCall.kt      |  6 ++---
 .../user/internal/UserModuleDownloader.kt     | 15 +++++------
 .../internal/VisualizationModuleDownloader.kt | 10 +++----
 .../domain/metadata/MetadataCallShould.kt     | 26 +++++++++++++------
 13 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
index 32bef41466..cac24c14bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
 
 internal abstract class ListCallFactoryImpl<P>(
     protected val data: GenericCallData,
-    protected val apiCallExecutor: APICallExecutor
+    protected val apiCallExecutor: APICallExecutor,
 ) : ListCallFactory<P> {
 
     override fun create(): Callable<List<P>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
index bebe89365f..4e50243c4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 
 internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
     protected val data: GenericCallData,
-    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : ListCoroutineCallFactory<P> {
     override suspend fun create(): List<P> {
         val objects: List<P> = fetcher()
@@ -42,6 +42,6 @@ internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
         return objects
     }
 
-    protected abstract suspend fun fetcher():  List<P>
+    protected abstract suspend fun fetcher(): List<P>
     protected abstract fun processor(): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
index f7262ae6bf..ac4b39b82e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/PayloadNoResourceCoroutineCallFetcher.kt
@@ -32,9 +32,10 @@ import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.maintenance.D2Error
 
 internal abstract class PayloadNoResourceCoroutineCallFetcher<P> protected constructor(
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : CoroutineCallFetcher<P> {
     protected abstract val call: Payload<P>?
+
     @Throws(D2Error::class)
     override suspend fun fetch(): List<P> {
         return coroutineAPICallExecutor.wrap { call }.getOrThrow()?.items().orEmpty()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
index d4784f3824..77decdd2e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCoroutineCall.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 
 class EndpointCoroutineCall<P>(
     private val fetcher: CoroutineCallFetcher<P>,
-    private val processor: CallProcessor<P>
+    private val processor: CallProcessor<P>,
 ) {
 
     @Throws(Exception::class)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
index 159e1045d8..74548add24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/processors/internal/TransactionalNoResourceSyncCallProcessor.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 
 internal class TransactionalNoResourceSyncCallProcessor<O>(
     private val databaseAdapter: DatabaseAdapter,
-    private val handler: Handler<O>
+    private val handler: Handler<O>,
 ) : CallProcessor<O> {
     @Throws(D2Error::class)
     override fun process(objectList: List<O>) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index 73a074b4a5..783394d0e3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.modules.internal
 
-import io.reactivex.Single
-
 interface TypedModuleDownloader<O> {
-    fun downloadMetadata(): Single<O>
+    suspend fun downloadMetadata(): O
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 69ed70e7bf..22620233d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -28,31 +28,31 @@
 package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
 import org.hisp.dhis.android.core.constant.Constant
+import javax.inject.Inject
 
 @Reusable
 internal class ConstantCoroutineCallFactory @Inject constructor(
     data: GenericCallData,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: ConstantService,
-    private val handler: ConstantHandler
+    private val handler: ConstantHandler,
 ) : ListCoroutineCallFactoryImpl<Constant>(data, coroutineAPICallExecutor) {
-    override suspend fun fetcher():  List<Constant> {
+    override suspend fun fetcher(): List<Constant> {
         return coroutineAPICallExecutor.wrap {
-                service.constants(ConstantFields.allFields, false)
-            }.getOrThrow().items()
+            service.constants(ConstantFields.allFields, false)
+        }.getOrThrow().items()
     }
 
     override fun processor(): CallProcessor<Constant> {
         return TransactionalNoResourceSyncCallProcessor(
             data.databaseAdapter(),
-            handler
+            handler,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index 3b9f94be8a..0956a2fe7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -28,20 +28,16 @@
 package org.hisp.dhis.android.core.constant.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import javax.inject.Inject
-import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.constant.Constant
+import javax.inject.Inject
 
 @Reusable
-class ConstantModuleDownloader @Inject internal constructor(
-    private val constantCallFactory: ConstantCoroutineCallFactory
+internal class ConstantModuleDownloader @Inject internal constructor(
+    private val constantCallFactory: ConstantCoroutineCallFactory,
 ) :
     TypedModuleDownloader<List<Constant>> {
-    override fun downloadMetadata(): Single<List<Constant>> {
-        return rxSingle {
-            constantCallFactory.create()
-        }
+    override suspend fun downloadMetadata(): List<Constant> {
+        return constantCallFactory.create()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index ba7b1902a2..cb33dc4eec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -38,6 +38,6 @@ internal interface ConstantService {
     @GET("constants")
     suspend fun constants(
         @Query("fields") @Which fields: Fields<Constant>,
-        @Query("paging") paging: Boolean
+        @Query("paging") paging: Boolean,
     ): Payload<Constant>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 6d9576ecbd..8b796beae3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -130,7 +130,7 @@ internal class MetadataCall @Inject constructor(
         useCaseDownloader.downloadMetadata().blockingAwait()
         emit(progressManager.increaseProgress(StockUseCase::class.java, false))
 
-        constantModuleDownloader.downloadMetadata().blockingGet()
+        constantModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Constant::class.java, false))
 
         smsModule.configCase().refreshMetadataIdsCallable().blockingAwait()
@@ -138,7 +138,7 @@ internal class MetadataCall @Inject constructor(
     }
 
     private fun executeUserCallAndChildren(progressManager: D2ProgressManager): Flow<D2Progress> = flow {
-        val user = userModuleDownloader.downloadMetadata().blockingGet()
+        val user = runBlocking { userModuleDownloader.downloadMetadata() }
         emit(progressManager.increaseProgress(User::class.java, false))
 
         organisationUnitModuleDownloader.downloadMetadata(user).blockingAwait()
@@ -153,7 +153,7 @@ internal class MetadataCall @Inject constructor(
         categoryDownloader.downloadMetadata().blockingAwait()
         emit(progressManager.increaseProgress(Category::class.java, false))
 
-        visualizationDownloader.downloadMetadata().blockingGet()
+        visualizationDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Visualization::class.java, false))
 
         programIndicatorModuleDownloader.downloadMetadata().blockingAwait()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 48653d2f69..3ace1f0e89 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -28,21 +28,18 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.user.User
+import javax.inject.Inject
 
 @Reusable
 internal class UserModuleDownloader @Inject internal constructor(
     private val userCall: UserCall,
-    private val authorityCallFactory: AuthorityEndpointCallFactory
+    private val authorityCallFactory: AuthorityEndpointCallFactory,
 ) : TypedModuleDownloader<User> {
-    override fun downloadMetadata(): Single<User> {
-        return Single.fromCallable {
-            val user = userCall.call()
-            authorityCallFactory.create().call()
-            user
-        }
+    override suspend fun downloadMetadata(): User {
+        val user = userCall.call()
+        authorityCallFactory.create().call()
+        return user
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index 3fdf65157b..0fa0a22bf0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.visualization.Visualization
@@ -41,11 +40,8 @@ internal class VisualizationModuleDownloader @Inject internal constructor(
 ) :
     TypedModuleDownloader<List<Visualization>> {
 
-    override fun downloadMetadata(): Single<List<Visualization>> {
-        return Single.fromCallable {
-            analyticsDhisVisualizationStore.selectAll().map { it.uid() }.toSet()
-        }.flatMap {
-            visualizationCall.download(it)
-        }
+    override suspend fun downloadMetadata(): List<Visualization> {
+        val visualizations = analyticsDhisVisualizationStore.selectAll().map { it.uid() }.toSet()
+        return visualizationCall.download(visualizations).blockingGet()
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 9c7f725aa1..3cdc47516a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -109,7 +109,9 @@ class MetadataCallShould : BaseCallShould() {
         }
         whenever(systemSettingDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(useCaseModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
-        whenever(userDownloader.downloadMetadata()).thenReturn(Single.just(user))
+        userDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(user)
+        }
         whenever(programDownloader.downloadMetadata()).thenReturn(
             Completable.complete(),
         )
@@ -120,12 +122,14 @@ class MetadataCallShould : BaseCallShould() {
             Completable.complete(),
         )
         whenever(programIndicatorModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
-        whenever(visualizationDownloader.downloadMetadata()).thenReturn(
-            Single.just(emptyList()),
-        )
+        visualizationDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(emptyList())
+        }
         whenever(legendSetModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(expressionDimensIndicatorModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
-        whenever(constantDownloader.downloadMetadata()).thenReturn(Single.just(emptyList()))
+        constantDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(emptyList())
+        }
         whenever(indicatorDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(smsModule.configCase()).thenReturn(configCase)
@@ -178,7 +182,9 @@ class MetadataCallShould : BaseCallShould() {
 
     @Test
     fun fail_when_user_call_fail() {
-        whenever(userDownloader.downloadMetadata()).thenReturn(Single.error(networkError))
+        userDownloader.stub {
+            onBlocking { downloadMetadata() }.doAnswer { throw networkError }
+        }
         downloadAndAssertError()
     }
 
@@ -190,7 +196,9 @@ class MetadataCallShould : BaseCallShould() {
 
     @Test
     fun fail_when_visualization_download_call_fail() {
-        whenever(visualizationDownloader.downloadMetadata()).thenReturn(Single.error(networkError))
+        visualizationDownloader.stub {
+            onBlocking { downloadMetadata() }.doAnswer { throw networkError }
+        }
         downloadAndAssertError()
     }
 
@@ -214,7 +222,9 @@ class MetadataCallShould : BaseCallShould() {
 
     @Test
     fun fail_when_constant_call_fail() {
-        whenever(constantDownloader.downloadMetadata()).thenReturn(Single.error(networkError))
+        constantDownloader.stub {
+            onBlocking { downloadMetadata() }.doAnswer { throw networkError }
+        }
         downloadAndAssertError()
     }
 

From 60da5d5da644b45eae0dec773ac06738eb5bc7d3 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 16:51:21 +0200
Subject: [PATCH 265/478] [ANDROSDK-1732] refactor: - Make interfaces
 functional

---
 .../arch/call/factories/internal/ListCoroutineCallFactory.kt    | 2 +-
 .../core/arch/call/fetchers/internal/CoroutineCallFetcher.kt    | 2 +-
 .../android/core/arch/modules/internal/TypedModuleDownloader.kt | 2 +-
 .../hisp/dhis/android/core/constant/internal/ConstantService.kt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
index e54f2c932e..4c9835536d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactory.kt
@@ -28,6 +28,6 @@
 
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-interface ListCoroutineCallFactory<P> {
+fun interface ListCoroutineCallFactory<P> {
     suspend fun create(): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
index 1eae246c2c..62d3fbca2c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/CoroutineCallFetcher.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
 import org.hisp.dhis.android.core.maintenance.D2Error
 
-interface CoroutineCallFetcher<P> {
+fun interface CoroutineCallFetcher<P> {
     @Throws(D2Error::class)
     suspend fun fetch(): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
index 783394d0e3..9070bd61de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/TypedModuleDownloader.kt
@@ -27,6 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.modules.internal
 
-interface TypedModuleDownloader<O> {
+fun interface TypedModuleDownloader<O> {
     suspend fun downloadMetadata(): O
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
index cb33dc4eec..78df5e133e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantService.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.constant.Constant
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface ConstantService {
+internal fun interface ConstantService {
     @GET("constants")
     suspend fun constants(
         @Query("fields") @Which fields: Fields<Constant>,

From cc77344e262584bbee4cb09eb5e49693f6b452ac Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 12:14:11 +0200
Subject: [PATCH 266/478] [ANDROSDK-1732] refactor: - Remove unnecessary
 "runBlocking" calls from MetadataCall.kt

---
 .../hisp/dhis/android/core/domain/metadata/MetadataCall.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index e87565b583..24fdb6bc70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -130,7 +130,7 @@ internal class MetadataCall @Inject constructor(
         useCaseDownloader.downloadMetadata().blockingAwait()
         emit(progressManager.increaseProgress(StockUseCase::class.java, false))
 
-        runBlocking { constantModuleDownloader.downloadMetadata() }
+        constantModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Constant::class.java, false))
 
         smsModule.configCase().refreshMetadataIdsCallable().blockingAwait()
@@ -138,7 +138,7 @@ internal class MetadataCall @Inject constructor(
     }
 
     private fun executeUserCallAndChildren(progressManager: D2ProgressManager): Flow<D2Progress> = flow {
-        val user = runBlocking { userModuleDownloader.downloadMetadata() }
+        val user = userModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(User::class.java, false))
 
         organisationUnitModuleDownloader.downloadMetadata(user).blockingAwait()

From 37d3c37a80d64d3d664536a12ec7d1921a71dc32 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 12:19:07 +0200
Subject: [PATCH 267/478] [ANDROSDK-1736] refactor: - All RxJava calls to
 Coroutines for ReservedValues fix: - EndpointCall.kt extending

---
 ...servedValueManagerRealIntegrationShould.kt | 20 +++---
 .../internal/ListCallFactoryImpl.java         |  2 +-
 ...ryCallFactory.java => QueryCallFactory.kt} | 14 ++---
 ....java => QueryCoroutineCallFactoryImpl.kt} | 47 ++++++--------
 .../internal/UidsCallFactoryImpl.java         |  2 +-
 ...stNoResourceWithErrorCatcherCallFetcher.kt | 36 ++++-------
 .../core/arch/call/internal/EndpointCall.kt   |  8 +--
 ...ckedEntityAttributeReservedValueManager.kt | 23 +++----
 ...tributeReservedValueEndpointCallFactory.kt | 63 +++++++++----------
 ...ckedEntityAttributeReservedValueService.kt |  6 +-
 10 files changed, 93 insertions(+), 128 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{QueryCallFactory.java => QueryCallFactory.kt} (87%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{QueryCallFactoryImpl.java => QueryCoroutineCallFactoryImpl.kt} (63%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 132d88e64d..62f64235b8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import com.google.common.truth.Truth
-import java.util.concurrent.Callable
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -77,7 +77,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
         null
 
     @Mock
-    val trackedEntityAttributeReservedValueCall: Callable<List<TrackedEntityAttributeReservedValue>>? =
+    val trackedEntityAttributeReservedValueCall: List<TrackedEntityAttributeReservedValue>? =
         null
 
     @Captor
@@ -141,14 +141,16 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
         OrganisationUnitProgramLinkStoreImpl(d2.databaseAdapter()).insert(
             organisationUnitProgramLink
         )
-        Mockito.`when`(
-            trackedEntityAttributeReservedValueQueryCallFactory!!.create(
-                ArgumentMatchers.any(
-                    TrackedEntityAttributeReservedValueQuery::class.java
+        runBlocking {
+            Mockito.`when`(
+                trackedEntityAttributeReservedValueQueryCallFactory!!.create(
+                    ArgumentMatchers.any(
+                        TrackedEntityAttributeReservedValueQuery::class.java
+                    )
                 )
             )
-        )
-            .thenReturn(trackedEntityAttributeReservedValueCall)
+                .thenReturn(trackedEntityAttributeReservedValueCall)
+        }
         handler.handleMany(trackedEntityAttributeReservedValues)
     }
 
@@ -340,7 +342,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
      * This method stopped working because QueryCallFactory mock instance differs from Dagger's injected one,
      * so the code is calling .create() on Dagger's instance and .verify() is trying to catch the call from Mockito's instace.
      */
-    private fun assertQueryIsCreatedRight(numberOfValuesExpected: Int) {
+    private suspend fun assertQueryIsCreatedRight(numberOfValuesExpected: Int) {
         Mockito.verify(trackedEntityAttributeReservedValueQueryCallFactory)!!.create(
             trackedEntityAttributeReservedValueQueryCaptor!!.capture()
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java
index 811b6fba35..fe0a772603 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java
@@ -49,7 +49,7 @@ protected ListCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecu
 
     @Override
     public final Callable<List<P>> create() {
-        return new EndpointCall<>(fetcher(), processor());
+        return new EndpointCall(fetcher(), processor());
     }
 
     protected abstract CallFetcher<P> fetcher();
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
similarity index 87%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
index 31bb481f06..aaad9afb46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
@@ -25,14 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.factories.internal
 
-package org.hisp.dhis.android.core.arch.call.factories.internal;
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
 
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public interface QueryCallFactory<P, Q extends BaseQuery> {
-    Callable<List<P>> create(Q query);
-}
\ No newline at end of file
+fun interface QueryCallFactory<P, Q : BaseQuery> {
+    suspend fun create(query: Q): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index d79b13f85d..213ce08343 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -25,34 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public abstract class QueryCallFactoryImpl<P, Q extends BaseQuery> implements QueryCallFactory<P, Q> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected QueryCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create(Q query) {
-        return new EndpointCall<>(fetcher(query), processor(query));
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+
+internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQuery> protected constructor(
+    protected val data: GenericCallData,
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : QueryCallFactory<P, Q> {
+    override suspend fun create(query: Q): MutableList<P> {
+        val objects: List<P> = fetcher(query)
+        processor(query).process(objects)
+        return objects.toMutableList()
     }
 
-    protected abstract CallFetcher<P> fetcher(Q query);
-    protected abstract CallProcessor<P> processor(Q query);
-}
\ No newline at end of file
+    protected abstract suspend fun fetcher(query: Q): List<P>
+    protected abstract fun processor(query: Q): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
index fcd8752900..18ba147138 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
@@ -50,7 +50,7 @@ protected UidsCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecu
 
     @Override
     public final Callable<List<P>> create(Set<String> uids) {
-        return new EndpointCall<>(fetcher(uids), processor());
+        return new EndpointCall(fetcher(uids), processor());
     }
 
     protected abstract CallFetcher<P> fetcher(Set<String> uids);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
index 9c2f7df105..76abb243f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
@@ -25,30 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
-package org.hisp.dhis.android.core.arch.call.fetchers.internal;
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.maintenance.D2Error;
+internal abstract class ListNoResourceWithErrorCatcherCallFetcher<P> protected constructor(
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
+    private val errorCatcher: APICallErrorCatcher
+) {
+    protected abstract val call: List<P>
 
-import java.util.List;
-
-public abstract class ListNoResourceWithErrorCatcherCallFetcher<P> implements CallFetcher<P> {
-
-    private final APICallExecutor apiCallExecutor;
-    private final APICallErrorCatcher errorCatcher;
-
-    protected ListNoResourceWithErrorCatcherCallFetcher(APICallExecutor apiCallExecutor,
-                                                        APICallErrorCatcher errorCatcher) {
-        this.apiCallExecutor = apiCallExecutor;
-        this.errorCatcher = errorCatcher;
-    }
-
-    protected abstract retrofit2.Call<List<P>> getCall();
-
-    @Override
-    public final List<P> fetch() throws D2Error {
-        return apiCallExecutor.executeObjectCallWithErrorCatcher(getCall(), errorCatcher);
+    @Throws(D2Error::class)
+    suspend fun fetch(): List<P> {
+        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) { call }.getOrThrow()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
index f7fc7cf572..54bcfecc5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.arch.call.internal
 
 import androidx.annotation.VisibleForTesting
+import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
 
 class EndpointCall<P>(
     @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val fetcher: CallFetcher<P>,
     @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val processor: CallProcessor<P>
-) {
+) : Callable<List<P>> {
 
     @Throws(Exception::class)
-    fun call(): List<P> {
+    override fun call(): List<P> {
         val objects = fetcher.fetch()
         processor.process(objects)
         return objects
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 12a0bf4dea..9d7c22d19d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -42,7 +42,6 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.asObservable
 import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
@@ -79,7 +78,6 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val generalSettingObjectRepository: GeneralSettingObjectRepository,
     private val reservedValueSettingStore: ReservedValueSettingStore,
-    private val executor: D2CallExecutor,
     private val reservedValueQueryCallFactory: QueryCallFactory<TrackedEntityAttributeReservedValue,
         TrackedEntityAttributeReservedValueQuery>
 ) {
@@ -112,7 +110,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
     private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
 
-        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
+        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null)
 
         val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
         val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
@@ -280,12 +278,12 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
             for (organisationUnit in organisationUnits) {
                 downloadValuesIfBelowThreshold(
-                    attribute, organisationUnit, numberOfValuesToFillUp, true
+                    attribute, organisationUnit, numberOfValuesToFillUp
                 )
                 emit(increaseProgress())
             }
         } else {
-            downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
+            downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp)
 
             emit(increaseProgress())
         }
@@ -295,7 +293,6 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         attribute: String,
         organisationUnit: OrganisationUnit?,
         minNumberOfValuesToHave: Int?,
-        storeError: Boolean
     ) = coroutineScope {
         // Using local date. It's not worth it to make a system info call
         store.deleteExpired(Date())
@@ -311,7 +308,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         if (remainingValues < minNumberToTryFill) {
             val numberToReserve = fillUpTo!! - remainingValues
             downloadValues(
-                attribute, organisationUnit, numberToReserve, pattern, storeError
+                attribute, organisationUnit, numberToReserve, pattern
             )
         }
     }
@@ -321,15 +318,11 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         organisationUnit: OrganisationUnit?,
         numberToReserve: Int,
         pattern: String?,
-        storeError: Boolean
     ) {
-        executor.executeD2Call(
-            reservedValueQueryCallFactory.create(
-                TrackedEntityAttributeReservedValueQuery.create(
-                    trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
-                )
-            ),
-            storeError
+        reservedValueQueryCallFactory.create(
+            TrackedEntityAttributeReservedValueQuery.create(
+                trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
+            )
         )
 
         if (pattern != null) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index a255aef720..4927afc8ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -28,56 +28,51 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
-import retrofit2.Call
-import javax.inject.Inject
 
 @Reusable
-class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
-    data: GenericCallData?,
-    apiCallExecutor: APICallExecutor?,
+internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
+    data: GenericCallData,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: TrackedEntityAttributeReservedValueService,
     private val handler: TrackedEntityAttributeReservedValueHandler
-) : QueryCallFactoryImpl<TrackedEntityAttributeReservedValue?, TrackedEntityAttributeReservedValueQuery?>(
+) : QueryCoroutineCallFactoryImpl<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery>(
     data,
-    apiCallExecutor
+    coroutineAPICallExecutor
 ) {
+    override suspend fun fetcher(query: TrackedEntityAttributeReservedValueQuery):
+        List<TrackedEntityAttributeReservedValue> {
+
+        val errorCatcher = TrackedEntityAttributeReservedValueCallErrorCatcher()
 
-    override fun fetcher(query: TrackedEntityAttributeReservedValueQuery?): CallFetcher<TrackedEntityAttributeReservedValue?> {
-        return object: ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue?>(
-            apiCallExecutor, TrackedEntityAttributeReservedValueCallErrorCatcher()
-        ) {
-            override fun getCall(): Call<MutableList<TrackedEntityAttributeReservedValue?>>? {
-                return if (query!!.organisationUnit() == null) {
-                    service.generateAndReserve(
-                        query.trackedEntityAttributeUid(),
-                        query.numberToReserve()
-                    )
-                } else {
-                    service.generateAndReserveWithOrgUnitCode(
-                        query.trackedEntityAttributeUid(),
-                        query.numberToReserve(),
-                        query.organisationUnit()!!.code()
-                    )
-                }
+        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) {
+            if (query.organisationUnit() == null) {
+                service.generateAndReserve(
+                    query.trackedEntityAttributeUid(),
+                    query.numberToReserve()
+                )
+            } else {
+                service.generateAndReserveWithOrgUnitCode(
+                    query.trackedEntityAttributeUid(),
+                    query.numberToReserve(),
+                    query.organisationUnit()!!.code()
+                )
             }
-        }
+        }.getOrThrow()
     }
 
-    override fun processor(query: TrackedEntityAttributeReservedValueQuery?): CallProcessor<TrackedEntityAttributeReservedValue?> {
+    override fun processor(query: TrackedEntityAttributeReservedValueQuery):
+        CallProcessor<TrackedEntityAttributeReservedValue> {
         return TrackedEntityAttributeReservedValueCallProcessor(
             data.databaseAdapter(),
             handler,
-            query!!.organisationUnit(),
+            query.organisationUnit(),
             query.trackedEntityAttributePattern()
         )
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 42c64270dc..8b06967353 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -37,16 +37,16 @@ interface TrackedEntityAttributeReservedValueService {
     suspend fun generateAndReserve(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
         @Query("numberToReserve") numberToReserve: Int?
-    ): List<TrackedEntityAttributeReservedValue?>?
+    ): List<TrackedEntityAttributeReservedValue>
 
     @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
     suspend fun generateAndReserveWithOrgUnitCode(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
         @Query("numberToReserve") numberToReserve: Int?,
         @Query("ORG_UNIT_CODE") orgUnitCode: String?
-    ): List<TrackedEntityAttributeReservedValue?>?
+    ): List<TrackedEntityAttributeReservedValue>
 
     companion object {
         const val TRACKED_ENTITY_ATTRIBUTE_UID = "trackedEntityAttributeUid"
     }
-}
\ No newline at end of file
+}

From 992c0f3a2af9b70ebc1216c612f0d8aae4592943 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 13:02:00 +0200
Subject: [PATCH 268/478] Rename .java to .kt

---
 .../arch/call/factories/internal/{ListCall.java => ListCall.kt}   | 0
 .../event/internal/{EventFilterCall.java => EventFilterCall.kt}   | 0
 .../option/internal/{OptionGroupCall.java => OptionGroupCall.kt}  | 0
 ...evelEndpointCall.java => OrganisationUnitLevelEndpointCall.kt} | 0
 .../core/program/internal/{ProgramCall.java => ProgramCall.kt}    | 0
 .../program/internal/{ProgramRuleCall.java => ProgramRuleCall.kt} | 0
 .../internal/{ProgramStageCall.java => ProgramStageCall.kt}       | 0
 .../{RelationshipTypeCall.java => RelationshipTypeCall.kt}        | 0
 ...ckedEntityAttributeCall.java => TrackedEntityAttributeCall.kt} | 0
 .../{TrackedEntityTypeCall.java => TrackedEntityTypeCall.kt}      | 0
 .../internal/{ValidationRuleCall.java => ValidationRuleCall.kt}   | 0
 .../{ValidationRuleUidsCall.java => ValidationRuleUidsCall.kt}    | 0
 ...idationRuleUidsCallImpl.java => ValidationRuleUidsCallImpl.kt} | 0
 13 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{ListCall.java => ListCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/event/internal/{EventFilterCall.java => EventFilterCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionGroupCall.java => OptionGroupCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitLevelEndpointCall.java => OrganisationUnitLevelEndpointCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramCall.java => ProgramCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleCall.java => ProgramRuleCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageCall.java => ProgramStageCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipTypeCall.java => RelationshipTypeCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeCall.java => TrackedEntityAttributeCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeCall.java => TrackedEntityTypeCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleCall.java => ValidationRuleCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleUidsCall.java => ValidationRuleUidsCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleUidsCallImpl.java => ValidationRuleUidsCallImpl.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt

From e6c7602bd0e4a2addacc66db3a106f3ec156931f Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 13:02:00 +0200
Subject: [PATCH 269/478] [ANDROSDK-1720] refactor: - All Java Call classes to
 Kotlin - Mark as @Deprecated some deprecated methods

---
 .../arch/call/factories/internal/ListCall.kt  | 13 +--
 .../arch/call/factories/internal/UidsCall.kt  |  2 +-
 .../android/core/enrollment/Enrollment.java   |  1 +
 .../hisp/dhis/android/core/event/Event.java   |  1 +
 .../core/event/internal/EventFilterCall.kt    | 96 +++++++++---------
 .../core/option/internal/OptionGroupCall.kt   | 62 ++++++------
 .../OrganisationUnitLevelEndpointCall.kt      | 51 ++++------
 .../android/core/program/ProgramStage.java    |  1 +
 .../core/program/internal/ProgramCall.kt      | 76 ++++++++-------
 .../core/program/internal/ProgramRuleCall.kt  | 66 ++++++-------
 .../internal/ProgramSectionFields.java        |  1 +
 .../core/program/internal/ProgramStageCall.kt | 97 +++++++++----------
 .../internal/RelationshipTypeCall.kt          | 73 ++++++--------
 .../internal/TrackedEntityAttributeCall.kt    | 64 ++++++------
 .../internal/TrackedEntityTypeCall.kt         | 86 ++++++++--------
 .../validation/internal/ValidationRuleCall.kt | 65 ++++++-------
 .../internal/ValidationRuleUidsCall.kt        | 10 +-
 .../internal/ValidationRuleUidsCallImpl.kt    | 83 ++++++++--------
 18 files changed, 392 insertions(+), 456 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
index 2809c2b173..db4c8866c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
@@ -25,13 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.factories.internal
 
-package org.hisp.dhis.android.core.arch.call.factories.internal;
+import io.reactivex.Single
 
-import java.util.List;
-
-import io.reactivex.Single;
-
-public interface ListCall<P> {
-    Single<List<P>> download();
-}
\ No newline at end of file
+interface ListCall<P> {
+    fun download(): Single<List<P>>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
index 67e4b01f5e..9bcb257bc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import io.reactivex.Single
 
-interface UidsCall<P> {
+internal fun interface UidsCall<P> {
     fun download(uids: Set<String>): Single<List<P>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
index 8a51616c75..9bd63862ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
@@ -221,6 +221,7 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.30, replaced by {@link #geometry(Geometry geometry)}
          */
+        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
index b188e02e77..2677f5719c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
@@ -232,6 +232,7 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.29, replaced by {@link #geometry(Geometry geometry)}
          */
+        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index 0eb8ee767e..ced194203b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -25,60 +25,60 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.event.internal
 
-package org.hisp.dhis.android.core.event.internal;
-
-import com.google.common.collect.Lists;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.event.EventFilter;
-import org.hisp.dhis.android.core.systeminfo.DHISVersion;
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import com.google.common.collect.Lists
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.event.EventFilter
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class EventFilterCall implements UidsCall<EventFilter> {
+class EventFilterCall @Inject internal constructor(
+    private val service: EventFilterService,
+    handler: EventFilterHandler,
+    apiDownloader: APIDownloader,
+    versionManager: DHISVersionManager,
+) : UidsCall<EventFilter> {
+    private val handler: Handler<EventFilter>
+    private val apiDownloader: APIDownloader
+    private val versionManager: DHISVersionManager
 
-    private static final int MAX_UID_LIST_SIZE = 50;
-
-    private final EventFilterService service;
-    private final Handler<EventFilter> handler;
-    private final APIDownloader apiDownloader;
-    private final DHISVersionManager versionManager;
-
-    @Inject
-    EventFilterCall(EventFilterService service,
-                    EventFilterHandler handler,
-                    APIDownloader apiDownloader,
-                    DHISVersionManager versionManager) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-        this.versionManager = versionManager;
+    init {
+        this.handler = handler
+        this.apiDownloader = apiDownloader
+        this.versionManager = versionManager
     }
 
-    @Override
-    public Single<List<EventFilter>> download(Set<String> programUids) {
-        if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
-            String accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString();
-            return apiDownloader.downloadPartitioned(programUids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-                    service.getEventFilters(
-                            EventFilterFields.programUid.in(partitionUids),
-                            accessDataReadFilter,
-                            EventFilterFields.allFields,
-                            Boolean.FALSE));
+    override fun download(programUids: Set<String>): Single<List<EventFilter>> {
+        return if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
+            val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
+            apiDownloader.downloadPartitioned(
+                programUids,
+                MAX_UID_LIST_SIZE,
+                handler,
+            ) { partitionUids: Set<String> ->
+                service.getEventFilters(
+                    EventFilterFields.programUid.`in`(partitionUids),
+                    accessDataReadFilter,
+                    EventFilterFields.allFields,
+                    Boolean.FALSE,
+                )
+            }
         } else {
-            return Single.just(Lists.newArrayList());
+            Single.just(Lists.newArrayList())
         }
     }
-}
\ No newline at end of file
+
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 50
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index f5a3ecea64..85bdb57762 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -25,44 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.option.OptionGroup;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.option.OptionGroup
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class OptionGroupCall implements UidsCall<OptionGroup> {
-
-    private static final int MAX_UID_LIST_SIZE = 130;
-
-    private final OptionGroupService service;
-    private final OptionGroupHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    OptionGroupCall(OptionGroupService service,
-                    OptionGroupHandler handler,
-                    APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+class OptionGroupCall @Inject internal constructor(
+    private val service: OptionGroupService,
+    private val handler: OptionGroupHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<OptionGroup> {
+    override fun download(optionSetUids: Set<String>): Single<List<OptionGroup>> {
+        return apiDownloader.downloadPartitioned(
+            optionSetUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            val optionSetUidsFilterStr =
+                "optionSet." + OptionSetFields.uid.`in`(partitionUids).generateString()
+            service.optionGroups(OptionGroupFields.allFields, optionSetUidsFilterStr, Boolean.FALSE)
+        }
     }
 
-    @Override
-    public Single<List<OptionGroup>> download(Set<String> optionSetUids) {
-        return apiDownloader.downloadPartitioned(optionSetUids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String optionSetUidsFilterStr = "optionSet." + OptionSetFields.uid.in(partitionUids).generateString();
-            return service.optionGroups(OptionGroupFields.allFields, optionSetUidsFilterStr, Boolean.FALSE);
-        });
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 130
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
index 6201b81870..1e64934f5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
@@ -25,39 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import java.lang.Boolean
+import javax.inject.Inject
 
 @Reusable
-final class OrganisationUnitLevelEndpointCall implements ListCall<OrganisationUnitLevel> {
-
-    private final OrganisationUnitLevelService service;
-    private final OrganisationUnitLevelHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    OrganisationUnitLevelEndpointCall(OrganisationUnitLevelService service,
-                                      OrganisationUnitLevelHandler handler,
-                                      APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<OrganisationUnitLevel>> download() {
-        return apiDownloader.download(handler,
-                service.getOrganisationUnitLevels(OrganisationUnitLevelFields.allFields, Boolean.FALSE));
+internal class OrganisationUnitLevelEndpointCall @Inject constructor(
+    private val service: OrganisationUnitLevelService,
+    private val handler: OrganisationUnitLevelHandler,
+    private val apiDownloader: APIDownloader,
+) : ListCall<OrganisationUnitLevel> {
+    override fun download(): Single<List<OrganisationUnitLevel>> {
+        return apiDownloader.download(
+            handler,
+            service.getOrganisationUnitLevels(OrganisationUnitLevelFields.allFields, Boolean.FALSE),
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
index 5fa3b9b3d9..9fbbc4e1ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
@@ -236,6 +236,7 @@ public static abstract class Builder extends BaseIdentifiableObject.Builder<Buil
         /**
          * @deprecated since 2.29, replaced by {@link #featureType(FeatureType featureType)}
          */
+        @Deprecated
         abstract Builder captureCoordinates(Boolean captureCoordinates);
 
         public abstract Builder featureType(FeatureType featureType);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 45a841e124..159a626b7c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -25,48 +25,50 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.program.Program;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.program.Program
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class ProgramCall implements UidsCall<Program> {
-
-    private static final int MAX_UID_LIST_SIZE = 50;
+class ProgramCall @Inject internal constructor(
+    private val service: ProgramService,
+    handler: ProgramHandler,
+    apiDownloader: APIDownloader,
+) : UidsCall<Program> {
+    private val handler: Handler<Program>
+    private val apiDownloader: APIDownloader
 
-    private final ProgramService service;
-    private final Handler<Program> handler;
-    private final APIDownloader apiDownloader;
+    init {
+        this.handler = handler
+        this.apiDownloader = apiDownloader
+    }
 
-    @Inject
-    ProgramCall(ProgramService service,
-                ProgramHandler handler,
-                APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+    override fun download(uids: Set<String>): Single<List<Program>> {
+        val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
+        return apiDownloader.downloadPartitioned(
+            uids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            service.getPrograms(
+                ProgramFields.allFields,
+                ProgramFields.uid.`in`(partitionUids),
+                accessDataReadFilter,
+                Boolean.FALSE,
+            )
+        }
     }
 
-    @Override
-    public Single<List<Program>> download(Set<String> uids) {
-        String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-        return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-                service.getPrograms(ProgramFields.allFields,
-                        ProgramFields.uid.in(partitionUids),
-                        accessDataReadFilter,
-                        Boolean.FALSE));
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 50
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index 9f1b899d30..127303fd92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -25,43 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.program.ProgramRule;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.program.ProgramRule
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-final class ProgramRuleCall implements UidsCall<ProgramRule> {
-
-    private static final int MAX_UID_LIST_SIZE = 64;
-
-    private final ProgramRuleService service;
-    private final ProgramRuleHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ProgramRuleCall(ProgramRuleService service, ProgramRuleHandler handler, APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+internal class ProgramRuleCall @Inject constructor(
+    private val service: ProgramRuleService,
+    private val handler: ProgramRuleHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<ProgramRule> {
+    override fun download(programUids: Set<String>): Single<List<ProgramRule>> {
+        return apiDownloader.downloadPartitioned(
+            programUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            val programUidsFilterStr =
+                "program." + ObjectWithUid.uid.`in`(partitionUids).generateString()
+            service.getProgramRules(
+                ProgramRuleFields.allFields,
+                programUidsFilterStr,
+                Boolean.FALSE,
+            )
+        }
     }
 
-    @Override
-    public Single<List<ProgramRule>> download(Set<String> programUids) {
-        return apiDownloader.downloadPartitioned(programUids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String programUidsFilterStr = "program." + ObjectWithUid.uid.in(partitionUids).generateString();
-            return service.getProgramRules(ProgramRuleFields.allFields, programUidsFilterStr, Boolean.FALSE);
-        });
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 64
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
index e750ed3cff..a6fc788ebb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
@@ -41,6 +41,7 @@ public final class ProgramSectionFields {
     /**
      * @deprecated In version 2.33 and later, use {@link #TRACKED_ENTITY_ATTRIBUTES} instead.
      */
+    @Deprecated
     public static final String ATTRIBUTES = "programTrackedEntityAttribute";
     public static final String TRACKED_ENTITY_ATTRIBUTES = "trackedEntityAttributes";
     private static final String STYLE = "style";
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 94122e3b73..693fd57976 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -25,68 +25,63 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class ProgramStageCall implements UidsCall<ProgramStage> {
-
-    private static final int MAX_UID_LIST_SIZE = 64;
-
-    private final ProgramStageService service;
-    private final ProgramStageHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ProgramStageCall(ProgramStageService service,
-                     ProgramStageHandler handler,
-                     APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<ProgramStage>> download(Set<String> uids) {
-        return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-            String programUidsFilterStr = "program." + ObjectWithUid.uid.in(partitionUids).generateString();
-            return service.getProgramStages(
+class ProgramStageCall @Inject internal constructor(
+    private val service: ProgramStageService,
+    private val handler: ProgramStageHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<ProgramStage> {
+    override fun download(uids: Set<String>): Single<List<ProgramStage>> {
+        return apiDownloader.downloadPartitioned(
+            uids,
+            MAX_UID_LIST_SIZE,
+            handler,
+            { partitionUids: Set<String> ->
+                val accessDataReadFilter =
+                    "access.data." + DataAccessFields.read.eq(true).generateString()
+                val programUidsFilterStr =
+                    "program." + ObjectWithUid.uid.`in`(partitionUids).generateString()
+                service.getProgramStages(
                     ProgramStageFields.allFields,
                     programUidsFilterStr,
                     accessDataReadFilter,
-                    Boolean.FALSE);
-        }, this::transform);
+                    Boolean.FALSE,
+                )
+            },
+        ) { stage: ProgramStage -> transform(stage) }
     }
 
-    private ProgramStage transform(ProgramStage stage) {
-        if (ProgramStageInternalAccessor.accessProgramStageDataElements(stage) == null) {
-            return stage;
+    private fun transform(stage: ProgramStage): ProgramStage {
+        return if (ProgramStageInternalAccessor.accessProgramStageDataElements(stage) == null) {
+            stage
         } else {
-            List<ProgramStageDataElement> psdes = new ArrayList<>();
-            for (ProgramStageDataElement psde : ProgramStageInternalAccessor.accessProgramStageDataElements(stage)) {
+            val psdes: MutableList<ProgramStageDataElement> = ArrayList()
+            for (psde in ProgramStageInternalAccessor.accessProgramStageDataElements(stage)) {
                 if (psde.dataElement() != null) {
-                    psdes.add(psde);
+                    psdes.add(psde)
                 }
             }
-            return ProgramStageInternalAccessor.insertProgramStageDataElements(stage.toBuilder(), psdes).build();
+            ProgramStageInternalAccessor.insertProgramStageDataElements(stage.toBuilder(), psdes)
+                .build()
         }
     }
-}
\ No newline at end of file
+
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 64
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index 164fa690b3..a4e53af601 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -25,47 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-import org.hisp.dhis.android.core.resource.internal.Resource;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.relationship.internal
+
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.hisp.dhis.android.core.resource.internal.Resource
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class RelationshipTypeCall implements ListCall<RelationshipType> {
-
-    private final Resource.Type resourceType = Resource.Type.RELATIONSHIP_TYPE;
-
-    private final RelationshipTypeService service;
-    private final RelationshipTypeHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    RelationshipTypeCall(RelationshipTypeService service,
-                         RelationshipTypeHandler handler,
-                         APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<RelationshipType>> download() {
-        return apiDownloader.downloadWithLastUpdated(handler, resourceType, lastUpdated -> {
-            String accessDataFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-
-            return service.getRelationshipTypes(RelationshipTypeFields.allFields,
-                    RelationshipTypeFields.lastUpdated.gt(lastUpdated), accessDataFilter, Boolean.FALSE);
-        });
+class RelationshipTypeCall @Inject internal constructor(
+    private val service: RelationshipTypeService,
+    private val handler: RelationshipTypeHandler,
+    private val apiDownloader: APIDownloader,
+) : ListCall<RelationshipType> {
+    private val resourceType = Resource.Type.RELATIONSHIP_TYPE
+    override fun download(): Single<List<RelationshipType>> {
+        return apiDownloader.downloadWithLastUpdated(
+            handler,
+            resourceType,
+        ) { lastUpdated: String? ->
+            val accessDataFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
+            service.getRelationshipTypes(
+                RelationshipTypeFields.allFields,
+                RelationshipTypeFields.lastUpdated.gt(lastUpdated),
+                accessDataFilter,
+                Boolean.FALSE,
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index c4802b3211..fe7c0182c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -25,46 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class TrackedEntityAttributeCall implements UidsCall<TrackedEntityAttribute> {
-
-    private static final int MAX_UID_LIST_SIZE = 140;
-
-    private final TrackedEntityAttributeService service;
-    private final TrackedEntityAttributeHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    TrackedEntityAttributeCall(TrackedEntityAttributeService service,
-                               TrackedEntityAttributeHandler handler,
-                               APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+class TrackedEntityAttributeCall @Inject internal constructor(
+    private val service: TrackedEntityAttributeService,
+    private val handler: TrackedEntityAttributeHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<TrackedEntityAttribute> {
+    override fun download(uids: Set<String>): Single<List<TrackedEntityAttribute>> {
+        return apiDownloader.downloadPartitioned(
+            uids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            service.getTrackedEntityAttributes(
+                TrackedEntityAttributeFields.allFields,
+                TrackedEntityAttributeFields.uid.`in`(partitionUids),
+                Boolean.FALSE,
+            )
+        }
     }
 
-
-    @Override
-    public Single<List<TrackedEntityAttribute>> download(Set<String> uids) {
-        return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-                service.getTrackedEntityAttributes(
-                        TrackedEntityAttributeFields.allFields,
-                        TrackedEntityAttributeFields.uid.in(partitionUids),
-                        Boolean.FALSE
-                ));
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 140
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index fb7927cd9a..cc85703840 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -25,63 +25,57 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class TrackedEntityTypeCall implements UidsCall<TrackedEntityType> {
-
-    private static final int MAX_UID_LIST_SIZE = 140;
-
-    private final TrackedEntityTypeService service;
-    private final TrackedEntityTypeHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    TrackedEntityTypeCall(TrackedEntityTypeService service,
-                          TrackedEntityTypeHandler handler,
-                          APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<TrackedEntityType>> download(Set<String> optionSetUids) {
-        String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-        return apiDownloader.downloadPartitioned(optionSetUids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-            service.getTrackedEntityTypes(
+class TrackedEntityTypeCall @Inject internal constructor(
+    private val service: TrackedEntityTypeService,
+    private val handler: TrackedEntityTypeHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<TrackedEntityType> {
+    override fun download(optionSetUids: Set<String>): Single<List<TrackedEntityType>> {
+        val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
+        return apiDownloader.downloadPartitioned(
+            optionSetUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+            { partitionUids: Set<String> ->
+                service.getTrackedEntityTypes(
                     TrackedEntityTypeFields.allFields,
-                    TrackedEntityTypeFields.uid.in(optionSetUids),
+                    TrackedEntityTypeFields.uid.`in`(optionSetUids),
                     accessDataReadFilter,
-                    Boolean.FALSE), this::transform);
+                    Boolean.FALSE,
+                )
+            },
+        ) { type: TrackedEntityType -> transform(type) }
     }
 
-    private TrackedEntityType transform(TrackedEntityType type) {
-        if (type.trackedEntityTypeAttributes() == null) {
-            return type;
+    private fun transform(type: TrackedEntityType): TrackedEntityType {
+        return if (type.trackedEntityTypeAttributes() == null) {
+            type
         } else {
-            List<TrackedEntityTypeAttribute> attributes = new ArrayList<>();
-            for (TrackedEntityTypeAttribute attribute : type.trackedEntityTypeAttributes()) {
+            val attributes: MutableList<TrackedEntityTypeAttribute> = ArrayList()
+            for (attribute in type.trackedEntityTypeAttributes()!!) {
                 if (attribute.trackedEntityAttribute() != null) {
-                    attributes.add(attribute);
+                    attributes.add(attribute)
                 }
             }
-            return type.toBuilder().trackedEntityTypeAttributes(attributes).build();
+            type.toBuilder().trackedEntityTypeAttributes(attributes).build()
         }
     }
+
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 140
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index ffefc77a9e..2970dc05df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -25,45 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.validation.ValidationRule;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.validation.ValidationRule
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class ValidationRuleCall implements UidsCall<ValidationRule> {
-
-    private static final int MAX_UID_LIST_SIZE = 64;
-
-    private final ValidationRuleService service;
-    private final ValidationRuleHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ValidationRuleCall(ValidationRuleService service,
-                       ValidationRuleHandler handler,
-                       APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+class ValidationRuleCall @Inject internal constructor(
+    private val service: ValidationRuleService,
+    private val handler: ValidationRuleHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<ValidationRule> {
+    override fun download(validationRuleUids: Set<String>): Single<List<ValidationRule>> {
+        return apiDownloader.downloadPartitioned(
+            validationRuleUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            val uidsFilterStr = ObjectWithUid.uid.`in`(partitionUids).generateString()
+            service.getValidationRules(ValidationRuleFields.allFields, uidsFilterStr, Boolean.FALSE)
+        }
     }
 
-    @Override
-    public Single<List<ValidationRule>> download(Set<String> validationRuleUids) {
-        return apiDownloader.downloadPartitioned(validationRuleUids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String uidsFilterStr = ObjectWithUid.uid.in(partitionUids).generateString();
-            return service.getValidationRules(ValidationRuleFields.allFields, uidsFilterStr, Boolean.FALSE);
-        });
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 64
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
index 04c3005fd4..8659b048c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
@@ -25,11 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
 
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-
-public interface ValidationRuleUidsCall extends UidsCall<ObjectWithUid> {
-}
\ No newline at end of file
+internal interface ValidationRuleUidsCall : UidsCall<ObjectWithUid>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index 024916ae7c..d50beb1150 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -25,52 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Observable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-final class ValidationRuleUidsCallImpl implements ValidationRuleUidsCall {
-
-    private final ValidationRuleService service;
-    private final DataSetValidationRuleLinkHandler linkHandler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ValidationRuleUidsCallImpl(ValidationRuleService service,
-                               DataSetValidationRuleLinkHandler linkHandler,
-                               APIDownloader apiDownloader) {
-        this.service = service;
-        this.linkHandler = linkHandler;
-        this.apiDownloader = apiDownloader;
-    }
+internal class ValidationRuleUidsCallImpl @Inject constructor(
+    private val service: ValidationRuleService,
+    private val linkHandler: DataSetValidationRuleLinkHandler,
+    private val apiDownloader: APIDownloader,
+) : ValidationRuleUidsCall {
 
-    @Override
-    public Single<List<ObjectWithUid>> download(Set<String> dataSetUids) {
-        return Observable.fromIterable(dataSetUids)
-                .flatMapSingle(dataSetUid -> apiDownloader.downloadLink(dataSetUid, linkHandler, dataSetPartitionUids ->
-                                service.getDataSetValidationRuleUids(
-                                        dataSetUid, BaseIdentifiableObject.UID, Boolean.FALSE),
-                        validationRule -> DataSetValidationRuleLink.builder()
-                                .dataSet(dataSetUid)
-                                .validationRule(validationRule.uid()).build()))
-                .reduce(new ArrayList<>(), (items1, items2) -> {
-                    items1.addAll(items2);
-                    return items1;
-                });
+    override fun download(uids: Set<String>): Single<List<ObjectWithUid>> {
+        return Observable.fromIterable(uids)
+            .flatMapSingle { dataSetUid: String ->
+                apiDownloader.downloadLink(
+                    dataSetUid,
+                    linkHandler,
+                    { dataSetPartitionUids: String ->
+                        service.getDataSetValidationRuleUids(
+                            dataSetUid,
+                            BaseIdentifiableObject.UID,
+                            Boolean.FALSE,
+                        )
+                    },
+                ) { validationRule: ObjectWithUid ->
+                    DataSetValidationRuleLink.builder()
+                        .dataSet(dataSetUid)
+                        .validationRule(validationRule.uid()).build()
+                }
+            }
+            .reduce(ArrayList()) { items1: List<ObjectWithUid>, items2: List<ObjectWithUid> ->
+                items1 + items2 // Use the + operator to concatenate lists
+            }
     }
-}
\ No newline at end of file
+}

From 0c7c7147bb3fe4497b5f11e72334a3f7d7c53c5a Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 15:37:08 +0200
Subject: [PATCH 270/478] Rename .java to .kt

---
 .../internal/{ListCallFactoryImpl.java => ListCallFactoryImpl.kt} | 0
 .../internal/{UidsCallFactoryImpl.java => UidsCallFactoryImpl.kt} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{ListCallFactoryImpl.java => ListCallFactoryImpl.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{UidsCallFactoryImpl.java => UidsCallFactoryImpl.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt

From 3a7ec9323adfd8e0c5d2df95dbba13844c450006 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 15:37:08 +0200
Subject: [PATCH 271/478] [ANDROSDK-1736] refactor: - EndpointCall to
 UidsCallFactoryImpl and ListCallFactoryImpl to Kotlin - Remove deprecated
 usages of BaseQuery in favor of BaseQueryKt - Adapt BaseQueryKt to Java call
 from AutoValue class

---
 ...servedValueManagerRealIntegrationShould.kt |  2 +-
 .../factories/internal/ListCallFactoryImpl.kt | 46 +++++++-----------
 .../factories/internal/QueryCallFactory.kt    |  4 +-
 .../internal/QueryCoroutineCallFactoryImpl.kt |  4 +-
 .../factories/internal/UidsCallFactoryImpl.kt | 47 +++++++------------
 .../arch/call/queries/internal/BaseQueryKt.kt |  6 +++
 ...ckedEntityAttributeReservedValueQuery.java |  7 +--
 7 files changed, 51 insertions(+), 65 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 62f64235b8..6b8d89d69c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -62,7 +62,7 @@ import org.mockito.Mock
 import org.mockito.Mockito
 
 @SuppressWarnings("MaxLineLength")
-class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
+internal class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
     private lateinit var store: TrackedEntityAttributeReservedValueStore
     private val organisationUnitUid = "org_unit_uid"
     private val programUid = "program_uid"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
index fe0a772603..0f95e9da78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
@@ -25,33 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public abstract class ListCallFactoryImpl<P> implements ListCallFactory<P> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected ListCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create() {
-        return new EndpointCall(fetcher(), processor());
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import java.util.concurrent.Callable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+abstract class ListCallFactoryImpl<P> protected constructor(
+    @JvmField protected val data: GenericCallData,
+    @JvmField protected val apiCallExecutor: APICallExecutor
+) : ListCallFactory<P> {
+    override fun create(): Callable<List<P>> {
+        return EndpointCall(fetcher(), processor())
     }
 
-    protected abstract CallFetcher<P> fetcher();
-    protected abstract CallProcessor<P> processor();
-}
\ No newline at end of file
+    protected abstract fun fetcher(): CallFetcher<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
index aaad9afb46..b2728103d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
-fun interface QueryCallFactory<P, Q : BaseQuery> {
+internal fun interface QueryCallFactory<P, Q : BaseQueryKt> {
     suspend fun create(query: Q): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index 213ce08343..31f81c7d07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -30,9 +30,9 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
-internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQuery> protected constructor(
+internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQueryKt> protected constructor(
     protected val data: GenericCallData,
     protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) : QueryCallFactory<P, Q> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
index 18ba147138..12e2ee19dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
@@ -25,34 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
-public abstract class UidsCallFactoryImpl<P> implements UidsCallFactory<P> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected UidsCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create(Set<String> uids) {
-        return new EndpointCall(fetcher(uids), processor());
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import java.util.concurrent.Callable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+abstract class UidsCallFactoryImpl<P> protected constructor(
+    @JvmField protected val data: GenericCallData,
+    @JvmField protected val apiCallExecutor: APICallExecutor
+) : UidsCallFactory<P> {
+    override fun create(uids: Set<String>): Callable<List<P>> {
+        return EndpointCall(fetcher(uids), processor())
     }
 
-    protected abstract CallFetcher<P> fetcher(Set<String> uids);
-    protected abstract CallProcessor<P> processor();
-}
\ No newline at end of file
+    protected abstract fun fetcher(uids: Set<String>): CallFetcher<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
index 81cef4beda..a5a275ac98 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
@@ -36,3 +36,9 @@ internal open class BaseQueryKt(
         const val DEFAULT_PAGE_SIZE = 50
     }
 }
+
+internal open class BaseQueryKtJavaCompatible(
+    page: Int = 1,
+    pageSize: Int = DEFAULT_PAGE_SIZE,
+    paging: Boolean = false
+) : BaseQueryKt(page, pageSize, paging)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
index 1f4ca9313c..a0a04a473d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
@@ -32,11 +32,12 @@
 
 import com.google.auto.value.AutoValue;
 
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKtJavaCompatible;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 
 @AutoValue
-public abstract class TrackedEntityAttributeReservedValueQuery extends BaseQuery {
+public abstract class TrackedEntityAttributeReservedValueQuery extends BaseQueryKtJavaCompatible {
+
     public abstract String trackedEntityAttributeUid();
 
     public abstract Integer numberToReserve();
@@ -50,7 +51,7 @@ public static TrackedEntityAttributeReservedValueQuery create(String trackedEnti
                                                                   Integer numberToReserve,
                                                                   OrganisationUnit organisationUnit,
                                                                   String trackedEntityAttributePattern) {
-        return new AutoValue_TrackedEntityAttributeReservedValueQuery(1, BaseQuery.DEFAULT_PAGE_SIZE, false,
+        return new AutoValue_TrackedEntityAttributeReservedValueQuery(
                 trackedEntityAttributeUid, numberToReserve, organisationUnit, trackedEntityAttributePattern);
     }
 }
\ No newline at end of file

From 9f84e7711a0a19b893866c067776683a60ba45d1 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 16:02:34 +0200
Subject: [PATCH 272/478] [ANDROSDK-1720] style: - Match styling conventions
 (SonarQube results)

---
 .../dhis/android/core/arch/call/factories/internal/ListCall.kt | 2 +-
 .../java/org/hisp/dhis/android/core/enrollment/Enrollment.java | 1 -
 core/src/main/java/org/hisp/dhis/android/core/event/Event.java | 1 -
 .../hisp/dhis/android/core/event/internal/EventFilterCall.kt   | 1 -
 .../hisp/dhis/android/core/option/internal/OptionGroupCall.kt  | 1 -
 .../java/org/hisp/dhis/android/core/program/ProgramStage.java  | 1 -
 .../org/hisp/dhis/android/core/program/internal/ProgramCall.kt | 1 -
 .../hisp/dhis/android/core/program/internal/ProgramRuleCall.kt | 1 -
 .../android/core/program/internal/ProgramSectionFields.java    | 1 -
 .../dhis/android/core/program/internal/ProgramStageCall.kt     | 1 -
 .../android/core/relationship/internal/RelationshipTypeCall.kt | 1 -
 .../core/trackedentity/internal/TrackedEntityAttributeCall.kt  | 1 -
 .../core/trackedentity/internal/TrackedEntityTypeCall.kt       | 3 +--
 .../android/core/validation/internal/ValidationRuleCall.kt     | 1 -
 .../core/validation/internal/ValidationRuleUidsCallImpl.kt     | 3 +--
 15 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
index db4c8866c0..1f7befe62b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import io.reactivex.Single
 
-interface ListCall<P> {
+fun interface ListCall<P> {
     fun download(): Single<List<P>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
index 9bd63862ef..8a51616c75 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
@@ -221,7 +221,6 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.30, replaced by {@link #geometry(Geometry geometry)}
          */
-        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
index 2677f5719c..b188e02e77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
@@ -232,7 +232,6 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.29, replaced by {@link #geometry(Geometry geometry)}
          */
-        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index ced194203b..be63896841 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -39,7 +39,6 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class EventFilterCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index 85bdb57762..ce19c68cf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.option.OptionGroup
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class OptionGroupCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
index 9fbbc4e1ef..5fa3b9b3d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
@@ -236,7 +236,6 @@ public static abstract class Builder extends BaseIdentifiableObject.Builder<Buil
         /**
          * @deprecated since 2.29, replaced by {@link #featureType(FeatureType featureType)}
          */
-        @Deprecated
         abstract Builder captureCoordinates(Boolean captureCoordinates);
 
         public abstract Builder featureType(FeatureType featureType);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 159a626b7c..f177d32d03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.Program
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class ProgramCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index 127303fd92..665d8f53d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 internal class ProgramRuleCall @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
index a6fc788ebb..e750ed3cff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
@@ -41,7 +41,6 @@ public final class ProgramSectionFields {
     /**
      * @deprecated In version 2.33 and later, use {@link #TRACKED_ENTITY_ATTRIBUTES} instead.
      */
-    @Deprecated
     public static final String ATTRIBUTES = "programTrackedEntityAttribute";
     public static final String TRACKED_ENTITY_ATTRIBUTES = "trackedEntityAttributes";
     private static final String STYLE = "style";
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 693fd57976..a0576687c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -38,7 +38,6 @@ import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class ProgramStageCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index a4e53af601..f73ccc9d14 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.resource.internal.Resource
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class RelationshipTypeCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index fe7c0182c7..f16c82b4e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class TrackedEntityAttributeCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index cc85703840..d4a0123e86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class TrackedEntityTypeCall @Inject internal constructor(
@@ -50,7 +49,7 @@ class TrackedEntityTypeCall @Inject internal constructor(
             optionSetUids,
             MAX_UID_LIST_SIZE,
             handler,
-            { partitionUids: Set<String> ->
+            { _: Set<String> ->
                 service.getTrackedEntityTypes(
                     TrackedEntityTypeFields.allFields,
                     TrackedEntityTypeFields.uid.`in`(optionSetUids),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index 2970dc05df..1475c78223 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.ValidationRule
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class ValidationRuleCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index d50beb1150..3bee1d430d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 internal class ValidationRuleUidsCallImpl @Inject constructor(
@@ -51,7 +50,7 @@ internal class ValidationRuleUidsCallImpl @Inject constructor(
                 apiDownloader.downloadLink(
                     dataSetUid,
                     linkHandler,
-                    { dataSetPartitionUids: String ->
+                    { _: String ->
                         service.getDataSetValidationRuleUids(
                             dataSetUid,
                             BaseIdentifiableObject.UID,

From 9d51b5e5c5ccc74b38c4c87799436450bd20273a Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 13:02:00 +0200
Subject: [PATCH 273/478] Rename .java to .kt

---
 .../arch/call/factories/internal/{ListCall.java => ListCall.kt}   | 0
 .../event/internal/{EventFilterCall.java => EventFilterCall.kt}   | 0
 .../option/internal/{OptionGroupCall.java => OptionGroupCall.kt}  | 0
 ...evelEndpointCall.java => OrganisationUnitLevelEndpointCall.kt} | 0
 .../core/program/internal/{ProgramCall.java => ProgramCall.kt}    | 0
 .../program/internal/{ProgramRuleCall.java => ProgramRuleCall.kt} | 0
 .../internal/{ProgramStageCall.java => ProgramStageCall.kt}       | 0
 .../{RelationshipTypeCall.java => RelationshipTypeCall.kt}        | 0
 ...ckedEntityAttributeCall.java => TrackedEntityAttributeCall.kt} | 0
 .../{TrackedEntityTypeCall.java => TrackedEntityTypeCall.kt}      | 0
 .../internal/{ValidationRuleCall.java => ValidationRuleCall.kt}   | 0
 .../{ValidationRuleUidsCall.java => ValidationRuleUidsCall.kt}    | 0
 ...idationRuleUidsCallImpl.java => ValidationRuleUidsCallImpl.kt} | 0
 13 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{ListCall.java => ListCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/event/internal/{EventFilterCall.java => EventFilterCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionGroupCall.java => OptionGroupCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitLevelEndpointCall.java => OrganisationUnitLevelEndpointCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramCall.java => ProgramCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleCall.java => ProgramRuleCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageCall.java => ProgramStageCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipTypeCall.java => RelationshipTypeCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeCall.java => TrackedEntityAttributeCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeCall.java => TrackedEntityTypeCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleCall.java => ValidationRuleCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleUidsCall.java => ValidationRuleUidsCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleUidsCallImpl.java => ValidationRuleUidsCallImpl.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt

From 6c36a03486d3082af54b33cd2a837b62b7aa4a04 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 13:02:00 +0200
Subject: [PATCH 274/478] [ANDROSDK-1720] refactor: - All Java Call classes to
 Kotlin - Mark as @Deprecated some deprecated methods

---
 .../arch/call/factories/internal/ListCall.kt  | 13 +--
 .../arch/call/factories/internal/UidsCall.kt  |  2 +-
 .../android/core/enrollment/Enrollment.java   |  1 +
 .../hisp/dhis/android/core/event/Event.java   |  1 +
 .../core/event/internal/EventFilterCall.kt    | 96 +++++++++---------
 .../core/option/internal/OptionGroupCall.kt   | 62 ++++++------
 .../OrganisationUnitLevelEndpointCall.kt      | 51 ++++------
 .../android/core/program/ProgramStage.java    |  1 +
 .../core/program/internal/ProgramCall.kt      | 76 ++++++++-------
 .../core/program/internal/ProgramRuleCall.kt  | 66 ++++++-------
 .../internal/ProgramSectionFields.java        |  1 +
 .../core/program/internal/ProgramStageCall.kt | 97 +++++++++----------
 .../internal/RelationshipTypeCall.kt          | 73 ++++++--------
 .../internal/TrackedEntityAttributeCall.kt    | 64 ++++++------
 .../internal/TrackedEntityTypeCall.kt         | 86 ++++++++--------
 .../validation/internal/ValidationRuleCall.kt | 65 ++++++-------
 .../internal/ValidationRuleUidsCall.kt        | 10 +-
 .../internal/ValidationRuleUidsCallImpl.kt    | 83 ++++++++--------
 18 files changed, 392 insertions(+), 456 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
index 2809c2b173..db4c8866c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
@@ -25,13 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.factories.internal
 
-package org.hisp.dhis.android.core.arch.call.factories.internal;
+import io.reactivex.Single
 
-import java.util.List;
-
-import io.reactivex.Single;
-
-public interface ListCall<P> {
-    Single<List<P>> download();
-}
\ No newline at end of file
+interface ListCall<P> {
+    fun download(): Single<List<P>>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
index 67e4b01f5e..9bcb257bc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import io.reactivex.Single
 
-interface UidsCall<P> {
+internal fun interface UidsCall<P> {
     fun download(uids: Set<String>): Single<List<P>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
index 8a51616c75..9bd63862ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
@@ -221,6 +221,7 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.30, replaced by {@link #geometry(Geometry geometry)}
          */
+        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
index b188e02e77..2677f5719c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
@@ -232,6 +232,7 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.29, replaced by {@link #geometry(Geometry geometry)}
          */
+        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index 0eb8ee767e..ced194203b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -25,60 +25,60 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.event.internal
 
-package org.hisp.dhis.android.core.event.internal;
-
-import com.google.common.collect.Lists;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.event.EventFilter;
-import org.hisp.dhis.android.core.systeminfo.DHISVersion;
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import com.google.common.collect.Lists
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.event.EventFilter
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class EventFilterCall implements UidsCall<EventFilter> {
+class EventFilterCall @Inject internal constructor(
+    private val service: EventFilterService,
+    handler: EventFilterHandler,
+    apiDownloader: APIDownloader,
+    versionManager: DHISVersionManager,
+) : UidsCall<EventFilter> {
+    private val handler: Handler<EventFilter>
+    private val apiDownloader: APIDownloader
+    private val versionManager: DHISVersionManager
 
-    private static final int MAX_UID_LIST_SIZE = 50;
-
-    private final EventFilterService service;
-    private final Handler<EventFilter> handler;
-    private final APIDownloader apiDownloader;
-    private final DHISVersionManager versionManager;
-
-    @Inject
-    EventFilterCall(EventFilterService service,
-                    EventFilterHandler handler,
-                    APIDownloader apiDownloader,
-                    DHISVersionManager versionManager) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-        this.versionManager = versionManager;
+    init {
+        this.handler = handler
+        this.apiDownloader = apiDownloader
+        this.versionManager = versionManager
     }
 
-    @Override
-    public Single<List<EventFilter>> download(Set<String> programUids) {
-        if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
-            String accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString();
-            return apiDownloader.downloadPartitioned(programUids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-                    service.getEventFilters(
-                            EventFilterFields.programUid.in(partitionUids),
-                            accessDataReadFilter,
-                            EventFilterFields.allFields,
-                            Boolean.FALSE));
+    override fun download(programUids: Set<String>): Single<List<EventFilter>> {
+        return if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
+            val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
+            apiDownloader.downloadPartitioned(
+                programUids,
+                MAX_UID_LIST_SIZE,
+                handler,
+            ) { partitionUids: Set<String> ->
+                service.getEventFilters(
+                    EventFilterFields.programUid.`in`(partitionUids),
+                    accessDataReadFilter,
+                    EventFilterFields.allFields,
+                    Boolean.FALSE,
+                )
+            }
         } else {
-            return Single.just(Lists.newArrayList());
+            Single.just(Lists.newArrayList())
         }
     }
-}
\ No newline at end of file
+
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 50
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index f5a3ecea64..85bdb57762 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -25,44 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.option.OptionGroup;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.option.OptionGroup
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class OptionGroupCall implements UidsCall<OptionGroup> {
-
-    private static final int MAX_UID_LIST_SIZE = 130;
-
-    private final OptionGroupService service;
-    private final OptionGroupHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    OptionGroupCall(OptionGroupService service,
-                    OptionGroupHandler handler,
-                    APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+class OptionGroupCall @Inject internal constructor(
+    private val service: OptionGroupService,
+    private val handler: OptionGroupHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<OptionGroup> {
+    override fun download(optionSetUids: Set<String>): Single<List<OptionGroup>> {
+        return apiDownloader.downloadPartitioned(
+            optionSetUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            val optionSetUidsFilterStr =
+                "optionSet." + OptionSetFields.uid.`in`(partitionUids).generateString()
+            service.optionGroups(OptionGroupFields.allFields, optionSetUidsFilterStr, Boolean.FALSE)
+        }
     }
 
-    @Override
-    public Single<List<OptionGroup>> download(Set<String> optionSetUids) {
-        return apiDownloader.downloadPartitioned(optionSetUids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String optionSetUidsFilterStr = "optionSet." + OptionSetFields.uid.in(partitionUids).generateString();
-            return service.optionGroups(OptionGroupFields.allFields, optionSetUidsFilterStr, Boolean.FALSE);
-        });
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 130
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
index 6201b81870..1e64934f5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
@@ -25,39 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.organisationunit.internal
 
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import java.lang.Boolean
+import javax.inject.Inject
 
 @Reusable
-final class OrganisationUnitLevelEndpointCall implements ListCall<OrganisationUnitLevel> {
-
-    private final OrganisationUnitLevelService service;
-    private final OrganisationUnitLevelHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    OrganisationUnitLevelEndpointCall(OrganisationUnitLevelService service,
-                                      OrganisationUnitLevelHandler handler,
-                                      APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<OrganisationUnitLevel>> download() {
-        return apiDownloader.download(handler,
-                service.getOrganisationUnitLevels(OrganisationUnitLevelFields.allFields, Boolean.FALSE));
+internal class OrganisationUnitLevelEndpointCall @Inject constructor(
+    private val service: OrganisationUnitLevelService,
+    private val handler: OrganisationUnitLevelHandler,
+    private val apiDownloader: APIDownloader,
+) : ListCall<OrganisationUnitLevel> {
+    override fun download(): Single<List<OrganisationUnitLevel>> {
+        return apiDownloader.download(
+            handler,
+            service.getOrganisationUnitLevels(OrganisationUnitLevelFields.allFields, Boolean.FALSE),
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
index 5fa3b9b3d9..9fbbc4e1ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
@@ -236,6 +236,7 @@ public static abstract class Builder extends BaseIdentifiableObject.Builder<Buil
         /**
          * @deprecated since 2.29, replaced by {@link #featureType(FeatureType featureType)}
          */
+        @Deprecated
         abstract Builder captureCoordinates(Boolean captureCoordinates);
 
         public abstract Builder featureType(FeatureType featureType);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 45a841e124..159a626b7c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -25,48 +25,50 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.program.Program;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.program.Program
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class ProgramCall implements UidsCall<Program> {
-
-    private static final int MAX_UID_LIST_SIZE = 50;
+class ProgramCall @Inject internal constructor(
+    private val service: ProgramService,
+    handler: ProgramHandler,
+    apiDownloader: APIDownloader,
+) : UidsCall<Program> {
+    private val handler: Handler<Program>
+    private val apiDownloader: APIDownloader
 
-    private final ProgramService service;
-    private final Handler<Program> handler;
-    private final APIDownloader apiDownloader;
+    init {
+        this.handler = handler
+        this.apiDownloader = apiDownloader
+    }
 
-    @Inject
-    ProgramCall(ProgramService service,
-                ProgramHandler handler,
-                APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+    override fun download(uids: Set<String>): Single<List<Program>> {
+        val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
+        return apiDownloader.downloadPartitioned(
+            uids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            service.getPrograms(
+                ProgramFields.allFields,
+                ProgramFields.uid.`in`(partitionUids),
+                accessDataReadFilter,
+                Boolean.FALSE,
+            )
+        }
     }
 
-    @Override
-    public Single<List<Program>> download(Set<String> uids) {
-        String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-        return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-                service.getPrograms(ProgramFields.allFields,
-                        ProgramFields.uid.in(partitionUids),
-                        accessDataReadFilter,
-                        Boolean.FALSE));
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 50
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index 9f1b899d30..127303fd92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -25,43 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.program.ProgramRule;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.program.ProgramRule
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-final class ProgramRuleCall implements UidsCall<ProgramRule> {
-
-    private static final int MAX_UID_LIST_SIZE = 64;
-
-    private final ProgramRuleService service;
-    private final ProgramRuleHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ProgramRuleCall(ProgramRuleService service, ProgramRuleHandler handler, APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+internal class ProgramRuleCall @Inject constructor(
+    private val service: ProgramRuleService,
+    private val handler: ProgramRuleHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<ProgramRule> {
+    override fun download(programUids: Set<String>): Single<List<ProgramRule>> {
+        return apiDownloader.downloadPartitioned(
+            programUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            val programUidsFilterStr =
+                "program." + ObjectWithUid.uid.`in`(partitionUids).generateString()
+            service.getProgramRules(
+                ProgramRuleFields.allFields,
+                programUidsFilterStr,
+                Boolean.FALSE,
+            )
+        }
     }
 
-    @Override
-    public Single<List<ProgramRule>> download(Set<String> programUids) {
-        return apiDownloader.downloadPartitioned(programUids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String programUidsFilterStr = "program." + ObjectWithUid.uid.in(partitionUids).generateString();
-            return service.getProgramRules(ProgramRuleFields.allFields, programUidsFilterStr, Boolean.FALSE);
-        });
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 64
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
index e750ed3cff..a6fc788ebb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
@@ -41,6 +41,7 @@ public final class ProgramSectionFields {
     /**
      * @deprecated In version 2.33 and later, use {@link #TRACKED_ENTITY_ATTRIBUTES} instead.
      */
+    @Deprecated
     public static final String ATTRIBUTES = "programTrackedEntityAttribute";
     public static final String TRACKED_ENTITY_ATTRIBUTES = "trackedEntityAttributes";
     private static final String STYLE = "style";
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 94122e3b73..693fd57976 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -25,68 +25,63 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.program.ProgramStage;
-import org.hisp.dhis.android.core.program.ProgramStageDataElement;
-import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.ProgramStageDataElement
+import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class ProgramStageCall implements UidsCall<ProgramStage> {
-
-    private static final int MAX_UID_LIST_SIZE = 64;
-
-    private final ProgramStageService service;
-    private final ProgramStageHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ProgramStageCall(ProgramStageService service,
-                     ProgramStageHandler handler,
-                     APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<ProgramStage>> download(Set<String> uids) {
-        return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-            String programUidsFilterStr = "program." + ObjectWithUid.uid.in(partitionUids).generateString();
-            return service.getProgramStages(
+class ProgramStageCall @Inject internal constructor(
+    private val service: ProgramStageService,
+    private val handler: ProgramStageHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<ProgramStage> {
+    override fun download(uids: Set<String>): Single<List<ProgramStage>> {
+        return apiDownloader.downloadPartitioned(
+            uids,
+            MAX_UID_LIST_SIZE,
+            handler,
+            { partitionUids: Set<String> ->
+                val accessDataReadFilter =
+                    "access.data." + DataAccessFields.read.eq(true).generateString()
+                val programUidsFilterStr =
+                    "program." + ObjectWithUid.uid.`in`(partitionUids).generateString()
+                service.getProgramStages(
                     ProgramStageFields.allFields,
                     programUidsFilterStr,
                     accessDataReadFilter,
-                    Boolean.FALSE);
-        }, this::transform);
+                    Boolean.FALSE,
+                )
+            },
+        ) { stage: ProgramStage -> transform(stage) }
     }
 
-    private ProgramStage transform(ProgramStage stage) {
-        if (ProgramStageInternalAccessor.accessProgramStageDataElements(stage) == null) {
-            return stage;
+    private fun transform(stage: ProgramStage): ProgramStage {
+        return if (ProgramStageInternalAccessor.accessProgramStageDataElements(stage) == null) {
+            stage
         } else {
-            List<ProgramStageDataElement> psdes = new ArrayList<>();
-            for (ProgramStageDataElement psde : ProgramStageInternalAccessor.accessProgramStageDataElements(stage)) {
+            val psdes: MutableList<ProgramStageDataElement> = ArrayList()
+            for (psde in ProgramStageInternalAccessor.accessProgramStageDataElements(stage)) {
                 if (psde.dataElement() != null) {
-                    psdes.add(psde);
+                    psdes.add(psde)
                 }
             }
-            return ProgramStageInternalAccessor.insertProgramStageDataElements(stage.toBuilder(), psdes).build();
+            ProgramStageInternalAccessor.insertProgramStageDataElements(stage.toBuilder(), psdes)
+                .build()
         }
     }
-}
\ No newline at end of file
+
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 64
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index 164fa690b3..a4e53af601 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -25,47 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-import org.hisp.dhis.android.core.resource.internal.Resource;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.relationship.internal
+
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.hisp.dhis.android.core.resource.internal.Resource
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class RelationshipTypeCall implements ListCall<RelationshipType> {
-
-    private final Resource.Type resourceType = Resource.Type.RELATIONSHIP_TYPE;
-
-    private final RelationshipTypeService service;
-    private final RelationshipTypeHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    RelationshipTypeCall(RelationshipTypeService service,
-                         RelationshipTypeHandler handler,
-                         APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<RelationshipType>> download() {
-        return apiDownloader.downloadWithLastUpdated(handler, resourceType, lastUpdated -> {
-            String accessDataFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-
-            return service.getRelationshipTypes(RelationshipTypeFields.allFields,
-                    RelationshipTypeFields.lastUpdated.gt(lastUpdated), accessDataFilter, Boolean.FALSE);
-        });
+class RelationshipTypeCall @Inject internal constructor(
+    private val service: RelationshipTypeService,
+    private val handler: RelationshipTypeHandler,
+    private val apiDownloader: APIDownloader,
+) : ListCall<RelationshipType> {
+    private val resourceType = Resource.Type.RELATIONSHIP_TYPE
+    override fun download(): Single<List<RelationshipType>> {
+        return apiDownloader.downloadWithLastUpdated(
+            handler,
+            resourceType,
+        ) { lastUpdated: String? ->
+            val accessDataFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
+            service.getRelationshipTypes(
+                RelationshipTypeFields.allFields,
+                RelationshipTypeFields.lastUpdated.gt(lastUpdated),
+                accessDataFilter,
+                Boolean.FALSE,
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index c4802b3211..fe7c0182c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -25,46 +25,38 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class TrackedEntityAttributeCall implements UidsCall<TrackedEntityAttribute> {
-
-    private static final int MAX_UID_LIST_SIZE = 140;
-
-    private final TrackedEntityAttributeService service;
-    private final TrackedEntityAttributeHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    TrackedEntityAttributeCall(TrackedEntityAttributeService service,
-                               TrackedEntityAttributeHandler handler,
-                               APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+class TrackedEntityAttributeCall @Inject internal constructor(
+    private val service: TrackedEntityAttributeService,
+    private val handler: TrackedEntityAttributeHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<TrackedEntityAttribute> {
+    override fun download(uids: Set<String>): Single<List<TrackedEntityAttribute>> {
+        return apiDownloader.downloadPartitioned(
+            uids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            service.getTrackedEntityAttributes(
+                TrackedEntityAttributeFields.allFields,
+                TrackedEntityAttributeFields.uid.`in`(partitionUids),
+                Boolean.FALSE,
+            )
+        }
     }
 
-
-    @Override
-    public Single<List<TrackedEntityAttribute>> download(Set<String> uids) {
-        return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-                service.getTrackedEntityAttributes(
-                        TrackedEntityAttributeFields.allFields,
-                        TrackedEntityAttributeFields.uid.in(partitionUids),
-                        Boolean.FALSE
-                ));
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 140
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index fb7927cd9a..cc85703840 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -25,63 +25,57 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class TrackedEntityTypeCall implements UidsCall<TrackedEntityType> {
-
-    private static final int MAX_UID_LIST_SIZE = 140;
-
-    private final TrackedEntityTypeService service;
-    private final TrackedEntityTypeHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    TrackedEntityTypeCall(TrackedEntityTypeService service,
-                          TrackedEntityTypeHandler handler,
-                          APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
-    }
-
-    @Override
-    public Single<List<TrackedEntityType>> download(Set<String> optionSetUids) {
-        String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-        return apiDownloader.downloadPartitioned(optionSetUids, MAX_UID_LIST_SIZE, handler, partitionUids ->
-            service.getTrackedEntityTypes(
+class TrackedEntityTypeCall @Inject internal constructor(
+    private val service: TrackedEntityTypeService,
+    private val handler: TrackedEntityTypeHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<TrackedEntityType> {
+    override fun download(optionSetUids: Set<String>): Single<List<TrackedEntityType>> {
+        val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
+        return apiDownloader.downloadPartitioned(
+            optionSetUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+            { partitionUids: Set<String> ->
+                service.getTrackedEntityTypes(
                     TrackedEntityTypeFields.allFields,
-                    TrackedEntityTypeFields.uid.in(optionSetUids),
+                    TrackedEntityTypeFields.uid.`in`(optionSetUids),
                     accessDataReadFilter,
-                    Boolean.FALSE), this::transform);
+                    Boolean.FALSE,
+                )
+            },
+        ) { type: TrackedEntityType -> transform(type) }
     }
 
-    private TrackedEntityType transform(TrackedEntityType type) {
-        if (type.trackedEntityTypeAttributes() == null) {
-            return type;
+    private fun transform(type: TrackedEntityType): TrackedEntityType {
+        return if (type.trackedEntityTypeAttributes() == null) {
+            type
         } else {
-            List<TrackedEntityTypeAttribute> attributes = new ArrayList<>();
-            for (TrackedEntityTypeAttribute attribute : type.trackedEntityTypeAttributes()) {
+            val attributes: MutableList<TrackedEntityTypeAttribute> = ArrayList()
+            for (attribute in type.trackedEntityTypeAttributes()!!) {
                 if (attribute.trackedEntityAttribute() != null) {
-                    attributes.add(attribute);
+                    attributes.add(attribute)
                 }
             }
-            return type.toBuilder().trackedEntityTypeAttributes(attributes).build();
+            type.toBuilder().trackedEntityTypeAttributes(attributes).build()
         }
     }
+
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 140
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index ffefc77a9e..2970dc05df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -25,45 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.validation.ValidationRule;
-
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.validation.internal
+
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.validation.ValidationRule
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-public final class ValidationRuleCall implements UidsCall<ValidationRule> {
-
-    private static final int MAX_UID_LIST_SIZE = 64;
-
-    private final ValidationRuleService service;
-    private final ValidationRuleHandler handler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ValidationRuleCall(ValidationRuleService service,
-                       ValidationRuleHandler handler,
-                       APIDownloader apiDownloader) {
-        this.service = service;
-        this.handler = handler;
-        this.apiDownloader = apiDownloader;
+class ValidationRuleCall @Inject internal constructor(
+    private val service: ValidationRuleService,
+    private val handler: ValidationRuleHandler,
+    private val apiDownloader: APIDownloader,
+) : UidsCall<ValidationRule> {
+    override fun download(validationRuleUids: Set<String>): Single<List<ValidationRule>> {
+        return apiDownloader.downloadPartitioned(
+            validationRuleUids,
+            MAX_UID_LIST_SIZE,
+            handler,
+        ) { partitionUids: Set<String> ->
+            val uidsFilterStr = ObjectWithUid.uid.`in`(partitionUids).generateString()
+            service.getValidationRules(ValidationRuleFields.allFields, uidsFilterStr, Boolean.FALSE)
+        }
     }
 
-    @Override
-    public Single<List<ValidationRule>> download(Set<String> validationRuleUids) {
-        return apiDownloader.downloadPartitioned(validationRuleUids, MAX_UID_LIST_SIZE, handler, partitionUids -> {
-            String uidsFilterStr = ObjectWithUid.uid.in(partitionUids).generateString();
-            return service.getValidationRules(ValidationRuleFields.allFields, uidsFilterStr, Boolean.FALSE);
-        });
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 64
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
index 04c3005fd4..8659b048c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
@@ -25,11 +25,9 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.common.ObjectWithUid
 
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-
-public interface ValidationRuleUidsCall extends UidsCall<ObjectWithUid> {
-}
\ No newline at end of file
+internal interface ValidationRuleUidsCall : UidsCall<ObjectWithUid>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index 024916ae7c..d50beb1150 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -25,52 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.validation.internal
 
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Observable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
+import java.lang.Boolean
+import javax.inject.Inject
+import kotlin.String
 
 @Reusable
-final class ValidationRuleUidsCallImpl implements ValidationRuleUidsCall {
-
-    private final ValidationRuleService service;
-    private final DataSetValidationRuleLinkHandler linkHandler;
-    private final APIDownloader apiDownloader;
-
-    @Inject
-    ValidationRuleUidsCallImpl(ValidationRuleService service,
-                               DataSetValidationRuleLinkHandler linkHandler,
-                               APIDownloader apiDownloader) {
-        this.service = service;
-        this.linkHandler = linkHandler;
-        this.apiDownloader = apiDownloader;
-    }
+internal class ValidationRuleUidsCallImpl @Inject constructor(
+    private val service: ValidationRuleService,
+    private val linkHandler: DataSetValidationRuleLinkHandler,
+    private val apiDownloader: APIDownloader,
+) : ValidationRuleUidsCall {
 
-    @Override
-    public Single<List<ObjectWithUid>> download(Set<String> dataSetUids) {
-        return Observable.fromIterable(dataSetUids)
-                .flatMapSingle(dataSetUid -> apiDownloader.downloadLink(dataSetUid, linkHandler, dataSetPartitionUids ->
-                                service.getDataSetValidationRuleUids(
-                                        dataSetUid, BaseIdentifiableObject.UID, Boolean.FALSE),
-                        validationRule -> DataSetValidationRuleLink.builder()
-                                .dataSet(dataSetUid)
-                                .validationRule(validationRule.uid()).build()))
-                .reduce(new ArrayList<>(), (items1, items2) -> {
-                    items1.addAll(items2);
-                    return items1;
-                });
+    override fun download(uids: Set<String>): Single<List<ObjectWithUid>> {
+        return Observable.fromIterable(uids)
+            .flatMapSingle { dataSetUid: String ->
+                apiDownloader.downloadLink(
+                    dataSetUid,
+                    linkHandler,
+                    { dataSetPartitionUids: String ->
+                        service.getDataSetValidationRuleUids(
+                            dataSetUid,
+                            BaseIdentifiableObject.UID,
+                            Boolean.FALSE,
+                        )
+                    },
+                ) { validationRule: ObjectWithUid ->
+                    DataSetValidationRuleLink.builder()
+                        .dataSet(dataSetUid)
+                        .validationRule(validationRule.uid()).build()
+                }
+            }
+            .reduce(ArrayList()) { items1: List<ObjectWithUid>, items2: List<ObjectWithUid> ->
+                items1 + items2 // Use the + operator to concatenate lists
+            }
     }
-}
\ No newline at end of file
+}

From f5fffd39439a4a8d9338adf01fe0aa8fdb4b306d Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 16:02:34 +0200
Subject: [PATCH 275/478] [ANDROSDK-1720] style: - Match styling conventions
 (SonarQube results)

---
 .../dhis/android/core/arch/call/factories/internal/ListCall.kt | 2 +-
 .../java/org/hisp/dhis/android/core/enrollment/Enrollment.java | 1 -
 core/src/main/java/org/hisp/dhis/android/core/event/Event.java | 1 -
 .../hisp/dhis/android/core/event/internal/EventFilterCall.kt   | 1 -
 .../hisp/dhis/android/core/option/internal/OptionGroupCall.kt  | 1 -
 .../java/org/hisp/dhis/android/core/program/ProgramStage.java  | 1 -
 .../org/hisp/dhis/android/core/program/internal/ProgramCall.kt | 1 -
 .../hisp/dhis/android/core/program/internal/ProgramRuleCall.kt | 1 -
 .../android/core/program/internal/ProgramSectionFields.java    | 1 -
 .../dhis/android/core/program/internal/ProgramStageCall.kt     | 1 -
 .../android/core/relationship/internal/RelationshipTypeCall.kt | 1 -
 .../core/trackedentity/internal/TrackedEntityAttributeCall.kt  | 1 -
 .../core/trackedentity/internal/TrackedEntityTypeCall.kt       | 3 +--
 .../android/core/validation/internal/ValidationRuleCall.kt     | 1 -
 .../core/validation/internal/ValidationRuleUidsCallImpl.kt     | 3 +--
 15 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
index db4c8866c0..1f7befe62b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCall.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import io.reactivex.Single
 
-interface ListCall<P> {
+fun interface ListCall<P> {
     fun download(): Single<List<P>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
index 9bd63862ef..8a51616c75 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
@@ -221,7 +221,6 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.30, replaced by {@link #geometry(Geometry geometry)}
          */
-        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
index 2677f5719c..b188e02e77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/Event.java
@@ -232,7 +232,6 @@ public abstract static class Builder extends BaseDeletableDataObject.Builder<Bui
         /**
          * @deprecated since 2.29, replaced by {@link #geometry(Geometry geometry)}
          */
-        @Deprecated
         abstract Builder coordinate(Coordinates coordinate);
 
         public abstract Builder geometry(Geometry geometry);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index ced194203b..be63896841 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -39,7 +39,6 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class EventFilterCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index 85bdb57762..ce19c68cf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.option.OptionGroup
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class OptionGroupCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
index 9fbbc4e1ef..5fa3b9b3d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStage.java
@@ -236,7 +236,6 @@ public static abstract class Builder extends BaseIdentifiableObject.Builder<Buil
         /**
          * @deprecated since 2.29, replaced by {@link #featureType(FeatureType featureType)}
          */
-        @Deprecated
         abstract Builder captureCoordinates(Boolean captureCoordinates);
 
         public abstract Builder featureType(FeatureType featureType);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 159a626b7c..f177d32d03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.Program
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class ProgramCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index 127303fd92..665d8f53d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 internal class ProgramRuleCall @Inject constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
index a6fc788ebb..e750ed3cff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionFields.java
@@ -41,7 +41,6 @@ public final class ProgramSectionFields {
     /**
      * @deprecated In version 2.33 and later, use {@link #TRACKED_ENTITY_ATTRIBUTES} instead.
      */
-    @Deprecated
     public static final String ATTRIBUTES = "programTrackedEntityAttribute";
     public static final String TRACKED_ENTITY_ATTRIBUTES = "trackedEntityAttributes";
     private static final String STYLE = "style";
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 693fd57976..a0576687c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -38,7 +38,6 @@ import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class ProgramStageCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index a4e53af601..f73ccc9d14 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.resource.internal.Resource
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class RelationshipTypeCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index fe7c0182c7..f16c82b4e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class TrackedEntityAttributeCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index cc85703840..d4a0123e86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class TrackedEntityTypeCall @Inject internal constructor(
@@ -50,7 +49,7 @@ class TrackedEntityTypeCall @Inject internal constructor(
             optionSetUids,
             MAX_UID_LIST_SIZE,
             handler,
-            { partitionUids: Set<String> ->
+            { _: Set<String> ->
                 service.getTrackedEntityTypes(
                     TrackedEntityTypeFields.allFields,
                     TrackedEntityTypeFields.uid.`in`(optionSetUids),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index 2970dc05df..1475c78223 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.ValidationRule
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 class ValidationRuleCall @Inject internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index d50beb1150..3bee1d430d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
 import java.lang.Boolean
 import javax.inject.Inject
-import kotlin.String
 
 @Reusable
 internal class ValidationRuleUidsCallImpl @Inject constructor(
@@ -51,7 +50,7 @@ internal class ValidationRuleUidsCallImpl @Inject constructor(
                 apiDownloader.downloadLink(
                     dataSetUid,
                     linkHandler,
-                    { dataSetPartitionUids: String ->
+                    { _: String ->
                         service.getDataSetValidationRuleUids(
                             dataSetUid,
                             BaseIdentifiableObject.UID,

From 76e3bb3af3cd29290aaf508d0bfdeff095685574 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 13 Sep 2023 14:45:30 +0200
Subject: [PATCH 276/478] [ANDROSDK-1736] refactor: - Use of
 ListNoResourceWithErrorCatcherCallFetcher.kt - Remove unneeded nullables -
 (re)added 'storeError'

---
 .../internal/QueryCoroutineCallFactoryImpl.kt |  4 +--
 ...stNoResourceWithErrorCatcherCallFetcher.kt |  4 +--
 ...ckedEntityAttributeReservedValueManager.kt | 13 ++++---
 ...tributeReservedValueEndpointCallFactory.kt | 36 +++++++++++--------
 ...ckedEntityAttributeReservedValueQuery.java | 12 +++++--
 ...ckedEntityAttributeReservedValueService.kt | 14 ++++----
 6 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index 31f81c7d07..158946bf0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -34,9 +34,9 @@ import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
 internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQueryKt> protected constructor(
     protected val data: GenericCallData,
-    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : QueryCallFactory<P, Q> {
-    override suspend fun create(query: Q): MutableList<P> {
+    override suspend fun create(query: Q): List<P> {
         val objects: List<P> = fetcher(query)
         processor(query).process(objects)
         return objects.toMutableList()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
index 76abb243f2..7776dbddd5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
@@ -35,10 +35,10 @@ internal abstract class ListNoResourceWithErrorCatcherCallFetcher<P> protected c
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val errorCatcher: APICallErrorCatcher
 ) {
-    protected abstract val call: List<P>
+    protected abstract suspend fun call(): List<P>
 
     @Throws(D2Error::class)
     suspend fun fetch(): List<P> {
-        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) { call }.getOrThrow()
+        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) { call() }.getOrThrow()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 9d7c22d19d..4814f68c73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -110,7 +110,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
     private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
 
-        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null)
+        downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
 
         val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
         val attributeOrgunit = if (isOrgunitDependent(pattern)) organisationUnitUid else null
@@ -278,12 +278,12 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
 
             for (organisationUnit in organisationUnits) {
                 downloadValuesIfBelowThreshold(
-                    attribute, organisationUnit, numberOfValuesToFillUp
+                    attribute, organisationUnit, numberOfValuesToFillUp, true
                 )
                 emit(increaseProgress())
             }
         } else {
-            downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp)
+            downloadValuesIfBelowThreshold(attribute, null, numberOfValuesToFillUp, true)
 
             emit(increaseProgress())
         }
@@ -293,6 +293,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         attribute: String,
         organisationUnit: OrganisationUnit?,
         minNumberOfValuesToHave: Int?,
+        storeError: Boolean,
     ) = coroutineScope {
         // Using local date. It's not worth it to make a system info call
         store.deleteExpired(Date())
@@ -308,7 +309,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         if (remainingValues < minNumberToTryFill) {
             val numberToReserve = fillUpTo!! - remainingValues
             downloadValues(
-                attribute, organisationUnit, numberToReserve, pattern
+                attribute, organisationUnit, numberToReserve, pattern, storeError
             )
         }
     }
@@ -318,11 +319,13 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         organisationUnit: OrganisationUnit?,
         numberToReserve: Int,
         pattern: String?,
+        storeError: Boolean,
     ) {
         reservedValueQueryCallFactory.create(
             TrackedEntityAttributeReservedValueQuery.create(
-                trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern
+                trackedEntityAttributeUid, numberToReserve, organisationUnit, pattern, storeError
             )
+
         )
 
         if (pattern != null) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index 4927afc8ee..75bd36acd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -31,6 +31,7 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
@@ -43,27 +44,32 @@ internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject in
     private val handler: TrackedEntityAttributeReservedValueHandler
 ) : QueryCoroutineCallFactoryImpl<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery>(
     data,
-    coroutineAPICallExecutor
+    coroutineAPICallExecutor,
 ) {
+
     override suspend fun fetcher(query: TrackedEntityAttributeReservedValueQuery):
         List<TrackedEntityAttributeReservedValue> {
-
         val errorCatcher = TrackedEntityAttributeReservedValueCallErrorCatcher()
 
-        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) {
-            if (query.organisationUnit() == null) {
-                service.generateAndReserve(
-                    query.trackedEntityAttributeUid(),
-                    query.numberToReserve()
-                )
-            } else {
-                service.generateAndReserveWithOrgUnitCode(
-                    query.trackedEntityAttributeUid(),
-                    query.numberToReserve(),
-                    query.organisationUnit()!!.code()
-                )
+        return object : ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
+            coroutineAPICallExecutor = coroutineAPICallExecutor,
+            errorCatcher = errorCatcher
+        ) {
+            override suspend fun call(): List<TrackedEntityAttributeReservedValue> {
+                return if (query.organisationUnit() == null) {
+                    service.generateAndReserve(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve()
+                    )
+                } else {
+                    service.generateAndReserveWithOrgUnitCode(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve(),
+                        query.organisationUnit()!!.code()!!
+                    )
+                }
             }
-        }.getOrThrow()
+        }.fetch()
     }
 
     override fun processor(query: TrackedEntityAttributeReservedValueQuery):
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
index a0a04a473d..b920269dd6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
@@ -47,11 +47,19 @@ public abstract class TrackedEntityAttributeReservedValueQuery extends BaseQuery
 
     public abstract String trackedEntityAttributePattern();
 
+    public abstract Boolean storeError();
+
     public static TrackedEntityAttributeReservedValueQuery create(String trackedEntityAttributeUid,
                                                                   Integer numberToReserve,
                                                                   OrganisationUnit organisationUnit,
-                                                                  String trackedEntityAttributePattern) {
+                                                                  String trackedEntityAttributePattern,
+                                                                  Boolean storeError) {
+
         return new AutoValue_TrackedEntityAttributeReservedValueQuery(
-                trackedEntityAttributeUid, numberToReserve, organisationUnit, trackedEntityAttributePattern);
+                trackedEntityAttributeUid,
+                numberToReserve,
+                organisationUnit,
+                trackedEntityAttributePattern,
+                storeError);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 8b06967353..028f3afed8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -33,17 +33,17 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface TrackedEntityAttributeReservedValueService {
-    @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
+    @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserve(
-        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
-        @Query("numberToReserve") numberToReserve: Int?
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
+        @Query("numberToReserve") numberToReserve: Int
     ): List<TrackedEntityAttributeReservedValue>
 
-    @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
+    @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserveWithOrgUnitCode(
-        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
-        @Query("numberToReserve") numberToReserve: Int?,
-        @Query("ORG_UNIT_CODE") orgUnitCode: String?
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
+        @Query("numberToReserve") numberToReserve: Int,
+        @Query("ORG_UNIT_CODE") orgUnitCode: String,
     ): List<TrackedEntityAttributeReservedValue>
 
     companion object {

From 0a4e8f64ae05af38274861e20bcd84bd3b3fea55 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 15 Aug 2023 19:29:57 +0200
Subject: [PATCH 277/478] Rename .java to .kt

---
 .../arch/call/internal/{EndpointCall.java => EndpointCall.kt}     | 0
 ... => TrackedEntityAttributeReservedValueEndpointCallFactory.kt} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/{EndpointCall.java => EndpointCall.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeReservedValueEndpointCallFactory.java => TrackedEntityAttributeReservedValueEndpointCallFactory.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt

From 387b48dc4723ddc12ca597b697254961371a1d45 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 15 Aug 2023 19:29:58 +0200
Subject: [PATCH 278/478] [ANDROSDK-1736] refactor: - ReservedValues network
 call to coroutines

---
 .../core/arch/call/internal/EndpointCall.kt   |  54 +++------
 ...tributeReservedValueEndpointCallFactory.kt | 103 ++++++++----------
 ...kedEntityAttributeReservedValueService.kt} |  38 +++----
 3 files changed, 81 insertions(+), 114 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeReservedValueService.java => TrackedEntityAttributeReservedValueService.kt} (68%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
index 18c9ec7ff9..f7fc7cf572 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
@@ -25,42 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.internal;
-
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import androidx.annotation.VisibleForTesting;
-
-public final class EndpointCall<P> implements Callable<List<P>> {
-
-    private final CallFetcher<P> fetcher;
-    private final CallProcessor<P> processor;
-
-    public EndpointCall(CallFetcher<P> fetcher,
-                        CallProcessor<P> processor) {
-        this.fetcher = fetcher;
-        this.processor = processor;
-    }
-
-    @Override
-    public List<P> call() throws Exception {
-        List<P> objects = fetcher.fetch();
-        processor.process(objects);
-        return objects;
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public CallFetcher<P> getFetcher() {
-        return fetcher;
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    public CallProcessor<P> getProcessor() {
-        return processor;
+package org.hisp.dhis.android.core.arch.call.internal
+
+import androidx.annotation.VisibleForTesting
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
+
+class EndpointCall<P>(
+    @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val fetcher: CallFetcher<P>,
+    @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val processor: CallProcessor<P>
+) {
+
+    @Throws(Exception::class)
+    fun call(): List<P> {
+        val objects = fetcher.fetch()
+        processor.process(objects)
+        return objects
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index bebddc8d1b..a255aef720 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -25,72 +25,59 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityAttributeReservedValueEndpointCallFactory
-        extends QueryCallFactoryImpl<TrackedEntityAttributeReservedValue,
-        TrackedEntityAttributeReservedValueQuery> {
-
-    private final TrackedEntityAttributeReservedValueService service;
-    private final TrackedEntityAttributeReservedValueHandler handler;
+class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
+    data: GenericCallData?,
+    apiCallExecutor: APICallExecutor?,
+    private val service: TrackedEntityAttributeReservedValueService,
+    private val handler: TrackedEntityAttributeReservedValueHandler
+) : QueryCallFactoryImpl<TrackedEntityAttributeReservedValue?, TrackedEntityAttributeReservedValueQuery?>(
+    data,
+    apiCallExecutor
+) {
 
-    @Inject
-    TrackedEntityAttributeReservedValueEndpointCallFactory(
-            GenericCallData data,
-            APICallExecutor apiCallExecutor,
-            TrackedEntityAttributeReservedValueService service,
-            TrackedEntityAttributeReservedValueHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
-    }
-
-    @Override
-    protected CallFetcher<TrackedEntityAttributeReservedValue> fetcher(
-            final TrackedEntityAttributeReservedValueQuery query) {
-
-        return new ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
-                apiCallExecutor, new TrackedEntityAttributeReservedValueCallErrorCatcher()) {
-            @Override
-            protected retrofit2.Call<List<TrackedEntityAttributeReservedValue>> getCall() {
-                if (query.organisationUnit() == null) {
-                    return service.generateAndReserve(
-                            query.trackedEntityAttributeUid(),
-                            query.numberToReserve());
+    override fun fetcher(query: TrackedEntityAttributeReservedValueQuery?): CallFetcher<TrackedEntityAttributeReservedValue?> {
+        return object: ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue?>(
+            apiCallExecutor, TrackedEntityAttributeReservedValueCallErrorCatcher()
+        ) {
+            override fun getCall(): Call<MutableList<TrackedEntityAttributeReservedValue?>>? {
+                return if (query!!.organisationUnit() == null) {
+                    service.generateAndReserve(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve()
+                    )
                 } else {
-                    return service.generateAndReserveWithOrgUnitCode(
-                            query.trackedEntityAttributeUid(),
-                            query.numberToReserve(),
-                            query.organisationUnit().code());
+                    service.generateAndReserveWithOrgUnitCode(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve(),
+                        query.organisationUnit()!!.code()
+                    )
                 }
             }
-        };
+        }
     }
 
-    @Override
-    protected CallProcessor<TrackedEntityAttributeReservedValue> processor(
-            final TrackedEntityAttributeReservedValueQuery query) {
-        return new TrackedEntityAttributeReservedValueCallProcessor(
-                data.databaseAdapter(),
-                handler,
-                query.organisationUnit(),
-                query.trackedEntityAttributePattern()
-        );
+    override fun processor(query: TrackedEntityAttributeReservedValueQuery?): CallProcessor<TrackedEntityAttributeReservedValue?> {
+        return TrackedEntityAttributeReservedValueCallProcessor(
+            data.databaseAdapter(),
+            handler,
+            query!!.organisationUnit(),
+            query.trackedEntityAttributePattern()
+        )
     }
+
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 18785b09da..42c64270dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -25,28 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue;
-
-import java.util.List;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-
-public interface TrackedEntityAttributeReservedValueService {
-    String TRACKED_ENTITY_ATTRIBUTE_UID = "trackedEntityAttributeUid";
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
 
+interface TrackedEntityAttributeReservedValueService {
     @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
-    Call<List<TrackedEntityAttributeReservedValue>> generateAndReserve(
-            @Path(TRACKED_ENTITY_ATTRIBUTE_UID) String trackedEntityAttributeUid,
-            @Query("numberToReserve") Integer numberToReserve);
+    suspend fun generateAndReserve(
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
+        @Query("numberToReserve") numberToReserve: Int?
+    ): List<TrackedEntityAttributeReservedValue?>?
 
     @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
-    Call<List<TrackedEntityAttributeReservedValue>> generateAndReserveWithOrgUnitCode(
-            @Path(TRACKED_ENTITY_ATTRIBUTE_UID) String trackedEntityAttributeUid,
-            @Query("numberToReserve") Integer numberToReserve,
-            @Query("ORG_UNIT_CODE") String orgUnitCode);
+    suspend fun generateAndReserveWithOrgUnitCode(
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
+        @Query("numberToReserve") numberToReserve: Int?,
+        @Query("ORG_UNIT_CODE") orgUnitCode: String?
+    ): List<TrackedEntityAttributeReservedValue?>?
+
+    companion object {
+        const val TRACKED_ENTITY_ATTRIBUTE_UID = "trackedEntityAttributeUid"
+    }
 }
\ No newline at end of file

From 2917daf1432b96e58a937bacf796b9cdc7e77502 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 8 Sep 2023 09:25:15 +0200
Subject: [PATCH 279/478] Rename .java to .kt

---
 ...lFetcher.java => ListNoResourceWithErrorCatcherCallFetcher.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{ListNoResourceWithErrorCatcherCallFetcher.java => ListNoResourceWithErrorCatcherCallFetcher.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt

From ceae005a253a4d6b7757dcc6d2ad78fa6e9341a3 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 12:19:07 +0200
Subject: [PATCH 280/478] [ANDROSDK-1736] refactor: - All RxJava calls to
 Coroutines for ReservedValues fix: - EndpointCall.kt extending

---
 ...servedValueManagerRealIntegrationShould.kt | 24 +++----
 ...ryCallFactory.java => QueryCallFactory.kt} | 14 ++---
 ....java => QueryCoroutineCallFactoryImpl.kt} | 47 ++++++--------
 .../internal/UidsCallFactoryImpl.java         |  2 +-
 ...stNoResourceWithErrorCatcherCallFetcher.kt | 36 ++++-------
 .../core/arch/call/internal/EndpointCall.kt   |  8 +--
 ...ckedEntityAttributeReservedValueManager.kt | 11 ++--
 ...tributeReservedValueEndpointCallFactory.kt | 63 +++++++++----------
 ...ckedEntityAttributeReservedValueService.kt |  6 +-
 9 files changed, 91 insertions(+), 120 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{QueryCallFactory.java => QueryCallFactory.kt} (87%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{QueryCallFactoryImpl.java => QueryCoroutineCallFactoryImpl.kt} (63%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 5b55e5bd16..7bb8e5c3c2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import com.google.common.truth.Truth
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.category.CategoryCombo
@@ -59,7 +60,6 @@ import org.mockito.ArgumentMatchers
 import org.mockito.Captor
 import org.mockito.Mock
 import org.mockito.Mockito
-import java.util.concurrent.Callable
 
 @SuppressWarnings("MaxLineLength")
 class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
@@ -79,7 +79,7 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
         null
 
     @Mock
-    val trackedEntityAttributeReservedValueCall: Callable<List<TrackedEntityAttributeReservedValue>>? =
+    val trackedEntityAttributeReservedValueCall: List<TrackedEntityAttributeReservedValue>? =
         null
 
     @Captor
@@ -143,14 +143,16 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
         OrganisationUnitProgramLinkStoreImpl(d2.databaseAdapter()).insert(
             organisationUnitProgramLink,
         )
-        Mockito.`when`(
-            trackedEntityAttributeReservedValueQueryCallFactory!!.create(
-                ArgumentMatchers.any(
-                    TrackedEntityAttributeReservedValueQuery::class.java,
+        runBlocking {
+            Mockito.`when`(
+                trackedEntityAttributeReservedValueQueryCallFactory!!.create(
+                    ArgumentMatchers.any(
+                        TrackedEntityAttributeReservedValueQuery::class.java
+                    ),
                 ),
-            ),
-        )
-            .thenReturn(trackedEntityAttributeReservedValueCall)
+            )
+                .thenReturn(trackedEntityAttributeReservedValueCall)
+        }
         handler.handleMany(trackedEntityAttributeReservedValues)
     }
 
@@ -343,12 +345,12 @@ class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseReal
      * This method stopped working because QueryCallFactory mock instance differs from Dagger's injected one,
      * so the code is calling .create() on Dagger's instance and .verify() is trying to catch the call from Mockito's instace.
      */
-    private fun assertQueryIsCreatedRight(numberOfValuesExpected: Int) {
+    private suspend fun assertQueryIsCreatedRight(numberOfValuesExpected: Int) {
         Mockito.verify(trackedEntityAttributeReservedValueQueryCallFactory)!!.create(
             trackedEntityAttributeReservedValueQueryCaptor!!.capture(),
         )
         val query = trackedEntityAttributeReservedValueQueryCaptor.value
-        Truth.assertThat(query.organisationUnit()!!.uid()).isEqualTo(organisationUnit!!.uid())
+        Truth.assertThat(query.organisationUnit()!!.uid()).isEqualTo(organisationUnit.uid())
         Truth.assertThat(query.numberToReserve())
             .isEqualTo(numberOfValuesExpected) // values expected - 3 that it had before.
         Truth.assertThat(query.trackedEntityAttributePattern()).isEqualTo(pattern)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
similarity index 87%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
index 31bb481f06..aaad9afb46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
@@ -25,14 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.factories.internal
 
-package org.hisp.dhis.android.core.arch.call.factories.internal;
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
 
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public interface QueryCallFactory<P, Q extends BaseQuery> {
-    Callable<List<P>> create(Q query);
-}
\ No newline at end of file
+fun interface QueryCallFactory<P, Q : BaseQuery> {
+    suspend fun create(query: Q): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index d79b13f85d..213ce08343 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -25,34 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public abstract class QueryCallFactoryImpl<P, Q extends BaseQuery> implements QueryCallFactory<P, Q> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected QueryCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create(Q query) {
-        return new EndpointCall<>(fetcher(query), processor(query));
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+
+internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQuery> protected constructor(
+    protected val data: GenericCallData,
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : QueryCallFactory<P, Q> {
+    override suspend fun create(query: Q): MutableList<P> {
+        val objects: List<P> = fetcher(query)
+        processor(query).process(objects)
+        return objects.toMutableList()
     }
 
-    protected abstract CallFetcher<P> fetcher(Q query);
-    protected abstract CallProcessor<P> processor(Q query);
-}
\ No newline at end of file
+    protected abstract suspend fun fetcher(query: Q): List<P>
+    protected abstract fun processor(query: Q): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
index fcd8752900..18ba147138 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
@@ -50,7 +50,7 @@ protected UidsCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecu
 
     @Override
     public final Callable<List<P>> create(Set<String> uids) {
-        return new EndpointCall<>(fetcher(uids), processor());
+        return new EndpointCall(fetcher(uids), processor());
     }
 
     protected abstract CallFetcher<P> fetcher(Set<String> uids);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
index 9c2f7df105..76abb243f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
@@ -25,30 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
-package org.hisp.dhis.android.core.arch.call.fetchers.internal;
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.maintenance.D2Error;
+internal abstract class ListNoResourceWithErrorCatcherCallFetcher<P> protected constructor(
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
+    private val errorCatcher: APICallErrorCatcher
+) {
+    protected abstract val call: List<P>
 
-import java.util.List;
-
-public abstract class ListNoResourceWithErrorCatcherCallFetcher<P> implements CallFetcher<P> {
-
-    private final APICallExecutor apiCallExecutor;
-    private final APICallErrorCatcher errorCatcher;
-
-    protected ListNoResourceWithErrorCatcherCallFetcher(APICallExecutor apiCallExecutor,
-                                                        APICallErrorCatcher errorCatcher) {
-        this.apiCallExecutor = apiCallExecutor;
-        this.errorCatcher = errorCatcher;
-    }
-
-    protected abstract retrofit2.Call<List<P>> getCall();
-
-    @Override
-    public final List<P> fetch() throws D2Error {
-        return apiCallExecutor.executeObjectCallWithErrorCatcher(getCall(), errorCatcher);
+    @Throws(D2Error::class)
+    suspend fun fetch(): List<P> {
+        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) { call }.getOrThrow()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
index f7fc7cf572..54bcfecc5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
@@ -28,19 +28,19 @@
 package org.hisp.dhis.android.core.arch.call.internal
 
 import androidx.annotation.VisibleForTesting
+import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
 
 class EndpointCall<P>(
     @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val fetcher: CallFetcher<P>,
     @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val processor: CallProcessor<P>
-) {
+) : Callable<List<P>> {
 
     @Throws(Exception::class)
-    fun call(): List<P> {
+    override fun call(): List<P> {
         val objects = fetcher.fetch()
         processor.process(objects)
         return objects
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index ce68e1a759..014a5febb8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -30,6 +30,8 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
+import java.util.Date
+import javax.inject.Inject
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -65,8 +67,6 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import java.util.Date
-import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
 @Reusable
@@ -79,7 +79,6 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val generalSettingObjectRepository: GeneralSettingObjectRepository,
     private val reservedValueSettingStore: ReservedValueSettingStore,
-    private val executor: D2CallExecutor,
     private val reservedValueQueryCallFactory: QueryCallFactory<
         TrackedEntityAttributeReservedValue,
         TrackedEntityAttributeReservedValueQuery,
@@ -113,6 +112,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     }
 
     private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
+
         downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
 
         val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
@@ -335,17 +335,16 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         pattern: String?,
         storeError: Boolean,
     ) {
-        executor.executeD2Call(
             reservedValueQueryCallFactory.create(
                 TrackedEntityAttributeReservedValueQuery.create(
                     trackedEntityAttributeUid,
                     numberToReserve,
                     organisationUnit,
                     pattern,
+                    storeError,
                 ),
             ),
-            storeError,
-        )
+
 
         if (pattern != null) {
             store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index a255aef720..4927afc8ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -28,56 +28,51 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
+import javax.inject.Inject
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
-import retrofit2.Call
-import javax.inject.Inject
 
 @Reusable
-class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
-    data: GenericCallData?,
-    apiCallExecutor: APICallExecutor?,
+internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
+    data: GenericCallData,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: TrackedEntityAttributeReservedValueService,
     private val handler: TrackedEntityAttributeReservedValueHandler
-) : QueryCallFactoryImpl<TrackedEntityAttributeReservedValue?, TrackedEntityAttributeReservedValueQuery?>(
+) : QueryCoroutineCallFactoryImpl<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery>(
     data,
-    apiCallExecutor
+    coroutineAPICallExecutor
 ) {
+    override suspend fun fetcher(query: TrackedEntityAttributeReservedValueQuery):
+        List<TrackedEntityAttributeReservedValue> {
+
+        val errorCatcher = TrackedEntityAttributeReservedValueCallErrorCatcher()
 
-    override fun fetcher(query: TrackedEntityAttributeReservedValueQuery?): CallFetcher<TrackedEntityAttributeReservedValue?> {
-        return object: ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue?>(
-            apiCallExecutor, TrackedEntityAttributeReservedValueCallErrorCatcher()
-        ) {
-            override fun getCall(): Call<MutableList<TrackedEntityAttributeReservedValue?>>? {
-                return if (query!!.organisationUnit() == null) {
-                    service.generateAndReserve(
-                        query.trackedEntityAttributeUid(),
-                        query.numberToReserve()
-                    )
-                } else {
-                    service.generateAndReserveWithOrgUnitCode(
-                        query.trackedEntityAttributeUid(),
-                        query.numberToReserve(),
-                        query.organisationUnit()!!.code()
-                    )
-                }
+        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) {
+            if (query.organisationUnit() == null) {
+                service.generateAndReserve(
+                    query.trackedEntityAttributeUid(),
+                    query.numberToReserve()
+                )
+            } else {
+                service.generateAndReserveWithOrgUnitCode(
+                    query.trackedEntityAttributeUid(),
+                    query.numberToReserve(),
+                    query.organisationUnit()!!.code()
+                )
             }
-        }
+        }.getOrThrow()
     }
 
-    override fun processor(query: TrackedEntityAttributeReservedValueQuery?): CallProcessor<TrackedEntityAttributeReservedValue?> {
+    override fun processor(query: TrackedEntityAttributeReservedValueQuery):
+        CallProcessor<TrackedEntityAttributeReservedValue> {
         return TrackedEntityAttributeReservedValueCallProcessor(
             data.databaseAdapter(),
             handler,
-            query!!.organisationUnit(),
+            query.organisationUnit(),
             query.trackedEntityAttributePattern()
         )
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 42c64270dc..8b06967353 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -37,16 +37,16 @@ interface TrackedEntityAttributeReservedValueService {
     suspend fun generateAndReserve(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
         @Query("numberToReserve") numberToReserve: Int?
-    ): List<TrackedEntityAttributeReservedValue?>?
+    ): List<TrackedEntityAttributeReservedValue>
 
     @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
     suspend fun generateAndReserveWithOrgUnitCode(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
         @Query("numberToReserve") numberToReserve: Int?,
         @Query("ORG_UNIT_CODE") orgUnitCode: String?
-    ): List<TrackedEntityAttributeReservedValue?>?
+    ): List<TrackedEntityAttributeReservedValue>
 
     companion object {
         const val TRACKED_ENTITY_ATTRIBUTE_UID = "trackedEntityAttributeUid"
     }
-}
\ No newline at end of file
+}

From 578a12138ff569a7bbc29e866dc4f45efefac3a2 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 15:37:08 +0200
Subject: [PATCH 281/478] Rename .java to .kt

---
 .../internal/{UidsCallFactoryImpl.java => UidsCallFactoryImpl.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{UidsCallFactoryImpl.java => UidsCallFactoryImpl.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt

From 1c06607610449256ad7b9439a3a703c07c6a5d4d Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 11 Sep 2023 15:37:08 +0200
Subject: [PATCH 282/478] [ANDROSDK-1736] refactor: - EndpointCall to
 UidsCallFactoryImpl and ListCallFactoryImpl to Kotlin - Remove deprecated
 usages of BaseQuery in favor of BaseQueryKt - Adapt BaseQueryKt to Java call
 from AutoValue class

---
 ...servedValueManagerRealIntegrationShould.kt |  2 +-
 .../factories/internal/QueryCallFactory.kt    |  4 +-
 .../internal/QueryCoroutineCallFactoryImpl.kt |  4 +-
 .../factories/internal/UidsCallFactoryImpl.kt | 47 +++++++------------
 .../arch/call/queries/internal/BaseQueryKt.kt |  6 +++
 ...ckedEntityAttributeReservedValueQuery.java |  7 +--
 6 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 7bb8e5c3c2..58c8f45c8e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -62,7 +62,7 @@ import org.mockito.Mock
 import org.mockito.Mockito
 
 @SuppressWarnings("MaxLineLength")
-class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
+internal class TrackedEntityAttributeReservedValueManagerRealIntegrationShould : BaseRealIntegrationTest() {
     private lateinit var store: TrackedEntityAttributeReservedValueStore
     private val organisationUnitUid = "org_unit_uid"
     private val programUid = "program_uid"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
index aaad9afb46..b2728103d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCallFactory.kt
@@ -27,8 +27,8 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
-fun interface QueryCallFactory<P, Q : BaseQuery> {
+internal fun interface QueryCallFactory<P, Q : BaseQueryKt> {
     suspend fun create(query: Q): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index 213ce08343..31f81c7d07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -30,9 +30,9 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
-internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQuery> protected constructor(
+internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQueryKt> protected constructor(
     protected val data: GenericCallData,
     protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
 ) : QueryCallFactory<P, Q> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
index 18ba147138..12e2ee19dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
@@ -25,34 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
-public abstract class UidsCallFactoryImpl<P> implements UidsCallFactory<P> {
-
-    protected final GenericCallData data;
-    protected final APICallExecutor apiCallExecutor;
-
-    protected UidsCallFactoryImpl(GenericCallData data, APICallExecutor apiCallExecutor) {
-        this.data = data;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    @Override
-    public final Callable<List<P>> create(Set<String> uids) {
-        return new EndpointCall(fetcher(uids), processor());
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import java.util.concurrent.Callable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+
+abstract class UidsCallFactoryImpl<P> protected constructor(
+    @JvmField protected val data: GenericCallData,
+    @JvmField protected val apiCallExecutor: APICallExecutor
+) : UidsCallFactory<P> {
+    override fun create(uids: Set<String>): Callable<List<P>> {
+        return EndpointCall(fetcher(uids), processor())
     }
 
-    protected abstract CallFetcher<P> fetcher(Set<String> uids);
-    protected abstract CallProcessor<P> processor();
-}
\ No newline at end of file
+    protected abstract fun fetcher(uids: Set<String>): CallFetcher<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
index 3355ae7c86..6896ac6dd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
@@ -36,3 +36,9 @@ internal open class BaseQueryKt(
         const val DEFAULT_PAGE_SIZE = 50
     }
 }
+
+internal open class BaseQueryKtJavaCompatible(
+    page: Int = 1,
+    pageSize: Int = DEFAULT_PAGE_SIZE,
+    paging: Boolean = false
+) : BaseQueryKt(page, pageSize, paging)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
index 1f4ca9313c..a0a04a473d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
@@ -32,11 +32,12 @@
 
 import com.google.auto.value.AutoValue;
 
-import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery;
+import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKtJavaCompatible;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 
 @AutoValue
-public abstract class TrackedEntityAttributeReservedValueQuery extends BaseQuery {
+public abstract class TrackedEntityAttributeReservedValueQuery extends BaseQueryKtJavaCompatible {
+
     public abstract String trackedEntityAttributeUid();
 
     public abstract Integer numberToReserve();
@@ -50,7 +51,7 @@ public static TrackedEntityAttributeReservedValueQuery create(String trackedEnti
                                                                   Integer numberToReserve,
                                                                   OrganisationUnit organisationUnit,
                                                                   String trackedEntityAttributePattern) {
-        return new AutoValue_TrackedEntityAttributeReservedValueQuery(1, BaseQuery.DEFAULT_PAGE_SIZE, false,
+        return new AutoValue_TrackedEntityAttributeReservedValueQuery(
                 trackedEntityAttributeUid, numberToReserve, organisationUnit, trackedEntityAttributePattern);
     }
 }
\ No newline at end of file

From 9f23b12f6a5748ba092a5332534c342f0df1bf42 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 13 Sep 2023 14:45:30 +0200
Subject: [PATCH 283/478] [ANDROSDK-1736] refactor: - Use of
 ListNoResourceWithErrorCatcherCallFetcher.kt - Remove unneeded nullables -
 (re)added 'storeError'

---
 .../internal/QueryCoroutineCallFactoryImpl.kt |  4 +--
 ...stNoResourceWithErrorCatcherCallFetcher.kt |  4 +--
 ...ckedEntityAttributeReservedValueManager.kt |  1 -
 ...tributeReservedValueEndpointCallFactory.kt | 36 +++++++++++--------
 ...ckedEntityAttributeReservedValueQuery.java | 12 +++++--
 ...ckedEntityAttributeReservedValueService.kt | 14 ++++----
 6 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index 31f81c7d07..158946bf0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -34,9 +34,9 @@ import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
 
 internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQueryKt> protected constructor(
     protected val data: GenericCallData,
-    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : QueryCallFactory<P, Q> {
-    override suspend fun create(query: Q): MutableList<P> {
+    override suspend fun create(query: Q): List<P> {
         val objects: List<P> = fetcher(query)
         processor(query).process(objects)
         return objects.toMutableList()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
index 76abb243f2..7776dbddd5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
@@ -35,10 +35,10 @@ internal abstract class ListNoResourceWithErrorCatcherCallFetcher<P> protected c
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val errorCatcher: APICallErrorCatcher
 ) {
-    protected abstract val call: List<P>
+    protected abstract suspend fun call(): List<P>
 
     @Throws(D2Error::class)
     suspend fun fetch(): List<P> {
-        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) { call }.getOrThrow()
+        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) { call() }.getOrThrow()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 014a5febb8..347d48e5a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -42,7 +42,6 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.asObservable
 import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index 4927afc8ee..75bd36acd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -31,6 +31,7 @@ import dagger.Reusable
 import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
@@ -43,27 +44,32 @@ internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject in
     private val handler: TrackedEntityAttributeReservedValueHandler
 ) : QueryCoroutineCallFactoryImpl<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery>(
     data,
-    coroutineAPICallExecutor
+    coroutineAPICallExecutor,
 ) {
+
     override suspend fun fetcher(query: TrackedEntityAttributeReservedValueQuery):
         List<TrackedEntityAttributeReservedValue> {
-
         val errorCatcher = TrackedEntityAttributeReservedValueCallErrorCatcher()
 
-        return coroutineAPICallExecutor.wrap(errorCatcher = errorCatcher) {
-            if (query.organisationUnit() == null) {
-                service.generateAndReserve(
-                    query.trackedEntityAttributeUid(),
-                    query.numberToReserve()
-                )
-            } else {
-                service.generateAndReserveWithOrgUnitCode(
-                    query.trackedEntityAttributeUid(),
-                    query.numberToReserve(),
-                    query.organisationUnit()!!.code()
-                )
+        return object : ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
+            coroutineAPICallExecutor = coroutineAPICallExecutor,
+            errorCatcher = errorCatcher
+        ) {
+            override suspend fun call(): List<TrackedEntityAttributeReservedValue> {
+                return if (query.organisationUnit() == null) {
+                    service.generateAndReserve(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve()
+                    )
+                } else {
+                    service.generateAndReserveWithOrgUnitCode(
+                        query.trackedEntityAttributeUid(),
+                        query.numberToReserve(),
+                        query.organisationUnit()!!.code()!!
+                    )
+                }
             }
-        }.getOrThrow()
+        }.fetch()
     }
 
     override fun processor(query: TrackedEntityAttributeReservedValueQuery):
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
index a0a04a473d..b920269dd6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueQuery.java
@@ -47,11 +47,19 @@ public abstract class TrackedEntityAttributeReservedValueQuery extends BaseQuery
 
     public abstract String trackedEntityAttributePattern();
 
+    public abstract Boolean storeError();
+
     public static TrackedEntityAttributeReservedValueQuery create(String trackedEntityAttributeUid,
                                                                   Integer numberToReserve,
                                                                   OrganisationUnit organisationUnit,
-                                                                  String trackedEntityAttributePattern) {
+                                                                  String trackedEntityAttributePattern,
+                                                                  Boolean storeError) {
+
         return new AutoValue_TrackedEntityAttributeReservedValueQuery(
-                trackedEntityAttributeUid, numberToReserve, organisationUnit, trackedEntityAttributePattern);
+                trackedEntityAttributeUid,
+                numberToReserve,
+                organisationUnit,
+                trackedEntityAttributePattern,
+                storeError);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 8b06967353..028f3afed8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -33,17 +33,17 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface TrackedEntityAttributeReservedValueService {
-    @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
+    @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserve(
-        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
-        @Query("numberToReserve") numberToReserve: Int?
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
+        @Query("numberToReserve") numberToReserve: Int
     ): List<TrackedEntityAttributeReservedValue>
 
-    @GET("trackedEntityAttributes/{" + TRACKED_ENTITY_ATTRIBUTE_UID + "}/generateAndReserve")
+    @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserveWithOrgUnitCode(
-        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String?,
-        @Query("numberToReserve") numberToReserve: Int?,
-        @Query("ORG_UNIT_CODE") orgUnitCode: String?
+        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
+        @Query("numberToReserve") numberToReserve: Int,
+        @Query("ORG_UNIT_CODE") orgUnitCode: String,
     ): List<TrackedEntityAttributeReservedValue>
 
     companion object {

From 0564cd8c40e6ddf24a76ea8f7ab9cd4c10b060df Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 14 Sep 2023 09:43:55 +0200
Subject: [PATCH 284/478] [ANDROSDK-1736] style: - Post-rebase code styling

---
 ...servedValueManagerRealIntegrationShould.kt |  2 +-
 .../factories/internal/UidsCallFactoryImpl.kt |  4 ++--
 ...stNoResourceWithErrorCatcherCallFetcher.kt |  2 +-
 .../core/arch/call/internal/EndpointCall.kt   |  4 ++--
 .../arch/call/queries/internal/BaseQueryKt.kt |  2 +-
 ...ckedEntityAttributeReservedValueManager.kt | 22 +++++++++----------
 ...tributeReservedValueEndpointCallFactory.kt | 12 +++++-----
 ...ckedEntityAttributeReservedValueService.kt |  2 +-
 8 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
index 58c8f45c8e..4ec5fdd070 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManagerRealIntegrationShould.kt
@@ -147,7 +147,7 @@ internal class TrackedEntityAttributeReservedValueManagerRealIntegrationShould :
             Mockito.`when`(
                 trackedEntityAttributeReservedValueQueryCallFactory!!.create(
                     ArgumentMatchers.any(
-                        TrackedEntityAttributeReservedValueQuery::class.java
+                        TrackedEntityAttributeReservedValueQuery::class.java,
                     ),
                 ),
             )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
index 12e2ee19dd..11da4da267 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
 
 abstract class UidsCallFactoryImpl<P> protected constructor(
     @JvmField protected val data: GenericCallData,
-    @JvmField protected val apiCallExecutor: APICallExecutor
+    @JvmField protected val apiCallExecutor: APICallExecutor,
 ) : UidsCallFactory<P> {
     override fun create(uids: Set<String>): Callable<List<P>> {
         return EndpointCall(fetcher(uids), processor())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
index 7776dbddd5..fbeebecafb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/ListNoResourceWithErrorCatcherCallFetcher.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 
 internal abstract class ListNoResourceWithErrorCatcherCallFetcher<P> protected constructor(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
-    private val errorCatcher: APICallErrorCatcher
+    private val errorCatcher: APICallErrorCatcher,
 ) {
     protected abstract suspend fun call(): List<P>
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
index 54bcfecc5e..8760496fda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/internal/EndpointCall.kt
@@ -28,13 +28,13 @@
 package org.hisp.dhis.android.core.arch.call.internal
 
 import androidx.annotation.VisibleForTesting
-import java.util.concurrent.Callable
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
 
 class EndpointCall<P>(
     @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val fetcher: CallFetcher<P>,
-    @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val processor: CallProcessor<P>
+    @get:VisibleForTesting(otherwise = VisibleForTesting.NONE) val processor: CallProcessor<P>,
 ) : Callable<List<P>> {
 
     @Throws(Exception::class)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
index 6896ac6dd0..84d40291c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/queries/internal/BaseQueryKt.kt
@@ -40,5 +40,5 @@ internal open class BaseQueryKt(
 internal open class BaseQueryKtJavaCompatible(
     page: Int = 1,
     pageSize: Int = DEFAULT_PAGE_SIZE,
-    paging: Boolean = false
+    paging: Boolean = false,
 ) : BaseQueryKt(page, pageSize, paging)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 347d48e5a8..1c94822fb4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -30,8 +30,6 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
-import java.util.Date
-import javax.inject.Inject
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -66,6 +64,8 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeR
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import java.util.Date
+import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
 @Reusable
@@ -111,7 +111,6 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     }
 
     private suspend fun getValueCoroutines(attributeUid: String, organisationUnitUid: String): String {
-
         downloadValuesIfBelowThreshold(attributeUid, getOrganisationUnit(organisationUnitUid), null, false)
 
         val pattern = trackedEntityAttributeStore.selectByUid(attributeUid)!!.pattern()
@@ -334,16 +333,15 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
         pattern: String?,
         storeError: Boolean,
     ) {
-            reservedValueQueryCallFactory.create(
-                TrackedEntityAttributeReservedValueQuery.create(
-                    trackedEntityAttributeUid,
-                    numberToReserve,
-                    organisationUnit,
-                    pattern,
-                    storeError,
-                ),
+        reservedValueQueryCallFactory.create(
+            TrackedEntityAttributeReservedValueQuery.create(
+                trackedEntityAttributeUid,
+                numberToReserve,
+                organisationUnit,
+                pattern,
+                storeError,
             ),
-
+        )
 
         if (pattern != null) {
             store.deleteIfOutdatedPattern(trackedEntityAttributeUid, pattern)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index 75bd36acd9..69b0d0e7b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -28,20 +28,20 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import javax.inject.Inject
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
+import javax.inject.Inject
 
 @Reusable
 internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
     data: GenericCallData,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: TrackedEntityAttributeReservedValueService,
-    private val handler: TrackedEntityAttributeReservedValueHandler
+    private val handler: TrackedEntityAttributeReservedValueHandler,
 ) : QueryCoroutineCallFactoryImpl<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery>(
     data,
     coroutineAPICallExecutor,
@@ -53,19 +53,19 @@ internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject in
 
         return object : ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
             coroutineAPICallExecutor = coroutineAPICallExecutor,
-            errorCatcher = errorCatcher
+            errorCatcher = errorCatcher,
         ) {
             override suspend fun call(): List<TrackedEntityAttributeReservedValue> {
                 return if (query.organisationUnit() == null) {
                     service.generateAndReserve(
                         query.trackedEntityAttributeUid(),
-                        query.numberToReserve()
+                        query.numberToReserve(),
                     )
                 } else {
                     service.generateAndReserveWithOrgUnitCode(
                         query.trackedEntityAttributeUid(),
                         query.numberToReserve(),
-                        query.organisationUnit()!!.code()!!
+                        query.organisationUnit()!!.code()!!,
                     )
                 }
             }
@@ -78,7 +78,7 @@ internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject in
             data.databaseAdapter(),
             handler,
             query.organisationUnit(),
-            query.trackedEntityAttributePattern()
+            query.trackedEntityAttributePattern(),
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 028f3afed8..a3e08bad27 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -36,7 +36,7 @@ interface TrackedEntityAttributeReservedValueService {
     @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserve(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
-        @Query("numberToReserve") numberToReserve: Int
+        @Query("numberToReserve") numberToReserve: Int,
     ): List<TrackedEntityAttributeReservedValue>
 
     @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")

From 1b654d63849265ef42d62675d3ace5a6ecb1baef Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 31 Aug 2023 12:30:09 +0200
Subject: [PATCH 285/478] [ANDROSDK-1743] Add TrackerHeaderEngine

---
 .../internal/TrackerHeaderEngine.kt           | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
new file mode 100644
index 0000000000..886102feb7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
@@ -0,0 +1,83 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.trackerheaderengine.internal
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper
+import org.hisp.dhis.android.core.constant.Constant
+import org.hisp.dhis.android.core.constant.internal.ConstantStore
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.program.ProgramIndicator
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
+import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorContext
+import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorExecutor
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import javax.inject.Inject
+
+@Reusable
+internal class TrackerHeaderEngine @Inject constructor(
+    private val dataElementStore: DataElementStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
+    private val programStageStore: ProgramStageStore,
+    private val constantStore: ConstantStore,
+) {
+    fun getTrackedEntityHeader(expression: String, attributeValues: List<TrackedEntityAttributeValue>): String? {
+        val programIndicator: ProgramIndicator = ProgramIndicator.builder()
+            .uid("mock_program_indicator")
+            .expression(expression)
+            .build()
+
+        val attributeValueMap = attributeValues
+            .filter { it.trackedEntityAttribute() != null }
+            .associateBy { it.trackedEntityAttribute()!! }
+
+        val context = ProgramIndicatorContext(
+            programIndicator = programIndicator,
+            attributeValues = attributeValueMap,
+        )
+
+        val executor = ProgramIndicatorExecutor(
+            constantMap,
+            context,
+            dataElementStore,
+            trackedEntityAttributeStore,
+            programStageStore,
+        )
+
+        return executor.getProgramIndicatorValue(context.programIndicator)
+    }
+
+    //TODO
+    private val constantMap: Map<String, Constant>
+        get() {
+            val constants = constantStore.selectAll()
+            return UidsHelper.mapByUid(constants)
+        }
+}
\ No newline at end of file

From 54e636cc06bf567957673273a5e105360c551ce8 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 1 Sep 2023 11:30:08 +0200
Subject: [PATCH 286/478] [ANDROSDK-1743] Centralize TEI search logic in
 dataFetcher

---
 ...EntityInstanceQueryCollectionRepository.kt | 71 ++++++--------
 .../TrackedEntityInstanceQueryDataFetcher.kt  | 38 ++++++--
 .../TrackedEntityInstanceQueryDataSource.kt   | 22 +----
 ...ckedEntityInstanceQueryDataSourceResult.kt | 27 +-----
 ...ckedEntityInstanceQueryDataSourceShould.kt | 94 +++++--------------
 5 files changed, 84 insertions(+), 168 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index bf20d0f6ff..fdbf511550 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -43,8 +43,6 @@ import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor.appendInObjectCollection
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BoolFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
@@ -71,7 +69,6 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
 import java.util.Date
@@ -575,15 +572,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
     }
 
     val dataSource: DataSource<TrackedEntityInstance, TrackedEntityInstance>
-        get() = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        get() = TrackedEntityInstanceQueryDataSource(getDataFetcher())
 
     val pagingSource: PagingSource<TrackedEntityInstance, TrackedEntityInstance>
         get() = TrackeEntityInstanceQueryPagingSource(
@@ -598,37 +587,22 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
 
     @Deprecated("use getPagingdata")
     val resultDataSource: DataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
-        get() = TrackedEntityInstanceQueryDataSourceResult(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        get() = TrackedEntityInstanceQueryDataSourceResult(getDataFetcher())
 
     @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
     override fun blockingGet(): List<TrackedEntityInstance> {
-        return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
-            val sqlQuery = localQueryHelper.getSqlQuery(scope, scope.excludedUids(), -1)
-            val instances = store.selectRawQuery(sqlQuery)
-            appendInObjectCollection(
-                instances,
-                childrenAppenders,
-                ChildrenSelection(
-                    setOf(
-                        TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES,
-                    ),
-                ),
-            )
-        } else {
-            try {
-                onlineHelper.queryOnlineBlocking(trackerParentCallFactory, scope)
-            } catch (d2error: D2Error) {
-                throw RuntimeException(d2error)
-            } catch (e: Exception) {
-                emptyList()
+        val dataFetcher = getDataFetcher()
+        val searchResult =
+            if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
+                dataFetcher.queryAllOffline()
+            } else {
+                dataFetcher.queryAllOnline()
+            }
+
+        return searchResult.map {
+            when (it) {
+                is Result.Success -> it.value
+                is Result.Failure -> throw it.failure
             }
         }
     }
@@ -672,6 +646,18 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         }
     }
 
+    private fun getDataFetcher(): TrackedEntityInstanceQueryDataFetcher {
+        return TrackedEntityInstanceQueryDataFetcher(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper
+        )
+    }
+
     override fun uid(uid: String?): ReadOnlyObjectRepository<TrackedEntityInstance> {
         return objectRepository(
             object : Transformer<List<TrackedEntityInstance>, TrackedEntityInstance?> {
@@ -688,10 +674,9 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
 
     override fun blockingGetUids(): List<String> {
         return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
-            val sqlQuery = localQueryHelper.getUidsWhereClause(scope, scope.excludedUids(), -1)
-            store.selectUidsWhere(sqlQuery)
+            getDataFetcher().queryAllOfflineUids()
         } else {
-            ArrayList<String>(getUids(blockingGet()))
+            getUids(blockingGet()).toList()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 4eba2aec64..74bb47fd1c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -95,6 +95,19 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         return result
     }
 
+    fun queryAllOffline(): List<Result<TrackedEntityInstance, D2Error>> {
+        return queryOffline(-1)
+    }
+
+    fun queryAllOfflineUids(): List<String> {
+        val sqlQuery = localQueryHelper.getUidsWhereClause(scope, scope.excludedUids(), -1)
+        return store.selectUidsWhere(sqlQuery)
+    }
+
+    fun queryAllOnline(): List<Result<TrackedEntityInstance, D2Error>> {
+        return queryOnlineRecursive(-1)
+    }
+
     private fun queryOffline(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
         val sqlQuery = localQueryHelper.getSqlQuery(
             scope,
@@ -105,7 +118,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         returnedUidsOffline.addAll(instances.map { it.uid() })
 
         return appendAttributes(instances).map {
-            Result.Success<TrackedEntityInstance, D2Error>(it)
+            Result.Success(it)
         }
     }
 
@@ -117,7 +130,12 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
                 val queryResult = getOnlineQueryResults(baseOnlineQuery, requestLoadSize)
                 result.addAll(queryResult)
             }
-        } while (result.all { it.succeeded } && result.size < requestLoadSize && !areAllOnlineQueriesExhausted())
+        } while (
+            result.all { it.succeeded } &&
+            requestLoadSize > 0 &&
+            result.size < requestLoadSize &&
+            !areAllOnlineQueriesExhausted()
+        )
 
         return result
     }
@@ -132,11 +150,17 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         }
 
         val page = (status.requestedItems / requestLoadSize) + 1
-        val onlineQuery = baseOnlineQuery.copy(
-            page = page,
-            pageSize = requestLoadSize,
-            paging = true,
-        )
+        val onlineQuery = if (requestLoadSize > 0) {
+            baseOnlineQuery.copy(
+                page = page,
+                pageSize = requestLoadSize,
+                paging = true,
+            )
+        } else {
+            baseOnlineQuery.copy(
+                paging = false
+            )
+        }
         val queryInstances = queryOnline(onlineQuery)
 
         status.requestedItems += requestLoadSize
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
index cf00a37342..a7f2d148da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
@@ -28,33 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.paging.ItemKeyedDataSource
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
 
 internal class TrackedEntityInstanceQueryDataSource constructor(
-    store: TrackedEntityInstanceStore,
-    trackerParentCallFactory: TrackerParentCallFactory,
-    scope: TrackedEntityInstanceQueryRepositoryScope,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
-    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
-    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+    private val dataFetcher: TrackedEntityInstanceQueryDataFetcher,
 ) : ItemKeyedDataSource<TrackedEntityInstance, TrackedEntityInstance>() {
 
-    private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
-        store,
-        trackerParentCallFactory,
-        scope,
-        childrenAppenders,
-        onlineCache,
-        onlineHelper,
-        localQueryHelper,
-    )
-
     override fun loadInitial(
         params: LoadInitialParams<TrackedEntityInstance>,
         callback: LoadInitialCallback<TrackedEntityInstance>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
index e32bc07553..676bab8dc6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
@@ -28,36 +28,13 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.paging.PageKeyedDataSource
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
 
 internal class TrackedEntityInstanceQueryDataSourceResult constructor(
-    store: TrackedEntityInstanceStore,
-    trackerParentCallFactory: TrackerParentCallFactory,
-    scope: TrackedEntityInstanceQueryRepositoryScope,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
-    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
-    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-) : PageKeyedDataSource<
-    TrackedEntityInstance,
-    Result<@JvmSuppressWildcards TrackedEntityInstance, @JvmSuppressWildcards D2Error>,
-    >() {
-
-    private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
-        store,
-        trackerParentCallFactory,
-        scope,
-        childrenAppenders,
-        onlineCache,
-        onlineHelper,
-        localQueryHelper,
-    )
+    private val dataFetcher: TrackedEntityInstanceQueryDataFetcher,
+) : PageKeyedDataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>() {
 
     override fun loadInitial(
         params: LoadInitialParams<TrackedEntityInstance>,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 9b9d380217..89a316eefa 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -128,15 +128,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun get_initial_online_page() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
-        val dataSource = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
             initialCallback,
@@ -150,15 +142,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun get_initial_offline_page() {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_ONLY).build()
-        val dataSource = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
             initialCallback,
@@ -171,15 +155,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun query_online_when_offline_exhausted() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
-        val dataSource = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
             initialCallback,
@@ -194,15 +170,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun query_online_again_if_not_exhausted_and_use_right_paging() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
-        val dataSource = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
 
         onlineCallFactory.stub {
             onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(1, 4, AssignedUserMode.ANY))) }
@@ -229,30 +197,14 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun get_initial_online_page_from_cache() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).allowOnlineCache(true).build()
-        val dataSource1 = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource1 = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
         dataSource1.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
             initialCallback,
         )
         verify(onlineCallFactory).getQueryCall(any())
 
-        val dataSource2 = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource2 = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
         dataSource2.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
             initialCallback,
@@ -263,15 +215,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun get_multiple_event_filter_queries() = runTest {
         val scope = multipleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
-        val dataSource = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
         dataSource.loadInitial(
             ItemKeyedDataSource.LoadInitialParams(null, initialLoad, false),
             initialCallback,
@@ -294,15 +238,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     @Test
     fun get_second_online_page_if_needed_in_initial_load() = runTest {
         val scope = singleEventFilterScope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
-        val dataSource = TrackedEntityInstanceQueryDataSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
+        val dataSource = TrackedEntityInstanceQueryDataSource(getDataFetcher(scope))
 
         onlineCallFactory.stub {
             onBlocking { getQueryCall(argThat(QueryPageUserModeMatcher(1, 5, AssignedUserMode.ANY))) }
@@ -325,6 +261,20 @@ class TrackedEntityInstanceQueryDataSourceShould {
         verifyNoMoreInteractions(onlineCallFactory)
     }
 
+    private fun getDataFetcher(
+        scope: TrackedEntityInstanceQueryRepositoryScope
+    ): TrackedEntityInstanceQueryDataFetcher {
+        return TrackedEntityInstanceQueryDataFetcher(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper,
+        )
+    }
+
     private fun identityAppender(): ChildrenAppender<TrackedEntityInstance> {
         return object : ChildrenAppender<TrackedEntityInstance>() {
             override fun appendChildren(m: TrackedEntityInstance): TrackedEntityInstance {

From 28c3ca7b7ce60ca2499a262f9a5ba9bc9ccd340c Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 1 Sep 2023 12:29:56 +0200
Subject: [PATCH 287/478] [ANDROSDK-1743] Add TrackedEntitySearchItem

---
 .../TrackedEntityInstanceQueryDataFetcher.kt  |  23 ++--
 .../TrackedEntityInstanceQueryDataSource.kt   |  19 ++-
 ...ckedEntityInstanceQueryDataSourceResult.kt |  21 ++--
 .../search/TrackedEntitySearchItem.java       | 118 ++++++++++++++++++
 .../search/TrackedEntitySearchItemHelper.kt   |  65 ++++++++++
 ...ckedEntityInstanceQueryDataSourceShould.kt |  10 +-
 6 files changed, 219 insertions(+), 37 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 74bb47fd1c..d209d75a7f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -71,8 +71,8 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         returnedErrorCodes = HashSet()
     }
 
-    fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
-        val result: MutableList<Result<TrackedEntityInstance, D2Error>> = ArrayList()
+    fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
+        val result: MutableList<Result<TrackedEntitySearchItem, D2Error>> = ArrayList()
 
         if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
             if (!isExhaustedOffline) {
@@ -81,11 +81,11 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
                 isExhaustedOffline = instances.size < requestedLoadSize
             }
             if (result.size < requestedLoadSize && scope.mode() == RepositoryMode.OFFLINE_FIRST) {
-                val onlineInstances = queryOnlineRecursive(requestedLoadSize)
+                val onlineInstances = queryOnline(requestedLoadSize)
                 result.addAll(onlineInstances)
             }
         } else {
-            val instances = queryOnlineRecursive(requestedLoadSize)
+            val instances = queryOnline(requestedLoadSize)
             result.addAll(instances)
             if (result.size < requestedLoadSize && scope.mode() == RepositoryMode.ONLINE_FIRST) {
                 val onlineInstances = queryOffline(requestedLoadSize)
@@ -95,7 +95,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         return result
     }
 
-    fun queryAllOffline(): List<Result<TrackedEntityInstance, D2Error>> {
+    fun queryAllOffline(): List<Result<TrackedEntitySearchItem, D2Error>> {
         return queryOffline(-1)
     }
 
@@ -104,11 +104,11 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         return store.selectUidsWhere(sqlQuery)
     }
 
-    fun queryAllOnline(): List<Result<TrackedEntityInstance, D2Error>> {
-        return queryOnlineRecursive(-1)
+    fun queryAllOnline(): List<Result<TrackedEntitySearchItem, D2Error>> {
+        return queryOnline(-1)
     }
 
-    private fun queryOffline(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
+    private fun queryOffline(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
         val sqlQuery = localQueryHelper.getSqlQuery(
             scope,
             returnedUidsOffline,
@@ -118,11 +118,12 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         returnedUidsOffline.addAll(instances.map { it.uid() })
 
         return appendAttributes(instances).map {
-            Result.Success(it)
+            val instance = TrackedEntitySearchItemHelper.from(it)
+            Result.Success(instance)
         }
     }
 
-    private fun queryOnlineRecursive(requestLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
+    private fun queryOnline(requestLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
         val result: MutableList<Result<TrackedEntityInstance, D2Error>> = ArrayList()
 
         do {
@@ -137,7 +138,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
             !areAllOnlineQueriesExhausted()
         )
 
-        return result
+        return result.map { r ->  r.map { TrackedEntitySearchItemHelper.from(it) } }
     }
 
     private fun getOnlineQueryResults(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
index a7f2d148da..eb9958906a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
@@ -29,39 +29,38 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.paging.ItemKeyedDataSource
 import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 internal class TrackedEntityInstanceQueryDataSource constructor(
     private val dataFetcher: TrackedEntityInstanceQueryDataFetcher,
-) : ItemKeyedDataSource<TrackedEntityInstance, TrackedEntityInstance>() {
+) : ItemKeyedDataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
 
     override fun loadInitial(
-        params: LoadInitialParams<TrackedEntityInstance>,
-        callback: LoadInitialCallback<TrackedEntityInstance>,
+        params: LoadInitialParams<TrackedEntitySearchItem>,
+        callback: LoadInitialCallback<TrackedEntitySearchItem>,
     ) {
         dataFetcher.refresh()
         callback.onResult(loadPages(params.requestedLoadSize))
     }
 
     override fun loadAfter(
-        params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance>,
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem>,
     ) {
         callback.onResult(loadPages(params.requestedLoadSize))
     }
 
     override fun loadBefore(
-        params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance>,
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem>,
     ) {
         // do nothing
     }
 
-    override fun getKey(item: TrackedEntityInstance): TrackedEntityInstance {
+    override fun getKey(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
         return item
     }
 
-    private fun loadPages(requestedLoadSize: Int): List<TrackedEntityInstance> {
+    private fun loadPages(requestedLoadSize: Int): List<TrackedEntitySearchItem> {
         return dataFetcher.loadPages(requestedLoadSize).mapNotNull {
             when (it) {
                 is Result.Success -> it.value
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
index 676bab8dc6..1cb24649b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
@@ -30,15 +30,14 @@ package org.hisp.dhis.android.core.trackedentity.search
 import androidx.paging.PageKeyedDataSource
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 internal class TrackedEntityInstanceQueryDataSourceResult constructor(
     private val dataFetcher: TrackedEntityInstanceQueryDataFetcher,
-) : PageKeyedDataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>() {
+) : PageKeyedDataSource<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>() {
 
     override fun loadInitial(
-        params: LoadInitialParams<TrackedEntityInstance>,
-        callback: LoadInitialCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
+        params: LoadInitialParams<TrackedEntitySearchItem>,
+        callback: LoadInitialCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
     ) {
         dataFetcher.refresh()
         val result = loadPages(params.requestedLoadSize)
@@ -46,25 +45,25 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
     }
 
     override fun loadAfter(
-        params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
     ) {
         val result = loadPages(params.requestedLoadSize)
         callback.onResult(result, getKey(result))
     }
 
     override fun loadBefore(
-        params: LoadParams<TrackedEntityInstance>,
-        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
     ) {
         // do nothing
     }
 
-    private fun getKey(result: List<Result<TrackedEntityInstance, D2Error>>): TrackedEntityInstance? {
-        return result.filterIsInstance<Result.Success<TrackedEntityInstance, D2Error>>().lastOrNull()?.value
+    private fun getKey(result: List<Result<TrackedEntitySearchItem, D2Error>>): TrackedEntitySearchItem? {
+        return result.filterIsInstance<Result.Success<TrackedEntitySearchItem, D2Error>>().lastOrNull()?.value
     }
 
-    private fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
+    private fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
         return dataFetcher.loadPages(requestedLoadSize)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
new file mode 100644
index 0000000000..4a5ee81638
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.auto.value.AutoValue;
+
+import org.hisp.dhis.android.core.common.Geometry;
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
+import org.hisp.dhis.android.core.common.State;
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
+
+import java.util.Date;
+import java.util.List;
+
+@AutoValue
+public abstract class TrackedEntitySearchItem implements ObjectWithUidInterface {
+    @Override
+    public abstract String uid();
+
+    @Nullable
+    public abstract Date created();
+
+    @Nullable
+    public abstract Date lastUpdated();
+
+    @Nullable
+    public abstract Date createdAtClient();
+
+    @Nullable
+    public abstract Date lastUpdatedAtClient();
+
+    @Nullable
+    public abstract String organisationUnit();
+
+    @Nullable
+    public abstract String trackedEntityType();
+
+    @Nullable
+    public abstract Geometry geometry();
+
+    @Nullable
+    public abstract List<TrackedEntityAttributeValue> trackedEntityAttributeValues();
+
+    @Nullable
+    public abstract State syncState();
+
+    @Nullable
+    public abstract State aggregatedSyncState();
+
+    @Nullable
+    public abstract Boolean deleted();
+
+    public static TrackedEntitySearchItem.Builder builder() {
+        return new AutoValue_TrackedEntitySearchItem.Builder();
+    }
+
+    public abstract TrackedEntitySearchItem.Builder toBuilder();
+
+    @AutoValue.Builder
+    public abstract static class Builder {
+
+        public abstract Builder uid(String uid);
+
+        public abstract Builder created(Date created);
+
+        public abstract Builder lastUpdated(Date lastUpdated);
+
+        public abstract Builder createdAtClient(Date createdAtClient);
+
+        public abstract Builder lastUpdatedAtClient(Date lastUpdatedAtClient);
+
+        public abstract Builder organisationUnit(String organisationUnit);
+
+        public abstract Builder trackedEntityType(String trackedEntityType);
+
+        public abstract Builder geometry(Geometry geometry);
+
+        public abstract Builder trackedEntityAttributeValues(
+                List<TrackedEntityAttributeValue> trackedEntityAttributeValues);
+
+        public abstract Builder syncState(State state);
+
+        public abstract Builder aggregatedSyncState(State state);
+
+        public abstract Builder deleted(Boolean deleted);
+
+        public abstract TrackedEntitySearchItem build();
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
new file mode 100644
index 0000000000..ceddbb8f28
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+
+object TrackedEntitySearchItemHelper {
+    fun from(i: TrackedEntityInstance): TrackedEntitySearchItem {
+        return TrackedEntitySearchItem.builder()
+            .uid(i.uid())
+            .created(i.created())
+            .lastUpdated(i.lastUpdated())
+            .createdAtClient(i.createdAtClient())
+            .lastUpdatedAtClient(i.lastUpdatedAtClient())
+            .organisationUnit(i.organisationUnit())
+            .trackedEntityType(i.trackedEntityType())
+            .geometry(i.geometry())
+            .trackedEntityAttributeValues(i.trackedEntityAttributeValues())
+            .syncState(i.syncState())
+            .aggregatedSyncState(i.aggregatedSyncState())
+            .build()
+    }
+
+    fun toTrackedEntityInstance(i: TrackedEntitySearchItem): TrackedEntityInstance {
+        return TrackedEntityInstance.builder()
+            .uid(i.uid())
+            .created(i.created())
+            .lastUpdated(i.lastUpdated())
+            .createdAtClient(i.createdAtClient())
+            .lastUpdatedAtClient(i.lastUpdatedAtClient())
+            .organisationUnit(i.organisationUnit())
+            .trackedEntityType(i.trackedEntityType())
+            .geometry(i.geometry())
+            .trackedEntityAttributeValues(i.trackedEntityAttributeValues())
+            .syncState(i.syncState())
+            .aggregatedSyncState(i.aggregatedSyncState())
+            .build()
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 89a316eefa..5a1b311d95 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -61,17 +61,17 @@ class TrackedEntityInstanceQueryDataSourceShould {
     private val store: TrackedEntityInstanceStore = mock()
     private val trackerParentCallFactory: TrackerParentCallFactory = mock()
     private val onlineCallFactory: TrackedEntityEndpointCallFactory = mock()
-    private val trackedEntity: TrackedEntityInstance = mock()
+    private val trackedEntity: TrackedEntitySearchItem = mock()
 
     private lateinit var offlineObjects: List<TrackedEntityInstance>
     private lateinit var onlineObjects1: List<TrackedEntityInstance>
     private lateinit var onlineObjects2: List<TrackedEntityInstance>
 
-    var captureInstances: KArgumentCaptor<List<TrackedEntityInstance>> = argumentCaptor()
+    var captureInstances: KArgumentCaptor<List<TrackedEntitySearchItem>> = argumentCaptor()
 
     private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>> = mock()
 
-    private val initialCallback: ItemKeyedDataSource.LoadInitialCallback<TrackedEntityInstance> = mock()
+    private val initialCallback: ItemKeyedDataSource.LoadInitialCallback<TrackedEntitySearchItem> = mock()
     private val calendarProvider = CalendarProviderFactory.calendarProvider
     private val periodHelper = DateFilterPeriodHelper(calendarProvider, create(calendarProvider))
     private val onlineHelper = TrackedEntityInstanceQueryOnlineHelper(periodHelper)
@@ -135,7 +135,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
         )
         verify(onlineCallFactory)
             .getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.ANY)))
-        verify(initialCallback).onResult(onlineObjects1)
+        verify(initialCallback).onResult(onlineObjects1.map { TrackedEntitySearchItemHelper.from(it) })
         verifyNoMoreInteractions(onlineCallFactory)
     }
 
@@ -148,7 +148,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
             initialCallback,
         )
         verify(store).selectRawQuery(anyString())
-        verify(initialCallback).onResult(offlineObjects)
+        verify(initialCallback).onResult(offlineObjects.map { TrackedEntitySearchItemHelper.from(it) })
         verifyNoMoreInteractions(store)
     }
 

From d2fc23ec5a312bc562c1186ad00073c3e5178bd3 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 1 Sep 2023 13:19:01 +0200
Subject: [PATCH 288/478] [ANDROSDK-1743] Hardcoded implementation of TEI
 header

---
 .../TrackedEntityInstanceQueryDataFetcher.kt  | 21 +++++++++++++++++--
 .../search/TrackedEntitySearchItem.java       |  5 +++++
 ...ckedEntityInstanceQueryDataSourceShould.kt |  3 +++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index d209d75a7f..7e29427a31 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSe
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
@@ -50,6 +51,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+    private val trackerHeaderEngine: TrackerHeaderEngine,
 ) {
     private val baseOnlineQueries: List<TrackedEntityInstanceQueryOnline> = onlineHelper.fromScope(scope)
     private val onlineQueryStatusMap: MutableMap<TrackedEntityInstanceQueryOnline, OnlineQueryStatus> = HashMap()
@@ -119,7 +121,8 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
 
         return appendAttributes(instances).map {
             val instance = TrackedEntitySearchItemHelper.from(it)
-            Result.Success(instance)
+            val instanceWithHeader = appendHeader(instance)
+            Result.Success(instanceWithHeader)
         }
     }
 
@@ -138,7 +141,12 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
             !areAllOnlineQueriesExhausted()
         )
 
-        return result.map { r ->  r.map { TrackedEntitySearchItemHelper.from(it) } }
+        return result.map { r ->
+            r.map {
+                val instance = TrackedEntitySearchItemHelper.from(it)
+                appendHeader(instance)
+            }
+        }
     }
 
     private fun getOnlineQueryResults(
@@ -224,6 +232,15 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         )
     }
 
+    private fun appendHeader(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
+        val header = trackerHeaderEngine.getTrackedEntityHeader(
+            expression = "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))",
+            attributeValues = item.trackedEntityAttributeValues() ?: emptyList()
+        )
+
+        return item.toBuilder().header(header).build()
+    }
+
     private fun areAllOnlineQueriesExhausted(): Boolean {
         return onlineQueryStatusMap.values.all { it.isExhausted }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
index 4a5ee81638..ef029d535c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
@@ -79,6 +79,9 @@ public abstract class TrackedEntitySearchItem implements ObjectWithUidInterface
     @Nullable
     public abstract Boolean deleted();
 
+    @Nullable
+    public abstract String header();
+
     public static TrackedEntitySearchItem.Builder builder() {
         return new AutoValue_TrackedEntitySearchItem.Builder();
     }
@@ -113,6 +116,8 @@ public abstract Builder trackedEntityAttributeValues(
 
         public abstract Builder deleted(Boolean deleted);
 
+        public abstract Builder header(String header);
+
         public abstract TrackedEntitySearchItem build();
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 5a1b311d95..0b82e6b572 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -40,6 +40,7 @@ import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
 import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGeneratorImpl.Companion.create
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityEndpointCallFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
@@ -76,6 +77,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     private val periodHelper = DateFilterPeriodHelper(calendarProvider, create(calendarProvider))
     private val onlineHelper = TrackedEntityInstanceQueryOnlineHelper(periodHelper)
     private val localQueryHelper = TrackedEntityInstanceLocalQueryHelper(periodHelper)
+    private val trackerHeaderEngine: TrackerHeaderEngine = mock()
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult> =
         ExpirableCache()
     private val initialLoad = 30
@@ -272,6 +274,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
             onlineCache,
             onlineHelper,
             localQueryHelper,
+            trackerHeaderEngine,
         )
     }
 

From c8233d72b1bff7c4abd841efa448d14a5ed74530 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 6 Sep 2023 13:53:44 +0200
Subject: [PATCH 289/478] [ANDROSDK-1743] Create separate repository for
 TrackedEntitySearch

---
 .../trackedentity/TrackedEntityModule.java    |   2 +
 .../internal/TrackedEntityModuleImpl.kt       |   6 +
 ...EntityInstanceQueryCollectionRepository.kt | 411 +--------------
 .../TrackedEntityInstanceQueryDataFetcher.kt  |  34 +-
 .../TrackedEntityInstanceQueryDataSource.kt   |  19 +-
 ...ckedEntityInstanceQueryDataSourceResult.kt |  21 +-
 ...TrackedEntitySearchCollectionRepository.kt | 209 ++++++++
 .../search/TrackedEntitySearchDataFetcher.kt  | 100 ++++
 .../search/TrackedEntitySearchDataSource.kt   |  71 +++
 .../search/TrackedEntitySearchOperators.kt    | 493 ++++++++++++++++++
 10 files changed, 921 insertions(+), 445 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSource.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityModule.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityModule.java
index f172ed0878..271e697f68 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityModule.java
@@ -31,6 +31,7 @@
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceDownloader;
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipManager;
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryCollectionRepository;
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchCollectionRepository;
 
 public interface TrackedEntityModule {
 
@@ -43,6 +44,7 @@ public interface TrackedEntityModule {
     TrackedEntityInstanceFilterCollectionRepository trackedEntityInstanceFilters();
 
     TrackedEntityInstanceQueryCollectionRepository trackedEntityInstanceQuery();
+    TrackedEntitySearchCollectionRepository trackedEntitySearch();
 
     TrackedEntityAttributeReservedValueManager reservedValueManager();
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
index 38ea3888a4..7bba679f08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
@@ -32,6 +32,7 @@ import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipManager
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchCollectionRepository
 import javax.inject.Inject
 
 @Reusable
@@ -47,6 +48,7 @@ internal class TrackedEntityModuleImpl @Inject constructor(
     private val reservedValueManager: TrackedEntityAttributeReservedValueManager,
     private val trackedEntityInstanceDownloader: TrackedEntityInstanceDownloader,
     private val trackedEntityInstanceQuery: TrackedEntityInstanceQueryCollectionRepository,
+    private val trackedEntitySearch: TrackedEntitySearchCollectionRepository,
     private val trackedEntityInstanceService: TrackedEntityInstanceService,
     private val ownershipManager: OwnershipManager,
 ) : TrackedEntityModule {
@@ -83,6 +85,10 @@ internal class TrackedEntityModuleImpl @Inject constructor(
         return trackedEntityInstanceQuery
     }
 
+    override fun trackedEntitySearch(): TrackedEntitySearchCollectionRepository {
+        return trackedEntitySearch
+    }
+
     override fun reservedValueManager(): TrackedEntityAttributeReservedValueManager {
         return reservedValueManager
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index fdbf511550..aba3f525b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -44,30 +44,20 @@ import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BoolFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqLikeItemFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
-import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper.Companion.mergeDateFilterPeriods
-import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
-import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
-import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
@@ -75,16 +65,16 @@ import java.util.Date
 import javax.inject.Inject
 
 @Reusable
-@Suppress("TooManyFunctions", "LongParameterList")
+@Suppress("LongParameterList")
 class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
-    val scope: TrackedEntityInstanceQueryRepositoryScope,
-    private val scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
-    private val versionManager: DHISVersionManager,
-    private val filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
-    private val workingListRepository: ProgramStageWorkingListCollectionRepository,
+    scope: TrackedEntityInstanceQueryRepositoryScope,
+    scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
+    versionManager: DHISVersionManager,
+    filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
+    workingListRepository: ProgramStageWorkingListCollectionRepository,
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
@@ -102,151 +92,6 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
             )
         }
 
-    /**
-     * Only TrackedEntityInstances coming from the server are shown in the list.
-     * <br></br>**Important:** Internet connection is required to use this mode.
-     *
-     * @return
-     */
-    fun onlineOnly(): TrackedEntityInstanceQueryCollectionRepository {
-        return connectorFactory.eqConnector<Any> {
-            scope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
-        }.eq(null)
-    }
-
-    /**
-     * Only TrackedEntityInstances coming from local database are shown in the list.
-     *
-     * @return
-     */
-    fun offlineOnly(): TrackedEntityInstanceQueryCollectionRepository {
-        return connectorFactory.eqConnector<Any> {
-            scope.toBuilder().mode(RepositoryMode.OFFLINE_ONLY).build()
-        }.eq(null)
-    }
-
-    /**
-     * TrackedEntityInstances coming from the server are shown in first place. Once there are no more results online,
-     * it continues with TrackedEntityInstances in local database.
-     * <br></br>**Important:** Internet connection is required to use this mode.
-     *
-     * @return
-     */
-    fun onlineFirst(): TrackedEntityInstanceQueryCollectionRepository {
-        return connectorFactory.eqConnector<Any> {
-            scope.toBuilder().mode(RepositoryMode.ONLINE_FIRST).build()
-        }.eq(null)
-    }
-
-    /**
-     * TrackedEntityInstances coming from local database are shown in first place. Once there are no more results, it
-     * continues with TrackedEntityInstances coming from the server. This method may speed up the initial load.
-     * <br></br>**Important:** Internet connection is required to use this mode.
-     *
-     * @return
-     */
-    fun offlineFirst(): TrackedEntityInstanceQueryCollectionRepository {
-        return connectorFactory.eqConnector<Any> {
-            scope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
-        }.eq(null)
-    }
-
-    /**
-     * Add an "attribute" filter to the query. If this method is called several times, conditions are appended with
-     * AND connector.
-     *
-     *
-     * For example,
-     * <pre><br></br>.byAttribute("uid1").eq("value1")<br></br>.byAttribute("uid2").eq("value2")<br></br></pre>
-     * means that the instance must have attribute "uid1" with value "value1" **AND** attribute "uid2" with
-     * value "value2".
-     *
-     * @param attributeId Attribute uid to use in the filter
-     * @return Repository connector
-     */
-    fun byAttribute(attributeId: String): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return byFilter(attributeId)
-    }
-
-    /**
-     * Add a "filter" to the query. If this method is called several times, conditions are appended with
-     * AND connector.
-     *
-     *
-     * For example,
-     * <pre><br></br>.byFilter("uid1").eq("value1")<br></br>.byFilter("uid2").eq("value2")<br></br></pre>
-     * means that the instance must have attribute "uid1" with value "value1" **AND** attribute "uid2" with
-     * value "value2".
-     *
-     * @param attributeId Attribute uid to use in the filter
-     * @return Repository connector
-     */
-    fun byFilter(attributeId: String): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.eqLikeItemC(attributeId) { filterItem: RepositoryScopeFilterItem ->
-            scopeHelper.addFilter(scope, filterItem)
-        }
-    }
-
-    /**
-     * Search tracked entity instances with **any** attribute matching the query.
-     *
-     * @return Repository connector
-     */
-    fun byQuery(): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.eqLikeItemC("") { filterItem: RepositoryScopeFilterItem ->
-            scope.toBuilder().query(filterItem).build()
-        }
-    }
-
-    /**
-     * Filter the tracked entity for those matching this filter. If this method is called several times, conditions
-     * are appended with AND connector.
-     *
-     * @param dataElement DataElement uid to use in the filter
-     * @return Repository connector
-     */
-    fun byDataValue(dataElement: String): EqLikeItemFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.eqLikeItemC(dataElement) { filterItem: RepositoryScopeFilterItem ->
-            scope.toBuilder().dataValue(scope.dataValue() + filterItem).build()
-        }
-    }
-
-    /**
-     * Filter by enrollment program. Only one program can be specified.
-     *
-     * @return Repository connector
-     */
-    fun byProgram(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.eqConnector { programUid: String? -> scope.toBuilder().program(programUid).build() }
-    }
-
-    /**
-     * Filter by event program stage. Only one program can be specified.
-     *
-     * @return Repository connector
-     */
-    fun byProgramStage(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.eqConnector { uid: String? -> scope.toBuilder().programStage(uid).build() }
-    }
-
-    /**
-     * Filter by tracked entity instance organisation unit.
-     *
-     * @return Repository connector
-     */
-    fun byOrgUnits(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.listConnector { scope.toBuilder().orgUnits(it).build() }
-    }
-
-    /**
-     * Define the organisation unit mode. See [OrganisationUnitMode] for more details on the modes.
-     *
-     * @return Repository connector
-     */
-    fun byOrgUnitMode(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrganisationUnitMode> {
-        return connectorFactory.eqConnector { scope.toBuilder().orgUnitMode(it).build() }
-    }
-
     @Deprecated("use {@link #byProgramDate()} instead.")
     fun byProgramStartDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> {
         return connectorFactory.eqConnector { byProgramDate().afterOrEqual(it!!).scope }
@@ -321,238 +166,13 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         }
     }
 
-    /**
-     * Define an event date filter. It only applies if a program has been specified in [.byProgram].
-     *
-     * @return Repository connector
-     */
-    fun byEventDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
-            val mergedFilter = mergeDateFilterPeriods(
-                scope.eventDate(),
-                filter,
-            )
-            scope.toBuilder().eventDate(mergedFilter).build()
-        }
-    }
-
-    /**
-     * Filter by event status. It only applies if a program has been specified in [.byProgram].
-     * <br></br>**IMPORTANT:** this filter requires that eventStartDate [.byEventStartDate] and eventEndDate
-     * [.byEventEndDate] are defined.
-     *
-     * @return Repository connector
-     */
-    fun byEventStatus(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EventStatus> {
-        return connectorFactory.listConnector { scope.toBuilder().eventStatus(it).build() }
-    }
-
-    /**
-     * Filter by TrackedEntityType. Only one type can be specified.
-     *
-     * @return Repository connector
-     */
-    fun byTrackedEntityType(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.eqConnector { scope.toBuilder().trackedEntityType(it).build() }
-    }
-
-    /**
-     * Whether to include or not deleted tracked entity instances.
-     * <br></br>**IMPORTANT:** currently this filter only applies to **offline** instances.
-     *
-     * @return Repository connector
-     */
-    fun byIncludeDeleted(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Boolean> {
-        return connectorFactory.eqConnector { scope.toBuilder().includeDeleted(it).build() }
-    }
-
-    /**
-     * Filter by sync status.
-     * <br></br>**IMPORTANT:** using this filter forces **offlineOnly** mode.
-     *
-     * @return Repository connector
-     */
-    fun byStates(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, State> {
-        return connectorFactory.listConnector { scope.toBuilder().states(it).build() }
-    }
-
-    /**
-     * Filter by follow up status. It only applies if a program has been specified in [.byProgram].
-     *
-     * @return Repository connector
-     */
-    fun byFollowUp(): BoolFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.booleanConnector { scope.toBuilder().followUp(it).build() }
-    }
-
-    /**
-     * Filter by assigned user mode.
-     * <br></br>**IMPORTANT:** this filter has effect if DHIS2 version is 2.32 or later. Otherwise, it is ignored.
-     *
-     * @return Repository connector
-     */
-    fun byAssignedUserMode(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, AssignedUserMode> {
-        return connectorFactory.eqConnector { mode: AssignedUserMode? ->
-            return@eqConnector if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
-                scope.toBuilder().assignedUserMode(mode).build()
-            } else {
-                scope
-            }
-        }
-    }
-
-    /**
-     * Define an lastUpdated date filter.
-     *
-     * @return Repository connector
-     */
-    fun byLastUpdatedDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
-            val mergedFilter = mergeDateFilterPeriods(
-                scope.lastUpdatedDate(),
-                filter,
-            )
-            scope.toBuilder().lastUpdatedDate(mergedFilter).build()
-        }
-    }
-
-    /**
-     * Whether to allow or not cached results for online queries. Its value is 'false' by default.
-     *
-     * @return Repository connector
-     */
-    fun allowOnlineCache(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Boolean> {
-        return connectorFactory.eqConnector { scope.toBuilder().allowOnlineCache(it).build() }
-    }
-
-    fun excludeUids(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.listConnector { list: List<String> ->
-            scope.toBuilder().excludedUids(HashSet(list)).build()
-        }
-    }
-
-    /**
-     * Apply the filters defined in a [TrackedEntityInstanceFilter]. It will overwrite previous filters in case
-     * they overlap. In the same way, they could be overwritten by subsequent filters.
-     *
-     * @return Repository connector
-     */
-    fun byTrackedEntityInstanceFilter(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.eqConnector { id: String? ->
-            val filter = filtersRepository
-                .withTrackedEntityInstanceEventFilters()
-                .withAttributeValueFilters()
-                .uid(id).blockingGet()
-            scopeHelper.addTrackedEntityInstanceFilter(scope, filter!!)
-        }
-    }
-
-    /**
-     * Apply the filters defined in a [ProgramStageWorkingList]. It will overwrite previous filters in case
-     * they overlap. In the same way, they could be overwritten by subsequent filters.
-     *
-     * @return Repository connector
-     */
-    fun byProgramStageWorkingList(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, String> {
-        return connectorFactory.eqConnector { id: String? ->
-            val workingList = workingListRepository
-                .withDataFilters()
-                .withAttributeValueFilters()
-                .uid(id).blockingGet()
-            scopeHelper.addProgramStageWorkingList(scope, workingList!!)
+    @Deprecated("use {@link #byEnrollmentStatus()} instead.")
+    fun byProgramStatus(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> {
+        return connectorFactory.eqConnector { status: EnrollmentStatus? ->
+            scope.toBuilder().enrollmentStatus(listOf(status)).build()
         }
     }
 
-    /**
-     * Order by created date. If a program is provided, it takes the created of most recent enrollment.
-     * Otherwise it takes the value of the tracked entity instance.
-     *
-     * @return Repository connector
-     */
-    fun orderByCreated(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.CREATED)
-    }
-
-    /**
-     * Order by last updated date. If a program is provided, it takes the last updated of most recent enrollment.
-     * Otherwise it takes the value of the tracked entity instance.
-     *
-     * @return Repository connector
-     */
-    fun orderByLastUpdated(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.LAST_UPDATED)
-    }
-
-    /**
-     * Order by tracked entity instance attribute value.
-     *
-     * @return Repository connector
-     */
-    fun orderByAttribute(
-        attr: String,
-    ): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.attribute(attr))
-    }
-
-    /**
-     * Order by organisation unit name of the tracked entity instance.
-     *
-     * @return Repository connector
-     */
-    fun orderByOrganisationUnitName(): EqFilterConnector<
-        TrackedEntityInstanceQueryCollectionRepository,
-        OrderByDirection,
-        > {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ORGUNIT_NAME)
-    }
-
-    /**
-     * Order by enrollment date of most recent enrollment. This order only applies to local results.
-     *
-     * @return Repository connector
-     */
-    fun orderByEnrollmentDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_DATE)
-    }
-
-    /**
-     * Order by incident date of most recent enrollment. This order only applies to local results.
-     *
-     * @return Repository connector
-     */
-    fun orderByIncidentDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.INCIDENT_DATE)
-    }
-
-    /**
-     * Order by most recent event. It takes the event date and, if it is null, it fallbacks to due date. This order
-     * only applies to local results.
-     *
-     * @return Repository connector
-     */
-    fun orderByEventDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.EVENT_DATE)
-    }
-
-    /**
-     * Order by completion date of the most recent event. This order only applies to local results.
-     *
-     * @return Repository connector
-     */
-    fun orderByCompletedDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.COMPLETION_DATE)
-    }
-
-    /**
-     * Order by enrollment status.
-     *
-     * @return Repository connector
-     */
-    fun orderByEnrollmentStatus(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS)
-    }
-
-    @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
     override fun getPaged(pageSize: Int): LiveData<PagedList<TrackedEntityInstance>> {
         val factory: DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance> =
             object : DataSource.Factory<TrackedEntityInstance, TrackedEntityInstance>() {
@@ -637,15 +257,6 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         )
     }
 
-    private fun orderConnector(
-        col: TrackedEntityInstanceQueryScopeOrderColumn,
-    ): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, OrderByDirection> {
-        return connectorFactory.eqConnector { direction: OrderByDirection? ->
-            val order = TrackedEntityInstanceQueryScopeOrderByItem.builder().column(col).direction(direction).build()
-            scope.toBuilder().order(scope.order() + order).build()
-        }
-    }
-
     private fun getDataFetcher(): TrackedEntityInstanceQueryDataFetcher {
         return TrackedEntityInstanceQueryDataFetcher(
             store,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 7e29427a31..a91bac7dce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSe
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
-import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
@@ -51,7 +50,6 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-    private val trackerHeaderEngine: TrackerHeaderEngine,
 ) {
     private val baseOnlineQueries: List<TrackedEntityInstanceQueryOnline> = onlineHelper.fromScope(scope)
     private val onlineQueryStatusMap: MutableMap<TrackedEntityInstanceQueryOnline, OnlineQueryStatus> = HashMap()
@@ -73,8 +71,8 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         returnedErrorCodes = HashSet()
     }
 
-    fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
-        val result: MutableList<Result<TrackedEntitySearchItem, D2Error>> = ArrayList()
+    fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
+        val result: MutableList<Result<TrackedEntityInstance, D2Error>> = ArrayList()
 
         if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
             if (!isExhaustedOffline) {
@@ -97,7 +95,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         return result
     }
 
-    fun queryAllOffline(): List<Result<TrackedEntitySearchItem, D2Error>> {
+    fun queryAllOffline(): List<Result<TrackedEntityInstance, D2Error>> {
         return queryOffline(-1)
     }
 
@@ -106,11 +104,11 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         return store.selectUidsWhere(sqlQuery)
     }
 
-    fun queryAllOnline(): List<Result<TrackedEntitySearchItem, D2Error>> {
+    fun queryAllOnline(): List<Result<TrackedEntityInstance, D2Error>> {
         return queryOnline(-1)
     }
 
-    private fun queryOffline(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
+    private fun queryOffline(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
         val sqlQuery = localQueryHelper.getSqlQuery(
             scope,
             returnedUidsOffline,
@@ -120,13 +118,11 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         returnedUidsOffline.addAll(instances.map { it.uid() })
 
         return appendAttributes(instances).map {
-            val instance = TrackedEntitySearchItemHelper.from(it)
-            val instanceWithHeader = appendHeader(instance)
-            Result.Success(instanceWithHeader)
+            Result.Success(it)
         }
     }
 
-    private fun queryOnline(requestLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
+    private fun queryOnline(requestLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
         val result: MutableList<Result<TrackedEntityInstance, D2Error>> = ArrayList()
 
         do {
@@ -141,12 +137,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
             !areAllOnlineQueriesExhausted()
         )
 
-        return result.map { r ->
-            r.map {
-                val instance = TrackedEntitySearchItemHelper.from(it)
-                appendHeader(instance)
-            }
-        }
+        return result
     }
 
     private fun getOnlineQueryResults(
@@ -232,15 +223,6 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         )
     }
 
-    private fun appendHeader(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
-        val header = trackerHeaderEngine.getTrackedEntityHeader(
-            expression = "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))",
-            attributeValues = item.trackedEntityAttributeValues() ?: emptyList()
-        )
-
-        return item.toBuilder().header(header).build()
-    }
-
     private fun areAllOnlineQueriesExhausted(): Boolean {
         return onlineQueryStatusMap.values.all { it.isExhausted }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
index eb9958906a..a7f2d148da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSource.kt
@@ -29,38 +29,39 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.paging.ItemKeyedDataSource
 import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 internal class TrackedEntityInstanceQueryDataSource constructor(
     private val dataFetcher: TrackedEntityInstanceQueryDataFetcher,
-) : ItemKeyedDataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
+) : ItemKeyedDataSource<TrackedEntityInstance, TrackedEntityInstance>() {
 
     override fun loadInitial(
-        params: LoadInitialParams<TrackedEntitySearchItem>,
-        callback: LoadInitialCallback<TrackedEntitySearchItem>,
+        params: LoadInitialParams<TrackedEntityInstance>,
+        callback: LoadInitialCallback<TrackedEntityInstance>,
     ) {
         dataFetcher.refresh()
         callback.onResult(loadPages(params.requestedLoadSize))
     }
 
     override fun loadAfter(
-        params: LoadParams<TrackedEntitySearchItem>,
-        callback: LoadCallback<TrackedEntitySearchItem>,
+        params: LoadParams<TrackedEntityInstance>,
+        callback: LoadCallback<TrackedEntityInstance>,
     ) {
         callback.onResult(loadPages(params.requestedLoadSize))
     }
 
     override fun loadBefore(
-        params: LoadParams<TrackedEntitySearchItem>,
-        callback: LoadCallback<TrackedEntitySearchItem>,
+        params: LoadParams<TrackedEntityInstance>,
+        callback: LoadCallback<TrackedEntityInstance>,
     ) {
         // do nothing
     }
 
-    override fun getKey(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
+    override fun getKey(item: TrackedEntityInstance): TrackedEntityInstance {
         return item
     }
 
-    private fun loadPages(requestedLoadSize: Int): List<TrackedEntitySearchItem> {
+    private fun loadPages(requestedLoadSize: Int): List<TrackedEntityInstance> {
         return dataFetcher.loadPages(requestedLoadSize).mapNotNull {
             when (it) {
                 is Result.Success -> it.value
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
index 1cb24649b2..676bab8dc6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceResult.kt
@@ -30,14 +30,15 @@ package org.hisp.dhis.android.core.trackedentity.search
 import androidx.paging.PageKeyedDataSource
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 internal class TrackedEntityInstanceQueryDataSourceResult constructor(
     private val dataFetcher: TrackedEntityInstanceQueryDataFetcher,
-) : PageKeyedDataSource<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>() {
+) : PageKeyedDataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>() {
 
     override fun loadInitial(
-        params: LoadInitialParams<TrackedEntitySearchItem>,
-        callback: LoadInitialCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
+        params: LoadInitialParams<TrackedEntityInstance>,
+        callback: LoadInitialCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
     ) {
         dataFetcher.refresh()
         val result = loadPages(params.requestedLoadSize)
@@ -45,25 +46,25 @@ internal class TrackedEntityInstanceQueryDataSourceResult constructor(
     }
 
     override fun loadAfter(
-        params: LoadParams<TrackedEntitySearchItem>,
-        callback: LoadCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
+        params: LoadParams<TrackedEntityInstance>,
+        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
     ) {
         val result = loadPages(params.requestedLoadSize)
         callback.onResult(result, getKey(result))
     }
 
     override fun loadBefore(
-        params: LoadParams<TrackedEntitySearchItem>,
-        callback: LoadCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
+        params: LoadParams<TrackedEntityInstance>,
+        callback: LoadCallback<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>,
     ) {
         // do nothing
     }
 
-    private fun getKey(result: List<Result<TrackedEntitySearchItem, D2Error>>): TrackedEntitySearchItem? {
-        return result.filterIsInstance<Result.Success<TrackedEntitySearchItem, D2Error>>().lastOrNull()?.value
+    private fun getKey(result: List<Result<TrackedEntityInstance, D2Error>>): TrackedEntityInstance? {
+        return result.filterIsInstance<Result.Success<TrackedEntityInstance, D2Error>>().lastOrNull()?.value
     }
 
-    private fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
+    private fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
         return dataFetcher.loadPages(requestedLoadSize)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
new file mode 100644
index 0000000000..9bc72de0b5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -0,0 +1,209 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import androidx.lifecycle.LiveData
+import androidx.paging.DataSource
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import javax.inject.Inject
+
+@Reusable
+class TrackedEntitySearchCollectionRepository @Inject internal constructor(
+    private val store: TrackedEntityInstanceStore,
+    private val trackerParentCallFactory: TrackerParentCallFactory,
+    private val childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
+    scope: TrackedEntityInstanceQueryRepositoryScope,
+    scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
+    versionManager: DHISVersionManager,
+    filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
+    workingListRepository: ProgramStageWorkingListCollectionRepository,
+    private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
+    private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+    private val trackerHeaderEngine: TrackerHeaderEngine,
+) : ReadOnlyWithUidCollectionRepository<TrackedEntitySearchItem>,
+    TrackedEntitySearchOperators<TrackedEntitySearchCollectionRepository>(
+        scope,
+        scopeHelper,
+        versionManager,
+        filtersRepository,
+        workingListRepository
+    ) {
+
+    override val connectorFactory:
+        ScopedFilterConnectorFactory<
+            TrackedEntitySearchCollectionRepository,
+            TrackedEntityInstanceQueryRepositoryScope,
+            > =
+        ScopedFilterConnectorFactory { s: TrackedEntityInstanceQueryRepositoryScope ->
+            TrackedEntitySearchCollectionRepository(
+                store, trackerParentCallFactory, childrenAppenders,
+                s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
+                onlineHelper, localQueryHelper, trackerHeaderEngine
+            )
+        }
+
+    override fun getPaged(pageSize: Int): LiveData<PagedList<TrackedEntitySearchItem>> {
+        val factory: DataSource.Factory<TrackedEntitySearchItem, TrackedEntitySearchItem> =
+            object : DataSource.Factory<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
+                override fun create(): DataSource<TrackedEntitySearchItem, TrackedEntitySearchItem> {
+                    return dataSource
+                }
+            }
+        return LivePagedListBuilder(factory, pageSize).build()
+    }
+
+    val dataSource: DataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>
+        get() = TrackedEntitySearchDataSource(getDataFetcher())
+
+    @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
+    override fun blockingGet(): List<TrackedEntitySearchItem> {
+        val dataFetcher = getDataFetcher()
+        val searchResult =
+            if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
+                dataFetcher.queryAllOffline()
+            } else {
+                dataFetcher.queryAllOnline()
+            }
+
+        return searchResult.map {
+            when (it) {
+                is Result.Success -> it.value
+                is Result.Failure -> throw it.failure
+            }
+        }
+    }
+
+    override fun get(): Single<List<TrackedEntitySearchItem>> {
+        return Single.fromCallable { blockingGet() }
+    }
+
+    override fun count(): Single<Int> {
+        return Single.fromCallable { blockingCount() }
+    }
+
+    override fun blockingCount(): Int {
+        return blockingGet().size
+    }
+
+    override fun isEmpty(): Single<Boolean> {
+        return Single.fromCallable { blockingIsEmpty() }
+    }
+
+    override fun blockingIsEmpty(): Boolean {
+        return blockingCount() == 0
+    }
+
+    override fun one(): ReadOnlyObjectRepository<TrackedEntitySearchItem> {
+        return objectRepository(
+            object : Transformer<List<TrackedEntitySearchItem>, TrackedEntitySearchItem?> {
+                override fun transform(o: List<TrackedEntitySearchItem>): TrackedEntitySearchItem? {
+                    return o.firstOrNull()
+                }
+            },
+        )
+    }
+
+    private fun getDataFetcher(): TrackedEntitySearchDataFetcher {
+        return TrackedEntitySearchDataFetcher(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper,
+            trackerHeaderEngine,
+        )
+    }
+
+    override fun uid(uid: String?): ReadOnlyObjectRepository<TrackedEntitySearchItem> {
+        return objectRepository(
+            object : Transformer<List<TrackedEntitySearchItem>, TrackedEntitySearchItem?> {
+                override fun transform(o: List<TrackedEntitySearchItem>): TrackedEntitySearchItem? {
+                    return o.find { uid == it.uid() }
+                }
+            },
+        )
+    }
+
+    override fun getUids(): Single<List<String>> {
+        return Single.fromCallable { blockingGetUids() }
+    }
+
+    override fun blockingGetUids(): List<String> {
+        return if (scope.mode() == RepositoryMode.OFFLINE_ONLY || scope.mode() == RepositoryMode.OFFLINE_FIRST) {
+            getDataFetcher().queryAllOfflineUids()
+        } else {
+            UidsHelper.getUids(blockingGet()).toList()
+        }
+    }
+
+    private fun objectRepository(
+        transformer: Transformer<List<TrackedEntitySearchItem>, TrackedEntitySearchItem?>,
+    ): ReadOnlyObjectRepository<TrackedEntitySearchItem> {
+        return object : ReadOnlyObjectRepository<TrackedEntitySearchItem> {
+            override fun get(): Single<TrackedEntitySearchItem?> {
+                return Single.fromCallable { this.blockingGet() }
+            }
+
+            override fun blockingGet(): TrackedEntitySearchItem? {
+                val list = this@TrackedEntitySearchCollectionRepository.blockingGet()
+                return transformer.transform(list)
+            }
+
+            override fun exists(): Single<Boolean> {
+                return Single.fromCallable { blockingExists() }
+            }
+
+            override fun blockingExists(): Boolean {
+                return blockingGet() != null
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
new file mode 100644
index 0000000000..541b2da68a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+
+internal class TrackedEntitySearchDataFetcher(
+    store: TrackedEntityInstanceStore,
+    trackerParentCallFactory: TrackerParentCallFactory,
+    scope: TrackedEntityInstanceQueryRepositoryScope,
+    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
+    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+    private val trackerHeaderEngine: TrackerHeaderEngine,
+) {
+
+    private val instanceFetcher = TrackedEntityInstanceQueryDataFetcher(
+        store,
+        trackerParentCallFactory,
+        scope,
+        childrenAppenders,
+        onlineCache,
+        onlineHelper,
+        localQueryHelper,
+    )
+
+    fun refresh() {
+        instanceFetcher.refresh()
+    }
+
+    fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
+        return transform(instanceFetcher.loadPages(requestedLoadSize))
+    }
+
+    fun queryAllOffline(): List<Result<TrackedEntitySearchItem, D2Error>> {
+        return transform(instanceFetcher.queryAllOffline())
+    }
+
+    fun queryAllOfflineUids(): List<String> {
+        return instanceFetcher.queryAllOfflineUids()
+    }
+
+    fun queryAllOnline(): List<Result<TrackedEntitySearchItem, D2Error>> {
+        return transform(instanceFetcher.queryAllOnline())
+    }
+
+    private fun transform(
+        list: List<Result<TrackedEntityInstance, D2Error>>
+    ): List<Result<TrackedEntitySearchItem, D2Error>> {
+        return list.map { item ->
+            item.map { instance ->
+                val searchItem = TrackedEntitySearchItemHelper.from(instance)
+                appendHeader(searchItem)
+            }
+        }
+    }
+
+    private fun appendHeader(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
+        val header = trackerHeaderEngine.getTrackedEntityHeader(
+            expression = "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))",
+            attributeValues = item.trackedEntityAttributeValues() ?: emptyList()
+        )
+
+        return item.toBuilder().header(header).build()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSource.kt
new file mode 100644
index 0000000000..ea8183c5a7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSource.kt
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.search
+
+import androidx.paging.ItemKeyedDataSource
+import org.hisp.dhis.android.core.arch.helpers.Result
+
+internal class TrackedEntitySearchDataSource constructor(
+    private val dataFetcher: TrackedEntitySearchDataFetcher,
+) : ItemKeyedDataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
+
+    override fun loadInitial(
+        params: LoadInitialParams<TrackedEntitySearchItem>,
+        callback: LoadInitialCallback<TrackedEntitySearchItem>,
+    ) {
+        dataFetcher.refresh()
+        callback.onResult(loadPages(params.requestedLoadSize))
+    }
+
+    override fun loadAfter(
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem>,
+    ) {
+        callback.onResult(loadPages(params.requestedLoadSize))
+    }
+
+    override fun loadBefore(
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem>,
+    ) {
+        // do nothing
+    }
+
+    override fun getKey(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
+        return item
+    }
+
+    private fun loadPages(requestedLoadSize: Int): List<TrackedEntitySearchItem> {
+        return dataFetcher.loadPages(requestedLoadSize).mapNotNull {
+            when (it) {
+                is Result.Success -> it.value
+                is Result.Failure -> null
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
new file mode 100644
index 0000000000..e1fc5f2077
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
@@ -0,0 +1,493 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BoolFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqLikeItemFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
+import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.common.DateFilterPeriod
+import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
+
+abstract class TrackedEntitySearchOperators<R : BaseRepository> internal constructor(
+    val scope: TrackedEntityInstanceQueryRepositoryScope,
+    private val scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
+    private val versionManager: DHISVersionManager,
+    private val filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
+    private val workingListRepository: ProgramStageWorkingListCollectionRepository,
+) {
+    internal abstract val connectorFactory: ScopedFilterConnectorFactory<R, TrackedEntityInstanceQueryRepositoryScope>
+
+    /**
+     * Only TrackedEntityInstances coming from the server are shown in the list.
+     * <br></br>**Important:** Internet connection is required to use this mode.
+     *
+     * @return
+     */
+    fun onlineOnly(): R {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.ONLINE_ONLY).build()
+        }.eq(null)
+    }
+
+    /**
+     * Only TrackedEntityInstances coming from local database are shown in the list.
+     *
+     * @return
+     */
+    fun offlineOnly(): R {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.OFFLINE_ONLY).build()
+        }.eq(null)
+    }
+
+    /**
+     * TrackedEntityInstances coming from the server are shown in first place. Once there are no more results online,
+     * it continues with TrackedEntityInstances in local database.
+     * <br></br>**Important:** Internet connection is required to use this mode.
+     *
+     * @return
+     */
+    fun onlineFirst(): R {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.ONLINE_FIRST).build()
+        }.eq(null)
+    }
+
+    /**
+     * TrackedEntityInstances coming from local database are shown in first place. Once there are no more results, it
+     * continues with TrackedEntityInstances coming from the server. This method may speed up the initial load.
+     * <br></br>**Important:** Internet connection is required to use this mode.
+     *
+     * @return
+     */
+    fun offlineFirst(): R {
+        return connectorFactory.eqConnector<Any> {
+            scope.toBuilder().mode(RepositoryMode.OFFLINE_FIRST).build()
+        }.eq(null)
+    }
+
+    /**
+     * Add an "attribute" filter to the query. If this method is called several times, conditions are appended with
+     * AND connector.
+     *
+     *
+     * For example,
+     * <pre><br></br>.byAttribute("uid1").eq("value1")<br></br>.byAttribute("uid2").eq("value2")<br></br></pre>
+     * means that the instance must have attribute "uid1" with value "value1" **AND** attribute "uid2" with
+     * value "value2".
+     *
+     * @param attributeId Attribute uid to use in the filter
+     * @return Repository connector
+     */
+    fun byAttribute(attributeId: String): EqLikeItemFilterConnector<R> {
+        return byFilter(attributeId)
+    }
+
+    /**
+     * Add a "filter" to the query. If this method is called several times, conditions are appended with
+     * AND connector.
+     *
+     *
+     * For example,
+     * <pre><br></br>.byFilter("uid1").eq("value1")<br></br>.byFilter("uid2").eq("value2")<br></br></pre>
+     * means that the instance must have attribute "uid1" with value "value1" **AND** attribute "uid2" with
+     * value "value2".
+     *
+     * @param attributeId Attribute uid to use in the filter
+     * @return Repository connector
+     */
+    fun byFilter(attributeId: String): EqLikeItemFilterConnector<R> {
+        return connectorFactory.eqLikeItemC(attributeId) { filterItem: RepositoryScopeFilterItem ->
+            scopeHelper.addFilter(scope, filterItem)
+        }
+    }
+
+    /**
+     * Search tracked entity instances with **any** attribute matching the query.
+     *
+     * @return Repository connector
+     */
+    fun byQuery(): EqLikeItemFilterConnector<R> {
+        return connectorFactory.eqLikeItemC("") { filterItem: RepositoryScopeFilterItem ->
+            scope.toBuilder().query(filterItem).build()
+        }
+    }
+
+    /**
+     * Filter the tracked entity for those matching this filter. If this method is called several times, conditions
+     * are appended with AND connector.
+     *
+     * @param dataElement DataElement uid to use in the filter
+     * @return Repository connector
+     */
+    fun byDataValue(dataElement: String): EqLikeItemFilterConnector<R> {
+        return connectorFactory.eqLikeItemC(dataElement) { filterItem: RepositoryScopeFilterItem ->
+            scope.toBuilder().dataValue(scope.dataValue() + filterItem).build()
+        }
+    }
+
+    /**
+     * Filter by enrollment program. Only one program can be specified.
+     *
+     * @return Repository connector
+     */
+    fun byProgram(): EqFilterConnector<R, String> {
+        return connectorFactory.eqConnector { programUid: String? -> scope.toBuilder().program(programUid).build() }
+    }
+
+    /**
+     * Filter by event program stage. Only one program can be specified.
+     *
+     * @return Repository connector
+     */
+    fun byProgramStage(): EqFilterConnector<R, String> {
+        return connectorFactory.eqConnector { uid: String? -> scope.toBuilder().programStage(uid).build() }
+    }
+
+    /**
+     * Filter by tracked entity instance organisation unit.
+     *
+     * @return Repository connector
+     */
+    fun byOrgUnits(): ListFilterConnector<R, String> {
+        return connectorFactory.listConnector { scope.toBuilder().orgUnits(it).build() }
+    }
+
+    /**
+     * Define the organisation unit mode. See [OrganisationUnitMode] for more details on the modes.
+     *
+     * @return Repository connector
+     */
+    fun byOrgUnitMode(): EqFilterConnector<R, OrganisationUnitMode> {
+        return connectorFactory.eqConnector { scope.toBuilder().orgUnitMode(it).build() }
+    }
+
+    /**
+     * Define an enrollment date filter. It only applies if a program has been specified in [.byProgram].
+     *
+     * @return Repository connector
+     */
+    fun byProgramDate(): PeriodFilterConnector<R> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = DateFilterPeriodHelper.mergeDateFilterPeriods(
+                scope.programDate(),
+                filter,
+            )
+            scope.toBuilder().programDate(mergedFilter).build()
+        }
+    }
+
+    /**
+     * Define an incident date filter. It only applies if a program has been specified in [.byProgram].
+     *
+     * @return Repository connector
+     */
+    fun byIncidentDate(): PeriodFilterConnector<R> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = DateFilterPeriodHelper.mergeDateFilterPeriods(
+                scope.incidentDate(),
+                filter,
+            )
+            scope.toBuilder().incidentDate(mergedFilter).build()
+        }
+    }
+
+    /**
+     * Filter by enrollment status. It only applies if a program has been specified in [.byProgram].
+     * <br></br>**IMPORTANT:** this filter accepts a list of status, but only the first one will be used for the online
+     * query because the web API does not support querying by multiple status.
+     *
+     * @return Repository connector
+     */
+    fun byEnrollmentStatus(): ListFilterConnector<R, EnrollmentStatus> {
+        return connectorFactory.listConnector {
+            scope.toBuilder().enrollmentStatus(it).build()
+        }
+    }
+
+    /**
+     * Define an event date filter. It only applies if a program has been specified in [.byProgram].
+     *
+     * @return Repository connector
+     */
+    fun byEventDate(): PeriodFilterConnector<R> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = DateFilterPeriodHelper.mergeDateFilterPeriods(
+                scope.eventDate(),
+                filter,
+            )
+            scope.toBuilder().eventDate(mergedFilter).build()
+        }
+    }
+
+    /**
+     * Filter by event status. It only applies if a program has been specified in [.byProgram].
+     * <br></br>**IMPORTANT:** this filter requires that eventStartDate [.byEventStartDate] and eventEndDate
+     * [.byEventEndDate] are defined.
+     *
+     * @return Repository connector
+     */
+    fun byEventStatus(): ListFilterConnector<R, EventStatus> {
+        return connectorFactory.listConnector { scope.toBuilder().eventStatus(it).build() }
+    }
+
+    /**
+     * Filter by TrackedEntityType. Only one type can be specified.
+     *
+     * @return Repository connector
+     */
+    fun byTrackedEntityType(): EqFilterConnector<R, String> {
+        return connectorFactory.eqConnector { scope.toBuilder().trackedEntityType(it).build() }
+    }
+
+    /**
+     * Whether to include or not deleted tracked entity instances.
+     * <br></br>**IMPORTANT:** currently this filter only applies to **offline** instances.
+     *
+     * @return Repository connector
+     */
+    fun byIncludeDeleted(): EqFilterConnector<R, Boolean> {
+        return connectorFactory.eqConnector { scope.toBuilder().includeDeleted(it).build() }
+    }
+
+    /**
+     * Filter by sync status.
+     * <br></br>**IMPORTANT:** using this filter forces **offlineOnly** mode.
+     *
+     * @return Repository connector
+     */
+    fun byStates(): ListFilterConnector<R, State> {
+        return connectorFactory.listConnector { scope.toBuilder().states(it).build() }
+    }
+
+    /**
+     * Filter by follow up status. It only applies if a program has been specified in [.byProgram].
+     *
+     * @return Repository connector
+     */
+    fun byFollowUp(): BoolFilterConnector<R> {
+        return connectorFactory.booleanConnector { scope.toBuilder().followUp(it).build() }
+    }
+
+    /**
+     * Filter by assigned user mode.
+     * <br></br>**IMPORTANT:** this filter has effect if DHIS2 version is 2.32 or later. Otherwise, it is ignored.
+     *
+     * @return Repository connector
+     */
+    fun byAssignedUserMode(): EqFilterConnector<R, AssignedUserMode> {
+        return connectorFactory.eqConnector { mode: AssignedUserMode? ->
+            return@eqConnector if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
+                scope.toBuilder().assignedUserMode(mode).build()
+            } else {
+                scope
+            }
+        }
+    }
+
+    /**
+     * Define an lastUpdated date filter.
+     *
+     * @return Repository connector
+     */
+    fun byLastUpdatedDate(): PeriodFilterConnector<R> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val mergedFilter = DateFilterPeriodHelper.mergeDateFilterPeriods(
+                scope.lastUpdatedDate(),
+                filter,
+            )
+            scope.toBuilder().lastUpdatedDate(mergedFilter).build()
+        }
+    }
+
+    /**
+     * Whether to allow or not cached results for online queries. Its value is 'false' by default.
+     *
+     * @return Repository connector
+     */
+    fun allowOnlineCache(): EqFilterConnector<R, Boolean> {
+        return connectorFactory.eqConnector { scope.toBuilder().allowOnlineCache(it).build() }
+    }
+
+    fun excludeUids(): ListFilterConnector<R, String> {
+        return connectorFactory.listConnector { list: List<String> ->
+            scope.toBuilder().excludedUids(HashSet(list)).build()
+        }
+    }
+
+    /**
+     * Apply the filters defined in a [TrackedEntityInstanceFilter]. It will overwrite previous filters in case
+     * they overlap. In the same way, they could be overwritten by subsequent filters.
+     *
+     * @return Repository connector
+     */
+    fun byTrackedEntityInstanceFilter(): EqFilterConnector<R, String> {
+        return connectorFactory.eqConnector { id: String? ->
+            val filter = filtersRepository
+                .withTrackedEntityInstanceEventFilters()
+                .withAttributeValueFilters()
+                .uid(id).blockingGet()
+            scopeHelper.addTrackedEntityInstanceFilter(scope, filter!!)
+        }
+    }
+
+    /**
+     * Apply the filters defined in a [ProgramStageWorkingList]. It will overwrite previous filters in case
+     * they overlap. In the same way, they could be overwritten by subsequent filters.
+     *
+     * @return Repository connector
+     */
+    fun byProgramStageWorkingList(): EqFilterConnector<R, String> {
+        return connectorFactory.eqConnector { id: String? ->
+            val workingList = workingListRepository
+                .withDataFilters()
+                .withAttributeValueFilters()
+                .uid(id).blockingGet()
+            scopeHelper.addProgramStageWorkingList(scope, workingList!!)
+        }
+    }
+
+    /**
+     * Order by created date. If a program is provided, it takes the created of most recent enrollment.
+     * Otherwise it takes the value of the tracked entity instance.
+     *
+     * @return Repository connector
+     */
+    fun orderByCreated(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.CREATED)
+    }
+
+    /**
+     * Order by last updated date. If a program is provided, it takes the last updated of most recent enrollment.
+     * Otherwise it takes the value of the tracked entity instance.
+     *
+     * @return Repository connector
+     */
+    fun orderByLastUpdated(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.LAST_UPDATED)
+    }
+
+    /**
+     * Order by tracked entity instance attribute value.
+     *
+     * @return Repository connector
+     */
+    fun orderByAttribute(
+        attr: String,
+    ): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.attribute(attr))
+    }
+
+    /**
+     * Order by organisation unit name of the tracked entity instance.
+     *
+     * @return Repository connector
+     */
+    fun orderByOrganisationUnitName(): EqFilterConnector<
+        R,
+        RepositoryScope.OrderByDirection,
+        > {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ORGUNIT_NAME)
+    }
+
+    /**
+     * Order by enrollment date of most recent enrollment. This order only applies to local results.
+     *
+     * @return Repository connector
+     */
+    fun orderByEnrollmentDate(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_DATE)
+    }
+
+    /**
+     * Order by incident date of most recent enrollment. This order only applies to local results.
+     *
+     * @return Repository connector
+     */
+    fun orderByIncidentDate(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.INCIDENT_DATE)
+    }
+
+    /**
+     * Order by most recent event. It takes the event date and, if it is null, it fallbacks to due date. This order
+     * only applies to local results.
+     *
+     * @return Repository connector
+     */
+    fun orderByEventDate(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.EVENT_DATE)
+    }
+
+    /**
+     * Order by completion date of the most recent event. This order only applies to local results.
+     *
+     * @return Repository connector
+     */
+    fun orderByCompletedDate(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.COMPLETION_DATE)
+    }
+
+    /**
+     * Order by enrollment status.
+     *
+     * @return Repository connector
+     */
+    fun orderByEnrollmentStatus(): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS)
+    }
+
+
+    private fun orderConnector(
+        col: TrackedEntityInstanceQueryScopeOrderColumn,
+    ): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
+        return connectorFactory.eqConnector { direction: RepositoryScope.OrderByDirection? ->
+            val order = TrackedEntityInstanceQueryScopeOrderByItem.builder().column(col).direction(direction).build()
+            scope.toBuilder().order(scope.order() + order).build()
+        }
+    }
+
+}

From 0d048826f8ecd6614cc8c8da1c09bd5b12d05e90 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 8 Sep 2023 08:42:08 +0200
Subject: [PATCH 290/478] [ANDROSDK-1743] Migrate TrackedEntitySearchItem to
 data class

---
 .../search/TrackedEntitySearchDataFetcher.kt  |   4 +-
 .../search/TrackedEntitySearchItem.java       | 123 ------------------
 .../search/TrackedEntitySearchItem.kt         |  53 ++++++++
 .../search/TrackedEntitySearchItemHelper.kt   |  49 +++----
 ...ckedEntityInstanceQueryDataSourceShould.kt |  11 +-
 5 files changed, 85 insertions(+), 155 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
index 541b2da68a..8de6506542 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
@@ -92,9 +92,9 @@ internal class TrackedEntitySearchDataFetcher(
     private fun appendHeader(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
         val header = trackerHeaderEngine.getTrackedEntityHeader(
             expression = "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))",
-            attributeValues = item.trackedEntityAttributeValues() ?: emptyList()
+            attributeValues = item.trackedEntityAttributeValues ?: emptyList()
         )
 
-        return item.toBuilder().header(header).build()
+        return item.copy(header = header)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
deleted file mode 100644
index ef029d535c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.search;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.auto.value.AutoValue;
-
-import org.hisp.dhis.android.core.common.Geometry;
-import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
-
-import java.util.Date;
-import java.util.List;
-
-@AutoValue
-public abstract class TrackedEntitySearchItem implements ObjectWithUidInterface {
-    @Override
-    public abstract String uid();
-
-    @Nullable
-    public abstract Date created();
-
-    @Nullable
-    public abstract Date lastUpdated();
-
-    @Nullable
-    public abstract Date createdAtClient();
-
-    @Nullable
-    public abstract Date lastUpdatedAtClient();
-
-    @Nullable
-    public abstract String organisationUnit();
-
-    @Nullable
-    public abstract String trackedEntityType();
-
-    @Nullable
-    public abstract Geometry geometry();
-
-    @Nullable
-    public abstract List<TrackedEntityAttributeValue> trackedEntityAttributeValues();
-
-    @Nullable
-    public abstract State syncState();
-
-    @Nullable
-    public abstract State aggregatedSyncState();
-
-    @Nullable
-    public abstract Boolean deleted();
-
-    @Nullable
-    public abstract String header();
-
-    public static TrackedEntitySearchItem.Builder builder() {
-        return new AutoValue_TrackedEntitySearchItem.Builder();
-    }
-
-    public abstract TrackedEntitySearchItem.Builder toBuilder();
-
-    @AutoValue.Builder
-    public abstract static class Builder {
-
-        public abstract Builder uid(String uid);
-
-        public abstract Builder created(Date created);
-
-        public abstract Builder lastUpdated(Date lastUpdated);
-
-        public abstract Builder createdAtClient(Date createdAtClient);
-
-        public abstract Builder lastUpdatedAtClient(Date lastUpdatedAtClient);
-
-        public abstract Builder organisationUnit(String organisationUnit);
-
-        public abstract Builder trackedEntityType(String trackedEntityType);
-
-        public abstract Builder geometry(Geometry geometry);
-
-        public abstract Builder trackedEntityAttributeValues(
-                List<TrackedEntityAttributeValue> trackedEntityAttributeValues);
-
-        public abstract Builder syncState(State state);
-
-        public abstract Builder aggregatedSyncState(State state);
-
-        public abstract Builder deleted(Boolean deleted);
-
-        public abstract Builder header(String header);
-
-        public abstract TrackedEntitySearchItem build();
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
new file mode 100644
index 0000000000..98cb6bd55e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.common.Geometry
+import org.hisp.dhis.android.core.common.ObjectWithUidInterface
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import java.util.Date
+
+data class TrackedEntitySearchItem(
+    val uid: String,
+    val created: Date?,
+    val lastUpdated: Date?,
+    val createdAtClient: Date?,
+    val lastUpdatedAtClient: Date?,
+    val organisationUnit: String?,
+    val trackedEntityType: String?,
+    val geometry: Geometry?,
+    val trackedEntityAttributeValues: List<TrackedEntityAttributeValue>?,
+    val syncState: State?,
+    val aggregatedSyncState: State?,
+    val deleted: Boolean,
+    val header: String? = null
+) : ObjectWithUidInterface {
+    override fun uid(): String = uid
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
index ceddbb8f28..b4140f3cf3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -32,34 +32,35 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 
 object TrackedEntitySearchItemHelper {
     fun from(i: TrackedEntityInstance): TrackedEntitySearchItem {
-        return TrackedEntitySearchItem.builder()
-            .uid(i.uid())
-            .created(i.created())
-            .lastUpdated(i.lastUpdated())
-            .createdAtClient(i.createdAtClient())
-            .lastUpdatedAtClient(i.lastUpdatedAtClient())
-            .organisationUnit(i.organisationUnit())
-            .trackedEntityType(i.trackedEntityType())
-            .geometry(i.geometry())
-            .trackedEntityAttributeValues(i.trackedEntityAttributeValues())
-            .syncState(i.syncState())
-            .aggregatedSyncState(i.aggregatedSyncState())
-            .build()
+        return TrackedEntitySearchItem(
+            uid = i.uid(),
+            created = i.created(),
+            lastUpdated = i.lastUpdated(),
+            createdAtClient = i.createdAtClient(),
+            lastUpdatedAtClient = i.lastUpdatedAtClient(),
+            organisationUnit = i.organisationUnit(),
+            trackedEntityType = i.trackedEntityType(),
+            geometry = i.geometry(),
+            trackedEntityAttributeValues = i.trackedEntityAttributeValues(),
+            syncState = i.syncState(),
+            aggregatedSyncState = i.aggregatedSyncState(),
+            deleted = i.deleted() ?: false
+        )
     }
 
     fun toTrackedEntityInstance(i: TrackedEntitySearchItem): TrackedEntityInstance {
         return TrackedEntityInstance.builder()
-            .uid(i.uid())
-            .created(i.created())
-            .lastUpdated(i.lastUpdated())
-            .createdAtClient(i.createdAtClient())
-            .lastUpdatedAtClient(i.lastUpdatedAtClient())
-            .organisationUnit(i.organisationUnit())
-            .trackedEntityType(i.trackedEntityType())
-            .geometry(i.geometry())
-            .trackedEntityAttributeValues(i.trackedEntityAttributeValues())
-            .syncState(i.syncState())
-            .aggregatedSyncState(i.aggregatedSyncState())
+            .uid(i.uid)
+            .created(i.created)
+            .lastUpdated(i.lastUpdated)
+            .createdAtClient(i.createdAtClient)
+            .lastUpdatedAtClient(i.lastUpdatedAtClient)
+            .organisationUnit(i.organisationUnit)
+            .trackedEntityType(i.trackedEntityType)
+            .geometry(i.geometry)
+            .trackedEntityAttributeValues(i.trackedEntityAttributeValues)
+            .syncState(i.syncState)
+            .aggregatedSyncState(i.aggregatedSyncState)
             .build()
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 0b82e6b572..60d63e981f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -62,17 +62,17 @@ class TrackedEntityInstanceQueryDataSourceShould {
     private val store: TrackedEntityInstanceStore = mock()
     private val trackerParentCallFactory: TrackerParentCallFactory = mock()
     private val onlineCallFactory: TrackedEntityEndpointCallFactory = mock()
-    private val trackedEntity: TrackedEntitySearchItem = mock()
+    private val trackedEntity: TrackedEntityInstance = mock()
 
     private lateinit var offlineObjects: List<TrackedEntityInstance>
     private lateinit var onlineObjects1: List<TrackedEntityInstance>
     private lateinit var onlineObjects2: List<TrackedEntityInstance>
 
-    var captureInstances: KArgumentCaptor<List<TrackedEntitySearchItem>> = argumentCaptor()
+    var captureInstances: KArgumentCaptor<List<TrackedEntityInstance>> = argumentCaptor()
 
     private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>> = mock()
 
-    private val initialCallback: ItemKeyedDataSource.LoadInitialCallback<TrackedEntitySearchItem> = mock()
+    private val initialCallback: ItemKeyedDataSource.LoadInitialCallback<TrackedEntityInstance> = mock()
     private val calendarProvider = CalendarProviderFactory.calendarProvider
     private val periodHelper = DateFilterPeriodHelper(calendarProvider, create(calendarProvider))
     private val onlineHelper = TrackedEntityInstanceQueryOnlineHelper(periodHelper)
@@ -137,7 +137,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
         )
         verify(onlineCallFactory)
             .getQueryCall(argThat(QueryPageUserModeMatcher(1, initialLoad, AssignedUserMode.ANY)))
-        verify(initialCallback).onResult(onlineObjects1.map { TrackedEntitySearchItemHelper.from(it) })
+        verify(initialCallback).onResult(onlineObjects1)
         verifyNoMoreInteractions(onlineCallFactory)
     }
 
@@ -150,7 +150,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
             initialCallback,
         )
         verify(store).selectRawQuery(anyString())
-        verify(initialCallback).onResult(offlineObjects.map { TrackedEntitySearchItemHelper.from(it) })
+        verify(initialCallback).onResult(offlineObjects)
         verifyNoMoreInteractions(store)
     }
 
@@ -274,7 +274,6 @@ class TrackedEntityInstanceQueryDataSourceShould {
             onlineCache,
             onlineHelper,
             localQueryHelper,
-            trackerHeaderEngine,
         )
     }
 

From a2013358aa7a19d8350c4b831530e41cdb0cdd0e Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 14 Sep 2023 11:22:03 +0200
Subject: [PATCH 291/478] [ANDROSDK-1736] refactor: - Remove unneeded
 .toMutableList()

---
 .../call/factories/internal/QueryCoroutineCallFactoryImpl.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index 158946bf0f..48c8af02ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -39,7 +39,7 @@ internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQueryKt> protec
     override suspend fun create(query: Q): List<P> {
         val objects: List<P> = fetcher(query)
         processor(query).process(objects)
-        return objects.toMutableList()
+        return objects
     }
 
     protected abstract suspend fun fetcher(query: Q): List<P>

From 1d8a6fca9d4cd654a64bf2f3286cf64ab70c174e Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 14 Sep 2023 11:46:16 +0200
Subject: [PATCH 292/478] [ANDROSDK-1743] Fix checks

---
 .../internal/TrackerHeaderEngine.kt           |  4 +-
 ...EntityInstanceQueryCollectionRepository.kt | 73 +++-------------
 .../TrackedEntityInstanceQueryDataFetcher.kt  |  4 +-
 ...TrackedEntityInstanceQueryPagingSource.kt} |  2 +-
 ...TrackedEntitySearchCollectionRepository.kt | 33 ++++++-
 .../search/TrackedEntitySearchDataFetcher.kt  |  9 +-
 .../search/TrackedEntitySearchItem.kt         |  2 +-
 .../search/TrackedEntitySearchItemHelper.kt   |  2 +-
 .../search/TrackedEntitySearchOperators.kt    |  3 +-
 .../search/TrackedEntitySearchPagingSource.kt | 86 +++++++++++++++++++
 ...ckedEntityInstanceQueryDataSourceShould.kt |  4 +-
 11 files changed, 145 insertions(+), 77 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/{TrackeEntityInstanceQueryPagingSource.kt => TrackedEntityInstanceQueryPagingSource.kt} (98%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
index 886102feb7..ca882d6312 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
@@ -74,10 +74,10 @@ internal class TrackerHeaderEngine @Inject constructor(
         return executor.getProgramIndicatorValue(context.programIndicator)
     }
 
-    //TODO
+    // TODO
     private val constantMap: Map<String, Constant>
         get() {
             val constants = constantStore.selectAll()
             return UidsHelper.mapByUid(constants)
         }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index aba3f525b2..da9faf2538 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -45,16 +45,11 @@ import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
-import org.hisp.dhis.android.core.common.DateFilterPeriod
-import org.hisp.dhis.android.core.common.DateFilterPeriodHelper.Companion.mergeDateFilterPeriods
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -65,7 +60,7 @@ import java.util.Date
 import javax.inject.Inject
 
 @Reusable
-@Suppress("LongParameterList")
+@Suppress("TooManyFunctions", "LongParameterList")
 class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
@@ -78,8 +73,16 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-) : ReadOnlyWithUidCollectionRepository<TrackedEntityInstance> {
-    private val connectorFactory:
+) : ReadOnlyWithUidCollectionRepository<TrackedEntityInstance>,
+    TrackedEntitySearchOperators<TrackedEntityInstanceQueryCollectionRepository>(
+        scope,
+        scopeHelper,
+        versionManager,
+        filtersRepository,
+        workingListRepository,
+    ) {
+
+    override val connectorFactory:
         ScopedFilterConnectorFactory<
             TrackedEntityInstanceQueryCollectionRepository,
             TrackedEntityInstanceQueryRepositoryScope,
@@ -102,56 +105,6 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         return connectorFactory.eqConnector { byProgramDate().beforeOrEqual(it!!).scope }
     }
 
-    /**
-     * Define an enrollment date filter. It only applies if a program has been specified in [.byProgram].
-     *
-     * @return Repository connector
-     */
-    fun byProgramDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
-            val mergedFilter = mergeDateFilterPeriods(
-                scope.programDate(),
-                filter,
-            )
-            scope.toBuilder().programDate(mergedFilter).build()
-        }
-    }
-
-    /**
-     * Define an incident date filter. It only applies if a program has been specified in [.byProgram].
-     *
-     * @return Repository connector
-     */
-    fun byIncidentDate(): PeriodFilterConnector<TrackedEntityInstanceQueryCollectionRepository> {
-        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
-            val mergedFilter = mergeDateFilterPeriods(
-                scope.incidentDate(),
-                filter,
-            )
-            scope.toBuilder().incidentDate(mergedFilter).build()
-        }
-    }
-
-    @Deprecated("use {@link #byEnrollmentStatus()} instead.")
-    fun byProgramStatus(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> {
-        return connectorFactory.eqConnector { status: EnrollmentStatus? ->
-            scope.toBuilder().enrollmentStatus(listOf(status)).build()
-        }
-    }
-
-    /**
-     * Filter by enrollment status. It only applies if a program has been specified in [.byProgram].
-     * <br></br>**IMPORTANT:** this filter accepts a list of status, but only the first one will be used for the online
-     * query because the web API does not support querying by multiple status.
-     *
-     * @return Repository connector
-     */
-    fun byEnrollmentStatus(): ListFilterConnector<TrackedEntityInstanceQueryCollectionRepository, EnrollmentStatus> {
-        return connectorFactory.listConnector {
-            scope.toBuilder().enrollmentStatus(it).build()
-        }
-    }
-
     @Deprecated("use {@link #byEventDate()} instead.")
     fun byEventStartDate(): EqFilterConnector<TrackedEntityInstanceQueryCollectionRepository, Date> {
         return connectorFactory.eqConnector {
@@ -195,7 +148,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         get() = TrackedEntityInstanceQueryDataSource(getDataFetcher())
 
     val pagingSource: PagingSource<TrackedEntityInstance, TrackedEntityInstance>
-        get() = TrackeEntityInstanceQueryPagingSource(
+        get() = TrackedEntityInstanceQueryPagingSource(
             store,
             trackerParentCallFactory,
             scope,
@@ -265,7 +218,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
             childrenAppenders,
             onlineCache,
             onlineHelper,
-            localQueryHelper
+            localQueryHelper,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index a91bac7dce..95dbe48beb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -42,6 +42,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
 import kotlin.collections.HashSet
 
+@Suppress("TooManyFunctions")
 internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
@@ -122,6 +123,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
         }
     }
 
+    @Suppress("ComplexCondition")
     private fun queryOnline(requestLoadSize: Int): List<Result<TrackedEntityInstance, D2Error>> {
         val result: MutableList<Result<TrackedEntityInstance, D2Error>> = ArrayList()
 
@@ -158,7 +160,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
             )
         } else {
             baseOnlineQuery.copy(
-                paging = false
+                paging = false,
             )
         }
         val queryInstances = queryOnline(onlineQuery)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt
similarity index 98%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt
index 0a02cb127c..3e82cf7eec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackeEntityInstanceQueryPagingSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt
@@ -37,7 +37,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
 
-internal class TrackeEntityInstanceQueryPagingSource(
+internal class TrackedEntityInstanceQueryPagingSource(
     store: TrackedEntityInstanceStore,
     trackerParentCallFactory: TrackerParentCallFactory,
     scope: TrackedEntityInstanceQueryRepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
index 9bc72de0b5..c156614f53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -32,8 +32,13 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.PagingSource
 import dagger.Reusable
 import io.reactivex.Single
+import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -53,6 +58,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactor
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions", "LongParameterList")
 class TrackedEntitySearchCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
@@ -72,7 +78,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
         scopeHelper,
         versionManager,
         filtersRepository,
-        workingListRepository
+        workingListRepository,
     ) {
 
     override val connectorFactory:
@@ -84,10 +90,11 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
             TrackedEntitySearchCollectionRepository(
                 store, trackerParentCallFactory, childrenAppenders,
                 s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
-                onlineHelper, localQueryHelper, trackerHeaderEngine
+                onlineHelper, localQueryHelper, trackerHeaderEngine,
             )
         }
 
+    @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
     override fun getPaged(pageSize: Int): LiveData<PagedList<TrackedEntitySearchItem>> {
         val factory: DataSource.Factory<TrackedEntitySearchItem, TrackedEntitySearchItem> =
             object : DataSource.Factory<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
@@ -98,9 +105,29 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
         return LivePagedListBuilder(factory, pageSize).build()
     }
 
+    override fun getPagingData(pageSize: Int): Flow<PagingData<TrackedEntitySearchItem>> {
+        return Pager(
+            config = PagingConfig(pageSize = pageSize),
+        ) {
+            pagingSource
+        }.flow
+    }
+
     val dataSource: DataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>
         get() = TrackedEntitySearchDataSource(getDataFetcher())
 
+    val pagingSource: PagingSource<TrackedEntitySearchItem, TrackedEntitySearchItem>
+        get() = TrackedEntitySearchPagingSource(
+            store,
+            trackerParentCallFactory,
+            scope,
+            childrenAppenders,
+            onlineCache,
+            onlineHelper,
+            localQueryHelper,
+            trackerHeaderEngine,
+        )
+
     @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
     override fun blockingGet(): List<TrackedEntitySearchItem> {
         val dataFetcher = getDataFetcher()
@@ -206,4 +233,4 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
index 8de6506542..c294a36946 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
@@ -58,6 +58,9 @@ internal class TrackedEntitySearchDataFetcher(
         localQueryHelper,
     )
 
+    private val sampleHeaderExpression =
+        "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))"
+
     fun refresh() {
         instanceFetcher.refresh()
     }
@@ -79,7 +82,7 @@ internal class TrackedEntitySearchDataFetcher(
     }
 
     private fun transform(
-        list: List<Result<TrackedEntityInstance, D2Error>>
+        list: List<Result<TrackedEntityInstance, D2Error>>,
     ): List<Result<TrackedEntitySearchItem, D2Error>> {
         return list.map { item ->
             item.map { instance ->
@@ -91,8 +94,8 @@ internal class TrackedEntitySearchDataFetcher(
 
     private fun appendHeader(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
         val header = trackerHeaderEngine.getTrackedEntityHeader(
-            expression = "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))",
-            attributeValues = item.trackedEntityAttributeValues ?: emptyList()
+            expression = sampleHeaderExpression,
+            attributeValues = item.trackedEntityAttributeValues ?: emptyList(),
         )
 
         return item.copy(header = header)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
index 98cb6bd55e..8e65a4265a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
@@ -47,7 +47,7 @@ data class TrackedEntitySearchItem(
     val syncState: State?,
     val aggregatedSyncState: State?,
     val deleted: Boolean,
-    val header: String? = null
+    val header: String? = null,
 ) : ObjectWithUidInterface {
     override fun uid(): String = uid
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
index b4140f3cf3..a3b266894c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -44,7 +44,7 @@ object TrackedEntitySearchItemHelper {
             trackedEntityAttributeValues = i.trackedEntityAttributeValues(),
             syncState = i.syncState(),
             aggregatedSyncState = i.aggregatedSyncState(),
-            deleted = i.deleted() ?: false
+            deleted = i.deleted() ?: false,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
index e1fc5f2077..d1a01cf58d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
@@ -52,6 +52,7 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 
+@Suppress("TooManyFunctions")
 abstract class TrackedEntitySearchOperators<R : BaseRepository> internal constructor(
     val scope: TrackedEntityInstanceQueryRepositoryScope,
     private val scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
@@ -480,7 +481,6 @@ abstract class TrackedEntitySearchOperators<R : BaseRepository> internal constru
         return orderConnector(TrackedEntityInstanceQueryScopeOrderColumn.ENROLLMENT_STATUS)
     }
 
-
     private fun orderConnector(
         col: TrackedEntityInstanceQueryScopeOrderColumn,
     ): EqFilterConnector<R, RepositoryScope.OrderByDirection> {
@@ -489,5 +489,4 @@ abstract class TrackedEntitySearchOperators<R : BaseRepository> internal constru
             scope.toBuilder().order(scope.order() + order).build()
         }
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt
new file mode 100644
index 0000000000..fe08236b42
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+
+internal class TrackedEntitySearchPagingSource(
+    store: TrackedEntityInstanceStore,
+    trackerParentCallFactory: TrackerParentCallFactory,
+    scope: TrackedEntityInstanceQueryRepositoryScope,
+    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
+    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
+    trackerHeaderEngine: TrackerHeaderEngine,
+) : PagingSource<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
+
+    private val dataFetcher = TrackedEntitySearchDataFetcher(
+        store,
+        trackerParentCallFactory,
+        scope,
+        childrenAppenders,
+        onlineCache,
+        onlineHelper,
+        localQueryHelper,
+        trackerHeaderEngine,
+    )
+
+    init {
+        dataFetcher.refresh()
+    }
+
+    override fun getRefreshKey(
+        state: PagingState<TrackedEntitySearchItem, TrackedEntitySearchItem>,
+    ): TrackedEntitySearchItem? {
+        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
+    }
+
+    override suspend fun load(
+        params: LoadParams<TrackedEntitySearchItem>,
+    ): LoadResult<TrackedEntitySearchItem, TrackedEntitySearchItem> {
+        val pages = dataFetcher.loadPages(params.loadSize)
+
+        return pages.firstOrNull { it is Result.Failure }?.let {
+            LoadResult.Error((it as Result.Failure).failure)
+        } ?: LoadResult.Page(
+            data = pages.map { it.getOrThrow() },
+            prevKey = pages.firstOrNull()?.getOrThrow(),
+            nextKey = pages.getOrNull(params.loadSize - 1)?.getOrThrow(),
+        )
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 60d63e981f..80b3294180 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -40,7 +40,6 @@ import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
 import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGeneratorImpl.Companion.create
-import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityEndpointCallFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
@@ -77,7 +76,6 @@ class TrackedEntityInstanceQueryDataSourceShould {
     private val periodHelper = DateFilterPeriodHelper(calendarProvider, create(calendarProvider))
     private val onlineHelper = TrackedEntityInstanceQueryOnlineHelper(periodHelper)
     private val localQueryHelper = TrackedEntityInstanceLocalQueryHelper(periodHelper)
-    private val trackerHeaderEngine: TrackerHeaderEngine = mock()
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult> =
         ExpirableCache()
     private val initialLoad = 30
@@ -264,7 +262,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     }
 
     private fun getDataFetcher(
-        scope: TrackedEntityInstanceQueryRepositoryScope
+        scope: TrackedEntityInstanceQueryRepositoryScope,
     ): TrackedEntityInstanceQueryDataFetcher {
         return TrackedEntityInstanceQueryDataFetcher(
             store,

From 9b7153cf451e3f3c53948a889d54c4c8e517c6c7 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 15 Sep 2023 14:13:19 +0200
Subject: [PATCH 293/478] [ANDROSDK-1736] refactor: - Simplify
 TrackedEntityAttributeReservedValueService - QueryCoroutineCallFactoryImpl to
 use CoroutineCallFetcher

---
 .../internal/QueryCoroutineCallFactoryImpl.kt |  5 +--
 ...tributeReservedValueEndpointCallFactory.kt | 34 ++++++++-----------
 ...ckedEntityAttributeReservedValueService.kt |  8 +----
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
index 48c8af02ca..29514290b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/QueryCoroutineCallFactoryImpl.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQueryKt
@@ -37,11 +38,11 @@ internal abstract class QueryCoroutineCallFactoryImpl<P, Q : BaseQueryKt> protec
     protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : QueryCallFactory<P, Q> {
     override suspend fun create(query: Q): List<P> {
-        val objects: List<P> = fetcher(query)
+        val objects: List<P> = fetcher(query).fetch()
         processor(query).process(objects)
         return objects
     }
 
-    protected abstract suspend fun fetcher(query: Q): List<P>
+    protected abstract fun fetcher(query: Q): CoroutineCallFetcher<P>
     protected abstract fun processor(query: Q): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index 69b0d0e7b8..0b61ff0f99 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.trackedentity.internal
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWithErrorCatcherCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -47,29 +48,24 @@ internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject in
     coroutineAPICallExecutor,
 ) {
 
-    override suspend fun fetcher(query: TrackedEntityAttributeReservedValueQuery):
-        List<TrackedEntityAttributeReservedValue> {
+    override fun fetcher(query: TrackedEntityAttributeReservedValueQuery):
+        CoroutineCallFetcher<TrackedEntityAttributeReservedValue> {
         val errorCatcher = TrackedEntityAttributeReservedValueCallErrorCatcher()
 
-        return object : ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
-            coroutineAPICallExecutor = coroutineAPICallExecutor,
-            errorCatcher = errorCatcher,
-        ) {
+        return object :
+            ListNoResourceWithErrorCatcherCallFetcher<TrackedEntityAttributeReservedValue>(
+                coroutineAPICallExecutor = coroutineAPICallExecutor,
+                errorCatcher = errorCatcher,
+            ),
+            CoroutineCallFetcher<TrackedEntityAttributeReservedValue> {
             override suspend fun call(): List<TrackedEntityAttributeReservedValue> {
-                return if (query.organisationUnit() == null) {
-                    service.generateAndReserve(
-                        query.trackedEntityAttributeUid(),
-                        query.numberToReserve(),
-                    )
-                } else {
-                    service.generateAndReserveWithOrgUnitCode(
-                        query.trackedEntityAttributeUid(),
-                        query.numberToReserve(),
-                        query.organisationUnit()!!.code()!!,
-                    )
-                }
+                return service.generateAndReserveWithOrgUnitCode(
+                    query.trackedEntityAttributeUid(),
+                    query.numberToReserve(),
+                    query.organisationUnit()?.code(),
+                )
             }
-        }.fetch()
+        }
     }
 
     override fun processor(query: TrackedEntityAttributeReservedValueQuery):
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index a3e08bad27..890de94820 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -33,17 +33,11 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface TrackedEntityAttributeReservedValueService {
-    @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
-    suspend fun generateAndReserve(
-        @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
-        @Query("numberToReserve") numberToReserve: Int,
-    ): List<TrackedEntityAttributeReservedValue>
-
     @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserveWithOrgUnitCode(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,
         @Query("numberToReserve") numberToReserve: Int,
-        @Query("ORG_UNIT_CODE") orgUnitCode: String,
+        @Query("ORG_UNIT_CODE") orgUnitCode: String?,
     ): List<TrackedEntityAttributeReservedValue>
 
     companion object {

From 3cac30e5a7bf099a81a7d365f6354cd4c087397d Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Sun, 17 Sep 2023 13:48:30 +0200
Subject: [PATCH 294/478] [ANDROSDK-1736] style: - Make interface functional

---
 .../internal/TrackedEntityAttributeReservedValueService.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
index 890de94820..492134cf2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueService.kt
@@ -32,7 +32,7 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
 
-interface TrackedEntityAttributeReservedValueService {
+fun interface TrackedEntityAttributeReservedValueService {
     @GET("trackedEntityAttributes/{$TRACKED_ENTITY_ATTRIBUTE_UID}/generateAndReserve")
     suspend fun generateAndReserveWithOrgUnitCode(
         @Path(TRACKED_ENTITY_ATTRIBUTE_UID) trackedEntityAttributeUid: String,

From b85e2ee86bddb77bcdcddf47b7fc42f3bf0e53b2 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Sat, 23 Sep 2023 15:55:33 +0200
Subject: [PATCH 295/478] [USER-CALL-TEST-FIX] Fix userCall integration test

---
 ...cateWithEncryptionMockIntegrationShould.kt |  3 +++
 .../internal/UserCallMockIntegrationShould.kt | 23 ++++++++-----------
 .../BaseMockIntegrationTestEmptyEnqueable.kt  |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt
index f1fb65b0dc..ac7c4cdbdf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt
@@ -32,10 +32,13 @@ import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.D2Factory.clear
 import org.hisp.dhis.android.core.D2Factory.forNewDatabase
 import org.hisp.dhis.android.core.mockwebserver.Dhis2MockServer
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
+import org.junit.runner.RunWith
 
+@RunWith(D2JunitRunner::class)
 class UserAuthenticateWithEncryptionMockIntegrationShould {
     @Test
     fun return_false_for_blocking_is_logged_when_not_logged() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
index 427e4bb7f5..a6fa0192c7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
@@ -33,7 +33,7 @@ import org.hisp.dhis.android.core.data.user.UserSamples
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
-import org.junit.BeforeClass
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.concurrent.Callable
@@ -41,23 +41,20 @@ import java.util.concurrent.Callable
 @RunWith(D2JunitRunner::class)
 class UserCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
 
-    companion object {
-        private lateinit var userStore: IdentifiableObjectStore<User>
+    private lateinit var userStore: IdentifiableObjectStore<User>
+    private lateinit var userCall: Callable<User>
 
-        @BeforeClass
-        @JvmStatic
-        @Throws(Exception::class)
-        internal fun setUpClass() {
-            BaseMockIntegrationTestEmptyEnqueable.setUpClass()
-            val userCall: Callable<User> = objects.d2DIComponent.internalModules().user.userCall
-            userStore = UserStoreImpl(databaseAdapter)
-            dhis2MockServer.enqueueMockResponse("user/user38.json")
-            userCall.call()
-        }
+    @Before
+    fun setUp() {
+        userStore = UserStoreImpl(databaseAdapter)
+        userCall = objects.d2DIComponent.internalModules().user.userCall
     }
 
     @Test
     fun persist_user_in_database_when_call() {
+        dhis2MockServer.enqueueMockResponse("user/user38.json")
+        userCall.call()
+
         assertThat(userStore.count()).isEqualTo(1)
         assertThat(userStore.selectFirst()).isEqualTo(UserSamples.getUser())
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
index e613a20c61..78747f946b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
@@ -36,7 +36,7 @@ abstract class BaseMockIntegrationTestEmptyEnqueable : BaseMockIntegrationTest()
         @JvmStatic
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.EmptyEnqueable)
-            if (isNewInstance) {
+            if (isNewInstance || !objects.d2.userModule().blockingIsLogged()) {
                 dhis2MockServer.enqueueLoginResponses()
                 objects.d2.userModule().blockingLogIn(
                     RealServerMother.username,

From d16552d46b5a6b6a2490b1561c571850dcf26722 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 26 Sep 2023 14:00:12 +0200
Subject: [PATCH 296/478] [ANDROSDK-1683] refactor: - [ANDROSDK-1720] PR's
 comments to improve the code - [ANDROSDK-1683] From RxJava to Coroutines

---
 ...istCallFactory.java => ListCallFactory.kt} |  12 +-
 .../call/factories/internal/ObjectCall.kt     |   2 +-
 ...idsCallFactory.java => UidsCallFactory.kt} |  13 +--
 ...java => DataElementEndpointCallFactory.kt} |  98 ++++++++---------
 ...ory.java => DataSetEndpointCallFactory.kt} | 103 ++++++++----------
 .../core/domain/metadata/MetadataCall.kt      |  23 ++--
 .../core/event/internal/EventFilterCall.kt    |  21 +---
 ...y.java => IndicatorEndpointCallFactory.kt} |  93 +++++++---------
 ...va => IndicatorTypeEndpointCallFactory.kt} |  93 +++++++---------
 .../core/program/internal/ProgramCall.kt      |  17 +--
 .../core/program/internal/ProgramRuleCall.kt  |   3 +-
 .../core/program/internal/ProgramStageCall.kt |   5 +-
 .../internal/RelationshipTypeCall.kt          |   5 +-
 .../settings/internal/GeneralSettingCall.kt   |   5 +-
 .../internal/TrackedEntityAttributeCall.kt    |   5 +-
 .../internal/TrackedEntityTypeCall.kt         |   5 +-
 ...y.java => AuthorityEndpointCallFactory.kt} |  69 +++++-------
 .../android/core/user/internal/LogInCall.kt   |   4 +-
 .../user/internal/LogInDatabaseManager.kt     |  34 +++---
 .../domain/metadata/MetadataCallShould.kt     |   6 +-
 .../core/user/internal/LogInCallUnitShould.kt |   6 +-
 21 files changed, 270 insertions(+), 352 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{ListCallFactory.java => ListCallFactory.kt} (88%)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/{UidsCallFactory.java => UidsCallFactory.kt} (87%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementEndpointCallFactory.java => DataElementEndpointCallFactory.kt} (53%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetEndpointCallFactory.java => DataSetEndpointCallFactory.kt} (54%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorEndpointCallFactory.java => IndicatorEndpointCallFactory.kt} (58%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorTypeEndpointCallFactory.java => IndicatorTypeEndpointCallFactory.kt} (56%)
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{AuthorityEndpointCallFactory.java => AuthorityEndpointCallFactory.kt} (62%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt
similarity index 88%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt
index 5603adfcf5..14058edf31 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt
@@ -25,12 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.factories.internal
 
-package org.hisp.dhis.android.core.arch.call.factories.internal;
+import java.util.concurrent.Callable
 
-import java.util.List;
-import java.util.concurrent.Callable;
-
-public interface ListCallFactory<P> {
-    Callable<List<P>> create();
-}
\ No newline at end of file
+internal fun interface ListCallFactory<P> {
+    fun create(): Callable<List<P>>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt
index e4618d609e..123af3705d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt
@@ -29,6 +29,6 @@ package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import io.reactivex.Single
 
-interface ObjectCall<P> {
+internal fun interface ObjectCall<P> {
     fun download(): Single<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
similarity index 87%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
index 3be30ac706..f86de19f91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
@@ -25,13 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.factories.internal
 
-package org.hisp.dhis.android.core.arch.call.factories.internal;
+import java.util.concurrent.Callable
 
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-
-public interface UidsCallFactory<P> {
-    Callable<List<P>> create(Set<String> uids);
-}
\ No newline at end of file
+internal fun interface UidsCallFactory<P> {
+    fun create(uids: Set<String>): Callable<List<P>>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
similarity index 53%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
index 2797a0dc7b..d39a8fff38 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
@@ -25,66 +25,54 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataelement.internal
 
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.common.internal.AccessFields;
-import org.hisp.dhis.android.core.dataelement.DataElement;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
+import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
+import org.hisp.dhis.android.core.common.internal.AccessFields
+import org.hisp.dhis.android.core.dataelement.DataElement
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class DataElementEndpointCallFactory extends UidsCallFactoryImpl<DataElement> {
-
-    private static final int MAX_UID_LIST_SIZE = 100;
-
-    private final DataElementService service;
-    private final DataElementHandler handler;
-
-    @Inject
-    DataElementEndpointCallFactory(GenericCallData data,
-                                   APICallExecutor apiCallExecutor,
-                                   DataElementService service,
-                                   DataElementHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
+internal class DataElementEndpointCallFactory @Inject constructor(
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
+    private val service: DataElementService,
+    private val handler: DataElementHandler,
+) : UidsCallFactoryImpl<DataElement>(data, apiCallExecutor) {
+    override fun fetcher(uids: Set<String>): CallFetcher<DataElement> {
+        return object :
+            UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+            var accessReadFilter = "access." + AccessFields.read.eq(true).generateString()
+            override fun getCall(query: UidsQuery): Call<Payload<DataElement>> {
+                return service.getDataElements(
+                    DataElementFields.allFields,
+                    DataElementFields.uid.`in`(query.uids()),
+                    DataElementFields.lastUpdated.gt(null),
+                    accessReadFilter,
+                    query.paging(),
+                )
+            }
+        }
     }
 
-    @Override
-    protected CallFetcher<DataElement> fetcher(Set<String> uids) {
-
-        return new UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-            String accessReadFilter = "access." + AccessFields.read.eq(true).generateString();
-
-            @Override
-            protected retrofit2.Call<Payload<DataElement>> getCall(UidsQuery query) {
-                return service.getDataElements(DataElementFields.allFields,
-                        DataElementFields.uid.in(query.uids()),
-                        DataElementFields.lastUpdated.gt(null),
-                        accessReadFilter,
-                        query.paging());
-            }
-        };
+    override fun processor(): CallProcessor<DataElement> {
+        return TransactionalNoResourceSyncCallProcessor(
+            data.databaseAdapter(),
+            handler,
+        )
     }
 
-    @Override
-    protected CallProcessor<DataElement> processor() {
-        return new TransactionalNoResourceSyncCallProcessor<>(
-                data.databaseAdapter(),
-                handler);
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 100
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
similarity index 54%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
index 87164f41b9..449807369a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
@@ -25,71 +25,58 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset.internal
 
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.common.internal.DataAccessFields;
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.resource.internal.Resource;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalResourceSyncCallProcessor
+import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
+import org.hisp.dhis.android.core.common.internal.DataAccessFields
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.resource.internal.Resource
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class DataSetEndpointCallFactory extends UidsCallFactoryImpl<DataSet> {
-
-    private static final int MAX_UID_LIST_SIZE = 50;
-
-    private final DataSetService dataSetService;
-    private final DataSetHandler dataSetHandler;
-    private final Resource.Type resourceType = Resource.Type.DATA_SET;
+internal class DataSetEndpointCallFactory @Inject constructor(
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
+    private val dataSetService: DataSetService,
+    private val dataSetHandler: DataSetHandler,
+) : UidsCallFactoryImpl<DataSet>(data, apiCallExecutor) {
+    private val resourceType = Resource.Type.DATA_SET
+    override fun fetcher(uids: Set<String>): CallFetcher<DataSet> {
+        return object :
+            UidsNoResourceCallFetcher<DataSet>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+            var accessDataReadFilter =
+                "access.data." + DataAccessFields.read.eq(true).generateString()
 
-    @Inject
-    DataSetEndpointCallFactory(GenericCallData data,
-                               APICallExecutor apiCallExecutor,
-                               DataSetService dataSetService,
-                               DataSetHandler dataSetHandler) {
-        super(data, apiCallExecutor);
-        this.dataSetService = dataSetService;
-        this.dataSetHandler = dataSetHandler;
-    }
-
-    @Override
-    protected CallFetcher<DataSet> fetcher(Set<String> uids) {
-
-        return new UidsNoResourceCallFetcher<DataSet>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-            String accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString();
-
-            @Override
-            protected retrofit2.Call<Payload<DataSet>> getCall(UidsQuery query) {
+            override fun getCall(query: UidsQuery): Call<Payload<DataSet>> {
                 return dataSetService.getDataSets(
-                        DataSetFields.allFields,
-                        DataSetFields.uid.in(query.uids()),
-                        accessDataReadFilter,
-                        Boolean.FALSE);
+                    DataSetFields.allFields,
+                    DataSetFields.uid.`in`(query.uids()),
+                    accessDataReadFilter,
+                    false,
+                )
             }
-        };
+        }
+    }
 
+    override fun processor(): CallProcessor<DataSet> {
+        return TransactionalResourceSyncCallProcessor(
+            data,
+            dataSetHandler,
+            resourceType,
+        )
     }
 
-    @Override
-    protected CallProcessor<DataSet> processor() {
-        return new TransactionalResourceSyncCallProcessor<>(
-                data,
-                dataSetHandler,
-                resourceType
-        );
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 50
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 24fdb6bc70..72912a6d5d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.domain.metadata
 
 import dagger.Reusable
-import io.reactivex.Completable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.collect
@@ -105,7 +104,9 @@ internal class MetadataCall @Inject constructor(
     @Suppress("TooGenericExceptionCaught")
     fun download(): Flow<D2Progress> = channelFlow {
         val progressManager = D2ProgressManager(CALLS_COUNT)
-        changeEncryptionIfRequired().blockingAwait()
+
+        changeEncryptionIfRequiredCoroutines()
+
         coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
             try {
                 systemInfoDownloader.downloadWithProgressManager(progressManager).also { send(it) }
@@ -169,13 +170,17 @@ internal class MetadataCall @Inject constructor(
         emit(progressManager.increaseProgress(ExpressionDimensionItem::class.java, true))
     }
 
-    private fun changeEncryptionIfRequired(): Completable {
-        return generalSettingCall.isDatabaseEncrypted()
-            .doOnSuccess { encrypt: Boolean ->
-                multiUserDatabaseManager.changeEncryptionIfRequired(credentialsSecureStore.get(), encrypt)
-            }
-            .ignoreElement()
-            .onErrorComplete()
+    private suspend fun changeEncryptionIfRequiredCoroutines() {
+        // TODO explore the possibility of "CoroutineExceptionHandler"
+
+        try {
+            val encrypt = generalSettingCall.isDatabaseEncrypted()
+            multiUserDatabaseManager.changeEncryptionIfRequired(
+                credentialsSecureStore.get(),
+                encrypt,
+            )
+        } catch (swallowed: Exception) {
+        }
     }
 
     fun blockingDownload() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index be63896841..e112099670 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -32,30 +32,19 @@ import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
-class EventFilterCall @Inject internal constructor(
+internal class EventFilterCall @Inject internal constructor(
     private val service: EventFilterService,
-    handler: EventFilterHandler,
-    apiDownloader: APIDownloader,
-    versionManager: DHISVersionManager,
+    val handler: EventFilterHandler,
+    val apiDownloader: APIDownloader,
+    val versionManager: DHISVersionManager,
 ) : UidsCall<EventFilter> {
-    private val handler: Handler<EventFilter>
-    private val apiDownloader: APIDownloader
-    private val versionManager: DHISVersionManager
-
-    init {
-        this.handler = handler
-        this.apiDownloader = apiDownloader
-        this.versionManager = versionManager
-    }
 
     override fun download(programUids: Set<String>): Single<List<EventFilter>> {
         return if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
@@ -69,7 +58,7 @@ class EventFilterCall @Inject internal constructor(
                     EventFilterFields.programUid.`in`(partitionUids),
                     accessDataReadFilter,
                     EventFilterFields.allFields,
-                    Boolean.FALSE,
+                    false,
                 )
             }
         } else {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
index f89c4705ac..05a237a51d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
@@ -25,64 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.indicator.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.indicator.Indicator;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
+import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
+import org.hisp.dhis.android.core.indicator.Indicator
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class IndicatorEndpointCallFactory extends UidsCallFactoryImpl<Indicator> {
-
-    private final IndicatorService service;
-    private final IndicatorHandler handler;
-
-    private static final int MAX_UID_LIST_SIZE = 100;
-
-    @Inject
-    IndicatorEndpointCallFactory(GenericCallData data,
-                                 APICallExecutor apiCallExecutor,
-                                 IndicatorService service,
-                                 IndicatorHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
-    }
-
-    @Override
-    protected CallFetcher<Indicator> fetcher(Set<String> uids) {
-
-        return new UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-
-            @Override
-            protected retrofit2.Call<Payload<Indicator>> getCall(UidsQuery query) {
+internal class IndicatorEndpointCallFactory @Inject constructor(
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
+    private val service: IndicatorService,
+    private val handler: IndicatorHandler,
+) : UidsCallFactoryImpl<Indicator>(data, apiCallExecutor) {
+    override fun fetcher(uids: Set<String>): CallFetcher<Indicator> {
+        return object :
+            UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+            override fun getCall(query: UidsQuery): Call<Payload<Indicator>> {
                 return service.getIndicators(
-                        IndicatorFields.allFields,
-                        IndicatorFields.lastUpdated.gt(null),
-                        IndicatorFields.uid.in(query.uids()),
-                        Boolean.FALSE);
+                    IndicatorFields.allFields,
+                    IndicatorFields.lastUpdated.gt(null),
+                    IndicatorFields.uid.`in`(query.uids()),
+                    false,
+                )
             }
-        };
+        }
+    }
+
+    override fun processor(): CallProcessor<Indicator> {
+        return TransactionalNoResourceSyncCallProcessor(
+            data.databaseAdapter(),
+            handler,
+        )
     }
 
-    @Override
-    protected CallProcessor<Indicator> processor() {
-        return new TransactionalNoResourceSyncCallProcessor<>(
-                data.databaseAdapter(),
-                handler);
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 100
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
index 9a0e8fc734..bbe5e11289 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
@@ -25,64 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.indicator.internal
 
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor;
-import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.indicator.IndicatorType;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
+import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
+import org.hisp.dhis.android.core.indicator.IndicatorType
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class IndicatorTypeEndpointCallFactory extends UidsCallFactoryImpl<IndicatorType> {
-
-    private static final int MAX_UID_LIST_SIZE = 140;
-
-    private final IndicatorTypeService service;
-    private final IndicatorTypeHandler handler;
-
-    @Inject
-    IndicatorTypeEndpointCallFactory(GenericCallData data,
-                                     APICallExecutor apiCallExecutor,
-                                     IndicatorTypeService service,
-                                     IndicatorTypeHandler handler) {
-        super(data, apiCallExecutor);
-        this.service = service;
-        this.handler = handler;
-    }
-
-    @Override
-    protected CallFetcher<IndicatorType> fetcher(Set<String> uids) {
-
-        return new UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-
-            @Override
-            protected retrofit2.Call<Payload<IndicatorType>> getCall(UidsQuery query) {
+internal class IndicatorTypeEndpointCallFactory @Inject constructor(
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
+    private val service: IndicatorTypeService,
+    private val handler: IndicatorTypeHandler,
+) : UidsCallFactoryImpl<IndicatorType>(data, apiCallExecutor) {
+    override fun fetcher(uids: Set<String>): CallFetcher<IndicatorType> {
+        return object :
+            UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+            override fun getCall(query: UidsQuery): Call<Payload<IndicatorType>> {
                 return service.getIndicatorTypes(
-                        IndicatorTypeFields.allFields,
-                        IndicatorTypeFields.lastUpdated.gt(null),
-                        IndicatorTypeFields.uid.in(query.uids()),
-                        Boolean.FALSE);
+                    IndicatorTypeFields.allFields,
+                    IndicatorTypeFields.lastUpdated.gt(null),
+                    IndicatorTypeFields.uid.`in`(query.uids()),
+                    false,
+                )
             }
-        };
+        }
+    }
+
+    override fun processor(): CallProcessor<IndicatorType> {
+        return TransactionalNoResourceSyncCallProcessor(
+            data.databaseAdapter(),
+            handler,
+        )
     }
 
-    @Override
-    protected CallProcessor<IndicatorType> processor() {
-        return new TransactionalNoResourceSyncCallProcessor<>(
-                data.databaseAdapter(),
-                handler);
+    companion object {
+        private const val MAX_UID_LIST_SIZE = 140
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index f177d32d03..3c2da17a63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -31,25 +31,16 @@ import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.Program
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
-class ProgramCall @Inject internal constructor(
+internal class ProgramCall @Inject internal constructor(
     private val service: ProgramService,
-    handler: ProgramHandler,
-    apiDownloader: APIDownloader,
+    val handler: ProgramHandler,
+    val apiDownloader: APIDownloader,
 ) : UidsCall<Program> {
-    private val handler: Handler<Program>
-    private val apiDownloader: APIDownloader
-
-    init {
-        this.handler = handler
-        this.apiDownloader = apiDownloader
-    }
 
     override fun download(uids: Set<String>): Single<List<Program>> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
@@ -62,7 +53,7 @@ class ProgramCall @Inject internal constructor(
                 ProgramFields.allFields,
                 ProgramFields.uid.`in`(partitionUids),
                 accessDataReadFilter,
-                Boolean.FALSE,
+                false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index 665d8f53d0..959f26603e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
@@ -53,7 +52,7 @@ internal class ProgramRuleCall @Inject constructor(
             service.getProgramRules(
                 ProgramRuleFields.allFields,
                 programUidsFilterStr,
-                Boolean.FALSE,
+                false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index a0576687c3..100cd2dc90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -36,11 +36,10 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
-class ProgramStageCall @Inject internal constructor(
+internal class ProgramStageCall @Inject internal constructor(
     private val service: ProgramStageService,
     private val handler: ProgramStageHandler,
     private val apiDownloader: APIDownloader,
@@ -59,7 +58,7 @@ class ProgramStageCall @Inject internal constructor(
                     ProgramStageFields.allFields,
                     programUidsFilterStr,
                     accessDataReadFilter,
-                    Boolean.FALSE,
+                    false,
                 )
             },
         ) { stage: ProgramStage -> transform(stage) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index f73ccc9d14..c5f42695f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -34,11 +34,10 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.resource.internal.Resource
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
-class RelationshipTypeCall @Inject internal constructor(
+internal class RelationshipTypeCall @Inject internal constructor(
     private val service: RelationshipTypeService,
     private val handler: RelationshipTypeHandler,
     private val apiDownloader: APIDownloader,
@@ -54,7 +53,7 @@ class RelationshipTypeCall @Inject internal constructor(
                 RelationshipTypeFields.allFields,
                 RelationshipTypeFields.lastUpdated.gt(lastUpdated),
                 accessDataFilter,
-                Boolean.FALSE,
+                false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 79766ae3b6..869258d162 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import io.reactivex.Single
+import kotlinx.coroutines.rx2.await
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.settings.GeneralSettings
 import javax.inject.Inject
@@ -62,13 +63,13 @@ internal class GeneralSettingCall @Inject constructor(
         generalSettingHandler.handleMany(generalSettingsList)
     }
 
-    fun isDatabaseEncrypted(): Single<Boolean> {
+    suspend fun isDatabaseEncrypted(): Boolean {
         // TODO Should we decrypt the database if the settings app is uninstalled?
         return appVersionManager.updateAppVersion()
             .flatMap { appVersionManager.getDataStoreVersion() }
             .flatMap { version ->
                 apiCallExecutor.wrapSingle(settingAppService.generalSettings(version), storeError = false)
             }
-            .map { obj: GeneralSettings -> obj.encryptDB() }
+            .map { obj: GeneralSettings -> obj.encryptDB() }.await()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index f16c82b4e2..f32ead88da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -32,11 +32,10 @@ import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
-class TrackedEntityAttributeCall @Inject internal constructor(
+internal class TrackedEntityAttributeCall @Inject internal constructor(
     private val service: TrackedEntityAttributeService,
     private val handler: TrackedEntityAttributeHandler,
     private val apiDownloader: APIDownloader,
@@ -50,7 +49,7 @@ class TrackedEntityAttributeCall @Inject internal constructor(
             service.getTrackedEntityAttributes(
                 TrackedEntityAttributeFields.allFields,
                 TrackedEntityAttributeFields.uid.`in`(partitionUids),
-                Boolean.FALSE,
+                false,
             )
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index d4a0123e86..efdd2e1b71 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -34,11 +34,10 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
-class TrackedEntityTypeCall @Inject internal constructor(
+internal class TrackedEntityTypeCall @Inject internal constructor(
     private val service: TrackedEntityTypeService,
     private val handler: TrackedEntityTypeHandler,
     private val apiDownloader: APIDownloader,
@@ -54,7 +53,7 @@ class TrackedEntityTypeCall @Inject internal constructor(
                     TrackedEntityTypeFields.allFields,
                     TrackedEntityTypeFields.uid.`in`(optionSetUids),
                     accessDataReadFilter,
-                    Boolean.FALSE,
+                    false,
                 )
             },
         ) { type: TrackedEntityType -> transform(type) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
index 02e56ce4fa..63b937b124 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
@@ -25,52 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user.internal
 
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData;
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.user.Authority;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.user.Authority
+import retrofit2.Call
+import javax.inject.Inject
 
 @Reusable
-final class AuthorityEndpointCallFactory extends ListCallFactoryImpl<Authority> {
-
-    private final Handler<Authority> handler;
-    private final AuthorityService service;
+internal class AuthorityEndpointCallFactory @Inject constructor(
+    data: GenericCallData,
+    apiCallExecutor: APICallExecutor,
+    handler: AuthorityHandler,
+    service: AuthorityService,
+) : ListCallFactoryImpl<Authority>(data, apiCallExecutor) {
+    private val handler: Handler<Authority>
+    private val service: AuthorityService
 
-    @Inject
-    AuthorityEndpointCallFactory(GenericCallData data,
-                                 APICallExecutor apiCallExecutor,
-                                 AuthorityHandler handler,
-                                 AuthorityService service) {
-        super(data, apiCallExecutor);
-        this.handler = handler;
-        this.service = service;
+    init {
+        this.handler = handler
+        this.service = service
     }
 
-    @Override
-    protected CallFetcher<Authority> fetcher() {
-        return new AuthorityCallFetcher(getApiCallExecutor()) {
-            @Override
-            protected retrofit2.Call<List<String>> getCall() {
-                return service.getAuthorities();
+    override fun fetcher(): CallFetcher<Authority> {
+        return object : AuthorityCallFetcher(apiCallExecutor) {
+            override fun getCall(): Call<List<String>> {
+                return service.authorities
             }
-        };
+        }
     }
 
-    @Override
-    protected CallProcessor<Authority> processor() {
-        return new AuthorityCallProcessor(getData().databaseAdapter(), handler);
+    override fun processor(): CallProcessor<Authority> {
+        return AuthorityCallProcessor(data.databaseAdapter(), handler)
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index c0a350683f..344bdb7ad4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -120,7 +120,9 @@ internal class LogInCall @Inject internal constructor(
     private suspend fun loginOnline(user: User, credentials: Credentials): User {
         credentialsSecureStore.set(credentials)
         userIdStore.set(user.uid())
-        databaseManager.loadDatabaseOnline(credentials.serverUrl, credentials.username).blockingAwait()
+
+        databaseManager.loadDatabaseOnline(credentials.serverUrl, credentials.username)
+
         return coroutineAPICallExecutor.wrapTransactionally {
             try {
                 val authenticatedUser = AuthenticatedUser.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
index dc955ef3e4..095487309e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
 import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
 import javax.inject.Inject
@@ -39,24 +38,21 @@ internal class LogInDatabaseManager @Inject internal constructor(
     private val generalSettingCall: GeneralSettingCall,
 ) {
 
-    fun loadDatabaseOnline(serverUrl: String, username: String): Completable {
-        return generalSettingCall.isDatabaseEncrypted()
-            .doOnSuccess { encrypt: Boolean ->
-                multiUserDatabaseManager.loadExistingChangingEncryptionIfRequiredOtherwiseCreateNew(
-                    serverUrl,
-                    username,
-                    encrypt,
-                )
-            }
-            .doOnError {
-                multiUserDatabaseManager.loadExistingKeepingEncryptionOtherwiseCreateNew(
-                    serverUrl,
-                    username,
-                    false,
-                )
-            }
-            .ignoreElement()
-            .onErrorComplete()
+    suspend fun loadDatabaseOnline(serverUrl: String, username: String) {
+        try {
+            val isEncrypted = generalSettingCall.isDatabaseEncrypted()
+            multiUserDatabaseManager.loadExistingChangingEncryptionIfRequiredOtherwiseCreateNew(
+                serverUrl,
+                username,
+                isEncrypted,
+            )
+        } catch (swallowed: Exception) {
+            multiUserDatabaseManager.loadExistingKeepingEncryptionOtherwiseCreateNew(
+                serverUrl,
+                username,
+                false,
+            )
+        }
     }
 
     fun loadExistingKeepingEncryption(serverUrl: String, username: String): Boolean {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 3cdc47516a..ecce6af793 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.domain.metadata
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
-import io.reactivex.Single
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -134,7 +133,10 @@ class MetadataCallShould : BaseCallShould() {
         whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(smsModule.configCase()).thenReturn(configCase)
         whenever(configCase.refreshMetadataIdsCallable()).thenReturn(Completable.complete())
-        whenever(generalSettingCall.isDatabaseEncrypted()).thenReturn(Single.just(false))
+
+        generalSettingCall.stub {
+            onBlocking { isDatabaseEncrypted() }.doReturn(false)
+        }
 
         // Metadata call
         metadataCall = MetadataCall(
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
index a00e211a2f..00ae1f478e 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/LogInCallUnitShould.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -105,7 +104,10 @@ class LogInCallUnitShould : BaseCallShould() {
         whenever(databaseAdapter.beginNewTransaction()).thenReturn(transaction)
         whenever(d2Error.errorCode()).thenReturn(D2ErrorCode.SOCKET_TIMEOUT)
         whenever(d2Error.isOffline).thenReturn(true)
-        whenever(generalSettingCall.isDatabaseEncrypted()).thenReturn(Single.just(false))
+        generalSettingCall.stub {
+            onBlocking { isDatabaseEncrypted() }.doReturn(false)
+        }
+
         whenever(versionManager.getVersion()).thenReturn(DHISVersion.V2_39)
     }
 

From b9d522f2fe57df78c824f43ca9e673df12bb6fe8 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 26 Sep 2023 16:47:44 +0200
Subject: [PATCH 297/478] [ANDROSDK-1683] refactor: - ignore exceptions

---
 .../org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt  | 2 +-
 .../dhis/android/core/user/internal/LogInDatabaseManager.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 72912a6d5d..c6dbbbd5c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -179,7 +179,7 @@ internal class MetadataCall @Inject constructor(
                 credentialsSecureStore.get(),
                 encrypt,
             )
-        } catch (swallowed: Exception) {
+        } catch (ignored: Exception) {
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
index 095487309e..0417d57876 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
@@ -46,7 +46,7 @@ internal class LogInDatabaseManager @Inject internal constructor(
                 username,
                 isEncrypted,
             )
-        } catch (swallowed: Exception) {
+        } catch (ignored: Exception) {
             multiUserDatabaseManager.loadExistingKeepingEncryptionOtherwiseCreateNew(
                 serverUrl,
                 username,

From 5653aba3d9481e76cded2c0cbb338ba9d8b8854e Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 27 Sep 2023 13:35:31 +0200
Subject: [PATCH 298/478] [ANDROSDK-1764] Refactor collapsibleSections by
 disableCollapsibleSections

---
 ...ObjectRepositoryMockIntegrationShould.java |  6 ++---
 core/src/main/assets/migrations/149.sql       |  2 +-
 core/src/main/assets/snapshots/snapshot.sql   |  2 +-
 .../settings/ProgramConfigurationSetting.java |  4 ++--
 .../ProgramConfigurationSettingTableInfo.java |  4 ++--
 .../ProgramConfigurationSettingStoreImpl.kt   |  2 +-
 ... => ProgramConfigurationSettingSamples.kt} | 24 +++++++++----------
 .../settings/appearance_settings_v2.json      |  6 ++---
 .../settings/AppearanceSettingsV2Should.java  |  4 ++--
 .../ProgramConfigurationSettingSamples.kt     |  2 +-
 10 files changed, 27 insertions(+), 29 deletions(-)
 rename core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/{ProgramConfigurationSettingSamples.java => ProgramConfigurationSettingSamples.kt} (80%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
index 636aa8f739..61eba9fecd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
@@ -127,14 +127,14 @@ public void should_return_disable_referrals_settings() {
     @Test
     public void should_return_collapsibleSections_settings() {
         ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting();
-        assertThat(setting.collapsibleSections()).isEqualTo(false);
+        assertThat(setting.disableCollapsibleSections()).isEqualTo(false);
 
         String UID = "IpHINAT79UW";
         setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.collapsibleSections()).isEqualTo(false);
+        assertThat(setting.disableCollapsibleSections()).isEqualTo(false);
 
         UID = "IpHINAT79UQ";
         setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.collapsibleSections()).isEqualTo(true);
+        assertThat(setting.disableCollapsibleSections()).isEqualTo(true);
     }
 }
diff --git a/core/src/main/assets/migrations/149.sql b/core/src/main/assets/migrations/149.sql
index a4cf763523..f4aa3159f5 100644
--- a/core/src/main/assets/migrations/149.sql
+++ b/core/src/main/assets/migrations/149.sql
@@ -1,4 +1,4 @@
 # Add disableReferrals and collapsibleSections in ProgramConfigurationSetting table (ANDROSDK-1723 and ANDROSDK-1724)
 
 ALTER TABLE ProgramConfigurationSetting ADD COLUMN disableReferrals INTEGER;
-ALTER TABLE ProgramConfigurationSetting ADD COLUMN collapsibleSections INTEGER;
+ALTER TABLE ProgramConfigurationSetting ADD COLUMN disableCollapsibleSections INTEGER;
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index 32175e1feb..35eb56267e 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -84,7 +84,7 @@ CREATE TABLE DataSetSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNI
 CREATE TABLE ProgramSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNIQUE, name TEXT, lastUpdated TEXT, teiDownload INTEGER, teiDBTrimming INTEGER, eventsDownload INTEGER, eventsDBTrimming INTEGER, updateDownload TEXT, updateDBTrimming TEXT, settingDownload TEXT, settingDBTrimming TEXT, enrollmentDownload TEXT, enrollmentDBTrimming TEXT, eventDateDownload TEXT, eventDateDBTrimming TEXT, enrollmentDateDownload TEXT, enrollmentDateDBTrimming TEXT, FOREIGN KEY (uid) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE SynchronizationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSync TEXT, metadataSync TEXT, trackerImporterVersion TEXT, trackerExporterVersion TEXT, fileMaxLengthBytes INTEGER);
 CREATE TABLE FilterSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, scope TEXT, filterType TEXT, uid TEXT, sort INTEGER, filter INTEGER);
-CREATE TABLE ProgramConfigurationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, completionSpinner INTEGER, optionalSearch INTEGER, disableReferrals INTEGER, collapsibleSections INTEGER);
+CREATE TABLE ProgramConfigurationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, completionSpinner INTEGER, optionalSearch INTEGER, disableReferrals INTEGER, disableCollapsibleSections INTEGER);
 CREATE TABLE AnalyticsTeiSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, name TEXT NOT NULL, shortName TEXT NOT NULL, program TEXT NOT NULL, programStage TEXT, period TEXT, type TEXT NOT NULL, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE AnalyticsTeiDataElement (_id INTEGER PRIMARY KEY AUTOINCREMENT, teiSetting TEXT NOT NULL, whoComponent TEXT, programStage TEXT, dataElement TEXT NOT NULL, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (teiSetting) REFERENCES AnalyticsTeiSetting (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE AnalyticsTeiIndicator (_id INTEGER PRIMARY KEY AUTOINCREMENT, teiSetting TEXT NOT NULL, whoComponent TEXT, programStage TEXT, indicator TEXT NOT NULL, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (indicator) REFERENCES ProgramIndicator (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (teiSetting) REFERENCES AnalyticsTeiSetting (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
index e4d289dfdd..f117b578b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
@@ -56,7 +56,7 @@ public abstract class ProgramConfigurationSetting implements CoreObject, ObjectW
     public abstract  Boolean disableReferrals();
 
     @Nullable
-    public abstract  Boolean collapsibleSections();
+    public abstract  Boolean disableCollapsibleSections();
 
     public static ProgramConfigurationSetting create(Cursor cursor) {
         return AutoValue_ProgramConfigurationSetting.createFromCursor(cursor);
@@ -82,7 +82,7 @@ public abstract static class Builder {
 
         public abstract Builder disableReferrals(Boolean disableReferrals);
 
-        public abstract Builder collapsibleSections(Boolean collapsibleSections);
+        public abstract Builder disableCollapsibleSections(Boolean disableCollapsibleSections);
 
         public abstract ProgramConfigurationSetting build();
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
index fdc43c7fbe..35cdbec057 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
@@ -55,7 +55,7 @@ public static class Columns extends CoreColumns {
         public static final String COMPLETION_SPINNER = "completionSpinner";
         public static final String OPTIONAL_SEARCH = "optionalSearch";
         public static final String DISABLE_REFERRALS = "disableReferrals";
-        public static final String COLLAPSIBLE_SECTIONS = "collapsibleSections";
+        public static final String DISABLE_COLLAPSIBLE_SECTIONS = "disableCollapsibleSections";
 
         @Override
         public String[] all() {
@@ -64,7 +64,7 @@ public String[] all() {
                     COMPLETION_SPINNER,
                     OPTIONAL_SEARCH,
                     DISABLE_REFERRALS,
-                    COLLAPSIBLE_SECTIONS
+                    DISABLE_COLLAPSIBLE_SECTIONS
             );
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
index 6948bb7488..285b055a16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
@@ -57,7 +57,7 @@ internal class ProgramConfigurationSettingStoreImpl(
                 w.bind(2, o.completionSpinner())
                 w.bind(3, o.optionalSearch())
                 w.bind(4, o.disableReferrals())
-                w.bind(5, o.collapsibleSections())
+                w.bind(5, o.disableCollapsibleSections())
             }
 
         private val WHERE_UPDATE_BINDER =
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
similarity index 80%
rename from core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java
rename to core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
index fa6bf8fcb9..bb2f9b0634 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.java
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
@@ -25,21 +25,19 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.data.settings
 
-package org.hisp.dhis.android.core.data.settings;
+import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting;
-
-public class ProgramConfigurationSettingSamples {
-
-    public static ProgramConfigurationSetting get() {
+object ProgramConfigurationSettingSamples {
+    fun get(): ProgramConfigurationSetting {
         return ProgramConfigurationSetting.builder()
-                .id(1L)
-                .uid("aBcDeFg")
-                .completionSpinner(true)
-                .optionalSearch(true)
-                .disableReferrals(true)
-                .collapsibleSections(true)
-                .build();
+            .id(1L)
+            .uid("aBcDeFg")
+            .completionSpinner(true)
+            .optionalSearch(true)
+            .disableReferrals(true)
+            .disableCollapsibleSections(true)
+            .build()
     }
 }
diff --git a/core/src/sharedTest/resources/settings/appearance_settings_v2.json b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
index 02c60f565a..bcde70d690 100644
--- a/core/src/sharedTest/resources/settings/appearance_settings_v2.json
+++ b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
@@ -131,20 +131,20 @@
     "globalSettings": {
       "completionSpinner": "true",
       "disableReferrals": "true",
-      "collapsibleSections": "false"
+      "disableCollapsibleSections": "false"
     },
     "specificSettings": {
       "IpHINAT79UW": {
         "completionSpinner": "true",
         "optionalSearch": "true",
         "disableReferrals": "true",
-        "collapsibleSections": "false"
+        "disableCollapsibleSections": "false"
       },
       "IpHINAT79UQ": {
         "completionSpinner": "true",
         "optionalSearch": "true",
         "disableReferrals": "false",
-        "collapsibleSections": "true"
+        "disableCollapsibleSections": "true"
       }
     }
   }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
index 90e56d884d..259866e74f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
@@ -83,7 +83,7 @@ public void map_from_json_string() throws IOException, ParseException {
         assertThat(programConfiguration.globalSettings().uid()).isNull();
         assertThat(programConfiguration.globalSettings().completionSpinner()).isEqualTo(true);
         assertThat(programConfiguration.globalSettings().disableReferrals()).isEqualTo(true);
-        assertThat(programConfiguration.globalSettings().collapsibleSections()).isEqualTo(false);
+        assertThat(programConfiguration.globalSettings().disableCollapsibleSections()).isEqualTo(false);
 
         Map<String, ProgramConfigurationSetting> speficicProgramConfiguration = programConfiguration.specificSettings();
         ProgramConfigurationSetting specificProgramConfiguration = speficicProgramConfiguration.get("IpHINAT79UW");
@@ -91,7 +91,7 @@ public void map_from_json_string() throws IOException, ParseException {
         assertThat(specificProgramConfiguration.completionSpinner()).isEqualTo(true);
         assertThat(specificProgramConfiguration.optionalSearch()).isEqualTo(true);
         assertThat(specificProgramConfiguration.disableReferrals()).isEqualTo(true);
-        assertThat(specificProgramConfiguration.collapsibleSections()).isEqualTo(false);
+        assertThat(specificProgramConfiguration.disableCollapsibleSections()).isEqualTo(false);
 
         // Compatibility backwards
         CompletionSpinnerSetting completionSpinnerSetting = appearanceSettings.completionSpinner();
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
index e0da682d71..66fb73b85b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
@@ -36,7 +36,7 @@ object ProgramConfigurationSettingSamples {
             .completionSpinner(true)
             .optionalSearch(true)
             .disableReferrals(true)
-            .collapsibleSections(true)
+            .disableCollapsibleSections(true)
             .build()
     }
 }

From e2d9390eafea3409c5029bde2be299b7f8ea8578 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:10:01 +0200
Subject: [PATCH 299/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...sitory.java => ExpressionDimensionItemCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/{ExpressionDimensionItemCollectionRepository.java => ExpressionDimensionItemCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt

From 65d209380ca4120e850c1e67f2f0df73994d1dde Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:10:01 +0200
Subject: [PATCH 300/478] [ANDROSDK-1717] Refactor
 ExpressionDimensionItemCollectionRepository to Kotlin

---
 ...essionDimensionItemCollectionRepository.kt | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
index bca392df2c..4a552c19ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
@@ -25,38 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.expressiondimensionitem
 
-package org.hisp.dhis.android.core.expressiondimensionitem;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo.Columns;
-import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
+import javax.inject.Inject
 
 @Reusable
-public final class ExpressionDimensionItemCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ExpressionDimensionItem,
-        ExpressionDimensionItemCollectionRepository> {
-
-    @Inject
-    ExpressionDimensionItemCollectionRepository(
-            final ExpressionDimensionItemStore store,
-            final Map<String, ChildrenAppender<ExpressionDimensionItem>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ExpressionDimensionItemCollectionRepository(store, childrenAppenders, s)));
+class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
+    store: ExpressionDimensionItemStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ExpressionDimensionItem>>,
+    scope: RepositoryScope
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ExpressionDimensionItem, ExpressionDimensionItemCollectionRepository>(
+    store, childrenAppenders, scope, FilterConnectorFactory(
+        scope
+    ) { s: RepositoryScope ->
+        ExpressionDimensionItemCollectionRepository(
+            store,
+            childrenAppenders,
+            s
+        )
     }
-
-    public StringFilterConnector<ExpressionDimensionItemCollectionRepository> byExpression() {
-        return cf.string(Columns.EXPRESSION);
+) {
+    fun byExpression(): StringFilterConnector<ExpressionDimensionItemCollectionRepository> {
+        return cf.string(ExpressionDimensionItemTableInfo.Columns.EXPRESSION)
     }
 }
\ No newline at end of file

From 3e087e370cb9454c9f04a857f10c854cc87c9e80 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:16:11 +0200
Subject: [PATCH 301/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...CollectionRepository.java => IndicatorCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/{IndicatorCollectionRepository.java => IndicatorCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt

From 5ae98ef910a93d56ba95773f8547aaa6d7e7d3e0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:16:12 +0200
Subject: [PATCH 302/478] [ANDROSDK-1717] Refactor
 IndicatorCollectionRepository to Kotlin

---
 .../IndicatorCollectionRepository.kt          | 126 +++++++++---------
 1 file changed, 62 insertions(+), 64 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
index 3d41e68807..e204a13de9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
@@ -25,93 +25,91 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.Columns;
-import org.hisp.dhis.android.core.indicator.internal.IndicatorFields;
-import org.hisp.dhis.android.core.indicator.internal.IndicatorStore;
-
-import java.util.Collections;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.indicator
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.NameableWithStyleColumns
+import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
+import org.hisp.dhis.android.core.indicator.internal.IndicatorFields
+import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
+import javax.inject.Inject
 
 @Reusable
-public final class IndicatorCollectionRepository
-        extends ReadOnlyNameableCollectionRepositoryImpl<Indicator, IndicatorCollectionRepository> {
-
-    @Inject
-    IndicatorCollectionRepository(final IndicatorStore store,
-                                  final Map<String, ChildrenAppender<Indicator>> childrenAppenders,
-                                  final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new IndicatorCollectionRepository(store, childrenAppenders, s)));
+class IndicatorCollectionRepository @Inject internal constructor(
+    store: IndicatorStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Indicator>>,
+    scope: RepositoryScope
+) : ReadOnlyNameableCollectionRepositoryImpl<Indicator, IndicatorCollectionRepository>(
+    store, childrenAppenders, scope, FilterConnectorFactory(
+        scope
+    ) { s: RepositoryScope ->
+        IndicatorCollectionRepository(
+            store,
+            childrenAppenders,
+            s
+        )
     }
-
-    public BooleanFilterConnector<IndicatorCollectionRepository> byAnnualized() {
-        return cf.bool(Columns.ANNUALIZED);
+) {
+    fun byAnnualized(): BooleanFilterConnector<IndicatorCollectionRepository> {
+        return cf.bool(IndicatorTableInfo.Columns.ANNUALIZED)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byIndicatorTypeUid() {
-        return cf.string(Columns.INDICATOR_TYPE);
+    fun byIndicatorTypeUid(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(IndicatorTableInfo.Columns.INDICATOR_TYPE)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byNumerator() {
-        return cf.string(Columns.NUMERATOR);
+    fun byNumerator(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(IndicatorTableInfo.Columns.NUMERATOR)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byNumeratorDescription() {
-        return cf.string(Columns.NUMERATOR_DESCRIPTION);
+    fun byNumeratorDescription(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(IndicatorTableInfo.Columns.NUMERATOR_DESCRIPTION)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byDenominator() {
-        return cf.string(Columns.DENOMINATOR);
+    fun byDenominator(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(IndicatorTableInfo.Columns.DENOMINATOR)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byDenominatorDescription() {
-        return cf.string(Columns.DENOMINATOR_DESCRIPTION);
+    fun byDenominatorDescription(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(IndicatorTableInfo.Columns.DENOMINATOR_DESCRIPTION)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byUrl() {
-        return cf.string(Columns.URL);
+    fun byUrl(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(IndicatorTableInfo.Columns.URL)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(NameableWithStyleColumns.COLOR)
     }
 
-    public StringFilterConnector<IndicatorCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<IndicatorCollectionRepository> {
+        return cf.string(NameableWithStyleColumns.ICON)
     }
 
-    public IndicatorCollectionRepository withLegendSets() {
-        return cf.withChild(IndicatorFields.LEGEND_SETS);
+    fun withLegendSets(): IndicatorCollectionRepository {
+        return cf.withChild(IndicatorFields.LEGEND_SETS)
     }
 
-    public IndicatorCollectionRepository byDataSetUid(String dataSetUid) {
-        return cf.subQuery(Columns.UID).inLinkTable(
-                DataSetIndicatorLinkTableInfo.TABLE_INFO.name(),
-                DataSetIndicatorLinkTableInfo.Columns.INDICATOR,
-                DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
-                Collections.singletonList(dataSetUid)
-        );
+    fun byDataSetUid(dataSetUid: String): IndicatorCollectionRepository {
+        return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
+            DataSetIndicatorLinkTableInfo.TABLE_INFO.name(),
+            DataSetIndicatorLinkTableInfo.Columns.INDICATOR,
+            DataSetIndicatorLinkTableInfo.Columns.DATA_SET, listOf(dataSetUid)
+        )
     }
 
-    public IndicatorCollectionRepository bySectionUid(String dataSetUid) {
-        return cf.subQuery(Columns.UID).inLinkTable(
-                SectionIndicatorLinkTableInfo.TABLE_INFO.name(),
-                SectionIndicatorLinkTableInfo.Columns.INDICATOR,
-                SectionIndicatorLinkTableInfo.Columns.SECTION,
-                Collections.singletonList(dataSetUid)
-        );
+    fun bySectionUid(dataSetUid: String): IndicatorCollectionRepository {
+        return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
+            SectionIndicatorLinkTableInfo.TABLE_INFO.name(),
+            SectionIndicatorLinkTableInfo.Columns.INDICATOR,
+            SectionIndicatorLinkTableInfo.Columns.SECTION, listOf(dataSetUid)
+        )
     }
-}
+}
\ No newline at end of file

From deaf8285ba65f1b6bc49ce1b5f507d43a6df5e18 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:17:48 +0200
Subject: [PATCH 303/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...endCollectionRepository.java => LegendCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/{LegendCollectionRepository.java => LegendCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt

From 3d1c063bef99a50b61518b3afa5ccc5302d37740 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:17:49 +0200
Subject: [PATCH 304/478] [ANDROSDK-1717] Refactor LegendCollectionRepository
 to Kotlin

---
 .../legendset/LegendCollectionRepository.kt   | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
index 5799709227..0b78409c22 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
@@ -25,48 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.legendset;
+package org.hisp.dhis.android.core.legendset
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.legendset.LegendTableInfo.Columns;
-import org.hisp.dhis.android.core.legendset.internal.LegendStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.legendset.internal.LegendStore
+import javax.inject.Inject
 
 @Reusable
-public final class LegendCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<Legend, LegendCollectionRepository> {
-
-    @Inject
-    LegendCollectionRepository(final LegendStore store,
-                               final Map<String, ChildrenAppender<Legend>> childrenAppenders,
-                               final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new LegendCollectionRepository(store, childrenAppenders, s)));
+class LegendCollectionRepository @Inject internal constructor(
+    store: LegendStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Legend>>,
+    scope: RepositoryScope
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Legend, LegendCollectionRepository>(
+    store, childrenAppenders, scope, FilterConnectorFactory(
+        scope
+    ) { s: RepositoryScope ->
+        LegendCollectionRepository(
+            store,
+            childrenAppenders,
+            s
+        )
     }
-
-    public DoubleFilterConnector<LegendCollectionRepository> byStartValue() {
-        return cf.doubleC(Columns.START_VALUE);
+) {
+    fun byStartValue(): DoubleFilterConnector<LegendCollectionRepository> {
+        return cf.doubleC(LegendTableInfo.Columns.START_VALUE)
     }
 
-    public DoubleFilterConnector<LegendCollectionRepository> byEndValue() {
-        return cf.doubleC(Columns.END_VALUE);
+    fun byEndValue(): DoubleFilterConnector<LegendCollectionRepository> {
+        return cf.doubleC(LegendTableInfo.Columns.END_VALUE)
     }
 
-    public StringFilterConnector<LegendCollectionRepository> byLegendSet() {
-        return cf.string(Columns.LEGEND_SET);
+    fun byLegendSet(): StringFilterConnector<LegendCollectionRepository> {
+        return cf.string(LegendTableInfo.Columns.LEGEND_SET)
     }
 
-    public StringFilterConnector<LegendCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<LegendCollectionRepository> {
+        return cf.string(LegendTableInfo.Columns.COLOR)
     }
-}
+}
\ No newline at end of file

From 94d208564c87a7d2ebd9469dfcba15e3bdb8ec46 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:21:11 +0200
Subject: [PATCH 305/478] [ANDROSDK-1717] KtlintFormat

---
 ...essionDimensionItemCollectionRepository.kt | 15 +++++++------
 .../IndicatorCollectionRepository.kt          | 21 ++++++++++++-------
 .../legendset/LegendCollectionRepository.kt   | 15 +++++++------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
index 4a552c19ca..ac498f07da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
@@ -40,19 +40,22 @@ import javax.inject.Inject
 class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
     store: ExpressionDimensionItemStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<ExpressionDimensionItem>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ExpressionDimensionItem, ExpressionDimensionItemCollectionRepository>(
-    store, childrenAppenders, scope, FilterConnectorFactory(
-        scope
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
     ) { s: RepositoryScope ->
         ExpressionDimensionItemCollectionRepository(
             store,
             childrenAppenders,
-            s
+            s,
         )
-    }
+    },
 ) {
     fun byExpression(): StringFilterConnector<ExpressionDimensionItemCollectionRepository> {
         return cf.string(ExpressionDimensionItemTableInfo.Columns.EXPRESSION)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
index e204a13de9..8bc22c0a1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
@@ -45,17 +45,20 @@ import javax.inject.Inject
 class IndicatorCollectionRepository @Inject internal constructor(
     store: IndicatorStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<Indicator>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<Indicator, IndicatorCollectionRepository>(
-    store, childrenAppenders, scope, FilterConnectorFactory(
-        scope
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
     ) { s: RepositoryScope ->
         IndicatorCollectionRepository(
             store,
             childrenAppenders,
-            s
+            s,
         )
-    }
+    },
 ) {
     fun byAnnualized(): BooleanFilterConnector<IndicatorCollectionRepository> {
         return cf.bool(IndicatorTableInfo.Columns.ANNUALIZED)
@@ -101,7 +104,8 @@ class IndicatorCollectionRepository @Inject internal constructor(
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
             DataSetIndicatorLinkTableInfo.TABLE_INFO.name(),
             DataSetIndicatorLinkTableInfo.Columns.INDICATOR,
-            DataSetIndicatorLinkTableInfo.Columns.DATA_SET, listOf(dataSetUid)
+            DataSetIndicatorLinkTableInfo.Columns.DATA_SET,
+            listOf(dataSetUid),
         )
     }
 
@@ -109,7 +113,8 @@ class IndicatorCollectionRepository @Inject internal constructor(
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
             SectionIndicatorLinkTableInfo.TABLE_INFO.name(),
             SectionIndicatorLinkTableInfo.Columns.INDICATOR,
-            SectionIndicatorLinkTableInfo.Columns.SECTION, listOf(dataSetUid)
+            SectionIndicatorLinkTableInfo.Columns.SECTION,
+            listOf(dataSetUid),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
index 0b78409c22..10d59ee61d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
@@ -41,17 +41,20 @@ import javax.inject.Inject
 class LegendCollectionRepository @Inject internal constructor(
     store: LegendStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<Legend>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Legend, LegendCollectionRepository>(
-    store, childrenAppenders, scope, FilterConnectorFactory(
-        scope
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
     ) { s: RepositoryScope ->
         LegendCollectionRepository(
             store,
             childrenAppenders,
-            s
+            s,
         )
-    }
+    },
 ) {
     fun byStartValue(): DoubleFilterConnector<LegendCollectionRepository> {
         return cf.doubleC(LegendTableInfo.Columns.START_VALUE)
@@ -68,4 +71,4 @@ class LegendCollectionRepository @Inject internal constructor(
     fun byColor(): StringFilterConnector<LegendCollectionRepository> {
         return cf.string(LegendTableInfo.Columns.COLOR)
     }
-}
\ No newline at end of file
+}

From dac76725fee003eeeff9ec8982faffd1a1328c73 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:23:18 +0200
Subject: [PATCH 306/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...CollectionRepository.java => LegendSetCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/{LegendSetCollectionRepository.java => LegendSetCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt

From e87130d838bbbca45d7fb60b79957b6fd3dbf703 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:23:18 +0200
Subject: [PATCH 307/478] [ANDROSDK-1717] Refactor
 LegendSetCollectionRepository to Kotlin

---
 .../LegendSetCollectionRepository.kt          | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
index f259005610..423409a2f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
@@ -25,40 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.legendset;
+package org.hisp.dhis.android.core.legendset
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.legendset.LegendSetTableInfo.Columns;
-import org.hisp.dhis.android.core.legendset.internal.LegendSetFields;
-import org.hisp.dhis.android.core.legendset.internal.LegendSetStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.legendset.internal.LegendSetFields
+import org.hisp.dhis.android.core.legendset.internal.LegendSetStore
+import javax.inject.Inject
 
 @Reusable
-public final class LegendSetCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<LegendSet, LegendSetCollectionRepository> {
-
-    @Inject
-    LegendSetCollectionRepository(final LegendSetStore store,
-                                  final Map<String, ChildrenAppender<LegendSet>> childrenAppenders,
-                                  final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new LegendSetCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<LegendSetCollectionRepository> bySymbolizer() {
-        return cf.string(Columns.SYMBOLIZER);
+class LegendSetCollectionRepository @Inject internal constructor(
+    store: LegendSetStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<LegendSet>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<LegendSet, LegendSetCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        LegendSetCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun bySymbolizer(): StringFilterConnector<LegendSetCollectionRepository> {
+        return cf.string(LegendSetTableInfo.Columns.SYMBOLIZER)
     }
 
-    public LegendSetCollectionRepository withLegends() {
-        return cf.withChild(LegendSetFields.LEGENDS);
+    fun withLegends(): LegendSetCollectionRepository {
+        return cf.withChild(LegendSetFields.LEGENDS)
     }
 }

From 023396ca1ff919f8ebbfb133daf3270743a5208c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:25:12 +0200
Subject: [PATCH 308/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ctionRepository.java => LocalDataStoreCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/datastore/{LocalDataStoreCollectionRepository.java => LocalDataStoreCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt

From 31ad110230ca487574255f46dd1a76c4102575c6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:25:12 +0200
Subject: [PATCH 309/478] [ANDROSDK-1717] Refactor
 LocalDataStoreCollectionRepository to Kotlin

---
 .../LocalDataStoreCollectionRepository.kt     | 71 +++++++++----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
index cb65d3207b..6da15d2ce9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
@@ -25,48 +25,47 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.datastore
 
-package org.hisp.dhis.android.core.datastore;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore
+import javax.inject.Inject
 
 @Reusable
-public final class LocalDataStoreCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<KeyValuePair, LocalDataStoreCollectionRepository> {
-
-    private final ObjectWithoutUidStore<KeyValuePair> store;
-
-    @Inject
-    LocalDataStoreCollectionRepository(final LocalDataStoreStore store,
-                                       final Map<String, ChildrenAppender<KeyValuePair>> childrenAppenders,
-                                       final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new LocalDataStoreCollectionRepository(store, childrenAppenders, s)));
-        this.store = store;
-    }
+class LocalDataStoreCollectionRepository @Inject internal constructor(
+    private val store: LocalDataStoreStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<KeyValuePair>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<KeyValuePair, LocalDataStoreCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        LocalDataStoreCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
 
-    public LocalDataStoreObjectRepository value(String key) {
-        RepositoryScope updatedScope = byKey().eq(key).scope;
-        return new LocalDataStoreObjectRepository(store, childrenAppenders, updatedScope, key);
+    fun value(key: String): LocalDataStoreObjectRepository {
+        val updatedScope = byKey().eq(key).scope
+        return LocalDataStoreObjectRepository(store, childrenAppenders, updatedScope, key)
     }
 
-    public StringFilterConnector<LocalDataStoreCollectionRepository> byKey() {
-        return cf.string(LocalDataStoreTableInfo.Columns.KEY);
+    fun byKey(): StringFilterConnector<LocalDataStoreCollectionRepository> {
+        return cf.string(LocalDataStoreTableInfo.Columns.KEY)
     }
 
-    public StringFilterConnector<LocalDataStoreCollectionRepository> byValue() {
-        return cf.string(LocalDataStoreTableInfo.Columns.VALUE);
+    fun byValue(): StringFilterConnector<LocalDataStoreCollectionRepository> {
+        return cf.string(LocalDataStoreTableInfo.Columns.VALUE)
     }
-}
\ No newline at end of file
+}

From 78018d431cde996d79664bb7ad29be0f9825bd63 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:30:02 +0200
Subject: [PATCH 310/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...{NoteCollectionRepository.java => NoteCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/note/{NoteCollectionRepository.java => NoteCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt

From 834536e9c8696e109f8767c5e3e744c9a1f3f78e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:30:03 +0200
Subject: [PATCH 311/478] [ANDROSDK-1717] Refactor NoteCollectionRepository to
 Kotlin

---
 .../core/note/NoteCollectionRepository.kt     | 131 +++++++++---------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
index 6679714600..8f70175095 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
@@ -25,90 +25,89 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.note;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
-import org.hisp.dhis.android.core.note.NoteTableInfo.Columns;
-import org.hisp.dhis.android.core.note.internal.NoteProjectionTransformer;
-import org.hisp.dhis.android.core.note.internal.NoteStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.note
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withUidFilterItem
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import org.hisp.dhis.android.core.note.Note.NoteType
+import org.hisp.dhis.android.core.note.internal.NoteProjectionTransformer
+import org.hisp.dhis.android.core.note.internal.NoteStore
+import javax.inject.Inject
 
 @Reusable
-public final class NoteCollectionRepository
-        extends ReadWriteWithUidCollectionRepositoryImpl<Note, NoteCreateProjection, NoteCollectionRepository> {
-
-    private final DataStatePropagator dataStatePropagator;
-
-    @Inject
-    NoteCollectionRepository(final NoteStore store,
-                             final Map<String, ChildrenAppender<Note>> childrenAppenders,
-                             final RepositoryScope scope,
-                             final NoteProjectionTransformer transformer,
-                             final DataStatePropagator dataStatePropagator) {
-        super(store, childrenAppenders, scope, transformer, new FilterConnectorFactory<>(scope,
-                s -> new NoteCollectionRepository(store, childrenAppenders, s, transformer, dataStatePropagator)));
-        this.dataStatePropagator = dataStatePropagator;
+class NoteCollectionRepository @Inject internal constructor(
+    store: NoteStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Note>>,
+    scope: RepositoryScope,
+    transformer: NoteProjectionTransformer,
+    private val dataStatePropagator: DataStatePropagator,
+) : ReadWriteWithUidCollectionRepositoryImpl<Note, NoteCreateProjection, NoteCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    transformer,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        NoteCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+            transformer,
+            dataStatePropagator,
+        )
+    },
+) {
+    fun byUid(): StringFilterConnector<NoteCollectionRepository> {
+        return cf.string(IdentifiableColumns.UID)
     }
 
-    public StringFilterConnector<NoteCollectionRepository> byUid() {
-        return cf.string(IdentifiableColumns.UID);
-    }
-
-
-    public EnumFilterConnector<NoteCollectionRepository, Note.NoteType> byNoteType() {
-        return cf.enumC(Columns.NOTE_TYPE);
+    fun byNoteType(): EnumFilterConnector<NoteCollectionRepository, NoteType> {
+        return cf.enumC(NoteTableInfo.Columns.NOTE_TYPE)
     }
 
-    public StringFilterConnector<NoteCollectionRepository> byEventUid() {
-        return cf.string(Columns.EVENT);
+    fun byEventUid(): StringFilterConnector<NoteCollectionRepository> {
+        return cf.string(NoteTableInfo.Columns.EVENT)
     }
 
-    public StringFilterConnector<NoteCollectionRepository> byEnrollmentUid() {
-        return cf.string(Columns.ENROLLMENT);
+    fun byEnrollmentUid(): StringFilterConnector<NoteCollectionRepository> {
+        return cf.string(NoteTableInfo.Columns.ENROLLMENT)
     }
 
-    public StringFilterConnector<NoteCollectionRepository> byValue() {
-        return cf.string(Columns.VALUE);
+    fun byValue(): StringFilterConnector<NoteCollectionRepository> {
+        return cf.string(NoteTableInfo.Columns.VALUE)
     }
 
-    public StringFilterConnector<NoteCollectionRepository> byStoredBy() {
-        return cf.string(Columns.STORED_BY);
+    fun byStoredBy(): StringFilterConnector<NoteCollectionRepository> {
+        return cf.string(NoteTableInfo.Columns.STORED_BY)
     }
 
-    public StringFilterConnector<NoteCollectionRepository> byStoredDate() {
-        return cf.string(Columns.STORED_DATE);
+    fun byStoredDate(): StringFilterConnector<NoteCollectionRepository> {
+        return cf.string(NoteTableInfo.Columns.STORED_DATE)
     }
 
-    public EnumFilterConnector<NoteCollectionRepository, State> bySyncState() {
-        return cf.enumC(Columns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<NoteCollectionRepository, State> {
+        return cf.enumC(NoteTableInfo.Columns.SYNC_STATE)
     }
 
-    @Override
-    public ReadOnlyObjectRepository<Note> uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new ReadOnlyOneObjectRepositoryFinalImpl<>(store, childrenAppenders, updatedScope);
+    override fun uid(uid: String?): ReadOnlyObjectRepository<Note> {
+        val updatedScope: RepositoryScope = withUidFilterItem(scope, uid)
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, updatedScope)
     }
 
-    @Override
-    protected void propagateState(Note note, HandleAction action) {
-        dataStatePropagator.propagateNoteCreation(note);
+    override fun propagateState(m: Note, action: HandleAction?) {
+        dataStatePropagator.propagateNoteCreation(m)
     }
-}
\ No newline at end of file
+}

From 810adcd4e177940cd2e93098d25712f18861e342 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:32:16 +0200
Subject: [PATCH 312/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ionCollectionRepository.java => OptionCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/option/{OptionCollectionRepository.java => OptionCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt

From 4062ae3c1b8649201b299e23ec3549666707a3d6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:32:17 +0200
Subject: [PATCH 313/478] [ANDROSDK-1717] Refactor OptionCollectionRepository
 to Kotlin

---
 .../core/option/OptionCollectionRepository.kt | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
index ea6344b958..c7342de9e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
@@ -25,52 +25,55 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.option;
+package org.hisp.dhis.android.core.option
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.option.OptionTableInfo.Columns;
-import org.hisp.dhis.android.core.option.internal.OptionStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.option.internal.OptionStore
+import javax.inject.Inject
 
 @Reusable
-public final class OptionCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<Option, OptionCollectionRepository> {
-
-    @Inject
-    OptionCollectionRepository(final OptionStore store,
-                               final Map<String, ChildrenAppender<Option>> childrenAppenders,
-                               final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new OptionCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public IntegerFilterConnector<OptionCollectionRepository> bySortOrder() {
-        return cf.integer(Columns.SORT_ORDER);
+class OptionCollectionRepository @Inject internal constructor(
+    store: OptionStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Option>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Option, OptionCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        OptionCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun bySortOrder(): IntegerFilterConnector<OptionCollectionRepository> {
+        return cf.integer(OptionTableInfo.Columns.SORT_ORDER)
     }
 
-    public StringFilterConnector<OptionCollectionRepository> byOptionSetUid() {
-        return cf.string(Columns.OPTION_SET);
+    fun byOptionSetUid(): StringFilterConnector<OptionCollectionRepository> {
+        return cf.string(OptionTableInfo.Columns.OPTION_SET)
     }
 
-    public StringFilterConnector<OptionCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<OptionCollectionRepository> {
+        return cf.string(OptionTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<OptionCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<OptionCollectionRepository> {
+        return cf.string(OptionTableInfo.Columns.ICON)
     }
 
-    public OptionCollectionRepository orderBySortOrder(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.SORT_ORDER, direction);
+    fun orderBySortOrder(direction: OrderByDirection?): OptionCollectionRepository {
+        return cf.withOrderBy(OptionTableInfo.Columns.SORT_ORDER, direction)
     }
-}
\ No newline at end of file
+}

From 56fb1807ffa487238d8124fa53388c934521c96d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:33:49 +0200
Subject: [PATCH 314/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...llectionRepository.java => OptionGroupCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/option/{OptionGroupCollectionRepository.java => OptionGroupCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt

From 420ac92e7125d32c13f4b5b0feaa6bc8ff2fee1b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:33:49 +0200
Subject: [PATCH 315/478] [ANDROSDK-1717] Refactor
 OptionGroupCollectionRepository to Kotlin

---
 .../option/OptionGroupCollectionRepository.kt | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
index 12d1ec1340..4b642d2eca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
@@ -25,40 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.option;
+package org.hisp.dhis.android.core.option
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.option.OptionGroupTableInfo.Columns;
-import org.hisp.dhis.android.core.option.internal.OptionGroupFields;
-import org.hisp.dhis.android.core.option.internal.OptionGroupStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.option.internal.OptionGroupFields
+import org.hisp.dhis.android.core.option.internal.OptionGroupStore
+import javax.inject.Inject
 
 @Reusable
-public final class OptionGroupCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<OptionGroup, OptionGroupCollectionRepository> {
-
-    @Inject
-    OptionGroupCollectionRepository(final OptionGroupStore store,
-                                    final Map<String, ChildrenAppender<OptionGroup>> childrenAppenders,
-                                    final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new OptionGroupCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<OptionGroupCollectionRepository> byOptionSetUid() {
-        return cf.string(Columns.OPTION_SET);
+class OptionGroupCollectionRepository @Inject internal constructor(
+    store: OptionGroupStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<OptionGroup>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<OptionGroup, OptionGroupCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        OptionGroupCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byOptionSetUid(): StringFilterConnector<OptionGroupCollectionRepository> {
+        return cf.string(OptionGroupTableInfo.Columns.OPTION_SET)
     }
 
-    public OptionGroupCollectionRepository withOptions() {
-        return cf.withChild(OptionGroupFields.OPTIONS);
+    fun withOptions(): OptionGroupCollectionRepository {
+        return cf.withChild(OptionGroupFields.OPTIONS)
     }
 }

From 5e2e3453eed013bf6caa061016ede1ebe6d32163 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:35:42 +0200
Subject: [PATCH 316/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...CollectionRepository.java => OptionSetCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/option/{OptionSetCollectionRepository.java => OptionSetCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt

From a0ba8f0fac3a04e2eeb71ce319f0a8b9d373bc03 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:35:43 +0200
Subject: [PATCH 317/478] [ANDROSDK-1717] Refactor
 OptionSetCollectionRepository to Kotlin

---
 .../option/OptionSetCollectionRepository.kt   | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
index 83619ed80f..a107bb1dd1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
@@ -25,41 +25,43 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.option;
+package org.hisp.dhis.android.core.option
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.option.OptionSetTableInfo.Columns;
-import org.hisp.dhis.android.core.option.internal.OptionSetStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.option.internal.OptionSetStore
+import javax.inject.Inject
 
 @Reusable
-public final class OptionSetCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<OptionSet, OptionSetCollectionRepository> {
-
-    @Inject
-    OptionSetCollectionRepository(final OptionSetStore store,
-                                  final Map<String, ChildrenAppender<OptionSet>> childrenAppenders,
-                                  final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new OptionSetCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public IntegerFilterConnector<OptionSetCollectionRepository> byVersion() {
-        return cf.integer(Columns.VERSION);
+class OptionSetCollectionRepository @Inject internal constructor(
+    store: OptionSetStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<OptionSet>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<OptionSet, OptionSetCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        OptionSetCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byVersion(): IntegerFilterConnector<OptionSetCollectionRepository> {
+        return cf.integer(OptionSetTableInfo.Columns.VERSION)
     }
 
-    public EnumFilterConnector<OptionSetCollectionRepository, ValueType> byValueType() {
-        return cf.enumC(Columns.VALUE_TYPE);
+    fun byValueType(): EnumFilterConnector<OptionSetCollectionRepository, ValueType> {
+        return cf.enumC(OptionSetTableInfo.Columns.VALUE_TYPE)
     }
-}
\ No newline at end of file
+}

From 94c6335bc90779215715f86e11899556fa3843f6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:47:26 +0200
Subject: [PATCH 318/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ionRepository.java => OrganisationUnitCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/{OrganisationUnitCollectionRepository.java => OrganisationUnitCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt

From f459cc9c3ecc6d37b96f666684dbeeae930a89a5 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:47:27 +0200
Subject: [PATCH 319/478] [ANDROSDK-1717] Refactor
 OrganisationUnitCollectionRepository to Kotlin

---
 .../OrganisationUnitCollectionRepository.kt   | 159 +++++++++---------
 1 file changed, 81 insertions(+), 78 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
index 1a9c90dfd3..96dd5f1719 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
@@ -25,114 +25,117 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.organisationunit;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo.Columns;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitFields;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore;
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.organisationunit
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitFields
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
+import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import javax.inject.Inject
 
 @Reusable
-public class OrganisationUnitCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnit, OrganisationUnitCollectionRepository> {
-
-    @Inject
-    OrganisationUnitCollectionRepository(final OrganisationUnitStore store,
-                                         final Map<String, ChildrenAppender<OrganisationUnit>> childrenAppenders,
-                                         final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new OrganisationUnitCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<OrganisationUnitCollectionRepository> byParentUid() {
-        return cf.string(Columns.PARENT);
+class OrganisationUnitCollectionRepository @Inject internal constructor(
+    store: OrganisationUnitStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnit>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnit, OrganisationUnitCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        OrganisationUnitCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byParentUid(): StringFilterConnector<OrganisationUnitCollectionRepository> {
+        return cf.string(OrganisationUnitTableInfo.Columns.PARENT)
     }
 
-    public StringFilterConnector<OrganisationUnitCollectionRepository> byPath() {
-        return cf.string(Columns.PATH);
+    fun byPath(): StringFilterConnector<OrganisationUnitCollectionRepository> {
+        return cf.string(OrganisationUnitTableInfo.Columns.PATH)
     }
 
-    public DateFilterConnector<OrganisationUnitCollectionRepository> byOpeningDate() {
-        return cf.date(Columns.OPENING_DATE);
+    fun byOpeningDate(): DateFilterConnector<OrganisationUnitCollectionRepository> {
+        return cf.date(OrganisationUnitTableInfo.Columns.OPENING_DATE)
     }
 
-    public DateFilterConnector<OrganisationUnitCollectionRepository> byClosedDate() {
-        return cf.date(Columns.CLOSED_DATE);
+    fun byClosedDate(): DateFilterConnector<OrganisationUnitCollectionRepository> {
+        return cf.date(OrganisationUnitTableInfo.Columns.CLOSED_DATE)
     }
 
-    public IntegerFilterConnector<OrganisationUnitCollectionRepository> byLevel() {
-        return cf.integer(Columns.LEVEL);
+    fun byLevel(): IntegerFilterConnector<OrganisationUnitCollectionRepository> {
+        return cf.integer(OrganisationUnitTableInfo.Columns.LEVEL)
     }
 
-
-    public EnumFilterConnector<OrganisationUnitCollectionRepository, FeatureType> byGeometryType() {
-        return cf.enumC(Columns.GEOMETRY_TYPE);
+    fun byGeometryType(): EnumFilterConnector<OrganisationUnitCollectionRepository, FeatureType> {
+        return cf.enumC(OrganisationUnitTableInfo.Columns.GEOMETRY_TYPE)
     }
 
-    public StringFilterConnector<OrganisationUnitCollectionRepository> byGeometryCoordinates() {
-        return cf.string(Columns.GEOMETRY_COORDINATES);
+    fun byGeometryCoordinates(): StringFilterConnector<OrganisationUnitCollectionRepository> {
+        return cf.string(OrganisationUnitTableInfo.Columns.GEOMETRY_COORDINATES)
     }
 
-    public OrganisationUnitCollectionRepository byOrganisationUnitScope(OrganisationUnit.Scope scope) {
+    fun byOrganisationUnitScope(scope: OrganisationUnit.Scope): OrganisationUnitCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                Collections.singletonList(scope.name()));
+            UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
+            listOf(scope.name),
+        )
     }
 
-    public OrganisationUnitCollectionRepository byRootOrganisationUnit(Boolean isRoot) {
+    fun byRootOrganisationUnit(isRoot: Boolean): OrganisationUnitCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                UserOrganisationUnitLinkTableInfo.Columns.ROOT,
-                Collections.singletonList(isRoot ? "1" : "0"));
+            UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            UserOrganisationUnitLinkTableInfo.Columns.ROOT,
+            listOf(if (isRoot) "1" else "0"),
+        )
     }
 
-    public OrganisationUnitCollectionRepository byProgramUids(List<String> programUids) {
+    fun byProgramUids(programUids: List<String>): OrganisationUnitCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
-                OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
-                programUids);
+            OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
+            OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
+            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
+            programUids,
+        )
     }
 
-    public OrganisationUnitCollectionRepository byDataSetUids(List<String> dataSetUids) {
+    fun byDataSetUids(dataSetUids: List<String>): OrganisationUnitCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
-                dataSetUids);
+            DataSetOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            DataSetOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET,
+            dataSetUids,
+        )
     }
 
-    public OrganisationUnitCollectionRepository withProgramUids() {
-        return cf.withChild(OrganisationUnitFields.PROGRAMS);
+    fun withProgramUids(): OrganisationUnitCollectionRepository {
+        return cf.withChild(OrganisationUnitFields.PROGRAMS)
     }
 
-    public OrganisationUnitCollectionRepository withDataSetUids() {
-        return cf.withChild(OrganisationUnitFields.DATA_SETS);
+    fun withDataSetUids(): OrganisationUnitCollectionRepository {
+        return cf.withChild(OrganisationUnitFields.DATA_SETS)
     }
 
-    public OrganisationUnitCollectionRepository withOrganisationUnitGroups() {
-        return cf.withChild(OrganisationUnitFields.ORGANISATION_UNIT_GROUPS);
+    fun withOrganisationUnitGroups(): OrganisationUnitCollectionRepository {
+        return cf.withChild(OrganisationUnitFields.ORGANISATION_UNIT_GROUPS)
     }
-}
\ No newline at end of file
+}

From abf7e9208fb56310ef2ff0ea99f7000c70070bcc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:47:42 +0200
Subject: [PATCH 320/478] [ANDROSDK-1717] Add
 OrganisationUnitCollectionRepository missing tests

---
 ...CollectionRepositoryMockIntegrationShould.java | 15 +++++++++++++++
 .../organisationunit/organisation_units.json      |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java
index 77d1e7e31a..6b09586d98 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java
@@ -29,6 +29,7 @@
 package org.hisp.dhis.android.testapp.organisationunit;
 
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
+import org.hisp.dhis.android.core.common.FeatureType;
 import org.hisp.dhis.android.core.common.ObjectWithUid;
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
@@ -86,6 +87,20 @@ public void filter_by_level() {
         assertThat(organisationUnits.size()).isEqualTo(2);
     }
 
+    @Test
+    public void filter_by_geometry_type() {
+        List<OrganisationUnit> organisationUnits = d2.organisationUnitModule().organisationUnits()
+                .byGeometryType().eq(FeatureType.POINT).blockingGet();
+        assertThat(organisationUnits.size()).isEqualTo(1);
+    }
+
+    @Test
+    public void filter_by_geometry_coordinates() {
+        List<OrganisationUnit> organisationUnits = d2.organisationUnitModule().organisationUnits()
+                .byGeometryCoordinates().isNotNull().blockingGet();
+        assertThat(organisationUnits.size()).isEqualTo(1);
+    }
+
     @Test
     public void filter_by_organisation_unit_scope() {
         List<OrganisationUnit> captureOrganisationUnits = d2.organisationUnitModule().organisationUnits()
diff --git a/core/src/sharedTest/resources/organisationunit/organisation_units.json b/core/src/sharedTest/resources/organisationunit/organisation_units.json
index 0b3b30c10c..a5e6daf343 100644
--- a/core/src/sharedTest/resources/organisationunit/organisation_units.json
+++ b/core/src/sharedTest/resources/organisationunit/organisation_units.json
@@ -12,6 +12,13 @@
       "displayShortName": "Badjia",
       "path": "/ImspTQPwCqd/O6uvpzGd5pu/YuQRtpLP10I",
       "openingDate": "1970-01-01T00:00:00.000",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+          -11.618041992187502,
+          9.508486893003065
+        ]
+      },
       "parent": {
         "id": "O6uvpzGd5pu"
       },

From d2e882eeee760f6866c4bb5d6e5c542fd6ec79fc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:48:49 +0200
Subject: [PATCH 321/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...pository.java => OrganisationUnitGroupCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/{OrganisationUnitGroupCollectionRepository.java => OrganisationUnitGroupCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt

From ca7dac770e248d9798f7c4d7df3fb42018917594 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:48:50 +0200
Subject: [PATCH 322/478] [ANDROSDK-1717] Refactor
 OrganisationUnitGroupCollectionRepository to Kotlin

---
 ...ganisationUnitGroupCollectionRepository.kt | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
index 735dcbd456..4354838468 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
@@ -25,40 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.organisationunit;
+package org.hisp.dhis.android.core.organisationunit
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo.Columns;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
+import javax.inject.Inject
 
 @Reusable
-public final class OrganisationUnitGroupCollectionRepository extends ReadOnlyIdentifiableCollectionRepositoryImpl<
-        OrganisationUnitGroup, OrganisationUnitGroupCollectionRepository> {
-
-    @Inject
-    OrganisationUnitGroupCollectionRepository(
-            final OrganisationUnitGroupStore store,
-            final Map<String, ChildrenAppender<OrganisationUnitGroup>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new OrganisationUnitGroupCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<OrganisationUnitGroupCollectionRepository> byShortName() {
-        return cf.string(Columns.SHORT_NAME);
+class OrganisationUnitGroupCollectionRepository @Inject internal constructor(
+    store: OrganisationUnitGroupStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnitGroup>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnitGroup, OrganisationUnitGroupCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        OrganisationUnitGroupCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byShortName(): StringFilterConnector<OrganisationUnitGroupCollectionRepository> {
+        return cf.string(OrganisationUnitGroupTableInfo.Columns.SHORT_NAME)
     }
 
-    public StringFilterConnector<OrganisationUnitGroupCollectionRepository> byDisplayShortName() {
-        return cf.string(Columns.DISPLAY_SHORT_NAME);
+    fun byDisplayShortName(): StringFilterConnector<OrganisationUnitGroupCollectionRepository> {
+        return cf.string(OrganisationUnitGroupTableInfo.Columns.DISPLAY_SHORT_NAME)
     }
-}
\ No newline at end of file
+}

From fe3c26fa243a02a420ff1b5f4822a12de2f2b2a7 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:50:18 +0200
Subject: [PATCH 323/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...iodCollectionRepository.java => PeriodCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/period/{PeriodCollectionRepository.java => PeriodCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt

From f5c2f70f03654f605b13c867f4d3a8299b87c779 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:50:18 +0200
Subject: [PATCH 324/478] [ANDROSDK-1717] Refactor PeriodCollectionRepository
 to Kotlin

---
 .../core/period/PeriodCollectionRepository.kt | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
index bea341b39c..4af75bef4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
@@ -25,49 +25,51 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.period
 
-package org.hisp.dhis.android.core.period;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.period.internal.PeriodStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.period.internal.PeriodStore
+import javax.inject.Inject
 
 @Reusable
-public final class PeriodCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<Period, PeriodCollectionRepository> {
-
-    @Inject
-    PeriodCollectionRepository(final PeriodStore store,
-                               final Map<String, ChildrenAppender<Period>> childrenAppenders,
-                               final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new PeriodCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<PeriodCollectionRepository> byPeriodId() {
-        return cf.string(PeriodTableInfo.Columns.PERIOD_ID);
+class PeriodCollectionRepository @Inject internal constructor(
+    store: PeriodStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Period>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<Period, PeriodCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        PeriodCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byPeriodId(): StringFilterConnector<PeriodCollectionRepository> {
+        return cf.string(PeriodTableInfo.Columns.PERIOD_ID)
     }
 
-    public EnumFilterConnector<PeriodCollectionRepository, PeriodType> byPeriodType() {
-        return cf.enumC(PeriodTableInfo.Columns.PERIOD_TYPE);
+    fun byPeriodType(): EnumFilterConnector<PeriodCollectionRepository, PeriodType> {
+        return cf.enumC(PeriodTableInfo.Columns.PERIOD_TYPE)
     }
 
-    public DateFilterConnector<PeriodCollectionRepository> byStartDate() {
-        return cf.date(PeriodTableInfo.Columns.START_DATE);
+    fun byStartDate(): DateFilterConnector<PeriodCollectionRepository> {
+        return cf.date(PeriodTableInfo.Columns.START_DATE)
     }
 
-    public DateFilterConnector<PeriodCollectionRepository> byEndDate() {
-        return cf.date(PeriodTableInfo.Columns.END_DATE);
+    fun byEndDate(): DateFilterConnector<PeriodCollectionRepository> {
+        return cf.date(PeriodTableInfo.Columns.END_DATE)
     }
-}
\ No newline at end of file
+}

From 6eed97260ad57a1000172082783d891ceb570103 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:52:01 +0200
Subject: [PATCH 325/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...amCollectionRepository.java => ProgramCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramCollectionRepository.java => ProgramCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt

From acc94cdc6c46ec61f077437b6de957dbf11c78f6 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:52:02 +0200
Subject: [PATCH 326/478] [ANDROSDK-1717] Refactor ProgramCollectionRepository
 to Kotlin

---
 .../program/ProgramCollectionRepository.kt    | 219 +++++++++---------
 1 file changed, 110 insertions(+), 109 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
index 76b4273862..5bcca66026 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
@@ -25,174 +25,175 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
-import org.hisp.dhis.android.core.period.PeriodType;
-import org.hisp.dhis.android.core.program.ProgramTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramStore;
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<Program, ProgramCollectionRepository> {
-
-    @Inject
-    ProgramCollectionRepository(final ProgramStore store,
-                                final Map<String, ChildrenAppender<Program>> childrenAppenders,
-                                final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public IntegerFilterConnector<ProgramCollectionRepository> byVersion() {
-        return cf.integer(Columns.VERSION);
+class ProgramCollectionRepository @Inject internal constructor(
+    store: ProgramStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Program>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Program, ProgramCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byVersion(): IntegerFilterConnector<ProgramCollectionRepository> {
+        return cf.integer(ProgramTableInfo.Columns.VERSION)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byOnlyEnrollOnce() {
-        return cf.bool(Columns.ONLY_ENROLL_ONCE);
+    fun byOnlyEnrollOnce(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.ONLY_ENROLL_ONCE)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byEnrollmentDateLabel() {
-        return cf.string(Columns.ENROLLMENT_DATE_LABEL);
+    fun byEnrollmentDateLabel(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.ENROLLMENT_DATE_LABEL)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byDisplayIncidentDate() {
-        return cf.bool(Columns.DISPLAY_INCIDENT_DATE);
+    fun byDisplayIncidentDate(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.DISPLAY_INCIDENT_DATE)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byIncidentDateLabel() {
-        return cf.string(Columns.INCIDENT_DATE_LABEL);
+    fun byIncidentDateLabel(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.INCIDENT_DATE_LABEL)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byRegistration() {
-        return cf.bool(Columns.REGISTRATION);
+    fun byRegistration(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.REGISTRATION)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> bySelectEnrollmentDatesInFuture() {
-        return cf.bool(Columns.SELECT_ENROLLMENT_DATES_IN_FUTURE);
+    fun bySelectEnrollmentDatesInFuture(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.SELECT_ENROLLMENT_DATES_IN_FUTURE)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byDataEntryMethod() {
-        return cf.bool(Columns.DATA_ENTRY_METHOD);
+    fun byDataEntryMethod(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.DATA_ENTRY_METHOD)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byIgnoreOverdueEvents() {
-        return cf.bool(Columns.IGNORE_OVERDUE_EVENTS);
+    fun byIgnoreOverdueEvents(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.IGNORE_OVERDUE_EVENTS)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> bySelectIncidentDatesInFuture() {
-        return cf.bool(Columns.SELECT_INCIDENT_DATES_IN_FUTURE);
+    fun bySelectIncidentDatesInFuture(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.SELECT_INCIDENT_DATES_IN_FUTURE)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byUseFirstStageDuringRegistration() {
-        return cf.bool(Columns.USE_FIRST_STAGE_DURING_REGISTRATION);
+    fun byUseFirstStageDuringRegistration(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.USE_FIRST_STAGE_DURING_REGISTRATION)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byDisplayFrontPageList() {
-        return cf.bool(Columns.DISPLAY_FRONT_PAGE_LIST);
+    fun byDisplayFrontPageList(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.DISPLAY_FRONT_PAGE_LIST)
     }
 
-    public EnumFilterConnector<ProgramCollectionRepository, ProgramType> byProgramType() {
-        return cf.enumC(Columns.PROGRAM_TYPE);
+    fun byProgramType(): EnumFilterConnector<ProgramCollectionRepository, ProgramType> {
+        return cf.enumC(ProgramTableInfo.Columns.PROGRAM_TYPE)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byRelatedProgramUid() {
-        return cf.string(Columns.RELATED_PROGRAM);
+    fun byRelatedProgramUid(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.RELATED_PROGRAM)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byTrackedEntityTypeUid() {
-        return cf.string(Columns.TRACKED_ENTITY_TYPE);
+    fun byTrackedEntityTypeUid(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byCategoryComboUid() {
-        return cf.string(Columns.CATEGORY_COMBO);
+    fun byCategoryComboUid(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.CATEGORY_COMBO)
     }
 
-    public BooleanFilterConnector<ProgramCollectionRepository> byAccessDataWrite() {
-        return cf.bool(ProgramTableInfo.Columns.ACCESS_DATA_WRITE);
+    fun byAccessDataWrite(): BooleanFilterConnector<ProgramCollectionRepository> {
+        return cf.bool(ProgramTableInfo.Columns.ACCESS_DATA_WRITE)
     }
 
-    public IntegerFilterConnector<ProgramCollectionRepository> byExpiryDays() {
-        return cf.integer(Columns.EXPIRY_DAYS);
+    fun byExpiryDays(): IntegerFilterConnector<ProgramCollectionRepository> {
+        return cf.integer(ProgramTableInfo.Columns.EXPIRY_DAYS)
     }
 
-    public IntegerFilterConnector<ProgramCollectionRepository> byCompleteEventsExpiryDays() {
-        return cf.integer(Columns.COMPLETE_EVENTS_EXPIRY_DAYS);
+    fun byCompleteEventsExpiryDays(): IntegerFilterConnector<ProgramCollectionRepository> {
+        return cf.integer(ProgramTableInfo.Columns.COMPLETE_EVENTS_EXPIRY_DAYS)
     }
 
-    public EnumFilterConnector<ProgramCollectionRepository, PeriodType> byExpiryPeriodType() {
-        return cf.enumC(Columns.EXPIRY_PERIOD_TYPE);
+    fun byExpiryPeriodType(): EnumFilterConnector<ProgramCollectionRepository, PeriodType> {
+        return cf.enumC(ProgramTableInfo.Columns.EXPIRY_PERIOD_TYPE)
     }
 
-    public IntegerFilterConnector<ProgramCollectionRepository> byMinAttributesRequiredToSearch() {
-        return cf.integer(Columns.MIN_ATTRIBUTES_REQUIRED_TO_SEARCH);
+    fun byMinAttributesRequiredToSearch(): IntegerFilterConnector<ProgramCollectionRepository> {
+        return cf.integer(ProgramTableInfo.Columns.MIN_ATTRIBUTES_REQUIRED_TO_SEARCH)
     }
 
-    public IntegerFilterConnector<ProgramCollectionRepository> byMaxTeiCountToReturn() {
-        return cf.integer(Columns.MAX_TEI_COUNT_TO_RETURN);
+    fun byMaxTeiCountToReturn(): IntegerFilterConnector<ProgramCollectionRepository> {
+        return cf.integer(ProgramTableInfo.Columns.MAX_TEI_COUNT_TO_RETURN)
     }
 
-    public EnumFilterConnector<ProgramCollectionRepository, FeatureType> byFeatureType() {
-        return cf.enumC(Columns.FEATURE_TYPE);
+    fun byFeatureType(): EnumFilterConnector<ProgramCollectionRepository, FeatureType> {
+        return cf.enumC(ProgramTableInfo.Columns.FEATURE_TYPE)
     }
 
-    public EnumFilterConnector<ProgramCollectionRepository, AccessLevel> byAccessLevel() {
-        return cf.enumC(Columns.ACCESS_LEVEL);
+    fun byAccessLevel(): EnumFilterConnector<ProgramCollectionRepository, AccessLevel> {
+        return cf.enumC(ProgramTableInfo.Columns.ACCESS_LEVEL)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<ProgramCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<ProgramCollectionRepository> {
+        return cf.string(ProgramTableInfo.Columns.ICON)
     }
 
-    public ProgramCollectionRepository byOrganisationUnitUid(String uid) {
-        return byOrganisationUnitList(Collections.singletonList(uid));
+    fun byOrganisationUnitUid(uid: String): ProgramCollectionRepository {
+        return byOrganisationUnitList(listOf(uid))
     }
 
-    public ProgramCollectionRepository byOrganisationUnitList(List<String> uids) {
+    fun byOrganisationUnitList(uids: List<String>): ProgramCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
-                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
-                OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-                uids);
+            OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
+            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
+            OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
+            uids,
+        )
     }
 
-    public ProgramCollectionRepository byOrganisationUnitScope(OrganisationUnit.Scope scope) {
+    fun byOrganisationUnitScope(scope: OrganisationUnit.Scope): ProgramCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inTwoLinkTable(
-                OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
-                OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
-                OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
-                UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
-                Collections.singletonList(scope.name())
-        );
-    }
-
-    public ProgramCollectionRepository withTrackedEntityType() {
-        return cf.withChild(Columns.TRACKED_ENTITY_TYPE);
+            OrganisationUnitProgramLinkTableInfo.TABLE_INFO.name(),
+            OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM,
+            OrganisationUnitProgramLinkTableInfo.Columns.ORGANISATION_UNIT,
+            UserOrganisationUnitLinkTableInfo.TABLE_INFO.name(),
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT_SCOPE,
+            listOf(scope.name),
+        )
+    }
+
+    fun withTrackedEntityType(): ProgramCollectionRepository {
+        return cf.withChild(ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE)
     }
 }

From 6190a1f54e50e6199c15ff66df41622886ef493d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:53:01 +0200
Subject: [PATCH 327/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ionRepository.java => ProgramIndicatorCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramIndicatorCollectionRepository.java => ProgramIndicatorCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt

From 8ffb4f9a7eee6fe15ab789a56c138ecfc75c9f81 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:53:02 +0200
Subject: [PATCH 328/478] [ANDROSDK-1717] Refactor
 ProgramIndicatorCollectionRepository to Kotlin

---
 .../ProgramIndicatorCollectionRepository.kt   | 109 +++++++++---------
 1 file changed, 54 insertions(+), 55 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
index 696cc74139..be85a71372 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
@@ -25,79 +25,78 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.AnalyticsType;
-import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramIndicatorFields;
-import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.AnalyticsType
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorFields
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramIndicatorCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramIndicator, ProgramIndicatorCollectionRepository> {
-
-    @Inject
-    ProgramIndicatorCollectionRepository(
-        final ProgramIndicatorStore store,
-        final Map<String, ChildrenAppender<ProgramIndicator>> childrenAppenders,
-        final RepositoryScope scope
-    ) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramIndicatorCollectionRepository(store, childrenAppenders, s)));
-    }
-
-
-    public BooleanFilterConnector<ProgramIndicatorCollectionRepository> byDisplayInForm() {
-        return cf.bool(Columns.DISPLAY_IN_FORM);
+class ProgramIndicatorCollectionRepository @Inject internal constructor(
+    store: ProgramIndicatorStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramIndicator>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramIndicator, ProgramIndicatorCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramIndicatorCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDisplayInForm(): BooleanFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.bool(ProgramIndicatorTableInfo.Columns.DISPLAY_IN_FORM)
     }
 
-    public StringFilterConnector<ProgramIndicatorCollectionRepository> byExpression() {
-        return cf.string(Columns.EXPRESSION);
+    fun byExpression(): StringFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.string(ProgramIndicatorTableInfo.Columns.EXPRESSION)
     }
 
-    public StringFilterConnector<ProgramIndicatorCollectionRepository> byDimensionItem() {
-        return cf.string(Columns.DIMENSION_ITEM);
+    fun byDimensionItem(): StringFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.string(ProgramIndicatorTableInfo.Columns.DIMENSION_ITEM)
     }
 
-    public StringFilterConnector<ProgramIndicatorCollectionRepository> byFilter() {
-        return cf.string(Columns.FILTER);
+    fun byFilter(): StringFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.string(ProgramIndicatorTableInfo.Columns.FILTER)
     }
 
-    public IntegerFilterConnector<ProgramIndicatorCollectionRepository> byDecimals() {
-        return cf.integer(Columns.DECIMALS);
+    fun byDecimals(): IntegerFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.integer(ProgramIndicatorTableInfo.Columns.DECIMALS)
     }
 
-    public StringFilterConnector<ProgramIndicatorCollectionRepository> byAggregationType() {
-        return cf.string(Columns.AGGREGATION_TYPE);
+    fun byAggregationType(): StringFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.string(ProgramIndicatorTableInfo.Columns.AGGREGATION_TYPE)
     }
 
-    public EnumFilterConnector<ProgramIndicatorCollectionRepository, AnalyticsType> byAnalyticsType() {
-        return cf.enumC(Columns.ANALYTICS_TYPE);
+    fun byAnalyticsType(): EnumFilterConnector<ProgramIndicatorCollectionRepository, AnalyticsType> {
+        return cf.enumC(ProgramIndicatorTableInfo.Columns.ANALYTICS_TYPE)
     }
 
-    public StringFilterConnector<ProgramIndicatorCollectionRepository> byProgramUid() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgramUid(): StringFilterConnector<ProgramIndicatorCollectionRepository> {
+        return cf.string(ProgramIndicatorTableInfo.Columns.PROGRAM)
     }
 
-    public ProgramIndicatorCollectionRepository withLegendSets() {
-        return cf.withChild(ProgramIndicatorFields.LEGEND_SETS);
+    fun withLegendSets(): ProgramIndicatorCollectionRepository {
+        return cf.withChild(ProgramIndicatorFields.LEGEND_SETS)
     }
 
-    public ProgramIndicatorCollectionRepository withAnalyticsPeriodBoundaries() {
-        return cf.withChild(ProgramIndicatorFields.ANALYTICS_PERIOD_BOUNDARIES);
+    fun withAnalyticsPeriodBoundaries(): ProgramIndicatorCollectionRepository {
+        return cf.withChild(ProgramIndicatorFields.ANALYTICS_PERIOD_BOUNDARIES)
     }
-}
\ No newline at end of file
+}

From 90094e9ba44a10737d409a4c7d4f3054c58a268c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:55:34 +0200
Subject: [PATCH 329/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...onRepository.java => ProgramRuleActionCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramRuleActionCollectionRepository.java => ProgramRuleActionCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt

From 8324c8448c078cce9ab1f1da690addc13fa498af Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:55:35 +0200
Subject: [PATCH 330/478] [ANDROSDK-1717] Refactor
 ProgramRuleActionCollectionRepository to Kotlin

---
 .../ProgramRuleActionCollectionRepository.kt  | 108 +++++++++---------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
index 881bc011d7..dfb7f7d068 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
@@ -25,82 +25,82 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramRuleActionCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRuleAction, ProgramRuleActionCollectionRepository> {
-
-    @Inject
-    ProgramRuleActionCollectionRepository(final ProgramRuleActionStore store,
-                                          final Map<String, ChildrenAppender<ProgramRuleAction>> childrenAppenders,
-                                          final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramRuleActionCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byData() {
-        return cf.string(Columns.DATA);
+class ProgramRuleActionCollectionRepository @Inject internal constructor(
+    store: ProgramRuleActionStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRuleAction>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRuleAction, ProgramRuleActionCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramRuleActionCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byData(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.DATA)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byContent() {
-        return cf.string(Columns.CONTENT);
+    fun byContent(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.CONTENT)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byLocation() {
-        return cf.string(Columns.LOCATION);
+    fun byLocation(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.LOCATION)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byTrackedEntityAttributeUid() {
-        return cf.string(Columns.TRACKED_ENTITY_ATTRIBUTE);
+    fun byTrackedEntityAttributeUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byProgramIndicatorUid() {
-        return cf.string(Columns.PROGRAM_INDICATOR);
+    fun byProgramIndicatorUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.PROGRAM_INDICATOR)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byProgramStageSectionUid() {
-        return cf.string(Columns.PROGRAM_STAGE_SECTION);
+    fun byProgramStageSectionUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.PROGRAM_STAGE_SECTION)
     }
 
-    public EnumFilterConnector<ProgramRuleActionCollectionRepository,
-            ProgramRuleActionType> byProgramRuleActionType() {
-
-        return cf.enumC(Columns.PROGRAM_RULE_ACTION_TYPE);
+    fun byProgramRuleActionType(): EnumFilterConnector<ProgramRuleActionCollectionRepository, ProgramRuleActionType> {
+        return cf.enumC(ProgramRuleActionTableInfo.Columns.PROGRAM_RULE_ACTION_TYPE)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byProgramStageUid() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStageUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byDataElementUid() {
-        return cf.string(Columns.DATA_ELEMENT);
+    fun byDataElementUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.DATA_ELEMENT)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byProgramRuleUid() {
-        return cf.string(Columns.PROGRAM_RULE);
+    fun byProgramRuleUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.PROGRAM_RULE)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byOptionUid() {
-        return cf.string(Columns.OPTION);
+    fun byOptionUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.OPTION)
     }
 
-    public StringFilterConnector<ProgramRuleActionCollectionRepository> byOptionGroupUid() {
-        return cf.string(Columns.OPTION_GROUP);
+    fun byOptionGroupUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
+        return cf.string(ProgramRuleActionTableInfo.Columns.OPTION_GROUP)
     }
-}
\ No newline at end of file
+}

From feda2c06ed9bcfbfa8ff4a1a960c08bacc876188 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:56:35 +0200
Subject: [PATCH 331/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...llectionRepository.java => ProgramRuleCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramRuleCollectionRepository.java => ProgramRuleCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt

From 1be380b36ddbfdb54f1e6702fa4f8698425f3769 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:56:36 +0200
Subject: [PATCH 332/478] [ANDROSDK-1717] Refactor
 ProgramRuleCollectionRepository to Kotlin

---
 .../ProgramRuleCollectionRepository.kt        | 79 ++++++++++---------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
index fd1944baff..14d6d0eb8d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
@@ -25,54 +25,55 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
+package org.hisp.dhis.android.core.program
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.ProgramRuleTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramRuleFields;
-import org.hisp.dhis.android.core.program.internal.ProgramRuleStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramRuleFields
+import org.hisp.dhis.android.core.program.internal.ProgramRuleStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramRuleCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRule, ProgramRuleCollectionRepository> {
-
-    @Inject
-    ProgramRuleCollectionRepository(final ProgramRuleStore store,
-                                    final Map<String, ChildrenAppender<ProgramRule>> childrenAppenders,
-                                    final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramRuleCollectionRepository(store, childrenAppenders, s)));
-    }
-
-
-    public IntegerFilterConnector<ProgramRuleCollectionRepository> byPriority() {
-        return cf.integer(Columns.PRIORITY);
+class ProgramRuleCollectionRepository @Inject internal constructor(
+    store: ProgramRuleStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRule>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRule, ProgramRuleCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramRuleCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byPriority(): IntegerFilterConnector<ProgramRuleCollectionRepository> {
+        return cf.integer(ProgramRuleTableInfo.Columns.PRIORITY)
     }
 
-    public StringFilterConnector<ProgramRuleCollectionRepository> byCondition() {
-        return cf.string(Columns.CONDITION);
+    fun byCondition(): StringFilterConnector<ProgramRuleCollectionRepository> {
+        return cf.string(ProgramRuleTableInfo.Columns.CONDITION)
     }
 
-    public StringFilterConnector<ProgramRuleCollectionRepository> byProgramUid() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgramUid(): StringFilterConnector<ProgramRuleCollectionRepository> {
+        return cf.string(ProgramRuleTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<ProgramRuleCollectionRepository> byProgramStageUid() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStageUid(): StringFilterConnector<ProgramRuleCollectionRepository> {
+        return cf.string(ProgramRuleTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public ProgramRuleCollectionRepository withProgramRuleActions() {
-        return cf.withChild(ProgramRuleFields.PROGRAM_RULE_ACTIONS);
+    fun withProgramRuleActions(): ProgramRuleCollectionRepository {
+        return cf.withChild(ProgramRuleFields.PROGRAM_RULE_ACTIONS)
     }
-}
\ No newline at end of file
+}

From 575e76838da1c3c60969a6ac76b7ee6f8d657895 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:57:47 +0200
Subject: [PATCH 333/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...Repository.java => ProgramRuleVariableCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramRuleVariableCollectionRepository.java => ProgramRuleVariableCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt

From 442d9b7435ac5ce1390e733ed01aaa1aeeb7afa3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:57:48 +0200
Subject: [PATCH 334/478] [ANDROSDK-1717] Refactor
 ProgramRuleVariableCollectionRepository to Kotlin

---
 ...ProgramRuleVariableCollectionRepository.kt | 88 ++++++++++---------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
index 4fc83645e0..c2ae45bcca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
@@ -25,60 +25,62 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
+package org.hisp.dhis.android.core.program
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramRuleVariableStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramRuleVariableStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramRuleVariableCollectionRepository extends ReadOnlyIdentifiableCollectionRepositoryImpl
-        <ProgramRuleVariable, ProgramRuleVariableCollectionRepository> {
-
-    @Inject
-    ProgramRuleVariableCollectionRepository(final ProgramRuleVariableStore store,
-                                            final Map<String, ChildrenAppender<ProgramRuleVariable>> childrenAppenders,
-                                            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramRuleVariableCollectionRepository(store, childrenAppenders, s)));
+class ProgramRuleVariableCollectionRepository @Inject internal constructor(
+    store: ProgramRuleVariableStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRuleVariable>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRuleVariable, ProgramRuleVariableCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramRuleVariableCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byUseCodeForOptionSet(): BooleanFilterConnector<ProgramRuleVariableCollectionRepository> {
+        return cf.bool(ProgramRuleVariableTableInfo.Columns.USE_CODE_FOR_OPTION_SET)
     }
 
-
-    public BooleanFilterConnector<ProgramRuleVariableCollectionRepository> byUseCodeForOptionSet() {
-        return cf.bool(Columns.USE_CODE_FOR_OPTION_SET);
-    }
-
-    public StringFilterConnector<ProgramRuleVariableCollectionRepository> byProgramUid() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgramUid(): StringFilterConnector<ProgramRuleVariableCollectionRepository> {
+        return cf.string(ProgramRuleVariableTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<ProgramRuleVariableCollectionRepository> byProgramStageUid() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStageUid(): StringFilterConnector<ProgramRuleVariableCollectionRepository> {
+        return cf.string(ProgramRuleVariableTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<ProgramRuleVariableCollectionRepository> byDataElementUid() {
-        return cf.string(Columns.DATA_ELEMENT);
+    fun byDataElementUid(): StringFilterConnector<ProgramRuleVariableCollectionRepository> {
+        return cf.string(ProgramRuleVariableTableInfo.Columns.DATA_ELEMENT)
     }
 
-    public StringFilterConnector<ProgramRuleVariableCollectionRepository> byTrackedEntityAttributeUid() {
-        return cf.string(Columns.TRACKED_ENTITY_ATTRIBUTE);
+    fun byTrackedEntityAttributeUid(): StringFilterConnector<ProgramRuleVariableCollectionRepository> {
+        return cf.string(ProgramRuleVariableTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE)
     }
 
-    public EnumFilterConnector<ProgramRuleVariableCollectionRepository,
-            ProgramRuleVariableSourceType> byProgramRuleVariableSourceType() {
-
-        return cf.enumC(Columns.PROGRAM_RULE_VARIABLE_SOURCE_TYPE);
+    fun byProgramRuleVariableSourceType(): EnumFilterConnector<
+        ProgramRuleVariableCollectionRepository,
+        ProgramRuleVariableSourceType,
+        > {
+        return cf.enumC(ProgramRuleVariableTableInfo.Columns.PROGRAM_RULE_VARIABLE_SOURCE_TYPE)
     }
-}
\ No newline at end of file
+}

From 55a858d058c65c824d50fa80dbbbb8aebb644cfc Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:58:39 +0200
Subject: [PATCH 335/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...pository.java => OrganisationUnitLevelCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/{OrganisationUnitLevelCollectionRepository.java => OrganisationUnitLevelCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt

From 16aebb03cb6600cca9eec73141bf7befe3026a73 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 08:58:39 +0200
Subject: [PATCH 336/478] [ANDROSDK-1717] Refactor
 OrganisationUnitLevelCollectionRepository to Kotlin

---
 ...ganisationUnitLevelCollectionRepository.kt | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
index 01f27b0d9d..2684a4240d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
@@ -25,36 +25,37 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.organisationunit;
+package org.hisp.dhis.android.core.organisationunit
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo.Columns;
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
+import javax.inject.Inject
 
 @Reusable
-public final class OrganisationUnitLevelCollectionRepository extends ReadOnlyIdentifiableCollectionRepositoryImpl<
-        OrganisationUnitLevel, OrganisationUnitLevelCollectionRepository> {
-
-    @Inject
-    OrganisationUnitLevelCollectionRepository(
-            final OrganisationUnitLevelStore store,
-            final Map<String, ChildrenAppender<OrganisationUnitLevel>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new OrganisationUnitLevelCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public IntegerFilterConnector<OrganisationUnitLevelCollectionRepository> byLevel() {
-        return cf.integer(Columns.LEVEL);
+class OrganisationUnitLevelCollectionRepository @Inject internal constructor(
+    store: OrganisationUnitLevelStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnitLevel>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnitLevel, OrganisationUnitLevelCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        OrganisationUnitLevelCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byLevel(): IntegerFilterConnector<OrganisationUnitLevelCollectionRepository> {
+        return cf.integer(OrganisationUnitLevelTableInfo.Columns.LEVEL)
     }
-}
\ No newline at end of file
+}

From 109990b7653eb74cf006ecc10649f24082265382 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:02:52 +0200
Subject: [PATCH 337/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ctionRepository.java => ProgramSectionCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramSectionCollectionRepository.java => ProgramSectionCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt

From 0157b54cb7d887f84fdb3223af7a31a900ff6b2b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:02:53 +0200
Subject: [PATCH 338/478] [ANDROSDK-1717] Refactor
 ProgramSectionCollectionRepository to Kotlin

---
 .../ProgramSectionCollectionRepository.kt     | 97 ++++++++++---------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
index dbf40d063b..0827b59a2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
@@ -25,70 +25,71 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.ProgramSectionTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramSectionFields;
-import org.hisp.dhis.android.core.program.internal.ProgramSectionStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramSectionFields
+import org.hisp.dhis.android.core.program.internal.ProgramSectionStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramSectionCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramSection, ProgramSectionCollectionRepository> {
-
-    @Inject
-    ProgramSectionCollectionRepository(final ProgramSectionStore store,
-                                       final Map<String, ChildrenAppender<ProgramSection>> childrenAppenders,
-                                       final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramSectionCollectionRepository(store, childrenAppenders, s)));
-    }
-
-
-    public StringFilterConnector<ProgramSectionCollectionRepository> byDescription() {
-        return cf.string(Columns.DESCRIPTION);
+class ProgramSectionCollectionRepository @Inject internal constructor(
+    store: ProgramSectionStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramSection>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramSection, ProgramSectionCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramSectionCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDescription(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.DESCRIPTION)
     }
 
-    public StringFilterConnector<ProgramSectionCollectionRepository> byProgramUid() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgramUid(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.PROGRAM)
     }
 
-    public IntegerFilterConnector<ProgramSectionCollectionRepository> bySortOrder() {
-        return cf.integer(Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.integer(ProgramSectionTableInfo.Columns.SORT_ORDER)
     }
 
-    public StringFilterConnector<ProgramSectionCollectionRepository> byFormName() {
-        return cf.string(Columns.FORM_NAME);
+    fun byFormName(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.FORM_NAME)
     }
 
-    public StringFilterConnector<ProgramSectionCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<ProgramSectionCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.ICON)
     }
 
-    public StringFilterConnector<ProgramSectionCollectionRepository> byDesktopRenderType() {
-        return cf.string(ProgramSectionTableInfo.Columns.DESKTOP_RENDER_TYPE);
+    fun byDesktopRenderType(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.DESKTOP_RENDER_TYPE)
     }
 
-    public StringFilterConnector<ProgramSectionCollectionRepository> byMobileRenderType() {
-        return cf.string(ProgramSectionTableInfo.Columns.MOBILE_RENDER_TYPE);
+    fun byMobileRenderType(): StringFilterConnector<ProgramSectionCollectionRepository> {
+        return cf.string(ProgramSectionTableInfo.Columns.MOBILE_RENDER_TYPE)
     }
 
-    public ProgramSectionCollectionRepository withAttributes() {
-        return cf.withChild(ProgramSectionFields.ATTRIBUTES);
+    fun withAttributes(): ProgramSectionCollectionRepository {
+        return cf.withChild(ProgramSectionFields.ATTRIBUTES)
     }
-}
\ No newline at end of file
+}

From dd5ec7ddbf1a604c259d784552707dbc43ab07f9 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:04:52 +0200
Subject: [PATCH 339/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...lectionRepository.java => ProgramStageCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramStageCollectionRepository.java => ProgramStageCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt

From ca91ff14643aaba1b52cffe25b32431a69c77158 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:04:53 +0200
Subject: [PATCH 340/478] [ANDROSDK-1717] Refactor
 ProgramStageCollectionRepository to Kotlin

---
 .../ProgramStageCollectionRepository.kt       | 185 +++++++++---------
 1 file changed, 93 insertions(+), 92 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
index 37d1956d16..c7574aeea6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
@@ -25,152 +25,153 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.common.FormType;
-import org.hisp.dhis.android.core.common.ValidationStrategy;
-import org.hisp.dhis.android.core.period.PeriodType;
-import org.hisp.dhis.android.core.program.ProgramStageTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramStageStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.common.FormType
+import org.hisp.dhis.android.core.common.ValidationStrategy
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramStageCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStage, ProgramStageCollectionRepository> {
-
-    @Inject
-    ProgramStageCollectionRepository(final ProgramStageStore store,
-                                     final Map<String, ChildrenAppender<ProgramStage>> childrenAppenders,
-                                     final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramStageCollectionRepository(store, childrenAppenders, s)));
-    }
-
-
-    public StringFilterConnector<ProgramStageCollectionRepository> byDescription() {
-        return cf.string(Columns.DESCRIPTION);
+class ProgramStageCollectionRepository @Inject internal constructor(
+    store: ProgramStageStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStage>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStage, ProgramStageCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramStageCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDescription(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.DESCRIPTION)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byDisplayDescription() {
-        return cf.string(Columns.DISPLAY_DESCRIPTION);
+    fun byDisplayDescription(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.DISPLAY_DESCRIPTION)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byExecutionDateLabel() {
-        return cf.string(Columns.EXECUTION_DATE_LABEL);
+    fun byExecutionDateLabel(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.EXECUTION_DATE_LABEL)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byDueDateLabel() {
-        return cf.string(Columns.DUE_DATE_LABEL);
+    fun byDueDateLabel(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.DUE_DATE_LABEL)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byAllowGenerateNextVisit() {
-        return cf.bool(Columns.ALLOW_GENERATE_NEXT_VISIT);
+    fun byAllowGenerateNextVisit(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.ALLOW_GENERATE_NEXT_VISIT)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byValidCompleteOnly() {
-        return cf.bool(Columns.VALID_COMPLETE_ONLY);
+    fun byValidCompleteOnly(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.VALID_COMPLETE_ONLY)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byReportDateToUse() {
-        return cf.string(Columns.REPORT_DATE_TO_USE);
+    fun byReportDateToUse(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.REPORT_DATE_TO_USE)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byOpenAfterEnrollment() {
-        return cf.bool(Columns.OPEN_AFTER_ENROLLMENT);
+    fun byOpenAfterEnrollment(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.OPEN_AFTER_ENROLLMENT)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byRepeatable() {
-        return cf.bool(Columns.REPEATABLE);
+    fun byRepeatable(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.REPEATABLE)
     }
 
-    public EnumFilterConnector<ProgramStageCollectionRepository, FeatureType> byFeatureType() {
-        return cf.enumC(Columns.FEATURE_TYPE);
+    fun byFeatureType(): EnumFilterConnector<ProgramStageCollectionRepository, FeatureType> {
+        return cf.enumC(ProgramStageTableInfo.Columns.FEATURE_TYPE)
     }
 
-    public EnumFilterConnector<ProgramStageCollectionRepository, FormType> byFormType() {
-        return cf.enumC(Columns.FORM_TYPE);
+    fun byFormType(): EnumFilterConnector<ProgramStageCollectionRepository, FormType> {
+        return cf.enumC(ProgramStageTableInfo.Columns.FORM_TYPE)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byDisplayGenerateEventBox() {
-        return cf.bool(Columns.DISPLAY_GENERATE_EVENT_BOX);
+    fun byDisplayGenerateEventBox(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.DISPLAY_GENERATE_EVENT_BOX)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byGeneratedByEnrollmentDate() {
-        return cf.bool(Columns.GENERATED_BY_ENROLMENT_DATE);
+    fun byGeneratedByEnrollmentDate(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.GENERATED_BY_ENROLMENT_DATE)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byAutoGenerateEvent() {
-        return cf.bool(Columns.AUTO_GENERATE_EVENT);
+    fun byAutoGenerateEvent(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.AUTO_GENERATE_EVENT)
     }
 
-    public IntegerFilterConnector<ProgramStageCollectionRepository> bySortOrder() {
-        return cf.integer(Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<ProgramStageCollectionRepository> {
+        return cf.integer(ProgramStageTableInfo.Columns.SORT_ORDER)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byHideDueDate() {
-        return cf.bool(Columns.HIDE_DUE_DATE);
+    fun byHideDueDate(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.HIDE_DUE_DATE)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byBlockEntryForm() {
-        return cf.bool(Columns.BLOCK_ENTRY_FORM);
+    fun byBlockEntryForm(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.BLOCK_ENTRY_FORM)
     }
 
-    public IntegerFilterConnector<ProgramStageCollectionRepository> byMinDaysFromStart() {
-        return cf.integer(Columns.MIN_DAYS_FROM_START);
+    fun byMinDaysFromStart(): IntegerFilterConnector<ProgramStageCollectionRepository> {
+        return cf.integer(ProgramStageTableInfo.Columns.MIN_DAYS_FROM_START)
     }
 
-    public IntegerFilterConnector<ProgramStageCollectionRepository> byStandardInterval() {
-        return cf.integer(Columns.STANDARD_INTERVAL);
+    fun byStandardInterval(): IntegerFilterConnector<ProgramStageCollectionRepository> {
+        return cf.integer(ProgramStageTableInfo.Columns.STANDARD_INTERVAL)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byEnableUserAssignment() {
-        return cf.bool(Columns.ENABLE_USER_ASSIGNMENT);
+    fun byEnableUserAssignment(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.ENABLE_USER_ASSIGNMENT)
     }
 
-    public EnumFilterConnector<ProgramStageCollectionRepository, PeriodType> byPeriodType() {
-        return cf.enumC(Columns.PERIOD_TYPE);
+    fun byPeriodType(): EnumFilterConnector<ProgramStageCollectionRepository, PeriodType> {
+        return cf.enumC(ProgramStageTableInfo.Columns.PERIOD_TYPE)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byProgramUid() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgramUid(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.PROGRAM)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byAccessDataWrite() {
-        return cf.bool(ProgramStageTableInfo.Columns.ACCESS_DATA_WRITE);
+    fun byAccessDataWrite(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.ACCESS_DATA_WRITE)
     }
 
-    public BooleanFilterConnector<ProgramStageCollectionRepository> byRemindCompleted() {
-        return cf.bool(Columns.REMIND_COMPLETED);
+    fun byRemindCompleted(): BooleanFilterConnector<ProgramStageCollectionRepository> {
+        return cf.bool(ProgramStageTableInfo.Columns.REMIND_COMPLETED)
     }
 
-    public EnumFilterConnector<ProgramStageCollectionRepository, ValidationStrategy> byValidationStrategy() {
-        return cf.enumC(Columns.VALIDATION_STRATEGY);
+    fun byValidationStrategy(): EnumFilterConnector<ProgramStageCollectionRepository, ValidationStrategy> {
+        return cf.enumC(ProgramStageTableInfo.Columns.VALIDATION_STRATEGY)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<ProgramStageCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<ProgramStageCollectionRepository> {
+        return cf.string(ProgramStageTableInfo.Columns.ICON)
     }
 
-    public ProgramStageCollectionRepository orderBySortOrder(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.SORT_ORDER, direction);
+    fun orderBySortOrder(direction: OrderByDirection?): ProgramStageCollectionRepository {
+        return cf.withOrderBy(ProgramStageTableInfo.Columns.SORT_ORDER, direction)
     }
-}
\ No newline at end of file
+}

From 92afb1c88e2aa73afe4954c13ce4b364b42632a1 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:06:27 +0200
Subject: [PATCH 341/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...sitory.java => ProgramStageDataElementCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramStageDataElementCollectionRepository.java => ProgramStageDataElementCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt

From 86c57380e87af012200d996045cce20d58bce078 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:06:27 +0200
Subject: [PATCH 342/478] [ANDROSDK-1717] Refactor
 ProgramStageDataElementCollectionRepository to Kotlin

---
 ...ramStageDataElementCollectionRepository.kt | 101 +++++++++---------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
index 431fb432f2..783d772b7f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
@@ -25,72 +25,73 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementFields;
-import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementFields
+import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramStageDataElementCollectionRepository extends ReadOnlyIdentifiableCollectionRepositoryImpl
-        <ProgramStageDataElement, ProgramStageDataElementCollectionRepository> {
-
-    @Inject
-    ProgramStageDataElementCollectionRepository(final ProgramStageDataElementStore store,
-                                                final Map<String, ChildrenAppender<ProgramStageDataElement>>
-                                                        childrenAppenders,
-                                                final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramStageDataElementCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public BooleanFilterConnector<ProgramStageDataElementCollectionRepository> byDisplayInReports() {
-        return cf.bool(Columns.DISPLAY_IN_REPORTS);
+class ProgramStageDataElementCollectionRepository @Inject internal constructor(
+    store: ProgramStageDataElementStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageDataElement>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageDataElement, ProgramStageDataElementCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramStageDataElementCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDisplayInReports(): BooleanFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.bool(ProgramStageDataElementTableInfo.Columns.DISPLAY_IN_REPORTS)
     }
 
-    public BooleanFilterConnector<ProgramStageDataElementCollectionRepository> byCompulsory() {
-        return cf.bool(Columns.COMPULSORY);
+    fun byCompulsory(): BooleanFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.bool(ProgramStageDataElementTableInfo.Columns.COMPULSORY)
     }
 
-    public BooleanFilterConnector<ProgramStageDataElementCollectionRepository> byAllowProvidedElsewhere() {
-        return cf.bool(Columns.ALLOW_PROVIDED_ELSEWHERE);
+    fun byAllowProvidedElsewhere(): BooleanFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.bool(ProgramStageDataElementTableInfo.Columns.ALLOW_PROVIDED_ELSEWHERE)
     }
 
-    public IntegerFilterConnector<ProgramStageDataElementCollectionRepository> bySortOrder() {
-        return cf.integer(Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.integer(ProgramStageDataElementTableInfo.Columns.SORT_ORDER)
     }
 
-    public BooleanFilterConnector<ProgramStageDataElementCollectionRepository> byAllowFutureDate() {
-        return cf.bool(Columns.ALLOW_FUTURE_DATE);
+    fun byAllowFutureDate(): BooleanFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.bool(ProgramStageDataElementTableInfo.Columns.ALLOW_FUTURE_DATE)
     }
 
-    public StringFilterConnector<ProgramStageDataElementCollectionRepository> byDataElement() {
-        return cf.string(Columns.DATA_ELEMENT);
+    fun byDataElement(): StringFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.string(ProgramStageDataElementTableInfo.Columns.DATA_ELEMENT)
     }
 
-    public StringFilterConnector<ProgramStageDataElementCollectionRepository> byProgramStage() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStage(): StringFilterConnector<ProgramStageDataElementCollectionRepository> {
+        return cf.string(ProgramStageDataElementTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public ProgramStageDataElementCollectionRepository withRenderType() {
-        return cf.withChild(ProgramStageDataElementFields.RENDER_TYPE);
+    fun withRenderType(): ProgramStageDataElementCollectionRepository {
+        return cf.withChild(ProgramStageDataElementFields.RENDER_TYPE)
     }
 
-    public ProgramStageDataElementCollectionRepository orderBySortOrder(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.SORT_ORDER, direction);
+    fun orderBySortOrder(direction: OrderByDirection?): ProgramStageDataElementCollectionRepository {
+        return cf.withOrderBy(ProgramStageDataElementTableInfo.Columns.SORT_ORDER, direction)
     }
-}
\ No newline at end of file
+}

From 7e3faed7ec99649c20576f39d9a3986ae09186d2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:07:35 +0200
Subject: [PATCH 343/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...epository.java => ProgramStageSectionsCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramStageSectionsCollectionRepository.java => ProgramStageSectionsCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt

From 9e0d42143d84d9ea24f80ec210d78ac9eca5d049 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:07:35 +0200
Subject: [PATCH 344/478] [ANDROSDK-1717] Refactor
 ProgramStageSectionsCollectionRepository to Kotlin

---
 ...rogramStageSectionsCollectionRepository.kt | 93 ++++++++++---------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
index fd1fd5500d..77b67291d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
@@ -25,66 +25,67 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.internal.ProgramStageSectionFields;
-import org.hisp.dhis.android.core.program.internal.ProgramStageSectionStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramStageSectionFields
+import org.hisp.dhis.android.core.program.internal.ProgramStageSectionStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramStageSectionsCollectionRepository extends ReadOnlyIdentifiableCollectionRepositoryImpl
-        <ProgramStageSection, ProgramStageSectionsCollectionRepository> {
-
-    @Inject
-    ProgramStageSectionsCollectionRepository(final ProgramStageSectionStore store,
-                                             final Map<String, ChildrenAppender<ProgramStageSection>> childrenAppenders,
-                                             final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramStageSectionsCollectionRepository(store, childrenAppenders, s)));
+class ProgramStageSectionsCollectionRepository @Inject internal constructor(
+    store: ProgramStageSectionStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageSection>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageSection, ProgramStageSectionsCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramStageSectionsCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun bySortOrder(): IntegerFilterConnector<ProgramStageSectionsCollectionRepository> {
+        return cf.integer(ProgramStageSectionTableInfo.Columns.SORT_ORDER)
     }
 
-
-    public IntegerFilterConnector<ProgramStageSectionsCollectionRepository> bySortOrder() {
-        return cf.integer(ProgramStageSectionTableInfo.Columns.SORT_ORDER);
-    }
-
-    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byProgramStageUid() {
-        return cf.string(ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE);
+    fun byProgramStageUid(): StringFilterConnector<ProgramStageSectionsCollectionRepository> {
+        return cf.string(ProgramStageSectionTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byDesktopRenderType() {
-        return cf.string(ProgramStageSectionTableInfo.Columns.DESKTOP_RENDER_TYPE);
+    fun byDesktopRenderType(): StringFilterConnector<ProgramStageSectionsCollectionRepository> {
+        return cf.string(ProgramStageSectionTableInfo.Columns.DESKTOP_RENDER_TYPE)
     }
 
-    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byMobileRenderType() {
-        return cf.string(ProgramStageSectionTableInfo.Columns.MOBILE_RENDER_TYPE);
+    fun byMobileRenderType(): StringFilterConnector<ProgramStageSectionsCollectionRepository> {
+        return cf.string(ProgramStageSectionTableInfo.Columns.MOBILE_RENDER_TYPE)
     }
 
-    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byDescription() {
-        return cf.string(ProgramStageSectionTableInfo.Columns.DESCRIPTION);
+    fun byDescription(): StringFilterConnector<ProgramStageSectionsCollectionRepository> {
+        return cf.string(ProgramStageSectionTableInfo.Columns.DESCRIPTION)
     }
 
-    public StringFilterConnector<ProgramStageSectionsCollectionRepository> byDisplayDescription() {
-        return cf.string(ProgramStageSectionTableInfo.Columns.DISPLAY_DESCRIPTION);
+    fun byDisplayDescription(): StringFilterConnector<ProgramStageSectionsCollectionRepository> {
+        return cf.string(ProgramStageSectionTableInfo.Columns.DISPLAY_DESCRIPTION)
     }
 
-    public ProgramStageSectionsCollectionRepository withProgramIndicators() {
-        return cf.withChild(ProgramStageSectionFields.PROGRAM_INDICATORS);
+    fun withProgramIndicators(): ProgramStageSectionsCollectionRepository {
+        return cf.withChild(ProgramStageSectionFields.PROGRAM_INDICATORS)
     }
 
-    public ProgramStageSectionsCollectionRepository withDataElements() {
-        return cf.withChild(ProgramStageSectionFields.DATA_ELEMENTS);
+    fun withDataElements(): ProgramStageSectionsCollectionRepository {
+        return cf.withChild(ProgramStageSectionFields.DATA_ELEMENTS)
     }
-
-}
\ No newline at end of file
+}

From 162a335d23e9a43b9aa36b8201cfbfa9bc936977 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:08:44 +0200
Subject: [PATCH 345/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...sitory.java => ProgramStageWorkingListCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/{ProgramStageWorkingListCollectionRepository.java => ProgramStageWorkingListCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt

From 3e15452b532f37cddf36ead909e664f284c1d7e2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:08:45 +0200
Subject: [PATCH 346/478] [ANDROSDK-1717] Refactor
 ProgramStageWorkingListCollectionRepository to Kotlin

---
 ...ramStageWorkingListCollectionRepository.kt | 120 +++++++++---------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
index 1ec960fcc0..224329d7bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
@@ -25,88 +25,88 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.programstageworkinglist;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.AssignedUserMode;
-import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
-import org.hisp.dhis.android.core.event.EventStatus;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageQueryCriteriaFields;
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStore;
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListTableInfo.Columns;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.programstageworkinglist
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageQueryCriteriaFields
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStore
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListTableInfo
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramStageWorkingListCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageWorkingList,
-        ProgramStageWorkingListCollectionRepository> {
-
-    @Inject
-    ProgramStageWorkingListCollectionRepository(
-            final ProgramStageWorkingListStore store,
-            final Map<String, ChildrenAppender<ProgramStageWorkingList>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramStageWorkingListCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<ProgramStageWorkingListCollectionRepository> byProgram() {
-        return cf.string(Columns.PROGRAM);
+class ProgramStageWorkingListCollectionRepository @Inject internal constructor(
+    store: ProgramStageWorkingListStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageWorkingList>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageWorkingList, ProgramStageWorkingListCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramStageWorkingListCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byProgram(): StringFilterConnector<ProgramStageWorkingListCollectionRepository> {
+        return cf.string(ProgramStageWorkingListTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<ProgramStageWorkingListCollectionRepository> byProgramStage() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStage(): StringFilterConnector<ProgramStageWorkingListCollectionRepository> {
+        return cf.string(ProgramStageWorkingListTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<ProgramStageWorkingListCollectionRepository> byDescription() {
-        return cf.string(Columns.DESCRIPTION);
+    fun byDescription(): StringFilterConnector<ProgramStageWorkingListCollectionRepository> {
+        return cf.string(ProgramStageWorkingListTableInfo.Columns.DESCRIPTION)
     }
 
-    public EnumFilterConnector<ProgramStageWorkingListCollectionRepository, EventStatus> byEventStatus() {
-        return cf.enumC(Columns.EVENT_STATUS);
+    fun byEventStatus(): EnumFilterConnector<ProgramStageWorkingListCollectionRepository, EventStatus> {
+        return cf.enumC(ProgramStageWorkingListTableInfo.Columns.EVENT_STATUS)
     }
 
-    public EnumFilterConnector<ProgramStageWorkingListCollectionRepository, EnrollmentStatus> byEnrollmentStatus() {
-        return cf.enumC(Columns.ENROLLMENT_STATUS);
+    fun byEnrollmentStatus(): EnumFilterConnector<ProgramStageWorkingListCollectionRepository, EnrollmentStatus> {
+        return cf.enumC(ProgramStageWorkingListTableInfo.Columns.ENROLLMENT_STATUS)
     }
 
-    public StringFilterConnector<ProgramStageWorkingListCollectionRepository> byOrder() {
-        return cf.string(Columns.ORDER);
+    fun byOrder(): StringFilterConnector<ProgramStageWorkingListCollectionRepository> {
+        return cf.string(ProgramStageWorkingListTableInfo.Columns.ORDER)
     }
 
-    public StringFilterConnector<ProgramStageWorkingListCollectionRepository> byDisplayColumnOrder() {
-        return cf.string(Columns.DISPLAY_COLUMN_ORDER);
+    fun byDisplayColumnOrder(): StringFilterConnector<ProgramStageWorkingListCollectionRepository> {
+        return cf.string(ProgramStageWorkingListTableInfo.Columns.DISPLAY_COLUMN_ORDER)
     }
 
-    public StringFilterConnector<ProgramStageWorkingListCollectionRepository> byOrganisationUnit() {
-        return cf.string(Columns.ORG_UNIT);
+    fun byOrganisationUnit(): StringFilterConnector<ProgramStageWorkingListCollectionRepository> {
+        return cf.string(ProgramStageWorkingListTableInfo.Columns.ORG_UNIT)
     }
 
-    public EnumFilterConnector<ProgramStageWorkingListCollectionRepository, OrganisationUnitMode> byOuMode() {
-        return cf.enumC(Columns.OU_MODE);
+    fun byOuMode(): EnumFilterConnector<ProgramStageWorkingListCollectionRepository, OrganisationUnitMode> {
+        return cf.enumC(ProgramStageWorkingListTableInfo.Columns.OU_MODE)
     }
 
-    public EnumFilterConnector<ProgramStageWorkingListCollectionRepository, AssignedUserMode> byAssignedUserMode() {
-        return cf.enumC(Columns.ASSIGNED_USER_MODE);
+    fun byAssignedUserMode(): EnumFilterConnector<ProgramStageWorkingListCollectionRepository, AssignedUserMode> {
+        return cf.enumC(ProgramStageWorkingListTableInfo.Columns.ASSIGNED_USER_MODE)
     }
 
-    public ProgramStageWorkingListCollectionRepository withDataFilters() {
-        return cf.withChild(ProgramStageQueryCriteriaFields.DATA_FILTERS);
+    fun withDataFilters(): ProgramStageWorkingListCollectionRepository {
+        return cf.withChild(ProgramStageQueryCriteriaFields.DATA_FILTERS)
     }
 
-    public ProgramStageWorkingListCollectionRepository withAttributeValueFilters() {
-        return cf.withChild(ProgramStageQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER);
+    fun withAttributeValueFilters(): ProgramStageWorkingListCollectionRepository {
+        return cf.withChild(ProgramStageQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER)
     }
-}
\ No newline at end of file
+}

From fbdc7dd5f5526d5eb3df014f2f59276e4b693964 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:09:32 +0200
Subject: [PATCH 347/478] [ANDROSDK-1717] Rename .java to .kt

---
 ....java => ProgramTrackedEntityAttributeCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/program/{ProgramTrackedEntityAttributeCollectionRepository.java => ProgramTrackedEntityAttributeCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt

From f6abaf9f0d706f2132f036a84656ee00060cc824 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:09:33 +0200
Subject: [PATCH 348/478] [ANDROSDK-1717] Refactor
 ProgramTrackedEntityAttributeCollectionRepository to Kotlin

---
 ...ckedEntityAttributeCollectionRepository.kt | 103 +++++++++---------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
index e24a2fdaac..ca41e6551d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
@@ -25,74 +25,75 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.program;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo.Columns;
-import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeFields;
-import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.program
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeFields
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore
+import javax.inject.Inject
 
 @Reusable
-public final class ProgramTrackedEntityAttributeCollectionRepository
-        extends ReadOnlyNameableCollectionRepositoryImpl
-        <ProgramTrackedEntityAttribute, ProgramTrackedEntityAttributeCollectionRepository> {
-
-    @Inject
-    ProgramTrackedEntityAttributeCollectionRepository(
-            final ProgramTrackedEntityAttributeStore store,
-            final Map<String, ChildrenAppender<ProgramTrackedEntityAttribute>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ProgramTrackedEntityAttributeCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> byMandatory() {
-        return cf.bool(Columns.MANDATORY);
+class ProgramTrackedEntityAttributeCollectionRepository @Inject internal constructor(
+    store: ProgramTrackedEntityAttributeStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramTrackedEntityAttribute>>,
+    scope: RepositoryScope,
+) : ReadOnlyNameableCollectionRepositoryImpl<ProgramTrackedEntityAttribute, ProgramTrackedEntityAttributeCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ProgramTrackedEntityAttributeCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byMandatory(): BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.bool(ProgramTrackedEntityAttributeTableInfo.Columns.MANDATORY)
     }
 
-    public StringFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> byTrackedEntityAttribute() {
-        return cf.string(Columns.TRACKED_ENTITY_ATTRIBUTE);
+    fun byTrackedEntityAttribute(): StringFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.string(ProgramTrackedEntityAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE)
     }
 
-    public BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> byAllowFutureDate() {
-        return cf.bool(Columns.ALLOW_FUTURE_DATE);
+    fun byAllowFutureDate(): BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.bool(ProgramTrackedEntityAttributeTableInfo.Columns.ALLOW_FUTURE_DATE)
     }
 
-    public BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> byDisplayInList() {
-        return cf.bool(Columns.DISPLAY_IN_LIST);
+    fun byDisplayInList(): BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.bool(ProgramTrackedEntityAttributeTableInfo.Columns.DISPLAY_IN_LIST)
     }
 
-    public StringFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> byProgram() {
-        return cf.string(Columns.PROGRAM);
+    fun byProgram(): StringFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.string(ProgramTrackedEntityAttributeTableInfo.Columns.PROGRAM)
     }
 
-    public IntegerFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> bySortOrder() {
-        return cf.integer(Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.integer(ProgramTrackedEntityAttributeTableInfo.Columns.SORT_ORDER)
     }
 
-    public BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> bySearchable() {
-        return cf.bool(Columns.SEARCHABLE);
+    fun bySearchable(): BooleanFilterConnector<ProgramTrackedEntityAttributeCollectionRepository> {
+        return cf.bool(ProgramTrackedEntityAttributeTableInfo.Columns.SEARCHABLE)
     }
 
-    public ProgramTrackedEntityAttributeCollectionRepository withRenderType() {
-        return cf.withChild(ProgramTrackedEntityAttributeFields.RENDER_TYPE);
+    fun withRenderType(): ProgramTrackedEntityAttributeCollectionRepository {
+        return cf.withChild(ProgramTrackedEntityAttributeFields.RENDER_TYPE)
     }
 
-    public ProgramTrackedEntityAttributeCollectionRepository orderBySortOrder(
-            RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.SORT_ORDER, direction);
+    fun orderBySortOrder(
+        direction: OrderByDirection?,
+    ): ProgramTrackedEntityAttributeCollectionRepository {
+        return cf.withOrderBy(ProgramTrackedEntityAttributeTableInfo.Columns.SORT_ORDER, direction)
     }
 }

From f2b107c0218407761b85bb647b005e6bd29dc9cd Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:18:10 +0200
Subject: [PATCH 349/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...lectionRepository.java => RelationshipCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/{RelationshipCollectionRepository.java => RelationshipCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt

From 22514834877ff81987b54a7966a9c4712f8b428a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:18:11 +0200
Subject: [PATCH 350/478] [ANDROSDK-1717] Refactor
 RelationshipCollectionRepository to Kotlin

---
 .../RelationshipCollectionRepository.kt       | 253 +++++++++---------
 1 file changed, 123 insertions(+), 130 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
index 93a5113c94..d87b00fec0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
@@ -25,133 +25,123 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.relationship;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.StoreWithState;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseReadOnlyWithUidCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler;
-import org.hisp.dhis.android.core.relationship.internal.RelationshipItemElementStoreSelector;
-import org.hisp.dhis.android.core.relationship.internal.RelationshipManager;
-import org.hisp.dhis.android.core.relationship.internal.RelationshipStore;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+package org.hisp.dhis.android.core.relationship
+
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseReadOnlyWithUidCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withUidFilterItem
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
+import org.hisp.dhis.android.core.relationship.internal.RelationshipItemElementStoreSelector
+import org.hisp.dhis.android.core.relationship.internal.RelationshipManager
+import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
+import javax.inject.Inject
 
 @Reusable
-public class RelationshipCollectionRepository
-        extends BaseReadOnlyWithUidCollectionRepositoryImpl<Relationship, RelationshipCollectionRepository>
-        implements ReadWriteWithUidCollectionRepository<Relationship, Relationship> {
-
-    private final RelationshipStore store;
-    private final RelationshipHandler relationshipHandler;
-    private final RelationshipItemElementStoreSelector storeSelector;
-    private final RelationshipManager relationshipManager;
-    private final TrackerDataManager trackerDataManager;
-
-    @Inject
-    RelationshipCollectionRepository(final RelationshipStore store,
-                                     final Map<String, ChildrenAppender<Relationship>> childrenAppenders,
-                                     final RepositoryScope scope,
-                                     final RelationshipHandler relationshipHandler,
-                                     final RelationshipItemElementStoreSelector storeSelector,
-                                     final RelationshipManager relationshipManager,
-                                     final TrackerDataManager trackerDataManager) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new RelationshipCollectionRepository(store, childrenAppenders, s,
-                        relationshipHandler, storeSelector, relationshipManager, trackerDataManager)));
-        this.store = store;
-        this.relationshipHandler = relationshipHandler;
-        this.storeSelector = storeSelector;
-        this.relationshipManager = relationshipManager;
-        this.trackerDataManager = trackerDataManager;
-    }
-
-    @Override
-    public Single<String> add(Relationship relationship) {
-        return Single.fromCallable(() -> blockingAdd(relationship));
+class RelationshipCollectionRepository @Inject internal constructor(
+    private val relationshipStore: RelationshipStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Relationship>>,
+    scope: RepositoryScope,
+    private val relationshipHandler: RelationshipHandler,
+    private val storeSelector: RelationshipItemElementStoreSelector,
+    private val relationshipManager: RelationshipManager,
+    private val trackerDataManager: TrackerDataManager,
+) : BaseReadOnlyWithUidCollectionRepositoryImpl<Relationship, RelationshipCollectionRepository>(
+    relationshipStore,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        RelationshipCollectionRepository(
+            relationshipStore,
+            childrenAppenders,
+            s,
+            relationshipHandler,
+            storeSelector,
+            relationshipManager,
+            trackerDataManager,
+        )
+    },
+),
+    ReadWriteWithUidCollectionRepository<Relationship, Relationship> {
+    override fun add(o: Relationship): Single<String> {
+        return Single.fromCallable { blockingAdd(o) }
     }
 
-    @Override
-    public String blockingAdd(Relationship relationship) throws D2Error {
-        Relationship relationshipWithUid;
-        if (relationshipHandler.doesRelationshipExist(relationship)) {
+    @Throws(D2Error::class)
+    override fun blockingAdd(o: Relationship): String {
+        val relationshipWithUid: Relationship
+        if (relationshipHandler.doesRelationshipExist(o)) {
             throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.CANT_CREATE_EXISTING_OBJECT)
-                    .errorDescription("Tried to create already existing Relationship: " + relationship)
-                    .build();
-        } else if (relationship.from() == null || relationship.to() == null) {
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.CANT_CREATE_EXISTING_OBJECT)
+                .errorDescription("Tried to create already existing Relationship: $o")
+                .build()
+        } else if (o.from() == null || o.to() == null) {
             throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.CANT_CREATE_EXISTING_OBJECT)
-                    .errorDescription("Relationship is missing either 'from' or 'to' component.")
-                    .build();
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.CANT_CREATE_EXISTING_OBJECT)
+                .errorDescription("Relationship is missing either 'from' or 'to' component.")
+                .build()
         } else {
-            RelationshipItem from = relationship.from();
-            if (relationship.uid() == null) {
-                String generatedUid = new UidGeneratorImpl().generate();
-                relationshipWithUid = relationship.toBuilder().uid(generatedUid).build();
+            val from = o.from()
+            relationshipWithUid = if (o.uid() == null) {
+                val generatedUid = UidGeneratorImpl().generate()
+                o.toBuilder().uid(generatedUid).build()
             } else {
-                relationshipWithUid = relationship;
+                o
             }
-
-            StoreWithState fromStore = storeSelector.getElementStore(from);
-            State fromState = fromStore.getSyncState(from.elementUid());
-
+            val fromStore = storeSelector.getElementStore(from)
+            val fromState = fromStore.getSyncState(from!!.elementUid())
             if (isUpdatableState(fromState)) {
-                relationshipHandler.handle(relationshipWithUid, r -> r.toBuilder()
+                relationshipHandler.handle(relationshipWithUid) { r: Relationship ->
+                    r.toBuilder()
                         .syncState(State.TO_POST)
                         .deleted(false)
-                        .build());
-                trackerDataManager.propagateRelationshipUpdate(relationship, HandleAction.Insert);
+                        .build()
+                }
+                trackerDataManager.propagateRelationshipUpdate(o, HandleAction.Insert)
             } else {
                 throw D2Error
-                        .builder()
-                        .errorComponent(D2ErrorComponent.SDK)
-                        .errorCode(D2ErrorCode.OBJECT_CANT_BE_UPDATED)
-                        .errorDescription(
-                                "RelationshipItem from doesn't have updatable state: " +
-                                        "(" + from + ": " + fromState + ")")
-                        .build();
+                    .builder()
+                    .errorComponent(D2ErrorComponent.SDK)
+                    .errorCode(D2ErrorCode.OBJECT_CANT_BE_UPDATED)
+                    .errorDescription(
+                        "RelationshipItem from doesn't have updatable state: " +
+                            "(" + from + ": " + fromState + ")",
+                    )
+                    .build()
             }
         }
-        return relationshipWithUid.uid();
+        return relationshipWithUid.uid()!!
     }
 
-    @Override
-    public ReadWriteObjectRepository<Relationship> uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new RelationshipObjectRepository(store, uid, childrenAppenders, updatedScope, trackerDataManager);
+    override fun uid(uid: String?): ReadWriteObjectRepository<Relationship> {
+        val updatedScope: RepositoryScope = withUidFilterItem(scope, uid)
+        return RelationshipObjectRepository(relationshipStore, uid, childrenAppenders, updatedScope, trackerDataManager)
     }
 
-    private boolean isUpdatableState(State state) {
-        return state != State.RELATIONSHIP;
+    private fun isUpdatableState(state: State?): Boolean {
+        return state !== State.RELATIONSHIP
     }
 
     /**
@@ -160,8 +150,8 @@ public class RelationshipCollectionRepository
      * @param searchItem Relationship item
      * @return List of relationships
      */
-    public List<Relationship> getByItem(@NonNull RelationshipItem searchItem) {
-        return relationshipManager.getByItem(searchItem, false, true);
+    fun getByItem(searchItem: RelationshipItem): List<Relationship> {
+        return relationshipManager.getByItem(searchItem, includeDeleted = false, onlyAccessible = true)
     }
 
     /**
@@ -171,8 +161,8 @@ public class RelationshipCollectionRepository
      * @param includeDeleted Whether to include deleted relationships or not
      * @return List of relationships
      */
-    public List<Relationship> getByItem(@NonNull RelationshipItem searchItem, Boolean includeDeleted) {
-        return relationshipManager.getByItem(searchItem, includeDeleted, true);
+    fun getByItem(searchItem: RelationshipItem, includeDeleted: Boolean): List<Relationship> {
+        return relationshipManager.getByItem(searchItem, includeDeleted, true)
     }
 
     /**
@@ -180,39 +170,42 @@ public class RelationshipCollectionRepository
      * @param searchItem Relationship item
      * @param includeDeleted Whether to include deleted relationships or not
      * @param onlyAccessible Whether to include only accessible relationships (owned relationships or any bidirectional
-     *                       relationship) or all linked relationships
+     * relationship) or all linked relationships
      * @return List of relationships
      */
-    public List<Relationship> getByItem(@NonNull RelationshipItem searchItem, Boolean includeDeleted,
-                                        Boolean onlyAccessible) {
-        return relationshipManager.getByItem(searchItem, includeDeleted, onlyAccessible);
+    fun getByItem(
+        searchItem: RelationshipItem,
+        includeDeleted: Boolean,
+        onlyAccessible: Boolean,
+    ): List<Relationship> {
+        return relationshipManager.getByItem(searchItem, includeDeleted, onlyAccessible)
     }
 
-    public StringFilterConnector<RelationshipCollectionRepository> byUid() {
-        return cf.string(IdentifiableColumns.UID);
+    fun byUid(): StringFilterConnector<RelationshipCollectionRepository> {
+        return cf.string(IdentifiableColumns.UID)
     }
 
-    public StringFilterConnector<RelationshipCollectionRepository> byName() {
-        return cf.string(IdentifiableColumns.NAME);
+    fun byName(): StringFilterConnector<RelationshipCollectionRepository> {
+        return cf.string(IdentifiableColumns.NAME)
     }
 
-    public DateFilterConnector<RelationshipCollectionRepository> byCreated() {
-        return cf.date(IdentifiableColumns.CREATED);
+    fun byCreated(): DateFilterConnector<RelationshipCollectionRepository> {
+        return cf.date(IdentifiableColumns.CREATED)
     }
 
-    public DateFilterConnector<RelationshipCollectionRepository> byLastUpdated() {
-        return cf.date(IdentifiableColumns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<RelationshipCollectionRepository> {
+        return cf.date(IdentifiableColumns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<RelationshipCollectionRepository> byRelationshipType() {
-        return cf.string(RelationshipTableInfo.Columns.RELATIONSHIP_TYPE);
+    fun byRelationshipType(): StringFilterConnector<RelationshipCollectionRepository> {
+        return cf.string(RelationshipTableInfo.Columns.RELATIONSHIP_TYPE)
     }
 
-    public EnumFilterConnector<RelationshipCollectionRepository, State> bySyncState() {
-        return cf.enumC(RelationshipTableInfo.Columns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<RelationshipCollectionRepository, State> {
+        return cf.enumC(RelationshipTableInfo.Columns.SYNC_STATE)
     }
 
-    public RelationshipCollectionRepository withItems() {
-        return cf.withChild(RelationshipFields.ITEMS);
+    fun withItems(): RelationshipCollectionRepository {
+        return cf.withChild(RelationshipFields.ITEMS)
     }
-}
\ No newline at end of file
+}

From a2bbb9247f8236a7a579512fa9343cb20e9613bf Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:19:14 +0200
Subject: [PATCH 351/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...onCollectionRepository.java => SectionCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/{SectionCollectionRepository.java => SectionCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt

From 24e7ff303f6f8a7287b2e415228cc8843baead72 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:19:14 +0200
Subject: [PATCH 352/478] [ANDROSDK-1717] Refactor SectionCollectionRepository
 to Kotlin

---
 .../dataset/SectionCollectionRepository.kt    | 89 ++++++++++---------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
index 0660260494..7bb07aebb8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
@@ -25,65 +25,68 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset;
+package org.hisp.dhis.android.core.dataset
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.dataset.internal.SectionFields;
-import org.hisp.dhis.android.core.dataset.internal.SectionStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.dataset.internal.SectionFields
+import org.hisp.dhis.android.core.dataset.internal.SectionStore
+import javax.inject.Inject
 
 @Reusable
-public final class SectionCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<Section, SectionCollectionRepository> {
-
-    @Inject
-    SectionCollectionRepository(final SectionStore store,
-                                final Map<String, ChildrenAppender<Section>> childrenAppenders,
-                                final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new SectionCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<SectionCollectionRepository> byDescription() {
-        return cf.string(SectionTableInfo.Columns.DESCRIPTION);
+class SectionCollectionRepository @Inject internal constructor(
+    store: SectionStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Section>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Section, SectionCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        SectionCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDescription(): StringFilterConnector<SectionCollectionRepository> {
+        return cf.string(SectionTableInfo.Columns.DESCRIPTION)
     }
 
-    public IntegerFilterConnector<SectionCollectionRepository> bySortOrder() {
-        return cf.integer(SectionTableInfo.Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<SectionCollectionRepository> {
+        return cf.integer(SectionTableInfo.Columns.SORT_ORDER)
     }
 
-    public BooleanFilterConnector<SectionCollectionRepository> byShowRowTotals() {
-        return cf.bool(SectionTableInfo.Columns.SHOW_ROW_TOTALS);
+    fun byShowRowTotals(): BooleanFilterConnector<SectionCollectionRepository> {
+        return cf.bool(SectionTableInfo.Columns.SHOW_ROW_TOTALS)
     }
 
-    public BooleanFilterConnector<SectionCollectionRepository> byShowColumnTotals() {
-        return cf.bool(SectionTableInfo.Columns.SHOW_COLUMN_TOTALS);
+    fun byShowColumnTotals(): BooleanFilterConnector<SectionCollectionRepository> {
+        return cf.bool(SectionTableInfo.Columns.SHOW_COLUMN_TOTALS)
     }
 
-    public StringFilterConnector<SectionCollectionRepository> byDataSetUid() {
-        return cf.string(SectionTableInfo.Columns.DATA_SET);
+    fun byDataSetUid(): StringFilterConnector<SectionCollectionRepository> {
+        return cf.string(SectionTableInfo.Columns.DATA_SET)
     }
 
-    public SectionCollectionRepository withDataElements() {
-        return cf.withChild(SectionFields.DATA_ELEMENTS);
+    fun withDataElements(): SectionCollectionRepository {
+        return cf.withChild(SectionFields.DATA_ELEMENTS)
     }
 
-    public SectionCollectionRepository withGreyedFields() {
-        return cf.withChild(SectionFields.GREYED_FIELDS);
+    fun withGreyedFields(): SectionCollectionRepository {
+        return cf.withChild(SectionFields.GREYED_FIELDS)
     }
 
-    public SectionCollectionRepository withIndicators() {
-        return cf.withChild(SectionFields.INDICATORS);
+    fun withIndicators(): SectionCollectionRepository {
+        return cf.withChild(SectionFields.INDICATORS)
     }
 }

From 375ec16fccb4103893085c450ada0a3b26c9e7e8 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:20:38 +0200
Subject: [PATCH 353/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ectionRepository.java => SystemSettingCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{SystemSettingCollectionRepository.java => SystemSettingCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt

From 3b4f1786c708cf81bbff73777f4a9aa881aaf5bd Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:20:39 +0200
Subject: [PATCH 354/478] [ANDROSDK-1717] Refactor
 SystemSettingCollectionRepository to Kotlin

---
 .../SystemSettingCollectionRepository.kt      | 76 ++++++++++---------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
index c6dcea5514..e6e2ef20d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
@@ -25,50 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.settings
 
-package org.hisp.dhis.android.core.settings;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyOneObjectRepositoryFinalImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.settings.internal.SystemSettingStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.settings.SystemSetting.SystemSettingKey
+import org.hisp.dhis.android.core.settings.internal.SystemSettingStore
+import javax.inject.Inject
 
 @Reusable
-public final class SystemSettingCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<SystemSetting, SystemSettingCollectionRepository> {
-
-    @Inject
-    SystemSettingCollectionRepository(final SystemSettingStore store,
-                                      final Map<String, ChildrenAppender<SystemSetting>> childrenAppenders,
-                                      final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new SystemSettingCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public EnumFilterConnector<SystemSettingCollectionRepository, SystemSetting.SystemSettingKey> byKey() {
-        return cf.enumC(SystemSettingTableInfo.Columns.KEY);
+class SystemSettingCollectionRepository @Inject internal constructor(
+    store: SystemSettingStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<SystemSetting>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<SystemSetting, SystemSettingCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        SystemSettingCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byKey(): EnumFilterConnector<SystemSettingCollectionRepository, SystemSettingKey> {
+        return cf.enumC(SystemSettingTableInfo.Columns.KEY)
     }
 
-    public StringFilterConnector<SystemSettingCollectionRepository> byValue() {
-        return cf.string(SystemSettingTableInfo.Columns.VALUE);
+    fun byValue(): StringFilterConnector<SystemSettingCollectionRepository> {
+        return cf.string(SystemSettingTableInfo.Columns.VALUE)
     }
 
-    public ReadOnlyOneObjectRepositoryFinalImpl<SystemSetting> flag() {
-        return byKey().eq(SystemSetting.SystemSettingKey.FLAG).one();
-
+    fun flag(): ReadOnlyOneObjectRepositoryFinalImpl<SystemSetting> {
+        return byKey().eq(SystemSettingKey.FLAG).one()
     }
 
-    public ReadOnlyOneObjectRepositoryFinalImpl<SystemSetting> style() {
-        return byKey().eq(SystemSetting.SystemSettingKey.STYLE).one();
+    fun style(): ReadOnlyOneObjectRepositoryFinalImpl<SystemSetting> {
+        return byKey().eq(SystemSettingKey.STYLE).one()
     }
-}
\ No newline at end of file
+}

From 3da796a4b984c6e43e736d34bbd9114b08722f72 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:23:39 +0200
Subject: [PATCH 355/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ository.java => TrackedEntityAttributeCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityAttributeCollectionRepository.java => TrackedEntityAttributeCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt

From 4139cd836066452666bcb4aaa896cc0f78e2c965 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:23:40 +0200
Subject: [PATCH 356/478] [ANDROSDK-1717] Refactor
 TrackedEntityAttributeCollectionRepository to Kotlin

---
 ...ckedEntityAttributeCollectionRepository.kt | 142 +++++++++---------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
index 134b4d8cd3..cd544509d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
@@ -25,114 +25,114 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeFields;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.trackedentity
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityAttributeCollectionRepository
-        extends ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityAttribute,
-        TrackedEntityAttributeCollectionRepository> {
-
-    @Inject
-    TrackedEntityAttributeCollectionRepository(final TrackedEntityAttributeStore store,
-                                               final Map<String, ChildrenAppender<TrackedEntityAttribute>>
-                                                       childrenAppenders,
-                                               final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new TrackedEntityAttributeCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byPattern() {
-        return cf.string(Columns.PATTERN);
+class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
+    store: TrackedEntityAttributeStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityAttribute>>,
+    scope: RepositoryScope,
+) : ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityAttribute, TrackedEntityAttributeCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityAttributeCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byPattern(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.PATTERN)
     }
 
-    public IntegerFilterConnector<TrackedEntityAttributeCollectionRepository> bySortOrderInListNoProgram() {
-        return cf.integer(Columns.SORT_ORDER_IN_LIST_NO_PROGRAM);
+    fun bySortOrderInListNoProgram(): IntegerFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.integer(TrackedEntityAttributeTableInfo.Columns.SORT_ORDER_IN_LIST_NO_PROGRAM)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byOptionSetUid() {
-        return cf.string(Columns.OPTION_SET);
+    fun byOptionSetUid(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.OPTION_SET)
     }
 
-    public EnumFilterConnector<TrackedEntityAttributeCollectionRepository, ValueType> byValueType() {
-        return cf.enumC(Columns.VALUE_TYPE);
+    fun byValueType(): EnumFilterConnector<TrackedEntityAttributeCollectionRepository, ValueType> {
+        return cf.enumC(TrackedEntityAttributeTableInfo.Columns.VALUE_TYPE)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byExpression() {
-        return cf.string(Columns.EXPRESSION);
+    fun byExpression(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.EXPRESSION)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byProgramScope() {
-        return cf.bool(Columns.PROGRAM_SCOPE);
+    fun byProgramScope(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.PROGRAM_SCOPE)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byDisplayInListNoProgram() {
-        return cf.bool(Columns.DISPLAY_IN_LIST_NO_PROGRAM);
+    fun byDisplayInListNoProgram(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.DISPLAY_IN_LIST_NO_PROGRAM)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byGenerated() {
-        return cf.bool(Columns.GENERATED);
+    fun byGenerated(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.GENERATED)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byDisplayOnVisitSchedule() {
-        return cf.bool(Columns.DISPLAY_ON_VISIT_SCHEDULE);
+    fun byDisplayOnVisitSchedule(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.DISPLAY_ON_VISIT_SCHEDULE)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byConfidential() {
-        return cf.bool(Columns.CONFIDENTIAL);
+    fun byConfidential(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.CONFIDENTIAL)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byOrgUnitScope() {
-        return cf.bool(TrackedEntityAttributeFields.ORG_UNIT_SCOPE);
+    fun byOrgUnitScope(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeFields.ORG_UNIT_SCOPE)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byUnique() {
-        return cf.bool(TrackedEntityAttributeTableInfo.Columns.UNIQUE);
+    fun byUnique(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.UNIQUE)
     }
 
-    public BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> byInherit() {
-        return cf.bool(Columns.INHERIT);
+    fun byInherit(): BooleanFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityAttributeTableInfo.Columns.INHERIT)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byFieldMask() {
-        return cf.string(Columns.FIELD_MASK);
+    fun byFieldMask(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.FIELD_MASK)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byFormName() {
-        return cf.string(Columns.FORM_NAME);
+    fun byFormName(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.FORM_NAME)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byDisplayFormName() {
-        return cf.string(Columns.DISPLAY_FORM_NAME);
+    fun byDisplayFormName(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.DISPLAY_FORM_NAME)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<TrackedEntityAttributeCollectionRepository> {
+        return cf.string(TrackedEntityAttributeTableInfo.Columns.ICON)
     }
 
-    public TrackedEntityAttributeCollectionRepository withLegendSets() {
-        return cf.withChild(TrackedEntityAttributeFields.LEGEND_SETS);
+    fun withLegendSets(): TrackedEntityAttributeCollectionRepository {
+        return cf.withChild(TrackedEntityAttributeFields.LEGEND_SETS)
     }
 }

From ea54140a407ebe587a636957c0f989322db7c2aa Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:25:06 +0200
Subject: [PATCH 357/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ry.java => TrackedEntityAttributeValueCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityAttributeValueCollectionRepository.java => TrackedEntityAttributeValueCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt

From 48924ef620aca36b0eed4e86469694e5e712b9d2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:25:06 +0200
Subject: [PATCH 358/478] [ANDROSDK-1717] Refactor
 TrackedEntityAttributeValueCollectionRepository to Kotlin

---
 ...ntityAttributeValueCollectionRepository.kt | 114 +++++++++---------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
index 9d51d1be90..71f49bb8c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
@@ -25,74 +25,78 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity
 
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DeletedFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DeletedFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityAttributeValueCollectionRepository extends ReadOnlyCollectionRepositoryImpl
-        <TrackedEntityAttributeValue, TrackedEntityAttributeValueCollectionRepository> {
-
-    private final TrackedEntityAttributeValueStore store;
-    private final DataStatePropagator dataStatePropagator;
-
-    @Inject
-    TrackedEntityAttributeValueCollectionRepository(
-            final TrackedEntityAttributeValueStore store,
-            final Map<String, ChildrenAppender<TrackedEntityAttributeValue>> childrenAppenders,
-            final RepositoryScope scope,
-            final DataStatePropagator dataStatePropagator) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope, s ->
-                new TrackedEntityAttributeValueCollectionRepository(store, childrenAppenders, s, dataStatePropagator)));
-        this.store = store;
-        this.dataStatePropagator = dataStatePropagator;
-    }
-
-    public TrackedEntityAttributeValueObjectRepository value(String trackedEntityAttribute,
-                                                             String trackedEntityInstance) {
-        RepositoryScope updatedScope = byTrackedEntityAttribute().eq(trackedEntityAttribute)
-                .byTrackedEntityInstance().eq(trackedEntityInstance).scope;
-        return new TrackedEntityAttributeValueObjectRepository(store, childrenAppenders, updatedScope,
-                dataStatePropagator, trackedEntityAttribute, trackedEntityInstance);
+class TrackedEntityAttributeValueCollectionRepository @Inject internal constructor(
+    private val store: TrackedEntityAttributeValueStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityAttributeValue>>,
+    scope: RepositoryScope,
+    private val dataStatePropagator: DataStatePropagator,
+) : ReadOnlyCollectionRepositoryImpl<TrackedEntityAttributeValue, TrackedEntityAttributeValueCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityAttributeValueCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+            dataStatePropagator,
+        )
+    },
+) {
+    fun value(
+        trackedEntityAttribute: String,
+        trackedEntityInstance: String,
+    ): TrackedEntityAttributeValueObjectRepository {
+        val updatedScope = byTrackedEntityAttribute().eq(trackedEntityAttribute)
+            .byTrackedEntityInstance().eq(trackedEntityInstance).scope
+        return TrackedEntityAttributeValueObjectRepository(
+            store,
+            childrenAppenders,
+            updatedScope,
+            dataStatePropagator,
+            trackedEntityAttribute,
+            trackedEntityInstance,
+        )
     }
 
-    public StringFilterConnector<TrackedEntityAttributeValueCollectionRepository> byTrackedEntityAttribute() {
-        return cf.string(Columns.TRACKED_ENTITY_ATTRIBUTE);
+    fun byTrackedEntityAttribute(): StringFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
+        return cf.string(TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeValueCollectionRepository> byValue() {
-        return cf.string(Columns.VALUE);
+    fun byValue(): StringFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
+        return cf.string(TrackedEntityAttributeValueTableInfo.Columns.VALUE)
     }
 
-    public DateFilterConnector<TrackedEntityAttributeValueCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
+    fun byCreated(): DateFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
+        return cf.date(TrackedEntityAttributeValueTableInfo.Columns.CREATED)
     }
 
-    public DateFilterConnector<TrackedEntityAttributeValueCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
+        return cf.date(TrackedEntityAttributeValueTableInfo.Columns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<TrackedEntityAttributeValueCollectionRepository> byTrackedEntityInstance() {
-        return cf.string(Columns.TRACKED_ENTITY_INSTANCE);
+    fun byTrackedEntityInstance(): StringFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
+        return cf.string(TrackedEntityAttributeValueTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
     }
 
-    public DeletedFilterConnector<TrackedEntityAttributeValueCollectionRepository> byDeleted() {
-        return cf.deleted(Columns.VALUE);
+    fun byDeleted(): DeletedFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
+        return cf.deleted(TrackedEntityAttributeValueTableInfo.Columns.VALUE)
     }
-}
\ No newline at end of file
+}

From 5f5323973fd5380a81cd90cf52519e4e54d5c48c Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:26:24 +0200
Subject: [PATCH 359/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ository.java => TrackedEntityDataValueCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityDataValueCollectionRepository.java => TrackedEntityDataValueCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt

From c63cebb008dcb1f99bc90e108382bcbd6885475d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:26:25 +0200
Subject: [PATCH 360/478] [ANDROSDK-1717] Refactor
 TrackedEntityDataValueCollectionRepository to Kotlin

---
 ...ckedEntityDataValueCollectionRepository.kt | 120 +++++++++---------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
index 7bc6ba831b..535b0229c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
@@ -25,81 +25,83 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DeletedFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.trackedentity
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DeletedFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityDataValueCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueCollectionRepository> {
-
-    private final TrackedEntityDataValueStore store;
-    private final DataStatePropagator dataStatePropagator;
-
-    @Inject
-    TrackedEntityDataValueCollectionRepository(
-            final TrackedEntityDataValueStore store,
-            final Map<String, ChildrenAppender<TrackedEntityDataValue>> childrenAppenders,
-            final RepositoryScope scope,
-            final DataStatePropagator dataStatePropagator) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new TrackedEntityDataValueCollectionRepository(store, childrenAppenders, s, dataStatePropagator)));
-        this.store = store;
-        this.dataStatePropagator = dataStatePropagator;
-    }
-
-    public TrackedEntityDataValueObjectRepository value(String event, String dataElement) {
-        RepositoryScope updatedScope = byEvent().eq(event).byDataElement().eq(dataElement).scope;
-        return new TrackedEntityDataValueObjectRepository(
-                store, childrenAppenders, updatedScope, dataStatePropagator, event, dataElement);
+class TrackedEntityDataValueCollectionRepository @Inject internal constructor(
+    private val store: TrackedEntityDataValueStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityDataValue>>,
+    scope: RepositoryScope,
+    private val dataStatePropagator: DataStatePropagator,
+) : ReadOnlyCollectionRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityDataValueCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+            dataStatePropagator,
+        )
+    },
+) {
+    fun value(event: String, dataElement: String): TrackedEntityDataValueObjectRepository {
+        val updatedScope = byEvent().eq(event).byDataElement().eq(dataElement).scope
+        return TrackedEntityDataValueObjectRepository(
+            store,
+            childrenAppenders,
+            updatedScope,
+            dataStatePropagator,
+            event,
+            dataElement,
+        )
     }
 
-    public StringFilterConnector<TrackedEntityDataValueCollectionRepository> byEvent() {
-        return cf.string(Columns.EVENT);
+    fun byEvent(): StringFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.string(TrackedEntityDataValueTableInfo.Columns.EVENT)
     }
 
-    public DateFilterConnector<TrackedEntityDataValueCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
+    fun byCreated(): DateFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.date(TrackedEntityDataValueTableInfo.Columns.CREATED)
     }
 
-    public DateFilterConnector<TrackedEntityDataValueCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.date(TrackedEntityDataValueTableInfo.Columns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<TrackedEntityDataValueCollectionRepository> byDataElement() {
-        return cf.string(Columns.DATA_ELEMENT);
+    fun byDataElement(): StringFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.string(TrackedEntityDataValueTableInfo.Columns.DATA_ELEMENT)
     }
 
-    public StringFilterConnector<TrackedEntityDataValueCollectionRepository> byStoredBy() {
-        return cf.string(Columns.STORED_BY);
+    fun byStoredBy(): StringFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.string(TrackedEntityDataValueTableInfo.Columns.STORED_BY)
     }
 
-    public StringFilterConnector<TrackedEntityDataValueCollectionRepository> byValue() {
-        return cf.string(Columns.VALUE);
+    fun byValue(): StringFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.string(TrackedEntityDataValueTableInfo.Columns.VALUE)
     }
 
-    public BooleanFilterConnector<TrackedEntityDataValueCollectionRepository> byProvidedElsewhere() {
-        return cf.bool(Columns.PROVIDED_ELSEWHERE);
+    fun byProvidedElsewhere(): BooleanFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.bool(TrackedEntityDataValueTableInfo.Columns.PROVIDED_ELSEWHERE)
     }
 
-    public DeletedFilterConnector<TrackedEntityDataValueCollectionRepository> byDeleted() {
-        return cf.deleted(Columns.VALUE);
+    fun byDeleted(): DeletedFilterConnector<TrackedEntityDataValueCollectionRepository> {
+        return cf.deleted(TrackedEntityDataValueTableInfo.Columns.VALUE)
     }
-}
\ No newline at end of file
+}

From 4bfaa0c1aa5c1cc966914da1424989f9510620d2 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 29 Sep 2023 09:29:49 +0200
Subject: [PATCH 361/478] Rename .java to .kt

---
 .../{UntypedModuleDownloader.java => UntypedModuleDownloader.kt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/{UntypedModuleDownloader.java => UntypedModuleDownloader.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.java b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.kt

From 6c23d6e473e0507c7eea519205b26b10bae04690 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 29 Sep 2023 09:29:49 +0200
Subject: [PATCH 362/478] [ANDROSDK-1751] refactor: - Remove RxJava Settings
 related classes (from SettingModuleDownloader in MetadataCall)

---
 .../api/executors/internal/APIDownloader.kt   |   2 +
 .../executors/internal/APIDownloaderImpl.kt   |   5 +
 .../factories/internal/ListCallCoroutines.kt  |  35 ++++++
 .../call/factories/internal/ObjectCall.kt     |   4 +-
 .../internal/UntypedModuleDownloader.kt       |  11 +-
 .../UntypedModuleDownloaderCoroutines.kt      |  33 ++++++
 .../core/domain/metadata/MetadataCall.kt      |   2 +-
 .../settings/internal/AnalyticsSettingCall.kt |  39 +++----
 .../internal/AppearanceSettingCall.kt         |  36 +++---
 .../core/settings/internal/BaseSettingCall.kt |  30 ++---
 .../settings/internal/DataSetSettingCall.kt   |  16 +--
 .../settings/internal/GeneralSettingCall.kt   |  34 +++---
 .../settings/internal/LatestAppVersionCall.kt |  19 ++-
 .../settings/internal/ProgramSettingCall.kt   |  18 +--
 .../settings/internal/SettingAppService.kt    |  24 ++--
 .../internal/SettingModuleDownloader.kt       |  32 +++--
 .../core/settings/internal/SettingService.kt  |  20 ++--
 .../settings/internal/SettingsAppInfoCall.kt  |  77 ++++++------
 .../internal/SettingsAppInfoManager.kt        |   6 +-
 .../internal/SettingsAppInfoManagerImpl.kt    |  37 +++---
 .../internal/SynchronizationSettingCall.kt    |  73 ++++++------
 .../settings/internal/SystemSettingCall.kt    |  14 +--
 .../settings/internal/UserSettingsCall.kt     |   9 +-
 .../core/usecase/UseCaseModuleDownloader.kt   |   6 +-
 .../stock/internal/StockUseCaseCall.kt        |  12 +-
 .../stock/internal/StockUseCaseService.kt     |   2 +-
 .../internal/SettingsAppInfoCallShould.kt     | 110 ++++++++++++------
 27 files changed, 416 insertions(+), 290 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index cdeeb11f67..dea7022857 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -84,6 +84,8 @@ internal interface APIDownloader {
 
     fun <P> downloadObject(handler: Handler<P>, downloader: Single<P>): Single<P>
 
+    suspend fun <P> downloadObjectAsCoroutine(handler: Handler<P>, downloader: suspend () -> P): P
+
     fun <P> downloadPagedPayload(
         pageSize: Int,
         downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index f04a0bdfce..2e052ef29f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -190,6 +190,11 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
             .doOnSuccess { o: P -> handler.handle(o) }
     }
 
+    override suspend fun <P> downloadObjectAsCoroutine(handler: Handler<P>, downloader: suspend () -> P): P {
+        return downloader.invoke()
+            .also { handler.handle(it) }
+    }
+
     override fun <P> downloadPagedPayload(
         pageSize: Int,
         downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt
new file mode 100644
index 0000000000..a0c42fdaa6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import io.reactivex.Single
+
+fun interface ListCallCoroutines<P> {
+    suspend fun download(): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt
index 123af3705d..c0802aac82 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ObjectCall.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import io.reactivex.Single
-
 internal fun interface ObjectCall<P> {
-    fun download(): Single<P>
+    suspend fun download(): P
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.kt
index 3bd466ae71..aebb796b62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloader.kt
@@ -25,11 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.modules.internal
 
-package org.hisp.dhis.android.core.arch.modules.internal;
+import io.reactivex.Completable
 
-import io.reactivex.Completable;
-
-public interface UntypedModuleDownloader {
-   Completable downloadMetadata();
-}
\ No newline at end of file
+fun interface UntypedModuleDownloader {
+    fun downloadMetadata(): Completable
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt
new file mode 100644
index 0000000000..96e6959207
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.modules.internal
+
+internal fun interface UntypedModuleDownloaderCoroutines {
+    suspend fun downloadMetadata()
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index c6dbbbd5c7..247c2d7345 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -125,7 +125,7 @@ internal class MetadataCall @Inject constructor(
     private fun executeIndependentCalls(progressManager: D2ProgressManager): Flow<D2Progress> = flow {
         databaseAdapter.delete(ForeignKeyViolationTableInfo.TABLE_INFO.name())
 
-        systemSettingDownloader.downloadMetadata().blockingAwait()
+        systemSettingDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(SystemSetting::class.java, false))
 
         useCaseDownloader.downloadMetadata().blockingAwait()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index 1b82da13d1..d3a41a8058 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -28,8 +28,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
@@ -42,25 +41,25 @@ internal class AnalyticsSettingCall @Inject constructor(
     private val analyticsTeiSettingHandler: AnalyticsTeiSettingHandler,
     private val analyticsDhisVisualizationsSettingHandler: AnalyticsDhisVisualizationSettingHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager,
-) : BaseSettingCall<AnalyticsSettings>() {
+) : BaseSettingCall<AnalyticsSettings>(coroutineAPICallExecutor) {
 
-    override fun fetch(storeError: Boolean): Single<AnalyticsSettings> {
-        return appVersionManager.getDataStoreVersion().flatMap { version ->
-            when (version) {
-                SettingsAppDataStoreVersion.V1_1 -> {
-                    Single.error(
-                        D2Error.builder()
-                            .errorDescription("Analytics settings not found")
-                            .errorCode(D2ErrorCode.URL_NOT_FOUND)
-                            .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                            .build(),
-                    )
-                }
-                else -> {
-                    apiCallExecutor.wrapSingle(settingAppService.analyticsSettings(version), storeError)
-                }
+    override suspend fun fetch(storeError: Boolean): AnalyticsSettings {
+        return when (val version = appVersionManager.getDataStoreVersion()) {
+            SettingsAppDataStoreVersion.V1_1 -> {
+                throw D2Error.builder()
+                    .errorDescription("Analytics settings not found")
+                    .errorCode(D2ErrorCode.URL_NOT_FOUND)
+                    .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                    .build()
+
+            }
+
+            else -> {
+                coroutineAPICallExecutor.wrap(storeError = storeError) {
+                    settingAppService.analyticsSettings(version)
+                }.getOrThrow()
             }
         }
     }
@@ -69,7 +68,7 @@ internal class AnalyticsSettingCall @Inject constructor(
         val analyticsTeiSettingList = item?.tei() ?: emptyList()
         analyticsTeiSettingHandler.handleMany(analyticsTeiSettingList)
 
-        val analyticsDhisVisualizations: List<AnalyticsDhisVisualization> = item?. let {
+        val analyticsDhisVisualizations: List<AnalyticsDhisVisualization> = item?.let {
             SettingsAppHelper.getAnalyticsDhisVisualizations(it)
         } ?: emptyList()
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index ed1fceb33b..011acfffe7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -29,8 +29,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AppearanceSettings
@@ -42,25 +41,24 @@ internal class AppearanceSettingCall @Inject constructor(
     private val filterSettingHandler: FilterSettingHandler,
     private val programConfigurationSettingHandler: ProgramConfigurationSettingHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager,
-) : BaseSettingCall<AppearanceSettings>() {
+) : BaseSettingCall<AppearanceSettings>(coroutineAPICallExecutor) {
 
-    override fun fetch(storeError: Boolean): Single<AppearanceSettings> {
-        return appVersionManager.getDataStoreVersion().flatMap { version ->
-            when (version) {
-                SettingsAppDataStoreVersion.V1_1 -> {
-                    Single.error(
-                        D2Error.builder()
-                            .errorDescription("Appearance settings not found")
-                            .errorCode(D2ErrorCode.URL_NOT_FOUND)
-                            .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                            .build(),
-                    )
-                }
-                SettingsAppDataStoreVersion.V2_0 -> {
-                    apiCallExecutor.wrapSingle(settingAppService.appearanceSettings(version), storeError)
-                }
+    override suspend fun fetch(storeError: Boolean): AppearanceSettings {
+        return when (val version = appVersionManager.getDataStoreVersion()) {
+            SettingsAppDataStoreVersion.V1_1 -> {
+                throw D2Error.builder()
+                    .errorDescription("Appearance settings not found")
+                    .errorCode(D2ErrorCode.URL_NOT_FOUND)
+                    .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                    .build()
+            }
+
+            SettingsAppDataStoreVersion.V2_0 -> {
+                coroutineAPICallExecutor.wrap(storeError = storeError) {
+                    settingAppService.appearanceSettings(version)
+                }.getOrThrow()
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
index 294c57a6c7..269ba7be15 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
@@ -29,36 +29,28 @@ package org.hisp.dhis.android.core.settings.internal
 
 import io.reactivex.Completable
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import java.net.HttpURLConnection
 
-internal abstract class BaseSettingCall<T> : CompletableProvider {
-
-    override fun getCompletable(storeError: Boolean): Completable {
-        return Completable
-            .fromSingle(download(storeError))
-            .onErrorComplete()
-    }
-
-    fun download(storeError: Boolean): Single<T> {
-        return fetch(storeError)
-            .doOnSuccess { process(it) }
-            .doOnError { throwable: Throwable ->
-                if (throwable is D2Error && isExpectedError(throwable)) {
-                    process(null)
-                }
-            }
+internal abstract class BaseSettingCall<T> internal constructor(
+    val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) {
+    suspend fun download(storeError: Boolean): T {
+        return coroutineAPICallExecutor.wrap {
+            fetch(storeError)
+        }.getOrThrow()
     }
 
     private fun isExpectedError(throwable: D2Error): Boolean {
         return throwable.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ||
-            throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_SUPPORTED ||
-            throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_INSTALLED
+                throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_SUPPORTED ||
+                throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_INSTALLED
     }
 
-    abstract fun fetch(storeError: Boolean): Single<T>
+    abstract suspend fun fetch(storeError: Boolean): T
 
     abstract fun process(item: T?)
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index f12844a4bb..c6ee12e8ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -28,8 +28,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.settings.DataSetSettings
 import javax.inject.Inject
 
@@ -37,14 +36,15 @@ import javax.inject.Inject
 internal class DataSetSettingCall @Inject constructor(
     private val dataSetSettingHandler: DataSetSettingHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager,
-) : BaseSettingCall<DataSetSettings>() {
+) : BaseSettingCall<DataSetSettings>(coroutineAPICallExecutor) {
+
+    override suspend fun fetch(storeError: Boolean): DataSetSettings {
+        return coroutineAPICallExecutor.wrap(storeError = storeError) {
+            settingAppService.dataSetSettings(appVersionManager.getDataStoreVersion())
+        }.getOrThrow()
 
-    override fun fetch(storeError: Boolean): Single<DataSetSettings> {
-        return appVersionManager.getDataStoreVersion().flatMap { version ->
-            apiCallExecutor.wrapSingle(settingAppService.dataSetSettings(version), storeError = storeError)
-        }
     }
 
     override fun process(item: DataSetSettings?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 869258d162..7e9fda6221 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -28,9 +28,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import kotlinx.coroutines.rx2.await
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.settings.GeneralSettings
 import javax.inject.Inject
 
@@ -38,21 +36,15 @@ import javax.inject.Inject
 internal class GeneralSettingCall @Inject constructor(
     private val generalSettingHandler: GeneralSettingHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager,
-) : BaseSettingCall<GeneralSettings>() {
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
+) : BaseSettingCall<GeneralSettings>(coroutineAPICallExecutor) {
 
     private var cachedValue: GeneralSettings? = null
 
-    override fun fetch(storeError: Boolean): Single<GeneralSettings> {
-        return appVersionManager.getDataStoreVersion().flatMap { version ->
-            apiCallExecutor.wrapSingle(settingAppService.generalSettings(version), storeError = storeError)
-        }
-    }
-
-    fun fetch(storeError: Boolean, acceptCache: Boolean = false): Single<GeneralSettings> {
+    suspend fun fetch(storeError: Boolean, acceptCache: Boolean = false): GeneralSettings {
         return when {
-            cachedValue != null && acceptCache -> Single.just(cachedValue)
+            cachedValue != null && acceptCache -> cachedValue!!
             else -> fetch(storeError)
         }
     }
@@ -65,11 +57,15 @@ internal class GeneralSettingCall @Inject constructor(
 
     suspend fun isDatabaseEncrypted(): Boolean {
         // TODO Should we decrypt the database if the settings app is uninstalled?
-        return appVersionManager.updateAppVersion()
-            .flatMap { appVersionManager.getDataStoreVersion() }
-            .flatMap { version ->
-                apiCallExecutor.wrapSingle(settingAppService.generalSettings(version), storeError = false)
-            }
-            .map { obj: GeneralSettings -> obj.encryptDB() }.await()
+        appVersionManager.updateAppVersion()
+        return coroutineAPICallExecutor.wrap(storeError = false) {
+            settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
+        }.getOrThrow().encryptDB()
+    }
+
+    override suspend fun fetch(storeError: Boolean): GeneralSettings {
+        return coroutineAPICallExecutor.wrap(storeError = storeError) {
+            settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
+        }.getOrThrow()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index cf03fd649d..2d248b99f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -29,8 +29,10 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import io.reactivex.Completable
+import kotlinx.coroutines.rx2.rxCompletable
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 import org.hisp.dhis.android.core.settings.LatestAppVersion
 import javax.inject.Inject
 
@@ -38,15 +40,20 @@ import javax.inject.Inject
 internal class LatestAppVersionCall @Inject constructor(
     private val latestAppVersionHandler: LatestAppVersionHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
-) : BaseSettingCall<LatestAppVersion>() {
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
+) : BaseSettingCall<LatestAppVersion>(coroutineAPICallExecutor), CompletableProvider {
 
-    override fun fetch(storeError: Boolean): Single<LatestAppVersion> {
-        return apiCallExecutor.wrapSingle(settingAppService.latestAppVersion(), storeError)
+    override suspend fun fetch(storeError: Boolean): LatestAppVersion {
+        return coroutineAPICallExecutor.wrap(storeError = storeError) { settingAppService.latestAppVersion() }
+            .getOrThrow()
     }
 
     override fun process(item: LatestAppVersion?) {
         val appVersionList = listOfNotNull(item)
         latestAppVersionHandler.handleMany(appVersionList)
     }
+
+    override fun getCompletable(storeError: Boolean): Completable {
+        return rxCompletable { fetch(storeError) }
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index df7cf78a77..c5fa91e336 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -28,8 +28,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import javax.inject.Inject
 
@@ -37,14 +36,17 @@ import javax.inject.Inject
 internal class ProgramSettingCall @Inject constructor(
     private val programSettingHandler: ProgramSettingHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val appVersionManager: SettingsAppInfoManager,
-) : BaseSettingCall<ProgramSettings>() {
+) : BaseSettingCall<ProgramSettings>(coroutineAPICallExecutor) {
+
+    override suspend fun fetch(storeError: Boolean): ProgramSettings {
+        return coroutineAPICallExecutor.wrap(storeError = storeError) {
+            settingAppService.programSettings(
+                appVersionManager.getDataStoreVersion()
+            )
+        }.getOrThrow()
 
-    override fun fetch(storeError: Boolean): Single<ProgramSettings> {
-        return appVersionManager.getDataStoreVersion().flatMap { version ->
-            apiCallExecutor.wrapSingle(settingAppService.programSettings(version), storeError = storeError)
-        }
     }
 
     override fun process(item: ProgramSettings?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
index a83e35438c..5c9f5923ae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
@@ -28,19 +28,25 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import io.reactivex.Single
-import org.hisp.dhis.android.core.settings.*
+import org.hisp.dhis.android.core.settings.AnalyticsSettings
 import org.hisp.dhis.android.core.settings.AppearanceSettings
+import org.hisp.dhis.android.core.settings.DataSetSettings
+import org.hisp.dhis.android.core.settings.GeneralSettings
+import org.hisp.dhis.android.core.settings.LatestAppVersion
+import org.hisp.dhis.android.core.settings.ProgramSettings
+import org.hisp.dhis.android.core.settings.SettingsAppInfo
+import org.hisp.dhis.android.core.settings.SynchronizationSettings
 import javax.inject.Inject
 
 internal class SettingAppService @Inject constructor(
     private val settingService: SettingService,
 ) {
 
-    fun info(): Single<SettingsAppInfo> {
+    suspend fun info(): SettingsAppInfo {
         return settingService.settingsAppInfo("$ANDROID_APP_NAMESPACE_V2/info")
     }
 
-    fun generalSettings(version: SettingsAppDataStoreVersion): Single<GeneralSettings> {
+    suspend fun generalSettings(version: SettingsAppDataStoreVersion): GeneralSettings {
         val key = when (version) {
             SettingsAppDataStoreVersion.V1_1 -> "general_settings"
             else -> "generalSettings"
@@ -49,27 +55,27 @@ internal class SettingAppService @Inject constructor(
         return settingService.generalSettings("${getNamespace(version)}/$key")
     }
 
-    fun dataSetSettings(version: SettingsAppDataStoreVersion): Single<DataSetSettings> {
+    suspend fun dataSetSettings(version: SettingsAppDataStoreVersion): DataSetSettings {
         return settingService.dataSetSettings("${getNamespace(version)}/dataSet_settings")
     }
 
-    fun programSettings(version: SettingsAppDataStoreVersion): Single<ProgramSettings> {
+    suspend fun programSettings(version: SettingsAppDataStoreVersion): ProgramSettings {
         return settingService.programSettings("${getNamespace(version)}/program_settings")
     }
 
-    fun synchronizationSettings(version: SettingsAppDataStoreVersion): Single<SynchronizationSettings> {
+    suspend fun synchronizationSettings(version: SettingsAppDataStoreVersion): SynchronizationSettings {
         return settingService.synchronizationSettings("${getNamespace(version)}/synchronization")
     }
 
-    fun appearanceSettings(version: SettingsAppDataStoreVersion): Single<AppearanceSettings> {
+    suspend fun appearanceSettings(version: SettingsAppDataStoreVersion): AppearanceSettings {
         return settingService.appearanceSettings("${getNamespace(version)}/appearance")
     }
 
-    fun analyticsSettings(version: SettingsAppDataStoreVersion): Single<AnalyticsSettings> {
+    suspend fun analyticsSettings(version: SettingsAppDataStoreVersion): AnalyticsSettings {
         return settingService.analyticsSettings("${getNamespace(version)}/analytics")
     }
 
-    fun latestAppVersion(): Single<LatestAppVersion> {
+    suspend fun latestAppVersion(): LatestAppVersion {
         return settingService.latestAppVersion("$APK_DISTRIBUTION_NAMESPACE/latestVersion")
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
index 567ce5415f..054f644bc4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
@@ -27,10 +27,9 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import android.annotation.SuppressLint
 import dagger.Reusable
-import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import javax.inject.Inject
 
 @Reusable
@@ -42,24 +41,21 @@ internal class SettingModuleDownloader @Inject constructor(
     private val userSettingsCall: UserSettingsCall,
     private val appearanceSettingCall: AppearanceSettingCall,
     private val latestAppVersionCall: LatestAppVersionCall,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
+
+    override suspend fun downloadMetadata() {
+        downloadFromSettingsApp()
+        userSettingsCall.download()
+        systemSettingCall.download()
+        latestAppVersionCall.download(false)
 
-    @SuppressLint("CheckResult")
-    override fun downloadMetadata(): Completable {
-        return Completable.fromAction {
-            downloadFromSettingsApp().blockingAwait()
-            userSettingsCall.download().blockingGet()
-            systemSettingCall.download().blockingGet()
-            latestAppVersionCall.getCompletable(false).blockingAwait()
-        }
     }
 
-    private fun downloadFromSettingsApp(): Completable {
-        return Completable.fromAction {
-            generalSettingCall.getCompletable(false).blockingAwait()
-            synchronizationSettingCall.getCompletable(false).blockingAwait()
-            appearanceSettingCall.getCompletable(false).blockingAwait()
-            analyticsSettingCall.getCompletable(false).blockingAwait()
-        }
+    private suspend fun downloadFromSettingsApp() {
+        generalSettingCall.download(false)
+        synchronizationSettingCall.download(false)
+        appearanceSettingCall.download(false)
+        analyticsSettingCall.download(false)
     }
+
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt
index 54a5f11b22..c11b1be8c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt
@@ -39,35 +39,35 @@ import retrofit2.http.Url
 internal interface SettingService {
 
     @GET("systemSettings")
-    fun getSystemSettingsSingle(@Query("key") @Which fields: Fields<SystemSettings>): Single<SystemSettings>
+    suspend fun getSystemSettingsSingle(@Query("key") @Which fields: Fields<SystemSettings>): SystemSettings
 
     @GET("systemSettings")
     suspend fun getSystemSettings(@Query("key") @Which fields: Fields<SystemSettings>): SystemSettings
 
     @GET("userSettings")
-    fun getUserSettings(@Query("key") @Which fields: Fields<UserSettings>): Single<UserSettings>
+    suspend fun getUserSettings(@Query("key") @Which fields: Fields<UserSettings>): UserSettings
 
     @GET
-    fun settingsAppInfo(@Url url: String): Single<SettingsAppInfo>
+    suspend fun settingsAppInfo(@Url url: String): SettingsAppInfo
 
     @GET
-    fun generalSettings(@Url url: String): Single<GeneralSettings>
+    suspend fun generalSettings(@Url url: String): GeneralSettings
 
     @GET
-    fun dataSetSettings(@Url url: String): Single<DataSetSettings>
+    suspend fun dataSetSettings(@Url url: String): DataSetSettings
 
     @GET
-    fun programSettings(@Url url: String): Single<ProgramSettings>
+    suspend fun programSettings(@Url url: String): ProgramSettings
 
     @GET
-    fun synchronizationSettings(@Url url: String): Single<SynchronizationSettings>
+    suspend fun synchronizationSettings(@Url url: String): SynchronizationSettings
 
     @GET
-    fun appearanceSettings(@Url url: String): Single<AppearanceSettings>
+    suspend fun appearanceSettings(@Url url: String): AppearanceSettings
 
     @GET
-    fun analyticsSettings(@Url url: String): Single<AnalyticsSettings>
+    suspend fun analyticsSettings(@Url url: String): AnalyticsSettings
 
     @GET
-    fun latestAppVersion(@Url url: String): Single<LatestAppVersion>
+    suspend fun latestAppVersion(@Url url: String): LatestAppVersion
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
index 70933cb2f8..310bf55166 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
@@ -29,8 +29,7 @@ package org.hisp.dhis.android.core.settings.internal
 
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import java.net.HttpURLConnection
 import javax.inject.Inject
@@ -38,50 +37,58 @@ import javax.inject.Inject
 @Reusable
 internal class SettingsAppInfoCall @Inject constructor(
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
     companion object {
         const val unknown = "unknown"
     }
 
-    fun fetch(storeError: Boolean): Single<SettingsAppVersion> {
+    suspend fun fetch(storeError: Boolean): SettingsAppVersion {
         return fetchAppVersion(storeError)
     }
 
-    private fun fetchAppVersion(storeError: Boolean): Single<SettingsAppVersion> {
-        return apiCallExecutor.wrapSingle(settingAppService.info(), storeError)
-            .map<SettingsAppVersion> {
-                SettingsAppVersion.Valid(it.dataStoreVersion(), it.androidSettingsVersion() ?: unknown)
-            }
-            .onErrorResumeNext { throwable: Throwable ->
-                return@onErrorResumeNext when {
-                    throwable is D2Error && throwable.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ->
-                        fetchV1GeneralSettings(storeError)
-                    throwable is D2Error && throwable.originalException() is InvalidFormatException ->
-                        Single.just(SettingsAppVersion.DataStoreEmpty)
-                    else ->
-                        Single.error(throwable)
-                }
+    private suspend fun fetchAppVersion(storeError: Boolean): SettingsAppVersion {
+
+        return try {
+
+            val info = coroutineAPICallExecutor.wrap(storeError = storeError) { settingAppService.info() }
+                .getOrThrow()
+
+            SettingsAppVersion.Valid(info.dataStoreVersion(), info.androidSettingsVersion() ?: unknown)
+
+        } catch (exception: D2Error) {
+            when {
+                exception.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ->
+                    fetchV1GeneralSettings(storeError)
+
+                exception.originalException() is InvalidFormatException ->
+                    SettingsAppVersion.DataStoreEmpty
+
+                else ->
+                    throw exception
             }
+        }
     }
 
-    private fun fetchV1GeneralSettings(storeError: Boolean): Single<SettingsAppVersion> {
-        return apiCallExecutor.wrapSingle(
-            settingAppService.generalSettings(SettingsAppDataStoreVersion.V1_1),
-            storeError,
-        )
-            .map<SettingsAppVersion> {
-                SettingsAppVersion.Valid(SettingsAppDataStoreVersion.V1_1, unknown)
-            }
-            .onErrorResumeNext { throwable: Throwable ->
-                return@onErrorResumeNext when {
-                    throwable is D2Error && throwable.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ->
-                        Single.just(SettingsAppVersion.DataStoreEmpty)
-                    throwable is D2Error && throwable.originalException() is InvalidFormatException ->
-                        Single.just(SettingsAppVersion.DataStoreEmpty)
-                    else ->
-                        Single.error(throwable)
-                }
+    private suspend fun fetchV1GeneralSettings(storeError: Boolean): SettingsAppVersion {
+        return try {
+            coroutineAPICallExecutor.wrap(storeError = storeError) {
+                settingAppService.generalSettings(SettingsAppDataStoreVersion.V1_1)
+            }.getOrThrow()
+            SettingsAppVersion.Valid(SettingsAppDataStoreVersion.V1_1, unknown)
+
+        } catch (exception: D2Error) {
+            when {
+                exception.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ->
+                    SettingsAppVersion.DataStoreEmpty
+
+                exception.originalException() is InvalidFormatException ->
+                    SettingsAppVersion.DataStoreEmpty
+
+                else ->
+                    throw exception
             }
+        }
     }
+
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt
index 2de9d60ab4..f7fdd32524 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt
@@ -30,7 +30,7 @@ package org.hisp.dhis.android.core.settings.internal
 import io.reactivex.Single
 
 internal interface SettingsAppInfoManager {
-    fun getDataStoreVersion(): Single<SettingsAppDataStoreVersion>
-    fun getAppVersion(): Single<String>
-    fun updateAppVersion(): Single<SettingsAppVersion>
+    suspend fun getDataStoreVersion(): SettingsAppDataStoreVersion
+    suspend fun getAppVersion(): String
+    suspend fun updateAppVersion(): SettingsAppVersion
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
index fb4ac900c3..5d90e1743d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
@@ -45,34 +45,33 @@ internal class SettingsAppInfoManagerImpl @Inject constructor(
         .errorDescription("The dataStore is empty")
         .build()
 
-    override fun getDataStoreVersion(): Single<SettingsAppDataStoreVersion> {
-        return getOrUpdateAppVersion().flatMap {
-            when (it) {
-                is SettingsAppVersion.Valid -> Single.just(it.dataStore)
-                is SettingsAppVersion.DataStoreEmpty -> Single.error(dataStoreEmpty)
-            }
+    override suspend fun getDataStoreVersion(): SettingsAppDataStoreVersion {
+        return when (val getOrUpdateAppVersion = getOrUpdateAppVersion()) {
+            is SettingsAppVersion.Valid -> getOrUpdateAppVersion.dataStore
+            is SettingsAppVersion.DataStoreEmpty -> throw dataStoreEmpty
         }
+
     }
 
-    override fun getAppVersion(): Single<String> {
-        return getOrUpdateAppVersion().flatMap {
-            when (it) {
-                is SettingsAppVersion.Valid -> Single.just(it.app)
-                is SettingsAppVersion.DataStoreEmpty -> Single.error(dataStoreEmpty)
-            }
+    override suspend fun getAppVersion(): String {
+        return when (val getOrUpdateAppVersion = getOrUpdateAppVersion()) {
+            is SettingsAppVersion.Valid -> getOrUpdateAppVersion.app
+            is SettingsAppVersion.DataStoreEmpty -> throw dataStoreEmpty
         }
+
     }
 
-    override fun updateAppVersion(): Single<SettingsAppVersion> {
-        return settingsAppInfoCall.fetch(false)
-            .doOnSuccess {
-                settingsAppVersion = it
-            }
+    override suspend fun updateAppVersion(): SettingsAppVersion {
+        return try {
+            settingsAppInfoCall.fetch(false).also { settingsAppVersion = it }
+        } catch (exception: D2Error) {
+            SettingsAppVersion.DataStoreEmpty
+        }
+
     }
 
-    private fun getOrUpdateAppVersion(): Single<SettingsAppVersion> {
+    private suspend fun getOrUpdateAppVersion(): SettingsAppVersion {
         return settingsAppVersion
-            ?.let { Single.just(it) }
             ?: updateAppVersion()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index dbe37f58a8..315b1bab6f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -28,8 +28,8 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
@@ -40,53 +40,58 @@ import javax.inject.Inject
 internal class SynchronizationSettingCall @Inject constructor(
     private val synchronizationSettingHandler: SynchronizationSettingHandler,
     private val settingAppService: SettingAppService,
-    private val apiCallExecutor: RxAPICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val generalSettingCall: GeneralSettingCall,
     private val dataSetSettingCall: DataSetSettingCall,
     private val programSettingCall: ProgramSettingCall,
     private val appVersionManager: SettingsAppInfoManager,
-) : BaseSettingCall<SynchronizationSettings>() {
+) : BaseSettingCall<SynchronizationSettings>(coroutineAPICallExecutor) {
 
-    override fun fetch(storeError: Boolean): Single<SynchronizationSettings> {
-        return appVersionManager.getDataStoreVersion().flatMap { version ->
-            when (version) {
-                SettingsAppDataStoreVersion.V1_1 -> {
-                    val generalSettings = tryOrNull(generalSettingCall.fetch(storeError, acceptCache = true))
-                    val dataSetSettings = tryOrNull(dataSetSettingCall.fetch(storeError))
-                    val programSettings = tryOrNull(programSettingCall.fetch(storeError))
+    override suspend fun fetch(storeError: Boolean): SynchronizationSettings {
+        return when (val version = appVersionManager.getDataStoreVersion()) {
+            SettingsAppDataStoreVersion.V1_1 -> {
+                val generalSettings = tryOrNull(generalSettingCall.fetch(storeError, acceptCache = true))
+                val dataSetSettings = tryOrNull(dataSetSettingCall.fetch(storeError))
+                val programSettings = tryOrNull(programSettingCall.fetch(storeError))
 
-                    if (generalSettings == null && dataSetSettings == null && programSettings == null) {
-                        Single.error(
-                            D2Error.builder()
-                                .errorDescription("Synchronization settings not found")
-                                .errorCode(D2ErrorCode.URL_NOT_FOUND)
-                                .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                                .build(),
-                        )
-                    } else {
-                        Single.just(
-                            SynchronizationSettings.builder()
-                                .dataSync(generalSettings?.dataSync())
-                                .metadataSync(generalSettings?.metadataSync())
-                                .dataSetSettings(dataSetSettings)
-                                .programSettings(programSettings)
-                                .build(),
-                        )
-                    }
-                }
-                SettingsAppDataStoreVersion.V2_0 -> {
-                    apiCallExecutor.wrapSingle(settingAppService.synchronizationSettings(version), storeError)
+                if (generalSettings == null && dataSetSettings == null && programSettings == null) {
+                    throw D2Error.builder()
+                        .errorDescription("Synchronization settings not found")
+                        .errorCode(D2ErrorCode.URL_NOT_FOUND)
+                        .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                        .build()
+
+                } else {
+
+                    SynchronizationSettings.builder()
+                        .dataSync(generalSettings?.dataSync())
+                        .metadataSync(generalSettings?.metadataSync())
+                        .dataSetSettings(dataSetSettings)
+                        .programSettings(programSettings)
+                        .build()
                 }
             }
+
+            SettingsAppDataStoreVersion.V2_0 -> {
+                coroutineAPICallExecutor.wrap(storeError = storeError) {
+                    settingAppService.synchronizationSettings(
+                        version
+                    )
+                }.getOrThrow()
+            }
         }
     }
 
+
     override fun process(item: SynchronizationSettings?) {
         val syncSettingsList = listOfNotNull(item)
         synchronizationSettingHandler.handleMany(syncSettingsList)
     }
 
-    private fun <T> tryOrNull(single: Single<T>): T? {
-        return try { single.blockingGet() } catch (e: java.lang.Exception) { null }
+    private fun <T> tryOrNull(call: T): T? {
+        return runBlocking {
+            coroutineAPICallExecutor.wrap { call }.getOrNull()
+        }
+
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
index 0a86aa741c..c3d3ab78cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallCoroutines
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields.allFields
 import javax.inject.Inject
@@ -41,12 +40,13 @@ internal class SystemSettingCall @Inject constructor(
     private val handler: SystemSettingHandler,
     private val service: SettingService,
     private val settingsSplitter: SystemSettingsSplitter,
-) : ListCall<SystemSetting> {
+) : ListCallCoroutines<SystemSetting> {
 
-    override fun download(): Single<List<SystemSetting>> {
-        return apiDownloader.downloadList(
+    override suspend fun download(): List<SystemSetting> {
+        return apiDownloader.downloadListAsCoroutine(
             handler = handler,
-            downloader = service.getSystemSettingsSingle(allFields).map(settingsSplitter::splitSettings),
-        )
+        ) {
+            settingsSplitter.splitSettings(service.getSystemSettingsSingle(allFields))
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
index 015a0aec47..b610bb7a7e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
@@ -28,20 +28,21 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ObjectCall
 import org.hisp.dhis.android.core.settings.UserSettings
 import javax.inject.Inject
 
 @Reusable
-class UserSettingsCall @Inject internal constructor(
+internal class UserSettingsCall @Inject internal constructor(
     private val handler: UserSettingsHandler,
     private val service: SettingService,
     private val apiDownloader: APIDownloader,
 ) : ObjectCall<UserSettings> {
 
-    override fun download(): Single<UserSettings> {
-        return apiDownloader.downloadObject(handler, service.getUserSettings(UserSettingsFields.allFields))
+    override suspend fun download(): UserSettings {
+        return apiDownloader.downloadObjectAsCoroutine(handler) {
+            service.getUserSettings(UserSettingsFields.allFields)
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
index eae4399cee..3746a70c31 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.usecase
 
 import dagger.Reusable
 import io.reactivex.Completable
+import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseCall
 import javax.inject.Inject
@@ -39,8 +40,9 @@ internal class UseCaseModuleDownloader @Inject constructor(
 ) : UntypedModuleDownloader {
 
     override fun downloadMetadata(): Completable {
-        return Completable.fromAction {
-            stockUseCaseCall.getCompletable(false).blockingAwait()
+        return rxCompletable {
+            stockUseCaseCall.download(false)
+
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index 90834cf1f1..001c277e3a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -28,8 +28,7 @@
 package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.settings.internal.BaseSettingCall
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import javax.inject.Inject
@@ -38,11 +37,12 @@ import javax.inject.Inject
 internal class StockUseCaseCall @Inject constructor(
     private val stockUseCaseHandler: StockUseCaseHandler,
     private val stockUseCaseService: StockUseCaseService,
-    private val apiCallExecutor: RxAPICallExecutor,
-) : BaseSettingCall<List<InternalStockUseCase>>() {
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
+) : BaseSettingCall<List<InternalStockUseCase>>(coroutineAPICallExecutor) {
 
-    override fun fetch(storeError: Boolean): Single<List<InternalStockUseCase>> {
-        return apiCallExecutor.wrapSingle(stockUseCaseService.stockUseCases(), storeError = storeError)
+    override suspend fun fetch(storeError: Boolean): List<InternalStockUseCase> {
+        return coroutineAPICallExecutor.wrap(storeError = storeError) { stockUseCaseService.stockUseCases() }
+            .getOrThrow()
     }
 
     override fun process(item: List<InternalStockUseCase>?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt
index b60a043092..bca7d7e93d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt
@@ -34,5 +34,5 @@ import retrofit2.http.GET
 internal interface StockUseCaseService {
 
     @GET("dataStore/USE_CASES/stockUseCases")
-    fun stockUseCases(): Single<List<InternalStockUseCase>>
+    suspend fun stockUseCases(): List<InternalStockUseCase>
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
index e46c254aac..283c02bcbb 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
@@ -29,9 +29,13 @@ package org.hisp.dhis.android.core.settings.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.doThrow
 import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
-import io.reactivex.Single
+import com.nhaarman.mockitokotlin2.stub
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
@@ -44,94 +48,134 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
+@OptIn(ExperimentalCoroutinesApi::class)
+
 @RunWith(JUnit4::class)
 class SettingsAppInfoCallShould {
     private val service: SettingAppService = mock()
     private val apiCallExecutor: RxAPICallExecutor = mock()
 
-    private val settingAppInfoSingle: Single<SettingsAppInfo> = mock()
+    private val settingAppInfoCall: SettingsAppInfo = mock()
     private val settingsAppInfo = SettingsAppInfo.builder()
         .dataStoreVersion(SettingsAppDataStoreVersion.V2_0)
         .build()
 
-    private val generalSettingsSingle: Single<GeneralSettings> = mock()
+    private val generalSettingsCall: GeneralSettings = mock()
     private val generalSettings = GeneralSettings.builder()
         .encryptDB(true)
         .build()
 
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
     private lateinit var dataSetSettingCall: SettingsAppInfoCall
 
     @Before
     fun setUp() {
-        whenever(service.info()) doReturn settingAppInfoSingle
-        whenever(apiCallExecutor.wrapSingle(settingAppInfoSingle, false)) doReturn
-            Single.just(settingsAppInfo)
+        service.stub {
+            onBlocking { info() } doReturn settingAppInfoCall
+        }
+        coroutineAPICallExecutor.stub {
+            onBlocking { wrap { settingAppInfoCall }.getOrThrow() } doReturn
+                    settingsAppInfo
+        }
 
-        whenever(service.generalSettings(SettingsAppDataStoreVersion.V1_1)) doReturn generalSettingsSingle
-        whenever(apiCallExecutor.wrapSingle(generalSettingsSingle, false)) doReturn
-            Single.just(generalSettings)
 
-        dataSetSettingCall = SettingsAppInfoCall(service, apiCallExecutor)
+        service.stub {
+            onBlocking { generalSettings(SettingsAppDataStoreVersion.V1_1) } doReturn generalSettingsCall
+        }
+
+        coroutineAPICallExecutor.stub {
+            onBlocking { wrap { generalSettingsCall }.getOrThrow() } doReturn generalSettings
+        }
+
+
+        dataSetSettingCall = SettingsAppInfoCall(service, coroutineAPICallExecutor)
     }
 
     @Test
-    fun default_to_version_2_if_info_found() {
-        when (val version = dataSetSettingCall.fetch(false).blockingGet()) {
+    fun default_to_version_2_if_info_found() = runTest {
+        when (val version = dataSetSettingCall.fetch(false)) {
             is SettingsAppVersion.Valid -> {
                 assertThat(version.dataStore).isEquivalentAccordingToCompareTo(SettingsAppDataStoreVersion.V2_0)
                 assertThat(version.app).isNotEmpty()
             }
+
             else -> fail("Unexpected version")
         }
     }
 
     @Test
-    fun default_to_version_1_if_info_not_found() {
-        whenever(apiCallExecutor.wrapSingle(settingAppInfoSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_version_1_if_info_not_found() = runTest {
+        coroutineAPICallExecutor.stub {
+            onBlocking {
+                wrap { settingAppInfoCall }.getOrThrow()
+            } doThrow D2ErrorSamples.notFound()
+        }
+
 
-        when (val version = dataSetSettingCall.fetch(false).blockingGet()) {
+        when (val version = dataSetSettingCall.fetch(false)) {
             is SettingsAppVersion.Valid -> {
                 assertThat(version.dataStore).isEquivalentAccordingToCompareTo(SettingsAppDataStoreVersion.V1_1)
                 assertThat(version.app).isNotEmpty()
             }
+
             else -> fail("Unexpected version")
         }
     }
 
     @Test
-    fun return_data_store_empty_if_cannot_found_anything() {
-        whenever(apiCallExecutor.wrapSingle(settingAppInfoSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
-        whenever(apiCallExecutor.wrapSingle(generalSettingsSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun return_data_store_empty_if_cannot_found_anything() = runTest {
+        coroutineAPICallExecutor.stub {
+            onBlocking {
+                wrap { settingAppInfoCall }.getOrThrow()
+            } doThrow D2ErrorSamples.notFound()
+        }
+        coroutineAPICallExecutor.stub {
+            onBlocking {
+                wrap { generalSettingsCall }.getOrThrow()
+            } doThrow D2ErrorSamples.notFound()
+        }
 
-        val version = dataSetSettingCall.fetch(false).blockingGet()
+        val version = dataSetSettingCall.fetch(false)
 
         assertThat(version is SettingsAppVersion.DataStoreEmpty).isTrue()
     }
 
     @Test
-    fun throws_D2_exception_if_other_error_than_not_found_in_general_settings() {
-        whenever(apiCallExecutor.wrapSingle(settingAppInfoSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
-        whenever(apiCallExecutor.wrapSingle(generalSettingsSingle, false)) doReturn
-            Single.error(D2ErrorSamples.get())
+    fun throws_D2_exception_if_other_error_than_not_found_in_general_settings() = runTest {
+
+        coroutineAPICallExecutor.stub {
+            onBlocking {
+                wrap { settingAppInfoCall }.getOrThrow()
+            } doThrow D2ErrorSamples.notFound()
+        }
+
+        coroutineAPICallExecutor.stub {
+            onBlocking {
+                wrap { generalSettingsCall }.getOrThrow()
+            } doThrow D2ErrorSamples.get()
+        }
 
         val exception = assertThrows(RuntimeException::class.java) {
-            dataSetSettingCall.fetch(false).blockingGet()
+            runBlocking {
+                dataSetSettingCall.fetch(false)
+            }
         }
 
         assertThat(exception.cause).isInstanceOf(D2Error::class.java)
     }
 
     @Test
-    fun throws_D2_exception_if_other_error_than_not_found_in_info() {
-        whenever(apiCallExecutor.wrapSingle(settingAppInfoSingle, false)) doReturn
-            Single.error(D2ErrorSamples.get())
+    fun throws_D2_exception_if_other_error_than_not_found_in_info() = runTest {
+        coroutineAPICallExecutor.stub {
+            onBlocking {
+                wrap { settingAppInfoCall }.getOrThrow()
+            } doThrow D2ErrorSamples.get()
+        }
 
         val exception = assertThrows(RuntimeException::class.java) {
-            dataSetSettingCall.fetch(false).blockingGet()
+            runBlocking {
+                dataSetSettingCall.fetch(false)
+            }
         }
 
         assertThat(exception.cause).isInstanceOf(D2Error::class.java)

From 408d2a994f952b59afb54e7f4be69e5c8a656c48 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:31:08 +0200
Subject: [PATCH 363/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...pository.java => TrackedEntityInstanceCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityInstanceCollectionRepository.java => TrackedEntityInstanceCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt

From d8b3d540c89c57b83bc36dfe195eb23d1e507047 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:31:09 +0200
Subject: [PATCH 364/478] [ANDROSDK-1717] Refactor
 TrackedEntityInstanceCollectionRepository to Kotlin

---
 ...ackedEntityInstanceCollectionRepository.kt | 271 +++++++++---------
 1 file changed, 139 insertions(+), 132 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
index 254baf6434..039a6bfcda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
@@ -25,184 +25,191 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.call.D2Progress;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePostParentCall;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceProjectionTransformer;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore;
-import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Observable;
+package org.hisp.dhis.android.core.trackedentity
+
+import dagger.Reusable
+import io.reactivex.Observable
+import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withUidFilterItem
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePostParentCall
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceProjectionTransformer
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityInstanceCollectionRepository
-        extends ReadWriteWithUidCollectionRepositoryImpl
-        <TrackedEntityInstance, TrackedEntityInstanceCreateProjection, TrackedEntityInstanceCollectionRepository>
-        implements ReadWriteWithUploadWithUidCollectionRepository
-        <TrackedEntityInstance, TrackedEntityInstanceCreateProjection> {
-
-    private final TrackedEntityInstancePostParentCall postCall;
-    private final TrackedEntityInstanceStore store;
-    private final TrackerDataManager trackerDataManager;
-    private final JobQueryCall jobQueryCall;
-
-    @Inject
-    TrackedEntityInstanceCollectionRepository(
-            final TrackedEntityInstanceStore store,
-            final Map<String, ChildrenAppender<TrackedEntityInstance>> childrenAppenders,
-            final RepositoryScope scope,
-            final TrackedEntityInstanceProjectionTransformer transformer,
-            final TrackerDataManager trackerDataManager,
-            final TrackedEntityInstancePostParentCall postCall,
-            final JobQueryCall jobQueryCall) {
-        super(store, childrenAppenders, scope, transformer, new FilterConnectorFactory<>(scope, s ->
-                new TrackedEntityInstanceCollectionRepository(store, childrenAppenders, s, transformer,
-                        trackerDataManager, postCall, jobQueryCall)));
-        this.postCall = postCall;
-        this.store = store;
-        this.trackerDataManager = trackerDataManager;
-        this.jobQueryCall = jobQueryCall;
-    }
-
-    @Override
-    protected void propagateState(TrackedEntityInstance trackedEntityInstance, HandleAction action) {
-        trackerDataManager.propagateTrackedEntityUpdate(trackedEntityInstance, action);
-    }
-
-    @Override
-    public Observable<D2Progress> upload() {
+class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
+    private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
+    scope: RepositoryScope,
+    transformer: TrackedEntityInstanceProjectionTransformer,
+    private val trackerDataManager: TrackerDataManager,
+    private val postCall: TrackedEntityInstancePostParentCall,
+    private val jobQueryCall: JobQueryCall,
+) : ReadWriteWithUidCollectionRepositoryImpl<
+    TrackedEntityInstance,
+    TrackedEntityInstanceCreateProjection,
+    TrackedEntityInstanceCollectionRepository,
+    >(
+    trackedEntityInstanceStore,
+    childrenAppenders,
+    scope,
+    transformer,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityInstanceCollectionRepository(
+            trackedEntityInstanceStore,
+            childrenAppenders,
+            s,
+            transformer,
+            trackerDataManager,
+            postCall,
+            jobQueryCall,
+        )
+    },
+),
+    ReadWriteWithUploadWithUidCollectionRepository<TrackedEntityInstance, TrackedEntityInstanceCreateProjection> {
+    override fun propagateState(m: TrackedEntityInstance, action: HandleAction?) {
+        trackerDataManager.propagateTrackedEntityUpdate(m, action!!)
+    }
+
+    override fun upload(): Observable<D2Progress> {
         return Observable.concat(
-                jobQueryCall.queryPendingJobs(),
-                Observable.fromCallable(() ->
-                        byAggregatedSyncState().in(State.uploadableStatesIncludingError()).blockingGetWithoutChildren()
-                ).flatMap(postCall::uploadTrackedEntityInstances)
-        );
+            jobQueryCall.queryPendingJobs(),
+            Observable.fromCallable {
+                byAggregatedSyncState().`in`(*uploadableStatesIncludingError()).blockingGetWithoutChildren()
+            }
+                .flatMap { trackedEntityInstances: List<TrackedEntityInstance> ->
+                    postCall.uploadTrackedEntityInstances(
+                        trackedEntityInstances,
+                    )
+                },
+        )
     }
 
-    @Override
-    public void blockingUpload() {
-        upload().blockingSubscribe();
+    override fun blockingUpload() {
+        upload().blockingSubscribe()
     }
 
-    @Override
-    public TrackedEntityInstanceObjectRepository uid(String uid) {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withUidFilterItem(scope, uid);
-        return new TrackedEntityInstanceObjectRepository(store, uid, childrenAppenders, updatedScope,
-                trackerDataManager);
+    override fun uid(uid: String?): TrackedEntityInstanceObjectRepository {
+        val updatedScope = withUidFilterItem(scope, uid)
+        return TrackedEntityInstanceObjectRepository(
+            trackedEntityInstanceStore,
+            uid,
+            childrenAppenders,
+            updatedScope,
+            trackerDataManager,
+        )
     }
 
-    public StringFilterConnector<TrackedEntityInstanceCollectionRepository> byUid() {
-        return cf.string(Columns.UID);
+    fun byUid(): StringFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.string(TrackedEntityInstanceTableInfo.Columns.UID)
     }
 
-    public DateFilterConnector<TrackedEntityInstanceCollectionRepository> byCreated() {
-        return cf.date(Columns.CREATED);
+    fun byCreated(): DateFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.date(TrackedEntityInstanceTableInfo.Columns.CREATED)
     }
 
-    public DateFilterConnector<TrackedEntityInstanceCollectionRepository> byLastUpdated() {
-        return cf.date(Columns.LAST_UPDATED);
+    fun byLastUpdated(): DateFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.date(TrackedEntityInstanceTableInfo.Columns.LAST_UPDATED)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceCollectionRepository> byCreatedAtClient() {
-        return cf.string(Columns.CREATED_AT_CLIENT);
+    fun byCreatedAtClient(): StringFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.string(TrackedEntityInstanceTableInfo.Columns.CREATED_AT_CLIENT)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceCollectionRepository> byLastUpdatedAtClient() {
-        return cf.string(Columns.LAST_UPDATED_AT_CLIENT);
+    fun byLastUpdatedAtClient(): StringFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.string(TrackedEntityInstanceTableInfo.Columns.LAST_UPDATED_AT_CLIENT)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceCollectionRepository> byOrganisationUnitUid() {
-        return cf.string(Columns.ORGANISATION_UNIT);
+    fun byOrganisationUnitUid(): StringFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.string(TrackedEntityInstanceTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceCollectionRepository> byTrackedEntityType() {
-        return cf.string(Columns.TRACKED_ENTITY_TYPE);
+    fun byTrackedEntityType(): StringFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.string(TrackedEntityInstanceTableInfo.Columns.TRACKED_ENTITY_TYPE)
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceCollectionRepository, FeatureType> byGeometryType() {
-        return cf.enumC(Columns.GEOMETRY_TYPE);
+    fun byGeometryType(): EnumFilterConnector<TrackedEntityInstanceCollectionRepository, FeatureType> {
+        return cf.enumC(TrackedEntityInstanceTableInfo.Columns.GEOMETRY_TYPE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceCollectionRepository> byGeometryCoordinates() {
-        return cf.string(Columns.GEOMETRY_COORDINATES);
+    fun byGeometryCoordinates(): StringFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.string(TrackedEntityInstanceTableInfo.Columns.GEOMETRY_COORDINATES)
     }
 
-    /**
-     * @deprecated Use {@link #byAggregatedSyncState()} instead.
-     */
-    @Deprecated
-    public EnumFilterConnector<TrackedEntityInstanceCollectionRepository, State> byState() {
-        return byAggregatedSyncState();
+    @Deprecated(
+        "Use {@link #byAggregatedSyncState()} instead.",
+        ReplaceWith("byAggregatedSyncState()"),
+    )
+    fun byState(): EnumFilterConnector<TrackedEntityInstanceCollectionRepository, State> {
+        return byAggregatedSyncState()
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceCollectionRepository, State> bySyncState() {
-        return cf.enumC(Columns.SYNC_STATE);
+    fun bySyncState(): EnumFilterConnector<TrackedEntityInstanceCollectionRepository, State> {
+        return cf.enumC(TrackedEntityInstanceTableInfo.Columns.SYNC_STATE)
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceCollectionRepository, State> byAggregatedSyncState() {
-        return cf.enumC(Columns.AGGREGATED_SYNC_STATE);
+    fun byAggregatedSyncState(): EnumFilterConnector<TrackedEntityInstanceCollectionRepository, State> {
+        return cf.enumC(TrackedEntityInstanceTableInfo.Columns.AGGREGATED_SYNC_STATE)
     }
 
-    public BooleanFilterConnector<TrackedEntityInstanceCollectionRepository> byDeleted() {
-        return cf.bool(Columns.DELETED);
+    fun byDeleted(): BooleanFilterConnector<TrackedEntityInstanceCollectionRepository> {
+        return cf.bool(TrackedEntityInstanceTableInfo.Columns.DELETED)
     }
 
-    public TrackedEntityInstanceCollectionRepository byProgramUids(List<String> programUids) {
-        return cf.subQuery(Columns.UID).inLinkTable(
-                EnrollmentTableInfo.TABLE_INFO.name(),
-                EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
-                EnrollmentTableInfo.Columns.PROGRAM,
-                programUids);
+    fun byProgramUids(programUids: List<String>): TrackedEntityInstanceCollectionRepository {
+        return cf.subQuery(TrackedEntityInstanceTableInfo.Columns.UID).inLinkTable(
+            EnrollmentTableInfo.TABLE_INFO.name(),
+            EnrollmentTableInfo.Columns.TRACKED_ENTITY_INSTANCE,
+            EnrollmentTableInfo.Columns.PROGRAM,
+            programUids,
+        )
     }
 
-    public TrackedEntityInstanceCollectionRepository orderByCreated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.CREATED, direction);
+    fun orderByCreated(direction: OrderByDirection?): TrackedEntityInstanceCollectionRepository {
+        return cf.withOrderBy(TrackedEntityInstanceTableInfo.Columns.CREATED, direction)
     }
 
-    public TrackedEntityInstanceCollectionRepository orderByLastUpdated(RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.LAST_UPDATED, direction);
+    fun orderByLastUpdated(direction: OrderByDirection?): TrackedEntityInstanceCollectionRepository {
+        return cf.withOrderBy(TrackedEntityInstanceTableInfo.Columns.LAST_UPDATED, direction)
     }
 
-    public TrackedEntityInstanceCollectionRepository orderByCreatedAtClient(
-            RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.CREATED_AT_CLIENT, direction);
+    fun orderByCreatedAtClient(
+        direction: OrderByDirection?,
+    ): TrackedEntityInstanceCollectionRepository {
+        return cf.withOrderBy(TrackedEntityInstanceTableInfo.Columns.CREATED_AT_CLIENT, direction)
     }
 
-    public TrackedEntityInstanceCollectionRepository orderByLastUpdatedAtClient(
-            RepositoryScope.OrderByDirection direction) {
-        return cf.withOrderBy(Columns.LAST_UPDATED_AT_CLIENT, direction);
+    fun orderByLastUpdatedAtClient(
+        direction: OrderByDirection?,
+    ): TrackedEntityInstanceCollectionRepository {
+        return cf.withOrderBy(TrackedEntityInstanceTableInfo.Columns.LAST_UPDATED_AT_CLIENT, direction)
     }
 
-    public TrackedEntityInstanceCollectionRepository withTrackedEntityAttributeValues() {
-        return cf.withChild(TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES);
+    fun withTrackedEntityAttributeValues(): TrackedEntityInstanceCollectionRepository {
+        return cf.withChild(TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES)
     }
 
-    public TrackedEntityInstanceCollectionRepository withProgramOwners() {
-        return cf.withChild(TrackedEntityInstanceFields.PROGRAM_OWNERS);
+    fun withProgramOwners(): TrackedEntityInstanceCollectionRepository {
+        return cf.withChild(TrackedEntityInstanceFields.PROGRAM_OWNERS)
     }
 }

From f73016bbc092c0d1089e21e824c571efc50f3979 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:42:03 +0200
Subject: [PATCH 365/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ry.java => TrackedEntityInstanceFilterCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityInstanceFilterCollectionRepository.java => TrackedEntityInstanceFilterCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt

From 7049f4f448a340b3e23e8806ae353639e6a9b9a3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:42:04 +0200
Subject: [PATCH 366/478] [ANDROSDK-1717] Refactor
 TrackedEntityInstanceFilterCollectionRepository to Kotlin

---
 ...ntityInstanceFilterCollectionRepository.kt | 164 +++++++++---------
 1 file changed, 83 insertions(+), 81 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
index 565695342e..b06a384edf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
@@ -25,127 +25,129 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.AssignedUserMode;
-import org.hisp.dhis.android.core.enrollment.EnrollmentStatus;
-import org.hisp.dhis.android.core.event.EventStatus;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.EntityQueryCriteriaFields;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterFields;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.trackedentity
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import org.hisp.dhis.android.core.trackedentity.internal.EntityQueryCriteriaFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityInstanceFilterCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<TrackedEntityInstanceFilter,
-        TrackedEntityInstanceFilterCollectionRepository> {
-
-    @Inject
-    TrackedEntityInstanceFilterCollectionRepository(
-            final TrackedEntityInstanceFilterStore store,
-            final Map<String, ChildrenAppender<TrackedEntityInstanceFilter>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new TrackedEntityInstanceFilterCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byProgram() {
-        return cf.string(Columns.PROGRAM);
+class TrackedEntityInstanceFilterCollectionRepository @Inject internal constructor(
+    store: TrackedEntityInstanceFilterStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstanceFilter>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<
+    TrackedEntityInstanceFilter,
+    TrackedEntityInstanceFilterCollectionRepository,
+    >(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityInstanceFilterCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byProgram(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.PROGRAM)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byDescription() {
-        return cf.string(Columns.DESCRIPTION);
+    fun byDescription(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.DESCRIPTION)
     }
 
-    public IntegerFilterConnector<TrackedEntityInstanceFilterCollectionRepository> bySortOrder() {
-        return cf.integer(Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.integer(TrackedEntityInstanceFilterTableInfo.Columns.SORT_ORDER)
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, EnrollmentStatus> byEnrollmentStatus() {
-        return cf.enumC(Columns.ENROLLMENT_STATUS);
+    fun byEnrollmentStatus(): EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, EnrollmentStatus> {
+        return cf.enumC(TrackedEntityInstanceFilterTableInfo.Columns.ENROLLMENT_STATUS)
     }
 
-    public BooleanFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byFollowUp() {
-        return cf.bool(Columns.FOLLOW_UP);
+    fun byFollowUp(): BooleanFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.bool(TrackedEntityInstanceFilterTableInfo.Columns.FOLLOW_UP)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byOrganisationUnit() {
-        return cf.string(Columns.ORGANISATION_UNIT);
+    fun byOrganisationUnit(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.ORGANISATION_UNIT)
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, OrganisationUnitMode> byOuMode() {
-        return cf.enumC(Columns.OU_MODE);
+    fun byOuMode(): EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, OrganisationUnitMode> {
+        return cf.enumC(TrackedEntityInstanceFilterTableInfo.Columns.OU_MODE)
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, AssignedUserMode> byAssignedUserMode() {
-        return cf.enumC(Columns.ASSIGNED_USER_MODE);
+    fun byAssignedUserMode(): EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, AssignedUserMode> {
+        return cf.enumC(TrackedEntityInstanceFilterTableInfo.Columns.ASSIGNED_USER_MODE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byOrderProperty() {
-        return cf.string(Columns.ORDER);
+    fun byOrderProperty(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.ORDER)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byDisplayColumnOrder() {
-        return cf.string(Columns.DISPLAY_COLUMN_ORDER);
+    fun byDisplayColumnOrder(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.DISPLAY_COLUMN_ORDER)
     }
 
-    public EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, EventStatus> byEventStatus() {
-        return cf.enumC(Columns.EVENT_STATUS);
+    fun byEventStatus(): EnumFilterConnector<TrackedEntityInstanceFilterCollectionRepository, EventStatus> {
+        return cf.enumC(TrackedEntityInstanceFilterTableInfo.Columns.EVENT_STATUS)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byEventDate() {
-        return cf.string(Columns.EVENT_DATE);
+    fun byEventDate(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.EVENT_DATE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byLastUpdatedDate() {
-        return cf.string(Columns.LAST_UPDATED_DATE);
+    fun byLastUpdatedDate(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.LAST_UPDATED_DATE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byProgramStage() {
-        return cf.string(Columns.PROGRAM_STAGE);
+    fun byProgramStage(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.PROGRAM_STAGE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byTrackedEntityInstances() {
-        return cf.string(Columns.TRACKED_ENTITY_INSTANCES);
+    fun byTrackedEntityInstances(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.TRACKED_ENTITY_INSTANCES)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byEnrollmentIncidentDate() {
-        return cf.string(Columns.ENROLLMENT_INCIDENT_DATE);
+    fun byEnrollmentIncidentDate(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.ENROLLMENT_INCIDENT_DATE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byEnrollmentCreatedDate() {
-        return cf.string(Columns.ENROLLMENT_CREATED_DATE);
+    fun byEnrollmentCreatedDate(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.ENROLLMENT_CREATED_DATE)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<TrackedEntityInstanceFilterCollectionRepository> {
+        return cf.string(TrackedEntityInstanceFilterTableInfo.Columns.ICON)
     }
 
-    public TrackedEntityInstanceFilterCollectionRepository withTrackedEntityInstanceEventFilters() {
-        return cf.withChild(TrackedEntityInstanceFilterFields.EVENT_FILTERS);
+    fun withTrackedEntityInstanceEventFilters(): TrackedEntityInstanceFilterCollectionRepository {
+        return cf.withChild(TrackedEntityInstanceFilterFields.EVENT_FILTERS)
     }
 
-    public TrackedEntityInstanceFilterCollectionRepository withAttributeValueFilters() {
-        return cf.withChild(EntityQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER);
+    fun withAttributeValueFilters(): TrackedEntityInstanceFilterCollectionRepository {
+        return cf.withChild(EntityQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER)
     }
-}
\ No newline at end of file
+}

From 1bd0bce39282de6a3362d874a114880edaa61b49 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:44:19 +0200
Subject: [PATCH 367/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ory.java => TrackedEntityTypeAttributeCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityTypeAttributeCollectionRepository.java => TrackedEntityTypeAttributeCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt

From 4ed4acf91deb4335a97ac29028a883f976a1425f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:44:19 +0200
Subject: [PATCH 368/478] [ANDROSDK-1717] Refactor
 TrackedEntityTypeAttributeCollectionRepository to Kotlin

---
 ...EntityTypeAttributeCollectionRepository.kt | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
index a3eb6e8c05..7e638ae854 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
@@ -25,59 +25,59 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity;
+package org.hisp.dhis.android.core.trackedentity
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityTypeAttributeCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<TrackedEntityTypeAttribute,
-        TrackedEntityTypeAttributeCollectionRepository> {
-
-    @Inject
-    TrackedEntityTypeAttributeCollectionRepository(
-            final TrackedEntityTypeAttributeStore store,
-            final Map<String, ChildrenAppender<TrackedEntityTypeAttribute>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new TrackedEntityTypeAttributeCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<TrackedEntityTypeAttributeCollectionRepository> byTrackedEntityTypeUid() {
-        return cf.string(Columns.TRACKED_ENTITY_TYPE);
+class TrackedEntityTypeAttributeCollectionRepository @Inject internal constructor(
+    store: TrackedEntityTypeAttributeStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityTypeAttribute>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<TrackedEntityTypeAttribute, TrackedEntityTypeAttributeCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityTypeAttributeCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byTrackedEntityTypeUid(): StringFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
+        return cf.string(TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_TYPE)
     }
 
-    public StringFilterConnector<TrackedEntityTypeAttributeCollectionRepository> byTrackedEntityAttributeUid() {
-        return cf.string(Columns.TRACKED_ENTITY_ATTRIBUTE);
+    fun byTrackedEntityAttributeUid(): StringFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
+        return cf.string(TrackedEntityTypeAttributeTableInfo.Columns.TRACKED_ENTITY_ATTRIBUTE)
     }
 
-    public BooleanFilterConnector<TrackedEntityTypeAttributeCollectionRepository> byDisplayInList() {
-        return cf.bool(Columns.DISPLAY_IN_LIST);
+    fun byDisplayInList(): BooleanFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityTypeAttributeTableInfo.Columns.DISPLAY_IN_LIST)
     }
 
-    public BooleanFilterConnector<TrackedEntityTypeAttributeCollectionRepository> byMandatory() {
-        return cf.bool(Columns.MANDATORY);
+    fun byMandatory(): BooleanFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityTypeAttributeTableInfo.Columns.MANDATORY)
     }
 
-    public BooleanFilterConnector<TrackedEntityTypeAttributeCollectionRepository> bySearchable() {
-        return cf.bool(Columns.SEARCHABLE);
+    fun bySearchable(): BooleanFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
+        return cf.bool(TrackedEntityTypeAttributeTableInfo.Columns.SEARCHABLE)
     }
 
-    public IntegerFilterConnector<TrackedEntityTypeAttributeCollectionRepository> bySortOrder() {
-        return cf.integer(TrackedEntityTypeAttributeTableInfo.Columns.SORT_ORDER);
+    fun bySortOrder(): IntegerFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
+        return cf.integer(TrackedEntityTypeAttributeTableInfo.Columns.SORT_ORDER)
     }
-}
\ No newline at end of file
+}

From 660770fa21904067dc2ee41801b4d3c591e1f760 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:45:45 +0200
Subject: [PATCH 369/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...onRepository.java => TrackedEntityTypeCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{TrackedEntityTypeCollectionRepository.java => TrackedEntityTypeCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt

From 3e91f4550a71541dddb91956da5f1631fffc52bb Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:45:46 +0200
Subject: [PATCH 370/478] [ANDROSDK-1717] Refactor
 TrackedEntityTypeCollectionRepository to Kotlin

---
 .../TrackedEntityTypeCollectionRepository.kt  | 75 ++++++++++---------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
index a1fb7e4b0e..f1606f6b3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
@@ -25,51 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity
 
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.FeatureType;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo.Columns;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeFields;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackedEntityTypeCollectionRepository
-        extends ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityType, TrackedEntityTypeCollectionRepository> {
-
-    @Inject
-    TrackedEntityTypeCollectionRepository(final TrackedEntityTypeStore store,
-                                          final Map<String, ChildrenAppender<TrackedEntityType>> childrenAppenders,
-                                          final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new TrackedEntityTypeCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public EnumFilterConnector<TrackedEntityTypeCollectionRepository, FeatureType> byFeatureType() {
-        return cf.enumC(Columns.FEATURE_TYPE);
+class TrackedEntityTypeCollectionRepository @Inject internal constructor(
+    store: TrackedEntityTypeStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityType>>,
+    scope: RepositoryScope,
+) : ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityType, TrackedEntityTypeCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackedEntityTypeCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byFeatureType(): EnumFilterConnector<TrackedEntityTypeCollectionRepository, FeatureType> {
+        return cf.enumC(TrackedEntityTypeTableInfo.Columns.FEATURE_TYPE)
     }
 
-    public StringFilterConnector<TrackedEntityTypeCollectionRepository> byColor() {
-        return cf.string(Columns.COLOR);
+    fun byColor(): StringFilterConnector<TrackedEntityTypeCollectionRepository> {
+        return cf.string(TrackedEntityTypeTableInfo.Columns.COLOR)
     }
 
-    public StringFilterConnector<TrackedEntityTypeCollectionRepository> byIcon() {
-        return cf.string(Columns.ICON);
+    fun byIcon(): StringFilterConnector<TrackedEntityTypeCollectionRepository> {
+        return cf.string(TrackedEntityTypeTableInfo.Columns.ICON)
     }
 
-    public TrackedEntityTypeCollectionRepository withTrackedEntityTypeAttributes() {
-        return cf.withChild(TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES);
+    fun withTrackedEntityTypeAttributes(): TrackedEntityTypeCollectionRepository {
+        return cf.withChild(TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES)
     }
 }

From 2b4b853420e518757cd25f12bd46a8a182b27c40 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:46:33 +0200
Subject: [PATCH 371/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...pository.java => TrackerImportConflictCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/imports/{TrackerImportConflictCollectionRepository.java => TrackerImportConflictCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt

From 347240ce9c12923a807ece7e2f285422942e9fb5 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:46:34 +0200
Subject: [PATCH 372/478] [ANDROSDK-1717] Refactor
 TrackerImportConflictCollectionRepository to Kotlin

---
 ...ackerImportConflictCollectionRepository.kt | 97 ++++++++++---------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
index 9a42f714b6..197dc619c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
@@ -25,70 +25,71 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.imports;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.imports
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
+import javax.inject.Inject
 
 @Reusable
-public final class TrackerImportConflictCollectionRepository
-        extends ReadOnlyCollectionRepositoryImpl<TrackerImportConflict, TrackerImportConflictCollectionRepository> {
-
-    @Inject
-    TrackerImportConflictCollectionRepository(
-            final TrackerImportConflictStore store,
-            final Map<String, ChildrenAppender<TrackerImportConflict>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new TrackerImportConflictCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byConflict() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.CONFLICT);
+class TrackerImportConflictCollectionRepository @Inject internal constructor(
+    store: TrackerImportConflictStore,
+    childrenAppenders: Map<String, ChildrenAppender<TrackerImportConflict>>,
+    scope: RepositoryScope,
+) : ReadOnlyCollectionRepositoryImpl<TrackerImportConflict, TrackerImportConflictCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        TrackerImportConflictCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byConflict(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.CONFLICT)
     }
 
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byValue() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.VALUE);
+    fun byValue(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.VALUE)
     }
 
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byTrackedEntityInstanceUid() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.TRACKED_ENTITY_INSTANCE);
+    fun byTrackedEntityInstanceUid(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
     }
 
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byEnrollmentUid() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.ENROLLMENT);
+    fun byEnrollmentUid(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.ENROLLMENT)
     }
 
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byEventUid() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.EVENT);
+    fun byEventUid(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.EVENT)
     }
 
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byTableReference() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.TABLE_REFERENCE);
+    fun byTableReference(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.TABLE_REFERENCE)
     }
 
-    public StringFilterConnector<TrackerImportConflictCollectionRepository> byErrorCode() {
-        return cf.string(TrackerImportConflictTableInfo.Columns.ERROR_CODE);
+    fun byErrorCode(): StringFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.string(TrackerImportConflictTableInfo.Columns.ERROR_CODE)
     }
 
-    public EnumFilterConnector<TrackerImportConflictCollectionRepository, ImportStatus> byStatus() {
-        return cf.enumC(TrackerImportConflictTableInfo.Columns.STATUS);
+    fun byStatus(): EnumFilterConnector<TrackerImportConflictCollectionRepository, ImportStatus> {
+        return cf.enumC(TrackerImportConflictTableInfo.Columns.STATUS)
     }
 
-    public DateFilterConnector<TrackerImportConflictCollectionRepository> byCreated() {
-        return cf.date(TrackerImportConflictTableInfo.Columns.CREATED);
+    fun byCreated(): DateFilterConnector<TrackerImportConflictCollectionRepository> {
+        return cf.date(TrackerImportConflictTableInfo.Columns.CREATED)
     }
-}
\ No newline at end of file
+}

From 5b342f28e513bc02bf476a9028925e794f364e1b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:47:27 +0200
Subject: [PATCH 373/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...eCollectionRepository.java => UserRoleCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/user/{UserRoleCollectionRepository.java => UserRoleCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt

From 5ce4b63f23fad60e5be389141848d04a76dec04a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:47:27 +0200
Subject: [PATCH 374/478] [ANDROSDK-1717] Refactor UserRoleCollectionRepository
 to Kotlin

---
 .../core/user/UserRoleCollectionRepository.kt | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
index 3c5f12d9fd..05f7edeb91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
@@ -25,30 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.user;
+package org.hisp.dhis.android.core.user
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.user.internal.UserRoleStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.user.internal.UserRoleStore
+import javax.inject.Inject
 
 @Reusable
-public final class UserRoleCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<UserRole, UserRoleCollectionRepository> {
-
-    @Inject
-    UserRoleCollectionRepository(
-            final UserRoleStore store,
-            final Map<String, ChildrenAppender<UserRole>> childrenAppenders,
-            final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new UserRoleCollectionRepository(store, childrenAppenders, s)));
-    }
-}
+class UserRoleCollectionRepository @Inject internal constructor(
+    store: UserRoleStore,
+    childrenAppenders: Map<String, ChildrenAppender<UserRole>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<UserRole, UserRoleCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        UserRoleCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+)

From d36d0fce6600468bb8931f922cb6948a5295b10f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:48:07 +0200
Subject: [PATCH 375/478] [ANDROSDK-1717] MutableMaps on User Roles and Tracker
 import conflict collection repositories

---
 .../core/imports/TrackerImportConflictCollectionRepository.kt   | 2 +-
 .../hisp/dhis/android/core/user/UserRoleCollectionRepository.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
index 197dc619c8..0fd0418f25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
@@ -41,7 +41,7 @@ import javax.inject.Inject
 @Reusable
 class TrackerImportConflictCollectionRepository @Inject internal constructor(
     store: TrackerImportConflictStore,
-    childrenAppenders: Map<String, ChildrenAppender<TrackerImportConflict>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<TrackerImportConflict>>,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<TrackerImportConflict, TrackerImportConflictCollectionRepository>(
     store,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
index 05f7edeb91..97e32276fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
@@ -38,7 +38,7 @@ import javax.inject.Inject
 @Reusable
 class UserRoleCollectionRepository @Inject internal constructor(
     store: UserRoleStore,
-    childrenAppenders: Map<String, ChildrenAppender<UserRole>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<UserRole>>,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<UserRole, UserRoleCollectionRepository>(
     store,

From cc93dccb0dcc3cce1dbb86bc7e147a4110aa910a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:49:21 +0200
Subject: [PATCH 376/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ctionRepository.java => ValidationRuleCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/{ValidationRuleCollectionRepository.java => ValidationRuleCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt

From 6dbc79acbba46ccf6639309f65a8f35ca83cb6c2 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:49:21 +0200
Subject: [PATCH 377/478] [ANDROSDK-1717] Refactor
 ValidationRuleCollectionRepository to Kotlin

---
 .../ValidationRuleCollectionRepository.kt     | 131 +++++++++---------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
index 58706e9c42..0e78bf23a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
@@ -25,95 +25,100 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.validation;
-
-import static org.hisp.dhis.android.core.validation.ValidationRuleTableInfo.Columns;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.IdentifiableColumns;
-import org.hisp.dhis.android.core.period.PeriodType;
-import org.hisp.dhis.android.core.validation.internal.ValidationRuleStore;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.validation
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.validation.internal.ValidationRuleStore
+import javax.inject.Inject
 
 @Reusable
-public final class ValidationRuleCollectionRepository
-        extends ReadOnlyNameableCollectionRepositoryImpl<ValidationRule, ValidationRuleCollectionRepository> {
-
-    @Inject
-    ValidationRuleCollectionRepository(final ValidationRuleStore store,
-                                       final Map<String, ChildrenAppender<ValidationRule>> childrenAppenders,
-                                       final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new ValidationRuleCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<ValidationRuleCollectionRepository> byInstruction() {
-        return cf.string(Columns.INSTRUCTION);
+class ValidationRuleCollectionRepository @Inject internal constructor(
+    store: ValidationRuleStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<ValidationRule>>,
+    scope: RepositoryScope,
+) : ReadOnlyNameableCollectionRepositoryImpl<ValidationRule, ValidationRuleCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        ValidationRuleCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byInstruction(): StringFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.string(ValidationRuleTableInfo.Columns.INSTRUCTION)
     }
 
-    public EnumFilterConnector<ValidationRuleCollectionRepository, ValidationRuleImportance> byImportance() {
-        return cf.enumC(Columns.IMPORTANCE);
+    fun byImportance(): EnumFilterConnector<ValidationRuleCollectionRepository, ValidationRuleImportance> {
+        return cf.enumC(ValidationRuleTableInfo.Columns.IMPORTANCE)
     }
 
-    public EnumFilterConnector<ValidationRuleCollectionRepository, ValidationRuleOperator> byOperator() {
-        return cf.enumC(Columns.OPERATOR);
+    fun byOperator(): EnumFilterConnector<ValidationRuleCollectionRepository, ValidationRuleOperator> {
+        return cf.enumC(ValidationRuleTableInfo.Columns.OPERATOR)
     }
 
-    public EnumFilterConnector<ValidationRuleCollectionRepository, PeriodType> byPeriodType() {
-        return cf.enumC(Columns.PERIOD_TYPE);
+    fun byPeriodType(): EnumFilterConnector<ValidationRuleCollectionRepository, PeriodType> {
+        return cf.enumC(ValidationRuleTableInfo.Columns.PERIOD_TYPE)
     }
 
-    public BooleanFilterConnector<ValidationRuleCollectionRepository> bySkipFormValidation() {
-        return cf.bool(Columns.SKIP_FORM_VALIDATION);
+    fun bySkipFormValidation(): BooleanFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.bool(ValidationRuleTableInfo.Columns.SKIP_FORM_VALIDATION)
     }
 
-    public StringFilterConnector<ValidationRuleCollectionRepository> byLeftSideExpression() {
-        return cf.string(Columns.LEFT_SIDE_EXPRESSION);
+    fun byLeftSideExpression(): StringFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.string(ValidationRuleTableInfo.Columns.LEFT_SIDE_EXPRESSION)
     }
 
-    public StringFilterConnector<ValidationRuleCollectionRepository> byLeftSideDescription() {
-        return cf.string(Columns.LEFT_SIDE_DESCRIPTION);
+    fun byLeftSideDescription(): StringFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.string(ValidationRuleTableInfo.Columns.LEFT_SIDE_DESCRIPTION)
     }
 
-    public EnumFilterConnector<ValidationRuleCollectionRepository, MissingValueStrategy>
-    byLeftSideMissingValueStrategy() {
-        return cf.enumC(Columns.LEFT_SIDE_MISSING_VALUE_STRATEGY);
+    fun byLeftSideMissingValueStrategy(): EnumFilterConnector<
+        ValidationRuleCollectionRepository,
+        MissingValueStrategy,
+        > {
+        return cf.enumC(ValidationRuleTableInfo.Columns.LEFT_SIDE_MISSING_VALUE_STRATEGY)
     }
 
-    public StringFilterConnector<ValidationRuleCollectionRepository> byRightSideExpression() {
-        return cf.string(Columns.RIGHT_SIDE_EXPRESSION);
+    fun byRightSideExpression(): StringFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.string(ValidationRuleTableInfo.Columns.RIGHT_SIDE_EXPRESSION)
     }
 
-    public StringFilterConnector<ValidationRuleCollectionRepository> byRightSideDescription() {
-        return cf.string(Columns.RIGHT_SIDE_DESCRIPTION);
+    fun byRightSideDescription(): StringFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.string(ValidationRuleTableInfo.Columns.RIGHT_SIDE_DESCRIPTION)
     }
 
-    public EnumFilterConnector<ValidationRuleCollectionRepository, MissingValueStrategy>
-    byRightSideMissingValueStrategy() {
-        return cf.enumC(Columns.RIGHT_SIDE_MISSING_VALUE_STRATEGY);
+    fun byRightSideMissingValueStrategy(): EnumFilterConnector<
+        ValidationRuleCollectionRepository,
+        MissingValueStrategy,
+        > {
+        return cf.enumC(ValidationRuleTableInfo.Columns.RIGHT_SIDE_MISSING_VALUE_STRATEGY)
     }
 
-    public StringFilterConnector<ValidationRuleCollectionRepository> byOrganisationUnitLevels() {
-        return cf.string(Columns.ORGANISATION_UNIT_LEVELS);
+    fun byOrganisationUnitLevels(): StringFilterConnector<ValidationRuleCollectionRepository> {
+        return cf.string(ValidationRuleTableInfo.Columns.ORGANISATION_UNIT_LEVELS)
     }
 
-    public ValidationRuleCollectionRepository byDataSetUids(List<String> dataSetUids) {
+    fun byDataSetUids(dataSetUids: List<String>): ValidationRuleCollectionRepository {
         return cf.subQuery(IdentifiableColumns.UID).inLinkTable(
-                DataSetValidationRuleLinkTableInfo.TABLE_INFO.name(),
-                DataSetValidationRuleLinkTableInfo.Columns.VALIDATION_RULE,
-                DataSetValidationRuleLinkTableInfo.Columns.DATA_SET,
-                dataSetUids);
+            DataSetValidationRuleLinkTableInfo.TABLE_INFO.name(),
+            DataSetValidationRuleLinkTableInfo.Columns.VALIDATION_RULE,
+            DataSetValidationRuleLinkTableInfo.Columns.DATA_SET,
+            dataSetUids,
+        )
     }
 }

From e46693fc16498b20d83ad7eada33949d5ce27d2f Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:51:10 +0200
Subject: [PATCH 378/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ectionRepository.java => VisualizationCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/visualization/{VisualizationCollectionRepository.java => VisualizationCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt

From 5e6e9d51881fe9453de8d3724f1647c4c988174e Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 09:51:11 +0200
Subject: [PATCH 379/478] [ANDROSDK-1717] Refactor
 VisualizationCollectionRepository to Kotlin

---
 .../VisualizationCollectionRepository.kt      | 180 +++++++++---------
 1 file changed, 91 insertions(+), 89 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
index 8c786e497f..7232582102 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
@@ -25,154 +25,156 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.visualization;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.visualization.VisualizationTableInfo.Columns;
-import org.hisp.dhis.android.core.visualization.internal.VisualizationFields;
-import org.hisp.dhis.android.core.visualization.internal.VisualizationStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+package org.hisp.dhis.android.core.visualization
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.visualization.internal.VisualizationFields
+import org.hisp.dhis.android.core.visualization.internal.VisualizationStore
+import javax.inject.Inject
 
 @Reusable
-public final class VisualizationCollectionRepository
-        extends ReadOnlyIdentifiableCollectionRepositoryImpl<Visualization, VisualizationCollectionRepository> {
-
-    @Inject
-    VisualizationCollectionRepository(final VisualizationStore store,
-                                      final Map<String, ChildrenAppender<Visualization>> childrenAppenders,
-                                      final RepositoryScope scope) {
-        super(store, childrenAppenders, scope, new FilterConnectorFactory<>(scope,
-                s -> new VisualizationCollectionRepository(store, childrenAppenders, s)));
-    }
-
-    public StringFilterConnector<VisualizationCollectionRepository> byDescription() {
-        return cf.string(Columns.DESCRIPTION);
+class VisualizationCollectionRepository @Inject internal constructor(
+    store: VisualizationStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<Visualization>>,
+    scope: RepositoryScope,
+) : ReadOnlyIdentifiableCollectionRepositoryImpl<Visualization, VisualizationCollectionRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    FilterConnectorFactory(
+        scope,
+    ) { s: RepositoryScope ->
+        VisualizationCollectionRepository(
+            store,
+            childrenAppenders,
+            s,
+        )
+    },
+) {
+    fun byDescription(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.DESCRIPTION)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byDisplayDescription() {
-        return cf.string(Columns.DISPLAY_DESCRIPTION);
+    fun byDisplayDescription(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.DISPLAY_DESCRIPTION)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byDisplayFormName() {
-        return cf.string(Columns.DISPLAY_FORM_NAME);
+    fun byDisplayFormName(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.DISPLAY_FORM_NAME)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byTitle() {
-        return cf.string(Columns.TITLE);
+    fun byTitle(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.TITLE)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byDisplayTitle() {
-        return cf.string(Columns.DISPLAY_TITLE);
+    fun byDisplayTitle(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.DISPLAY_TITLE)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> bySubtitle() {
-        return cf.string(Columns.SUBTITLE);
+    fun bySubtitle(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.SUBTITLE)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byLegendShowKey() {
-        return cf.bool(Columns.LEGEND_SHOW_KEY);
+    fun byLegendShowKey(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.LEGEND_SHOW_KEY)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byLegendStrategy() {
-        return cf.string(Columns.LEGEND_STRATEGY);
+    fun byLegendStrategy(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.LEGEND_STRATEGY)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byLegendStyle() {
-        return cf.string(Columns.LEGEND_STYLE);
+    fun byLegendStyle(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.LEGEND_STYLE)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byLegendUid() {
-        return cf.string(Columns.LEGEND_SET_ID);
+    fun byLegendUid(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.LEGEND_SET_ID)
     }
 
-    public StringFilterConnector<VisualizationCollectionRepository> byDisplaySubtitle() {
-        return cf.string(Columns.DISPLAY_SUBTITLE);
+    fun byDisplaySubtitle(): StringFilterConnector<VisualizationCollectionRepository> {
+        return cf.string(VisualizationTableInfo.Columns.DISPLAY_SUBTITLE)
     }
 
-    public EnumFilterConnector<VisualizationCollectionRepository, VisualizationType> byType() {
-        return cf.enumC(Columns.TYPE);
+    fun byType(): EnumFilterConnector<VisualizationCollectionRepository, VisualizationType> {
+        return cf.enumC(VisualizationTableInfo.Columns.TYPE)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byHideTitle() {
-        return cf.bool(Columns.HIDE_TITLE);
+    fun byHideTitle(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.HIDE_TITLE)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byHideSubtitle() {
-        return cf.bool(Columns.HIDE_SUBTITLE);
+    fun byHideSubtitle(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.HIDE_SUBTITLE)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byHideEmptyColumns() {
-        return cf.bool(Columns.HIDE_EMPTY_COLUMNS);
+    fun byHideEmptyColumns(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.HIDE_EMPTY_COLUMNS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byHideEmptyRows() {
-        return cf.bool(Columns.HIDE_EMPTY_ROWS);
+    fun byHideEmptyRows(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.HIDE_EMPTY_ROWS)
     }
 
-    public EnumFilterConnector<VisualizationCollectionRepository, HideEmptyItemStrategy> byHideEmptyRowItems() {
-        return cf.enumC(Columns.HIDE_EMPTY_ROW_ITEMS);
+    fun byHideEmptyRowItems(): EnumFilterConnector<VisualizationCollectionRepository, HideEmptyItemStrategy> {
+        return cf.enumC(VisualizationTableInfo.Columns.HIDE_EMPTY_ROW_ITEMS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byHideLegend() {
-        return cf.bool(Columns.HIDE_LEGEND);
+    fun byHideLegend(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.HIDE_LEGEND)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byShowHierarchy() {
-        return cf.bool(Columns.SHOW_HIERARCHY);
+    fun byShowHierarchy(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.SHOW_HIERARCHY)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byRowTotals() {
-        return cf.bool(Columns.ROW_TOTALS);
+    fun byRowTotals(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.ROW_TOTALS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byRowSubTotals() {
-        return cf.bool(Columns.ROW_SUB_TOTALS);
+    fun byRowSubTotals(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.ROW_SUB_TOTALS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byColTotals() {
-        return cf.bool(Columns.COL_TOTALS);
+    fun byColTotals(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.COL_TOTALS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byColSubTotals() {
-        return cf.bool(Columns.COL_SUB_TOTALS);
+    fun byColSubTotals(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.COL_SUB_TOTALS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byShowDimensionLabels() {
-        return cf.bool(Columns.SHOW_DIMENSION_LABELS);
+    fun byShowDimensionLabels(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.SHOW_DIMENSION_LABELS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byPercentStackedValues() {
-        return cf.bool(Columns.PERCENT_STACKED_VALUES);
+    fun byPercentStackedValues(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.PERCENT_STACKED_VALUES)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> byNoSpaceBetweenColumns() {
-        return cf.bool(Columns.NO_SPACE_BETWEEN_COLUMNS);
+    fun byNoSpaceBetweenColumns(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.NO_SPACE_BETWEEN_COLUMNS)
     }
 
-    public BooleanFilterConnector<VisualizationCollectionRepository> bySkipRounding() {
-        return cf.bool(Columns.SKIP_ROUNDING);
+    fun bySkipRounding(): BooleanFilterConnector<VisualizationCollectionRepository> {
+        return cf.bool(VisualizationTableInfo.Columns.SKIP_ROUNDING)
     }
 
-    public EnumFilterConnector<VisualizationCollectionRepository, DisplayDensity> byDisplayDensity() {
-        return cf.enumC(Columns.DISPLAY_DENSITY);
+    fun byDisplayDensity(): EnumFilterConnector<VisualizationCollectionRepository, DisplayDensity> {
+        return cf.enumC(VisualizationTableInfo.Columns.DISPLAY_DENSITY)
     }
 
-    public EnumFilterConnector<VisualizationCollectionRepository, DigitGroupSeparator> byDigitGroupSeparator() {
-        return cf.enumC(Columns.DIGIT_GROUP_SEPARATOR);
+    fun byDigitGroupSeparator(): EnumFilterConnector<VisualizationCollectionRepository, DigitGroupSeparator> {
+        return cf.enumC(VisualizationTableInfo.Columns.DIGIT_GROUP_SEPARATOR)
     }
 
-    public VisualizationCollectionRepository withColumnsRowsAndFilters() {
-        return cf.withChild(VisualizationFields.ITEMS);
+    fun withColumnsRowsAndFilters(): VisualizationCollectionRepository {
+        return cf.withChild(VisualizationFields.ITEMS)
     }
 }

From e856d5ae26afefbb77744d3c4d57e2e1b1d45c37 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 10:45:22 +0200
Subject: [PATCH 380/478] [ANDROSDK-1717] Rename .java to .kt

---
 ...ollectionRepository.java => EventQueryCollectionRepository.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/event/search/{EventQueryCollectionRepository.java => EventQueryCollectionRepository.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt

From a41338caf770ecc599bd5d14a52ec3e527fc7ff3 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 10:45:22 +0200
Subject: [PATCH 381/478] [ANDROSDK-1717] Refactor
 EventQueryCollectionRepository to Kotlin

---
 ...ectionRepositoryMockIntegrationShould.java |   2 +-
 .../search/EventQueryCollectionRepository.kt  | 393 +++++++++---------
 2 files changed, 195 insertions(+), 200 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java
index 441c7fd368..a575adf22b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java
@@ -68,7 +68,7 @@ public void find_uids_by_program() {
     @Test
     public void get_scope() {
         EventQueryRepositoryScope scope =
-                d2.eventModule().eventQuery().getScope();
+                d2.eventModule().eventQuery().scope;
 
         assertThat(scope.mode()).isNotNull();
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index 70eedcff66..7327b73d43 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -25,295 +25,290 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event.search;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.paging.DataSource;
-import androidx.paging.PagedList;
-import androidx.paging.PagingData;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.EventDataFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector;
-import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadOnlyObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.AssignedUserMode;
-import org.hisp.dhis.android.core.common.DateFilterPeriod;
-import org.hisp.dhis.android.core.common.DateFilterPeriodHelper;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.event.Event;
-import org.hisp.dhis.android.core.event.EventCollectionRepository;
-import org.hisp.dhis.android.core.event.EventDataFilter;
-import org.hisp.dhis.android.core.event.EventFilter;
-import org.hisp.dhis.android.core.event.EventFilterCollectionRepository;
-import org.hisp.dhis.android.core.event.EventObjectRepository;
-import org.hisp.dhis.android.core.event.EventStatus;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
-import kotlinx.coroutines.flow.Flow;
-
-@SuppressWarnings("PMD.ExcessiveImports")
-@Reusable
-public final class EventQueryCollectionRepository implements ReadOnlyWithUidCollectionRepository<Event> {
-
-    private final EventCollectionRepositoryAdapter eventCollectionRepositoryAdapter;
-    private final ScopedFilterConnectorFactory<EventQueryCollectionRepository,
-            EventQueryRepositoryScope> connectorFactory;
-    private final EventFilterCollectionRepository eventFilterRepository;
-
-    private final EventQueryRepositoryScope scope;
-
-    @Inject
-    EventQueryCollectionRepository(final EventCollectionRepositoryAdapter eventCollectionRepositoryAdapter,
-                                   final EventFilterCollectionRepository eventFilterRepository,
-                                   final EventQueryRepositoryScope scope) {
-        this.eventCollectionRepositoryAdapter = eventCollectionRepositoryAdapter;
-        this.eventFilterRepository = eventFilterRepository;
-        this.scope = scope;
-        this.connectorFactory = new ScopedFilterConnectorFactory<>(s ->
-                new EventQueryCollectionRepository(eventCollectionRepositoryAdapter, eventFilterRepository, s));
-    }
-
-    public ListFilterConnector<EventQueryCollectionRepository, String> byUid() {
-        return connectorFactory.listConnector(uidList -> scope.toBuilder().events(uidList).build());
-    }
+package org.hisp.dhis.android.core.event.search
+
+import androidx.lifecycle.LiveData
+import androidx.paging.DataSource
+import androidx.paging.PagedList
+import androidx.paging.PagingData
+import dagger.Reusable
+import io.reactivex.Single
+import kotlinx.coroutines.flow.Flow
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.EventDataFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodFilterConnector
+import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.common.DateFilterPeriod
+import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.EventCollectionRepository
+import org.hisp.dhis.android.core.event.EventDataFilter
+import org.hisp.dhis.android.core.event.EventFilter
+import org.hisp.dhis.android.core.event.EventFilterCollectionRepository
+import org.hisp.dhis.android.core.event.EventObjectRepository
+import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
+import javax.inject.Inject
 
-    public PeriodFilterConnector<EventQueryCollectionRepository> byLastUpdated() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod merged = DateFilterPeriodHelper.mergeDateFilterPeriods(scope.lastUpdatedDate(), filter);
-            return scope.toBuilder().lastUpdatedDate(merged).build();
-        });
+@Reusable
+class EventQueryCollectionRepository @Inject internal constructor(
+    private val eventCollectionRepositoryAdapter: EventCollectionRepositoryAdapter,
+    eventFilterRepository: EventFilterCollectionRepository,
+    scope: EventQueryRepositoryScope,
+) : ReadOnlyWithUidCollectionRepository<Event> {
+    private val connectorFactory: ScopedFilterConnectorFactory<
+        EventQueryCollectionRepository,
+        EventQueryRepositoryScope,
+        >
+    private val eventFilterRepository: EventFilterCollectionRepository
+
+    @JvmField
+    val scope: EventQueryRepositoryScope
+
+    init {
+        this.eventFilterRepository = eventFilterRepository
+        this.scope = scope
+        connectorFactory = ScopedFilterConnectorFactory { s: EventQueryRepositoryScope ->
+            EventQueryCollectionRepository(
+                eventCollectionRepositoryAdapter, eventFilterRepository, s,
+            )
+        }
+    }
+
+    fun byUid(): ListFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.listConnector { uidList: List<String> ->
+            scope.toBuilder().events(uidList).build()
+        }
+    }
+
+    fun byLastUpdated(): PeriodFilterConnector<EventQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter ->
+            val merged: DateFilterPeriod =
+                DateFilterPeriodHelper.mergeDateFilterPeriods(scope.lastUpdatedDate(), filter)!!
+            scope.toBuilder().lastUpdatedDate(merged).build()
+        }
     }
 
     /**
      * Filter by event status.
-     * <br><b>IMPORTANT:</b> this filter accepts a list of event status, but only the first one will be used for
+     * <br></br>**IMPORTANT:** this filter accepts a list of event status, but only the first one will be used for
      * the online query because the web API does not support querying by multiple status.
      *
      * @return Repository connector
      */
-    public ListFilterConnector<EventQueryCollectionRepository, EventStatus> byStatus() {
-        return connectorFactory.listConnector(status -> scope.toBuilder().eventStatus(status).build());
+    fun byStatus(): ListFilterConnector<EventQueryCollectionRepository, EventStatus> {
+        return connectorFactory.listConnector { status: List<EventStatus> ->
+            scope.toBuilder().eventStatus(status).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, String> byProgram() {
-        return connectorFactory.eqConnector(program -> scope.toBuilder().program(program).build());
+    fun byProgram(): EqFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { program ->
+            scope.toBuilder().program(program).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, String> byProgramStage() {
-        return connectorFactory.eqConnector(programStage -> scope.toBuilder().programStage(programStage).build());
+    fun byProgramStage(): EqFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { programStage ->
+            scope.toBuilder().programStage(programStage).build()
+        }
     }
 
     /**
      * Filter by Event organisation units.
-     * <br><b>IMPORTANT:</b> this filter accepts a list of organisation units, but only the first one will be used for
+     * <br></br>**IMPORTANT:** this filter accepts a list of organisation units, but only the first one will be used for
      * the online query because the web API does not support querying by multiple organisation units.
      *
      * @return Repository connector
      */
-    public ListFilterConnector<EventQueryCollectionRepository, String> byOrgUnits() {
-        return connectorFactory.listConnector(orgunits -> scope.toBuilder().orgUnits(orgunits).build());
+    fun byOrgUnits(): ListFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.listConnector { orgUnits: List<String> ->
+            scope.toBuilder().orgUnits(orgUnits).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, OrganisationUnitMode> byOrgUnitMode() {
-        return connectorFactory.eqConnector(mode -> scope.toBuilder().orgUnitMode(mode).build());
+    fun byOrgUnitMode(): EqFilterConnector<EventQueryCollectionRepository, OrganisationUnitMode> {
+        return connectorFactory.eqConnector { mode ->
+            scope.toBuilder().orgUnitMode(mode).build()
+        }
     }
 
-    public PeriodFilterConnector<EventQueryCollectionRepository> byEventDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod merged = DateFilterPeriodHelper.mergeDateFilterPeriods(scope.eventDate(), filter);
-            return scope.toBuilder().eventDate(merged).build();
-        });
+    fun byEventDate(): PeriodFilterConnector<EventQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val merged: DateFilterPeriod = DateFilterPeriodHelper.mergeDateFilterPeriods(scope.eventDate(), filter)!!
+            scope.toBuilder().eventDate(merged).build()
+        }
     }
 
-    public PeriodFilterConnector<EventQueryCollectionRepository> byCompleteDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod merged = DateFilterPeriodHelper.mergeDateFilterPeriods(scope.completedDate(), filter);
-            return scope.toBuilder().completedDate(merged).build();
-        });
+    fun byCompleteDate(): PeriodFilterConnector<EventQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val merged: DateFilterPeriod =
+                DateFilterPeriodHelper.mergeDateFilterPeriods(scope.completedDate(), filter)!!
+            scope.toBuilder().completedDate(merged).build()
+        }
     }
 
-    public PeriodFilterConnector<EventQueryCollectionRepository> byDueDate() {
-        return connectorFactory.periodConnector(filter -> {
-            DateFilterPeriod merged = DateFilterPeriodHelper.mergeDateFilterPeriods(scope.dueDate(), filter);
-            return scope.toBuilder().dueDate(merged).build();
-        });
+    fun byDueDate(): PeriodFilterConnector<EventQueryCollectionRepository> {
+        return connectorFactory.periodConnector { filter: DateFilterPeriod ->
+            val merged: DateFilterPeriod = DateFilterPeriodHelper.mergeDateFilterPeriods(scope.dueDate(), filter)!!
+            scope.toBuilder().dueDate(merged).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, Boolean> byIncludeDeleted() {
-        return connectorFactory.eqConnector(includeDeleted -> scope.toBuilder().includeDeleted(includeDeleted).build());
+    fun byIncludeDeleted(): EqFilterConnector<EventQueryCollectionRepository, Boolean> {
+        return connectorFactory.eqConnector { includeDeleted ->
+            scope.toBuilder().includeDeleted(includeDeleted).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, String> byTrackedEntityInstance() {
-        return connectorFactory.eqConnector(tei -> scope.toBuilder().trackedEntityInstance(tei).build());
+    fun byTrackedEntityInstance(): EqFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { tei ->
+            scope.toBuilder().trackedEntityInstance(tei).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, AssignedUserMode> byAssignedUser() {
-        return connectorFactory.eqConnector(userMode -> scope.toBuilder().assignedUserMode(userMode).build());
+    fun byAssignedUser(): EqFilterConnector<EventQueryCollectionRepository, AssignedUserMode> {
+        return connectorFactory.eqConnector { userMode ->
+            scope.toBuilder().assignedUserMode(userMode).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository, String> byEventFilter() {
-        return connectorFactory.eqConnector(id -> {
-            EventFilter filter = eventFilterRepository.withEventDataFilters().uid(id).blockingGet();
-            return EventQueryRepositoryScopeHelper.addEventFilter(scope, filter);
-        });
+    fun byEventFilter(): EqFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.eqConnector { id ->
+            val filter: EventFilter = eventFilterRepository.withEventDataFilters().uid(id).blockingGet()!!
+            EventQueryRepositoryScopeHelper.addEventFilter(scope, filter)
+        }
     }
 
     /**
      * Filter by sync status.
-     * <br><b>IMPORTANT:</b> using this filter forces <b>offlineOnly</b> mode.
+     * <br></br>**IMPORTANT:** using this filter forces **offlineOnly** mode.
      *
      * @return Repository connector
      */
-    public ListFilterConnector<EventQueryCollectionRepository, State> byStates() {
-        return connectorFactory.listConnector(states -> scope.toBuilder().states(states).build());
-    }
-
-    public ListFilterConnector<EventQueryCollectionRepository, String> byAttributeOptionCombo() {
-        return connectorFactory.listConnector(aoc -> scope.toBuilder().attributeOptionCombos(aoc).build());
+    fun byStates(): ListFilterConnector<EventQueryCollectionRepository, State> {
+        return connectorFactory.listConnector { states: List<State> ->
+            scope.toBuilder().states(states).build()
+        }
     }
 
-    public EventDataFilterConnector<EventQueryCollectionRepository> byDataValue(String dataElementId) {
-        return connectorFactory.eventDataFilterConnector(dataElementId, filter -> {
-            List<EventDataFilter> filters = DateFilterPeriodHelper.mergeEventDataFilters(scope.dataFilters(), filter);
-            return scope.toBuilder().dataFilters(filters).build();
-        });
+    fun byAttributeOptionCombo(): ListFilterConnector<EventQueryCollectionRepository, String> {
+        return connectorFactory.listConnector { aoc: List<String> ->
+            scope.toBuilder().attributeOptionCombos(aoc).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByEventDate() {
-        return orderConnector(EventQueryScopeOrderColumn.EVENT_DATE);
+    fun byDataValue(dataElementId: String): EventDataFilterConnector<EventQueryCollectionRepository> {
+        return connectorFactory.eventDataFilterConnector(
+            dataElementId,
+        ) { filter: EventDataFilter ->
+            val filters: List<EventDataFilter> =
+                DateFilterPeriodHelper.mergeEventDataFilters(scope.dataFilters(), filter)
+            scope.toBuilder().dataFilters(filters).build()
+        }
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByDueDate() {
-        return orderConnector(EventQueryScopeOrderColumn.DUE_DATE);
+    fun orderByEventDate(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.EVENT_DATE)
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByCompleteDate() {
-        return orderConnector(EventQueryScopeOrderColumn.COMPLETED_DATE);
+    fun orderByDueDate(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.DUE_DATE)
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByCreated() {
-        return orderConnector(EventQueryScopeOrderColumn.CREATED);
+    fun orderByCompleteDate(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.COMPLETED_DATE)
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByLastUpdated() {
-        return orderConnector(EventQueryScopeOrderColumn.LAST_UPDATED);
+    fun orderByCreated(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.CREATED)
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByOrganisationUnitName() {
-        return orderConnector(EventQueryScopeOrderColumn.ORGUNIT_NAME);
+    fun orderByLastUpdated(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.LAST_UPDATED)
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByTimeline() {
-        return orderConnector(EventQueryScopeOrderColumn.TIMELINE);
+    fun orderByOrganisationUnitName(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.ORGUNIT_NAME)
     }
 
-    public EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderByDataElement(String dataElement) {
-        return orderConnector(EventQueryScopeOrderColumn.dataElement(dataElement));
+    fun orderByTimeline(): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.TIMELINE)
     }
 
-    private EqFilterConnector<EventQueryCollectionRepository,
-            RepositoryScope.OrderByDirection> orderConnector(
-            EventQueryScopeOrderColumn col) {
-        return connectorFactory.eqConnector(direction -> {
-            List<EventQueryScopeOrderByItem> order = new ArrayList<>(scope.order());
-            order.add(EventQueryScopeOrderByItem.builder().column(col).direction(direction).build());
-            return scope.toBuilder().order(order).build();
-        });
+    fun orderByDataElement(dataElement: String?): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return orderConnector(EventQueryScopeOrderColumn.dataElement(dataElement))
     }
 
-    public EventQueryRepositoryScope getScope() {
-        return scope;
+    private fun orderConnector(
+        col: EventQueryScopeOrderColumn,
+    ): EqFilterConnector<EventQueryCollectionRepository, OrderByDirection> {
+        return connectorFactory.eqConnector { direction ->
+            val order: MutableList<EventQueryScopeOrderByItem> = ArrayList(scope.order())
+            order.add(EventQueryScopeOrderByItem.builder().column(col).direction(direction).build())
+            scope.toBuilder().order(order).build()
+        }
     }
 
-    @Override
-    public EventObjectRepository uid(String uid) {
-        return getEventCollectionRepository().uid(uid);
+    override fun uid(uid: String?): EventObjectRepository {
+        return eventCollectionRepository.uid(uid)
     }
 
-    @Override
-    public Single<List<String>> getUids() {
-        return getEventCollectionRepository().getUids();
+    override fun getUids(): Single<List<String>> {
+        return eventCollectionRepository.getUids()
     }
 
-    @Override
-    public List<String> blockingGetUids() {
-        return getEventCollectionRepository().blockingGetUids();
+    override fun blockingGetUids(): List<String> {
+        return eventCollectionRepository.blockingGetUids()
     }
 
-    @Override
-    public Single<List<Event>> get() {
-        return getEventCollectionRepository().get();
+    override fun get(): Single<List<Event>> {
+        return eventCollectionRepository.get()
     }
 
-    @Override
-    public List<Event> blockingGet() {
-        return getEventCollectionRepository().blockingGet();
+    override fun blockingGet(): List<Event> {
+        return eventCollectionRepository.blockingGet()
     }
 
-    @NonNull
-    @Override
-    public LiveData<PagedList<Event>> getPaged(int pageSize) {
-        return getEventCollectionRepository().getPaged(pageSize);
+    override fun getPaged(pageSize: Int): LiveData<PagedList<Event>> {
+        return eventCollectionRepository.getPaged(pageSize)
     }
 
-    @NonNull
-    @Override
-    public Flow<PagingData<Event>> getPagingData(int pageSize) {
-        return getEventCollectionRepository().getPagingData(pageSize);
+    override fun getPagingData(pageSize: Int): Flow<PagingData<Event>> {
+        return eventCollectionRepository.getPagingData(pageSize)
     }
 
-    public DataSource<Event, Event> getDataSource() {
-        return getEventCollectionRepository().getDataSource();
+    fun getDataSource(): DataSource<Event, Event> {
+        return eventCollectionRepository.dataSource
     }
 
-    @Override
-    public Single<Integer> count() {
-        return getEventCollectionRepository().count();
+    override fun count(): Single<Int> {
+        return eventCollectionRepository.count()
     }
 
-    @Override
-    public int blockingCount() {
-        return getEventCollectionRepository().blockingCount();
+    override fun blockingCount(): Int {
+        return eventCollectionRepository.blockingCount()
     }
 
-    @Override
-    public Single<Boolean> isEmpty() {
-        return getEventCollectionRepository().isEmpty();
+    override fun isEmpty(): Single<Boolean> {
+        return eventCollectionRepository.isEmpty()
     }
-
-    @Override
-    public boolean blockingIsEmpty() {
-        return getEventCollectionRepository().blockingIsEmpty();
+    override fun blockingIsEmpty(): Boolean {
+        return eventCollectionRepository.blockingIsEmpty()
     }
 
-    @Override
-    public ReadOnlyObjectRepository<Event> one() {
-        return getEventCollectionRepository().one();
+    override fun one(): ReadOnlyObjectRepository<Event> {
+        return eventCollectionRepository.one()
     }
 
-    private EventCollectionRepository getEventCollectionRepository() {
-        return eventCollectionRepositoryAdapter
-                .getCollectionRepository(scope)
-                .withTrackedEntityDataValues();
-    }
-}
\ No newline at end of file
+    private val eventCollectionRepository: EventCollectionRepository
+        private get() = eventCollectionRepositoryAdapter
+            .getCollectionRepository(scope)
+            .withTrackedEntityDataValues()
+}

From aa7d821f0534ead376101340af76e254e4a05743 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 10:48:41 +0200
Subject: [PATCH 382/478] [ANDROSDK-1717] Detekt

---
 .../core/event/search/EventQueryCollectionRepository.kt      | 1 +
 .../android/core/indicator/IndicatorCollectionRepository.kt  | 1 +
 .../organisationunit/OrganisationUnitCollectionRepository.kt | 1 +
 .../dhis/android/core/program/ProgramCollectionRepository.kt | 1 +
 .../core/program/ProgramRuleActionCollectionRepository.kt    | 1 +
 .../android/core/program/ProgramStageCollectionRepository.kt | 1 +
 .../ProgramTrackedEntityAttributeCollectionRepository.kt     | 5 ++++-
 .../ProgramStageWorkingListCollectionRepository.kt           | 1 +
 .../core/relationship/RelationshipCollectionRepository.kt    | 1 +
 .../TrackedEntityAttributeCollectionRepository.kt            | 1 +
 .../TrackedEntityInstanceCollectionRepository.kt             | 2 ++
 .../TrackedEntityInstanceFilterCollectionRepository.kt       | 1 +
 .../core/validation/ValidationRuleCollectionRepository.kt    | 1 +
 .../core/visualization/VisualizationCollectionRepository.kt  | 1 +
 14 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index 7327b73d43..f3d3ff9460 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -57,6 +57,7 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class EventQueryCollectionRepository @Inject internal constructor(
     private val eventCollectionRepositoryAdapter: EventCollectionRepositoryAdapter,
     eventFilterRepository: EventFilterCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
index 8bc22c0a1e..f4ee8df706 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
@@ -42,6 +42,7 @@ import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class IndicatorCollectionRepository @Inject internal constructor(
     store: IndicatorStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<Indicator>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
index 96dd5f1719..d59e84da4e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
@@ -45,6 +45,7 @@ import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class OrganisationUnitCollectionRepository @Inject internal constructor(
     store: OrganisationUnitStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnit>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
index 5bcca66026..f47887b9ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
@@ -46,6 +46,7 @@ import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class ProgramCollectionRepository @Inject internal constructor(
     store: ProgramStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<Program>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
index dfb7f7d068..3e86177aa2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
@@ -38,6 +38,7 @@ import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class ProgramRuleActionCollectionRepository @Inject internal constructor(
     store: ProgramRuleActionStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRuleAction>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
index c7574aeea6..df7b2769d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
@@ -45,6 +45,7 @@ import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class ProgramStageCollectionRepository @Inject internal constructor(
     store: ProgramStageStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStage>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
index ca41e6551d..c994087ef3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
@@ -45,7 +45,10 @@ class ProgramTrackedEntityAttributeCollectionRepository @Inject internal constru
     store: ProgramTrackedEntityAttributeStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<ProgramTrackedEntityAttribute>>,
     scope: RepositoryScope,
-) : ReadOnlyNameableCollectionRepositoryImpl<ProgramTrackedEntityAttribute, ProgramTrackedEntityAttributeCollectionRepository>(
+) : ReadOnlyNameableCollectionRepositoryImpl<
+    ProgramTrackedEntityAttribute,
+    ProgramTrackedEntityAttributeCollectionRepository,
+    >(
     store,
     childrenAppenders,
     scope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
index 224329d7bb..a3fa637253 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
@@ -44,6 +44,7 @@ import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageW
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class ProgramStageWorkingListCollectionRepository @Inject internal constructor(
     store: ProgramStageWorkingListStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageWorkingList>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
index d87b00fec0..d0d9ca7435 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
@@ -54,6 +54,7 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class RelationshipCollectionRepository @Inject internal constructor(
     private val relationshipStore: RelationshipStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<Relationship>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
index cd544509d9..cb8593d711 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
@@ -42,6 +42,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeS
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
     store: TrackedEntityAttributeStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityAttribute>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
index 039a6bfcda..88d3523dd1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
@@ -55,6 +55,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
@@ -91,6 +92,7 @@ class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
         trackerDataManager.propagateTrackedEntityUpdate(m, action!!)
     }
 
+    @Suppress("SpreadOperator")
     override fun upload(): Observable<D2Progress> {
         return Observable.concat(
             jobQueryCall.queryPendingJobs(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
index b06a384edf..5b8937ed84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
@@ -46,6 +46,7 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFi
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class TrackedEntityInstanceFilterCollectionRepository @Inject internal constructor(
     store: TrackedEntityInstanceFilterStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstanceFilter>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
index 0e78bf23a5..68454f76c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
@@ -41,6 +41,7 @@ import org.hisp.dhis.android.core.validation.internal.ValidationRuleStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class ValidationRuleCollectionRepository @Inject internal constructor(
     store: ValidationRuleStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<ValidationRule>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
index 7232582102..f99fcaffcd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
@@ -40,6 +40,7 @@ import org.hisp.dhis.android.core.visualization.internal.VisualizationStore
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class VisualizationCollectionRepository @Inject internal constructor(
     store: VisualizationStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<Visualization>>,

From dd81840098c4f9bc626f01cc6757227abbda0653 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 11:06:30 +0200
Subject: [PATCH 383/478] [ANDROSDK-1717] Fix TrackerImportConflictParser
 nullable arguments

---
 .../core/imports/internal/TrackerImportConflictParser.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
index cb4fab83fb..1543590891 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
@@ -147,11 +147,11 @@ internal class TrackerImportConflictParser @Inject constructor(
 
         return if (auxConflict.dataElement() != null && auxConflict.event() != null) {
             trackedEntityInstanceDataValueRepository
-                .value(auxConflict.event(), auxConflict.dataElement())
+                .value(auxConflict.event()!!, auxConflict.dataElement()!!)
                 .blockingGet()?.value()
         } else if (auxConflict.trackedEntityAttribute() != null && auxConflict.trackedEntityInstance() != null) {
             trackedEntityAttributeValueRepository
-                .value(auxConflict.trackedEntityAttribute(), auxConflict.trackedEntityInstance())
+                .value(auxConflict.trackedEntityAttribute()!!, auxConflict.trackedEntityInstance()!!)
                 .blockingGet()?.value()
         } else {
             null

From 13011ed58a8858a24cecb4ef4e9639e5946d3c0a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Fri, 29 Sep 2023 11:34:31 +0200
Subject: [PATCH 384/478] [ANDROSDK-1717] Fix not nullable anymore tests

---
 .../core/event/internal/EventPostCallRealIntegrationShould.kt   | 2 +-
 .../internal/FileResourceCallRealIntegrationShould.kt           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
index 1950053b62..429547b1ba 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/event/internal/EventPostCallRealIntegrationShould.kt
@@ -194,7 +194,7 @@ class EventPostCallRealIntegrationShould : BaseRealIntegrationTest() {
             .one().blockingGet()!!
             .uid()
         programUid = d2.programModule().programs()
-            .byOrganisationUnitUid(orgUnitUid)
+            .byOrganisationUnitUid(orgUnitUid!!)
             .byProgramType().eq(ProgramType.WITHOUT_REGISTRATION)
             .one().blockingGet()!!
             .uid()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
index 4d8c99cce5..8d6b843e06 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceCallRealIntegrationShould.kt
@@ -148,7 +148,7 @@ class FileResourceCallRealIntegrationShould : BaseRealIntegrationTest() {
         d2.eventModule().events().uid(newEventUid).setEventDate(Date())
 
         val newValueUid = d2.fileResourceModule().fileResources().blockingAdd(file)
-        d2.trackedEntityModule().trackedEntityDataValues().value(newEventUid, existingValue.dataElement())
+        d2.trackedEntityModule().trackedEntityDataValues().value(newEventUid, existingValue.dataElement()!!)
             .blockingSet(newValueUid)
 
         d2.eventModule().events().blockingUpload()

From 4c967ba89c8f5346664ff26ed73f42dd800aea8b Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 2 Oct 2023 09:54:32 +0200
Subject: [PATCH 385/478] [ANDROSDK-1717] Remove init and fix getter

---
 .../search/EventQueryCollectionRepository.kt  | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index f3d3ff9460..9f4ce10212 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -60,26 +60,19 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class EventQueryCollectionRepository @Inject internal constructor(
     private val eventCollectionRepositoryAdapter: EventCollectionRepositoryAdapter,
-    eventFilterRepository: EventFilterCollectionRepository,
-    scope: EventQueryRepositoryScope,
+    private val eventFilterRepository: EventFilterCollectionRepository,
+    private val scope: EventQueryRepositoryScope,
 ) : ReadOnlyWithUidCollectionRepository<Event> {
+
     private val connectorFactory: ScopedFilterConnectorFactory<
         EventQueryCollectionRepository,
         EventQueryRepositoryScope,
-        >
-    private val eventFilterRepository: EventFilterCollectionRepository
-
-    @JvmField
-    val scope: EventQueryRepositoryScope
-
-    init {
-        this.eventFilterRepository = eventFilterRepository
-        this.scope = scope
-        connectorFactory = ScopedFilterConnectorFactory { s: EventQueryRepositoryScope ->
-            EventQueryCollectionRepository(
-                eventCollectionRepositoryAdapter, eventFilterRepository, s,
-            )
-        }
+        > = ScopedFilterConnectorFactory { s: EventQueryRepositoryScope ->
+        EventQueryCollectionRepository(
+            eventCollectionRepositoryAdapter,
+            eventFilterRepository,
+            s,
+        )
     }
 
     fun byUid(): ListFilterConnector<EventQueryCollectionRepository, String> {
@@ -285,9 +278,8 @@ class EventQueryCollectionRepository @Inject internal constructor(
         return eventCollectionRepository.getPagingData(pageSize)
     }
 
-    fun getDataSource(): DataSource<Event, Event> {
-        return eventCollectionRepository.dataSource
-    }
+    val dataSource: DataSource<Event, Event>
+        get() = eventCollectionRepository.dataSource
 
     override fun count(): Single<Int> {
         return eventCollectionRepository.count()

From c8b185e8db5c7a165430f03c7b7d6e91cf8c92b0 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 2 Oct 2023 10:44:45 +0200
Subject: [PATCH 386/478] [ANDROSDK-1717] Make scope public

---
 .../core/event/search/EventQueryCollectionRepository.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index 9f4ce10212..2b69d6df65 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -61,7 +61,7 @@ import javax.inject.Inject
 class EventQueryCollectionRepository @Inject internal constructor(
     private val eventCollectionRepositoryAdapter: EventCollectionRepositoryAdapter,
     private val eventFilterRepository: EventFilterCollectionRepository,
-    private val scope: EventQueryRepositoryScope,
+    val scope: EventQueryRepositoryScope,
 ) : ReadOnlyWithUidCollectionRepository<Event> {
 
     private val connectorFactory: ScopedFilterConnectorFactory<
@@ -301,7 +301,7 @@ class EventQueryCollectionRepository @Inject internal constructor(
     }
 
     private val eventCollectionRepository: EventCollectionRepository
-        private get() = eventCollectionRepositoryAdapter
+        get() = eventCollectionRepositoryAdapter
             .getCollectionRepository(scope)
             .withTrackedEntityDataValues()
 }

From 38c0d18de035ba1c6a6c0703b8ad795216f5059a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Mon, 2 Oct 2023 13:07:27 +0200
Subject: [PATCH 387/478] [ANDROSDK-1717] Add JvmField to scope

---
 .../android/core/event/search/EventQueryCollectionRepository.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index 2b69d6df65..67b4e3824c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -61,7 +61,7 @@ import javax.inject.Inject
 class EventQueryCollectionRepository @Inject internal constructor(
     private val eventCollectionRepositoryAdapter: EventCollectionRepositoryAdapter,
     private val eventFilterRepository: EventFilterCollectionRepository,
-    val scope: EventQueryRepositoryScope,
+    @JvmField val scope: EventQueryRepositoryScope,
 ) : ReadOnlyWithUidCollectionRepository<Event> {
 
     private val connectorFactory: ScopedFilterConnectorFactory<

From 9eec0a28ba6db53b104048dd36975608c249eddb Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 29 Sep 2023 07:57:32 +0200
Subject: [PATCH 388/478] [ANDROSDK-1742-REVERT] Revert update to Paging 3

---
 core/build.gradle.kts                         |  3 +-
 .../collection/PagingMockIntegrationShould.kt | 88 -----------------
 ...llectionRepositoryMockIntegrationShould.kt | 18 ----
 .../ReadOnlyCollectionRepository.kt           |  9 --
 .../ReadOnlyCollectionRepositoryImpl.kt       | 17 ----
 ...WithTransformerCollectionRepositoryImpl.kt | 17 ----
 .../paging/internal/RepositoryPagingSource.kt | 91 ------------------
 .../RepositoryPagingSourceWithTransformer.kt  | 94 -------------------
 .../search/EventQueryCollectionRepository.kt  |  6 --
 ...EntityInstanceQueryCollectionRepository.kt | 24 -----
 .../TrackedEntityInstanceQueryPagingSource.kt | 83 ----------------
 ...TrackedEntitySearchCollectionRepository.kt | 25 -----
 .../search/TrackedEntitySearchPagingSource.kt | 86 -----------------
 13 files changed, 1 insertion(+), 560 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 0c3d66b053..1400ad0581 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -56,7 +56,7 @@ val libraryDesugaring = "2.0.3"
 
 // android
 val annotation = "1.6.0"
-val paging = "3.2.0"
+val paging = "2.1.2"
 
 // java
 val jackson = "2.13.4"
@@ -222,7 +222,6 @@ dependencies {
         exclude(group = "junit") // Android has JUnit built in.
     }
     androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines")
-    androidTestImplementation("androidx.paging:paging-testing:$paging")
 
     debugImplementation("com.facebook.flipper:flipper:$flipper")
     debugImplementation("com.facebook.soloader:soloader:$soloader")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index 1258227045..ca5531cc58 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.paging.PagedList
-import androidx.paging.testing.asSnapshot
 import com.jraska.livedata.TestObserver
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -39,14 +37,12 @@ import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
-import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(D2JunitRunner::class)
 class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
@@ -159,88 +155,4 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
             .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[4]!!.displayName() == "Male" }
             .assertValue { pagedList: PagedList<CategoryOption> -> pagedList[5]!!.displayName() == "MCH Aides" }
     }
-
-    @Test
-    fun get_pagingData_with_initial_objects_with_default_order_considering_prefetch_distance() = runTest {
-        val items = d2.categoryModule().categoryOptions().getPagingData(2)
-
-        val itemsSnapshot: List<CategoryOption> = items.asSnapshot()
-
-        assertEquals(itemsSnapshot.size, 6)
-        assertEquals(itemsSnapshot[0], allValues[0])
-        assertEquals(itemsSnapshot[1], allValues[1])
-        assertEquals(itemsSnapshot[2], allValues[2])
-        assertEquals(itemsSnapshot[3], allValues[3])
-        assertEquals(itemsSnapshot[4], allValues[4])
-        assertEquals(itemsSnapshot[5], allValues[5])
-    }
-
-    @Test
-    fun get_pagingData_with_initial_objects_ordered_by_display_name_asc() = runTest {
-        val items = d2.categoryModule().categoryOptions()
-            .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
-            .getPagingData(2)
-
-        val snapshot = items.asSnapshot()
-
-        assertEquals(snapshot.size, 6)
-        assertEquals(snapshot[0].displayName(), "At PHU")
-        assertEquals(snapshot[1].displayName(), "Female")
-        assertEquals(snapshot[2].displayName(), "In Community")
-        assertEquals(snapshot[3].displayName(), "MCH Aides")
-        assertEquals(snapshot[4].displayName(), "Male")
-        assertEquals(snapshot[5].displayName(), "SECHN")
-    }
-
-    @Test
-    fun get_pagingData_with_initial_objects_ordered_by_display_name_desc() = runTest {
-        val items = d2.categoryModule().categoryOptions()
-            .orderByDisplayName(RepositoryScope.OrderByDirection.DESC)
-            .getPagingData(2)
-
-        val snapshot = items.asSnapshot()
-
-        assertEquals(snapshot.size, 6)
-        assertEquals(snapshot[0].displayName(), "default display name")
-        assertEquals(snapshot[1].displayName(), "Trained TBA")
-        assertEquals(snapshot[2].displayName(), "SECHN")
-        assertEquals(snapshot[3].displayName(), "Male")
-        assertEquals(snapshot[4].displayName(), "MCH Aides")
-        assertEquals(snapshot[5].displayName(), "In Community")
-    }
-
-    @Test
-    fun get_pagingData_with_initial_objects_ordered_by_description_desc() = runTest {
-        val items = d2.categoryModule().categoryOptions()
-            .orderByDescription(RepositoryScope.OrderByDirection.DESC)
-            .getPagingData(2)
-
-        val snapshot = items.asSnapshot()
-
-        assertEquals(snapshot.size, 6)
-        assertEquals(snapshot[0].displayName(), "default display name")
-        assertEquals(snapshot[1].displayName(), "Female")
-        assertEquals(snapshot[2].displayName(), "Male")
-        assertEquals(snapshot[3].displayName(), "In Community")
-        assertEquals(snapshot[4].displayName(), "At PHU")
-        assertEquals(snapshot[5].displayName(), "MCH Aides")
-    }
-
-    @Test
-    fun get_pagingData_with_initial_objects_ordered_by_description_and_display_name_desc() = runTest {
-        val items = d2.categoryModule().categoryOptions()
-            .orderByDescription(RepositoryScope.OrderByDirection.DESC)
-            .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
-            .getPagingData(2)
-
-        val snapshot = items.asSnapshot()
-
-        assertEquals(snapshot.size, 6)
-        assertEquals(snapshot[0].displayName(), "default display name")
-        assertEquals(snapshot[1].displayName(), "At PHU")
-        assertEquals(snapshot[2].displayName(), "Female")
-        assertEquals(snapshot[3].displayName(), "In Community")
-        assertEquals(snapshot[4].displayName(), "Male")
-        assertEquals(snapshot[5].displayName(), "MCH Aides")
-    }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index e4a1e64393..1d2584cca5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -29,16 +29,10 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.paging.PagedList
-import androidx.paging.PagingData
-import androidx.paging.testing.asSnapshot
 import com.jraska.livedata.TestObserver
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
-import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -50,7 +44,6 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     @get:Rule
     var rule: TestRule = InstantTaskExecutorRule()
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun get_offline_initial_objects() {
         val liveData = d2.trackedEntityModule().trackedEntityInstanceQuery()
@@ -60,15 +53,4 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
             .assertHasValue()
             .assertValue { pagedList: PagedList<TrackedEntityInstance> -> pagedList.size == 2 }
     }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun get_PagingData_with_offline_initial_objects() = runTest {
-        val items: Flow<PagingData<TrackedEntityInstance>> = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .offlineOnly().getPagingData(2)
-
-        val snapshot = items.asSnapshot()
-
-        assertEquals(snapshot.size, 2)
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
index 6fc97e38a9..d242f752e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepository.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.core.arch.repositories.collection
 
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
-import androidx.paging.PagingData
 import io.reactivex.Single
-import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 
 interface ReadOnlyCollectionRepository<M : Any> : BaseRepository {
@@ -59,13 +57,6 @@ interface ReadOnlyCollectionRepository<M : Any> : BaseRepository {
     @Deprecated(message = "Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
     fun getPaged(pageSize: Int): LiveData<PagedList<M>>
 
-    /**
-     * Uses Paging3 library and return a Flow
-     * @param pageSize Length of the page
-     * @return a Flow of PagingData elements
-     */
-    fun getPagingData(pageSize: Int): Flow<PagingData<M>>
-
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
      * @return A `Single` object with the element count
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index e3a1af98b0..e9faac8f20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -31,12 +31,7 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.PagingSource
 import io.reactivex.Single
-import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
@@ -46,7 +41,6 @@ import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectio
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
 import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource
-import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingSource
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
@@ -115,21 +109,10 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
         return LivePagedListBuilder(factory, pageSize).build()
     }
 
-    override fun getPagingData(pageSize: Int): Flow<PagingData<M>> {
-        return Pager(
-            config = PagingConfig(pageSize = pageSize),
-        ) {
-            pagingSource
-        }.flow
-    }
-
     @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
     val dataSource: DataSource<M, M>
         get() = RepositoryDataSource(store, scope, childrenAppenders)
 
-    private val pagingSource: PagingSource<M, M>
-        get() = RepositoryPagingSource(store, scope, childrenAppenders)
-
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
      * @return A `Single` object with the element count
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index d272c1bbe3..fd074debff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -31,12 +31,7 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.PagingSource
 import io.reactivex.Single
-import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
@@ -48,7 +43,6 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyWithTransformerObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSourceWithTransformer
-import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingSourceWithTransformer
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
@@ -123,20 +117,9 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
         return LivePagedListBuilder(factory, pageSize).build()
     }
 
-    override fun getPagingData(pageSize: Int): Flow<PagingData<T>> {
-        return Pager(
-            config = PagingConfig(pageSize = pageSize),
-        ) {
-            pagingSource
-        }.flow
-    }
-
     val dataSource: DataSource<M, T>
         get() = RepositoryDataSourceWithTransformer(store, scope, childrenAppenders, transformer)
 
-    private val pagingSource: PagingSource<M, T>
-        get() = RepositoryPagingSourceWithTransformer(store, scope, childrenAppenders, transformer)
-
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
      * @return A `Single` object with the element count
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
deleted file mode 100644
index 7e0e253838..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSource.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.paging.internal
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor.appendInObjectCollection
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
-import org.hisp.dhis.android.core.common.CoreObject
-import java.io.IOException
-
-class RepositoryPagingSource<M : CoreObject> internal constructor(
-    private val store: ReadableStore<M>,
-    private val scope: RepositoryScope,
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
-) : PagingSource<M, M>() {
-
-    override fun getRefreshKey(state: PagingState<M, M>): M? {
-        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
-    }
-
-    override suspend fun load(params: LoadParams<M>): LoadResult<M, M> {
-        try {
-            val whereClauseBuilder = WhereClauseBuilder()
-
-            params.key?.let { key ->
-                val reverse = when (params) {
-                    is LoadParams.Prepend -> true
-                    else -> false
-                }
-
-                OrderByClauseBuilder.addSortingClauses(
-                    whereClauseBuilder,
-                    scope.orderBy(),
-                    key.toContentValues(),
-                    reverse,
-                    scope.pagingKey(),
-                )
-            }
-
-            val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(
-                scope,
-            )
-            val withoutChildren = store.selectWhere(
-                whereClause,
-                OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-                params.loadSize,
-            )
-
-            val items = appendInObjectCollection(withoutChildren, childrenAppenders, scope.children())
-            return LoadResult.Page(
-                data = items,
-                prevKey = items.firstOrNull(),
-                nextKey = items.getOrNull(params.loadSize - 1),
-            )
-        } catch (e: IOException) {
-            return LoadResult.Error(e)
-        }
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
deleted file mode 100644
index 890772ee47..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryPagingSourceWithTransformer.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.paging.internal
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
-import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
-import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
-import org.hisp.dhis.android.core.common.CoreObject
-import java.io.IOException
-
-internal class RepositoryPagingSourceWithTransformer<M : CoreObject, T : Any> internal constructor(
-    private val store: ReadableStore<M>,
-    private val scope: RepositoryScope,
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
-    private val transformer: TwoWayTransformer<M, T>,
-) : PagingSource<M, T>() {
-    override fun getRefreshKey(state: PagingState<M, T>): M? {
-        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
-    }
-
-    override suspend fun load(params: LoadParams<M>): LoadResult<M, T> {
-        try {
-            val whereClauseBuilder = WhereClauseBuilder()
-
-            params.key?.let { key ->
-                val reverse = when (params) {
-                    is LoadParams.Prepend -> true
-                    else -> false
-                }
-
-                OrderByClauseBuilder.addSortingClauses(
-                    whereClauseBuilder,
-                    scope.orderBy(),
-                    key.toContentValues(),
-                    reverse,
-                    scope.pagingKey(),
-                )
-            }
-
-            val whereClause = WhereClauseFromScopeBuilder(whereClauseBuilder).getWhereClause(scope)
-            val withoutChildren = store.selectWhere(
-                whereClause,
-                OrderByClauseBuilder.orderByFromItems(scope.orderBy(), scope.pagingKey()),
-                params.loadSize,
-            )
-            val items = ChildrenAppenderExecutor.appendInObjectCollection(
-                withoutChildren,
-                childrenAppenders,
-                scope.children(),
-            )
-
-            return LoadResult.Page(
-                data = items.map { transformer.transform(it) },
-                prevKey = items.firstOrNull(),
-                nextKey = items.getOrNull(params.loadSize - 1),
-            )
-        } catch (e: IOException) {
-            return LoadResult.Error(e)
-        }
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index 67b4e3824c..673419c86e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -30,10 +30,8 @@ package org.hisp.dhis.android.core.event.search
 import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.PagedList
-import androidx.paging.PagingData
 import dagger.Reusable
 import io.reactivex.Single
-import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EventDataFilterConnector
@@ -274,10 +272,6 @@ class EventQueryCollectionRepository @Inject internal constructor(
         return eventCollectionRepository.getPaged(pageSize)
     }
 
-    override fun getPagingData(pageSize: Int): Flow<PagingData<Event>> {
-        return eventCollectionRepository.getPagingData(pageSize)
-    }
-
     val dataSource: DataSource<Event, Event>
         get() = eventCollectionRepository.dataSource
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index da9faf2538..fde09df59a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -31,13 +31,8 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.PagingSource
 import dagger.Reusable
 import io.reactivex.Single
-import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -136,28 +131,9 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
         return LivePagedListBuilder(factory, pageSize).build()
     }
 
-    override fun getPagingData(pageSize: Int): Flow<PagingData<TrackedEntityInstance>> {
-        return Pager(
-            config = PagingConfig(pageSize = pageSize),
-        ) {
-            pagingSource
-        }.flow
-    }
-
     val dataSource: DataSource<TrackedEntityInstance, TrackedEntityInstance>
         get() = TrackedEntityInstanceQueryDataSource(getDataFetcher())
 
-    val pagingSource: PagingSource<TrackedEntityInstance, TrackedEntityInstance>
-        get() = TrackedEntityInstanceQueryPagingSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-        )
-
     @Deprecated("use getPagingdata")
     val resultDataSource: DataSource<TrackedEntityInstance, Result<TrackedEntityInstance, D2Error>>
         get() = TrackedEntityInstanceQueryDataSourceResult(getDataFetcher())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt
deleted file mode 100644
index 3e82cf7eec..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryPagingSource.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.search
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
-import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
-
-internal class TrackedEntityInstanceQueryPagingSource(
-    store: TrackedEntityInstanceStore,
-    trackerParentCallFactory: TrackerParentCallFactory,
-    scope: TrackedEntityInstanceQueryRepositoryScope,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
-    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
-    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-) : PagingSource<TrackedEntityInstance, TrackedEntityInstance>() {
-
-    private val dataFetcher = TrackedEntityInstanceQueryDataFetcher(
-        store,
-        trackerParentCallFactory,
-        scope,
-        childrenAppenders,
-        onlineCache,
-        onlineHelper,
-        localQueryHelper,
-    )
-
-    init {
-        dataFetcher.refresh()
-    }
-
-    override fun getRefreshKey(
-        state: PagingState<TrackedEntityInstance, TrackedEntityInstance>,
-    ): TrackedEntityInstance? {
-        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
-    }
-
-    override suspend fun load(
-        params: LoadParams<TrackedEntityInstance>,
-    ): LoadResult<TrackedEntityInstance, TrackedEntityInstance> {
-        val pages = dataFetcher.loadPages(params.loadSize)
-
-        return pages.firstOrNull { it is Result.Failure }?.let {
-            LoadResult.Error((it as Result.Failure).failure)
-        } ?: LoadResult.Page(
-            data = pages.map { it.getOrThrow() },
-            prevKey = pages.firstOrNull()?.getOrThrow(),
-            nextKey = pages.getOrNull(params.loadSize - 1)?.getOrThrow(),
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
index c156614f53..ff7627d775 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -32,13 +32,8 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.PagingSource
 import dagger.Reusable
 import io.reactivex.Single
-import kotlinx.coroutines.flow.Flow
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -105,29 +100,9 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
         return LivePagedListBuilder(factory, pageSize).build()
     }
 
-    override fun getPagingData(pageSize: Int): Flow<PagingData<TrackedEntitySearchItem>> {
-        return Pager(
-            config = PagingConfig(pageSize = pageSize),
-        ) {
-            pagingSource
-        }.flow
-    }
-
     val dataSource: DataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>
         get() = TrackedEntitySearchDataSource(getDataFetcher())
 
-    val pagingSource: PagingSource<TrackedEntitySearchItem, TrackedEntitySearchItem>
-        get() = TrackedEntitySearchPagingSource(
-            store,
-            trackerParentCallFactory,
-            scope,
-            childrenAppenders,
-            onlineCache,
-            onlineHelper,
-            localQueryHelper,
-            trackerHeaderEngine,
-        )
-
     @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
     override fun blockingGet(): List<TrackedEntitySearchItem> {
         val dataFetcher = getDataFetcher()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt
deleted file mode 100644
index fe08236b42..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchPagingSource.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.search
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
-import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
-
-internal class TrackedEntitySearchPagingSource(
-    store: TrackedEntityInstanceStore,
-    trackerParentCallFactory: TrackerParentCallFactory,
-    scope: TrackedEntityInstanceQueryRepositoryScope,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
-    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
-    onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
-    localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-    trackerHeaderEngine: TrackerHeaderEngine,
-) : PagingSource<TrackedEntitySearchItem, TrackedEntitySearchItem>() {
-
-    private val dataFetcher = TrackedEntitySearchDataFetcher(
-        store,
-        trackerParentCallFactory,
-        scope,
-        childrenAppenders,
-        onlineCache,
-        onlineHelper,
-        localQueryHelper,
-        trackerHeaderEngine,
-    )
-
-    init {
-        dataFetcher.refresh()
-    }
-
-    override fun getRefreshKey(
-        state: PagingState<TrackedEntitySearchItem, TrackedEntitySearchItem>,
-    ): TrackedEntitySearchItem? {
-        return state.anchorPosition?.let { state.closestPageToPosition(it)?.prevKey }
-    }
-
-    override suspend fun load(
-        params: LoadParams<TrackedEntitySearchItem>,
-    ): LoadResult<TrackedEntitySearchItem, TrackedEntitySearchItem> {
-        val pages = dataFetcher.loadPages(params.loadSize)
-
-        return pages.firstOrNull { it is Result.Failure }?.let {
-            LoadResult.Error((it as Result.Failure).failure)
-        } ?: LoadResult.Page(
-            data = pages.map { it.getOrThrow() },
-            prevKey = pages.firstOrNull()?.getOrThrow(),
-            nextKey = pages.getOrNull(params.loadSize - 1)?.getOrThrow(),
-        )
-    }
-}

From 8027ecb66e63109568f6beb87b9f59fee0f93c51 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 27 Sep 2023 13:09:03 +0200
Subject: [PATCH 389/478] [ANDROSDK-1743-2] Add attributes and TEType to
 TrackedEntitySearchItem

---
 ...llectionRepositoryMockIntegrationShould.kt |  74 ++++++++++
 ...TrackedEntitySearchCollectionRepository.kt |  11 +-
 .../search/TrackedEntitySearchDataFetcher.kt  |  62 +++++++--
 .../TrackedEntitySearchDataFetcherHelper.kt   | 129 ++++++++++++++++++
 .../TrackedEntitySearchDataSourceResult.kt    |  69 ++++++++++
 .../search/TrackedEntitySearchItem.kt         |   9 +-
 .../TrackedEntitySearchItemAttribute.kt       |  44 ++++++
 .../search/TrackedEntitySearchItemHelper.kt   |  45 +++++-
 8 files changed, 417 insertions(+), 26 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSourceResult.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemAttribute.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
new file mode 100644
index 0000000000..289be1f205
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.testapp.trackedentity.search
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(D2JunitRunner::class)
+class TrackedEntitySearchCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+    @Test
+    fun find_query() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
+            .byQuery().eq("4081507")
+            .blockingGet()
+
+        assertThat(trackedEntityInstances.size).isEqualTo(1)
+    }
+
+    @Test
+    fun find_by_attributes() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
+            .byAttribute("cejWyOfXge6").eq("4081507")
+            .blockingGet()
+
+        assertThat(trackedEntityInstances.size).isEqualTo(1)
+    }
+
+    @Test
+    fun find_by_filter() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
+            .byFilter("cejWyOfXge6").eq("4081507")
+            .blockingGet()
+
+        assertThat(trackedEntityInstances.size).isEqualTo(1)
+    }
+
+    @Test
+    fun find_by_data_value() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
+            .byProgram().eq("lxAQ7Zs9VYR")
+            .byDataValue("g9eOBujte1U").eq("false")
+            .blockingGet()
+
+        assertThat(trackedEntityInstances.size).isEqualTo(1)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
index ff7627d775..87b6e310b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -43,7 +43,7 @@ import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCo
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
-import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -66,7 +66,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-    private val trackerHeaderEngine: TrackerHeaderEngine,
+    private val searchDataFetcherHelper: TrackedEntitySearchDataFetcherHelper,
 ) : ReadOnlyWithUidCollectionRepository<TrackedEntitySearchItem>,
     TrackedEntitySearchOperators<TrackedEntitySearchCollectionRepository>(
         scope,
@@ -85,7 +85,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
             TrackedEntitySearchCollectionRepository(
                 store, trackerParentCallFactory, childrenAppenders,
                 s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
-                onlineHelper, localQueryHelper, trackerHeaderEngine,
+                onlineHelper, localQueryHelper, searchDataFetcherHelper,
             )
         }
 
@@ -103,6 +103,9 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
     val dataSource: DataSource<TrackedEntitySearchItem, TrackedEntitySearchItem>
         get() = TrackedEntitySearchDataSource(getDataFetcher())
 
+    val resultDataSource: DataSource<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>
+        get() = TrackedEntitySearchDataSourceResult(getDataFetcher())
+
     @Suppress("TooGenericExceptionCaught", "TooGenericExceptionThrown")
     override fun blockingGet(): List<TrackedEntitySearchItem> {
         val dataFetcher = getDataFetcher()
@@ -160,7 +163,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
             onlineCache,
             onlineHelper,
             localQueryHelper,
-            trackerHeaderEngine,
+            searchDataFetcherHelper,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
index c294a36946..c6a6af60ab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
@@ -29,13 +29,16 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import java.util.concurrent.TimeUnit
 
 internal class TrackedEntitySearchDataFetcher(
     store: TrackedEntityInstanceStore,
@@ -45,7 +48,7 @@ internal class TrackedEntitySearchDataFetcher(
     onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
-    private val trackerHeaderEngine: TrackerHeaderEngine,
+    private val helper: TrackedEntitySearchDataFetcherHelper,
 ) {
 
     private val instanceFetcher = TrackedEntityInstanceQueryDataFetcher(
@@ -58,8 +61,16 @@ internal class TrackedEntitySearchDataFetcher(
         localQueryHelper,
     )
 
-    private val sampleHeaderExpression =
-        "d2:concatenate(A{w75KJ2mc4zz}, ' ', A{zDhUuAYrxNC}, ', ', d2:substring(A{cejWyOfXge6}, 0, 1))"
+    private val attributes by lazy {
+        helper.getScopeAttributes(scope.program(), scope.trackedEntityType())
+    }
+
+    private val headerExpression by lazy {
+        helper.getHeaderExpression(scope.program())
+    }
+
+    @Suppress("MagicNumber")
+    private val teTypeCache = ExpirableCache<String, TrackedEntityType>(TimeUnit.SECONDS.toMillis(30))
 
     fun refresh() {
         instanceFetcher.refresh()
@@ -84,20 +95,43 @@ internal class TrackedEntitySearchDataFetcher(
     private fun transform(
         list: List<Result<TrackedEntityInstance, D2Error>>,
     ): List<Result<TrackedEntitySearchItem, D2Error>> {
-        return list.map { item ->
-            item.map { instance ->
-                val searchItem = TrackedEntitySearchItemHelper.from(instance)
-                appendHeader(searchItem)
+        return list.map { itemResult ->
+            itemResult.flatMap { instance ->
+                val teType = getTrackedEntityType(instance.trackedEntityType())
+
+                if (teType != null) {
+                    Result.Success(
+                        TrackedEntitySearchItemHelper
+                            .from(instance, attributes, teType)
+                            .copy(
+                                header = evaluateHeader(instance),
+                            ),
+                    )
+                } else {
+                    Result.Failure(
+                        D2Error.builder()
+                            .errorCode(D2ErrorCode.UNEXPECTED)
+                            .errorDescription("Tracked Entity type ${instance.trackedEntityType()} not found")
+                            .build(),
+                    )
+                }
             }
         }
     }
 
-    private fun appendHeader(item: TrackedEntitySearchItem): TrackedEntitySearchItem {
-        val header = trackerHeaderEngine.getTrackedEntityHeader(
-            expression = sampleHeaderExpression,
-            attributeValues = item.trackedEntityAttributeValues ?: emptyList(),
-        )
+    private fun getTrackedEntityType(uid: String?): TrackedEntityType? {
+        return if (uid != null) {
+            teTypeCache[uid]
+                ?: helper.getTeType(uid)
+                    .also { it?.let { teTypeCache[uid] = it } }
+        } else {
+            null
+        }
+    }
 
-        return item.copy(header = header)
+    private fun evaluateHeader(item: TrackedEntityInstance): String? {
+        return headerExpression?.let {
+            helper.evaluateHeaderExpression(it, item)
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
new file mode 100644
index 0000000000..b6eb627b4f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
@@ -0,0 +1,129 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeCollectionRepository
+import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeCollectionRepository
+import javax.inject.Inject
+
+@Reusable
+internal class TrackedEntitySearchDataFetcherHelper @Inject constructor(
+    private val trackerHeaderEngine: TrackerHeaderEngine,
+    private val trackedEntityTypeAttributeCollectionRepository: TrackedEntityTypeAttributeCollectionRepository,
+    private val programTrackedEntityAttributeCollectionRepository: ProgramTrackedEntityAttributeCollectionRepository,
+    private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository,
+    private val trackedEntityTypeCollectionRepository: TrackedEntityTypeCollectionRepository,
+) {
+    fun getHeaderExpression(program: String?): String? {
+        return program?.let {
+            // https://dhis2.atlassian.net/browse/ANDROSDK-1728
+            null
+        }
+    }
+
+    fun evaluateHeaderExpression(expression: String, trackedEntityInstance: TrackedEntityInstance): String? {
+        return trackerHeaderEngine.getTrackedEntityHeader(
+            expression = expression,
+            attributeValues = trackedEntityInstance.trackedEntityAttributeValues() ?: emptyList(),
+        )
+    }
+
+    fun getScopeAttributes(program: String?, trackedEntityType: String?): List<SimpleTrackedEntityAttribute> {
+        return if (program != null) {
+            val programAttributes = programTrackedEntityAttributeCollectionRepository
+                .byProgram().eq(program)
+                .orderBySortOrder(RepositoryScope.OrderByDirection.ASC)
+                .blockingGet()
+
+            val attributes = trackedEntityAttributeCollectionRepository
+                .byUid().`in`(programAttributes.mapNotNull { it.trackedEntityAttribute()?.uid() })
+                .blockingGet()
+
+            programAttributes.mapNotNull { programAttribute ->
+                val attributeUid = programAttribute.trackedEntityAttribute()!!.uid()
+                attributes.find { it.uid() == attributeUid }?.let { attribute ->
+                    SimpleTrackedEntityAttribute(
+                        attribute = attributeUid,
+                        displayName = attribute.displayName() ?: attribute.name() ?: attributeUid,
+                        displayFormName = attribute.displayFormName(),
+                        displayInList = programAttribute.displayInList() ?: false,
+                        valueType = attribute.valueType()!!,
+                        optionSet = attribute.optionSet()?.uid(),
+                    )
+                }
+            }
+        } else if (trackedEntityType != null) {
+            val typeAttributes = trackedEntityTypeAttributeCollectionRepository
+                .byTrackedEntityTypeUid().eq(trackedEntityType)
+                .blockingGet()
+
+            val attributes = trackedEntityAttributeCollectionRepository
+                .byUid().`in`(typeAttributes.mapNotNull { it.trackedEntityAttribute()?.uid() })
+                .blockingGet()
+
+            typeAttributes.mapNotNull { typeAttribute ->
+                val attributeUid = typeAttribute.trackedEntityAttribute()!!.uid()
+                attributes.find { it.uid() == attributeUid }?.let { attribute ->
+                    SimpleTrackedEntityAttribute(
+                        attribute = attributeUid,
+                        displayName = attribute.displayName() ?: attribute.name() ?: attributeUid,
+                        displayFormName = attribute.displayFormName(),
+                        displayInList = typeAttribute.displayInList() ?: false,
+                        valueType = attribute.valueType()!!,
+                        optionSet = attribute.optionSet()?.uid(),
+                    )
+                }
+            }
+        } else {
+            // TODO
+            emptyList()
+        }
+    }
+
+    fun getTeType(uid: String): TrackedEntityType? {
+        return trackedEntityTypeCollectionRepository.uid(uid).blockingGet()
+    }
+}
+
+internal data class SimpleTrackedEntityAttribute(
+    val attribute: String,
+    val displayName: String,
+    val displayFormName: String?,
+    val displayInList: Boolean,
+    val valueType: ValueType,
+    val optionSet: String?,
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSourceResult.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSourceResult.kt
new file mode 100644
index 0000000000..1e7ea26f76
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataSourceResult.kt
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity.search
+
+import androidx.paging.PageKeyedDataSource
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
+
+internal class TrackedEntitySearchDataSourceResult constructor(
+    private val dataFetcher: TrackedEntitySearchDataFetcher,
+) : PageKeyedDataSource<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>() {
+
+    override fun loadInitial(
+        params: LoadInitialParams<TrackedEntitySearchItem>,
+        callback: LoadInitialCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
+    ) {
+        dataFetcher.refresh()
+        val result = loadPages(params.requestedLoadSize)
+        callback.onResult(result, null, getKey(result))
+    }
+
+    override fun loadAfter(
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
+    ) {
+        val result = loadPages(params.requestedLoadSize)
+        callback.onResult(result, getKey(result))
+    }
+
+    override fun loadBefore(
+        params: LoadParams<TrackedEntitySearchItem>,
+        callback: LoadCallback<TrackedEntitySearchItem, Result<TrackedEntitySearchItem, D2Error>>,
+    ) {
+        // do nothing
+    }
+
+    private fun getKey(result: List<Result<TrackedEntitySearchItem, D2Error>>): TrackedEntitySearchItem? {
+        return result.filterIsInstance<Result.Success<TrackedEntitySearchItem, D2Error>>().lastOrNull()?.value
+    }
+
+    private fun loadPages(requestedLoadSize: Int): List<Result<TrackedEntitySearchItem, D2Error>> {
+        return dataFetcher.loadPages(requestedLoadSize)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
index 8e65a4265a..72f2d21790 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItem.kt
@@ -31,7 +31,7 @@ package org.hisp.dhis.android.core.trackedentity.search
 import org.hisp.dhis.android.core.common.Geometry
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import java.util.Date
 
 data class TrackedEntitySearchItem(
@@ -41,13 +41,16 @@ data class TrackedEntitySearchItem(
     val createdAtClient: Date?,
     val lastUpdatedAtClient: Date?,
     val organisationUnit: String?,
-    val trackedEntityType: String?,
     val geometry: Geometry?,
-    val trackedEntityAttributeValues: List<TrackedEntityAttributeValue>?,
     val syncState: State?,
     val aggregatedSyncState: State?,
     val deleted: Boolean,
+
+    val isOnline: Boolean = false,
+    val type: TrackedEntityType,
     val header: String? = null,
+    val attributeValues: List<TrackedEntitySearchItemAttribute>? = emptyList(),
+
 ) : ObjectWithUidInterface {
     override fun uid(): String = uid
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemAttribute.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemAttribute.kt
new file mode 100644
index 0000000000..cd85257fc6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemAttribute.kt
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.common.ValueType
+import java.util.Date
+
+data class TrackedEntitySearchItemAttribute(
+    val attribute: String,
+    val displayName: String,
+    val displayFormName: String,
+    val value: String?,
+    val created: Date?,
+    val lastUpdated: Date?,
+    val valueType: ValueType,
+    val displayInList: Boolean,
+    val optionSet: String?,
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
index a3b266894c..b2fbebe6c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -28,10 +28,16 @@
 
 package org.hisp.dhis.android.core.trackedentity.search
 
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 
 object TrackedEntitySearchItemHelper {
-    fun from(i: TrackedEntityInstance): TrackedEntitySearchItem {
+    internal fun from(
+        i: TrackedEntityInstance,
+        attributes: List<SimpleTrackedEntityAttribute>,
+        type: TrackedEntityType,
+    ): TrackedEntitySearchItem {
         return TrackedEntitySearchItem(
             uid = i.uid(),
             created = i.created(),
@@ -39,12 +45,13 @@ object TrackedEntitySearchItemHelper {
             createdAtClient = i.createdAtClient(),
             lastUpdatedAtClient = i.lastUpdatedAtClient(),
             organisationUnit = i.organisationUnit(),
-            trackedEntityType = i.trackedEntityType(),
             geometry = i.geometry(),
-            trackedEntityAttributeValues = i.trackedEntityAttributeValues(),
+            attributeValues = i.trackedEntityAttributeValues()?.mapNotNull { from(it, attributes) },
             syncState = i.syncState(),
             aggregatedSyncState = i.aggregatedSyncState(),
             deleted = i.deleted() ?: false,
+            isOnline = i.id() != null,
+            type = type,
         )
     }
 
@@ -56,11 +63,39 @@ object TrackedEntitySearchItemHelper {
             .createdAtClient(i.createdAtClient)
             .lastUpdatedAtClient(i.lastUpdatedAtClient)
             .organisationUnit(i.organisationUnit)
-            .trackedEntityType(i.trackedEntityType)
+            .trackedEntityType(i.type.uid())
             .geometry(i.geometry)
-            .trackedEntityAttributeValues(i.trackedEntityAttributeValues)
+            .trackedEntityAttributeValues(i.attributeValues?.map(::toTrackedEntityAttributeValue))
             .syncState(i.syncState)
             .aggregatedSyncState(i.aggregatedSyncState)
             .build()
     }
+
+    private fun from(
+        a: TrackedEntityAttributeValue,
+        attributes: List<SimpleTrackedEntityAttribute>,
+    ): TrackedEntitySearchItemAttribute? {
+        return attributes.find { it.attribute == a.trackedEntityAttribute() }?.let { attribute ->
+            TrackedEntitySearchItemAttribute(
+                attribute = a.trackedEntityAttribute()!!,
+                displayName = attribute.displayName,
+                displayFormName = attribute.displayFormName ?: attribute.displayName,
+                value = a.value(),
+                created = a.created(),
+                lastUpdated = a.lastUpdated(),
+                valueType = attribute.valueType,
+                displayInList = attribute.displayInList,
+                optionSet = attribute.optionSet,
+            )
+        }
+    }
+
+    private fun toTrackedEntityAttributeValue(a: TrackedEntitySearchItemAttribute): TrackedEntityAttributeValue {
+        return TrackedEntityAttributeValue.builder()
+            .trackedEntityAttribute(a.attribute)
+            .value(a.value)
+            .created(a.created)
+            .lastUpdated(a.lastUpdated)
+            .build()
+    }
 }

From 097bddaeb00a460a7dc6b46dfe6ce7ae77555d11 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 3 Oct 2023 11:54:13 +0200
Subject: [PATCH 390/478] [ANDROSDK-1743-2] Simplify tei attributes get method

---
 .../TrackedEntitySearchDataFetcherHelper.kt   | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
index b6eb627b4f..2fa64596d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
@@ -33,6 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeCollectionRepository
 import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
@@ -76,13 +77,9 @@ internal class TrackedEntitySearchDataFetcherHelper @Inject constructor(
             programAttributes.mapNotNull { programAttribute ->
                 val attributeUid = programAttribute.trackedEntityAttribute()!!.uid()
                 attributes.find { it.uid() == attributeUid }?.let { attribute ->
-                    SimpleTrackedEntityAttribute(
-                        attribute = attributeUid,
-                        displayName = attribute.displayName() ?: attribute.name() ?: attributeUid,
-                        displayFormName = attribute.displayFormName(),
-                        displayInList = programAttribute.displayInList() ?: false,
-                        valueType = attribute.valueType()!!,
-                        optionSet = attribute.optionSet()?.uid(),
+                    getSimpleTrackedEntityAttribute(
+                        attribute = attribute,
+                        displayInList = programAttribute.displayInList(),
                     )
                 }
             }
@@ -98,22 +95,39 @@ internal class TrackedEntitySearchDataFetcherHelper @Inject constructor(
             typeAttributes.mapNotNull { typeAttribute ->
                 val attributeUid = typeAttribute.trackedEntityAttribute()!!.uid()
                 attributes.find { it.uid() == attributeUid }?.let { attribute ->
-                    SimpleTrackedEntityAttribute(
-                        attribute = attributeUid,
-                        displayName = attribute.displayName() ?: attribute.name() ?: attributeUid,
-                        displayFormName = attribute.displayFormName(),
-                        displayInList = typeAttribute.displayInList() ?: false,
-                        valueType = attribute.valueType()!!,
-                        optionSet = attribute.optionSet()?.uid(),
+                    getSimpleTrackedEntityAttribute(
+                        attribute = attribute,
+                        displayInList = typeAttribute.displayInList(),
                     )
                 }
             }
         } else {
-            // TODO
-            emptyList()
+            val attributes = trackedEntityAttributeCollectionRepository
+                .blockingGet()
+
+            attributes.map { attribute ->
+                getSimpleTrackedEntityAttribute(
+                    attribute = attribute,
+                    displayInList = attribute.displayInListNoProgram(),
+                )
+            }
         }
     }
 
+    private fun getSimpleTrackedEntityAttribute(
+        attribute: TrackedEntityAttribute,
+        displayInList: Boolean?,
+    ): SimpleTrackedEntityAttribute {
+        return SimpleTrackedEntityAttribute(
+            attribute = attribute.uid(),
+            displayName = attribute.displayName() ?: attribute.name() ?: attribute.uid(),
+            displayFormName = attribute.displayFormName(),
+            displayInList = displayInList ?: false,
+            valueType = attribute.valueType()!!,
+            optionSet = attribute.optionSet()?.uid(),
+        )
+    }
+
     fun getTeType(uid: String): TrackedEntityType? {
         return trackedEntityTypeCollectionRepository.uid(uid).blockingGet()
     }

From f2d1cacc8e89903a4a6564f9ec86a67bfdcc53a1 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 4 Oct 2023 09:25:53 +0200
Subject: [PATCH 391/478] [ANDROSDK-1728] Add itemHeader programIndicator
 property

---
 ...ObjectRepositoryMockIntegrationShould.java | 140 ------------------
 ...gsObjectRepositoryMockIntegrationShould.kt | 140 ++++++++++++++++++
 core/src/main/assets/migrations/151.sql       |   3 +
 core/src/main/assets/snapshots/snapshot.sql   |   2 +-
 .../access/internal/BaseDatabaseOpenHelper.kt |   2 +-
 .../ProgramItemHeaderColumnAdapter.kt         |  52 +++++++
 .../settings/ProgramConfigurationSetting.java |  14 +-
 .../ProgramConfigurationSettingTableInfo.java |   4 +-
 .../core/settings/ProgramItemHeader.java      |  58 ++++++++
 .../ProgramConfigurationSettingStoreImpl.kt   |   1 +
 .../ProgramConfigurationSettingSamples.kt     |   6 +
 .../settings/appearance_settings_v2.json      |   5 +-
 .../settings/AppearanceSettingsV1Should.java  | 100 -------------
 .../settings/AppearanceSettingsV1Should.kt    |  85 +++++++++++
 .../settings/AppearanceSettingsV2Should.java  | 105 -------------
 .../settings/AppearanceSettingsV2Should.kt    |  94 ++++++++++++
 .../ProgramConfigurationSettingSamples.kt     |   5 +
 17 files changed, 464 insertions(+), 352 deletions(-)
 delete mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
 create mode 100644 core/src/main/assets/migrations/151.sql
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/ProgramItemHeaderColumnAdapter.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/ProgramItemHeader.java
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.java
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.kt
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
deleted file mode 100644
index 61eba9fecd..0000000000
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *  
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *  
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *  
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.testapp.settings;
-
-import org.hisp.dhis.android.core.settings.AppearanceSettings;
-import org.hisp.dhis.android.core.settings.CompletionSpinner;
-import org.hisp.dhis.android.core.settings.DataSetFilter;
-import org.hisp.dhis.android.core.settings.FilterSetting;
-import org.hisp.dhis.android.core.settings.HomeFilter;
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting;
-import org.hisp.dhis.android.core.settings.ProgramFilter;
-import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Map;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(D2JunitRunner.class)
-public class AppearanceSettingsObjectRepositoryMockIntegrationShould extends BaseMockIntegrationTestFullDispatcher {
-
-    @Test
-    public void find_appearance_settings() {
-        AppearanceSettings appearanceSettings = d2.settingModule().appearanceSettings().blockingGet();
-
-        assertThat(appearanceSettings.filterSorting()).isNotNull();
-        assertThat(appearanceSettings.completionSpinner()).isNotNull();
-    }
-
-    @Test
-    public void should_return_only_homeFilters() {
-        Map<HomeFilter, FilterSetting> homeFilters = d2.settingModule().appearanceSettings().getHomeFilters();
-        assertThat(homeFilters.size()).isEqualTo(4);
-        assertThat(homeFilters.get(HomeFilter.DATE).filter()).isEqualTo(true);
-    }
-
-    @Test
-    public void should_return_only_dataSetFilters_for_specific_uid() {
-        String UID = "lyLU2wR22tC";
-        Map<DataSetFilter, FilterSetting> specificFilters = d2.settingModule().appearanceSettings().getDataSetFiltersByUid(UID);
-        assertThat(specificFilters.size()).isEqualTo(5);
-        assertThat(specificFilters.get(DataSetFilter.SYNC_STATUS).uid()).isEqualTo(UID);
-    }
-
-    @Test
-    public void should_return_only_programFilters_for_specific_uid() {
-        String UID = "IpHINAT79UW";
-        Map<ProgramFilter, FilterSetting> specificFilters = d2.settingModule().appearanceSettings().getProgramFiltersByUid(UID);
-        assertThat(specificFilters.size()).isEqualTo(7);
-        assertThat(specificFilters.get(ProgramFilter.ENROLLMENT_STATUS).uid()).isEqualTo(UID);
-    }
-
-    @Test
-    public void should_return_global_program_configuration_setting() {
-        ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting();
-        assertThat(setting.uid()).isNull();
-        assertThat(setting.completionSpinner()).isEqualTo(true);
-        assertThat(setting.optionalSearch()).isNull();
-    }
-
-    @Test
-    public void should_return_global_completion_spinner_settings() {
-        CompletionSpinner completionSpinner = d2.settingModule().appearanceSettings().getGlobalCompletionSpinner();
-        assertThat(completionSpinner.uid()).isNull();
-        assertThat(completionSpinner.visible()).isEqualTo(true);
-    }
-
-    @Test
-    public void should_return_program_configuration_setting_for_specific_uid() {
-        String UID = "IpHINAT79UW";
-        ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.uid()).isEqualTo(UID);
-        assertThat(setting.completionSpinner()).isEqualTo(true);
-        assertThat(setting.optionalSearch()).isEqualTo(true);
-    }
-
-    @Test
-    public void should_return_completion_spinner_settings_for_specific_uid() {
-        String UID = "IpHINAT79UW";
-        CompletionSpinner completionSpinner = d2.settingModule().appearanceSettings().getCompletionSpinnerByUid(UID);
-        assertThat(completionSpinner.uid()).isEqualTo(UID);
-        assertThat(completionSpinner.visible()).isEqualTo(true);
-    }
-
-    @Test
-    public void should_return_disable_referrals_settings() {
-        ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting();
-        assertThat(setting.disableReferrals()).isEqualTo(true);
-
-        String UID = "IpHINAT79UW";
-        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.disableReferrals()).isEqualTo(true);
-
-        UID = "IpHINAT79UQ";
-        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.disableReferrals()).isEqualTo(false);
-    }
-
-    @Test
-    public void should_return_collapsibleSections_settings() {
-        ProgramConfigurationSetting setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting();
-        assertThat(setting.disableCollapsibleSections()).isEqualTo(false);
-
-        String UID = "IpHINAT79UW";
-        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.disableCollapsibleSections()).isEqualTo(false);
-
-        UID = "IpHINAT79UQ";
-        setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(UID);
-        assertThat(setting.disableCollapsibleSections()).isEqualTo(true);
-    }
-}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
new file mode 100644
index 0000000000..4fff1e82b0
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
@@ -0,0 +1,140 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *  
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *  
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.testapp.settings
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.settings.DataSetFilter
+import org.hisp.dhis.android.core.settings.HomeFilter
+import org.hisp.dhis.android.core.settings.ProgramFilter
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(D2JunitRunner::class)
+class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+    @Test
+    fun find_appearance_settings() {
+        val appearanceSettings = d2.settingModule().appearanceSettings().blockingGet()!!
+        assertThat(appearanceSettings.filterSorting()).isNotNull()
+        assertThat(appearanceSettings.completionSpinner()).isNotNull()
+    }
+
+    @Test
+    fun should_return_only_homeFilters() {
+        val homeFilters = d2.settingModule().appearanceSettings().homeFilters
+        assertThat(homeFilters.size).isEqualTo(4)
+        assertThat(homeFilters[HomeFilter.DATE]!!.filter()).isEqualTo(true)
+    }
+
+    @Test
+    fun should_return_only_dataSetFilters_for_specific_uid() {
+        val specificFilters = d2.settingModule().appearanceSettings().getDataSetFiltersByUid(program3)
+        assertThat(specificFilters.size).isEqualTo(5)
+        assertThat(specificFilters[DataSetFilter.SYNC_STATUS]!!.uid()).isEqualTo(program3)
+    }
+
+    @Test
+    fun should_return_only_programFilters_for_specific_uid() {
+        val specificFilters = d2.settingModule().appearanceSettings().getProgramFiltersByUid(program1)
+        assertThat(specificFilters.size).isEqualTo(7)
+        assertThat(specificFilters[ProgramFilter.ENROLLMENT_STATUS]!!.uid()).isEqualTo(program1)
+    }
+
+    @Test
+    fun should_return_global_program_configuration_setting() {
+        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
+        assertThat(setting.uid()).isNull()
+        assertThat(setting.completionSpinner()).isEqualTo(true)
+        assertThat(setting.optionalSearch()).isNull()
+    }
+
+    @Test
+    fun should_return_global_completion_spinner_settings() {
+        val completionSpinner = d2.settingModule().appearanceSettings().globalCompletionSpinner
+        assertThat(completionSpinner.uid()).isNull()
+        assertThat(completionSpinner.visible()).isEqualTo(true)
+    }
+
+    @Test
+    fun should_return_program_configuration_setting_for_specific_uid() {
+        val setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        assertThat(setting.uid()).isEqualTo(program1)
+        assertThat(setting.completionSpinner()).isEqualTo(true)
+        assertThat(setting.optionalSearch()).isEqualTo(true)
+    }
+
+    @Test
+    fun should_return_completion_spinner_settings_for_specific_uid() {
+        val completionSpinner = d2.settingModule().appearanceSettings().getCompletionSpinnerByUid(program1)
+        assertThat(completionSpinner.uid()).isEqualTo(program1)
+        assertThat(completionSpinner.visible()).isEqualTo(true)
+    }
+
+    @Test
+    fun should_return_disable_referrals_settings() {
+        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
+        assertThat(setting.disableReferrals()).isEqualTo(true)
+
+        val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        assertThat(program1Setting.disableReferrals()).isEqualTo(true)
+
+        val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
+        assertThat(program2Setting.disableReferrals()).isEqualTo(false)
+    }
+
+    @Test
+    fun should_return_collapsibleSections_settings() {
+        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
+        assertThat(setting.disableCollapsibleSections()).isEqualTo(false)
+
+        val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        assertThat(program1Setting.disableCollapsibleSections()).isEqualTo(false)
+
+        val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
+        assertThat(program2Setting.disableCollapsibleSections()).isEqualTo(true)
+    }
+
+    @Test
+    fun should_return_program_indicator_header_settings() {
+        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
+        assertThat(setting.itemHeader()?.programIndicator()).isNull()
+
+        val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        assertThat(program1Setting.itemHeader()?.programIndicator()).isEqualTo("GpkfmoQyXEb")
+
+        val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
+        assertThat(program2Setting.itemHeader()?.programIndicator()).isNull()
+    }
+
+    companion object {
+        const val program1 = "IpHINAT79UW"
+        const val program2 = "IpHINAT79UQ"
+        const val program3 = "lyLU2wR22tC"
+    }
+}
diff --git a/core/src/main/assets/migrations/151.sql b/core/src/main/assets/migrations/151.sql
new file mode 100644
index 0000000000..a6f3bca104
--- /dev/null
+++ b/core/src/main/assets/migrations/151.sql
@@ -0,0 +1,3 @@
+# Add itemHeaderProgramIndicator in ProgramStageSection table (ANDROSDK-1728)
+
+ALTER TABLE ProgramConfigurationSetting ADD COLUMN itemHeaderProgramIndicator TEXT;
\ No newline at end of file
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index 35eb56267e..200838ee2b 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -84,7 +84,7 @@ CREATE TABLE DataSetSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNI
 CREATE TABLE ProgramSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNIQUE, name TEXT, lastUpdated TEXT, teiDownload INTEGER, teiDBTrimming INTEGER, eventsDownload INTEGER, eventsDBTrimming INTEGER, updateDownload TEXT, updateDBTrimming TEXT, settingDownload TEXT, settingDBTrimming TEXT, enrollmentDownload TEXT, enrollmentDBTrimming TEXT, eventDateDownload TEXT, eventDateDBTrimming TEXT, enrollmentDateDownload TEXT, enrollmentDateDBTrimming TEXT, FOREIGN KEY (uid) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE SynchronizationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSync TEXT, metadataSync TEXT, trackerImporterVersion TEXT, trackerExporterVersion TEXT, fileMaxLengthBytes INTEGER);
 CREATE TABLE FilterSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, scope TEXT, filterType TEXT, uid TEXT, sort INTEGER, filter INTEGER);
-CREATE TABLE ProgramConfigurationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, completionSpinner INTEGER, optionalSearch INTEGER, disableReferrals INTEGER, disableCollapsibleSections INTEGER);
+CREATE TABLE ProgramConfigurationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT, completionSpinner INTEGER, optionalSearch INTEGER, disableReferrals INTEGER, disableCollapsibleSections INTEGER, itemHeaderProgramIndicator TEXT);
 CREATE TABLE AnalyticsTeiSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, name TEXT NOT NULL, shortName TEXT NOT NULL, program TEXT NOT NULL, programStage TEXT, period TEXT, type TEXT NOT NULL, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE AnalyticsTeiDataElement (_id INTEGER PRIMARY KEY AUTOINCREMENT, teiSetting TEXT NOT NULL, whoComponent TEXT, programStage TEXT, dataElement TEXT NOT NULL, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (teiSetting) REFERENCES AnalyticsTeiSetting (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE AnalyticsTeiIndicator (_id INTEGER PRIMARY KEY AUTOINCREMENT, teiSetting TEXT NOT NULL, whoComponent TEXT, programStage TEXT, indicator TEXT NOT NULL, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (indicator) REFERENCES ProgramIndicator (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (teiSetting) REFERENCES AnalyticsTeiSetting (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index c785b00655..25695e8daf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -59,6 +59,6 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     }
 
     companion object {
-        const val VERSION = 150
+        const val VERSION = 151
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/ProgramItemHeaderColumnAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/ProgramItemHeaderColumnAdapter.kt
new file mode 100644
index 0000000000..ae80dcbcf8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/adapters/custom/internal/ProgramItemHeaderColumnAdapter.kt
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.db.adapters.custom.internal
+
+import android.content.ContentValues
+import android.database.Cursor
+import com.gabrielittner.auto.value.cursor.ColumnTypeAdapter
+import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
+import org.hisp.dhis.android.core.settings.ProgramItemHeader
+
+class ProgramItemHeaderColumnAdapter : ColumnTypeAdapter<ProgramItemHeader> {
+    override fun fromCursor(cursor: Cursor, columnName: String): ProgramItemHeader {
+        val programIndicatorIndex = cursor.getColumnIndex(PROGRAM_INDICATOR)
+        val programIndicator = cursor.getString(programIndicatorIndex)
+        return ProgramItemHeader.builder()
+            .programIndicator(programIndicator)
+            .build()
+    }
+
+    override fun toContentValues(values: ContentValues, columnName: String, value: ProgramItemHeader) {
+        values.put(PROGRAM_INDICATOR, value.programIndicator())
+    }
+
+    companion object {
+        const val PROGRAM_INDICATOR = ProgramConfigurationSettingTableInfo.Columns.ITEM_HEADER_PROGRAM_INDICATOR
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
index f117b578b9..644fb140d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSetting.java
@@ -34,8 +34,10 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.gabrielittner.auto.value.cursor.ColumnAdapter;
 import com.google.auto.value.AutoValue;
 
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.ProgramItemHeaderColumnAdapter;
 import org.hisp.dhis.android.core.common.CoreObject;
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface;
 
@@ -50,13 +52,17 @@ public abstract class ProgramConfigurationSetting implements CoreObject, ObjectW
     public abstract Boolean completionSpinner();
 
     @Nullable
-    public abstract  Boolean optionalSearch();
+    public abstract Boolean optionalSearch();
 
     @Nullable
-    public abstract  Boolean disableReferrals();
+    public abstract Boolean disableReferrals();
 
     @Nullable
-    public abstract  Boolean disableCollapsibleSections();
+    public abstract Boolean disableCollapsibleSections();
+
+    @Nullable
+    @ColumnAdapter(ProgramItemHeaderColumnAdapter.class)
+    public abstract ProgramItemHeader itemHeader();
 
     public static ProgramConfigurationSetting create(Cursor cursor) {
         return AutoValue_ProgramConfigurationSetting.createFromCursor(cursor);
@@ -84,6 +90,8 @@ public abstract static class Builder {
 
         public abstract Builder disableCollapsibleSections(Boolean disableCollapsibleSections);
 
+        public abstract Builder itemHeader(ProgramItemHeader itemHeader);
+
         public abstract ProgramConfigurationSetting build();
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
index 35cdbec057..766a9ea2e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingTableInfo.java
@@ -56,6 +56,7 @@ public static class Columns extends CoreColumns {
         public static final String OPTIONAL_SEARCH = "optionalSearch";
         public static final String DISABLE_REFERRALS = "disableReferrals";
         public static final String DISABLE_COLLAPSIBLE_SECTIONS = "disableCollapsibleSections";
+        public static final String ITEM_HEADER_PROGRAM_INDICATOR = "itemHeaderProgramIndicator";
 
         @Override
         public String[] all() {
@@ -64,7 +65,8 @@ public String[] all() {
                     COMPLETION_SPINNER,
                     OPTIONAL_SEARCH,
                     DISABLE_REFERRALS,
-                    DISABLE_COLLAPSIBLE_SECTIONS
+                    DISABLE_COLLAPSIBLE_SECTIONS,
+                    ITEM_HEADER_PROGRAM_INDICATOR
             );
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramItemHeader.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramItemHeader.java
new file mode 100644
index 0000000000..2b4e703969
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramItemHeader.java
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings;
+
+import androidx.annotation.Nullable;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+@JsonDeserialize(builder = AutoValue_ProgramItemHeader.Builder.class)
+public abstract class ProgramItemHeader {
+
+    @Nullable
+    public abstract String programIndicator();
+
+    public abstract Builder toBuilder();
+
+    public static Builder builder() {
+        return new AutoValue_ProgramItemHeader.Builder();
+    }
+
+    @AutoValue.Builder
+    @JsonPOJOBuilder(withPrefix = "")
+    public abstract static class Builder {
+
+        public abstract Builder programIndicator(String programIndicator);
+
+        public abstract ProgramItemHeader build();
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
index 285b055a16..4a2d9ce5b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
@@ -58,6 +58,7 @@ internal class ProgramConfigurationSettingStoreImpl(
                 w.bind(3, o.optionalSearch())
                 w.bind(4, o.disableReferrals())
                 w.bind(5, o.disableCollapsibleSections())
+                w.bind(6, o.itemHeader()?.programIndicator())
             }
 
         private val WHERE_UPDATE_BINDER =
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
index bb2f9b0634..73a41e8a80 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.data.settings
 
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
+import org.hisp.dhis.android.core.settings.ProgramItemHeader
 
 object ProgramConfigurationSettingSamples {
     fun get(): ProgramConfigurationSetting {
@@ -38,6 +39,11 @@ object ProgramConfigurationSettingSamples {
             .optionalSearch(true)
             .disableReferrals(true)
             .disableCollapsibleSections(true)
+            .itemHeader(
+                ProgramItemHeader.builder()
+                    .programIndicator("programIndicator")
+                    .build()
+            )
             .build()
     }
 }
diff --git a/core/src/sharedTest/resources/settings/appearance_settings_v2.json b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
index bcde70d690..58d84d76c2 100644
--- a/core/src/sharedTest/resources/settings/appearance_settings_v2.json
+++ b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
@@ -138,7 +138,10 @@
         "completionSpinner": "true",
         "optionalSearch": "true",
         "disableReferrals": "true",
-        "disableCollapsibleSections": "false"
+        "disableCollapsibleSections": "false",
+        "itemHeader": {
+          "programIndicator": "GpkfmoQyXEb"
+        }
       },
       "IpHINAT79UQ": {
         "completionSpinner": "true",
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.java b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.java
deleted file mode 100644
index cd4d641146..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings;
-
-import org.hisp.dhis.android.core.common.BaseObjectShould;
-import org.hisp.dhis.android.core.common.ObjectShould;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Map;
-
-import static com.google.common.truth.Truth.assertThat;
-
-public class AppearanceSettingsV1Should extends BaseObjectShould implements ObjectShould {
-
-    public AppearanceSettingsV1Should() {
-        super("settings/appearance_settings_v1.json");
-    }
-
-    @Override
-    @Test
-    public void map_from_json_string() throws IOException, ParseException {
-
-        AppearanceSettings appearanceSettings = objectMapper.readValue(jsonStream, AppearanceSettings.class);
-
-        FilterSorting filterSorting = appearanceSettings.filterSorting();
-
-        Map<HomeFilter, FilterSetting> homeFilters = filterSorting.home();
-        FilterSetting homeDateFilter = homeFilters.get(HomeFilter.DATE);
-
-        assertThat(homeDateFilter.scope()).isNull();
-        assertThat(homeDateFilter.filterType()).isNull();
-        assertThat(homeDateFilter.uid()).isNull();
-        assertThat(homeDateFilter.sort()).isEqualTo(true);
-        assertThat(homeDateFilter.filter()).isEqualTo(true);
-
-        DataSetFilters dataSetFilters = filterSorting.dataSetSettings();
-        Map<DataSetFilter, FilterSetting> dataSetGlobalFilters = dataSetFilters.globalSettings();
-        FilterSetting dataSetPeriodFilter = dataSetGlobalFilters.get(DataSetFilter.PERIOD);
-        assertThat(dataSetPeriodFilter.scope()).isNull();
-        assertThat(dataSetPeriodFilter.filterType()).isNull();
-        assertThat(dataSetPeriodFilter.uid()).isNull();
-        assertThat(dataSetPeriodFilter.sort()).isEqualTo(true);
-        assertThat(dataSetPeriodFilter.filter()).isEqualTo(true);
-
-        ProgramFilters programFilters = filterSorting.programSettings();
-        Map<ProgramFilter, FilterSetting> programGlobalFilters = programFilters.globalSettings();
-        FilterSetting programEventDateFilter = programGlobalFilters.get(ProgramFilter.EVENT_DATE);
-        assertThat(programEventDateFilter.scope()).isNull();
-        assertThat(programEventDateFilter.filterType()).isNull();
-        assertThat(programEventDateFilter.uid()).isNull();
-        assertThat(programEventDateFilter.sort()).isEqualTo(true);
-        assertThat(programEventDateFilter.filter()).isEqualTo(true);
-
-        CompletionSpinnerSetting completionSpinnerSetting = appearanceSettings.completionSpinner();
-        assertThat(completionSpinnerSetting.globalSettings().uid()).isNull();
-
-        Map<String, CompletionSpinner> specificCompletionSpinnerList = completionSpinnerSetting.specificSettings();
-        CompletionSpinner specificCompletionSpinner = specificCompletionSpinnerList.get("IpHINAT79UW");
-        assertThat(specificCompletionSpinner.uid()).isNull();
-        assertThat(specificCompletionSpinner.visible()).isEqualTo(true);
-
-        // Compatibility forwards
-        ProgramConfigurationSettings programConfiguration = appearanceSettings.programConfiguration();
-        assertThat(programConfiguration.globalSettings().uid()).isNull();
-
-        Map<String, ProgramConfigurationSetting> speficicProgramConfiguration = programConfiguration.specificSettings();
-        ProgramConfigurationSetting specificProgramConfiguration = speficicProgramConfiguration.get("IpHINAT79UW");
-        assertThat(specificProgramConfiguration.uid()).isNull();
-        assertThat(specificProgramConfiguration.completionSpinner()).isEqualTo(true);
-        assertThat(specificProgramConfiguration.optionalSearch()).isNull();
-    }
-}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.kt
new file mode 100644
index 0000000000..5a285880fa
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV1Should.kt
@@ -0,0 +1,85 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.common.BaseObjectShould
+import org.hisp.dhis.android.core.common.ObjectShould
+import org.junit.Test
+
+class AppearanceSettingsV1Should : BaseObjectShould("settings/appearance_settings_v1.json"), ObjectShould {
+    @Test
+    override fun map_from_json_string() {
+        val appearanceSettings = objectMapper.readValue(jsonStream, AppearanceSettings::class.java)
+
+        val filterSorting = appearanceSettings.filterSorting()
+        val homeFilters = filterSorting!!.home()
+        val homeDateFilter = homeFilters[HomeFilter.DATE]!!
+        assertThat(homeDateFilter.scope()).isNull()
+        assertThat(homeDateFilter.filterType()).isNull()
+        assertThat(homeDateFilter.uid()).isNull()
+        assertThat(homeDateFilter.sort()).isEqualTo(true)
+        assertThat(homeDateFilter.filter()).isEqualTo(true)
+
+        val dataSetFilters = filterSorting.dataSetSettings()
+        val dataSetGlobalFilters = dataSetFilters.globalSettings()
+        val dataSetPeriodFilter = dataSetGlobalFilters[DataSetFilter.PERIOD]!!
+        assertThat(dataSetPeriodFilter.scope()).isNull()
+        assertThat(dataSetPeriodFilter.filterType()).isNull()
+        assertThat(dataSetPeriodFilter.uid()).isNull()
+        assertThat(dataSetPeriodFilter.sort()).isEqualTo(true)
+        assertThat(dataSetPeriodFilter.filter()).isEqualTo(true)
+
+        val programFilters = filterSorting.programSettings()
+        val programGlobalFilters = programFilters.globalSettings()
+        val programEventDateFilter = programGlobalFilters[ProgramFilter.EVENT_DATE]!!
+        assertThat(programEventDateFilter.scope()).isNull()
+        assertThat(programEventDateFilter.filterType()).isNull()
+        assertThat(programEventDateFilter.uid()).isNull()
+        assertThat(programEventDateFilter.sort()).isEqualTo(true)
+        assertThat(programEventDateFilter.filter()).isEqualTo(true)
+
+        val completionSpinnerSetting = appearanceSettings.completionSpinner()
+        assertThat(completionSpinnerSetting!!.globalSettings()!!.uid()).isNull()
+
+        val specificCompletionSpinnerList = completionSpinnerSetting.specificSettings()
+        val specificCompletionSpinner = specificCompletionSpinnerList!!["IpHINAT79UW"]!!
+        assertThat(specificCompletionSpinner.uid()).isNull()
+        assertThat(specificCompletionSpinner.visible()).isEqualTo(true)
+
+        // Compatibility forwards
+        val programConfiguration = appearanceSettings.programConfiguration()
+        assertThat(programConfiguration!!.globalSettings()!!.uid()).isNull()
+
+        val speficicProgramConfiguration = programConfiguration.specificSettings()
+        val specificProgramConfiguration = speficicProgramConfiguration!!["IpHINAT79UW"]!!
+        assertThat(specificProgramConfiguration.uid()).isNull()
+        assertThat(specificProgramConfiguration.completionSpinner()).isEqualTo(true)
+        assertThat(specificProgramConfiguration.optionalSearch()).isNull()
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
deleted file mode 100644
index 259866e74f..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.hisp.dhis.android.core.common.BaseObjectShould;
-import org.hisp.dhis.android.core.common.ObjectShould;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Map;
-
-public class AppearanceSettingsV2Should extends BaseObjectShould implements ObjectShould {
-
-    public AppearanceSettingsV2Should() {
-        super("settings/appearance_settings_v2.json");
-    }
-
-    @Override
-    @Test
-    public void map_from_json_string() throws IOException, ParseException {
-
-        AppearanceSettings appearanceSettings = objectMapper.readValue(jsonStream, AppearanceSettings.class);
-
-        FilterSorting filterSorting = appearanceSettings.filterSorting();
-
-        Map<HomeFilter, FilterSetting> homeFilters = filterSorting.home();
-        FilterSetting homeDateFilter = homeFilters.get(HomeFilter.DATE);
-
-        assertThat(homeDateFilter.scope()).isNull();
-        assertThat(homeDateFilter.filterType()).isNull();
-        assertThat(homeDateFilter.uid()).isNull();
-        assertThat(homeDateFilter.sort()).isEqualTo(true);
-        assertThat(homeDateFilter.filter()).isEqualTo(true);
-
-        DataSetFilters dataSetFilters = filterSorting.dataSetSettings();
-        Map<DataSetFilter, FilterSetting> dataSetGlobalFilters = dataSetFilters.globalSettings();
-        FilterSetting dataSetPeriodFilter = dataSetGlobalFilters.get(DataSetFilter.PERIOD);
-        assertThat(dataSetPeriodFilter.scope()).isNull();
-        assertThat(dataSetPeriodFilter.filterType()).isNull();
-        assertThat(dataSetPeriodFilter.uid()).isNull();
-        assertThat(dataSetPeriodFilter.sort()).isEqualTo(true);
-        assertThat(dataSetPeriodFilter.filter()).isEqualTo(true);
-
-        ProgramFilters programFilters = filterSorting.programSettings();
-        Map<ProgramFilter, FilterSetting> programGlobalFilters = programFilters.globalSettings();
-        FilterSetting programEventDateFilter = programGlobalFilters.get(ProgramFilter.EVENT_DATE);
-        assertThat(programEventDateFilter.scope()).isNull();
-        assertThat(programEventDateFilter.filterType()).isNull();
-        assertThat(programEventDateFilter.uid()).isNull();
-        assertThat(programEventDateFilter.sort()).isEqualTo(true);
-        assertThat(programEventDateFilter.filter()).isEqualTo(true);
-
-        ProgramConfigurationSettings programConfiguration = appearanceSettings.programConfiguration();
-        assertThat(programConfiguration.globalSettings().uid()).isNull();
-        assertThat(programConfiguration.globalSettings().completionSpinner()).isEqualTo(true);
-        assertThat(programConfiguration.globalSettings().disableReferrals()).isEqualTo(true);
-        assertThat(programConfiguration.globalSettings().disableCollapsibleSections()).isEqualTo(false);
-
-        Map<String, ProgramConfigurationSetting> speficicProgramConfiguration = programConfiguration.specificSettings();
-        ProgramConfigurationSetting specificProgramConfiguration = speficicProgramConfiguration.get("IpHINAT79UW");
-        assertThat(specificProgramConfiguration.uid()).isNull();
-        assertThat(specificProgramConfiguration.completionSpinner()).isEqualTo(true);
-        assertThat(specificProgramConfiguration.optionalSearch()).isEqualTo(true);
-        assertThat(specificProgramConfiguration.disableReferrals()).isEqualTo(true);
-        assertThat(specificProgramConfiguration.disableCollapsibleSections()).isEqualTo(false);
-
-        // Compatibility backwards
-        CompletionSpinnerSetting completionSpinnerSetting = appearanceSettings.completionSpinner();
-        assertThat(completionSpinnerSetting.globalSettings().uid()).isNull();
-
-        Map<String, CompletionSpinner> specificCompletionSpinnerList = completionSpinnerSetting.specificSettings();
-        CompletionSpinner specificCompletionSpinner = specificCompletionSpinnerList.get("IpHINAT79UW");
-        assertThat(specificCompletionSpinner.uid()).isNull();
-        assertThat(specificCompletionSpinner.visible()).isEqualTo(true);
-    }
-}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt
new file mode 100644
index 0000000000..45d850a666
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt
@@ -0,0 +1,94 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.common.BaseObjectShould
+import org.hisp.dhis.android.core.common.ObjectShould
+import org.junit.Test
+import java.io.IOException
+import java.text.ParseException
+
+class AppearanceSettingsV2Should : BaseObjectShould("settings/appearance_settings_v2.json"), ObjectShould {
+    @Test
+    @Throws(IOException::class, ParseException::class)
+    override fun map_from_json_string() {
+        val appearanceSettings = objectMapper.readValue(jsonStream, AppearanceSettings::class.java)
+
+        val filterSorting = appearanceSettings.filterSorting()
+        val homeFilters = filterSorting!!.home()
+        val homeDateFilter = homeFilters[HomeFilter.DATE]!!
+        assertThat(homeDateFilter.scope()).isNull()
+        assertThat(homeDateFilter.filterType()).isNull()
+        assertThat(homeDateFilter.uid()).isNull()
+        assertThat(homeDateFilter.sort()).isEqualTo(true)
+        assertThat(homeDateFilter.filter()).isEqualTo(true)
+
+        val dataSetFilters = filterSorting.dataSetSettings()
+        val dataSetGlobalFilters = dataSetFilters.globalSettings()
+        val dataSetPeriodFilter = dataSetGlobalFilters[DataSetFilter.PERIOD]!!
+        assertThat(dataSetPeriodFilter.scope()).isNull()
+        assertThat(dataSetPeriodFilter.filterType()).isNull()
+        assertThat(dataSetPeriodFilter.uid()).isNull()
+        assertThat(dataSetPeriodFilter.sort()).isEqualTo(true)
+        assertThat(dataSetPeriodFilter.filter()).isEqualTo(true)
+
+        val programFilters = filterSorting.programSettings()
+        val programGlobalFilters = programFilters.globalSettings()
+        val programEventDateFilter = programGlobalFilters[ProgramFilter.EVENT_DATE]!!
+        assertThat(programEventDateFilter.scope()).isNull()
+        assertThat(programEventDateFilter.filterType()).isNull()
+        assertThat(programEventDateFilter.uid()).isNull()
+        assertThat(programEventDateFilter.sort()).isEqualTo(true)
+        assertThat(programEventDateFilter.filter()).isEqualTo(true)
+
+        val programConfiguration = appearanceSettings.programConfiguration()!!
+        assertThat(programConfiguration.globalSettings()!!.uid()).isNull()
+        assertThat(programConfiguration.globalSettings()!!.completionSpinner()).isEqualTo(true)
+        assertThat(programConfiguration.globalSettings()!!.disableReferrals()).isEqualTo(true)
+        assertThat(programConfiguration.globalSettings()!!.disableCollapsibleSections()).isEqualTo(false)
+
+        val speficicProgramConfiguration = programConfiguration.specificSettings()
+        val specificProgramConfiguration = speficicProgramConfiguration!!["IpHINAT79UW"]!!
+        assertThat(specificProgramConfiguration.uid()).isNull()
+        assertThat(specificProgramConfiguration.completionSpinner()).isEqualTo(true)
+        assertThat(specificProgramConfiguration.optionalSearch()).isEqualTo(true)
+        assertThat(specificProgramConfiguration.disableReferrals()).isEqualTo(true)
+        assertThat(specificProgramConfiguration.disableCollapsibleSections()).isEqualTo(false)
+        assertThat(specificProgramConfiguration.itemHeader()!!.programIndicator()).isEqualTo("GpkfmoQyXEb")
+
+        // Compatibility backwards
+        val completionSpinnerSetting = appearanceSettings.completionSpinner()
+        assertThat(completionSpinnerSetting!!.globalSettings()!!.uid()).isNull()
+
+        val specificCompletionSpinnerList = completionSpinnerSetting.specificSettings()
+        val specificCompletionSpinner = specificCompletionSpinnerList!!["IpHINAT79UW"]!!
+        assertThat(specificCompletionSpinner.uid()).isNull()
+        assertThat(specificCompletionSpinner.visible()).isEqualTo(true)
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
index 66fb73b85b..abe5af12f4 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
@@ -37,6 +37,11 @@ object ProgramConfigurationSettingSamples {
             .optionalSearch(true)
             .disableReferrals(true)
             .disableCollapsibleSections(true)
+            .itemHeader(
+                ProgramItemHeader.builder()
+                    .programIndicator("programIndicator")
+                    .build()
+            )
             .build()
     }
 }

From ecf024d9e133db56ead681097e90297529146bc2 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 4 Oct 2023 09:00:18 +0200
Subject: [PATCH 392/478] [ANDROSDK-1751] refactor: - Remove RxJava Settings
 related classes, prepare for related tests

---
 ...OnlyAnyObjectWithDownloadRepositoryImpl.kt |  9 +++---
 .../settings/internal/AnalyticsSettingCall.kt | 18 ++++++-----
 .../internal/AppearanceSettingCall.kt         | 17 ++++++----
 .../core/settings/internal/BaseSettingCall.kt | 23 +++++++------
 .../settings/internal/DataSetSettingCall.kt   |  6 ++--
 .../settings/internal/GeneralSettingCall.kt   | 10 +++---
 .../settings/internal/LatestAppVersionCall.kt | 12 +++----
 .../settings/internal/ProgramSettingCall.kt   |  6 ++--
 .../internal/SynchronizationSettingCall.kt    | 32 +++++++++++--------
 .../stock/internal/StockUseCaseCall.kt        |  5 +--
 10 files changed, 81 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
index 68f7616451..9d78dd7aeb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyAnyObjectWithDownloadRepositoryImpl.kt
@@ -29,10 +29,11 @@ package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import kotlinx.coroutines.rx2.rxCompletable
+import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 
-abstract class ReadOnlyAnyObjectWithDownloadRepositoryImpl<M>(
-    private val downloadCompletableProvider: CompletableProvider,
+abstract class ReadOnlyAnyObjectWithDownloadRepositoryImpl<M> internal constructor(
+    private val downloadProvider: DownloadProvider,
 ) {
     fun get(): Single<M?> {
         return Single.fromCallable { blockingGet() }
@@ -49,7 +50,7 @@ abstract class ReadOnlyAnyObjectWithDownloadRepositoryImpl<M>(
     }
 
     fun download(): Completable {
-        return downloadCompletableProvider.getCompletable(false)
+        return rxCompletable { downloadProvider.download(false) }
     }
 
     fun blockingDownload() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index d3a41a8058..2f7c1ae5af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
@@ -45,21 +46,22 @@ internal class AnalyticsSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<AnalyticsSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): AnalyticsSettings {
+    override suspend fun fetch(storeError: Boolean): Result<AnalyticsSettings, D2Error> {
         return when (val version = appVersionManager.getDataStoreVersion()) {
             SettingsAppDataStoreVersion.V1_1 -> {
-                throw D2Error.builder()
-                    .errorDescription("Analytics settings not found")
-                    .errorCode(D2ErrorCode.URL_NOT_FOUND)
-                    .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                    .build()
-
+                Result.Failure(
+                    D2Error.builder()
+                        .errorDescription("Analytics settings not found")
+                        .errorCode(D2ErrorCode.URL_NOT_FOUND)
+                        .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                        .build()
+                )
             }
 
             else -> {
                 coroutineAPICallExecutor.wrap(storeError = storeError) {
                     settingAppService.analyticsSettings(version)
-                }.getOrThrow()
+                }
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index 011acfffe7..d771021df9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AppearanceSettings
@@ -45,20 +46,22 @@ internal class AppearanceSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<AppearanceSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): AppearanceSettings {
+    override suspend fun fetch(storeError: Boolean): Result<AppearanceSettings, D2Error> {
         return when (val version = appVersionManager.getDataStoreVersion()) {
             SettingsAppDataStoreVersion.V1_1 -> {
-                throw D2Error.builder()
-                    .errorDescription("Appearance settings not found")
-                    .errorCode(D2ErrorCode.URL_NOT_FOUND)
-                    .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                    .build()
+                Result.Failure(
+                    D2Error.builder()
+                        .errorDescription("Appearance settings not found")
+                        .errorCode(D2ErrorCode.URL_NOT_FOUND)
+                        .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                        .build()
+                )
             }
 
             SettingsAppDataStoreVersion.V2_0 -> {
                 coroutineAPICallExecutor.wrap(storeError = storeError) {
                     settingAppService.appearanceSettings(version)
-                }.getOrThrow()
+                }
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
index 269ba7be15..ae42acb590 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
@@ -27,30 +27,35 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import io.reactivex.Completable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import java.net.HttpURLConnection
 
 internal abstract class BaseSettingCall<T> internal constructor(
     val coroutineAPICallExecutor: CoroutineAPICallExecutor
-) {
-    suspend fun download(storeError: Boolean): T {
-        return coroutineAPICallExecutor.wrap {
-            fetch(storeError)
-        }.getOrThrow()
+) : DownloadProvider {
+
+    override suspend fun download(storeError: Boolean) {
+        fetch(storeError).fold(
+            { process(it) },
+            { throwable ->
+                if (isExpectedError(throwable)) {
+                    process(null)
+                }
+            })
     }
 
+
     private fun isExpectedError(throwable: D2Error): Boolean {
         return throwable.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ||
                 throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_SUPPORTED ||
                 throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_INSTALLED
     }
 
-    abstract suspend fun fetch(storeError: Boolean): T
+    abstract suspend fun fetch(storeError: Boolean): Result<T, D2Error>
 
     abstract fun process(item: T?)
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index c6ee12e8ba..326acbc764 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -29,6 +29,8 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.DataSetSettings
 import javax.inject.Inject
 
@@ -40,10 +42,10 @@ internal class DataSetSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<DataSetSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): DataSetSettings {
+    override suspend fun fetch(storeError: Boolean): Result<DataSetSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.dataSetSettings(appVersionManager.getDataStoreVersion())
-        }.getOrThrow()
+        }
 
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 7e9fda6221..46ac440d77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -29,6 +29,8 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.GeneralSettings
 import javax.inject.Inject
 
@@ -42,9 +44,9 @@ internal class GeneralSettingCall @Inject constructor(
 
     private var cachedValue: GeneralSettings? = null
 
-    suspend fun fetch(storeError: Boolean, acceptCache: Boolean = false): GeneralSettings {
+    suspend fun fetch(storeError: Boolean, acceptCache: Boolean = false): Result<GeneralSettings, D2Error> {
         return when {
-            cachedValue != null && acceptCache -> cachedValue!!
+            cachedValue != null && acceptCache -> Result.Success(cachedValue!!)
             else -> fetch(storeError)
         }
     }
@@ -63,9 +65,9 @@ internal class GeneralSettingCall @Inject constructor(
         }.getOrThrow().encryptDB()
     }
 
-    override suspend fun fetch(storeError: Boolean): GeneralSettings {
+    override suspend fun fetch(storeError: Boolean): Result<GeneralSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
-        }.getOrThrow()
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index 2d248b99f6..97d37b30c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -33,6 +33,8 @@ import io.reactivex.Completable
 import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.LatestAppVersion
 import javax.inject.Inject
 
@@ -41,11 +43,12 @@ internal class LatestAppVersionCall @Inject constructor(
     private val latestAppVersionHandler: LatestAppVersionHandler,
     private val settingAppService: SettingAppService,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
-) : BaseSettingCall<LatestAppVersion>(coroutineAPICallExecutor), CompletableProvider {
+) : BaseSettingCall<LatestAppVersion>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): LatestAppVersion {
+
+    override suspend fun fetch(storeError: Boolean): Result<LatestAppVersion, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) { settingAppService.latestAppVersion() }
-            .getOrThrow()
+
     }
 
     override fun process(item: LatestAppVersion?) {
@@ -53,7 +56,4 @@ internal class LatestAppVersionCall @Inject constructor(
         latestAppVersionHandler.handleMany(appVersionList)
     }
 
-    override fun getCompletable(storeError: Boolean): Completable {
-        return rxCompletable { fetch(storeError) }
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index c5fa91e336..1952b054cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -29,6 +29,8 @@ package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import javax.inject.Inject
 
@@ -40,12 +42,12 @@ internal class ProgramSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<ProgramSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): ProgramSettings {
+    override suspend fun fetch(storeError: Boolean): Result<ProgramSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.programSettings(
                 appVersionManager.getDataStoreVersion()
             )
-        }.getOrThrow()
+        }
 
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index 315b1bab6f..039db237e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.settings.internal
 import dagger.Reusable
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
@@ -47,7 +48,7 @@ internal class SynchronizationSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<SynchronizationSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): SynchronizationSettings {
+    override suspend fun fetch(storeError: Boolean): Result<SynchronizationSettings, D2Error> {
         return when (val version = appVersionManager.getDataStoreVersion()) {
             SettingsAppDataStoreVersion.V1_1 -> {
                 val generalSettings = tryOrNull(generalSettingCall.fetch(storeError, acceptCache = true))
@@ -55,20 +56,25 @@ internal class SynchronizationSettingCall @Inject constructor(
                 val programSettings = tryOrNull(programSettingCall.fetch(storeError))
 
                 if (generalSettings == null && dataSetSettings == null && programSettings == null) {
-                    throw D2Error.builder()
-                        .errorDescription("Synchronization settings not found")
-                        .errorCode(D2ErrorCode.URL_NOT_FOUND)
-                        .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                        .build()
+                    Result.Failure(
+                        D2Error.builder()
+                            .errorDescription("Synchronization settings not found")
+                            .errorCode(D2ErrorCode.URL_NOT_FOUND)
+                            .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
+                            .build()
+                    )
 
                 } else {
+                    val generalSettingsData = generalSettings?.getOrThrow()
+                    Result.Success(
+                        SynchronizationSettings.builder()
+                            .dataSync(generalSettingsData!!.dataSync())
+                            .metadataSync(generalSettingsData.metadataSync())
+                            .dataSetSettings(dataSetSettings?.getOrThrow())
+                            .programSettings(programSettings?.getOrThrow())
+                            .build()
+                    )
 
-                    SynchronizationSettings.builder()
-                        .dataSync(generalSettings?.dataSync())
-                        .metadataSync(generalSettings?.metadataSync())
-                        .dataSetSettings(dataSetSettings)
-                        .programSettings(programSettings)
-                        .build()
                 }
             }
 
@@ -77,7 +83,7 @@ internal class SynchronizationSettingCall @Inject constructor(
                     settingAppService.synchronizationSettings(
                         version
                     )
-                }.getOrThrow()
+                }
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index 001c277e3a..b5c73322be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -29,6 +29,8 @@ package org.hisp.dhis.android.core.usecase.stock.internal
 
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.helpers.Result
+import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.internal.BaseSettingCall
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import javax.inject.Inject
@@ -40,9 +42,8 @@ internal class StockUseCaseCall @Inject constructor(
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : BaseSettingCall<List<InternalStockUseCase>>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): List<InternalStockUseCase> {
+    override suspend fun fetch(storeError: Boolean): Result<List<InternalStockUseCase>, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) { stockUseCaseService.stockUseCases() }
-            .getOrThrow()
     }
 
     override fun process(item: List<InternalStockUseCase>?) {

From c89c71aa644c531e49bdc63f4b1991912ab0ba2e Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 4 Oct 2023 10:06:56 +0200
Subject: [PATCH 393/478] [ANDROSDK-1728] Download itemHeader programIndicator

---
 .../program/internal/ProgramIndicatorUidsSeeker.kt     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
index c25ef61495..4a1f6023db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
@@ -31,6 +31,7 @@ package org.hisp.dhis.android.core.program.internal
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
+import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
 import javax.inject.Inject
@@ -41,11 +42,16 @@ internal class ProgramIndicatorUidsSeeker @Inject constructor(
 ) : BaseUidsSeeker(databaseAdapter) {
 
     fun seekUids(): Set<String> {
-        val query = "SELECT ${VisualizationDimensionItemTableInfo.Columns.DIMENSION_ITEM} " +
+        val visualizationQuery = "SELECT ${VisualizationDimensionItemTableInfo.Columns.DIMENSION_ITEM} " +
             "FROM ${VisualizationDimensionItemTableInfo.TABLE_INFO.name()} " +
             "WHERE ${VisualizationDimensionItemTableInfo.Columns.DIMENSION_ITEM_TYPE} = " +
             "'${DimensionItemType.PROGRAM_INDICATOR.name}'"
 
-        return readSingleColumnResults(query)
+        val itemHeaderQuery = "SELECT ${ProgramConfigurationSettingTableInfo.Columns.ITEM_HEADER_PROGRAM_INDICATOR} " +
+            "FROM ${ProgramConfigurationSettingTableInfo.TABLE_INFO.name()} " +
+            "WHERE ${ProgramConfigurationSettingTableInfo.Columns.ITEM_HEADER_PROGRAM_INDICATOR} IS NOT NULL"
+
+        return readSingleColumnResults(visualizationQuery) +
+            readSingleColumnResults(itemHeaderQuery)
     }
 }

From 34a9796f395e74028226cd595e5246bc2797474e Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 4 Oct 2023 12:53:55 +0200
Subject: [PATCH 394/478] [ANDROSDK-1728] Use program indicator header in
 Search repository

---
 ...ndicatorUidsSeekerMockIntegrationShould.kt |   9 +-
 ...ectionRepositoryMockIntegrationShould.java |   8 +-
 ...ectionRepositoryMockIntegrationShould.java |   4 +-
 ...ectionRepositoryMockIntegrationShould.java |   4 +-
 ...ectionRepositoryMockIntegrationShould.java |   8 +-
 ...ectionRepositoryMockIntegrationShould.java |   2 +-
 ...ectionRepositoryMockIntegrationShould.java |   2 +-
 ...gsObjectRepositoryMockIntegrationShould.kt |   8 +-
 ...ObjectRepositoryMockIntegrationShould.java |  59 ++++++----
 ...ectionRepositoryMockIntegrationShould.java |   2 +-
 ...ectionRepositoryMockIntegrationShould.java |   2 +-
 ...llectionRepositoryMockIntegrationShould.kt |  20 ++--
 ...llectionRepositoryMockIntegrationShould.kt |  12 +-
 .../TrackedEntitySearchDataFetcherHelper.kt   |  17 ++-
 .../ProgramTrackedEntityAttributeSamples.java |   2 +-
 .../ProgramConfigurationSettingSamples.kt     |   2 +-
 .../resources/program/program_indicators.json |  24 ++++
 .../resources/program/programs.json           | 110 +++++++++---------
 .../relationship/relationship_types.json      |   6 +-
 .../settings/appearance_settings_v2.json      |   2 +-
 ...new_tracker_importer_tracked_entities.json |  12 +-
 .../tracked_entity_instances.json             |  12 +-
 .../settings/AppearanceSettingsV2Should.kt    |   2 +-
 .../ProgramConfigurationSettingSamples.kt     |   2 +-
 24 files changed, 197 insertions(+), 134 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
index e4be838a00..ca11ca0614 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
@@ -28,7 +28,7 @@
 
 package org.hisp.dhis.android.core.program.internal
 
-import com.google.common.truth.Truth
+import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -39,8 +39,9 @@ class ProgramIndicatorUidsSeekerMockIntegrationShould : BaseMockIntegrationTestF
     @Test
     fun seek_programIndicator_uids() {
         val programIndicatorsUids = ProgramIndicatorUidsSeeker(databaseAdapter).seekUids()
-        Truth.assertThat(programIndicatorsUids.size).isEqualTo(2)
-        Truth.assertThat(programIndicatorsUids.contains("p2Zxg0wcPQ3")).isTrue()
-        Truth.assertThat(programIndicatorsUids.contains("GSae40Fyppf")).isTrue()
+        assertThat(programIndicatorsUids.size).isEqualTo(3)
+        assertThat(programIndicatorsUids.contains("p2Zxg0wcPQ3")).isTrue()
+        assertThat(programIndicatorsUids.contains("GSae40Fyppf")).isTrue()
+        assertThat(programIndicatorsUids.contains("kALwOyvVvdT")).isTrue()
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentCollectionRepositoryMockIntegrationShould.java
index b52b4ed956..eaaf3cf036 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/enrollment/EnrollmentCollectionRepositoryMockIntegrationShould.java
@@ -57,14 +57,14 @@ public void allow_access_to_all_enrollments_without_children() {
 
         Enrollment enrollment = enrollments.get(0);
         assertThat(enrollment.uid()).isEqualTo("enroll1");
-        assertThat(enrollment.program()).isEqualTo("lxAQ7Zs9VYR");
+        assertThat(enrollment.program()).isEqualTo("IpHINAT79UW");
     }
 
     @Test
     public void allow_access_to_one_enrollment_without_children() {
         Enrollment enrollment = d2.enrollmentModule().enrollments().uid("enroll1").blockingGet();
         assertThat(enrollment.uid()).isEqualTo("enroll1");
-        assertThat(enrollment.program()).isEqualTo("lxAQ7Zs9VYR");
+        assertThat(enrollment.program()).isEqualTo("IpHINAT79UW");
     }
 
     @Test
@@ -83,7 +83,7 @@ public void filter_by_uid() {
                 .byUid().eq("enroll1")
                 .one().blockingGet();
         assertThat(enrollment.uid()).isEqualTo("enroll1");
-        assertThat(enrollment.program()).isEqualTo("lxAQ7Zs9VYR");
+        assertThat(enrollment.program()).isEqualTo("IpHINAT79UW");
     }
 
     @Test
@@ -131,7 +131,7 @@ public void filter_by_organisation_unit() {
     @Test
     public void filter_by_program() {
         List<Enrollment> enrollments = d2.enrollmentModule().enrollments()
-                .byProgram().eq("lxAQ7Zs9VYR")
+                .byProgram().eq("IpHINAT79UW")
                 .blockingGet();
         assertThat(enrollments.size()).isEqualTo(2);
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java
index 5fe4d20866..3545d0291e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/EventCollectionRepositoryMockIntegrationShould.java
@@ -155,10 +155,10 @@ public void filter_by_geometry_coordinates() {
     public void filter_by_program() {
         List<Event> events =
                 d2.eventModule().events()
-                        .byProgramUid().eq("lxAQ7Zs9VYR")
+                        .byProgramUid().eq("IpHINAT79UW")
                         .blockingGet();
 
-        assertThat(events.size()).isEqualTo(4);
+        assertThat(events.size()).isEqualTo(2);
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java
index a575adf22b..5fb7ff8ffe 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/event/search/EventQueryCollectionRepositoryMockIntegrationShould.java
@@ -52,7 +52,7 @@ public void find_by_program() {
                         .byProgram().eq("lxAQ7Zs9VYR")
                         .blockingGet();
 
-        assertThat(events.size()).isEqualTo(4);
+        assertThat(events.size()).isEqualTo(2);
     }
 
     @Test
@@ -62,7 +62,7 @@ public void find_uids_by_program() {
                         .byProgram().eq("lxAQ7Zs9VYR")
                         .blockingGetUids();
 
-        assertThat(eventUids.size()).isEqualTo(4);
+        assertThat(eventUids.size()).isEqualTo(2);
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramIndicatorCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramIndicatorCollectionRepositoryMockIntegrationShould.java
index b14246c510..dd9bfe8942 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramIndicatorCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramIndicatorCollectionRepositoryMockIntegrationShould.java
@@ -50,7 +50,7 @@ public void find_all() {
                 d2.programModule().programIndicators()
                         .blockingGet();
 
-        assertThat(indicators.size()).isEqualTo(2);
+        assertThat(indicators.size()).isEqualTo(3);
     }
 
     @Test
@@ -105,7 +105,7 @@ public void filter_by_decimals() {
                         .eq(2)
                         .blockingGet();
 
-        assertThat(indicators.size()).isEqualTo(1);
+        assertThat(indicators.size()).isEqualTo(2);
     }
 
     @Test
@@ -116,7 +116,7 @@ public void filter_by_aggregation_type() {
                         .eq("AVERAGE")
                         .blockingGet();
 
-        assertThat(indicators.size()).isEqualTo(2);
+        assertThat(indicators.size()).isEqualTo(3);
     }
 
     @Test
@@ -138,7 +138,7 @@ public void filter_by_program() {
                         .eq("lxAQ7Zs9VYR")
                         .blockingGet();
 
-        assertThat(indicators.size()).isEqualTo(2);
+        assertThat(indicators.size()).isEqualTo(3);
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramSectionCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramSectionCollectionRepositoryMockIntegrationShould.java
index 304c94f505..694b4cd66c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramSectionCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramSectionCollectionRepositoryMockIntegrationShould.java
@@ -76,7 +76,7 @@ public void filter_by_program() {
         List<ProgramSection> programSections =
                 d2.programModule().programSections()
                         .byProgramUid()
-                        .eq("lxAQ7Zs9VYR")
+                        .eq("IpHINAT79UW")
                         .blockingGet();
 
         assertThat(programSections.size()).isEqualTo(2);
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramTrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramTrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java
index bbde8bffae..995796363e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramTrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramTrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java
@@ -102,7 +102,7 @@ public void filter_by_program() {
         List<ProgramTrackedEntityAttribute> programTrackedEntityAttributes =
                 d2.programModule().programTrackedEntityAttributes()
                         .byProgram()
-                        .eq("lxAQ7Zs9VYR")
+                        .eq("IpHINAT79UW")
                         .blockingGet();
 
         assertThat(programTrackedEntityAttributes.size()).isEqualTo(2);
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
index 4fff1e82b0..af851a3936 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
@@ -1,19 +1,19 @@
 /*
  *  Copyright (c) 2004-2022, University of Oslo
  *  All rights reserved.
- *  
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
  *  Redistributions of source code must retain the above copyright notice, this
  *  list of conditions and the following disclaimer.
- *  
+ *
  *  Redistributions in binary form must reproduce the above copyright notice,
  *  this list of conditions and the following disclaimer in the documentation
  *  and/or other materials provided with the distribution.
  *  Neither the name of the HISP project nor the names of its contributors may
  *  be used to endorse or promote products derived from this software without
  *  specific prior written permission.
- *  
+ *
  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -126,7 +126,7 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
         assertThat(setting.itemHeader()?.programIndicator()).isNull()
 
         val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
-        assertThat(program1Setting.itemHeader()?.programIndicator()).isEqualTo("GpkfmoQyXEb")
+        assertThat(program1Setting.itemHeader()?.programIndicator()).isEqualTo("kALwOyvVvdT")
 
         val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
         assertThat(program2Setting.itemHeader()?.programIndicator()).isNull()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeValueObjectRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeValueObjectRepositoryMockIntegrationShould.java
index be7999be24..381f880a8c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeValueObjectRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeValueObjectRepositoryMockIntegrationShould.java
@@ -30,8 +30,12 @@
 
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueObjectRepository;
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection;
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceObjectRepository;
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -41,26 +45,41 @@
 public class TrackedEntityAttributeValueObjectRepositoryMockIntegrationShould
         extends BaseMockIntegrationTestFullDispatcher {
 
+    TrackedEntityInstanceObjectRepository teiRepository;
+    TrackedEntityAttributeValueObjectRepository attributeRepository;
+
+    @Before
+    public void setup() throws D2Error {
+        TrackedEntityInstanceCreateProjection projection = TrackedEntityInstanceCreateProjection
+                .create("DiszpKrYNg8", "nEenWmSyUEp");
+
+        String uid = d2.trackedEntityModule().trackedEntityInstances().blockingAdd(projection);
+        attributeRepository = objectRepository(uid);
+        teiRepository = d2.trackedEntityModule().trackedEntityInstances().uid(uid);
+    }
+
+    @After
+    public void teardown() throws D2Error {
+        teiRepository.blockingDelete();
+    }
+
     @Test
     public void update_value() throws D2Error {
         String value = "new_value";
 
-        TrackedEntityAttributeValueObjectRepository repository = objectRepository();
-
-        repository.blockingSet(value);
-        assertThat(repository.blockingGet().value()).isEqualTo(value);
+        attributeRepository.blockingSet(value);
+        assertThat(attributeRepository.blockingGet().value()).isEqualTo(value);
 
-        repository.blockingDelete();
+        attributeRepository.blockingDelete();
     }
 
     @Test
     public void delete_value() throws D2Error {
-        TrackedEntityAttributeValueObjectRepository repository = objectRepository();
+        attributeRepository.blockingSet("value");
+        assertThat(attributeRepository.blockingExists()).isEqualTo(Boolean.TRUE);
 
-        repository.blockingSet("value");
-        assertThat(repository.blockingExists()).isEqualTo(Boolean.TRUE);
-        repository.blockingDelete();
-        assertThat(repository.blockingExists()).isEqualTo(Boolean.FALSE);
+        attributeRepository.blockingDelete();
+        assertThat(attributeRepository.blockingExists()).isEqualTo(Boolean.FALSE);
     }
 
     @Test
@@ -73,20 +92,16 @@ public void return_that_a_value_exists_only_if_it_has_been_created() {
 
     @Test
     public void mark_a_value_as_deleted_using_the_delete_method() throws D2Error {
-        TrackedEntityAttributeValueObjectRepository repository = objectRepository();
-
-        repository.blockingSet("value");
-        repository.blockingDelete();
-        assertValueIsDeleted(repository);
+        attributeRepository.blockingSet("value");
+        attributeRepository.blockingDelete();
+        assertValueIsDeleted(attributeRepository);
     }
 
     @Test
     public void mark_a_value_as_deleted_when_setting_a_null() throws D2Error {
-        TrackedEntityAttributeValueObjectRepository repository = objectRepository();
-
-        repository.blockingSet("value");
-        repository.blockingSet(null);
-        assertValueIsDeleted(repository);
+        attributeRepository.blockingSet("value");
+        attributeRepository.blockingSet(null);
+        assertValueIsDeleted(attributeRepository);
     }
 
     private void assertValueIsDeleted(TrackedEntityAttributeValueObjectRepository objectRepository) throws D2Error {
@@ -98,8 +113,8 @@ private void assertValueIsDeleted(TrackedEntityAttributeValueObjectRepository ob
         objectRepository.blockingSet(null);
     }
 
-    private TrackedEntityAttributeValueObjectRepository objectRepository() {
+    private TrackedEntityAttributeValueObjectRepository objectRepository(String teiUid) {
         return d2.trackedEntityModule().trackedEntityAttributeValues()
-                .value("aejWyOfXge6", "nWrB0TfWlvh");
+                .value("aejWyOfXge6", teiUid);
     }
 }
\ No newline at end of file
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityCollectionRepositoryMockIntegrationShould.java
index 5f0c05921c..a9fac488f4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityCollectionRepositoryMockIntegrationShould.java
@@ -182,7 +182,7 @@ public void filter_by_deleted() {
     public void filter_by_program_uids() {
         List<TrackedEntityInstance> trackedEntityInstances =
                 d2.trackedEntityModule().trackedEntityInstances()
-                        .byProgramUids(Lists.newArrayList("lxAQ7Zs9VYR"))
+                        .byProgramUids(Lists.newArrayList("IpHINAT79UW"))
                         .blockingGet();
 
         assertThat(trackedEntityInstances.size()).isEqualTo(2);
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceCollectionRepositoryMockIntegrationShould.java
index c9c42f86c3..de27979021 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceCollectionRepositoryMockIntegrationShould.java
@@ -84,7 +84,7 @@ public void include_program_owners_as_children() {
         assertThat(tei.programOwners().size()).isEqualTo(1);
 
 
-        assertThat(tei.programOwners().get(0).program()).isEqualTo("lxAQ7Zs9VYR");
+        assertThat(tei.programOwners().get(0).program()).isEqualTo("IpHINAT79UW");
         assertThat(tei.programOwners().get(0).trackedEntityInstance()).isEqualTo("nWrB0TfWlvD");
         assertThat(tei.programOwners().get(0).ownerOrgUnit()).isEqualTo("DiszpKrYNg8");
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index d55d59f4b5..e27edbc019 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -66,7 +66,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     @Test
     fun find_by_data_value() {
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byDataValue("g9eOBujte1U").eq("false")
             .blockingGet()
 
@@ -76,7 +76,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     @Test
     fun find_by_program() {
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .blockingGet()
 
         assertThat(trackedEntityInstances.size).isEqualTo(2)
@@ -85,7 +85,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     @Test
     fun find_uids_by_program() {
         val trackedEntityInstanceUids = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .blockingGetUids()
 
         assertThat(trackedEntityInstanceUids.size).isEqualTo(2)
@@ -95,7 +95,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     fun find_by_enrollment_date() {
         val refDate = DateUtils.DATE_FORMAT.parse("2018-01-10T00:00:00.000")
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byProgramDate().afterOrEqual(refDate)
             .byProgramDate().beforeOrEqual(refDate)
             .blockingGet()
@@ -107,7 +107,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     fun find_by_incident_date() {
         val refDate = DateUtils.DATE_FORMAT.parse("2018-01-10T00:00:00.000")
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byIncidentDate().afterOrEqual(refDate)
             .byIncidentDate().beforeOrEqual(refDate)
             .blockingGet()
@@ -119,7 +119,7 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     fun find_by_event_date() {
         val refDate = DateUtils.DATE_FORMAT.parse("2015-05-01T00:00:00.000")
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byEventDate().afterOrEqual(refDate)
             .byEventDate().beforeOrEqual(refDate)
             .blockingGet()
@@ -156,11 +156,11 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
     fun find_by_transferred_orgunit() {
         val originalOu = d2.trackedEntityModule()
             .trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byOrgUnits().eq("DiszpKrYNg8")
         val transferredOu = d2.trackedEntityModule()
             .trackedEntityInstanceQuery()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byOrgUnits().eq("g8upMTyEZGZ")
 
         assertThat(originalOu.blockingCount()).isEqualTo(2)
@@ -168,11 +168,11 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
 
         // Transfer ownership
         val teiUid = originalOu.blockingGet()[0].uid()
-        d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "lxAQ7Zs9VYR", "g8upMTyEZGZ")
+        d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "IpHINAT79UW", "g8upMTyEZGZ")
         assertThat(originalOu.blockingCount()).isEqualTo(1)
         assertThat(transferredOu.blockingCount()).isEqualTo(1)
 
         // Undo change
-        d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "lxAQ7Zs9VYR", "DiszpKrYNg8")
+        d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "IpHINAT79UW", "DiszpKrYNg8")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
index 289be1f205..e577ca2c17 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -65,10 +65,20 @@ class TrackedEntitySearchCollectionRepositoryMockIntegrationShould : BaseMockInt
     @Test
     fun find_by_data_value() {
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
-            .byProgram().eq("lxAQ7Zs9VYR")
+            .byProgram().eq("IpHINAT79UW")
             .byDataValue("g9eOBujte1U").eq("false")
             .blockingGet()
 
         assertThat(trackedEntityInstances.size).isEqualTo(1)
     }
+
+    @Test
+    fun should_return_header() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
+            .byProgram().eq("IpHINAT79UW")
+            .blockingGet()
+
+        assertThat(trackedEntityInstances[0].header).isEqualTo("4081507, befryEfXge5")
+        assertThat(trackedEntityInstances[1].header).isEqualTo("654321, 0.0")
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
index 2fa64596d6..f9c214a5c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
@@ -31,8 +31,10 @@ package org.hisp.dhis.android.core.trackedentity.search
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeCollectionRepository
 import org.hisp.dhis.android.core.program.trackerheaderengine.internal.TrackerHeaderEngine
+import org.hisp.dhis.android.core.settings.AppearanceSettingsObjectRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -48,11 +50,22 @@ internal class TrackedEntitySearchDataFetcherHelper @Inject constructor(
     private val programTrackedEntityAttributeCollectionRepository: ProgramTrackedEntityAttributeCollectionRepository,
     private val trackedEntityAttributeCollectionRepository: TrackedEntityAttributeCollectionRepository,
     private val trackedEntityTypeCollectionRepository: TrackedEntityTypeCollectionRepository,
+    private val appearanceSettingsObjectRepository: AppearanceSettingsObjectRepository,
+    private val programIndicatorCollectionRepository: ProgramIndicatorCollectionRepository,
 ) {
     fun getHeaderExpression(program: String?): String? {
         return program?.let {
-            // https://dhis2.atlassian.net/browse/ANDROSDK-1728
-            null
+            val itemHeader = appearanceSettingsObjectRepository.getProgramConfigurationByUid(program)?.itemHeader()
+            val programIndicatorHeader = itemHeader?.programIndicator()
+
+            if (programIndicatorHeader != null) {
+                programIndicatorCollectionRepository
+                    .uid(programIndicatorHeader)
+                    .blockingGet()
+                    ?.expression()
+            } else {
+                null
+            }
         }
     }
 
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramTrackedEntityAttributeSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramTrackedEntityAttributeSamples.java
index 926e1d4674..583cbc99be 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramTrackedEntityAttributeSamples.java
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/program/ProgramTrackedEntityAttributeSamples.java
@@ -65,7 +65,7 @@ public static ProgramTrackedEntityAttribute getChildProgrammeGender() {
                 .displayInList(true)
                 .sortOrder(1)
                 .searchable(false)
-                .program(ObjectWithUid.create("lxAQ7Zs9VYR"))
+                .program(ObjectWithUid.create("IpHINAT79UW"))
                 .trackedEntityAttribute(ObjectWithUid.create("cejWyOfXge6"))
                 .build();
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
index 73a41e8a80..26ee3db89d 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/ProgramConfigurationSettingSamples.kt
@@ -42,7 +42,7 @@ object ProgramConfigurationSettingSamples {
             .itemHeader(
                 ProgramItemHeader.builder()
                     .programIndicator("programIndicator")
-                    .build()
+                    .build(),
             )
             .build()
     }
diff --git a/core/src/sharedTest/resources/program/program_indicators.json b/core/src/sharedTest/resources/program/program_indicators.json
index 89f2fc7eb0..646742e059 100644
--- a/core/src/sharedTest/resources/program/program_indicators.json
+++ b/core/src/sharedTest/resources/program/program_indicators.json
@@ -83,6 +83,30 @@
           "offsetPeriods": 2
         }
       ]
+    },
+    {
+      "created": "2014-10-20T11:26:19.631",
+      "lastUpdated": "2014-10-20T11:26:19.631",
+      "name": "Item header expression",
+      "id": "kALwOyvVvdT",
+      "shortName": "Item header expression",
+      "displayDescription": "Header",
+      "aggregationType": "AVERAGE",
+      "expression": "d2:concatenate(A{cejWyOfXge6}, ', ', A{aejWyOfXge6})",
+      "dimensionItem": "kALwOyvVvdT",
+      "displayName": "Item header expression",
+      "displayInForm": false,
+      "description": "Header",
+      "displayShortName": "Item header expression",
+      "decimals": 2,
+      "filter": "1",
+      "analyticsType": "ENROLLMENT",
+      "program": {
+        "id": "lxAQ7Zs9VYR"
+      },
+      "legendSets": [],
+      "analyticsPeriodBoundaries": [
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/program/programs.json b/core/src/sharedTest/resources/program/programs.json
index 4b6a9bc0f5..ee679e16de 100644
--- a/core/src/sharedTest/resources/program/programs.json
+++ b/core/src/sharedTest/resources/program/programs.json
@@ -88,6 +88,57 @@
           }
         }
       ],
+      "programTrackedEntityAttributes": [
+      ],
+      "programSections": [
+      ]
+    },
+    {
+      "lastUpdated": "2017-01-19T14:32:05.307",
+      "id": "IpHINAT79UW",
+      "created": "2016-04-12T15:30:43.783",
+      "name": "Child Programme",
+      "shortName": "Child Programme",
+      "displayName": "Child Programme",
+      "ignoreOverdueEvents": false,
+      "displayShortName": "Child Programme",
+      "featureType": "POINT",
+      "displayFrontPageList": true,
+      "enrollmentDateLabel": "Enrollment",
+      "onlyEnrollOnce": true,
+      "programType": "WITH_REGISTRATION",
+      "accessLevel": "OPEN",
+      "relationshipFromA": false,
+      "dataEntryMethod": false,
+      "version": 4,
+      "selectIncidentDatesInFuture": true,
+      "incidentDateLabel": "Incident",
+      "displayIncidentDate": true,
+      "selectEnrollmentDatesInFuture": true,
+      "registration": true,
+      "useFirstStageDuringRegistration": false,
+      "expiryDays": 4,
+      "completeEventsExpiryDays": 6,
+      "expiryPeriodType": "Monthly",
+      "minAttributesRequiredToSearch": 5,
+      "maxTeiCountToReturn": 10,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
+      "relationshipType": {
+        "id": "V2kkHafqs8G"
+      },
+      "relationshipText": "Relationship text",
+      "trackedEntityType": {
+        "id": "nEenWmSyUEp"
+      },
+      "categoryCombo": {
+        "id": "m2jTvAj5kkm"
+      },
+      "programRuleVariables": [
+      ],
       "programTrackedEntityAttributes": [
         {
           "lastUpdated": "2016-10-11T10:41:40.401",
@@ -107,7 +158,7 @@
           "dimensionItemType": "PROGRAM_ATTRIBUTE",
           "searchable": false,
           "program": {
-            "id": "lxAQ7Zs9VYR"
+            "id": "IpHINAT79UW"
           },
           "trackedEntityAttribute": {
             "id": "cejWyOfXge6"
@@ -147,7 +198,7 @@
           "dimensionItemType": "PROGRAM_ATTRIBUTE",
           "searchable": true,
           "program": {
-            "id": "lxAQ7Zs9VYR"
+            "id": "IpHINAT79UW"
           },
           "trackedEntityAttribute": {
             "id": "aejWyOfXge6"
@@ -168,7 +219,7 @@
           "sortOrder": 1,
           "favorite": false,
           "program": {
-            "id": "lxAQ7Zs9VYR"
+            "id": "IpHINAT79UW"
           },
           "style": {
             "color": "#555",
@@ -201,64 +252,13 @@
           "sortOrder": 2,
           "favorite": true,
           "program": {
-            "id": "lxAQ7Zs9VYR"
+            "id": "IpHINAT79UW"
           },
           "style": {
             "color": "#556",
             "icon": "section-icon-2"
           }
         }
-      ]
-    },
-    {
-      "lastUpdated": "2017-01-19T14:32:05.307",
-      "id": "IpHINAT79UW",
-      "created": "2016-04-12T15:30:43.783",
-      "name": "Child Programme",
-      "shortName": "Child Programme",
-      "displayName": "Child Programme",
-      "ignoreOverdueEvents": false,
-      "displayShortName": "Child Programme",
-      "featureType": "POINT",
-      "displayFrontPageList": true,
-      "enrollmentDateLabel": "Enrollment",
-      "onlyEnrollOnce": true,
-      "programType": "WITH_REGISTRATION",
-      "accessLevel": "OPEN",
-      "relationshipFromA": false,
-      "dataEntryMethod": false,
-      "version": 4,
-      "selectIncidentDatesInFuture": true,
-      "incidentDateLabel": "Incident",
-      "displayIncidentDate": true,
-      "selectEnrollmentDatesInFuture": true,
-      "registration": true,
-      "useFirstStageDuringRegistration": false,
-      "expiryDays": 4,
-      "completeEventsExpiryDays": 6,
-      "expiryPeriodType": "Monthly",
-      "minAttributesRequiredToSearch": 5,
-      "maxTeiCountToReturn": 10,
-      "access": {
-        "data": {
-          "write": true
-        }
-      },
-      "relationshipType": {
-        "id": "V2kkHafqs8G"
-      },
-      "relationshipText": "Relationship text",
-      "trackedEntityType": {
-        "id": "nEenWmSyUEp"
-      },
-      "categoryCombo": {
-        "id": "m2jTvAj5kkm"
-      },
-      "programRuleVariables": [
-      ],
-      "programTrackedEntityAttributes": [
-      ],
-      "programSections": [
       ],
       "attributeValues": [
         {
diff --git a/core/src/sharedTest/resources/relationship/relationship_types.json b/core/src/sharedTest/resources/relationship/relationship_types.json
index 1be02ebd65..02d933a8d8 100644
--- a/core/src/sharedTest/resources/relationship/relationship_types.json
+++ b/core/src/sharedTest/resources/relationship/relationship_types.json
@@ -25,7 +25,7 @@
       "fromConstraint": {
         "relationshipEntity": "PROGRAM_INSTANCE",
         "program": {
-          "id": "lxAQ7Zs9VYR"
+          "id": "IpHINAT79UW"
         }
       },
       "toConstraint": {
@@ -60,7 +60,7 @@
           "id": "nEenWmSyUEp"
         },
         "program": {
-          "id": "lxAQ7Zs9VYR"
+          "id": "IpHINAT79UW"
         }
       },
       "toConstraint": {
@@ -101,7 +101,7 @@
           "id": "nEenWmSyUEp"
         },
         "program": {
-          "id": "lxAQ7Zs9VYR"
+          "id": "IpHINAT79UW"
         }
       }
     },
diff --git a/core/src/sharedTest/resources/settings/appearance_settings_v2.json b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
index 58d84d76c2..b5e3b09011 100644
--- a/core/src/sharedTest/resources/settings/appearance_settings_v2.json
+++ b/core/src/sharedTest/resources/settings/appearance_settings_v2.json
@@ -140,7 +140,7 @@
         "disableReferrals": "true",
         "disableCollapsibleSections": "false",
         "itemHeader": {
-          "programIndicator": "GpkfmoQyXEb"
+          "programIndicator": "kALwOyvVvdT"
         }
       },
       "IpHINAT79UQ": {
diff --git a/core/src/sharedTest/resources/trackedentity/new_tracker_importer_tracked_entities.json b/core/src/sharedTest/resources/trackedentity/new_tracker_importer_tracked_entities.json
index 38fd52937d..35740298e2 100644
--- a/core/src/sharedTest/resources/trackedentity/new_tracker_importer_tracked_entities.json
+++ b/core/src/sharedTest/resources/trackedentity/new_tracker_importer_tracked_entities.json
@@ -65,7 +65,7 @@
         {
           "createdAt": "2019-01-10T13:40:28.322",
           "orgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "enrollment": "enroll1",
           "trackedEntity": "nWrB0TfWlvh",
           "updatedAt": "2019-01-10T13:40:28.718",
@@ -117,7 +117,7 @@
               "storedBy": "system",
               "orgUnit": "DiszpKrYNg8",
               "scheduledAt": "2015-05-01T00:00:00.000",
-              "program": "lxAQ7Zs9VYR",
+              "program": "IpHINAT79UW",
               "href": "https://play.dhis2.org/demo/api/events/hnaWBxMw5j3",
               "event": "event1",
               "status": "COMPLETED",
@@ -167,7 +167,7 @@
       "programOwners": [
         {
           "orgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "trackedEntity": "nWrB0TfWlvh"
         }
       ]
@@ -237,7 +237,7 @@
         {
           "createdAt": "2018-01-10T13:40:28.322",
           "orgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "enrollment": "enroll2",
           "trackedEntity": "nWrB0TfWlvD",
           "updatedAt": "2018-01-10T13:40:28.718",
@@ -275,7 +275,7 @@
               "storedBy": "system",
               "orgUnit": "DiszpKrYNg8",
               "scheduledAt": "2016-05-01T00:00:00.000",
-              "program": "lxAQ7Zs9VYR",
+              "program": "IpHINAT79UW",
               "href": "https://play.dhis2.org/demo/api/events/hnaWBxMw5j3",
               "event": "event2",
               "status": "SCHEDULE",
@@ -309,7 +309,7 @@
       "programOwners": [
         {
           "orgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "trackedEntity": "nWrB0TfWlvD"
         }
       ]
diff --git a/core/src/sharedTest/resources/trackedentity/tracked_entity_instances.json b/core/src/sharedTest/resources/trackedentity/tracked_entity_instances.json
index 65aa0c2b2f..aeb27b33d3 100644
--- a/core/src/sharedTest/resources/trackedentity/tracked_entity_instances.json
+++ b/core/src/sharedTest/resources/trackedentity/tracked_entity_instances.json
@@ -63,7 +63,7 @@
         {
           "created": "2019-01-10T13:40:28.322",
           "orgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "enrollment": "enroll1",
           "trackedEntityInstance": "nWrB0TfWlvh",
           "lastUpdated": "2019-01-10T13:40:28.718",
@@ -115,7 +115,7 @@
               "storedBy": "system",
               "orgUnit": "DiszpKrYNg8",
               "dueDate": "2015-05-01T00:00:00.000",
-              "program": "lxAQ7Zs9VYR",
+              "program": "IpHINAT79UW",
               "href": "https://play.dhis2.org/demo/api/events/hnaWBxMw5j3",
               "event": "event1",
               "status": "COMPLETED",
@@ -162,7 +162,7 @@
       "programOwners": [
         {
           "ownerOrgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "trackedEntityInstance": "nWrB0TfWlvh"
         }
       ]
@@ -232,7 +232,7 @@
         {
           "created": "2018-01-10T13:40:28.322",
           "orgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "enrollment": "enroll2",
           "trackedEntityInstance": "nWrB0TfWlvD",
           "lastUpdated": "2018-01-10T13:40:28.718",
@@ -267,7 +267,7 @@
               "storedBy": "system",
               "orgUnit": "DiszpKrYNg8",
               "dueDate": "2016-05-01T00:00:00.000",
-              "program": "lxAQ7Zs9VYR",
+              "program": "IpHINAT79UW",
               "href": "https://play.dhis2.org/demo/api/events/hnaWBxMw5j3",
               "event": "event2",
               "status": "SCHEDULE",
@@ -298,7 +298,7 @@
       "programOwners": [
         {
           "ownerOrgUnit": "DiszpKrYNg8",
-          "program": "lxAQ7Zs9VYR",
+          "program": "IpHINAT79UW",
           "trackedEntityInstance": "nWrB0TfWlvD"
         }
       ]
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt
index 45d850a666..6710feb612 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/AppearanceSettingsV2Should.kt
@@ -80,7 +80,7 @@ class AppearanceSettingsV2Should : BaseObjectShould("settings/appearance_setting
         assertThat(specificProgramConfiguration.optionalSearch()).isEqualTo(true)
         assertThat(specificProgramConfiguration.disableReferrals()).isEqualTo(true)
         assertThat(specificProgramConfiguration.disableCollapsibleSections()).isEqualTo(false)
-        assertThat(specificProgramConfiguration.itemHeader()!!.programIndicator()).isEqualTo("GpkfmoQyXEb")
+        assertThat(specificProgramConfiguration.itemHeader()!!.programIndicator()).isEqualTo("kALwOyvVvdT")
 
         // Compatibility backwards
         val completionSpinnerSetting = appearanceSettings.completionSpinner()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
index abe5af12f4..f354bea921 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/ProgramConfigurationSettingSamples.kt
@@ -40,7 +40,7 @@ object ProgramConfigurationSettingSamples {
             .itemHeader(
                 ProgramItemHeader.builder()
                     .programIndicator("programIndicator")
-                    .build()
+                    .build(),
             )
             .build()
     }

From b6f438378b9234917544c42e9d9c8f573ccdcff4 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 5 Oct 2023 08:25:42 +0200
Subject: [PATCH 395/478] [ANDROSDK-1751] refactor: - Tests. Remove RxJava,
 adapt to classes

---
 .../factories/internal/ListCallCoroutines.kt  |  2 -
 .../UntypedModuleDownloaderCoroutines.kt      |  2 +-
 .../settings/internal/AnalyticsSettingCall.kt |  2 +-
 .../internal/AppearanceSettingCall.kt         |  2 +-
 .../core/settings/internal/BaseSettingCall.kt | 10 +--
 .../settings/internal/DataSetSettingCall.kt   |  1 -
 .../settings/internal/GeneralSettingCall.kt   | 12 ++--
 .../settings/internal/LatestAppVersionCall.kt |  6 --
 .../settings/internal/ProgramSettingCall.kt   |  3 +-
 .../settings/internal/SettingAppService.kt    |  1 -
 .../internal/SettingModuleDownloader.kt       |  3 -
 .../core/settings/internal/SettingService.kt  |  1 -
 .../settings/internal/SettingsAppInfoCall.kt  |  5 --
 .../internal/SettingsAppInfoManager.kt        |  2 -
 .../internal/SettingsAppInfoManagerImpl.kt    |  4 --
 .../internal/SynchronizationSettingCall.kt    | 10 +--
 .../core/usecase/UseCaseModuleDownloader.kt   |  1 -
 .../stock/internal/StockUseCaseService.kt     |  1 -
 .../domain/metadata/MetadataCallShould.kt     | 17 +++--
 .../internal/AnalyticsSettingCallShould.kt    | 42 ++++++++----
 .../internal/AppearanceSettingsCallShould.kt  | 47 ++++++++------
 .../internal/DataSetSettingCallShould.kt      | 33 ++++++----
 .../internal/GeneralSettingCallShould.kt      | 33 ++++++----
 .../internal/ProgramSettingCallShould.kt      | 33 ++++++----
 .../internal/SettingsAppInfoCallShould.kt     | 64 ++++---------------
 .../internal/SettingsAppInfoManagerShould.kt  | 19 ++++--
 .../SynchronizationSettingCallShould.kt       | 64 +++++++++++--------
 .../usecase/stock/StockUseCaseCallShould.kt   | 28 +++++---
 28 files changed, 230 insertions(+), 218 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt
index a0c42fdaa6..cee21b6ded 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallCoroutines.kt
@@ -28,8 +28,6 @@
 
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import io.reactivex.Single
-
 fun interface ListCallCoroutines<P> {
     suspend fun download(): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt
index 96e6959207..a9c33424f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/modules/internal/UntypedModuleDownloaderCoroutines.kt
@@ -30,4 +30,4 @@ package org.hisp.dhis.android.core.arch.modules.internal
 
 internal fun interface UntypedModuleDownloaderCoroutines {
     suspend fun downloadMetadata()
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index 2f7c1ae5af..11e7a2985b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -54,7 +54,7 @@ internal class AnalyticsSettingCall @Inject constructor(
                         .errorDescription("Analytics settings not found")
                         .errorCode(D2ErrorCode.URL_NOT_FOUND)
                         .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                        .build()
+                        .build(),
                 )
             }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index d771021df9..2c2423f256 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -54,7 +54,7 @@ internal class AppearanceSettingCall @Inject constructor(
                         .errorDescription("Appearance settings not found")
                         .errorCode(D2ErrorCode.URL_NOT_FOUND)
                         .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                        .build()
+                        .build(),
                 )
             }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
index ae42acb590..1098736aba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
@@ -35,7 +35,7 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import java.net.HttpURLConnection
 
 internal abstract class BaseSettingCall<T> internal constructor(
-    val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : DownloadProvider {
 
     override suspend fun download(storeError: Boolean) {
@@ -45,14 +45,14 @@ internal abstract class BaseSettingCall<T> internal constructor(
                 if (isExpectedError(throwable)) {
                     process(null)
                 }
-            })
+            },
+        )
     }
 
-
     private fun isExpectedError(throwable: D2Error): Boolean {
         return throwable.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ||
-                throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_SUPPORTED ||
-                throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_INSTALLED
+            throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_SUPPORTED ||
+            throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_INSTALLED
     }
 
     abstract suspend fun fetch(storeError: Boolean): Result<T, D2Error>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index 326acbc764..948f5ea753 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -46,7 +46,6 @@ internal class DataSetSettingCall @Inject constructor(
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.dataSetSettings(appVersionManager.getDataStoreVersion())
         }
-
     }
 
     override fun process(item: DataSetSettings?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 46ac440d77..e0432f5f4c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -44,6 +44,12 @@ internal class GeneralSettingCall @Inject constructor(
 
     private var cachedValue: GeneralSettings? = null
 
+    override suspend fun fetch(storeError: Boolean): Result<GeneralSettings, D2Error> {
+        return coroutineAPICallExecutor.wrap(storeError = storeError) {
+            settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
+        }
+    }
+
     suspend fun fetch(storeError: Boolean, acceptCache: Boolean = false): Result<GeneralSettings, D2Error> {
         return when {
             cachedValue != null && acceptCache -> Result.Success(cachedValue!!)
@@ -64,10 +70,4 @@ internal class GeneralSettingCall @Inject constructor(
             settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
         }.getOrThrow().encryptDB()
     }
-
-    override suspend fun fetch(storeError: Boolean): Result<GeneralSettings, D2Error> {
-        return coroutineAPICallExecutor.wrap(storeError = storeError) {
-            settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
-        }
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index 97d37b30c0..2141803b54 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -29,10 +29,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.internal.CompletableProvider
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.LatestAppVersion
@@ -45,15 +42,12 @@ internal class LatestAppVersionCall @Inject constructor(
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : BaseSettingCall<LatestAppVersion>(coroutineAPICallExecutor) {
 
-
     override suspend fun fetch(storeError: Boolean): Result<LatestAppVersion, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) { settingAppService.latestAppVersion() }
-
     }
 
     override fun process(item: LatestAppVersion?) {
         val appVersionList = listOfNotNull(item)
         latestAppVersionHandler.handleMany(appVersionList)
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index 1952b054cf..901234c300 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -45,10 +45,9 @@ internal class ProgramSettingCall @Inject constructor(
     override suspend fun fetch(storeError: Boolean): Result<ProgramSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.programSettings(
-                appVersionManager.getDataStoreVersion()
+                appVersionManager.getDataStoreVersion(),
             )
         }
-
     }
 
     override fun process(item: ProgramSettings?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
index 5c9f5923ae..ef6aeb1102 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.settings.AnalyticsSettings
 import org.hisp.dhis.android.core.settings.AppearanceSettings
 import org.hisp.dhis.android.core.settings.DataSetSettings
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
index 054f644bc4..0552e6f260 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import javax.inject.Inject
 
@@ -48,7 +47,6 @@ internal class SettingModuleDownloader @Inject constructor(
         userSettingsCall.download()
         systemSettingCall.download()
         latestAppVersionCall.download(false)
-
     }
 
     private suspend fun downloadFromSettingsApp() {
@@ -57,5 +55,4 @@ internal class SettingModuleDownloader @Inject constructor(
         appearanceSettingCall.download(false)
         analyticsSettingCall.download(false)
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt
index c11b1be8c7..9c53bdf686 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.settings.*
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
index 310bf55166..295e2c52ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
@@ -48,14 +48,11 @@ internal class SettingsAppInfoCall @Inject constructor(
     }
 
     private suspend fun fetchAppVersion(storeError: Boolean): SettingsAppVersion {
-
         return try {
-
             val info = coroutineAPICallExecutor.wrap(storeError = storeError) { settingAppService.info() }
                 .getOrThrow()
 
             SettingsAppVersion.Valid(info.dataStoreVersion(), info.androidSettingsVersion() ?: unknown)
-
         } catch (exception: D2Error) {
             when {
                 exception.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ->
@@ -76,7 +73,6 @@ internal class SettingsAppInfoCall @Inject constructor(
                 settingAppService.generalSettings(SettingsAppDataStoreVersion.V1_1)
             }.getOrThrow()
             SettingsAppVersion.Valid(SettingsAppDataStoreVersion.V1_1, unknown)
-
         } catch (exception: D2Error) {
             when {
                 exception.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ->
@@ -90,5 +86,4 @@ internal class SettingsAppInfoCall @Inject constructor(
             }
         }
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt
index f7fdd32524..014bb3c4d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManager.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import io.reactivex.Single
-
 internal interface SettingsAppInfoManager {
     suspend fun getDataStoreVersion(): SettingsAppDataStoreVersion
     suspend fun getAppVersion(): String
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
index 5d90e1743d..f96caa6f90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import javax.inject.Inject
@@ -50,7 +49,6 @@ internal class SettingsAppInfoManagerImpl @Inject constructor(
             is SettingsAppVersion.Valid -> getOrUpdateAppVersion.dataStore
             is SettingsAppVersion.DataStoreEmpty -> throw dataStoreEmpty
         }
-
     }
 
     override suspend fun getAppVersion(): String {
@@ -58,7 +56,6 @@ internal class SettingsAppInfoManagerImpl @Inject constructor(
             is SettingsAppVersion.Valid -> getOrUpdateAppVersion.app
             is SettingsAppVersion.DataStoreEmpty -> throw dataStoreEmpty
         }
-
     }
 
     override suspend fun updateAppVersion(): SettingsAppVersion {
@@ -67,7 +64,6 @@ internal class SettingsAppInfoManagerImpl @Inject constructor(
         } catch (exception: D2Error) {
             SettingsAppVersion.DataStoreEmpty
         }
-
     }
 
     private suspend fun getOrUpdateAppVersion(): SettingsAppVersion {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index 039db237e9..10963d9b3e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -61,9 +61,8 @@ internal class SynchronizationSettingCall @Inject constructor(
                             .errorDescription("Synchronization settings not found")
                             .errorCode(D2ErrorCode.URL_NOT_FOUND)
                             .httpErrorCode(HttpURLConnection.HTTP_NOT_FOUND)
-                            .build()
+                            .build(),
                     )
-
                 } else {
                     val generalSettingsData = generalSettings?.getOrThrow()
                     Result.Success(
@@ -72,23 +71,21 @@ internal class SynchronizationSettingCall @Inject constructor(
                             .metadataSync(generalSettingsData.metadataSync())
                             .dataSetSettings(dataSetSettings?.getOrThrow())
                             .programSettings(programSettings?.getOrThrow())
-                            .build()
+                            .build(),
                     )
-
                 }
             }
 
             SettingsAppDataStoreVersion.V2_0 -> {
                 coroutineAPICallExecutor.wrap(storeError = storeError) {
                     settingAppService.synchronizationSettings(
-                        version
+                        version,
                     )
                 }
             }
         }
     }
 
-
     override fun process(item: SynchronizationSettings?) {
         val syncSettingsList = listOfNotNull(item)
         synchronizationSettingHandler.handleMany(syncSettingsList)
@@ -98,6 +95,5 @@ internal class SynchronizationSettingCall @Inject constructor(
         return runBlocking {
             coroutineAPICallExecutor.wrap { call }.getOrNull()
         }
-
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
index 3746a70c31..50c12720d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
@@ -42,7 +42,6 @@ internal class UseCaseModuleDownloader @Inject constructor(
     override fun downloadMetadata(): Completable {
         return rxCompletable {
             stockUseCaseCall.download(false)
-
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt
index bca7d7e93d..0e87470194 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import retrofit2.http.GET
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index ecce6af793..00e8b65bbc 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -32,6 +32,7 @@ import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.arch.call.BaseD2Progress
@@ -97,16 +98,21 @@ class MetadataCallShould : BaseCallShould() {
     // object to test
     private lateinit var metadataCall: MetadataCall
 
+    @SuppressWarnings("LongMethod")
     @Before
     @Throws(Exception::class)
     override fun setUp() {
         super.setUp()
-
         // Calls
         systemInfoDownloader.stub {
             onBlocking { downloadWithProgressManager(any()) }.doReturn(BaseD2Progress.empty(10))
         }
-        whenever(systemSettingDownloader.downloadMetadata()).thenReturn(Completable.complete())
+        systemInfoDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
+        useCaseModuleDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Completable.complete())
+        }
         whenever(useCaseModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         userDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(user)
@@ -133,11 +139,9 @@ class MetadataCallShould : BaseCallShould() {
         whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.complete())
         whenever(smsModule.configCase()).thenReturn(configCase)
         whenever(configCase.refreshMetadataIdsCallable()).thenReturn(Completable.complete())
-
         generalSettingCall.stub {
             onBlocking { isDatabaseEncrypted() }.doReturn(false)
         }
-
         // Metadata call
         metadataCall = MetadataCall(
             coroutineAPICallExecutor,
@@ -177,8 +181,9 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_system_setting_call_fail() {
-        whenever(systemSettingDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
+    fun fail_when_system_setting_call_fail() = runTest {
+        whenever(systemSettingDownloader.downloadMetadata()).doAnswer { throw networkError }
+
         downloadAndAssertError()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
index f4fc377329..87f8b2e94c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCallShould.kt
@@ -28,58 +28,74 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.stub
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import com.nhaarman.mockitokotlin2.whenever
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.AnalyticsSettings
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class AnalyticsSettingCallShould {
     private val handler: AnalyticsTeiSettingHandler = mock()
     private val analyticsDhisVisualizationsSettingHandler: AnalyticsDhisVisualizationSettingHandler = mock()
     private val service: SettingAppService = mock()
-    private val analyticsSettingSingle: Single<AnalyticsSettings> = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val analyticsSettings: AnalyticsSettings = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
     private val appVersionManager: SettingsAppInfoManager = mock()
 
     private lateinit var analyticsSettingCall: AnalyticsSettingCall
 
     @Before
     fun setUp() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
-        whenever(service.analyticsSettings(any())) doReturn analyticsSettingSingle
+        appVersionManager.stub {
+            onBlocking { getDataStoreVersion() } doReturn SettingsAppDataStoreVersion.V1_1
+        }
+        whenAPICall { analyticsSettings }
         analyticsSettingCall = AnalyticsSettingCall(
             handler,
             analyticsDhisVisualizationsSettingHandler,
             service,
-            apiCallExecutor,
+            coroutineAPICallExecutor,
             appVersionManager,
         )
     }
 
+    private fun whenAPICall(answer: Answer<AnalyticsSettings>) {
+        service.stub {
+            onBlocking { analyticsSettings(any()) }.doAnswer(answer)
+        }
+    }
+
     @Test
-    fun default_to_empty_collection_if_version_1_1() {
-        analyticsSettingCall.getCompletable(false).blockingAwait()
+    fun default_to_empty_collection_if_version_1_1() = runTest {
+        analyticsSettingCall.download(false)
 
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)
     }
 
     @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(apiCallExecutor.wrapSingle(analyticsSettingSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_empty_collection_if_not_found() = runTest {
+        appVersionManager.stub {
+            onBlocking { getDataStoreVersion() } doReturn SettingsAppDataStoreVersion.V2_0
+        }
+
+        whenever(service.analyticsSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
 
-        analyticsSettingCall.getCompletable(false).blockingAwait()
+        analyticsSettingCall.download(false)
 
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
index b074d2f81f..221b4aa7d3 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingsCallShould.kt
@@ -29,68 +29,77 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.AppearanceSettings
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class AppearanceSettingsCallShould {
 
     private val filterSettingHandler: FilterSettingHandler = mock()
     private val programConfigurationHandler: ProgramConfigurationSettingHandler = mock()
     private val service: SettingAppService = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
     private val appVersionManager: SettingsAppInfoManager = mock()
 
     private val appearanceSettings: AppearanceSettings = mock()
-    private val appearanceSettingsSingle: Single<AppearanceSettings> = Single.just(appearanceSettings)
 
     private lateinit var appearanceSettingsCall: AppearanceSettingCall
 
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
+
     @Before
     fun setUp() {
-        whenever(service.appearanceSettings(any())) doReturn appearanceSettingsSingle
-
+        whenAPICall { appearanceSettings }
         appearanceSettingsCall = AppearanceSettingCall(
             filterSettingHandler,
             programConfigurationHandler,
             service,
-            apiCallExecutor,
+            coroutineAPICallExecutor,
             appVersionManager,
         )
     }
 
+    private fun whenAPICall(answer: Answer<AppearanceSettings>) {
+        service.stub {
+            onBlocking { appearanceSettings(any()) }.doAnswer(answer)
+        }
+    }
+
     @Test
-    fun call_appearances_endpoint_if_version_1() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
+    fun call_appearances_endpoint_if_version_1() = runTest {
+        whenever(appVersionManager.getDataStoreVersion()) doReturn SettingsAppDataStoreVersion.V1_1
 
-        appearanceSettingsCall.getCompletable(false).blockingAwait()
+        appearanceSettingsCall.download(false)
 
         verify(service, never()).appearanceSettings(any())
     }
 
     @Test
-    fun call_appearances_endpoint_if_version_2() {
-        whenever(apiCallExecutor.wrapSingle(appearanceSettingsSingle, false)) doReturn appearanceSettingsSingle
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V2_0)
+    fun call_appearances_endpoint_if_version_2() = runTest {
+        whenever(service.appearanceSettings(any())) doAnswer { appearanceSettings }
+
+        whenever(appVersionManager.getDataStoreVersion()) doReturn SettingsAppDataStoreVersion.V2_0
 
-        appearanceSettingsCall.getCompletable(false).blockingAwait()
+        appearanceSettingsCall.download(false)
 
         verify(service).appearanceSettings(any())
     }
 
     @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V2_0)
-        whenever(apiCallExecutor.wrapSingle(appearanceSettingsSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_empty_collection_if_not_found() = runTest {
+        whenever(service.appearanceSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
+
+        whenever(appVersionManager.getDataStoreVersion()) doReturn SettingsAppDataStoreVersion.V2_0
 
-        appearanceSettingsCall.getCompletable(false).blockingAwait()
+        appearanceSettingsCall.download(false)
 
         verify(filterSettingHandler).handleMany(emptyList())
         verifyNoMoreInteractions(filterSettingHandler)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt
index e4433b0b51..2bc6cbcd59 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCallShould.kt
@@ -28,38 +28,49 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.DataSetSettings
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class DataSetSettingCallShould {
     private val handler: DataSetSettingHandler = mock()
     private val service: SettingAppService = mock()
-    private val dataSetSettingSingle: Single<DataSetSettings> = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val dataSetSetting: DataSetSettings = mock()
     private val appVersionManager: SettingsAppInfoManager = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
 
     private lateinit var dataSetSettingCall: DataSetSettingCall
 
     @Before
     fun setUp() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
-        whenever(service.dataSetSettings(any())) doReturn dataSetSettingSingle
-        dataSetSettingCall = DataSetSettingCall(handler, service, apiCallExecutor, appVersionManager)
+        appVersionManager.stub {
+            onBlocking { getDataStoreVersion() } doReturn SettingsAppDataStoreVersion.V1_1
+        }
+        whenAPICall { dataSetSetting }
+
+        dataSetSettingCall = DataSetSettingCall(handler, service, coroutineAPICallExecutor, appVersionManager)
+    }
+
+    private fun whenAPICall(answer: Answer<DataSetSettings>) {
+        service.stub {
+            onBlocking { dataSetSettings(any()) }.doAnswer(answer)
+        }
     }
 
     @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(apiCallExecutor.wrapSingle(dataSetSettingSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_empty_collection_if_not_found() = runTest {
+        whenever(service.dataSetSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
 
-        dataSetSettingCall.getCompletable(false).blockingAwait()
+        dataSetSettingCall.download(false)
 
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt
index 0aaac55ebc..8bbcc5ebc5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCallShould.kt
@@ -28,39 +28,48 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.GeneralSettings
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class GeneralSettingCallShould {
     private val handler: GeneralSettingHandler = mock()
     private val service: SettingAppService = mock()
-    private val generalSettingSingle: Single<GeneralSettings> = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val generalSetting: GeneralSettings = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
     private val appVersionManager: SettingsAppInfoManager = mock()
 
     private lateinit var generalSettingCall: GeneralSettingCall
 
     @Before
     fun setUp() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
-        whenever(service.generalSettings(any())) doReturn generalSettingSingle
-        generalSettingCall = GeneralSettingCall(handler, service, apiCallExecutor, appVersionManager)
+        appVersionManager.stub {
+            onBlocking { getDataStoreVersion() } doReturn SettingsAppDataStoreVersion.V1_1
+        }
+        whenAPICall { generalSetting }
+        generalSettingCall = GeneralSettingCall(handler, service, appVersionManager, coroutineAPICallExecutor)
     }
 
-    @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(apiCallExecutor.wrapSingle(generalSettingSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    private fun whenAPICall(answer: Answer<GeneralSettings>) {
+        service.stub {
+            onBlocking { generalSettings(any()) }.doAnswer(answer)
+        }
+    }
 
-        generalSettingCall.getCompletable(false).blockingAwait()
+    @Test
+    fun default_to_empty_collection_if_not_found() = runTest {
+        whenever(service.generalSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
 
+        generalSettingCall.download(false)
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt
index 553a076e8e..a0024b8f86 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCallShould.kt
@@ -28,38 +28,49 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class ProgramSettingCallShould {
     private val handler: ProgramSettingHandler = mock()
     private val service: SettingAppService = mock()
-    private val programSettingSingle: Single<ProgramSettings> = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val programSettings: ProgramSettings = mock()
     private val appVersionManager: SettingsAppInfoManager = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
 
     private lateinit var programSettingCall: ProgramSettingCall
 
     @Before
     fun setUp() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
-        whenever(service.programSettings(any())) doReturn programSettingSingle
-        programSettingCall = ProgramSettingCall(handler, service, apiCallExecutor, appVersionManager)
+        appVersionManager.stub {
+            onBlocking { getDataStoreVersion() } doReturn SettingsAppDataStoreVersion.V1_1
+        }
+        whenAPICall { programSettings }
+
+        programSettingCall = ProgramSettingCall(handler, service, coroutineAPICallExecutor, appVersionManager)
+    }
+
+    private fun whenAPICall(answer: Answer<ProgramSettings>) {
+        service.stub {
+            onBlocking { programSettings(any()) }.doAnswer(answer)
+        }
     }
 
     @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(apiCallExecutor.wrapSingle(programSettingSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_empty_collection_if_not_found() = runTest {
+        whenever(service.programSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
 
-        programSettingCall.getCompletable(false).blockingAwait()
+        programSettingCall.download(false)
 
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
index 283c02bcbb..c76cccda67 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
@@ -28,15 +28,15 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.doThrow
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.stub
+import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.GeneralSettings
@@ -49,18 +49,13 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 @OptIn(ExperimentalCoroutinesApi::class)
-
 @RunWith(JUnit4::class)
 class SettingsAppInfoCallShould {
     private val service: SettingAppService = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
-
-    private val settingAppInfoCall: SettingsAppInfo = mock()
     private val settingsAppInfo = SettingsAppInfo.builder()
         .dataStoreVersion(SettingsAppDataStoreVersion.V2_0)
         .build()
 
-    private val generalSettingsCall: GeneralSettings = mock()
     private val generalSettings = GeneralSettings.builder()
         .encryptDB(true)
         .build()
@@ -71,23 +66,13 @@ class SettingsAppInfoCallShould {
     @Before
     fun setUp() {
         service.stub {
-            onBlocking { info() } doReturn settingAppInfoCall
+            onBlocking { info() } doAnswer { settingsAppInfo }
         }
-        coroutineAPICallExecutor.stub {
-            onBlocking { wrap { settingAppInfoCall }.getOrThrow() } doReturn
-                    settingsAppInfo
-        }
-
 
         service.stub {
-            onBlocking { generalSettings(SettingsAppDataStoreVersion.V1_1) } doReturn generalSettingsCall
+            onBlocking { generalSettings(SettingsAppDataStoreVersion.V1_1) } doAnswer { generalSettings }
         }
 
-        coroutineAPICallExecutor.stub {
-            onBlocking { wrap { generalSettingsCall }.getOrThrow() } doReturn generalSettings
-        }
-
-
         dataSetSettingCall = SettingsAppInfoCall(service, coroutineAPICallExecutor)
     }
 
@@ -105,12 +90,7 @@ class SettingsAppInfoCallShould {
 
     @Test
     fun default_to_version_1_if_info_not_found() = runTest {
-        coroutineAPICallExecutor.stub {
-            onBlocking {
-                wrap { settingAppInfoCall }.getOrThrow()
-            } doThrow D2ErrorSamples.notFound()
-        }
-
+        whenever(service.info()) doAnswer { throw D2ErrorSamples.notFound() }
 
         when (val version = dataSetSettingCall.fetch(false)) {
             is SettingsAppVersion.Valid -> {
@@ -124,16 +104,8 @@ class SettingsAppInfoCallShould {
 
     @Test
     fun return_data_store_empty_if_cannot_found_anything() = runTest {
-        coroutineAPICallExecutor.stub {
-            onBlocking {
-                wrap { settingAppInfoCall }.getOrThrow()
-            } doThrow D2ErrorSamples.notFound()
-        }
-        coroutineAPICallExecutor.stub {
-            onBlocking {
-                wrap { generalSettingsCall }.getOrThrow()
-            } doThrow D2ErrorSamples.notFound()
-        }
+        whenever(service.info()) doAnswer { throw D2ErrorSamples.notFound() }
+        whenever(service.generalSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
 
         val version = dataSetSettingCall.fetch(false)
 
@@ -142,18 +114,8 @@ class SettingsAppInfoCallShould {
 
     @Test
     fun throws_D2_exception_if_other_error_than_not_found_in_general_settings() = runTest {
-
-        coroutineAPICallExecutor.stub {
-            onBlocking {
-                wrap { settingAppInfoCall }.getOrThrow()
-            } doThrow D2ErrorSamples.notFound()
-        }
-
-        coroutineAPICallExecutor.stub {
-            onBlocking {
-                wrap { generalSettingsCall }.getOrThrow()
-            } doThrow D2ErrorSamples.get()
-        }
+        whenever(service.info()) doAnswer { throw D2ErrorSamples.notFound() }
+        whenever(service.generalSettings(any())) doAnswer { throw D2ErrorSamples.get() }
 
         val exception = assertThrows(RuntimeException::class.java) {
             runBlocking {
@@ -166,11 +128,7 @@ class SettingsAppInfoCallShould {
 
     @Test
     fun throws_D2_exception_if_other_error_than_not_found_in_info() = runTest {
-        coroutineAPICallExecutor.stub {
-            onBlocking {
-                wrap { settingAppInfoCall }.getOrThrow()
-            } doThrow D2ErrorSamples.get()
-        }
+        whenever(service.generalSettings(any())) doAnswer { throw D2ErrorSamples.get() }
 
         val exception = assertThrows(RuntimeException::class.java) {
             runBlocking {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerShould.kt
index 1bbf4d41d0..f0709a6ace 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerShould.kt
@@ -29,34 +29,39 @@ package org.hisp.dhis.android.core.settings.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class SettingsAppInfoManagerShould {
     private val settingsAppInfoCall: SettingsAppInfoCall = mock()
 
     private val settingsAppInfo = SettingsAppVersion.Valid(SettingsAppDataStoreVersion.V1_1, "unknown")
-    private val settingAppInfoSingle: Single<SettingsAppVersion> = Single.just(settingsAppInfo)
 
     private lateinit var manager: SettingsAppInfoManager
 
     @Before
     fun setUp() {
-        whenever(settingsAppInfoCall.fetch(any())) doReturn settingAppInfoSingle
-        manager = SettingsAppInfoManagerImpl(settingsAppInfoCall)
+        settingsAppInfoCall.stub {
+            onBlocking { fetch(any()) } doAnswer {
+                settingsAppInfo
+            }
+            manager = SettingsAppInfoManagerImpl(settingsAppInfoCall)
+        }
     }
 
     @Test
-    fun call_setting_info_only_if_version_is_null() {
-        val version = manager.getDataStoreVersion().blockingGet()!!
+    fun call_setting_info_only_if_version_is_null() = runTest {
+        val version = manager.getDataStoreVersion()
         verify(settingsAppInfoCall).fetch(any())
         assertThat(version).isEquivalentAccordingToCompareTo(settingsAppInfo.dataStore)
 
-        val cached = manager.getDataStoreVersion().blockingGet()
+        val cached = manager.getDataStoreVersion()
         verifyNoMoreInteractions(settingsAppInfoCall)
         assertThat(cached).isEquivalentAccordingToCompareTo(settingsAppInfo.dataStore)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
index 811297cbce..1091b110c7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
@@ -28,8 +28,9 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
 import org.junit.Before
@@ -37,31 +38,34 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.Mockito
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class SynchronizationSettingCallShould {
 
     private val handler: SynchronizationSettingHandler = mock()
     private val service: SettingAppService = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
     private val generalSettingCall: GeneralSettingCall = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
     private val dataSetSettingCall: DataSetSettingCall = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
     private val programSettingCall: ProgramSettingCall = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
     private val appVersionManager: SettingsAppInfoManager = mock()
 
     private val synchronizationSettings: SynchronizationSettings = mock()
-    private val synchronizationSettingSingle: Single<SynchronizationSettings> = Single.just(synchronizationSettings)
 
     private lateinit var synchronizationSettingCall: SynchronizationSettingCall
 
     @Before
     fun setUp() {
-        whenever(service.synchronizationSettings(any())) doReturn synchronizationSettingSingle
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
+        whenAPICall { synchronizationSettings }
+        appVersionManager.stub {
+            onBlocking { getDataStoreVersion() } doReturn SettingsAppDataStoreVersion.V1_1
+        }
         synchronizationSettingCall = SynchronizationSettingCall(
             handler,
             service,
-            apiCallExecutor,
+            coroutineAPICallExecutor,
             generalSettingCall,
             dataSetSettingCall,
             programSettingCall,
@@ -69,39 +73,47 @@ class SynchronizationSettingCallShould {
         )
     }
 
+    private fun whenAPICall(answer: Answer<SynchronizationSettings>) {
+        service.stub {
+            onBlocking { synchronizationSettings(any()) }.doAnswer(answer)
+        }
+    }
+
     @Test
-    fun call_dataSet_and_program_endpoints_if_version_1() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V1_1)
+    fun call_dataSet_and_program_endpoints_if_version_1() = runTest {
+        whenever(appVersionManager.getDataStoreVersion()) doReturn SettingsAppDataStoreVersion.V1_1
 
-        synchronizationSettingCall.getCompletable(false).blockingAwait()
+        synchronizationSettingCall.download(false)
 
-        verify(generalSettingCall.fetch(any(), any())).blockingGet()
-        verify(dataSetSettingCall.fetch(any())).blockingGet()
-        verify(programSettingCall.fetch(any())).blockingGet()
+        verify(generalSettingCall.fetch(any(), any()))
+        verify(dataSetSettingCall.fetch(any()))
+        verify(programSettingCall.fetch(any()))
         verify(service, never()).synchronizationSettings(any())
     }
 
     @Test
-    fun call_synchronization_endpoint_if_version_2() {
-        whenever(apiCallExecutor.wrapSingle(synchronizationSettingSingle, false)) doReturn
-            synchronizationSettingSingle
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V2_0)
+    fun call_synchronization_endpoint_if_version_2() = runTest {
+        whenever(service.synchronizationSettings(any())) doReturn synchronizationSettings
+
+        whenever(appVersionManager.getDataStoreVersion()) doReturn SettingsAppDataStoreVersion.V2_0
+
+        synchronizationSettingCall.download(false)
+
+        verify(generalSettingCall.fetch(any(), any()), never())
+
+        verify(dataSetSettingCall.fetch(any()), never())
 
-        synchronizationSettingCall.getCompletable(false).blockingAwait()
+        verify(programSettingCall.fetch(any()), never())
 
-        verify(generalSettingCall.fetch(any(), any()), never()).blockingGet()
-        verify(dataSetSettingCall.fetch(any()), never()).blockingGet()
-        verify(programSettingCall.fetch(any()), never()).blockingGet()
         verify(service).synchronizationSettings(any())
     }
 
     @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(appVersionManager.getDataStoreVersion()) doReturn Single.just(SettingsAppDataStoreVersion.V2_0)
-        whenever(apiCallExecutor.wrapSingle(synchronizationSettingSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_empty_collection_if_not_found() = runTest {
+        whenever(appVersionManager.getDataStoreVersion()) doReturn SettingsAppDataStoreVersion.V2_0
+        whenever(service.synchronizationSettings(any())) doAnswer { throw D2ErrorSamples.notFound() }
 
-        synchronizationSettingCall.getCompletable(false).blockingAwait()
+        synchronizationSettingCall.download(false)
 
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt
index 9971cd4b3c..aa6f43f266 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCallShould.kt
@@ -28,8 +28,9 @@
 package org.hisp.dhis.android.core.usecase.stock
 
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
 import org.hisp.dhis.android.core.maintenance.D2ErrorSamples
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseCall
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseHandler
@@ -38,28 +39,35 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.mockito.stubbing.Answer
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class StockUseCaseCallShould {
     private val handler: StockUseCaseHandler = mock()
     private val service: StockUseCaseService = mock()
-    private val stockUseCaseSingle: Single<List<InternalStockUseCase>> = mock()
-    private val apiCallExecutor: RxAPICallExecutor = mock()
+    private val stockUseCase: List<InternalStockUseCase> = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutorMock = CoroutineAPICallExecutorMock()
 
     private lateinit var stockUseCaseCall: StockUseCaseCall
 
     @Before
     fun setUp() {
-        whenever(service.stockUseCases()) doReturn stockUseCaseSingle
-        stockUseCaseCall = StockUseCaseCall(handler, service, apiCallExecutor)
+        whenAPICall { stockUseCase }
+        stockUseCaseCall = StockUseCaseCall(handler, service, coroutineAPICallExecutor)
+    }
+
+    private fun whenAPICall(answer: Answer<List<InternalStockUseCase>>) {
+        service.stub {
+            onBlocking { stockUseCases() }.doAnswer(answer)
+        }
     }
 
     @Test
-    fun default_to_empty_collection_if_not_found() {
-        whenever(apiCallExecutor.wrapSingle(stockUseCaseSingle, false)) doReturn
-            Single.error(D2ErrorSamples.notFound())
+    fun default_to_empty_collection_if_not_found() = runTest {
+        whenever(service.stockUseCases()) doAnswer { throw D2ErrorSamples.notFound() }
 
-        stockUseCaseCall.getCompletable(false).blockingAwait()
+        stockUseCaseCall.download(false)
 
         verify(handler).handleMany(emptyList())
         verifyNoMoreInteractions(handler)

From b2ebdd1610a601d49183c70c411d94c18a6fa6ae Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 5 Oct 2023 09:29:22 +0200
Subject: [PATCH 396/478] [ANDROSDK-1751] Modify assertions in unit tests

---
 .../settings/internal/SettingsAppInfoCallShould.kt   | 10 +++-------
 .../internal/SynchronizationSettingCallShould.kt     | 12 ++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
index c76cccda67..fe99bdab98 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCallShould.kt
@@ -117,25 +117,21 @@ class SettingsAppInfoCallShould {
         whenever(service.info()) doAnswer { throw D2ErrorSamples.notFound() }
         whenever(service.generalSettings(any())) doAnswer { throw D2ErrorSamples.get() }
 
-        val exception = assertThrows(RuntimeException::class.java) {
+        assertThrows(D2Error::class.java) {
             runBlocking {
                 dataSetSettingCall.fetch(false)
             }
         }
-
-        assertThat(exception.cause).isInstanceOf(D2Error::class.java)
     }
 
     @Test
     fun throws_D2_exception_if_other_error_than_not_found_in_info() = runTest {
-        whenever(service.generalSettings(any())) doAnswer { throw D2ErrorSamples.get() }
+        whenever(service.info()) doAnswer { throw D2ErrorSamples.get() }
 
-        val exception = assertThrows(RuntimeException::class.java) {
+        assertThrows(D2Error::class.java) {
             runBlocking {
                 dataSetSettingCall.fetch(false)
             }
         }
-
-        assertThat(exception.cause).isInstanceOf(D2Error::class.java)
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
index 1091b110c7..f948a403e8 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCallShould.kt
@@ -85,9 +85,9 @@ class SynchronizationSettingCallShould {
 
         synchronizationSettingCall.download(false)
 
-        verify(generalSettingCall.fetch(any(), any()))
-        verify(dataSetSettingCall.fetch(any()))
-        verify(programSettingCall.fetch(any()))
+        verify(generalSettingCall).fetch(any(), any())
+        verify(dataSetSettingCall).fetch(any())
+        verify(programSettingCall).fetch(any())
         verify(service, never()).synchronizationSettings(any())
     }
 
@@ -99,11 +99,11 @@ class SynchronizationSettingCallShould {
 
         synchronizationSettingCall.download(false)
 
-        verify(generalSettingCall.fetch(any(), any()), never())
+        verify(generalSettingCall, never()).fetch(any(), any())
 
-        verify(dataSetSettingCall.fetch(any()), never())
+        verify(dataSetSettingCall, never()).fetch(any())
 
-        verify(programSettingCall.fetch(any()), never())
+        verify(programSettingCall, never()).fetch(any())
 
         verify(service).synchronizationSettings(any())
     }

From 8dbeb83994f61755151586779369b2f864ddefa1 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 5 Oct 2023 10:38:55 +0200
Subject: [PATCH 397/478] [ANDROSDK-1751] Refactor UseCaseModuleDownloader

---
 .../android/core/domain/metadata/MetadataCall.kt     |  2 +-
 .../android/core/usecase/UseCaseModuleDownloader.kt  | 12 ++++--------
 .../core/domain/metadata/MetadataCallShould.kt       |  3 +--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 247c2d7345..5969691e1b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -128,7 +128,7 @@ internal class MetadataCall @Inject constructor(
         systemSettingDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(SystemSetting::class.java, false))
 
-        useCaseDownloader.downloadMetadata().blockingAwait()
+        useCaseDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(StockUseCase::class.java, false))
 
         constantModuleDownloader.downloadMetadata()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
index 50c12720d7..959785281f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
@@ -28,20 +28,16 @@
 package org.hisp.dhis.android.core.usecase
 
 import dagger.Reusable
-import io.reactivex.Completable
-import kotlinx.coroutines.rx2.rxCompletable
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseCall
 import javax.inject.Inject
 
 @Reusable
 internal class UseCaseModuleDownloader @Inject constructor(
     private val stockUseCaseCall: StockUseCaseCall,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return rxCompletable {
-            stockUseCaseCall.download(false)
-        }
+    override suspend fun downloadMetadata() {
+        return stockUseCaseCall.download(false)
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 00e8b65bbc..65f442f925 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -111,9 +111,8 @@ class MetadataCallShould : BaseCallShould() {
             onBlocking { downloadMetadata() }.doReturn(Unit)
         }
         useCaseModuleDownloader.stub {
-            onBlocking { downloadMetadata() }.doReturn(Completable.complete())
+            onBlocking { downloadMetadata() }.doReturn(Unit)
         }
-        whenever(useCaseModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
         userDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(user)
         }

From 9ad2255b3f78c856ff3b1a6e98ee2be65dd83e43 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 5 Oct 2023 14:00:07 +0200
Subject: [PATCH 398/478] [ANDROSDK-1751] Wrap thrown exception in base call

---
 .../core/settings/internal/AnalyticsSettingCall.kt   |  2 +-
 .../core/settings/internal/AppearanceSettingCall.kt  |  2 +-
 .../core/settings/internal/BaseSettingCall.kt        | 12 ++++++++++--
 .../core/settings/internal/DataSetSettingCall.kt     |  2 +-
 .../core/settings/internal/GeneralSettingCall.kt     |  2 +-
 .../core/settings/internal/LatestAppVersionCall.kt   |  2 +-
 .../core/settings/internal/ProgramSettingCall.kt     |  2 +-
 .../settings/internal/SynchronizationSettingCall.kt  |  2 +-
 .../core/usecase/stock/internal/StockUseCaseCall.kt  |  2 +-
 9 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index 11e7a2985b..5fb21a0252 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -46,7 +46,7 @@ internal class AnalyticsSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<AnalyticsSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<AnalyticsSettings, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<AnalyticsSettings, D2Error> {
         return when (val version = appVersionManager.getDataStoreVersion()) {
             SettingsAppDataStoreVersion.V1_1 -> {
                 Result.Failure(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index 2c2423f256..6150b28d08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -46,7 +46,7 @@ internal class AppearanceSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<AppearanceSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<AppearanceSettings, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<AppearanceSettings, D2Error> {
         return when (val version = appVersionManager.getDataStoreVersion()) {
             SettingsAppDataStoreVersion.V1_1 -> {
                 Result.Failure(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
index 1098736aba..505a28737d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/BaseSettingCall.kt
@@ -49,13 +49,21 @@ internal abstract class BaseSettingCall<T> internal constructor(
         )
     }
 
+    suspend fun fetch(storeError: Boolean): Result<T, D2Error> {
+        return try {
+            tryFetch(storeError)
+        } catch (d2Error: D2Error) {
+            Result.Failure(d2Error)
+        }
+    }
+
     private fun isExpectedError(throwable: D2Error): Boolean {
         return throwable.httpErrorCode() == HttpURLConnection.HTTP_NOT_FOUND ||
             throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_SUPPORTED ||
             throwable.errorCode() == D2ErrorCode.SETTINGS_APP_NOT_INSTALLED
     }
 
-    abstract suspend fun fetch(storeError: Boolean): Result<T, D2Error>
+    protected abstract suspend fun tryFetch(storeError: Boolean): Result<T, D2Error>
 
-    abstract fun process(item: T?)
+    protected abstract fun process(item: T?)
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index 948f5ea753..4f79a49d5b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -42,7 +42,7 @@ internal class DataSetSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<DataSetSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<DataSetSettings, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<DataSetSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.dataSetSettings(appVersionManager.getDataStoreVersion())
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index e0432f5f4c..6443e00e30 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -44,7 +44,7 @@ internal class GeneralSettingCall @Inject constructor(
 
     private var cachedValue: GeneralSettings? = null
 
-    override suspend fun fetch(storeError: Boolean): Result<GeneralSettings, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<GeneralSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.generalSettings(appVersionManager.getDataStoreVersion())
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index 2141803b54..0640909566 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -42,7 +42,7 @@ internal class LatestAppVersionCall @Inject constructor(
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : BaseSettingCall<LatestAppVersion>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<LatestAppVersion, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<LatestAppVersion, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) { settingAppService.latestAppVersion() }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index 901234c300..b137c9c7bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -42,7 +42,7 @@ internal class ProgramSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<ProgramSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<ProgramSettings, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<ProgramSettings, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) {
             settingAppService.programSettings(
                 appVersionManager.getDataStoreVersion(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index 10963d9b3e..55e8e2ee00 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -48,7 +48,7 @@ internal class SynchronizationSettingCall @Inject constructor(
     private val appVersionManager: SettingsAppInfoManager,
 ) : BaseSettingCall<SynchronizationSettings>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<SynchronizationSettings, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<SynchronizationSettings, D2Error> {
         return when (val version = appVersionManager.getDataStoreVersion()) {
             SettingsAppDataStoreVersion.V1_1 -> {
                 val generalSettings = tryOrNull(generalSettingCall.fetch(storeError, acceptCache = true))
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index b5c73322be..7f036ed508 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -42,7 +42,7 @@ internal class StockUseCaseCall @Inject constructor(
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : BaseSettingCall<List<InternalStockUseCase>>(coroutineAPICallExecutor) {
 
-    override suspend fun fetch(storeError: Boolean): Result<List<InternalStockUseCase>, D2Error> {
+    override suspend fun tryFetch(storeError: Boolean): Result<List<InternalStockUseCase>, D2Error> {
         return coroutineAPICallExecutor.wrap(storeError = storeError) { stockUseCaseService.stockUseCases() }
     }
 

From 29cbe503551746e423a26d08e1874b2ae8e31b73 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 08:28:16 +0200
Subject: [PATCH 399/478] [ANDROSDK-1728] Fix attribute order

---
 ...llectionRepositoryMockIntegrationShould.kt | 11 ++++++++
 .../search/TrackedEntitySearchItemHelper.kt   | 25 +++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
index e577ca2c17..024bba6925 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -81,4 +81,15 @@ class TrackedEntitySearchCollectionRepositoryMockIntegrationShould : BaseMockInt
         assertThat(trackedEntityInstances[0].header).isEqualTo("4081507, befryEfXge5")
         assertThat(trackedEntityInstances[1].header).isEqualTo("654321, 0.0")
     }
+
+    @Test
+    fun should_return_ordered_attributes() {
+        val trackedEntity = d2.trackedEntityModule().trackedEntitySearch()
+            .uid("nWrB0TfWlvh")
+            .blockingGet()
+
+        assertThat(trackedEntity).isNotNull()
+        assertThat(trackedEntity!!.attributeValues!![0].attribute).isEqualTo("cejWyOfXge6")
+        assertThat(trackedEntity.attributeValues!![1].attribute).isEqualTo("aejWyOfXge6")
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
index b2fbebe6c5..54790f1ff2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -46,7 +46,7 @@ object TrackedEntitySearchItemHelper {
             lastUpdatedAtClient = i.lastUpdatedAtClient(),
             organisationUnit = i.organisationUnit(),
             geometry = i.geometry(),
-            attributeValues = i.trackedEntityAttributeValues()?.mapNotNull { from(it, attributes) },
+            attributeValues = fromAttributes(attributes, i.trackedEntityAttributeValues()),
             syncState = i.syncState(),
             aggregatedSyncState = i.aggregatedSyncState(),
             deleted = i.deleted() ?: false,
@@ -71,18 +71,27 @@ object TrackedEntitySearchItemHelper {
             .build()
     }
 
-    private fun from(
-        a: TrackedEntityAttributeValue,
+    private fun fromAttributes(
         attributes: List<SimpleTrackedEntityAttribute>,
+        attributeValues: List<TrackedEntityAttributeValue>?
+    ): List<TrackedEntitySearchItemAttribute> {
+        return attributes.mapNotNull { attribute ->
+            from(attribute, attributeValues)
+        }
+    }
+
+    private fun from(
+        attribute: SimpleTrackedEntityAttribute,
+        attributeValues: List<TrackedEntityAttributeValue>?,
     ): TrackedEntitySearchItemAttribute? {
-        return attributes.find { it.attribute == a.trackedEntityAttribute() }?.let { attribute ->
+        return attributeValues?.find { it.trackedEntityAttribute() == attribute.attribute }?.let { value ->
             TrackedEntitySearchItemAttribute(
-                attribute = a.trackedEntityAttribute()!!,
+                attribute = attribute.attribute,
                 displayName = attribute.displayName,
                 displayFormName = attribute.displayFormName ?: attribute.displayName,
-                value = a.value(),
-                created = a.created(),
-                lastUpdated = a.lastUpdated(),
+                value = value.value(),
+                created = value.created(),
+                lastUpdated = value.lastUpdated(),
                 valueType = attribute.valueType,
                 displayInList = attribute.displayInList,
                 optionSet = attribute.optionSet,

From f0ddf489ac49eddf1c919e691aa422df74f6ecfc Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 08:50:57 +0200
Subject: [PATCH 400/478] [ANDROSDK-1765] Fix nestedField string generation

---
 .../core/arch/api/fields/internal/FieldsConverter.java     | 7 +++----
 .../arch/api/fields/internal/FieldsConverterShould.java    | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverter.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverter.java
index f6d1c0dbed..befe7c2c09 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverter.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverter.java
@@ -77,10 +77,9 @@ private static void append(StringBuilder builder, List<Property> properties) {
 
                     // close property array
                     builder.append(']');
-
-                    if (propertyIterator.hasNext()) {
-                        builder.append(',');
-                    }
+                }
+                if (propertyIterator.hasNext()) {
+                    builder.append(',');
                 }
             } else {
                 throw new IllegalArgumentException("Unsupported type of Property: " +
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverterShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverterShould.java
index 9e0cf4ba3a..a943cab06f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverterShould.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/api/fields/internal/FieldsConverterShould.java
@@ -144,11 +144,14 @@ public void respect_fields_order_with_nested_fields() throws IOException {
                 Fields.builder().fields(id, programsWithChildrenWithChildren).build());
         String queryStringFive = fieldsConverter.convert(
                 Fields.builder().fields(id, programsWithChildrenWithChildren, displayName).build());
+        String queryStringSix = fieldsConverter.convert(
+                Fields.builder().fields(id, programs, displayName).build());
 
         assertThat(queryStringOne).isEqualTo("id,displayName,programs");
         assertThat(queryStringTwo).isEqualTo("id,displayName,programs[id,displayName]");
         assertThat(queryStringThree).isEqualTo("id,programs[id,displayName],displayName");
         assertThat(queryStringFour).isEqualTo("id,programs[id,displayName,programs[id,displayName]]");
         assertThat(queryStringFive).isEqualTo("id,programs[id,displayName,programs[id,displayName]],displayName");
+        assertThat(queryStringSix).isEqualTo("id,programs,displayName");
     }
 }

From b3fc2df8ad7e31b4c076328c70271c95cb7bc920 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 08:54:50 +0200
Subject: [PATCH 401/478] [ANDROSDK-1728] Ktlint

---
 .../core/trackedentity/search/TrackedEntitySearchItemHelper.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
index 54790f1ff2..6995e3381d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -73,7 +73,7 @@ object TrackedEntitySearchItemHelper {
 
     private fun fromAttributes(
         attributes: List<SimpleTrackedEntityAttribute>,
-        attributeValues: List<TrackedEntityAttributeValue>?
+        attributeValues: List<TrackedEntityAttributeValue>?,
     ): List<TrackedEntitySearchItemAttribute> {
         return attributes.mapNotNull { attribute ->
             from(attribute, attributeValues)

From 62d31496d215d9764ea43d3128a26a50644cb674 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 10:54:22 +0200
Subject: [PATCH 402/478] [ANDROSDK-1745] Query /events endpoint in first place
 if eventStatus is defined

---
 .../NewTrackedEntityEndpointCallFactory.kt    |  5 +-
 .../TrackedEntityInstanceQueryCallFactory.kt  |  5 +-
 .../TrackedEntityInstanceQueryOnline.kt       |  9 +++-
 .../TrackedEntityInstanceQueryOnlineHelper.kt | 47 +++++--------------
 4 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index 0a3163cb3f..0fc57778a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -96,10 +96,7 @@ internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
     }
 
     override suspend fun getQueryCall(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
-        val shouldCallEventsFirst = query.dataValueFilter.isNotEmpty() ||
-            query.dueStartDate != null || query.dueEndDate != null
-
-        return if (shouldCallEventsFirst) {
+        return if (query.shouldCallEventFirst()) {
             val events = getEventQuery(query)
             if (events.isEmpty()) {
                 TrackerQueryResult(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index ead7375fc0..37f2afeb5c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -59,10 +59,7 @@ internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
     }
 
     private suspend fun queryTrackedEntityInstances(query: TrackedEntityInstanceQueryOnline): TrackerQueryResult {
-        val shouldCallEventsFirst = query.dataValueFilter.isNotEmpty() ||
-            query.dueStartDate != null || query.dueEndDate != null
-
-        return if (shouldCallEventsFirst) {
+        return if (query.shouldCallEventFirst()) {
             val events = getEventQuery(query)
             if (events.isEmpty()) {
                 TrackerQueryResult(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
index 5a3a802690..f3b054a852 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
@@ -64,4 +64,11 @@ internal data class TrackedEntityInstanceQueryOnline(
     val lastUpdatedStartDate: Date? = null,
     val lastUpdatedEndDate: Date? = null,
     val order: String? = null,
-)
+) {
+    fun shouldCallEventFirst(): Boolean {
+        return dataValueFilter.isNotEmpty() ||
+            dueStartDate != null ||
+            dueEndDate != null ||
+            eventStatus != null
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index d1291a3645..3d39351aac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -27,17 +27,13 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.call.queries.internal.BaseQuery
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
-import org.hisp.dhis.android.core.common.DateFilterPeriod
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
 import org.hisp.dhis.android.core.common.FilterOperatorsHelper
 import org.hisp.dhis.android.core.event.EventStatus
-import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import java.util.Date
 import javax.inject.Inject
 
 internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
@@ -45,14 +41,14 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
 ) {
 
     fun fromScope(scope: TrackedEntityInstanceQueryRepositoryScope): List<TrackedEntityInstanceQueryOnline> {
-        return if (scope.eventFilters().isEmpty()) {
+        val queries = if (scope.eventFilters().isEmpty()) {
             listOf(getBaseQuery(scope))
         } else {
             scope.eventFilters().map { eventFilter ->
                 getBaseQuery(scope)
                     .run {
                         eventFilter.eventStatus()
-                            ?.let { copy(eventStatus = getEventStatus(it, eventFilter.eventDate())) } ?: this
+                            ?.let { copy(eventStatus = getEventStatus(it)) } ?: this
                     }
                     .run {
                         eventFilter.assignedUserMode()?.let { copy(assignedUserMode = it) } ?: this
@@ -70,28 +66,13 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
                     }
             }
         }
-    }
-
-    @Throws(D2Error::class, Exception::class)
-    fun queryOnlineBlocking(
-        trackerParentCallFactory: TrackerParentCallFactory,
-        scope: TrackedEntityInstanceQueryRepositoryScope,
-    ): List<TrackedEntityInstance> {
-        return fromScope(scope).foldRight(emptyList()) { queryOnline, acc ->
-            val noPagingQuery = queryOnline.copy(paging = false)
-            val pageInstances = runBlocking {
-                trackerParentCallFactory.getTrackedEntityCall()
-                    .getQueryCall(noPagingQuery)
-            }
-
-            val validInstances = pageInstances.trackedEntities.filter { tei ->
-                val isExcluded = scope.excludedUids()?.contains(tei.uid()) ?: false
-                val isAlreadyReturned = acc.any { it.uid() == tei.uid() }
 
-                !isExcluded && !isAlreadyReturned
+        return queries.map { query ->
+            if (query.eventStatus == EventStatus.SCHEDULE && query.dueStartDate == null) {
+                query.copy(dueStartDate = Date())
+            } else {
+                query
             }
-
-            acc + validInstances
         }
     }
 
@@ -128,7 +109,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
                     programEndDate = scope.programDate()?.let { dateFilterPeriodHelper.getEndDate(it) },
                     incidentStartDate = scope.incidentDate()?.let { dateFilterPeriodHelper.getStartDate(it) },
                     incidentEndDate = scope.incidentDate()?.let { dateFilterPeriodHelper.getEndDate(it) },
-                    eventStatus = scope.eventStatus()?.let { getEventStatus(it, scope.eventDate()) },
+                    eventStatus = scope.eventStatus()?.let { getEventStatus(it) },
                     assignedUserMode = assignedUserMode,
                     programStage = scope.programStage(),
                     eventStartDate = scope.eventDate()?.let { dateFilterPeriodHelper.getStartDate(it) },
@@ -140,15 +121,9 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
         }
     }
 
-    private fun getEventStatus(eventStatus: List<EventStatus>, eventDate: DateFilterPeriod?): EventStatus? {
+    private fun getEventStatus(eventStatus: List<EventStatus>): EventStatus? {
         // EventStatus does not accepts a list of status but a single value in web API.
-        // Additionally, it requires that eventStartDate and eventEndDate are defined.
-        val hasEventDate = eventDate?.startDate() != null && eventDate.endDate() != null
-        return if (eventStatus.isNotEmpty() && hasEventDate) {
-            eventStatus[0]
-        } else {
-            null
-        }
+        return eventStatus.firstOrNull()
     }
 
     private fun toAPIOrderFormat(orders: List<TrackedEntityInstanceQueryScopeOrderByItem>): String? {

From f7285c02ccccacc66b61a6be0c85c643f0adc88a Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 11:33:59 +0200
Subject: [PATCH 403/478] [ANDROSDK-1745] Query local database using event
 status even if eventDate is not defined

---
 ...llectionRepositoryMockIntegrationShould.kt | 11 ++++++++++
 .../TrackedEntityInstanceLocalQueryHelper.kt  | 15 +++++++-------
 .../TrackedEntityInstanceQueryOnlineHelper.kt |  1 +
 ...kedEntityInstanceLocalQueryHelperShould.kt | 20 ++++---------------
 .../TrackedEntityInstanceQueryCallShould.kt   | 12 ++++++-----
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index e27edbc019..1ee1370db7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.testapp.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
@@ -175,4 +176,14 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
         // Undo change
         d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "IpHINAT79UW", "DiszpKrYNg8")
     }
+
+    @Test
+    fun find_by_event_status() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
+            .byProgram().eq("IpHINAT79UW")
+            .byEventStatus().eq(EventStatus.COMPLETED)
+            .blockingGet()
+
+        assertThat(trackedEntityInstances.size).isEqualTo(1)
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
index 3d25a0a8e7..f2676c418e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
@@ -201,7 +201,7 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
     private fun hasEvent(scope: TrackedEntityInstanceQueryRepositoryScope): Boolean {
         return scope.eventFilters().isNotEmpty() || scope.dataValue().isNotEmpty() || scope.programStage() != null ||
             scope.eventDate() != null || scope.dueDate() != null || scope.eventCreatedDate() != null ||
-            scope.assignedUserMode() != null
+            scope.assignedUserMode() != null || !scope.eventStatus().isNullOrEmpty()
     }
 
     @Suppress("LongMethod")
@@ -438,25 +438,23 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
             appendEventDates(where, eventDate, EventTableInfo.Columns.EVENT_DATE)
             appendEventDates(where, dueDate, EventTableInfo.Columns.DUE_DATE)
             appendEventDates(where, eventCreatedDate, EventTableInfo.Columns.CREATED)
-        } else if (eventStatusList.isNotEmpty() && eventDate != null) {
+        } else if (eventStatusList.isNotEmpty()) {
             val nowStr = DateUtils.SIMPLE_DATE_FORMAT.format(Date())
             val statusListWhere = WhereClauseBuilder()
             for (eventStatus in eventStatusList) {
                 val statusWhere = WhereClauseBuilder()
                 when (eventStatus) {
                     EventStatus.ACTIVE -> {
-                        appendEventDates(statusWhere, eventDate, EventTableInfo.Columns.EVENT_DATE)
+                        statusWhere.appendIsNotNullValue(EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendInKeyEnumValues(
                             dot(eventAlias, EventTableInfo.Columns.STATUS),
                             listOf(EventStatus.ACTIVE, EventStatus.SCHEDULE, EventStatus.OVERDUE),
                         )
                     }
                     EventStatus.COMPLETED, EventStatus.VISITED -> {
-                        appendEventDates(statusWhere, eventDate, EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendKeyStringValue(dot(eventAlias, EventTableInfo.Columns.STATUS), eventStatus)
                     }
                     EventStatus.SCHEDULE -> {
-                        appendEventDates(statusWhere, eventDate, EventTableInfo.Columns.DUE_DATE)
                         statusWhere.appendIsNullValue(EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendInKeyEnumValues(
                             dot(eventAlias, EventTableInfo.Columns.STATUS),
@@ -468,7 +466,6 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                         )
                     }
                     EventStatus.OVERDUE -> {
-                        appendEventDates(statusWhere, eventDate, EventTableInfo.Columns.DUE_DATE)
                         statusWhere.appendIsNullValue(EventTableInfo.Columns.EVENT_DATE)
                         statusWhere.appendInKeyEnumValues(
                             dot(eventAlias, EventTableInfo.Columns.STATUS),
@@ -481,9 +478,13 @@ internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
                     }
                     EventStatus.SKIPPED -> {
                         statusWhere.appendKeyStringValue(dot(eventAlias, EventTableInfo.Columns.STATUS), eventStatus)
-                        appendEventDates(statusWhere, eventDate, EventTableInfo.Columns.DUE_DATE)
                     }
                 }
+                val eventDateComparisonColum = when (eventStatus) {
+                    EventStatus.ACTIVE, EventStatus.COMPLETED -> EventTableInfo.Columns.EVENT_DATE
+                    else -> EventTableInfo.Columns.DUE_DATE
+                }
+                appendEventDates(statusWhere, eventDate, eventDateComparisonColum)
                 appendEventDates(statusWhere, dueDate, EventTableInfo.Columns.DUE_DATE)
                 appendEventDates(statusWhere, eventCreatedDate, EventTableInfo.Columns.CREATED)
                 statusListWhere.appendOrComplexQuery(statusWhere.build())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index 3d39351aac..bff411024d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -40,6 +40,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
     private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
 
+    @Suppress("ComplexMethod")
     fun fromScope(scope: TrackedEntityInstanceQueryRepositoryScope): List<TrackedEntityInstanceQueryOnline> {
         val queries = if (scope.eventFilters().isEmpty()) {
             listOf(getBaseQuery(scope))
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt
index 0fa6fca11e..a957fcec5b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperShould.kt
@@ -170,19 +170,7 @@ class TrackedEntityInstanceLocalQueryHelperShould {
     }
 
     @Test
-    fun build_sql_query_with_event_status_only_if_event_dates_defined() {
-        val eventFilterWithoutDates = TrackedEntityInstanceQueryEventFilter.builder()
-            .eventStatus(listOf(EventStatus.ACTIVE)).build()
-
-        val scopeWithoutDates = queryBuilder
-            .program(programUid)
-            .eventFilters(listOf(eventFilterWithoutDates))
-            .build()
-
-        val query1 = localQueryHelper.getSqlQuery(scopeWithoutDates, emptySet(), 50)
-
-        assertThat(query1).doesNotContain("ACTIVE")
-
+    fun build_sql_query_with_event_dates() {
         val eventFilterWithDates = TrackedEntityInstanceQueryEventFilter.builder()
             .eventDate(
                 DateFilterPeriod.builder()
@@ -198,10 +186,10 @@ class TrackedEntityInstanceLocalQueryHelperShould {
             .eventFilters(listOf(eventFilterWithDates))
             .build()
 
-        val query2 = localQueryHelper.getSqlQuery(scopeWithDates, emptySet(), 50)
+        val query = localQueryHelper.getSqlQuery(scopeWithDates, emptySet(), 50)
 
-        assertThat(query2).contains("ACTIVE")
-        assertThat(query2).contains("eventDate")
+        assertThat(query).contains("ACTIVE")
+        assertThat(query).contains("eventDate")
     }
 
     @Test
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index 4df0fd4649..f96d4397b6 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -95,7 +95,6 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             programEndDate = Date(),
             enrollmentStatus = EnrollmentStatus.ACTIVE,
             followUp = true,
-            eventStatus = EventStatus.OVERDUE,
             incidentStartDate = Date(),
             incidentEndDate = Date(),
             trackedEntityType = "teiTypeStr",
@@ -187,7 +186,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
 
         callFactory.getCall(activeQuery)
 
-        verifyService(activeQuery, EventStatus.ACTIVE)
+        verifyEventService(activeQuery, EventStatus.ACTIVE)
     }
 
     @Test
@@ -197,12 +196,12 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
         callFactory.getCall(activeQuery)
 
-        verifyService(activeQuery, EventStatus.VISITED)
+        verifyEventService(activeQuery, EventStatus.VISITED)
 
         val nonActiveQuery = query.copy(eventStatus = EventStatus.SCHEDULE)
         callFactory.getCall(nonActiveQuery)
 
-        verifyService(activeQuery, EventStatus.SCHEDULE)
+        verifyEventService(activeQuery, EventStatus.SCHEDULE)
     }
 
     @Test
@@ -283,7 +282,10 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         )
     }
 
-    private fun verifyEventService(query: TrackedEntityInstanceQueryOnline) {
+    private fun verifyEventService(
+        query: TrackedEntityInstanceQueryOnline,
+        expectedStatus: EventStatus? = query.eventStatus,
+    ) {
         if (query.orgUnits.size <= 1) {
             verifyEventServiceForOrgunit(query, query.orgUnits.firstOrNull())
         } else {

From de34c25cb64ffea432f0dcb75e11a559aa7eff8a Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 13:25:22 +0200
Subject: [PATCH 404/478] [ANDROSDK-1767] Reinforce isLogged method

---
 .../core/MetadataCallRealIntegrationShould.kt |  8 +++-
 ....java => IsUserLoggedInCallableFactory.kt} | 40 +++++++------------
 .../internal/IsUserLoggedInCallableShould.kt  | 18 +++++++--
 3 files changed, 35 insertions(+), 31 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{IsUserLoggedInCallableFactory.java => IsUserLoggedInCallableFactory.kt} (73%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt
index 253c9bae3d..e5437c7099 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core
 import android.util.Log
 import io.reactivex.schedulers.Schedulers
 import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.data.server.RealServerMother
 import org.hisp.dhis.android.core.user.User
 
 class MetadataCallRealIntegrationShould : BaseRealIntegrationTest() {
@@ -58,9 +59,12 @@ class MetadataCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     fun response_successful_on_sync_meta_data_once() {
-        d2.userModule().logIn(username, password, url).blockingGet()
+        d2.userModule().logIn(username, password, url)
+            .flatMapObservable { log -> d2.metadataModule().download() }
+            .subscribeOn(Schedulers.io())
+            .subscribe()
 
-        d2.metadataModule().blockingDownload()
+        Thread.sleep(60000)
 
         // TODO: add additional sync + break point.
         // when debugger stops at the new break point manually change metadata online & resume.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt
index 036760262e..19c0d8ff11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt
@@ -25,28 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore;
-
-import javax.inject.Inject;
-
-import io.reactivex.Single;
-
-final class IsUserLoggedInCallableFactory {
-
-    @NonNull
-    private final CredentialsSecureStore credentialsSecureStore;
-
-    @Inject
-    IsUserLoggedInCallableFactory(@NonNull CredentialsSecureStore credentialsSecureStore) {
-        this.credentialsSecureStore = credentialsSecureStore;
-    }
-
-    Single<Boolean> isLogged() {
-        return Single.fromCallable(() -> credentialsSecureStore.get() != null);
-    }
-}
\ No newline at end of file
+package org.hisp.dhis.android.core.user.internal
+
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
+import javax.inject.Inject
+
+internal class IsUserLoggedInCallableFactory @Inject constructor(
+    private val credentialsSecureStore: CredentialsSecureStore,
+    private val authenticatedUserStore: AuthenticatedUserStore,
+) {
+    val isLogged: Single<Boolean>
+        get() = Single.fromCallable {
+            credentialsSecureStore.get() != null && authenticatedUserStore.isReady
+        }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableShould.kt
index c745d92472..c1ab354db1 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
+import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
@@ -41,15 +42,16 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class IsUserLoggedInCallableShould {
     private val credentialsSecureStore: CredentialsSecureStore = mock()
+    private val authenticatedUserStore: AuthenticatedUserStore = mock()
     private val credentials: Credentials = mock()
 
     private lateinit var isUserLoggedInSingle: Single<Boolean>
 
     @Before
     fun setUp() {
-        whenever(credentials.username).thenReturn("user")
-        whenever(credentials.password).thenReturn("password")
-        isUserLoggedInSingle = IsUserLoggedInCallableFactory(credentialsSecureStore).isLogged
+        whenever(credentials.username).doReturn("user")
+        whenever(credentials.password).doReturn("password")
+        isUserLoggedInSingle = IsUserLoggedInCallableFactory(credentialsSecureStore, authenticatedUserStore).isLogged
     }
 
     @Test
@@ -57,9 +59,17 @@ class IsUserLoggedInCallableShould {
         assertThat(isUserLoggedInSingle.blockingGet()).isFalse()
     }
 
+    @Test
+    fun return_false_if_database_is_not_ready() {
+        whenever(credentialsSecureStore.get()).doReturn(credentials)
+        whenever(authenticatedUserStore.isReady).doReturn(false)
+        assertThat(isUserLoggedInSingle.blockingGet()).isFalse()
+    }
+
     @Test
     fun return_true_if_credentials_stored() {
-        whenever(credentialsSecureStore.get()).thenReturn(credentials)
+        whenever(credentialsSecureStore.get()).doReturn(credentials)
+        whenever(authenticatedUserStore.isReady).doReturn(true)
         assertThat(isUserLoggedInSingle.blockingGet()).isTrue()
     }
 }

From f656707f8eb92a9e0b3e6a4620ffa84e65997a23 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 13:43:26 +0200
Subject: [PATCH 405/478] [ANDROSDK-1767] Ktlint

---
 .../android/core/MetadataCallRealIntegrationShould.kt     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt
index e5437c7099..253c9bae3d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MetadataCallRealIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core
 import android.util.Log
 import io.reactivex.schedulers.Schedulers
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.data.server.RealServerMother
 import org.hisp.dhis.android.core.user.User
 
 class MetadataCallRealIntegrationShould : BaseRealIntegrationTest() {
@@ -59,12 +58,9 @@ class MetadataCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
     fun response_successful_on_sync_meta_data_once() {
-        d2.userModule().logIn(username, password, url)
-            .flatMapObservable { log -> d2.metadataModule().download() }
-            .subscribeOn(Schedulers.io())
-            .subscribe()
+        d2.userModule().logIn(username, password, url).blockingGet()
 
-        Thread.sleep(60000)
+        d2.metadataModule().blockingDownload()
 
         // TODO: add additional sync + break point.
         // when debugger stops at the new break point manually change metadata online & resume.

From 417b0dc7c768d01654d4c0ae57ef31b9cc868323 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 15:03:51 +0200
Subject: [PATCH 406/478] [ANDROSDK-1766] Replace missing values depending on
 value type

---
 ...itySearchCollectionRepositoryMockIntegrationShould.kt | 2 +-
 .../internal/expression/CommonExpressionVisitor.kt       | 9 +++++++--
 .../core/parser/internal/expression/ParserUtils.kt       | 1 +
 .../parser/internal/service/dataitem/DimensionalItem.kt  | 3 ++-
 .../internal/dataitem/ProgramItemAttribute.kt            | 2 +-
 .../internal/dataitem/ProgramItemStageElement.kt         | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
index 024bba6925..d32dee167d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -79,7 +79,7 @@ class TrackedEntitySearchCollectionRepositoryMockIntegrationShould : BaseMockInt
             .blockingGet()
 
         assertThat(trackedEntityInstances[0].header).isEqualTo("4081507, befryEfXge5")
-        assertThat(trackedEntityInstances[1].header).isEqualTo("654321, 0.0")
+        assertThat(trackedEntityInstances[1].header).isEqualTo("654321, ")
     }
 
     @Test
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt
index dec4451709..b06d502472 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonExpressionVisitor.kt
@@ -31,6 +31,7 @@ import org.antlr.v4.runtime.ParserRuleContext
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine.IndicatorContext
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
+import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
@@ -173,11 +174,15 @@ internal class CommonExpressionVisitor constructor(
      * @param value the (possibly null) value
      * @return the value we should return.
      */
-    fun handleNulls(value: Any?): Any? {
+    fun handleNulls(value: Any?, valueType: ValueType?): Any? {
         if (state.replaceNulls) {
             state.itemsFound = state.itemsFound + 1
             if (value == null) {
-                return ParserUtils.DOUBLE_VALUE_IF_NULL
+                return if ((valueType ?: ValueType.NUMBER).isNumeric) {
+                    ParserUtils.DOUBLE_VALUE_IF_NULL
+                } else {
+                    ParserUtils.TEXT_VALUE_IF_NULL
+                }
             } else {
                 state.itemValuesFound = state.itemValuesFound + 1
                 if (isZeroOrPositive(value.toString())) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
index 38352e0e74..dbe9b1c711 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/ParserUtils.kt
@@ -47,6 +47,7 @@ import kotlin.math.roundToInt
 
 internal object ParserUtils {
     const val DOUBLE_VALUE_IF_NULL = 0.0
+    const val TEXT_VALUE_IF_NULL = ""
     private const val NUMERIC_REGEXP = "^(-?0|-?[1-9]\\d*)(\\.\\d+)?(E(-)?\\d+)?$"
     private val NUMERIC_PATTERN = Pattern.compile(NUMERIC_REGEXP)
     private const val DEFAULT_DATE_FORMAT = "yyyy-MM-dd"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItem.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItem.kt
index cfc9055996..e666b57a47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItem.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/dataitem/DimensionalItem.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.parser.internal.service.dataitem
 
+import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils.DOUBLE_VALUE_IF_NULL
@@ -49,7 +50,7 @@ internal abstract class DimensionalItem : ExpressionItem {
 
     override fun evaluate(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
         val value = visitor.itemValueMap[getId(ctx)]
-        return visitor.handleNulls(value)!!
+        return visitor.handleNulls(value, ValueType.NUMBER)!!
     }
 
     override fun regenerate(ctx: ExprContext, visitor: CommonExpressionVisitor): Any {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt
index 1bc0cdf8db..60cf5aa9d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemAttribute.kt
@@ -50,7 +50,7 @@ internal class ProgramItemAttribute : ProgramExpressionItem() {
         val attribute = getAttribute(visitor, attributeUid)
 
         val value = attributeValue?.value()
-        val handledValue = visitor.handleNulls(value)
+        val handledValue = visitor.handleNulls(value, attribute.valueType())
         val strValue = handledValue?.toString()
 
         return formatValue(strValue, attribute.valueType())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt
index 3d04900b3f..af04e1ac7e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/dataitem/ProgramItemStageElement.kt
@@ -59,7 +59,7 @@ internal class ProgramItemStageElement : ProgramExpressionItem() {
         }
 
         val dataElement = getDataElement(visitor, dataElementId)
-        val handledValue = visitor.handleNulls(value)
+        val handledValue = visitor.handleNulls(value, dataElement.valueType())
         val strValue = handledValue?.toString()
 
         return formatValue(strValue, dataElement.valueType())

From 220d3050b1179d4a0f0b24656907a7481e79e25b Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 17:38:40 +0200
Subject: [PATCH 407/478] [ANDROSDK-1745] Remove outdated tests

---
 .../TrackedEntityInstanceQueryCallShould.kt   | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index f96d4397b6..0b4fdb5afd 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -179,31 +179,6 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
         callFactory.getCall(query)
     }
 
-    @Test
-    fun should_not_map_active_event_status_if_greater_than_2_33() = runTest {
-        whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(true)
-        val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
-
-        callFactory.getCall(activeQuery)
-
-        verifyEventService(activeQuery, EventStatus.ACTIVE)
-    }
-
-    @Test
-    fun should_map_active_event_status_if_not_greater_than_2_33() = runTest {
-        whenever(dhisVersionManager.isGreaterThan(DHISVersion.V2_33)).doReturn(false)
-
-        val activeQuery = query.copy(eventStatus = EventStatus.ACTIVE)
-        callFactory.getCall(activeQuery)
-
-        verifyEventService(activeQuery, EventStatus.VISITED)
-
-        val nonActiveQuery = query.copy(eventStatus = EventStatus.SCHEDULE)
-        callFactory.getCall(nonActiveQuery)
-
-        verifyEventService(activeQuery, EventStatus.SCHEDULE)
-    }
-
     @Test
     fun should_query_events_if_data_value_filter() = runTest {
         val events = listOf(
@@ -284,7 +259,6 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
 
     private fun verifyEventService(
         query: TrackedEntityInstanceQueryOnline,
-        expectedStatus: EventStatus? = query.eventStatus,
     ) {
         if (query.orgUnits.size <= 1) {
             verifyEventServiceForOrgunit(query, query.orgUnits.firstOrNull())

From 8e31114efbd8cfb9906a25db63c9d695ae6760dd Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Sat, 7 Oct 2023 11:41:01 +0200
Subject: [PATCH 408/478] [ANDROSDK-1768] Refactor settings ObjectRepository

---
 ...gsObjectRepositoryMockIntegrationShould.kt |  62 ++---
 .../AnalyticsDhisVisualizationsHelper.kt      |   6 +-
 ...sVisualizationsSettingObjectRepository.kt} |  63 ++---
 .../AnalyticsSettingObjectRepository.java     |  84 -------
 .../AnalyticsSettingObjectRepository.kt       |  60 +++++
 .../AppearanceSettingsObjectRepository.java   | 220 ------------------
 .../AppearanceSettingsObjectRepository.kt     | 172 ++++++++++++++
 ...ava => DataSetSettingsObjectRepository.kt} |  73 +++---
 ...java => GeneralSettingObjectRepository.kt} |  77 +++---
 ...ava => ProgramSettingsObjectRepository.kt} |  73 +++---
 ...ynchronizationSettingObjectRepository.java |  80 -------
 .../SynchronizationSettingObjectRepository.kt |  60 +++++
 ...y.java => UserSettingsObjectRepository.kt} |  48 ++--
 13 files changed, 447 insertions(+), 631 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{AnalyticsDhisVisualizationsSettingObjectRepository.java => AnalyticsDhisVisualizationsSettingObjectRepository.kt} (53%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{DataSetSettingsObjectRepository.java => DataSetSettingsObjectRepository.kt} (55%)
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{GeneralSettingObjectRepository.java => GeneralSettingObjectRepository.kt} (51%)
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{ProgramSettingsObjectRepository.java => ProgramSettingsObjectRepository.kt} (55%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/{UserSettingsObjectRepository.java => UserSettingsObjectRepository.kt} (65%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
index af851a3936..84336ae881 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
@@ -47,89 +47,89 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
 
     @Test
     fun should_return_only_homeFilters() {
-        val homeFilters = d2.settingModule().appearanceSettings().homeFilters
-        assertThat(homeFilters.size).isEqualTo(4)
-        assertThat(homeFilters[HomeFilter.DATE]!!.filter()).isEqualTo(true)
+        val homeFilters = d2.settingModule().appearanceSettings().getHomeFilters()
+        assertThat(homeFilters?.size).isEqualTo(4)
+        assertThat(homeFilters!![HomeFilter.DATE]!!.filter()).isEqualTo(true)
     }
 
     @Test
     fun should_return_only_dataSetFilters_for_specific_uid() {
         val specificFilters = d2.settingModule().appearanceSettings().getDataSetFiltersByUid(program3)
-        assertThat(specificFilters.size).isEqualTo(5)
-        assertThat(specificFilters[DataSetFilter.SYNC_STATUS]!!.uid()).isEqualTo(program3)
+        assertThat(specificFilters?.size).isEqualTo(5)
+        assertThat(specificFilters!![DataSetFilter.SYNC_STATUS]!!.uid()).isEqualTo(program3)
     }
 
     @Test
     fun should_return_only_programFilters_for_specific_uid() {
         val specificFilters = d2.settingModule().appearanceSettings().getProgramFiltersByUid(program1)
-        assertThat(specificFilters.size).isEqualTo(7)
-        assertThat(specificFilters[ProgramFilter.ENROLLMENT_STATUS]!!.uid()).isEqualTo(program1)
+        assertThat(specificFilters?.size).isEqualTo(7)
+        assertThat(specificFilters!![ProgramFilter.ENROLLMENT_STATUS]!!.uid()).isEqualTo(program1)
     }
 
     @Test
     fun should_return_global_program_configuration_setting() {
-        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
-        assertThat(setting.uid()).isNull()
-        assertThat(setting.completionSpinner()).isEqualTo(true)
-        assertThat(setting.optionalSearch()).isNull()
+                val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
+        assertThat(setting?.uid()).isNull()
+        assertThat(setting?.completionSpinner()).isEqualTo(true)
+        assertThat(setting?.optionalSearch()).isNull()
     }
 
     @Test
     fun should_return_global_completion_spinner_settings() {
-        val completionSpinner = d2.settingModule().appearanceSettings().globalCompletionSpinner
-        assertThat(completionSpinner.uid()).isNull()
-        assertThat(completionSpinner.visible()).isEqualTo(true)
+        val completionSpinner = d2.settingModule().appearanceSettings().getGlobalCompletionSpinner()
+        assertThat(completionSpinner?.uid()).isNull()
+        assertThat(completionSpinner?.visible()).isEqualTo(true)
     }
 
     @Test
     fun should_return_program_configuration_setting_for_specific_uid() {
         val setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
-        assertThat(setting.uid()).isEqualTo(program1)
-        assertThat(setting.completionSpinner()).isEqualTo(true)
-        assertThat(setting.optionalSearch()).isEqualTo(true)
+        assertThat(setting?.uid()).isEqualTo(program1)
+        assertThat(setting?.completionSpinner()).isEqualTo(true)
+        assertThat(setting?.optionalSearch()).isEqualTo(true)
     }
 
     @Test
     fun should_return_completion_spinner_settings_for_specific_uid() {
         val completionSpinner = d2.settingModule().appearanceSettings().getCompletionSpinnerByUid(program1)
-        assertThat(completionSpinner.uid()).isEqualTo(program1)
-        assertThat(completionSpinner.visible()).isEqualTo(true)
+        assertThat(completionSpinner?.uid()).isEqualTo(program1)
+        assertThat(completionSpinner?.visible()).isEqualTo(true)
     }
 
     @Test
     fun should_return_disable_referrals_settings() {
-        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
-        assertThat(setting.disableReferrals()).isEqualTo(true)
+        val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
+        assertThat(setting?.disableReferrals()).isEqualTo(true)
 
         val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
-        assertThat(program1Setting.disableReferrals()).isEqualTo(true)
+        assertThat(program1Setting?.disableReferrals()).isEqualTo(true)
 
         val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
-        assertThat(program2Setting.disableReferrals()).isEqualTo(false)
+        assertThat(program2Setting?.disableReferrals()).isEqualTo(false)
     }
 
     @Test
     fun should_return_collapsibleSections_settings() {
-        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
-        assertThat(setting.disableCollapsibleSections()).isEqualTo(false)
+        val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
+        assertThat(setting?.disableCollapsibleSections()).isEqualTo(false)
 
         val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
-        assertThat(program1Setting.disableCollapsibleSections()).isEqualTo(false)
+        assertThat(program1Setting?.disableCollapsibleSections()).isEqualTo(false)
 
         val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
-        assertThat(program2Setting.disableCollapsibleSections()).isEqualTo(true)
+        assertThat(program2Setting?.disableCollapsibleSections()).isEqualTo(true)
     }
 
     @Test
     fun should_return_program_indicator_header_settings() {
-        val setting = d2.settingModule().appearanceSettings().globalProgramConfigurationSetting
-        assertThat(setting.itemHeader()?.programIndicator()).isNull()
+        val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
+        assertThat(setting?.itemHeader()?.programIndicator()).isNull()
 
         val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
-        assertThat(program1Setting.itemHeader()?.programIndicator()).isEqualTo("kALwOyvVvdT")
+        assertThat(program1Setting?.itemHeader()?.programIndicator()).isEqualTo("kALwOyvVvdT")
 
         val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
-        assertThat(program2Setting.itemHeader()?.programIndicator()).isNull()
+        assertThat(program2Setting?.itemHeader()?.programIndicator()).isNull()
     }
 
     companion object {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
index af5427af59..102fea675e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsHelper.kt
@@ -35,8 +35,10 @@ import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationScope.PROGR
 fun generateGroups(
     analyticsDhisVisualizations: List<AnalyticsDhisVisualization>,
 ): AnalyticsDhisVisualizationsSetting {
-    val visualizationsByScope: Map<AnalyticsDhisVisualizationScope?, List<AnalyticsDhisVisualization>> =
-        analyticsDhisVisualizations.groupBy { it.scope() }
+    val visualizationsByScope: Map<AnalyticsDhisVisualizationScope, List<AnalyticsDhisVisualization>> =
+        analyticsDhisVisualizations
+            .filter { it.scope() != null }
+            .groupBy { it.scope()!! }
 
     return AnalyticsDhisVisualizationsSetting
         .builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
similarity index 53%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
index bbb61f1f17..006e4069fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
@@ -25,56 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.settings
 
-package org.hisp.dhis.android.core.settings;
-
-import static org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationsHelperKt.generateGroups;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore;
-import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
+import dagger.Reusable
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
+import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall
+import javax.inject.Inject
 
 @Reusable
-public class AnalyticsDhisVisualizationsSettingObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsDhisVisualizationsSetting>
-        implements ReadOnlyWithDownloadObjectRepository<AnalyticsDhisVisualizationsSetting> {
-
-    private final AnalyticsDhisVisualizationStore analyticsDhisVisualizationStore;
-
-    @Inject
-    public AnalyticsDhisVisualizationsSettingObjectRepository(
-            AnalyticsDhisVisualizationStore analyticsDhisVisualizationStore,
-            AnalyticsSettingCall analyticsSettingCall) {
-        super(analyticsSettingCall);
-        this.analyticsDhisVisualizationStore = analyticsDhisVisualizationStore;
-    }
-
-    public Single<List<AnalyticsDhisVisualizationsGroup>> getByProgram(String program) {
-        return Single.just(blockingGetByProgram(program));
+class AnalyticsDhisVisualizationsSettingObjectRepository @Inject internal constructor(
+    private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore,
+    analyticsSettingCall: AnalyticsSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsDhisVisualizationsSetting>(analyticsSettingCall),
+    ReadOnlyWithDownloadObjectRepository<AnalyticsDhisVisualizationsSetting> {
+    fun getByProgram(program: String?): Single<List<AnalyticsDhisVisualizationsGroup>> {
+        return Single.just(blockingGetByProgram(program))
     }
 
-    public List<AnalyticsDhisVisualizationsGroup> blockingGetByProgram(String program) {
-        return generateGroups(analyticsDhisVisualizationStore.selectAll()).program().get(program);
+    fun blockingGetByProgram(program: String?): List<AnalyticsDhisVisualizationsGroup>? {
+        return generateGroups(analyticsDhisVisualizationStore.selectAll()).program()[program]
     }
 
-    public Single<List<AnalyticsDhisVisualizationsGroup>> getByDataSet(String dataSet) {
-        return Single.just(blockingGetByProgram(dataSet));
+    fun getByDataSet(dataSet: String?): Single<List<AnalyticsDhisVisualizationsGroup>> {
+        return Single.just(blockingGetByProgram(dataSet))
     }
 
-    public List<AnalyticsDhisVisualizationsGroup> blockingByDataSet(String dataSet) {
-        return generateGroups(analyticsDhisVisualizationStore.selectAll()).dataSet().get(dataSet);
+    fun blockingByDataSet(dataSet: String?): List<AnalyticsDhisVisualizationsGroup>? {
+        return generateGroups(analyticsDhisVisualizationStore.selectAll()).dataSet()[dataSet]
     }
 
-    @Override
-    public AnalyticsDhisVisualizationsSetting blockingGet() {
-        return generateGroups(analyticsDhisVisualizationStore.selectAll());
+    override fun blockingGet(): AnalyticsDhisVisualizationsSetting {
+        return generateGroups(analyticsDhisVisualizationStore.selectAll())
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.java
deleted file mode 100644
index f002ba1249..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.java
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public class AnalyticsSettingObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsSettings>
-        implements ReadOnlyWithDownloadObjectRepository<AnalyticsSettings> {
-
-    private final AnalyticsTeiSettingCollectionRepository analyticsTeiSettingRepository;
-
-    private final AnalyticsDhisVisualizationsSettingObjectRepository analyticsDhisVisualizationsSettingObjectRepository;
-
-    @Inject
-    AnalyticsSettingObjectRepository(
-            AnalyticsTeiSettingCollectionRepository analyticsTeiSettingRepository,
-            AnalyticsSettingCall analyticsSettingCall,
-            AnalyticsDhisVisualizationsSettingObjectRepository analyticsDhisVisualizationsSettingObjectRepository
-    ) {
-        super(analyticsSettingCall);
-        this.analyticsTeiSettingRepository = analyticsTeiSettingRepository;
-        this.analyticsDhisVisualizationsSettingObjectRepository = analyticsDhisVisualizationsSettingObjectRepository;
-    }
-
-    @Override
-    public AnalyticsSettings blockingGet() {
-        List<AnalyticsTeiSetting> analyticsTeiSettings = analyticsTeiSettingRepository.blockingGet();
-        AnalyticsDhisVisualizationsSetting analyticsDhisVisualizationsSetting =
-                analyticsDhisVisualizationsSettingObjectRepository.blockingGet();
-
-        if (analyticsTeiSettings.isEmpty()) {
-            return null;
-        } else {
-            return AnalyticsSettings.builder()
-                    .tei(analyticsTeiSettings)
-                    .dhisVisualizations(analyticsDhisVisualizationsSetting)
-                    .build();
-        }
-    }
-
-    public AnalyticsTeiSettingCollectionRepository teis() {
-        return analyticsTeiSettingRepository;
-    }
-
-    public AnalyticsDhisVisualizationsSettingObjectRepository visualizationsSettings() {
-        return analyticsDhisVisualizationsSettingObjectRepository;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
new file mode 100644
index 0000000000..86a7e597ef
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall
+import javax.inject.Inject
+
+@Reusable
+class AnalyticsSettingObjectRepository @Inject internal constructor(
+    private val analyticsTeiSettingRepository: AnalyticsTeiSettingCollectionRepository,
+    analyticsSettingCall: AnalyticsSettingCall,
+    private val analyticsDhisVisualizationsSettingObjectRepository: AnalyticsDhisVisualizationsSettingObjectRepository
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsSettings>(analyticsSettingCall),
+    ReadOnlyWithDownloadObjectRepository<AnalyticsSettings> {
+    override fun blockingGet(): AnalyticsSettings? {
+        val analyticsTeiSettings = analyticsTeiSettingRepository.blockingGet()
+        val analyticsDhisVisualizationsSetting = analyticsDhisVisualizationsSettingObjectRepository.blockingGet()
+
+        return AnalyticsSettings.builder()
+            .tei(analyticsTeiSettings)
+            .dhisVisualizations(analyticsDhisVisualizationsSetting)
+            .build()
+    }
+
+    fun teis(): AnalyticsTeiSettingCollectionRepository {
+        return analyticsTeiSettingRepository
+    }
+
+    fun visualizationsSettings(): AnalyticsDhisVisualizationsSettingObjectRepository {
+        return analyticsDhisVisualizationsSettingObjectRepository
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java
deleted file mode 100644
index 38e25241ce..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.AppearanceSettingCall;
-import org.hisp.dhis.android.core.settings.internal.FilterSettingStore;
-import org.hisp.dhis.android.core.settings.internal.ProgramConfigurationSettingStore;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public class AppearanceSettingsObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<AppearanceSettings>
-        implements ReadOnlyWithDownloadObjectRepository<AppearanceSettings> {
-
-    private final FilterSettingStore filterSettingStore;
-    private final ProgramConfigurationSettingStore programConfigurationSettingStore;
-
-    @Inject
-    AppearanceSettingsObjectRepository(FilterSettingStore filterSettingStore,
-                                       ProgramConfigurationSettingStore programConfigurationSettingStore,
-                                       AppearanceSettingCall appearanceSettingCall) {
-        super(appearanceSettingCall);
-        this.filterSettingStore = filterSettingStore;
-        this.programConfigurationSettingStore = programConfigurationSettingStore;
-    }
-
-    @Override
-    public AppearanceSettings blockingGet() {
-        List<FilterSetting> filters = filterSettingStore.selectAll();
-        List<ProgramConfigurationSetting> programConfigurationSettingList =
-                programConfigurationSettingStore.selectAll();
-
-        if (filters.isEmpty() && programConfigurationSettingList.isEmpty()) {
-            return null;
-        }
-
-        //FilterSorting
-        FilterSorting filterSorting = FilterSorting.builder()
-                .home(getHomeFilters(filters))
-                .dataSetSettings(getDataSetFilters(filters))
-                .programSettings(getProgramFilters(filters))
-                .build();
-
-        //ProgramConfigurationSettings
-        ProgramConfigurationSettings programConfigurationSettings = ProgramConfigurationSettings.builder()
-                .globalSettings(AppearanceSettingsHelper.getGlobal(programConfigurationSettingList))
-                .specificSettings(AppearanceSettingsHelper.getSpecifics(programConfigurationSettingList))
-                .build();
-
-        return AppearanceSettings.builder()
-                .filterSorting(filterSorting)
-                .programConfiguration(programConfigurationSettings)
-                .completionSpinner(AppearanceSettingsHelper.programToCompletionSpinner(programConfigurationSettings))
-                .build();
-    }
-
-    public Map<HomeFilter, FilterSetting> getHomeFilters() {
-        return blockingGet().filterSorting().home();
-    }
-
-    public Map<DataSetFilter, FilterSetting> getDataSetFiltersByUid(String uid) {
-        Map<DataSetFilter, FilterSetting> filters = blockingGet()
-                .filterSorting()
-                .dataSetSettings()
-                .specificSettings()
-                .get(uid);
-        if (filters == null) {
-            filters = blockingGet().filterSorting().dataSetSettings().globalSettings();
-        }
-        return filters;
-    }
-
-    public Map<ProgramFilter, FilterSetting> getTrackedEntityTypeFilters() {
-        return blockingGet().filterSorting().programSettings().globalSettings();
-    }
-
-    public Map<ProgramFilter, FilterSetting> getProgramFiltersByUid(String uid) {
-        Map<ProgramFilter, FilterSetting> filters = blockingGet()
-                .filterSorting()
-                .programSettings()
-                .specificSettings()
-                .get(uid);
-        if (filters == null) {
-            filters = blockingGet().filterSorting().programSettings().globalSettings();
-        }
-        return filters;
-    }
-
-    private Map<HomeFilter, FilterSetting> getHomeFilters(List<FilterSetting> filters) {
-        Map<HomeFilter, FilterSetting> homeFilters = new HashMap<>();
-        for (FilterSetting filter : filters) {
-            if (Objects.equals(filter.scope(), HomeFilter.class.getSimpleName())) {
-                homeFilters.put(HomeFilter.valueOf(filter.filterType()), filter);
-            }
-        }
-        return homeFilters;
-    }
-
-    private DataSetFilters getDataSetFilters(List<FilterSetting> filters) {
-        Map<DataSetFilter, FilterSetting> globalDataSetFilters = new HashMap<>();
-        Map<String, Map<DataSetFilter, FilterSetting>> specificDataSetFilters = new HashMap<>();
-        for (FilterSetting filter : filters) {
-            if (Objects.equals(filter.scope(), DataSetFilter.class.getSimpleName())) {
-                if (filter.uid() == null) {
-                    globalDataSetFilters.put(DataSetFilter.valueOf(filter.filterType()), filter);
-                } else {
-                    Map<DataSetFilter, FilterSetting> uidFilters = specificDataSetFilters.get(filter.uid());
-                    if (uidFilters == null) {
-                        specificDataSetFilters.put(filter.uid(), createRegistryForSpecificDataSetFilters(filter));
-                    } else {
-                        uidFilters.put(DataSetFilter.valueOf(filter.filterType()), filter);
-                    }
-                }
-            }
-        }
-
-        DataSetFilters.Builder dataSetScopeBuilder = DataSetFilters.builder();
-        dataSetScopeBuilder.globalSettings(globalDataSetFilters);
-        dataSetScopeBuilder.specificSettings(specificDataSetFilters);
-        return dataSetScopeBuilder.build();
-    }
-
-    private Map<DataSetFilter, FilterSetting> createRegistryForSpecificDataSetFilters(FilterSetting filter) {
-        Map<DataSetFilter, FilterSetting> dataSetFilters = new HashMap<>();
-        dataSetFilters.put(DataSetFilter.valueOf(filter.filterType()), filter);
-        return dataSetFilters;
-    }
-
-    private ProgramFilters getProgramFilters(List<FilterSetting> filters) {
-        Map<ProgramFilter, FilterSetting> globalDataSetFilters = new HashMap<>();
-        Map<String, Map<ProgramFilter, FilterSetting>> specificDataSetFilters = new HashMap<>();
-        for (FilterSetting filter : filters) {
-            if (Objects.equals(filter.scope(), ProgramFilter.class.getSimpleName())) {
-                if (filter.uid() == null) {
-                    globalDataSetFilters.put(ProgramFilter.valueOf(filter.filterType()), filter);
-                } else {
-                    Map<ProgramFilter, FilterSetting> uidFilters = specificDataSetFilters.get(filter.uid());
-                    if (uidFilters == null) {
-                        specificDataSetFilters.put(filter.uid(), createRegistryForSpecificProgramFilters(filter));
-                    } else {
-                        uidFilters.put(ProgramFilter.valueOf(filter.filterType()), filter);
-                    }
-                }
-            }
-        }
-
-        ProgramFilters.Builder dataSetScopeBuilder = ProgramFilters.builder();
-        dataSetScopeBuilder.globalSettings(globalDataSetFilters);
-        dataSetScopeBuilder.specificSettings(specificDataSetFilters);
-        return dataSetScopeBuilder.build();
-    }
-
-    private Map<ProgramFilter, FilterSetting> createRegistryForSpecificProgramFilters(FilterSetting filter) {
-        Map<ProgramFilter, FilterSetting> programFilters = new HashMap<>();
-        programFilters.put(ProgramFilter.valueOf(filter.filterType()), filter);
-        return programFilters;
-    }
-
-    public ProgramConfigurationSetting getGlobalProgramConfigurationSetting() {
-        List<ProgramConfigurationSetting> programSettingList = programConfigurationSettingStore.selectAll();
-        return AppearanceSettingsHelper.getGlobal(programSettingList);
-    }
-
-    @Deprecated
-    public CompletionSpinner getGlobalCompletionSpinner() {
-        ProgramConfigurationSetting setting = getGlobalProgramConfigurationSetting();
-        return AppearanceSettingsHelper.toCompletionSpinner(setting);
-    }
-
-    public ProgramConfigurationSetting getProgramConfigurationByUid(String uid) {
-        List<ProgramConfigurationSetting> programSettingList = programConfigurationSettingStore.selectAll();
-        ProgramConfigurationSetting result = AppearanceSettingsHelper.getSpecifics(programSettingList).get(uid);
-        if (result == null) {
-            result = getGlobalProgramConfigurationSetting();
-        }
-        return result;
-    }
-
-    @Deprecated
-    public CompletionSpinner getCompletionSpinnerByUid(String uid) {
-        ProgramConfigurationSetting setting = getProgramConfigurationByUid(uid);
-        return AppearanceSettingsHelper.toCompletionSpinner(setting);
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
new file mode 100644
index 0000000000..568e2eb187
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
@@ -0,0 +1,172 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.AppearanceSettingsHelper.getGlobal
+import org.hisp.dhis.android.core.settings.AppearanceSettingsHelper.getSpecifics
+import org.hisp.dhis.android.core.settings.AppearanceSettingsHelper.programToCompletionSpinner
+import org.hisp.dhis.android.core.settings.AppearanceSettingsHelper.toCompletionSpinner
+import org.hisp.dhis.android.core.settings.internal.AppearanceSettingCall
+import org.hisp.dhis.android.core.settings.internal.FilterSettingStore
+import org.hisp.dhis.android.core.settings.internal.ProgramConfigurationSettingStore
+import javax.inject.Inject
+
+@Reusable
+class AppearanceSettingsObjectRepository @Inject internal constructor(
+    private val filterSettingStore: FilterSettingStore,
+    private val programConfigurationSettingStore: ProgramConfigurationSettingStore,
+    appearanceSettingCall: AppearanceSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AppearanceSettings>(appearanceSettingCall),
+    ReadOnlyWithDownloadObjectRepository<AppearanceSettings> {
+    override fun blockingGet(): AppearanceSettings? {
+        val filters = filterSettingStore.selectAll()
+        val programConfigurationSettingList = programConfigurationSettingStore.selectAll()
+
+        return if (filters.isEmpty() && programConfigurationSettingList.isEmpty()) {
+            null
+        } else {
+            //FilterSorting
+            val filterSorting = FilterSorting.builder()
+                .home(getHomeFilters(filters))
+                .dataSetSettings(getDataSetFilters(filters))
+                .programSettings(getProgramFilters(filters))
+                .build()
+
+            //ProgramConfigurationSettings
+            val programConfigurationSettings = ProgramConfigurationSettings.builder()
+                .globalSettings(getGlobal(programConfigurationSettingList))
+                .specificSettings(getSpecifics(programConfigurationSettingList))
+                .build()
+
+            AppearanceSettings.builder()
+                .filterSorting(filterSorting)
+                .programConfiguration(programConfigurationSettings)
+                .completionSpinner(programToCompletionSpinner(programConfigurationSettings))
+                .build()
+        }
+    }
+
+    fun getHomeFilters(): Map<HomeFilter, FilterSetting>? {
+        return blockingGet()?.filterSorting()?.home()
+    }
+
+    fun getDataSetFiltersByUid(uid: String?): Map<DataSetFilter, FilterSetting>? {
+        val dataSetSettings = blockingGet()?.filterSorting()?.dataSetSettings()
+
+        return dataSetSettings?.specificSettings()?.get(uid)
+            ?: dataSetSettings?.globalSettings()
+    }
+
+    val trackedEntityTypeFilters: Map<ProgramFilter, FilterSetting>?
+        get() = blockingGet()?.filterSorting()?.programSettings()?.globalSettings()
+
+    fun getProgramFiltersByUid(uid: String?): Map<ProgramFilter, FilterSetting>? {
+        val programFilters = blockingGet()?.filterSorting()?.programSettings()
+
+        return programFilters?.specificSettings()?.get(uid)
+            ?: programFilters?.globalSettings()
+    }
+
+    private fun getHomeFilters(filters: List<FilterSetting>): Map<HomeFilter, FilterSetting> {
+        return filters
+            .filter { it.scope() == HomeFilter::class.java.simpleName }
+            .associateBy { HomeFilter.valueOf(it.filterType()!!) }
+    }
+
+    private fun getDataSetFilters(filters: List<FilterSetting>): DataSetFilters {
+        val dataSetFilters = filters
+            .filter { it.scope() == DataSetFilter::class.java.simpleName }
+
+        val global = dataSetFilters
+            .filter { it.uid() == null }
+            .associateBy { DataSetFilter.valueOf(it.filterType()!!) }
+
+        val specific = dataSetFilters
+            .filter { it.uid() != null }
+            .groupBy { it.uid()!! }
+            .mapValues { entry ->
+                entry.value.associateBy {
+                    DataSetFilter.valueOf(it.filterType()!!)
+                }
+            }
+
+        return DataSetFilters.builder()
+            .globalSettings(global)
+            .specificSettings(specific)
+            .build()
+    }
+
+    private fun getProgramFilters(filters: List<FilterSetting>): ProgramFilters {
+        val programFilters = filters
+            .filter { it.scope() == ProgramFilter::class.java.simpleName }
+
+        val global = programFilters
+            .filter { it.uid() == null }
+            .associateBy { ProgramFilter.valueOf(it.filterType()!!) }
+
+        val specific = programFilters
+            .filter { it.uid() != null }
+            .groupBy { it.uid()!! }
+            .mapValues { entry ->
+                entry.value.associateBy {
+                    ProgramFilter.valueOf(it.filterType()!!)
+                }
+            }
+
+        return ProgramFilters.builder()
+            .globalSettings(global)
+            .specificSettings(specific)
+            .build()
+    }
+
+    fun getGlobalProgramConfigurationSetting(): ProgramConfigurationSetting? {
+        val programSettingList = programConfigurationSettingStore.selectAll()
+        return getGlobal(programSettingList)
+    }
+    @Deprecated("")
+    fun getGlobalCompletionSpinner(): CompletionSpinner? {
+        val setting = getGlobalProgramConfigurationSetting()
+        return toCompletionSpinner(setting)
+    }
+
+    fun getProgramConfigurationByUid(uid: String?): ProgramConfigurationSetting? {
+        val programSettingList = programConfigurationSettingStore.selectAll()
+        var result = getSpecifics(programSettingList)[uid]
+
+        return result ?: getGlobalProgramConfigurationSetting()
+    }
+
+    @Deprecated("")
+    fun getCompletionSpinnerByUid(uid: String?): CompletionSpinner? {
+        val setting = getProgramConfigurationByUid(uid)
+        return toCompletionSpinner(setting)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
index 6da38d9ba4..c5c1f693e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
@@ -25,55 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.settings;
+package org.hisp.dhis.android.core.settings
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.DataSetSettingCall;
-import org.hisp.dhis.android.core.settings.internal.DataSetSettingStore;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.DataSetSettingCall
+import org.hisp.dhis.android.core.settings.internal.DataSetSettingStore
+import javax.inject.Inject
 
 @Reusable
-public class DataSetSettingsObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<DataSetSettings>
-        implements ReadOnlyWithDownloadObjectRepository<DataSetSettings> {
-
-    private final DataSetSettingStore store;
-
-    @Inject
-    DataSetSettingsObjectRepository(DataSetSettingStore store,
-                                    DataSetSettingCall dataSetSettingCall) {
-        super(dataSetSettingCall);
-        this.store = store;
-    }
-
-    @Override
-    public DataSetSettings blockingGet() {
-        List<DataSetSetting> settings = store.selectAll();
-
-        if (settings.isEmpty()) {
-            return null;
-        }
-
-        DataSetSettings.Builder builder = DataSetSettings.builder();
-        Map<String, DataSetSetting> specifics = new HashMap<>();
-
-        for (DataSetSetting dataSetSetting : settings) {
-            if (dataSetSetting.uid() == null) {
-                builder.globalSettings(dataSetSetting);
-            } else {
-                specifics.put(dataSetSetting.uid(), dataSetSetting);
-            }
+class DataSetSettingsObjectRepository @Inject internal constructor(
+    private val store: DataSetSettingStore,
+    dataSetSettingCall: DataSetSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<DataSetSettings>(dataSetSettingCall),
+    ReadOnlyWithDownloadObjectRepository<DataSetSettings> {
+    override fun blockingGet(): DataSetSettings? {
+        val settings = store.selectAll()
+        return if (settings.isEmpty()) {
+            null
+        } else {
+            val specifics = settings
+                .filter { it.uid() != null }
+                .associateBy { it.uid()!! }
+
+            DataSetSettings.builder()
+                .globalSettings(settings.find { it.uid() == null })
+                .specificSettings(specifics)
+                .build()
         }
-        builder.specificSettings(specifics);
-
-        return builder.build();
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
similarity index 51%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
index 0537126954..5917cbe3ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
@@ -25,57 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.settings;
+package org.hisp.dhis.android.core.settings
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall;
-import org.hisp.dhis.android.core.settings.internal.GeneralSettingStore;
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
+import org.hisp.dhis.android.core.settings.internal.GeneralSettingStore
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import javax.inject.Inject
 
 @Reusable
-public class GeneralSettingObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<GeneralSettings>
-        implements ReadOnlyWithDownloadObjectRepository<GeneralSettings> {
-
-    private final GeneralSettingStore store;
-    private final SynchronizationSettingStore syncStore;
-
-    @Inject
-    GeneralSettingObjectRepository(GeneralSettingStore store,
-                                   SynchronizationSettingStore syncStore,
-                                   GeneralSettingCall generalSettingCall) {
-        super(generalSettingCall);
-        this.store = store;
-        this.syncStore = syncStore;
-    }
-
-    @Override
-    public GeneralSettings blockingGet() {
-        List<GeneralSettings> generalSettings = store.selectAll();
-        List<SynchronizationSettings> syncSettings = syncStore.selectAll();
-
-        if (generalSettings.isEmpty() && syncSettings.isEmpty()) {
-            return null;
+class GeneralSettingObjectRepository @Inject internal constructor(
+    private val store: GeneralSettingStore,
+    private val syncStore: SynchronizationSettingStore,
+    generalSettingCall: GeneralSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<GeneralSettings>(generalSettingCall),
+    ReadOnlyWithDownloadObjectRepository<GeneralSettings> {
+    override fun blockingGet(): GeneralSettings? {
+        val generalSettings = store.selectAll()
+        val syncSettings = syncStore.selectAll()
+        return if (generalSettings.isEmpty() && syncSettings.isEmpty()) {
+            null
         } else {
-            GeneralSettings generalSetting = generalSettings.isEmpty() ?
-                    GeneralSettings.builder().build() :
-                    generalSettings.get(0);
-
-            SynchronizationSettings syncSetting = syncSettings.isEmpty() ?
-                    SynchronizationSettings.builder().build() :
-                    syncSettings.get(0);
+            val generalSetting =
+                if (generalSettings.isEmpty()) GeneralSettings.builder().build()
+                else generalSettings[0]
+            val syncSetting =
+                if (syncSettings.isEmpty()) SynchronizationSettings.builder().build()
+                else syncSettings[0]
 
-            return generalSetting.toBuilder()
-                    .dataSync(syncSetting.dataSync())
-                    .metadataSync(syncSetting.metadataSync())
-                    .build();
+            generalSetting.toBuilder()
+                .dataSync(syncSetting.dataSync())
+                .metadataSync(syncSetting.metadataSync())
+                .build()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
similarity index 55%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
index 4efb9e5226..41cf07f572 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
@@ -25,55 +25,34 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.settings;
+package org.hisp.dhis.android.core.settings
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.ProgramSettingCall;
-import org.hisp.dhis.android.core.settings.internal.ProgramSettingStore;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.ProgramSettingCall
+import org.hisp.dhis.android.core.settings.internal.ProgramSettingStore
+import javax.inject.Inject
 
 @Reusable
-public class ProgramSettingsObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<ProgramSettings>
-        implements ReadOnlyWithDownloadObjectRepository<ProgramSettings> {
-
-    private final ProgramSettingStore store;
-
-    @Inject
-    ProgramSettingsObjectRepository(ProgramSettingStore store,
-                                    ProgramSettingCall programSettingCall) {
-        super(programSettingCall);
-        this.store = store;
-    }
-
-    @Override
-    public ProgramSettings blockingGet() {
-        List<ProgramSetting> settings = store.selectAll();
-
-        if (settings.isEmpty()) {
-            return null;
-        }
-
-        ProgramSettings.Builder builder = ProgramSettings.builder();
-        Map<String, ProgramSetting> specifics = new HashMap<>();
-
-        for (ProgramSetting programSetting : settings) {
-            if (programSetting.uid() == null) {
-                builder.globalSettings(programSetting);
-            } else {
-                specifics.put(programSetting.uid(), programSetting);
-            }
+class ProgramSettingsObjectRepository @Inject internal constructor(
+    private val store: ProgramSettingStore,
+    programSettingCall: ProgramSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<ProgramSettings>(programSettingCall),
+    ReadOnlyWithDownloadObjectRepository<ProgramSettings> {
+    override fun blockingGet(): ProgramSettings? {
+        val settings = store.selectAll()
+        return if (settings.isEmpty()) {
+            null
+        } else {
+            val specifics = settings
+                .filter { it.uid() != null }
+                .associateBy { it.uid()!! }
+
+            ProgramSettings.builder()
+                .globalSettings(settings.find { it.uid() == null })
+                .specificSettings(specifics)
+                .build()
         }
-        builder.specificSettings(specifics);
-
-        return builder.build();
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java
deleted file mode 100644
index b37235dc2f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings;
-
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingCall;
-import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public class SynchronizationSettingObjectRepository
-        extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<SynchronizationSettings>
-        implements ReadOnlyWithDownloadObjectRepository<SynchronizationSettings> {
-
-    private final SynchronizationSettingStore syncStore;
-    private final DataSetSettingsObjectRepository dataSetSettingsRepository;
-    private final ProgramSettingsObjectRepository programSettingsRepository;
-
-    @Inject
-    SynchronizationSettingObjectRepository(SynchronizationSettingStore syncStore,
-                                           DataSetSettingsObjectRepository dataSetSettingsRepository,
-                                           ProgramSettingsObjectRepository programSettingsRepository,
-                                           SynchronizationSettingCall synchronizationSettingCall) {
-        super(synchronizationSettingCall);
-        this.syncStore = syncStore;
-        this.dataSetSettingsRepository = dataSetSettingsRepository;
-        this.programSettingsRepository = programSettingsRepository;
-    }
-
-    @Override
-    public SynchronizationSettings blockingGet() {
-        List<SynchronizationSettings> syncSettings = syncStore.selectAll();
-        DataSetSettings dataSetSettings = dataSetSettingsRepository.blockingGet();
-        ProgramSettings programSettings = programSettingsRepository.blockingGet();
-
-        if (syncSettings.isEmpty() && dataSetSettings == null && programSettings == null) {
-            return null;
-        } else {
-            SynchronizationSettings.Builder builder = syncSettings.isEmpty() ?
-                    SynchronizationSettings.builder() :
-                    syncSettings.get(0).toBuilder();
-
-            return builder
-                    .dataSetSettings(dataSetSettings)
-                    .programSettings(programSettings)
-                    .build();
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
new file mode 100644
index 0000000000..95b9888cf0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings
+
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingCall
+import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
+import javax.inject.Inject
+
+@Reusable
+class SynchronizationSettingObjectRepository @Inject internal constructor(
+    private val syncStore: SynchronizationSettingStore,
+    private val dataSetSettingsRepository: DataSetSettingsObjectRepository,
+    private val programSettingsRepository: ProgramSettingsObjectRepository,
+    synchronizationSettingCall: SynchronizationSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<SynchronizationSettings>(synchronizationSettingCall),
+    ReadOnlyWithDownloadObjectRepository<SynchronizationSettings> {
+    override fun blockingGet(): SynchronizationSettings? {
+        val syncSettings = syncStore.selectAll()
+        val dataSetSettings = dataSetSettingsRepository.blockingGet()
+        val programSettings = programSettingsRepository.blockingGet()
+
+        return if (syncSettings.isEmpty() && dataSetSettings == null && programSettings == null) {
+            null
+        } else {
+            val builder = if (syncSettings.isEmpty()) SynchronizationSettings.builder() else syncSettings[0].toBuilder()
+            builder
+                .dataSetSettings(dataSetSettings)
+                .programSettings(programSettings)
+                .build()
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
index 76aade9ad2..ebbece0524 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
@@ -25,40 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.settings;
+package org.hisp.dhis.android.core.settings
 
-import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall;
-import org.hisp.dhis.android.core.settings.internal.UserSettingsStore;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
+import org.hisp.dhis.android.core.settings.internal.UserSettingsStore
+import javax.inject.Inject
 
 @Reusable
-public class UserSettingsObjectRepository extends ReadOnlyAnyObjectWithDownloadRepositoryImpl<UserSettings>
-        implements ReadOnlyWithDownloadObjectRepository<UserSettings> {
-
-    private final UserSettingsStore store;
-
-    @Inject
-    UserSettingsObjectRepository(UserSettingsStore store,
-                                 GeneralSettingCall generalSettingCall) {
-        super(generalSettingCall);
-        this.store = store;
-    }
-
-    @Override
-    public UserSettings blockingGet() {
-        List<UserSettings> settings = store.selectAll();
-
-        if (settings.isEmpty()) {
-            return null;
-        } else {
-            return settings.get(0);
-        }
+class UserSettingsObjectRepository @Inject internal constructor(
+    private val store: UserSettingsStore,
+    generalSettingCall: GeneralSettingCall
+) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<UserSettings>(generalSettingCall),
+    ReadOnlyWithDownloadObjectRepository<UserSettings> {
+    override fun blockingGet(): UserSettings? {
+        return store.selectAll().firstOrNull()
     }
-}
\ No newline at end of file
+}

From dfda58f0f401565b4ee6325bae6bab01943b5b16 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 9 Oct 2023 08:45:04 +0200
Subject: [PATCH 409/478] [ANDROSDK-1768] Refactor user, aggregated
 ObjectRepository

---
 ...ngObjectRepositoryMockIntegrationShould.kt |  14 +-
 ...tCompleteRegistrationObjectRepository.java | 160 ------------------
 ...SetCompleteRegistrationObjectRepository.kt | 136 +++++++++++++++
 .../android/core/datavalue/DataValue.java     |   6 +-
 .../datavalue/DataValueObjectRepository.java  | 127 --------------
 .../datavalue/DataValueObjectRepository.kt    | 119 +++++++++++++
 ...a => AuthenticatedUserObjectRepository.kt} |  44 ++---
 ...epository.java => UserObjectRepository.kt} |  50 +++---
 8 files changed, 311 insertions(+), 345 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
 rename core/src/main/java/org/hisp/dhis/android/core/user/{AuthenticatedUserObjectRepository.java => AuthenticatedUserObjectRepository.kt} (67%)
 rename core/src/main/java/org/hisp/dhis/android/core/user/{UserObjectRepository.java => UserObjectRepository.kt} (63%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
index c9c44b7dc4..193864a33a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
@@ -43,7 +43,7 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
             .settingModule()
             .analyticsSetting()
             .visualizationsSettings()
-            .blockingGet()!!
+            .blockingGet()
 
         assertThat(analyticsDhisVisualizationsSetting.home().size).isEqualTo(2)
         assertThat(analyticsDhisVisualizationsSetting.home().first().visualizations().first().name()).isNotEmpty()
@@ -60,9 +60,9 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
             .visualizationsSettings()
             .blockingGetByProgram("IpHINAT79UW")
 
-        assertThat(programSettings.size).isEqualTo(1)
-        assertThat(programSettings.first().visualizations().size).isEqualTo(2)
-        assertThat(programSettings.first().visualizations().first().uid()).isEqualTo("PYBH8ZaAQnC")
+        assertThat(programSettings?.size).isEqualTo(1)
+        assertThat(programSettings?.first()?.visualizations()?.size).isEqualTo(2)
+        assertThat(programSettings?.first()?.visualizations()?.first()?.uid()).isEqualTo("PYBH8ZaAQnC")
     }
 
     @Test
@@ -73,8 +73,8 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
             .visualizationsSettings()
             .blockingByDataSet("BfMAe6Itzgt")
 
-        assertThat(programSettings.size).isEqualTo(1)
-        assertThat(programSettings.first().visualizations().size).isEqualTo(1)
-        assertThat(programSettings.first().visualizations().first().uid()).isEqualTo("FAFa11yFeFe")
+        assertThat(programSettings?.size).isEqualTo(1)
+        assertThat(programSettings?.first()?.visualizations()?.size).isEqualTo(1)
+        assertThat(programSettings?.first()?.visualizations()?.first()?.uid()).isEqualTo("FAFa11yFeFe")
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.java
deleted file mode 100644
index 1339c40f81..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset;
-
-import android.util.Log;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository;
-
-import java.util.Date;
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public final class DataSetCompleteRegistrationObjectRepository
-        extends ReadOnlyOneObjectRepositoryImpl<DataSetCompleteRegistration,
-        DataSetCompleteRegistrationObjectRepository>
-        implements ReadWriteObjectRepository<DataSetCompleteRegistration> {
-
-    private final DataSetCompleteRegistrationStore dataSetCompleteRegistrationStore;
-    private final UserCredentialsObjectRepository credentialsRepository;
-
-    private final String period;
-    private final String dataSet;
-    private final String organisationUnit;
-    private final String attributeOptionCombo;
-
-    DataSetCompleteRegistrationObjectRepository(
-            final DataSetCompleteRegistrationStore dataSetCompleteRegistrationStore,
-            final UserCredentialsObjectRepository credentialsRepository,
-            final Map<String, ChildrenAppender<DataSetCompleteRegistration>> childrenAppenders,
-            final RepositoryScope scope,
-            final String period,
-            final String organisationUnit,
-            final String dataSet,
-            final String attributeOptionCombo
-            ) {
-        super(dataSetCompleteRegistrationStore, childrenAppenders, scope,
-                s -> new DataSetCompleteRegistrationObjectRepository(
-                        dataSetCompleteRegistrationStore, credentialsRepository, childrenAppenders, s,
-                period, organisationUnit, dataSet, attributeOptionCombo));
-
-        this.dataSetCompleteRegistrationStore = dataSetCompleteRegistrationStore;
-        this.credentialsRepository = credentialsRepository;
-
-        this.period = period;
-        this.dataSet = dataSet;
-        this.organisationUnit = organisationUnit;
-        this.attributeOptionCombo = attributeOptionCombo;
-    }
-
-    public Completable set() {
-        return Completable.fromAction(this::blockingSet);
-    }
-
-    public void blockingSet() {
-        DataSetCompleteRegistration dataSetCompleteRegistration = blockingGetWithoutChildren();
-
-        if (dataSetCompleteRegistration == null) {
-            String username = credentialsRepository.blockingGet().username();
-            dataSetCompleteRegistrationStore.insert(
-                    DataSetCompleteRegistration.builder()
-                            .period(period)
-                            .dataSet(dataSet)
-                            .organisationUnit(organisationUnit)
-                            .attributeOptionCombo(attributeOptionCombo)
-                            .date(new Date())
-                            .storedBy(username)
-                            .syncState(State.TO_POST)
-                            .deleted(false)
-                            .build());
-        } else {
-            DataSetCompleteRegistration newRecord = dataSetCompleteRegistration.toBuilder()
-                    .deleted(false)
-                    .syncState(dataSetCompleteRegistration.syncState() == State.TO_POST ?
-                            State.TO_POST : State.TO_UPDATE)
-                    .build();
-            dataSetCompleteRegistrationStore.updateWhere(newRecord);
-        }
-    }
-
-    @Override
-    public Completable delete() {
-        return Completable.fromAction(this::blockingDelete);
-    }
-
-    @Override
-    public void blockingDelete() throws D2Error {
-        DataSetCompleteRegistration dataSetCompleteRegistration = blockingGetWithoutChildren();
-        if (dataSetCompleteRegistration == null) {
-            throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.CANT_DELETE_NON_EXISTING_OBJECT)
-                    .errorDescription("DataSetCompleteRegistration can't be deleted " +
-                            "because no longer exists")
-                    .build();
-        } else {
-            if (dataSetCompleteRegistration.syncState() == State.TO_POST) {
-                dataSetCompleteRegistrationStore.deleteWhere(dataSetCompleteRegistration);
-            } else {
-                DataSetCompleteRegistration deletedRecord = dataSetCompleteRegistration.toBuilder()
-                        .deleted(true)
-                        .syncState(State.TO_UPDATE)
-                        .build();
-                dataSetCompleteRegistrationStore.updateWhere(deletedRecord);
-            }
-        }
-    }
-
-    @Override
-    public Completable deleteIfExist() {
-        return Completable.fromAction(this::blockingDeleteIfExist);
-    }
-
-    @Override
-    public void blockingDeleteIfExist() {
-        try {
-            blockingDelete();
-        } catch (D2Error d2Error) {
-            Log.v(DataSetCompleteRegistrationObjectRepository.class.getCanonicalName(), d2Error.errorDescription());
-
-        }
-    }
-
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
new file mode 100644
index 0000000000..f70bfc63b1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset
+
+import android.util.Log
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository
+import java.util.Date
+
+class DataSetCompleteRegistrationObjectRepository internal constructor(
+    private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
+    private val credentialsRepository: UserCredentialsObjectRepository,
+    childrenAppenders: Map<String, ChildrenAppender<DataSetCompleteRegistration>>,
+    scope: RepositoryScope,
+    private val period: String,
+    private val organisationUnit: String,
+    private val dataSet: String,
+    private val attributeOptionCombo: String
+) : ReadOnlyOneObjectRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationObjectRepository>(
+    dataSetCompleteRegistrationStore, childrenAppenders, scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        DataSetCompleteRegistrationObjectRepository(
+            dataSetCompleteRegistrationStore, credentialsRepository, childrenAppenders, s,
+            period, organisationUnit, dataSet, attributeOptionCombo
+        )
+    }), ReadWriteObjectRepository<DataSetCompleteRegistration> {
+    fun set(): Completable {
+        return Completable.fromAction { blockingSet() }
+    }
+
+    fun blockingSet() {
+        val dataSetCompleteRegistration = blockingGetWithoutChildren()
+        if (dataSetCompleteRegistration == null) {
+            val username = credentialsRepository.blockingGet()!!.username()
+            dataSetCompleteRegistrationStore.insert(
+                DataSetCompleteRegistration.builder()
+                    .period(period)
+                    .dataSet(dataSet)
+                    .organisationUnit(organisationUnit)
+                    .attributeOptionCombo(attributeOptionCombo)
+                    .date(Date())
+                    .storedBy(username)
+                    .syncState(State.TO_POST)
+                    .deleted(false)
+                    .build()
+            )
+        } else {
+            val syncState =
+                if (dataSetCompleteRegistration.syncState() === State.TO_POST) State.TO_POST
+                else State.TO_UPDATE
+
+            val newRecord = dataSetCompleteRegistration.toBuilder()
+                .deleted(false)
+                .syncState(syncState)
+                .build()
+
+            dataSetCompleteRegistrationStore.updateWhere(newRecord)
+        }
+    }
+
+    override fun delete(): Completable {
+        return Completable.fromAction { blockingDelete() }
+    }
+
+    @Throws(D2Error::class)
+    override fun blockingDelete() {
+        val dataSetCompleteRegistration = blockingGetWithoutChildren()
+        if (dataSetCompleteRegistration == null) {
+            throw D2Error
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.CANT_DELETE_NON_EXISTING_OBJECT)
+                .errorDescription(
+                    "DataSetCompleteRegistration can't be deleted because no longer exists"
+                )
+                .build()
+        } else {
+            if (dataSetCompleteRegistration.syncState() === State.TO_POST) {
+                dataSetCompleteRegistrationStore.deleteWhere(dataSetCompleteRegistration)
+            } else {
+                val deletedRecord = dataSetCompleteRegistration.toBuilder()
+                    .deleted(true)
+                    .syncState(State.TO_UPDATE)
+                    .build()
+                dataSetCompleteRegistrationStore.updateWhere(deletedRecord)
+            }
+        }
+    }
+
+    override fun deleteIfExist(): Completable {
+        return Completable.fromAction { blockingDeleteIfExist() }
+    }
+
+    override fun blockingDeleteIfExist() {
+        try {
+            blockingDelete()
+        } catch (d2Error: D2Error) {
+            Log.v(DataSetCompleteRegistrationObjectRepository::class.java.canonicalName, d2Error.errorDescription())
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValue.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValue.java
index 98abe16ad4..f932c86d92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValue.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValue.java
@@ -127,7 +127,7 @@ public Builder() {
 
         public abstract DataValue.Builder attributeOptionCombo(@NonNull String attributeOptionCombo);
 
-        public abstract DataValue.Builder value(@NonNull String value);
+        public abstract DataValue.Builder value(@Nullable String value);
 
         public abstract DataValue.Builder storedBy(@Nullable String storedBy);
 
@@ -135,10 +135,10 @@ public Builder() {
 
         public abstract DataValue.Builder lastUpdated(@NonNull Date lastUpdated);
 
-        public abstract DataValue.Builder comment(@NonNull String comment);
+        public abstract DataValue.Builder comment(@Nullable String comment);
 
         @JsonProperty(DataValueFields.FOLLOW_UP)
-        public abstract DataValue.Builder followUp(@NonNull Boolean followUp);
+        public abstract DataValue.Builder followUp(@Nullable Boolean followUp);
 
         abstract DataValue autoBuild();
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java
deleted file mode 100644
index ff2d292d1f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.datavalue;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.datavalue.internal.DataValueStore;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.Date;
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public final class DataValueObjectRepository
-        extends ReadWriteWithValueObjectRepositoryImpl<DataValue, DataValueObjectRepository>
-        implements ReadWriteValueObjectRepository<DataValue> {
-
-    private final String period;
-    private final String organisationUnit;
-    private final String dataElement;
-    private final String categoryOptionCombo;
-    private final String attributeOptionCombo;
-
-    DataValueObjectRepository(
-            final DataValueStore store,
-            final Map<String, ChildrenAppender<DataValue>> childrenAppenders,
-            final RepositoryScope scope,
-            final String period,
-            final String organisationUnit,
-            final String dataElement,
-            final String categoryOptionCombo,
-            final String attributeOptionCombo) {
-        super(store, childrenAppenders, scope, s -> new DataValueObjectRepository(store, childrenAppenders, s,
-                period, organisationUnit, dataElement, categoryOptionCombo, attributeOptionCombo));
-        this.period = period;
-        this.organisationUnit = organisationUnit;
-        this.dataElement = dataElement;
-        this.categoryOptionCombo = categoryOptionCombo;
-        this.attributeOptionCombo = attributeOptionCombo;
-    }
-
-    @Override
-    public Completable set(String value) {
-        return Completable.fromAction(() -> blockingSet(value));
-    }
-
-    public void blockingSet(String value) throws D2Error {
-        DataValue objectWithValue = setBuilder().value(value).deleted(false).build();
-        setObject(objectWithValue);
-    }
-
-    public void setFollowUp(Boolean followUp) throws D2Error {
-        setObject(setBuilder().followUp(followUp).build());
-    }
-
-    public void setComment(String comment) throws D2Error {
-        setObject(setBuilder().comment(comment).build());
-    }
-
-    @Override
-    public Completable delete() {
-        return Completable.fromAction(this::blockingDelete);
-    }
-
-    @Override
-    public void blockingDelete() throws D2Error {
-        DataValue dataValue = blockingGetWithoutChildren();
-        if (dataValue.syncState() == State.TO_POST) {
-            super.delete(dataValue);
-        } else {
-            setObject(dataValue.toBuilder().deleted(true).syncState(State.TO_UPDATE).build());
-        }
-    }
-
-    private DataValue.Builder setBuilder() {
-        Date date = new Date();
-        if (blockingExists()) {
-            DataValue dataValue = blockingGetWithoutChildren();
-            State state = dataValue.syncState() == State.TO_POST ? State.TO_POST : State.TO_UPDATE;
-            return dataValue.toBuilder()
-                    .syncState(state)
-                    .lastUpdated(date);
-        } else {
-            return DataValue.builder()
-                    .syncState(State.TO_POST)
-                    .created(date)
-                    .lastUpdated(date)
-                    .followUp(Boolean.FALSE)
-                    .period(period)
-                    .organisationUnit(organisationUnit)
-                    .dataElement(dataElement)
-                    .categoryOptionCombo(categoryOptionCombo)
-                    .attributeOptionCombo(attributeOptionCombo)
-                    .deleted(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
new file mode 100644
index 0000000000..79d7e81820
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
@@ -0,0 +1,119 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.datavalue
+
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
+import org.hisp.dhis.android.core.maintenance.D2Error
+import java.util.Date
+
+class DataValueObjectRepository internal constructor(
+    store: DataValueStore,
+    childrenAppenders: Map<String, ChildrenAppender<DataValue>>,
+    scope: RepositoryScope,
+    private val period: String,
+    private val organisationUnit: String,
+    private val dataElement: String,
+    private val categoryOptionCombo: String,
+    private val attributeOptionCombo: String
+) : ReadWriteWithValueObjectRepositoryImpl<DataValue, DataValueObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        DataValueObjectRepository(
+            store, childrenAppenders, s,
+            period, organisationUnit, dataElement, categoryOptionCombo, attributeOptionCombo
+        )
+    }), ReadWriteValueObjectRepository<DataValue> {
+    override fun set(value: String?): Completable {
+        return Completable.fromAction { blockingSet(value) }
+    }
+
+    @Throws(D2Error::class)
+    override fun blockingSet(value: String?) {
+        val objectWithValue = setBuilder().value(value).deleted(false).build()
+        setObject(objectWithValue)
+    }
+
+    @Throws(D2Error::class)
+    fun setFollowUp(followUp: Boolean) {
+        setObject(setBuilder().followUp(followUp).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setComment(comment: String?) {
+        setObject(setBuilder().comment(comment).build())
+    }
+
+    override fun delete(): Completable {
+        return Completable.fromAction { blockingDelete() }
+    }
+
+    @Throws(D2Error::class)
+    override fun blockingDelete() {
+        blockingGetWithoutChildren()?.let { dataValue ->
+            if (dataValue.syncState() === State.TO_POST) {
+                super.delete(dataValue)
+            } else {
+                setObject(dataValue.toBuilder().deleted(true).syncState(State.TO_UPDATE).build())
+            }
+        }
+    }
+
+    private fun setBuilder(): DataValue.Builder {
+        val date = Date()
+        val dataValue = blockingGetWithoutChildren()
+
+        return if (dataValue != null) {
+            val state =
+                if (dataValue.syncState() === State.TO_POST) State.TO_POST else State.TO_UPDATE
+            dataValue.toBuilder()
+                .syncState(state)
+                .lastUpdated(date)
+        } else {
+            DataValue.builder()
+                .syncState(State.TO_POST)
+                .created(date)
+                .lastUpdated(date)
+                .followUp(java.lang.Boolean.FALSE)
+                .period(period)
+                .organisationUnit(organisationUnit)
+                .dataElement(dataElement)
+                .categoryOptionCombo(categoryOptionCombo)
+                .attributeOptionCombo(attributeOptionCombo)
+                .deleted(false)
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
similarity index 67%
rename from core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
index a344d3dd08..93af7c144c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
@@ -25,28 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.user;
+package org.hisp.dhis.android.core.user
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.user.internal.AuthenticatedUserStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.user.internal.AuthenticatedUserStore
+import javax.inject.Inject
 
 @Reusable
-public final class AuthenticatedUserObjectRepository
-        extends ReadOnlyOneObjectRepositoryImpl<AuthenticatedUser, AuthenticatedUserObjectRepository> {
-
-    @Inject
-    AuthenticatedUserObjectRepository(AuthenticatedUserStore store,
-                                      Map<String, ChildrenAppender<AuthenticatedUser>> childrenAppenders,
-                                      RepositoryScope scope) {
-        super(store, childrenAppenders, scope,
-                updatedScope -> new AuthenticatedUserObjectRepository(store, childrenAppenders, updatedScope));
-    }
-}
\ No newline at end of file
+class AuthenticatedUserObjectRepository @Inject internal constructor(
+    store: AuthenticatedUserStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<AuthenticatedUser>>,
+    scope: RepositoryScope
+) : ReadOnlyOneObjectRepositoryImpl<AuthenticatedUser, AuthenticatedUserObjectRepository>(store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { updatedScope: RepositoryScope ->
+        AuthenticatedUserObjectRepository(
+            store,
+            childrenAppenders,
+            updatedScope
+        )
+    })
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
index 452da45626..5b232b1911 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
@@ -25,33 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user
 
-package org.hisp.dhis.android.core.user;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.user.internal.UserFields;
-import org.hisp.dhis.android.core.user.internal.UserStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.user.internal.UserFields
+import org.hisp.dhis.android.core.user.internal.UserStore
+import javax.inject.Inject
 
 @Reusable
-public final class UserObjectRepository extends ReadOnlyOneObjectRepositoryImpl<User, UserObjectRepository> {
-
-    @Inject
-    UserObjectRepository(UserStore store,
-                         Map<String, ChildrenAppender<User>> childrenAppenders,
-                         RepositoryScope scope) {
-        super(store, childrenAppenders, scope,
-                s -> new UserObjectRepository(store, childrenAppenders, s));
-    }
-
-    public UserObjectRepository withUserRoles() {
-        return cf.withChild(UserFields.USER_ROLES);
+class UserObjectRepository @Inject internal constructor(
+    store: UserStore,
+    childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
+    scope: RepositoryScope
+) : ReadOnlyOneObjectRepositoryImpl<User, UserObjectRepository>(store, childrenAppenders, scope,
+    ObjectRepositoryFactory<UserObjectRepository> { s: RepositoryScope ->
+        UserObjectRepository(
+            store,
+            childrenAppenders,
+            s
+        )
+    }) {
+    fun withUserRoles(): UserObjectRepository {
+        return cf.withChild(UserFields.USER_ROLES)
     }
-}
\ No newline at end of file
+}

From 4b711dd0f3fe44ce4b170d50541c043423c1eaf8 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 9 Oct 2023 09:00:58 +0200
Subject: [PATCH 410/478] [ANDROSDK-1768] Refactor tracker ObjectRepository

---
 .../EnrollmentObjectRepository.java           | 113 ---------------
 .../enrollment/EnrollmentObjectRepository.kt  | 120 ++++++++++++++++
 .../core/event/EventObjectRepository.java     | 130 -----------------
 .../core/event/EventObjectRepository.kt       | 134 ++++++++++++++++++
 ...y.java => RelationshipObjectRepository.kt} |  64 ++++-----
 ...dEntityAttributeValueObjectRepository.java | 104 --------------
 ...kedEntityAttributeValueObjectRepository.kt |  95 +++++++++++++
 ...rackedEntityDataValueObjectRepository.java | 105 --------------
 .../TrackedEntityDataValueObjectRepository.kt |  96 +++++++++++++
 ...TrackedEntityInstanceObjectRepository.java | 102 -------------
 .../TrackedEntityInstanceObjectRepository.kt  | 105 ++++++++++++++
 11 files changed, 582 insertions(+), 586 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/{RelationshipObjectRepository.java => RelationshipObjectRepository.kt} (58%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java
deleted file mode 100644
index 7dbfd021db..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.enrollment;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.helpers.GeometryHelper;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.Geometry;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.Unit;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.Date;
-import java.util.Map;
-
-public final class EnrollmentObjectRepository
-        extends ReadWriteWithUidDataObjectRepositoryImpl<Enrollment, EnrollmentObjectRepository> {
-
-    private final TrackerDataManager trackerDataManager;
-
-    EnrollmentObjectRepository(final EnrollmentStore store,
-                               final String uid,
-                               final Map<String, ChildrenAppender<Enrollment>> childrenAppenders,
-                               final RepositoryScope scope,
-                               final TrackerDataManager trackerDataManager) {
-        super(store, childrenAppenders, scope,
-                s -> new EnrollmentObjectRepository(store, uid, childrenAppenders, s, trackerDataManager));
-        this.trackerDataManager = trackerDataManager;
-    }
-
-    public Unit setOrganisationUnitUid(String organisationUnitUid) throws D2Error {
-        return updateObject(updateBuilder().organisationUnit(organisationUnitUid).build());
-    }
-
-    public Unit setEnrollmentDate(Date enrollmentDate) throws D2Error {
-        return updateObject(updateBuilder().enrollmentDate(enrollmentDate).build());
-    }
-
-    public Unit setIncidentDate(Date incidentDate) throws D2Error {
-        return updateObject(updateBuilder().incidentDate(incidentDate).build());
-    }
-
-    public Unit setCompletedDate(Date completedDate) throws D2Error {
-        return updateObject(updateBuilder().completedDate(completedDate).build());
-    }
-
-    public Unit setFollowUp(Boolean followUp) throws D2Error {
-        return updateObject(updateBuilder().followUp(followUp).build());
-    }
-
-    public Unit setStatus(EnrollmentStatus enrollmentStatus) throws D2Error {
-        Date completedDate = enrollmentStatus.equals(EnrollmentStatus.COMPLETED) ? new Date() : null;
-        return updateObject(updateBuilder().status(enrollmentStatus).completedDate(completedDate).build());
-    }
-
-    public Unit setGeometry(Geometry geometry) throws D2Error {
-        GeometryHelper.validateGeometry(geometry);
-        return updateObject(updateBuilder().geometry(geometry).build());
-    }
-
-    private Enrollment.Builder updateBuilder() {
-        Enrollment enrollment = blockingGetWithoutChildren();
-        Date updateDate = new Date();
-        State state = enrollment.aggregatedSyncState();
-        state = state == State.TO_POST ? state : State.TO_UPDATE;
-
-        return enrollment.toBuilder()
-                .syncState(state)
-                .aggregatedSyncState(state)
-                .lastUpdated(updateDate)
-                .lastUpdatedAtClient(updateDate);
-    }
-
-    @Override
-    protected void propagateState(Enrollment enrollment, HandleAction action) {
-        trackerDataManager.propagateEnrollmentUpdate(enrollment, action);
-    }
-
-    @Override
-    protected void deleteObject(Enrollment enrollment) {
-        trackerDataManager.deleteEnrollment(enrollment);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
new file mode 100644
index 0000000000..1b937a1248
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
@@ -0,0 +1,120 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.enrollment
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.Geometry
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.Unit
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
+import org.hisp.dhis.android.core.maintenance.D2Error
+import java.util.Date
+
+class EnrollmentObjectRepository internal constructor(
+    store: EnrollmentStore,
+    uid: String?,
+    childrenAppenders: Map<String, ChildrenAppender<Enrollment>>,
+    scope: RepositoryScope,
+    private val trackerDataManager: TrackerDataManager
+) : ReadWriteWithUidDataObjectRepositoryImpl<Enrollment, EnrollmentObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        EnrollmentObjectRepository(
+            store,
+            uid,
+            childrenAppenders,
+            s,
+            trackerDataManager
+        )
+    }) {
+
+    @Throws(D2Error::class)
+    fun setOrganisationUnitUid(organisationUnitUid: String?): Unit {
+        return updateObject(updateBuilder().organisationUnit(organisationUnitUid).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setEnrollmentDate(enrollmentDate: Date?): Unit {
+        return updateObject(updateBuilder().enrollmentDate(enrollmentDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setIncidentDate(incidentDate: Date?): Unit {
+        return updateObject(updateBuilder().incidentDate(incidentDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setCompletedDate(completedDate: Date?): Unit {
+        return updateObject(updateBuilder().completedDate(completedDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setFollowUp(followUp: Boolean?): Unit {
+        return updateObject(updateBuilder().followUp(followUp).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setStatus(enrollmentStatus: EnrollmentStatus): Unit {
+        val completedDate = if (enrollmentStatus == EnrollmentStatus.COMPLETED) Date() else null
+        return updateObject(updateBuilder().status(enrollmentStatus).completedDate(completedDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setGeometry(geometry: Geometry?): Unit {
+        GeometryHelper.validateGeometry(geometry)
+        return updateObject(updateBuilder().geometry(geometry).build())
+    }
+
+    private fun updateBuilder(): Enrollment.Builder {
+        val enrollment = blockingGetWithoutChildren()!!
+        val updateDate = Date()
+        var state = enrollment.aggregatedSyncState()
+        state = if (state === State.TO_POST) state else State.TO_UPDATE
+        return enrollment.toBuilder()
+            .syncState(state)
+            .aggregatedSyncState(state)
+            .lastUpdated(updateDate)
+            .lastUpdatedAtClient(updateDate)
+    }
+
+    override fun propagateState(m: Enrollment, action: HandleAction) {
+        trackerDataManager.propagateEnrollmentUpdate(m, action)
+    }
+
+    override fun deleteObject(m: Enrollment) {
+        trackerDataManager.deleteEnrollment(m)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java
deleted file mode 100644
index 1490645bc6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.event;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.helpers.GeometryHelper;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.Geometry;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.Unit;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.event.internal.EventStore;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.user.User;
-
-import java.util.Date;
-import java.util.Map;
-
-public final class EventObjectRepository
-        extends ReadWriteWithUidDataObjectRepositoryImpl<Event, EventObjectRepository> {
-
-    private final TrackerDataManager trackerDataManager;
-    private final IdentifiableObjectStore<User> userStore;
-
-    EventObjectRepository(final EventStore store,
-                          final IdentifiableObjectStore<User> userStore,
-                          final String uid,
-                          final Map<String, ChildrenAppender<Event>> childrenAppenders,
-                          final RepositoryScope scope,
-                          final TrackerDataManager trackerDataManager) {
-        super(store, childrenAppenders, scope,
-                s -> new EventObjectRepository(store, userStore, uid, childrenAppenders, s, trackerDataManager));
-        this.trackerDataManager = trackerDataManager;
-        this.userStore = userStore;
-    }
-
-    public Unit setOrganisationUnitUid(String organisationUnitUid) throws D2Error {
-        return updateObject(updateBuilder().organisationUnit(organisationUnitUid).build());
-    }
-
-    public Unit setEventDate(Date eventDate) throws D2Error {
-        return updateObject(updateBuilder().eventDate(eventDate).build());
-    }
-
-    public Unit setStatus(EventStatus eventStatus) throws D2Error {
-        Date completedDate = eventStatus.equals(EventStatus.COMPLETED) ? new Date() : null;
-        String completedBy = eventStatus.equals(EventStatus.COMPLETED) ? userStore.selectFirst().username() : null;
-
-        return updateObject(
-                updateBuilder().status(eventStatus).completedDate(completedDate).completedBy(completedBy).build()
-        );
-    }
-
-    public Unit setCompletedDate(Date completedDate) throws D2Error {
-        return updateObject(updateBuilder().completedDate(completedDate).build());
-    }
-
-    public Unit setCompletedBy(String completedBy) throws D2Error {
-        return updateObject(updateBuilder().completedBy(completedBy).build());
-    }
-
-    public Unit setDueDate(Date dueDate) throws D2Error {
-        return updateObject(updateBuilder().dueDate(dueDate).build());
-    }
-
-    public Unit setGeometry(Geometry geometry) throws D2Error {
-        GeometryHelper.validateGeometry(geometry);
-        return updateObject(updateBuilder().geometry(geometry).build());
-    }
-
-    public Unit setAttributeOptionComboUid(String attributeOptionComboUid) throws D2Error {
-        return updateObject(updateBuilder().attributeOptionCombo(attributeOptionComboUid).build());
-    }
-
-    public Unit setAssignedUser(String assignedUser) throws D2Error {
-        return updateObject(updateBuilder().assignedUser(assignedUser).build());
-    }
-
-    private Event.Builder updateBuilder() {
-        Event event = blockingGetWithoutChildren();
-        Date updateDate = new Date();
-        State state = event.syncState();
-        state = state == State.TO_POST ? state : State.TO_UPDATE;
-
-        return event.toBuilder()
-                .syncState(state)
-                .aggregatedSyncState(state)
-                .lastUpdated(updateDate)
-                .lastUpdatedAtClient(updateDate);
-    }
-
-    @Override
-    protected void propagateState(Event event, HandleAction action) {
-        trackerDataManager.propagateEventUpdate(event, action);
-    }
-
-    @Override
-    protected void deleteObject(Event event) {
-        trackerDataManager.deleteEvent(event);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
new file mode 100644
index 0000000000..d626669082
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
@@ -0,0 +1,134 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.event
+
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.Geometry
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.Unit
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.event.internal.EventStore
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.user.User
+import java.util.Date
+
+class EventObjectRepository internal constructor(
+    store: EventStore,
+    private val userStore: IdentifiableObjectStore<User>,
+    uid: String?,
+    childrenAppenders: Map<String, ChildrenAppender<Event>>,
+    scope: RepositoryScope,
+    private val trackerDataManager: TrackerDataManager
+) : ReadWriteWithUidDataObjectRepositoryImpl<Event, EventObjectRepository>(store, childrenAppenders, scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        EventObjectRepository(
+            store,
+            userStore,
+            uid,
+            childrenAppenders,
+            s,
+            trackerDataManager
+        )
+    }) {
+
+    @Throws(D2Error::class)
+    fun setOrganisationUnitUid(organisationUnitUid: String?): Unit {
+        return updateObject(updateBuilder().organisationUnit(organisationUnitUid).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setEventDate(eventDate: Date?): Unit {
+        return updateObject(updateBuilder().eventDate(eventDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setStatus(eventStatus: EventStatus): Unit {
+        val completedDate = if (eventStatus == EventStatus.COMPLETED) Date() else null
+        val completedBy = if (eventStatus == EventStatus.COMPLETED) userStore.selectFirst()!!.username() else null
+        return updateObject(
+            updateBuilder().status(eventStatus).completedDate(completedDate).completedBy(completedBy).build()
+        )
+    }
+
+    @Throws(D2Error::class)
+    fun setCompletedDate(completedDate: Date?): Unit {
+        return updateObject(updateBuilder().completedDate(completedDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setCompletedBy(completedBy: String?): Unit {
+        return updateObject(updateBuilder().completedBy(completedBy).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setDueDate(dueDate: Date?): Unit {
+        return updateObject(updateBuilder().dueDate(dueDate).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setGeometry(geometry: Geometry?): Unit {
+        GeometryHelper.validateGeometry(geometry)
+        return updateObject(updateBuilder().geometry(geometry).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setAttributeOptionComboUid(attributeOptionComboUid: String?): Unit {
+        return updateObject(updateBuilder().attributeOptionCombo(attributeOptionComboUid).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setAssignedUser(assignedUser: String?): Unit {
+        return updateObject(updateBuilder().assignedUser(assignedUser).build())
+    }
+
+    private fun updateBuilder(): Event.Builder {
+        val event: Event = blockingGetWithoutChildren()!!
+        val updateDate = Date()
+        var state = event.syncState()
+        state = if (state === State.TO_POST) state else State.TO_UPDATE
+        return event.toBuilder()
+            .syncState(state)
+            .aggregatedSyncState(state)
+            .lastUpdated(updateDate)
+            .lastUpdatedAtClient(updateDate)
+    }
+
+    override fun propagateState(m: Event, action: HandleAction) {
+        trackerDataManager.propagateEventUpdate(m, action)
+    }
+
+    override fun deleteObject(m: Event) {
+        trackerDataManager.deleteEvent(m)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
index 134eb20ec6..c42dcaa44f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
@@ -25,40 +25,40 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.relationship
 
-package org.hisp.dhis.android.core.relationship;
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.relationship.internal.RelationshipStore;
-
-import java.util.Map;
-
-final class RelationshipObjectRepository
-        extends ReadWriteWithUidDataObjectRepositoryImpl<Relationship, RelationshipObjectRepository> {
-
-    private final TrackerDataManager trackerDataManager;
-
-    RelationshipObjectRepository(final RelationshipStore store,
-                                 final String uid,
-                                 final Map<String, ChildrenAppender<Relationship>> childrenAppenders,
-                                 final RepositoryScope scope,
-                                 final TrackerDataManager trackerDataManager) {
-        super(store, childrenAppenders, scope,
-                s -> new RelationshipObjectRepository(store, uid, childrenAppenders, s, trackerDataManager));
-        this.trackerDataManager = trackerDataManager;
-    }
-
-    @Override
-    protected void propagateState(Relationship relationship, HandleAction action) {
-        trackerDataManager.propagateRelationshipUpdate(relationship, action);
+internal class RelationshipObjectRepository(
+    store: RelationshipStore,
+    uid: String?,
+    childrenAppenders: Map<String, ChildrenAppender<Relationship>>,
+    scope: RepositoryScope,
+    private val trackerDataManager: TrackerDataManager
+) : ReadWriteWithUidDataObjectRepositoryImpl<Relationship, RelationshipObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        RelationshipObjectRepository(
+            store,
+            uid,
+            childrenAppenders,
+            s,
+            trackerDataManager
+        )
+    }) {
+    override fun propagateState(m: Relationship, action: HandleAction) {
+        trackerDataManager.propagateRelationshipUpdate(m, action)
     }
 
-    @Override
-    protected void deleteObject(Relationship relationship) {
-        trackerDataManager.deleteRelationship(relationship);
+    override fun deleteObject(m: Relationship) {
+        trackerDataManager.deleteRelationship(m)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java
deleted file mode 100644
index 3f7d43d4f7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore;
-
-import java.util.Date;
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public final class TrackedEntityAttributeValueObjectRepository extends ReadWriteWithValueObjectRepositoryImpl
-        <TrackedEntityAttributeValue, TrackedEntityAttributeValueObjectRepository>
-        implements ReadWriteValueObjectRepository<TrackedEntityAttributeValue> {
-
-    private final DataStatePropagator dataStatePropagator;
-    private final String trackedEntityAttribute;
-    private final String trackedEntityInstance;
-
-    TrackedEntityAttributeValueObjectRepository(
-            final TrackedEntityAttributeValueStore store,
-            final Map<String, ChildrenAppender<TrackedEntityAttributeValue>> childrenAppenders,
-            final RepositoryScope scope,
-            final DataStatePropagator dataStatePropagator,
-            final String trackedEntityAttribute,
-            final String trackedEntityInstance) {
-        super(store, childrenAppenders, scope, s -> new TrackedEntityAttributeValueObjectRepository(
-                store, childrenAppenders, s, dataStatePropagator, trackedEntityAttribute, trackedEntityInstance));
-        this.dataStatePropagator = dataStatePropagator;
-        this.trackedEntityAttribute = trackedEntityAttribute;
-        this.trackedEntityInstance = trackedEntityInstance;
-    }
-
-    @Override
-    public Completable set(String value) {
-        return Completable.fromAction(() -> blockingSet(value));
-    }
-
-    public void blockingSet(String value) throws D2Error {
-        setObject(setBuilder().value(value).build());
-    }
-
-    @Override
-    protected void delete(TrackedEntityAttributeValue trackedEntityAttributeValue) throws D2Error {
-        blockingSet(null);
-    }
-
-    @Override
-    public boolean blockingExists() {
-        TrackedEntityAttributeValue value = blockingGetWithoutChildren();
-        return value == null ? Boolean.FALSE : value.deleted() != Boolean.TRUE;
-    }
-
-    private TrackedEntityAttributeValue.Builder setBuilder() {
-        Date date = new Date();
-        if (blockingExists()) {
-            return blockingGetWithoutChildren().toBuilder()
-                    .lastUpdated(date);
-        } else {
-            return TrackedEntityAttributeValue.builder()
-                    .created(date)
-                    .lastUpdated(date)
-                    .trackedEntityAttribute(trackedEntityAttribute)
-                    .trackedEntityInstance(trackedEntityInstance);
-        }
-    }
-
-    @Override
-    protected void propagateState(TrackedEntityAttributeValue trackedEntityAttributeValue) {
-        dataStatePropagator.propagateTrackedEntityAttributeUpdate(trackedEntityAttributeValue);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
new file mode 100644
index 0000000000..a9b4bfe7e9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
@@ -0,0 +1,95 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity
+
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
+import java.util.Date
+
+class TrackedEntityAttributeValueObjectRepository internal constructor(
+    store: TrackedEntityAttributeValueStore,
+    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityAttributeValue>>,
+    scope: RepositoryScope,
+    private val dataStatePropagator: DataStatePropagator,
+    private val trackedEntityAttribute: String,
+    private val trackedEntityInstance: String
+) : ReadWriteWithValueObjectRepositoryImpl<TrackedEntityAttributeValue, TrackedEntityAttributeValueObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        TrackedEntityAttributeValueObjectRepository(
+            store, childrenAppenders, s, dataStatePropagator, trackedEntityAttribute, trackedEntityInstance
+        )
+    }),
+    ReadWriteValueObjectRepository<TrackedEntityAttributeValue> {
+    override fun set(value: String?): Completable {
+        return Completable.fromAction { blockingSet(value) }
+    }
+
+    @Throws(D2Error::class)
+    override fun blockingSet(value: String?) {
+        setObject(setBuilder().value(value).build())
+    }
+
+    @Throws(D2Error::class)
+    override fun delete(m: TrackedEntityAttributeValue) {
+        blockingSet(null)
+    }
+
+    override fun blockingExists(): Boolean {
+        val value = blockingGetWithoutChildren()
+        return if (value == null) false else value.deleted() == null || !value.deleted()
+    }
+
+    private fun setBuilder(): TrackedEntityAttributeValue.Builder {
+        val date = Date()
+        val value = blockingGetWithoutChildren()
+        return if (value != null) {
+            value.toBuilder()
+                .lastUpdated(date)
+        } else {
+            TrackedEntityAttributeValue.builder()
+                .created(date)
+                .lastUpdated(date)
+                .trackedEntityAttribute(trackedEntityAttribute)
+                .trackedEntityInstance(trackedEntityInstance)
+        }
+    }
+
+    override fun propagateState(m: TrackedEntityAttributeValue?) {
+        dataStatePropagator.propagateTrackedEntityAttributeUpdate(m)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java
deleted file mode 100644
index 585df90a73..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.internal.DataStatePropagator;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore;
-
-import java.util.Date;
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public final class TrackedEntityDataValueObjectRepository
-        extends ReadWriteWithValueObjectRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueObjectRepository>
-        implements ReadWriteValueObjectRepository<TrackedEntityDataValue> {
-
-    private final DataStatePropagator dataStatePropagator;
-    private final String event;
-    private final String dataElement;
-
-    TrackedEntityDataValueObjectRepository(
-            final TrackedEntityDataValueStore store,
-            final Map<String, ChildrenAppender<TrackedEntityDataValue>> childrenAppenders,
-            final RepositoryScope scope,
-            final DataStatePropagator dataStatePropagator,
-            final String event,
-            final String dataElement) {
-        super(store, childrenAppenders, scope, s -> new TrackedEntityDataValueObjectRepository(
-                store, childrenAppenders, s, dataStatePropagator, event, dataElement));
-        this.dataStatePropagator = dataStatePropagator;
-        this.event = event;
-        this.dataElement = dataElement;
-    }
-
-    @Override
-    public Completable set(String value) {
-        return Completable.fromAction(() -> blockingSet(value));
-    }
-
-    public void blockingSet(String value) throws D2Error {
-        setObject(setBuilder().value(value).build());
-    }
-
-    @Override
-    protected void delete(TrackedEntityDataValue trackedEntityDataValue) throws D2Error {
-        blockingSet(null);
-    }
-
-    @Override
-    public boolean blockingExists() {
-        TrackedEntityDataValue value = blockingGetWithoutChildren();
-        return value == null ? Boolean.FALSE : value.deleted() != Boolean.TRUE;
-    }
-
-    private TrackedEntityDataValue.Builder setBuilder() {
-        Date date = new Date();
-        if (blockingExists()) {
-            return blockingGetWithoutChildren().toBuilder()
-                    .lastUpdated(date);
-        } else {
-            return TrackedEntityDataValue.builder()
-                    .created(date)
-                    .lastUpdated(date)
-                    .providedElsewhere(Boolean.FALSE)
-                    .event(event)
-                    .dataElement(dataElement);
-        }
-    }
-
-    @Override
-    protected void propagateState(TrackedEntityDataValue trackedEntityDataValue) {
-        dataStatePropagator.propagateTrackedEntityDataValueUpdate(trackedEntityDataValue);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
new file mode 100644
index 0000000000..0529b04758
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity
+
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.internal.DataStatePropagator
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
+import java.util.Date
+
+class TrackedEntityDataValueObjectRepository internal constructor(
+    store: TrackedEntityDataValueStore,
+    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityDataValue>>,
+    scope: RepositoryScope,
+    private val dataStatePropagator: DataStatePropagator,
+    private val event: String,
+    private val dataElement: String
+) : ReadWriteWithValueObjectRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        TrackedEntityDataValueObjectRepository(
+            store, childrenAppenders, s, dataStatePropagator, event, dataElement
+        )
+    }),
+    ReadWriteValueObjectRepository<TrackedEntityDataValue> {
+    override fun set(value: String?): Completable {
+        return Completable.fromAction { blockingSet(value) }
+    }
+
+    @Throws(D2Error::class)
+    override fun blockingSet(value: String?) {
+        setObject(setBuilder().value(value).build())
+    }
+
+    @Throws(D2Error::class)
+    override fun delete(m: TrackedEntityDataValue) {
+        blockingSet(null)
+    }
+
+    override fun blockingExists(): Boolean {
+        val value = blockingGetWithoutChildren()
+        return if (value == null) false else value.deleted() == null || !value.deleted()
+    }
+
+    private fun setBuilder(): TrackedEntityDataValue.Builder {
+        val date = Date()
+        val value = blockingGetWithoutChildren()
+        return if (value != null) {
+            value.toBuilder()
+                .lastUpdated(date)
+        } else {
+            TrackedEntityDataValue.builder()
+                .created(date)
+                .lastUpdated(date)
+                .providedElsewhere(java.lang.Boolean.FALSE)
+                .event(event)
+                .dataElement(dataElement)
+        }
+    }
+
+    override fun propagateState(m: TrackedEntityDataValue?) {
+        dataStatePropagator.propagateTrackedEntityDataValueUpdate(m)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java
deleted file mode 100644
index 02649c7a5a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity;
-
-import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction;
-import org.hisp.dhis.android.core.arch.helpers.GeometryHelper;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithUidDataObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.common.Geometry;
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.common.Unit;
-import org.hisp.dhis.android.core.common.internal.TrackerDataManager;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.D2ErrorComponent;
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore;
-
-import java.util.Date;
-import java.util.Map;
-
-public final class TrackedEntityInstanceObjectRepository
-        extends ReadWriteWithUidDataObjectRepositoryImpl<TrackedEntityInstance, TrackedEntityInstanceObjectRepository> {
-
-    private final TrackerDataManager trackerDataManager;
-
-    TrackedEntityInstanceObjectRepository(final TrackedEntityInstanceStore store,
-                                          final String uid,
-                                          final Map<String, ChildrenAppender<TrackedEntityInstance>> childrenAppenders,
-                                          final RepositoryScope scope,
-                                          final TrackerDataManager trackerDataManager) {
-        super(store, childrenAppenders, scope,
-                s -> new TrackedEntityInstanceObjectRepository(store, uid, childrenAppenders, s, trackerDataManager));
-        this.trackerDataManager = trackerDataManager;
-    }
-
-    public Unit setOrganisationUnitUid(String organisationUnitUid) throws D2Error {
-        return updateObject(updateBuilder().organisationUnit(organisationUnitUid).build());
-    }
-
-    public Unit setGeometry(Geometry geometry) throws D2Error {
-        GeometryHelper.validateGeometry(geometry);
-        return updateObject(updateBuilder().geometry(geometry).build());
-    }
-
-    private TrackedEntityInstance.Builder updateBuilder() throws D2Error {
-        TrackedEntityInstance trackedEntityInstance = blockingGetWithoutChildren();
-        State state = trackedEntityInstance.aggregatedSyncState();
-        if (state == State.RELATIONSHIP) {
-            throw D2Error
-                    .builder()
-                    .errorComponent(D2ErrorComponent.SDK)
-                    .errorCode(D2ErrorCode.RELATIONSHIPS_CANT_BE_UPDATED)
-                    .errorDescription("Relationships can't be updated")
-                    .build();
-        }
-        Date updateDate = new Date();
-        state = state == State.TO_POST ? state : State.TO_UPDATE;
-
-        return trackedEntityInstance.toBuilder()
-                .syncState(state)
-                .aggregatedSyncState(state)
-                .lastUpdated(updateDate)
-                .lastUpdatedAtClient(updateDate);
-    }
-
-    @Override
-    protected void propagateState(TrackedEntityInstance trackedEntityInstance, HandleAction action) {
-        trackerDataManager.propagateTrackedEntityUpdate(trackedEntityInstance, action);
-    }
-
-    @Override
-    protected void deleteObject(TrackedEntityInstance trackedEntityInstance) {
-        trackerDataManager.deleteTrackedEntity(trackedEntityInstance);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
new file mode 100644
index 0000000000..090316abd1
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
@@ -0,0 +1,105 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.trackedentity
+
+import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
+import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.common.Geometry
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.common.Unit
+import org.hisp.dhis.android.core.common.internal.TrackerDataManager
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import java.util.Date
+
+class TrackedEntityInstanceObjectRepository internal constructor(
+    store: TrackedEntityInstanceStore,
+    uid: String?,
+    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    scope: RepositoryScope,
+    private val trackerDataManager: TrackerDataManager
+) : ReadWriteWithUidDataObjectRepositoryImpl<TrackedEntityInstance, TrackedEntityInstanceObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        TrackedEntityInstanceObjectRepository(
+            store,
+            uid,
+            childrenAppenders,
+            s,
+            trackerDataManager
+        )
+    }) {
+
+    @Throws(D2Error::class)
+    fun setOrganisationUnitUid(organisationUnitUid: String?): Unit {
+        return updateObject(updateBuilder().organisationUnit(organisationUnitUid).build())
+    }
+
+    @Throws(D2Error::class)
+    fun setGeometry(geometry: Geometry?): Unit {
+        GeometryHelper.validateGeometry(geometry)
+        return updateObject(updateBuilder().geometry(geometry).build())
+    }
+
+    @Throws(D2Error::class)
+    private fun updateBuilder(): TrackedEntityInstance.Builder {
+        val trackedEntityInstance: TrackedEntityInstance = blockingGetWithoutChildren()!!
+        var state = trackedEntityInstance.aggregatedSyncState()
+        if (state === State.RELATIONSHIP) {
+            throw D2Error
+                .builder()
+                .errorComponent(D2ErrorComponent.SDK)
+                .errorCode(D2ErrorCode.RELATIONSHIPS_CANT_BE_UPDATED)
+                .errorDescription("Relationships can't be updated")
+                .build()
+        }
+        val updateDate = Date()
+        state = if (state === State.TO_POST) state else State.TO_UPDATE
+        return trackedEntityInstance.toBuilder()
+            .syncState(state)
+            .aggregatedSyncState(state)
+            .lastUpdated(updateDate)
+            .lastUpdatedAtClient(updateDate)
+    }
+
+    override fun propagateState(m: TrackedEntityInstance, action: HandleAction) {
+        trackerDataManager.propagateTrackedEntityUpdate(m, action)
+    }
+
+    override fun deleteObject(m: TrackedEntityInstance) {
+        trackerDataManager.deleteTrackedEntity(m)
+    }
+}

From e5a0904815f1fe1bf76c4f4590de2612dbb99b1b Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 9 Oct 2023 09:05:47 +0200
Subject: [PATCH 411/478] [ANDROSDK-1768] Refactor remaining ObjectRepository

---
 ...java => LocalDataStoreObjectRepository.kt} | 72 ++++++++++---------
 ...y.java => FileResourceObjectRepository.kt} | 42 ++++++-----
 ...ory.java => SystemInfoObjectRepository.kt} | 51 ++++++-------
 3 files changed, 87 insertions(+), 78 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/datastore/{LocalDataStoreObjectRepository.java => LocalDataStoreObjectRepository.kt} (54%)
 rename core/src/main/java/org/hisp/dhis/android/core/fileresource/{FileResourceObjectRepository.java => FileResourceObjectRepository.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/systeminfo/{SystemInfoObjectRepository.java => SystemInfoObjectRepository.kt} (66%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
similarity index 54%
rename from core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
index b46a493126..c0ff69cebc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
@@ -25,43 +25,45 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.datastore
 
-package org.hisp.dhis.android.core.datastore;
+import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.ReadWriteValueObjectRepository;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadWriteWithValueObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.Map;
-
-import io.reactivex.Completable;
-
-public final class LocalDataStoreObjectRepository
-        extends ReadWriteWithValueObjectRepositoryImpl<KeyValuePair, LocalDataStoreObjectRepository>
-        implements ReadWriteValueObjectRepository<KeyValuePair> {
-
-    private final String key;
-
-    LocalDataStoreObjectRepository(
-            final ObjectWithoutUidStore<KeyValuePair> store,
-            final Map<String, ChildrenAppender<KeyValuePair>> childrenAppenders,
-            final RepositoryScope scope,
-            final String key) {
-        super(store, childrenAppenders, scope, s ->
-                new LocalDataStoreObjectRepository(store, childrenAppenders, s, key));
-        this.key = key;
-    }
-
-    @Override
-    public Completable set(String value) {
-        return Completable.fromAction(() -> blockingSet(value));
+class LocalDataStoreObjectRepository internal constructor(
+    store: LocalDataStoreStore,
+    childrenAppenders: Map<String, ChildrenAppender<KeyValuePair>>,
+    scope: RepositoryScope,
+    private val key: String
+) : ReadWriteWithValueObjectRepositoryImpl<KeyValuePair, LocalDataStoreObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        LocalDataStoreObjectRepository(
+            store,
+            childrenAppenders,
+            s,
+            key
+        )
+    }),
+    ReadWriteValueObjectRepository<KeyValuePair> {
+    override fun set(value: String?): Completable {
+        return Completable.fromAction { blockingSet(value) }
     }
 
-    public void blockingSet(String value) throws D2Error {
-        KeyValuePair pair = KeyValuePair.builder().key(key).value(value).build();
-        setObject(pair);
+    @Throws(D2Error::class)
+    override fun blockingSet(value: String?) {
+        val pair = KeyValuePair.builder()
+            .key(key)
+            .value(value)
+            .build()
+        setObject(pair)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
index 7169e56adb..a94ee0b576 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
@@ -25,24 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.fileresource
 
-package org.hisp.dhis.android.core.fileresource;
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyOneObjectRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-
-import java.util.Map;
-
-public final class FileResourceObjectRepository
-        extends ReadOnlyOneObjectRepositoryImpl<FileResource, FileResourceObjectRepository> {
-
-    FileResourceObjectRepository(final IdentifiableDataObjectStore<FileResource> store,
-                                 final String uid,
-                                 final Map<String, ChildrenAppender<FileResource>> childrenAppenders,
-                                 final RepositoryScope scope) {
-        super(store, childrenAppenders, scope,
-                s -> new FileResourceObjectRepository(store, uid, childrenAppenders, s));
-    }
-}
\ No newline at end of file
+class FileResourceObjectRepository internal constructor(
+    store: FileResourceStore,
+    uid: String?,
+    childrenAppenders: Map<String, ChildrenAppender<FileResource>>,
+    scope: RepositoryScope
+) : ReadOnlyOneObjectRepositoryImpl<FileResource, FileResourceObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    ObjectRepositoryFactory { s: RepositoryScope ->
+        FileResourceObjectRepository(
+            store,
+            uid,
+            childrenAppenders,
+            s
+        )
+    })
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java
rename to core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
index 1564be340a..e76755fc63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
@@ -25,30 +25,33 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.systeminfo;
+package org.hisp.dhis.android.core.systeminfo
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.object.internal.ReadOnlyFirstObjectWithDownloadRepositoryImpl;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall;
-import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStore;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
+import dagger.Reusable
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
+import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyFirstObjectWithDownloadRepositoryImpl
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStore
+import javax.inject.Inject
 
 @Reusable
-public final class SystemInfoObjectRepository
-        extends ReadOnlyFirstObjectWithDownloadRepositoryImpl<SystemInfo, SystemInfoObjectRepository> {
-
-    @Inject
-    SystemInfoObjectRepository(SystemInfoStore store,
-                               Map<String, ChildrenAppender<SystemInfo>> childrenAppenders,
-                               RepositoryScope scope,
-                               SystemInfoCall systemInfoCall) {
-        super(store, childrenAppenders, scope, systemInfoCall,
-                cs -> new SystemInfoObjectRepository(store, childrenAppenders, cs, systemInfoCall));
-    }
-}
\ No newline at end of file
+class SystemInfoObjectRepository @Inject internal constructor(
+    store: SystemInfoStore,
+    childrenAppenders: Map<String, ChildrenAppender<SystemInfo>>,
+    scope: RepositoryScope,
+    systemInfoCall: SystemInfoCall
+) : ReadOnlyFirstObjectWithDownloadRepositoryImpl<SystemInfo, SystemInfoObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
+    systemInfoCall,
+    ObjectRepositoryFactory { cs: RepositoryScope ->
+        SystemInfoObjectRepository(
+            store,
+            childrenAppenders,
+            cs,
+            systemInfoCall
+        )
+    })

From 28abd0e041031f3619f1a374e83732203e119459 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 9 Oct 2023 09:18:13 +0200
Subject: [PATCH 412/478] [ANDROSDK-1768] Ktlint

---
 ...gsObjectRepositoryMockIntegrationShould.kt |  2 +-
 ...SetCompleteRegistrationObjectRepository.kt | 31 +++++++++++++------
 .../LocalDataStoreObjectRepository.kt         |  7 +++--
 .../datavalue/DataValueObjectRepository.kt    | 16 +++++++---
 .../enrollment/EnrollmentObjectRepository.kt  |  7 +++--
 .../core/event/EventObjectRepository.kt       | 15 ++++++---
 .../FileResourceObjectRepository.kt           |  7 +++--
 .../RelationshipObjectRepository.kt           |  7 +++--
 ...isVisualizationsSettingObjectRepository.kt |  2 +-
 .../AnalyticsSettingObjectRepository.kt       |  2 +-
 .../AppearanceSettingsObjectRepository.kt     |  8 +++--
 .../DataSetSettingsObjectRepository.kt        |  2 +-
 .../GeneralSettingObjectRepository.kt         | 16 +++++++---
 .../ProgramSettingsObjectRepository.kt        |  2 +-
 .../SynchronizationSettingObjectRepository.kt |  2 +-
 .../settings/UserSettingsObjectRepository.kt  |  2 +-
 .../systeminfo/SystemInfoObjectRepository.kt  |  9 +++---
 ...kedEntityAttributeValueObjectRepository.kt | 12 +++++--
 .../TrackedEntityDataValueObjectRepository.kt | 12 +++++--
 .../TrackedEntityInstanceObjectRepository.kt  |  7 +++--
 .../user/AuthenticatedUserObjectRepository.kt | 10 +++---
 .../android/core/user/UserObjectRepository.kt | 12 ++++---
 22 files changed, 124 insertions(+), 66 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
index 84336ae881..313b39d695 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
@@ -68,7 +68,7 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
 
     @Test
     fun should_return_global_program_configuration_setting() {
-                val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
+        val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
         assertThat(setting?.uid()).isNull()
         assertThat(setting?.completionSpinner()).isEqualTo(true)
         assertThat(setting?.optionalSearch()).isNull()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
index f70bfc63b1..ae0ff8ee3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
@@ -50,15 +50,25 @@ class DataSetCompleteRegistrationObjectRepository internal constructor(
     private val period: String,
     private val organisationUnit: String,
     private val dataSet: String,
-    private val attributeOptionCombo: String
+    private val attributeOptionCombo: String,
 ) : ReadOnlyOneObjectRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationObjectRepository>(
-    dataSetCompleteRegistrationStore, childrenAppenders, scope,
+    dataSetCompleteRegistrationStore,
+    childrenAppenders,
+    scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         DataSetCompleteRegistrationObjectRepository(
-            dataSetCompleteRegistrationStore, credentialsRepository, childrenAppenders, s,
-            period, organisationUnit, dataSet, attributeOptionCombo
+            dataSetCompleteRegistrationStore,
+            credentialsRepository,
+            childrenAppenders,
+            s,
+            period,
+            organisationUnit,
+            dataSet,
+            attributeOptionCombo,
         )
-    }), ReadWriteObjectRepository<DataSetCompleteRegistration> {
+    },
+),
+    ReadWriteObjectRepository<DataSetCompleteRegistration> {
     fun set(): Completable {
         return Completable.fromAction { blockingSet() }
     }
@@ -77,12 +87,15 @@ class DataSetCompleteRegistrationObjectRepository internal constructor(
                     .storedBy(username)
                     .syncState(State.TO_POST)
                     .deleted(false)
-                    .build()
+                    .build(),
             )
         } else {
             val syncState =
-                if (dataSetCompleteRegistration.syncState() === State.TO_POST) State.TO_POST
-                else State.TO_UPDATE
+                if (dataSetCompleteRegistration.syncState() === State.TO_POST) {
+                    State.TO_POST
+                } else {
+                    State.TO_UPDATE
+                }
 
             val newRecord = dataSetCompleteRegistration.toBuilder()
                 .deleted(false)
@@ -106,7 +119,7 @@ class DataSetCompleteRegistrationObjectRepository internal constructor(
                 .errorComponent(D2ErrorComponent.SDK)
                 .errorCode(D2ErrorCode.CANT_DELETE_NON_EXISTING_OBJECT)
                 .errorDescription(
-                    "DataSetCompleteRegistration can't be deleted because no longer exists"
+                    "DataSetCompleteRegistration can't be deleted because no longer exists",
                 )
                 .build()
         } else {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
index c0ff69cebc..65f4cc8be5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
@@ -40,7 +40,7 @@ class LocalDataStoreObjectRepository internal constructor(
     store: LocalDataStoreStore,
     childrenAppenders: Map<String, ChildrenAppender<KeyValuePair>>,
     scope: RepositoryScope,
-    private val key: String
+    private val key: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<KeyValuePair, LocalDataStoreObjectRepository>(
     store,
     childrenAppenders,
@@ -50,9 +50,10 @@ class LocalDataStoreObjectRepository internal constructor(
             store,
             childrenAppenders,
             s,
-            key
+            key,
         )
-    }),
+    },
+),
     ReadWriteValueObjectRepository<KeyValuePair> {
     override fun set(value: String?): Completable {
         return Completable.fromAction { blockingSet(value) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
index 79d7e81820..736741955d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
@@ -46,17 +46,25 @@ class DataValueObjectRepository internal constructor(
     private val organisationUnit: String,
     private val dataElement: String,
     private val categoryOptionCombo: String,
-    private val attributeOptionCombo: String
+    private val attributeOptionCombo: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<DataValue, DataValueObjectRepository>(
     store,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         DataValueObjectRepository(
-            store, childrenAppenders, s,
-            period, organisationUnit, dataElement, categoryOptionCombo, attributeOptionCombo
+            store,
+            childrenAppenders,
+            s,
+            period,
+            organisationUnit,
+            dataElement,
+            categoryOptionCombo,
+            attributeOptionCombo,
         )
-    }), ReadWriteValueObjectRepository<DataValue> {
+    },
+),
+    ReadWriteValueObjectRepository<DataValue> {
     override fun set(value: String?): Completable {
         return Completable.fromAction { blockingSet(value) }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
index 1b937a1248..44be3a5da4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
@@ -46,7 +46,7 @@ class EnrollmentObjectRepository internal constructor(
     uid: String?,
     childrenAppenders: Map<String, ChildrenAppender<Enrollment>>,
     scope: RepositoryScope,
-    private val trackerDataManager: TrackerDataManager
+    private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<Enrollment, EnrollmentObjectRepository>(
     store,
     childrenAppenders,
@@ -57,9 +57,10 @@ class EnrollmentObjectRepository internal constructor(
             uid,
             childrenAppenders,
             s,
-            trackerDataManager
+            trackerDataManager,
         )
-    }) {
+    },
+) {
 
     @Throws(D2Error::class)
     fun setOrganisationUnitUid(organisationUnitUid: String?): Unit {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
index d626669082..67fcb17781 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
@@ -43,14 +43,18 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.user.User
 import java.util.Date
 
+@Suppress("TooManyFunctions")
 class EventObjectRepository internal constructor(
     store: EventStore,
     private val userStore: IdentifiableObjectStore<User>,
     uid: String?,
     childrenAppenders: Map<String, ChildrenAppender<Event>>,
     scope: RepositoryScope,
-    private val trackerDataManager: TrackerDataManager
-) : ReadWriteWithUidDataObjectRepositoryImpl<Event, EventObjectRepository>(store, childrenAppenders, scope,
+    private val trackerDataManager: TrackerDataManager,
+) : ReadWriteWithUidDataObjectRepositoryImpl<Event, EventObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         EventObjectRepository(
             store,
@@ -58,9 +62,10 @@ class EventObjectRepository internal constructor(
             uid,
             childrenAppenders,
             s,
-            trackerDataManager
+            trackerDataManager,
         )
-    }) {
+    },
+) {
 
     @Throws(D2Error::class)
     fun setOrganisationUnitUid(organisationUnitUid: String?): Unit {
@@ -77,7 +82,7 @@ class EventObjectRepository internal constructor(
         val completedDate = if (eventStatus == EventStatus.COMPLETED) Date() else null
         val completedBy = if (eventStatus == EventStatus.COMPLETED) userStore.selectFirst()!!.username() else null
         return updateObject(
-            updateBuilder().status(eventStatus).completedDate(completedDate).completedBy(completedBy).build()
+            updateBuilder().status(eventStatus).completedDate(completedDate).completedBy(completedBy).build(),
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
index a94ee0b576..95d7b506fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
@@ -37,7 +37,7 @@ class FileResourceObjectRepository internal constructor(
     store: FileResourceStore,
     uid: String?,
     childrenAppenders: Map<String, ChildrenAppender<FileResource>>,
-    scope: RepositoryScope
+    scope: RepositoryScope,
 ) : ReadOnlyOneObjectRepositoryImpl<FileResource, FileResourceObjectRepository>(
     store,
     childrenAppenders,
@@ -47,6 +47,7 @@ class FileResourceObjectRepository internal constructor(
             store,
             uid,
             childrenAppenders,
-            s
+            s,
         )
-    })
+    },
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
index c42dcaa44f..256e13ad80 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
@@ -40,7 +40,7 @@ internal class RelationshipObjectRepository(
     uid: String?,
     childrenAppenders: Map<String, ChildrenAppender<Relationship>>,
     scope: RepositoryScope,
-    private val trackerDataManager: TrackerDataManager
+    private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<Relationship, RelationshipObjectRepository>(
     store,
     childrenAppenders,
@@ -51,9 +51,10 @@ internal class RelationshipObjectRepository(
             uid,
             childrenAppenders,
             s,
-            trackerDataManager
+            trackerDataManager,
         )
-    }) {
+    },
+) {
     override fun propagateState(m: Relationship, action: HandleAction) {
         trackerDataManager.propagateRelationshipUpdate(m, action)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
index 006e4069fe..5ec9205721 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
@@ -38,7 +38,7 @@ import javax.inject.Inject
 @Reusable
 class AnalyticsDhisVisualizationsSettingObjectRepository @Inject internal constructor(
     private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore,
-    analyticsSettingCall: AnalyticsSettingCall
+    analyticsSettingCall: AnalyticsSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsDhisVisualizationsSetting>(analyticsSettingCall),
     ReadOnlyWithDownloadObjectRepository<AnalyticsDhisVisualizationsSetting> {
     fun getByProgram(program: String?): Single<List<AnalyticsDhisVisualizationsGroup>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
index 86a7e597ef..786bfb7e10 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 class AnalyticsSettingObjectRepository @Inject internal constructor(
     private val analyticsTeiSettingRepository: AnalyticsTeiSettingCollectionRepository,
     analyticsSettingCall: AnalyticsSettingCall,
-    private val analyticsDhisVisualizationsSettingObjectRepository: AnalyticsDhisVisualizationsSettingObjectRepository
+    private val analyticsDhisVisualizationsSettingObjectRepository: AnalyticsDhisVisualizationsSettingObjectRepository,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsSettings>(analyticsSettingCall),
     ReadOnlyWithDownloadObjectRepository<AnalyticsSettings> {
     override fun blockingGet(): AnalyticsSettings? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
index 568e2eb187..4343e52620 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
@@ -40,10 +40,11 @@ import org.hisp.dhis.android.core.settings.internal.ProgramConfigurationSettingS
 import javax.inject.Inject
 
 @Reusable
+@Suppress("TooManyFunctions")
 class AppearanceSettingsObjectRepository @Inject internal constructor(
     private val filterSettingStore: FilterSettingStore,
     private val programConfigurationSettingStore: ProgramConfigurationSettingStore,
-    appearanceSettingCall: AppearanceSettingCall
+    appearanceSettingCall: AppearanceSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AppearanceSettings>(appearanceSettingCall),
     ReadOnlyWithDownloadObjectRepository<AppearanceSettings> {
     override fun blockingGet(): AppearanceSettings? {
@@ -53,14 +54,14 @@ class AppearanceSettingsObjectRepository @Inject internal constructor(
         return if (filters.isEmpty() && programConfigurationSettingList.isEmpty()) {
             null
         } else {
-            //FilterSorting
+            // FilterSorting
             val filterSorting = FilterSorting.builder()
                 .home(getHomeFilters(filters))
                 .dataSetSettings(getDataSetFilters(filters))
                 .programSettings(getProgramFilters(filters))
                 .build()
 
-            //ProgramConfigurationSettings
+            // ProgramConfigurationSettings
             val programConfigurationSettings = ProgramConfigurationSettings.builder()
                 .globalSettings(getGlobal(programConfigurationSettingList))
                 .specificSettings(getSpecifics(programConfigurationSettingList))
@@ -151,6 +152,7 @@ class AppearanceSettingsObjectRepository @Inject internal constructor(
         val programSettingList = programConfigurationSettingStore.selectAll()
         return getGlobal(programSettingList)
     }
+
     @Deprecated("")
     fun getGlobalCompletionSpinner(): CompletionSpinner? {
         val setting = getGlobalProgramConfigurationSetting()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
index c5c1f693e1..1c559615c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 @Reusable
 class DataSetSettingsObjectRepository @Inject internal constructor(
     private val store: DataSetSettingStore,
-    dataSetSettingCall: DataSetSettingCall
+    dataSetSettingCall: DataSetSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<DataSetSettings>(dataSetSettingCall),
     ReadOnlyWithDownloadObjectRepository<DataSetSettings> {
     override fun blockingGet(): DataSetSettings? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
index 5917cbe3ca..aae5118d06 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
 class GeneralSettingObjectRepository @Inject internal constructor(
     private val store: GeneralSettingStore,
     private val syncStore: SynchronizationSettingStore,
-    generalSettingCall: GeneralSettingCall
+    generalSettingCall: GeneralSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<GeneralSettings>(generalSettingCall),
     ReadOnlyWithDownloadObjectRepository<GeneralSettings> {
     override fun blockingGet(): GeneralSettings? {
@@ -49,11 +49,17 @@ class GeneralSettingObjectRepository @Inject internal constructor(
             null
         } else {
             val generalSetting =
-                if (generalSettings.isEmpty()) GeneralSettings.builder().build()
-                else generalSettings[0]
+                if (generalSettings.isEmpty()) {
+                    GeneralSettings.builder().build()
+                } else {
+                    generalSettings[0]
+                }
             val syncSetting =
-                if (syncSettings.isEmpty()) SynchronizationSettings.builder().build()
-                else syncSettings[0]
+                if (syncSettings.isEmpty()) {
+                    SynchronizationSettings.builder().build()
+                } else {
+                    syncSettings[0]
+                }
 
             generalSetting.toBuilder()
                 .dataSync(syncSetting.dataSync())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
index 41cf07f572..d2bf794c88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 @Reusable
 class ProgramSettingsObjectRepository @Inject internal constructor(
     private val store: ProgramSettingStore,
-    programSettingCall: ProgramSettingCall
+    programSettingCall: ProgramSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<ProgramSettings>(programSettingCall),
     ReadOnlyWithDownloadObjectRepository<ProgramSettings> {
     override fun blockingGet(): ProgramSettings? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
index 95b9888cf0..898eebaf6c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
@@ -39,7 +39,7 @@ class SynchronizationSettingObjectRepository @Inject internal constructor(
     private val syncStore: SynchronizationSettingStore,
     private val dataSetSettingsRepository: DataSetSettingsObjectRepository,
     private val programSettingsRepository: ProgramSettingsObjectRepository,
-    synchronizationSettingCall: SynchronizationSettingCall
+    synchronizationSettingCall: SynchronizationSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<SynchronizationSettings>(synchronizationSettingCall),
     ReadOnlyWithDownloadObjectRepository<SynchronizationSettings> {
     override fun blockingGet(): SynchronizationSettings? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
index ebbece0524..ba84c1eb20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 @Reusable
 class UserSettingsObjectRepository @Inject internal constructor(
     private val store: UserSettingsStore,
-    generalSettingCall: GeneralSettingCall
+    generalSettingCall: GeneralSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<UserSettings>(generalSettingCall),
     ReadOnlyWithDownloadObjectRepository<UserSettings> {
     override fun blockingGet(): UserSettings? {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
index e76755fc63..1f11b5c0f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
@@ -39,9 +39,9 @@ import javax.inject.Inject
 @Reusable
 class SystemInfoObjectRepository @Inject internal constructor(
     store: SystemInfoStore,
-    childrenAppenders: Map<String, ChildrenAppender<SystemInfo>>,
+    childrenAppenders: MutableMap<String, ChildrenAppender<SystemInfo>>,
     scope: RepositoryScope,
-    systemInfoCall: SystemInfoCall
+    systemInfoCall: SystemInfoCall,
 ) : ReadOnlyFirstObjectWithDownloadRepositoryImpl<SystemInfo, SystemInfoObjectRepository>(
     store,
     childrenAppenders,
@@ -52,6 +52,7 @@ class SystemInfoObjectRepository @Inject internal constructor(
             store,
             childrenAppenders,
             cs,
-            systemInfoCall
+            systemInfoCall,
         )
-    })
+    },
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
index a9b4bfe7e9..435aefb8b7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
@@ -44,16 +44,22 @@ class TrackedEntityAttributeValueObjectRepository internal constructor(
     scope: RepositoryScope,
     private val dataStatePropagator: DataStatePropagator,
     private val trackedEntityAttribute: String,
-    private val trackedEntityInstance: String
+    private val trackedEntityInstance: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<TrackedEntityAttributeValue, TrackedEntityAttributeValueObjectRepository>(
     store,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         TrackedEntityAttributeValueObjectRepository(
-            store, childrenAppenders, s, dataStatePropagator, trackedEntityAttribute, trackedEntityInstance
+            store,
+            childrenAppenders,
+            s,
+            dataStatePropagator,
+            trackedEntityAttribute,
+            trackedEntityInstance,
         )
-    }),
+    },
+),
     ReadWriteValueObjectRepository<TrackedEntityAttributeValue> {
     override fun set(value: String?): Completable {
         return Completable.fromAction { blockingSet(value) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
index 0529b04758..a227ce6682 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
@@ -44,16 +44,22 @@ class TrackedEntityDataValueObjectRepository internal constructor(
     scope: RepositoryScope,
     private val dataStatePropagator: DataStatePropagator,
     private val event: String,
-    private val dataElement: String
+    private val dataElement: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueObjectRepository>(
     store,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         TrackedEntityDataValueObjectRepository(
-            store, childrenAppenders, s, dataStatePropagator, event, dataElement
+            store,
+            childrenAppenders,
+            s,
+            dataStatePropagator,
+            event,
+            dataElement,
         )
-    }),
+    },
+),
     ReadWriteValueObjectRepository<TrackedEntityDataValue> {
     override fun set(value: String?): Completable {
         return Completable.fromAction { blockingSet(value) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
index 090316abd1..7241bf9c63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
@@ -48,7 +48,7 @@ class TrackedEntityInstanceObjectRepository internal constructor(
     uid: String?,
     childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
     scope: RepositoryScope,
-    private val trackerDataManager: TrackerDataManager
+    private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<TrackedEntityInstance, TrackedEntityInstanceObjectRepository>(
     store,
     childrenAppenders,
@@ -59,9 +59,10 @@ class TrackedEntityInstanceObjectRepository internal constructor(
             uid,
             childrenAppenders,
             s,
-            trackerDataManager
+            trackerDataManager,
         )
-    }) {
+    },
+) {
 
     @Throws(D2Error::class)
     fun setOrganisationUnitUid(organisationUnitUid: String?): Unit {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
index 93af7c144c..5c340f0cec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
@@ -39,14 +39,16 @@ import javax.inject.Inject
 class AuthenticatedUserObjectRepository @Inject internal constructor(
     store: AuthenticatedUserStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<AuthenticatedUser>>,
-    scope: RepositoryScope
-) : ReadOnlyOneObjectRepositoryImpl<AuthenticatedUser, AuthenticatedUserObjectRepository>(store,
+    scope: RepositoryScope,
+) : ReadOnlyOneObjectRepositoryImpl<AuthenticatedUser, AuthenticatedUserObjectRepository>(
+    store,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { updatedScope: RepositoryScope ->
         AuthenticatedUserObjectRepository(
             store,
             childrenAppenders,
-            updatedScope
+            updatedScope,
         )
-    })
+    },
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
index 5b232b1911..f6f1771f0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
@@ -40,15 +40,19 @@ import javax.inject.Inject
 class UserObjectRepository @Inject internal constructor(
     store: UserStore,
     childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
-    scope: RepositoryScope
-) : ReadOnlyOneObjectRepositoryImpl<User, UserObjectRepository>(store, childrenAppenders, scope,
+    scope: RepositoryScope,
+) : ReadOnlyOneObjectRepositoryImpl<User, UserObjectRepository>(
+    store,
+    childrenAppenders,
+    scope,
     ObjectRepositoryFactory<UserObjectRepository> { s: RepositoryScope ->
         UserObjectRepository(
             store,
             childrenAppenders,
-            s
+            s,
         )
-    }) {
+    },
+) {
     fun withUserRoles(): UserObjectRepository {
         return cf.withChild(UserFields.USER_ROLES)
     }

From 05b1dfbefe5588418d2137c4894da4fd99c37724 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 6 Oct 2023 18:56:44 +0200
Subject: [PATCH 413/478] [ANDROSDK-1700] Replace childrenAppenders in base
 classes

---
 .../internal/ChildreAppenderGetter.kt         | 33 +++++++++++++++++++
 .../internal/ChildrenAppenderExecutor.kt      | 16 +++++----
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |  8 +++--
 .../ReadOnlyCollectionRepositoryImpl.kt       | 12 ++++---
 ...nlyIdentifiableCollectionRepositoryImpl.kt |  8 +++--
 ...eadOnlyNameableCollectionRepositoryImpl.kt |  7 ++--
 ...WithTransformerCollectionRepositoryImpl.kt | 17 +++++++---
 ...dAndTransformerCollectionRepositoryImpl.kt | 23 ++++++++++---
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |  9 +++--
 ...eadWriteWithUidCollectionRepositoryImpl.kt |  7 ++--
 .../ReadOnlyOneObjectRepositoryFinalImpl.kt   |  8 +++--
 ...lyFirstObjectWithDownloadRepositoryImpl.kt |  7 ++--
 .../internal/ReadOnlyObjectRepositoryImpl.kt  |  9 +++--
 .../ReadOnlyOneObjectRepositoryImpl.kt        |  8 +++--
 ...OnlyWithTransformerObjectRepositoryImpl.kt |  7 ++--
 ...eadWriteWithUidDataObjectRepositoryImpl.kt |  8 +++--
 .../ReadWriteWithUidObjectRepositoryImpl.kt   |  7 ++--
 .../ReadWriteWithValueObjectRepositoryImpl.kt |  8 +++--
 .../paging/internal/RepositoryDataSource.kt   |  8 +++--
 .../RepositoryDataSourceWithTransformer.kt    |  7 ++--
 .../user/UserCredentialsObjectRepository.kt   | 15 +++++++--
 21 files changed, 173 insertions(+), 59 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildreAppenderGetter.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildreAppenderGetter.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildreAppenderGetter.kt
new file mode 100644
index 0000000000..96b0c1034b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildreAppenderGetter.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.repositories.children.internal
+
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+
+internal typealias ChildrenAppenderGetter<M> = Map<String, (DatabaseAdapter) -> ChildrenAppender<M>>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
index ee943b38c1..2a03bc18d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderExecutor.kt
@@ -27,17 +27,19 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.children.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.CoreObject
 
 internal object ChildrenAppenderExecutor {
     @JvmStatic
     fun <M> appendInObject(
         m: M?,
-        childrenAppenders: Map<String, ChildrenAppender<M>>,
+        databaseAdapter: DatabaseAdapter,
+        childrenAppenders: ChildrenAppenderGetter<M>,
         childrenSelection: ChildrenSelection,
     ): M? {
         return m?.let {
-            val selectedAppenders = getSelectedChildrenAppenders(childrenAppenders, childrenSelection)
+            val selectedAppenders = getSelectedChildrenAppenders(databaseAdapter, childrenAppenders, childrenSelection)
             selectedAppenders.fold(m) { nWithChildren: M, appender ->
                 appender.prepareChildren(setOf(nWithChildren))
                 appender.appendChildren(nWithChildren)
@@ -48,10 +50,11 @@ internal object ChildrenAppenderExecutor {
     @JvmStatic
     fun <M : CoreObject?> appendInObjectCollection(
         list: List<M>,
-        childrenAppenders: Map<String, ChildrenAppender<M>>,
+        databaseAdapter: DatabaseAdapter,
+        childrenAppenders: ChildrenAppenderGetter<M>,
         childrenSelection: ChildrenSelection,
     ): List<M> {
-        val selectedAppenders = getSelectedChildrenAppenders(childrenAppenders, childrenSelection)
+        val selectedAppenders = getSelectedChildrenAppenders(databaseAdapter, childrenAppenders, childrenSelection)
 
         selectedAppenders.forEach { it.prepareChildren(list) }
 
@@ -63,9 +66,10 @@ internal object ChildrenAppenderExecutor {
     }
 
     private fun <M> getSelectedChildrenAppenders(
-        appendersMap: Map<String, ChildrenAppender<M>>,
+        databaseAdapter: DatabaseAdapter,
+        appendersMap: ChildrenAppenderGetter<M>,
         childrenSelection: ChildrenSelection,
     ): Collection<ChildrenAppender<M>> {
-        return childrenSelection.children.mapNotNull { key -> appendersMap[key] }
+        return childrenSelection.children.mapNotNull { key -> appendersMap[key]?.invoke(databaseAdapter) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
index ce4ff50cb2..9f6a7e93ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/BaseReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -28,9 +28,10 @@
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -40,10 +41,11 @@ import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
 abstract class BaseReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
     @JvmField internal val store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
-) : ReadOnlyCollectionRepositoryImpl<M, R>(store, childrenAppenders, scope, cf),
+) : ReadOnlyCollectionRepositoryImpl<M, R>(store, databaseAdapter, childrenAppenders, scope, cf),
     ReadOnlyWithUidCollectionRepository<M> where M : CoreObject, M : ObjectWithUidInterface {
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
index e9faac8f20..665b2743cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyCollectionRepositoryImpl.kt
@@ -32,11 +32,12 @@ import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
@@ -47,10 +48,12 @@ import org.hisp.dhis.android.core.common.CoreObject
 
 open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollectionRepository<M>> internal constructor(
     private val store: ReadableStore<M>,
-    @JvmField internal val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    internal val databaseAdapter: DatabaseAdapter,
+    internal val childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
 ) : BaseRepositoryImpl<R>(scope, cf), ReadOnlyCollectionRepository<M> {
+
     protected fun blockingGetWithoutChildren(): List<M> {
         return store.selectWhere(
             whereClause,
@@ -67,7 +70,7 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
      * @return Object repository
      */
     override fun one(): ReadOnlyOneObjectRepositoryFinalImpl<M> {
-        return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, scope)
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, databaseAdapter, childrenAppenders, scope)
     }
 
     /**
@@ -79,6 +82,7 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
     override fun blockingGet(): List<M> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
             blockingGetWithoutChildren(),
+            databaseAdapter,
             childrenAppenders,
             scope.children(),
         )
@@ -111,7 +115,7 @@ open class ReadOnlyCollectionRepositoryImpl<M : CoreObject, R : ReadOnlyCollecti
 
     @Deprecated("Use {@link #getPagingData()} instead}", replaceWith = ReplaceWith("getPagingData()"))
     val dataSource: DataSource<M, M>
-        get() = RepositoryDataSource(store, scope, childrenAppenders)
+        get() = RepositoryDataSource(store, databaseAdapter, scope, childrenAppenders)
 
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
index 3ad0d7fd94..25d2875f25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyIdentifiableCollectionRepositoryImpl.kt
@@ -27,8 +27,9 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyIdentifiableCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -43,10 +44,11 @@ import org.hisp.dhis.android.core.common.IdentifiableObject
 @Suppress("TooManyFunctions")
 open class ReadOnlyIdentifiableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
     store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
-) : ReadOnlyWithUidCollectionRepositoryImpl<M, R>(store, childrenAppenders, scope, cf),
+) : ReadOnlyWithUidCollectionRepositoryImpl<M, R>(store, databaseAdapter, childrenAppenders, scope, cf),
     ReadOnlyIdentifiableCollectionRepository<M, R> where M : CoreObject, M : IdentifiableObject {
     override fun byUid(): StringFilterConnector<R> {
         return cf.string(IdentifiableColumns.UID)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
index 230ae3912e..f817a8ecf0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyNameableCollectionRepositoryImpl.kt
@@ -27,8 +27,9 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyNameableCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -41,11 +42,13 @@ import org.hisp.dhis.android.core.common.NameableObject
 
 open class ReadOnlyNameableCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
     store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<M, R>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     cf,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index fd074debff..047aebfc8d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -32,12 +32,13 @@ import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
@@ -53,7 +54,8 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
     R : ReadOnlyCollectionRepository<T>,
     > internal constructor(
     private val store: ReadableStore<M>,
-    val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    internal val databaseAdapter: DatabaseAdapter,
+    internal val childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
     open val transformer: TwoWayTransformer<M, T>,
@@ -75,7 +77,13 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
      * @return Object repository
      */
     override fun one(): ReadOnlyObjectRepository<T> {
-        return ReadOnlyWithTransformerObjectRepositoryImpl(store, childrenAppenders, scope, transformer)
+        return ReadOnlyWithTransformerObjectRepositoryImpl(
+            store,
+            databaseAdapter,
+            childrenAppenders,
+            scope,
+            transformer
+        )
     }
 
     /**
@@ -87,6 +95,7 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
     override fun blockingGet(): List<T> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
             blockingGetWithoutChildren(),
+            databaseAdapter,
             childrenAppenders,
             scope.children(),
         ).map { transformer.transform(it) }
@@ -118,7 +127,7 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
     }
 
     val dataSource: DataSource<M, T>
-        get() = RepositoryDataSourceWithTransformer(store, scope, childrenAppenders, transformer)
+        get() = RepositoryDataSourceWithTransformer(store, databaseAdapter, scope, childrenAppenders, transformer)
 
     /**
      * Get the count of elements in an asynchronous way, returning a `Single`.
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index 07ef8a340a..39fc0cb2c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -28,10 +28,11 @@
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -48,11 +49,19 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
     R : ReadOnlyCollectionRepository<T>,
     > internal constructor(
     private val store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
     override val transformer: TwoWayTransformer<M, T>,
-) : ReadOnlyWithTransformerCollectionRepositoryImpl<M, T, R>(store, childrenAppenders, scope, cf, transformer),
+) : ReadOnlyWithTransformerCollectionRepositoryImpl<M, T, R>(
+    store,
+    databaseAdapter,
+    childrenAppenders,
+    scope,
+    cf,
+    transformer
+),
     ReadOnlyWithUidCollectionRepository<T>
     where M : CoreObject, M : ObjectWithUidInterface, T : ObjectWithUidInterface {
     /**
@@ -88,6 +97,12 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
      */
     override fun uid(uid: String?): ReadOnlyObjectRepository<T> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
-        return ReadOnlyWithTransformerObjectRepositoryImpl(store, childrenAppenders, updatedScope, transformer)
+        return ReadOnlyWithTransformerObjectRepositoryImpl(
+            store,
+            databaseAdapter,
+            childrenAppenders,
+            updatedScope,
+            transformer
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index 18df710214..cc9d6ef9a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -27,8 +27,9 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRepositoryFinalImpl
@@ -39,11 +40,13 @@ import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 
 open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepository<M>> internal constructor(
     store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     cf: FilterConnectorFactory<R>,
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     cf,
@@ -56,6 +59,6 @@ open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepo
      */
     override fun uid(uid: String?): ReadOnlyOneObjectRepositoryFinalImpl<M> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
-        return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, updatedScope)
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, databaseAdapter, childrenAppenders, scope)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
index a35b964ba1..64db4ad147 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadWriteWithUidCollectionRepositoryImpl.kt
@@ -28,10 +28,11 @@
 package org.hisp.dhis.android.core.arch.repositories.collection.internal
 
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -44,12 +45,14 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
 abstract class ReadWriteWithUidCollectionRepositoryImpl<M, P, R : ReadOnlyCollectionRepository<M>>internal constructor(
     store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     @JvmField protected val transformer: Transformer<P, M>,
     cf: FilterConnectorFactory<R>,
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<M, R>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     cf,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
index bd905f6442..2e5ffab241 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/ReadOnlyOneObjectRepositoryFinalImpl.kt
@@ -27,23 +27,27 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.`object`
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
 class ReadOnlyOneObjectRepositoryFinalImpl<M> internal constructor(
     store: ReadableStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
 ) : ReadOnlyOneObjectRepositoryImpl<M, ReadOnlyOneObjectRepositoryFinalImpl<M>>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         ReadOnlyOneObjectRepositoryFinalImpl(
             store,
+            databaseAdapter,
             childrenAppenders,
             s,
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
index cc81587465..e367e6f9ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
@@ -30,8 +30,10 @@ package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 import io.reactivex.Completable
 import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -40,11 +42,12 @@ import org.hisp.dhis.android.core.common.CoreObject
 open class ReadOnlyFirstObjectWithDownloadRepositoryImpl<M : CoreObject, R : ReadOnlyObjectRepository<M>>
 internal constructor(
     store: ObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     private val downloadProvider: DownloadProvider,
     repositoryFactory: ObjectRepositoryFactory<R>,
-) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
+) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, databaseAdapter, childrenAppenders, scope, repositoryFactory),
     ReadOnlyWithDownloadObjectRepository<M> {
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
index f5c42ca547..361e34ff60 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyObjectRepositoryImpl.kt
@@ -28,14 +28,16 @@
 package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 
 abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    private val databaseAdapter: DatabaseAdapter,
+    private val childrenAppenderGetter: ChildrenAppenderGetter<M>,
     protected val scope: RepositoryScope,
     repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyObjectRepository<M> {
@@ -59,7 +61,8 @@ abstract class ReadOnlyObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>>
     override fun blockingGet(): M? {
         return ChildrenAppenderExecutor.appendInObject(
             blockingGetWithoutChildren(),
-            childrenAppenders,
+            databaseAdapter,
+            childrenAppenderGetter,
             scope.children(),
         )
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
index 85b1b93bdc..77e695685f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyOneObjectRepositoryImpl.kt
@@ -27,19 +27,21 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 
 open class ReadOnlyOneObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
     private val store: ReadableStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     repositoryFactory: ObjectRepositoryFactory<R>,
-) : ReadOnlyObjectRepositoryImpl<M, R>(childrenAppenders, scope, repositoryFactory) {
+) : ReadOnlyObjectRepositoryImpl<M, R>(databaseAdapter, childrenAppenders, scope, repositoryFactory) {
 
     override fun blockingGetWithoutChildren(): M? {
         val whereClauseBuilder = WhereClauseFromScopeBuilder(WhereClauseBuilder())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
index 1aa263109a..f03a7741be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyWithTransformerObjectRepositoryImpl.kt
@@ -28,11 +28,12 @@
 package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
@@ -40,7 +41,8 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFr
 internal class ReadOnlyWithTransformerObjectRepositoryImpl<M, T, R : ReadOnlyObjectRepository<T>>
 internal constructor(
     private val store: ReadableStore<M>,
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    private val databaseAdapter: DatabaseAdapter,
+    private val childrenAppenders: ChildrenAppenderGetter<M>,
     private val scope: RepositoryScope,
     private val transformer: TwoWayTransformer<M, T>,
 ) : ReadOnlyObjectRepository<T> {
@@ -66,6 +68,7 @@ internal constructor(
     override fun blockingGet(): T? {
         val item = ChildrenAppenderExecutor.appendInObject(
             blockingGetWithoutChildren(),
+            databaseAdapter,
             childrenAppenders,
             scope.children(),
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
index 8863951370..1111f7e8a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidDataObjectRepositoryImpl.kt
@@ -29,9 +29,10 @@ package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
 import android.util.Log
 import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -45,10 +46,11 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
 abstract class ReadWriteWithUidDataObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
     store: IdentifiableDeletableDataObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     repositoryFactory: ObjectRepositoryFactory<R>,
-) : ReadWriteWithUidObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
+) : ReadWriteWithUidObjectRepositoryImpl<M, R>(store, databaseAdapter, childrenAppenders, scope, repositoryFactory),
     ReadWriteObjectRepository<M> where M : CoreObject, M : ObjectWithUidInterface, M : DeletableDataObject {
     /**
      * Removes the object in scope in an asynchronous way. Field [DataObject.syncState] is marked as
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
index 164d8d39ad..2b3fd41d06 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithUidObjectRepositoryImpl.kt
@@ -27,8 +27,9 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.CoreObject
@@ -40,11 +41,13 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 
 open class ReadWriteWithUidObjectRepositoryImpl<M, R : ReadOnlyObjectRepository<M>> internal constructor(
     private val store: IdentifiableObjectStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     repositoryFactory: ObjectRepositoryFactory<R>,
 ) : ReadOnlyOneObjectRepositoryImpl<M, R>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     repositoryFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
index 63c67e9e97..907772ae22 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadWriteWithValueObjectRepositoryImpl.kt
@@ -29,8 +29,9 @@ package org.hisp.dhis.android.core.arch.repositories.`object`.internal
 
 import android.util.Log
 import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -42,10 +43,11 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 open class ReadWriteWithValueObjectRepositoryImpl<M : CoreObject, R : ReadOnlyObjectRepository<M>>
 internal constructor(
     private val store: ObjectWithoutUidStore<M>,
-    childrenAppenders: Map<String, ChildrenAppender<M>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<M>,
     scope: RepositoryScope,
     repositoryFactory: ObjectRepositoryFactory<R>,
-) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, childrenAppenders, scope, repositoryFactory),
+) : ReadOnlyOneObjectRepositoryImpl<M, R>(store, databaseAdapter, childrenAppenders, scope, repositoryFactory),
     ReadWriteObjectRepository<M> {
 
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
index 31f0b7d688..43f5885f47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSource.kt
@@ -28,19 +28,21 @@
 package org.hisp.dhis.android.core.arch.repositories.paging.internal
 
 import androidx.paging.ItemKeyedDataSource
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor.appendInObjectCollection
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
 
 class RepositoryDataSource<M : CoreObject> internal constructor(
     private val store: ReadableStore<M>,
+    private val databaseAdapter: DatabaseAdapter,
     private val scope: RepositoryScope,
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    private val childrenAppenders: ChildrenAppenderGetter<M>,
 ) : ItemKeyedDataSource<M, M>() {
     override fun loadInitial(params: LoadInitialParams<M>, callback: LoadInitialCallback<M>) {
         val whereClause = WhereClauseFromScopeBuilder(WhereClauseBuilder()).getWhereClause(
@@ -88,6 +90,6 @@ class RepositoryDataSource<M : CoreObject> internal constructor(
     }
 
     private fun appendChildren(withoutChildren: List<M>): List<M> {
-        return appendInObjectCollection(withoutChildren, childrenAppenders, scope.children())
+        return appendInObjectCollection(withoutChildren, databaseAdapter, childrenAppenders, scope.children())
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
index 214fc10e64..0155c4cc6d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/paging/internal/RepositoryDataSourceWithTransformer.kt
@@ -28,20 +28,22 @@
 package org.hisp.dhis.android.core.arch.repositories.paging.internal
 
 import androidx.paging.ItemKeyedDataSource
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStore
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.WhereClauseFromScopeBuilder
 import org.hisp.dhis.android.core.common.CoreObject
 
 internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> internal constructor(
     private val store: ReadableStore<M>,
+    private val databaseAdapter: DatabaseAdapter,
     private val scope: RepositoryScope,
-    private val childrenAppenders: Map<String, ChildrenAppender<M>>,
+    private val childrenAppenders: ChildrenAppenderGetter<M>,
     private val transformer: TwoWayTransformer<M, T>,
 ) : ItemKeyedDataSource<M, T>() {
 
@@ -88,6 +90,7 @@ internal class RepositoryDataSourceWithTransformer<M : CoreObject, T : Any> inte
     private fun appendChildren(withoutChildren: List<M>): List<T> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
             withoutChildren,
+            databaseAdapter,
             childrenAppenders,
             scope.children(),
         ).map { transformer.transform(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index 880afc4ca4..0eb8f62cb7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -28,12 +28,14 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyWithTransformerObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserCredentialsFields
+import org.hisp.dhis.android.core.user.internal.UserRoleChildrenAppender
 import org.hisp.dhis.android.core.user.internal.UserStore
 import org.hisp.dhis.android.core.user.internal.UserUserCredentialsTransformer
 import javax.inject.Inject
@@ -41,21 +43,28 @@ import javax.inject.Inject
 @Reusable
 class UserCredentialsObjectRepository @Inject internal constructor(
     store: UserStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     transformer: UserUserCredentialsTransformer,
 ) : ReadOnlyObjectRepository<UserCredentials> by ReadOnlyWithTransformerObjectRepositoryImpl(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     transformer,
 ) {
 
     private val cf: FilterConnectorFactory<UserCredentialsObjectRepository> = FilterConnectorFactory(scope) { s ->
-        UserCredentialsObjectRepository(store, childrenAppenders, s, transformer)
+        UserCredentialsObjectRepository(store, databaseAdapter, s, transformer)
     }
 
     fun withUserRoles(): UserCredentialsObjectRepository {
         return cf.withChild(UserCredentialsFields.USER_ROLES)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<User> = mapOf(
+            UserCredentialsFields.USER_ROLES to { d -> UserRoleChildrenAppender(d) }
+        )
+    }
 }

From 81b206edffdf8bb54b26277d4ec7c603a308019f Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 9 Oct 2023 13:07:12 +0200
Subject: [PATCH 414/478] [ANDROSDK-1700] Refactor childrenAppenders

---
 .../core/arch/d2/internal/D2DIComponent.kt    |   3 +-
 ...ReadOnlyWithUidCollectionRepositoryImpl.kt |   2 +-
 .../category/CategoryCollectionRepository.kt  |  15 +-
 .../CategoryComboCollectionRepository.kt      |  15 +-
 .../CategoryOptionCollectionRepository.kt     |  15 +-
 ...CategoryOptionComboCollectionRepository.kt |  15 +-
 .../internal/CategoryComboEntityDIModule.kt   |   8 -
 .../internal/CategoryEntityDIModule.kt        |  11 --
 .../CategoryOptionComboEntityDIModule.kt      |   9 -
 .../internal/CategoryOptionEntityDIModule.kt  |  12 --
 .../constant/ConstantCollectionRepository.kt  |  12 +-
 .../internal/ConstantPackageDIModule.kt       |   7 -
 .../DataApprovalCollectionRepository.kt       |   9 +-
 .../internal/DataApprovalEntityDIModule.kt    |   8 -
 .../DataElementCollectionRepository.kt        |  15 +-
 .../internal/DataElementEntityDIModule.kt     |  12 --
 .../dataset/DataSetCollectionRepository.kt    |  22 ++-
 ...ompleteRegistrationCollectionRepository.kt |  15 +-
 ...SetCompleteRegistrationObjectRepository.kt |   8 +-
 .../DataSetInstanceCollectionRepository.kt    |   4 +
 ...aSetInstanceSummaryCollectionRepository.kt |   4 +
 .../dataset/SectionCollectionRepository.kt    |  19 +-
 ...taSetCompleteRegistrationEntityDIModule.kt |   8 -
 .../dataset/internal/DataSetEntityDIModule.kt |  16 --
 .../dataset/internal/SectionEntityDIModule.kt |  12 --
 .../DataStoreCollectionRepository.kt          |  14 +-
 .../datastore/DataStoreObjectRepository.kt    |   9 +-
 .../LocalDataStoreCollectionRepository.kt     |  15 +-
 .../LocalDataStoreObjectRepository.kt         |   8 +-
 .../internal/DataStoreEntityDIModule.kt       |   6 -
 .../internal/LocalDataStoreEntityDIModule.kt  |   8 -
 .../DataValueCollectionRepository.kt          |  13 +-
 .../DataValueConflictCollectionRepository.kt  |  12 +-
 .../datavalue/DataValueObjectRepository.kt    |   8 +-
 .../DataValueConflictEntityDIModule.kt        |   8 -
 .../internal/DataValueEntityDIModule.kt       |   8 -
 .../EnrollmentCollectionRepository.kt         |  18 +-
 .../enrollment/EnrollmentObjectRepository.kt  |   8 +-
 .../internal/EnrollmentEntityDIModule.kt      |  11 --
 .../core/event/EventCollectionRepository.kt   |  20 +-
 .../event/EventFilterCollectionRepository.kt  |  15 +-
 .../core/event/EventObjectRepository.kt       |  13 +-
 .../event/internal/EventEntityDIModule.kt     |  13 --
 .../internal/EventFilterEntityDIModule.kt     |  10 -
 ...essionDimensionItemCollectionRepository.kt |  12 +-
 .../ExpressionDimensionItemEntityDIModule.kt  |   8 -
 .../FileResourceCollectionRepository.kt       |  14 +-
 .../FileResourceObjectRepository.kt           |   8 +-
 .../internal/FileResourceEntityDIModule.kt    |   8 -
 ...ackerImportConflictCollectionRepository.kt |  12 +-
 .../TrackerImportConflictEntityDIModule.kt    |   8 -
 .../IndicatorCollectionRepository.kt          |  15 +-
 .../IndicatorTypeCollectionRepository.kt      |  12 +-
 .../internal/IndicatorEntityDIModule.kt       |  10 -
 .../internal/IndicatorTypeEntityDIModule.kt   |   8 -
 .../legendset/LegendCollectionRepository.kt   |  12 +-
 .../LegendSetCollectionRepository.kt          |  15 +-
 .../internal/LegendEntityDIModule.kt          |   8 -
 .../internal/LegendSetEntityDIModule.kt       |  10 -
 .../D2ErrorCollectionRepository.kt            |  12 +-
 ...ForeignKeyViolationCollectionRepository.kt |  12 +-
 .../internal/D2ErrorEntityDIModule.kt         |   8 -
 .../ForeignKeyViolationEntityDIModule.kt      |   8 -
 .../map/layer/MapLayerCollectionRepository.kt |  15 +-
 .../layer/internal/MapLayerEntityDIModule.kt  |  12 --
 .../MapLayerImagerProviderChildrenAppender.kt |   4 +-
 .../core/note/NoteCollectionRepository.kt     |  14 +-
 .../core/note/internal/NoteEntityDIModule.kt  |   8 -
 .../core/option/OptionCollectionRepository.kt |  12 +-
 .../option/OptionGroupCollectionRepository.kt |  15 +-
 .../option/OptionSetCollectionRepository.kt   |  12 +-
 .../option/internal/OptionEntityDIModule.kt   |   8 -
 .../internal/OptionGroupEntityDIModule.kt     |  10 -
 .../internal/OptionSetEntityDIModule.kt       |   8 -
 .../OrganisationUnitCollectionRepository.kt   |  20 +-
 ...ganisationUnitGroupCollectionRepository.kt |  12 +-
 ...ganisationUnitLevelCollectionRepository.kt |  12 +-
 .../OrganisationUnitEntityDIModule.kt         |  13 --
 .../OrganisationUnitGroupEntityDIModule.kt    |   8 -
 .../OrganisationUnitLevelEntityDIModule.kt    |   8 -
 .../core/period/PeriodCollectionRepository.kt |  12 +-
 .../period/internal/PeriodEntityDIModule.kt   |   8 -
 .../program/ProgramCollectionRepository.kt    |  15 +-
 .../ProgramIndicatorCollectionRepository.kt   |  18 +-
 .../ProgramRuleActionCollectionRepository.kt  |  12 +-
 .../ProgramRuleCollectionRepository.kt        |  15 +-
 ...ProgramRuleVariableCollectionRepository.kt |  12 +-
 .../ProgramSectionCollectionRepository.kt     |  17 +-
 .../ProgramStageCollectionRepository.kt       |  12 +-
 ...ramStageDataElementCollectionRepository.kt |  15 +-
 ...rogramStageSectionsCollectionRepository.kt |  17 +-
 ...ckedEntityAttributeCollectionRepository.kt |  16 +-
 ...ementValueTypeRenderingChildrenAppender.kt |   7 +-
 .../program/internal/ProgramEntityDIModule.kt |  13 --
 .../ProgramIndicatorEntityDIModule.kt         |  12 --
 .../ProgramRuleActionEntityDIModule.kt        |   8 -
 .../internal/ProgramRuleEntityDIModule.kt     |  10 -
 .../ProgramRuleVariableEntityDIModule.kt      |   8 -
 .../internal/ProgramSectionEntityDIModule.kt  |  10 -
 .../ProgramStageDataElementEntityDIModule.kt  |  12 --
 .../internal/ProgramStageEntityDIModule.kt    |   8 -
 .../ProgramStageSectionEntityDIModule.kt      |  13 --
 ...ramTrackedEntityAttributeEntityDIModule.kt |  12 --
 ...ibuteValueTypeRenderingChildrenAppender.kt |   9 +-
 ...rogramTrackedEntityTypeChildrenAppender.kt |   6 +-
 ...ramStageWorkingListCollectionRepository.kt |  19 +-
 .../ProgramStageWorkingListEntityDIModule.kt  |  15 --
 .../RelationshipCollectionRepository.kt       |  18 +-
 .../RelationshipObjectRepository.kt           |   8 +-
 .../RelationshipTypeCollectionRepository.kt   |  15 +-
 .../RelationshipConstraintChildrenAppender.kt |   9 +-
 .../internal/RelationshipEntityDIModule.kt    |  13 --
 .../RelationshipItemChildrenAppender.kt       |   4 +-
 .../RelationshipTypeEntityDIModule.kt         |  12 --
 ...AnalyticsTeiSettingCollectionRepository.kt |  14 +-
 .../SystemSettingCollectionRepository.kt      |  12 +-
 .../AnalyticsSettingEntityDIModule.kt         |   9 -
 .../AnalyticsTeiDataChildrenAppender.kt       |  10 +-
 .../internal/SystemSettingEntityDIModule.kt   |   8 -
 .../internal/UserSettingsEntityDIModule.kt    |   8 -
 .../systeminfo/SystemInfoObjectRepository.kt  |  14 +-
 .../internal/SystemInfoEntityDIModule.kt      |   8 -
 ...ckedEntityAttributeCollectionRepository.kt |  15 +-
 ...ntityAttributeValueCollectionRepository.kt |  13 +-
 ...kedEntityAttributeValueObjectRepository.kt |   8 +-
 ...ckedEntityDataValueCollectionRepository.kt |  13 +-
 .../TrackedEntityDataValueObjectRepository.kt |   8 +-
 ...ackedEntityInstanceCollectionRepository.kt |  20 +-
 ...ntityInstanceFilterCollectionRepository.kt |  19 +-
 .../TrackedEntityInstanceObjectRepository.kt  |   8 +-
 ...EntityTypeAttributeCollectionRepository.kt |  12 +-
 .../TrackedEntityTypeCollectionRepository.kt  |  16 +-
 .../internal/ProgramOwnerChildrenAppender.kt  |   7 +-
 ...TrackedEntityAttributeLegendSetDIModule.kt |  11 --
 ...ackedEntityAttributeValueEntityDIModule.kt |   8 -
 .../TrackedEntityDataValueEntityDIModule.kt   |   8 -
 .../TrackedEntityInstanceEntityDIModule.kt    |  17 --
 ...ackedEntityInstanceFilterEntityDIModule.kt |  15 --
 ...rackedEntityTypeAttributeEntityDIModule.kt |   8 -
 .../TrackedEntityTypeEntityDIModule.kt        |  11 --
 ...EntityInstanceQueryCollectionRepository.kt |  12 +-
 .../TrackedEntityInstanceQueryDataFetcher.kt  |   8 +-
 ...TrackedEntitySearchCollectionRepository.kt |  13 +-
 .../search/TrackedEntitySearchDataFetcher.kt  |   7 +-
 .../stock/StockUseCaseCollectionRepository.kt |  23 ++-
 .../internal/StockUseCaseEntityDIModule.kt    |  11 --
 ...StockUseCaseTransactionChildrenAppender.kt |   4 +-
 .../user/AuthenticatedUserObjectRepository.kt |  14 +-
 .../user/AuthorityCollectionRepository.kt     |  12 +-
 .../user/UserCredentialsObjectRepository.kt   |   2 +-
 .../android/core/user/UserObjectRepository.kt |  17 +-
 .../core/user/UserRoleCollectionRepository.kt |  14 +-
 .../AuthenticatedUserEntityDIModule.kt        |   8 -
 .../user/internal/AuthorityEntityDIModule.kt  |   8 -
 .../core/user/internal/UserEntityDIModule.kt  |  10 -
 .../user/internal/UserRoleChildrenAppender.kt |   5 +-
 .../user/internal/UserRoleEntityDIModule.kt   |   8 -
 .../ValidationRuleCollectionRepository.kt     |  12 +-
 .../internal/ValidationRuleEntityDIModule.kt  |   8 -
 .../VisualizationCollectionRepository.kt      |  15 +-
 .../internal/VisualizationEntityDIModule.kt   |  10 -
 .../collection/RepositoryPagingShould.java    | 166 -----------------
 .../collection/RepositoryPagingShould.kt      | 176 ++++++++++++++++++
 ...ckedEntityInstanceQueryDataSourceShould.kt |  10 +-
 164 files changed, 1075 insertions(+), 1092 deletions(-)
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index ec08247c27..214e2a7b4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -154,7 +154,8 @@ import javax.inject.Singleton
     ],
 )
 @Suppress("TooManyFunctions")
-internal interface D2DIComponent {
+internal interface
+D2DIComponent {
     fun modules(): D2Modules
     fun metadataModule(): MetadataModuleImpl
     fun aggregatedModule(): AggregatedModuleImpl
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
index cc9d6ef9a9..a83e4de79e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidCollectionRepositoryImpl.kt
@@ -59,6 +59,6 @@ open class ReadOnlyWithUidCollectionRepositoryImpl<M, R : ReadOnlyCollectionRepo
      */
     override fun uid(uid: String?): ReadOnlyOneObjectRepositoryFinalImpl<M> {
         val updatedScope: RepositoryScope = RepositoryScopeHelper.withUidFilterItem(scope, uid)
-        return ReadOnlyOneObjectRepositoryFinalImpl(store, databaseAdapter, childrenAppenders, scope)
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, databaseAdapter, childrenAppenders, updatedScope)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
index 403341a818..e11234a1bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
@@ -28,11 +28,13 @@
 package org.hisp.dhis.android.core.category
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryCategoryOptionChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryFields
 import org.hisp.dhis.android.core.category.internal.CategoryStore
 import javax.inject.Inject
@@ -40,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class CategoryCollectionRepository @Inject internal constructor(
     store: CategoryStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Category>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Category, CategoryCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +54,7 @@ class CategoryCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         CategoryCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -63,4 +66,10 @@ class CategoryCollectionRepository @Inject internal constructor(
     fun withCategoryOptions(): CategoryCollectionRepository {
         return cf.withChild(CategoryFields.CATEGORY_OPTIONS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Category> = mapOf(
+            CategoryFields.CATEGORY_OPTIONS to CategoryCategoryOptionChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
index ecd3c3551f..7480678bcd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
@@ -28,11 +28,13 @@
 package org.hisp.dhis.android.core.category
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryCategoryComboChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryComboFields
 import org.hisp.dhis.android.core.category.internal.CategoryComboStore
 import javax.inject.Inject
@@ -40,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class CategoryComboCollectionRepository @Inject internal constructor(
     store: CategoryComboStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<CategoryCombo>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryCombo, CategoryComboCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +54,7 @@ class CategoryComboCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         CategoryComboCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -63,4 +66,10 @@ class CategoryComboCollectionRepository @Inject internal constructor(
     fun withCategories(): CategoryComboCollectionRepository {
         return cf.withChild(CategoryComboFields.CATEGORIES)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<CategoryCombo> = mapOf(
+            CategoryComboFields.CATEGORIES to CategoryCategoryComboChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
index c488f696e2..50b1c778b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
@@ -28,13 +28,15 @@
 package org.hisp.dhis.android.core.category
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.internal.CategoryOptionFields
+import org.hisp.dhis.android.core.category.internal.CategoryOptionOrganisationUnitChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import javax.inject.Inject
@@ -42,10 +44,11 @@ import javax.inject.Inject
 @Reusable
 class CategoryOptionCollectionRepository @Inject internal constructor(
     store: CategoryOptionStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<CategoryOption>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<CategoryOption, CategoryOptionCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -53,7 +56,7 @@ class CategoryOptionCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         CategoryOptionCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -95,4 +98,10 @@ class CategoryOptionCollectionRepository @Inject internal constructor(
     fun withOrganisationUnits(): CategoryOptionCollectionRepository {
         return cf.withChild(CategoryOptionFields.ORGANISATION_UNITS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<CategoryOption> = mapOf(
+            CategoryOptionFields.ORGANISATION_UNITS to CategoryOptionOrganisationUnitChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
index 965d950323..cafccba71e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
@@ -28,11 +28,13 @@
 package org.hisp.dhis.android.core.category
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.category.internal.CategoryOptionComboCategoryOptionChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboFields
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.common.IdentifiableColumns
@@ -41,10 +43,11 @@ import javax.inject.Inject
 @Reusable
 class CategoryOptionComboCollectionRepository @Inject internal constructor(
     store: CategoryOptionComboStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<CategoryOptionCombo>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<CategoryOptionCombo, CategoryOptionComboCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +55,7 @@ class CategoryOptionComboCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         CategoryOptionComboCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -73,4 +76,10 @@ class CategoryOptionComboCollectionRepository @Inject internal constructor(
     fun withCategoryOptions(): CategoryOptionComboCollectionRepository {
         return cf.withChild(CategoryOptionComboFields.CATEGORY_OPTIONS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<CategoryOptionCombo> = mapOf(
+            CategoryOptionComboFields.CATEGORY_OPTIONS to CategoryOptionComboCategoryOptionChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
index 1ed99f673f..2e6c5f695c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.category.CategoryCombo
 
 @Module
 internal class CategoryComboEntityDIModule {
@@ -52,10 +50,4 @@ internal class CategoryComboEntityDIModule {
     ): CategoryComboHandler {
         return CategoryComboHandler(store, optionComboHandler, categoryCategoryComboLinkHandler, categoryOptionCleaner)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<CategoryCombo>> {
-        return mapOf(CategoryComboFields.CATEGORIES to CategoryCategoryComboChildrenAppender.create(databaseAdapter))
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
index 39d76de884..1841eb1c1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.category.Category
 
 @Module
 internal class CategoryEntityDIModule {
@@ -47,13 +45,4 @@ internal class CategoryEntityDIModule {
     fun handler(store: CategoryStore): CategoryHandler {
         return CategoryHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Category>> {
-        return mapOf(
-            CategoryFields.CATEGORY_OPTIONS to
-                CategoryCategoryOptionChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
index 8555ca1ef6..b895c148ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
@@ -50,13 +50,4 @@ internal class CategoryOptionComboEntityDIModule {
     ): CategoryOptionComboHandler {
         return CategoryOptionComboHandler(store, categoryOptionComboCategoryOptionLinkHandler)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<CategoryOptionCombo>> {
-        return mapOf(
-            CategoryOptionComboFields.CATEGORY_OPTIONS to
-                CategoryOptionComboCategoryOptionChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
index b1cfb63b39..2f58805f73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
@@ -31,9 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.category.CategoryOption
-import java.util.Collections
 
 @Module
 internal class CategoryOptionEntityDIModule {
@@ -49,13 +46,4 @@ internal class CategoryOptionEntityDIModule {
     fun handler(store: CategoryOptionStore): CategoryOptionHandler {
         return CategoryOptionHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<CategoryOption>> {
-        return Collections.singletonMap(
-            CategoryOptionFields.ORGANISATION_UNITS,
-            CategoryOptionOrganisationUnitChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
index 183ca947c2..5ae07b8c6c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.constant
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -39,10 +40,11 @@ import javax.inject.Inject
 @Reusable
 class ConstantCollectionRepository @Inject internal constructor(
     store: ConstantStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Constant>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Constant, ConstantCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -50,7 +52,7 @@ class ConstantCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ConstantCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -58,4 +60,8 @@ class ConstantCollectionRepository @Inject internal constructor(
     fun byValue(): DoubleFilterConnector<ConstantCollectionRepository> {
         return cf.doubleC(ConstantTableInfo.Columns.VALUE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Constant> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
index 300922511d..22f09ae269 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
@@ -32,7 +32,6 @@ import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantModule
 import retrofit2.Retrofit
@@ -66,12 +65,6 @@ internal class ConstantPackageDIModule {
         return retrofit.create(ConstantService::class.java)
     }
 
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<Constant>> {
-        return emptyMap()
-    }
-
     @Provides
     @Reusable
     fun module(impl: ConstantModuleImpl): ConstantModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
index 02770bddbe..b43ede96b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.dataapproval
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -40,18 +40,19 @@ import javax.inject.Inject
 @Reusable
 class DataApprovalCollectionRepository @Inject internal constructor(
     dataApprovalStore: DataApprovalStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataApproval>>,
+    databaseAdapter: DatabaseAdapter,
     repositoryScope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<DataApproval, DataApprovalCollectionRepository>(
     dataApprovalStore,
-    childrenAppenders,
+    databaseAdapter,
+    emptyMap(),
     repositoryScope,
     FilterConnectorFactory(
         repositoryScope,
     ) { s: RepositoryScope ->
         DataApprovalCollectionRepository(
             dataApprovalStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
index 8c84a0e27c..6e3f45780c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.dataapproval.DataApproval
 
 @Module
 internal class DataApprovalEntityDIModule {
@@ -47,10 +45,4 @@ internal class DataApprovalEntityDIModule {
     fun handler(dataApprovalStore: DataApprovalStore): DataApprovalHandler {
         return DataApprovalHandler(dataApprovalStore)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<DataApproval>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
index 8b3ade0e33..0d59bdbcfe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.dataelement
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -37,6 +38,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.dataelement.internal.DataElementFields
+import org.hisp.dhis.android.core.dataelement.internal.DataElementLegendSetChildrenAppender
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import javax.inject.Inject
 
@@ -44,10 +46,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class DataElementCollectionRepository @Inject internal constructor(
     store: DataElementStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataElement>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<DataElement, DataElementCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -55,7 +58,7 @@ class DataElementCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         DataElementCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -107,4 +110,10 @@ class DataElementCollectionRepository @Inject internal constructor(
     fun withLegendSets(): DataElementCollectionRepository {
         return cf.withChild(DataElementFields.LEGEND_SETS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<DataElement> = mapOf(
+            DataElementFields.LEGEND_SETS to DataElementLegendSetChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
index c20c5e7671..02a6a37b01 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
@@ -31,12 +31,9 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
 import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
-import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
-import java.util.Collections
 
 @Module
 internal class DataElementEntityDIModule {
@@ -61,13 +58,4 @@ internal class DataElementEntityDIModule {
             dataElementLegendSetLinkHandler,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataElement>> {
-        return Collections.singletonMap(
-            DataElementFields.LEGEND_SETS,
-            DataElementLegendSetChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
index 96bc3dae11..ccf7754801 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.dataset
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -37,8 +38,12 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilt
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.IdentifiableColumns
+import org.hisp.dhis.android.core.dataset.internal.DataInputPeriodChildrenAppender
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompulsoryDataElementOperandChildrenAppender
+import org.hisp.dhis.android.core.dataset.internal.DataSetElementChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.DataSetFields
 import org.hisp.dhis.android.core.dataset.internal.DataSetStore
+import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
@@ -48,10 +53,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class DataSetCollectionRepository @Inject internal constructor(
     store: DataSetStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataSet>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<DataSet, DataSetCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -59,7 +65,7 @@ class DataSetCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         DataSetCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -176,4 +182,14 @@ class DataSetCollectionRepository @Inject internal constructor(
     fun withIndicators(): DataSetCollectionRepository {
         return cf.withChild(DataSetFields.INDICATORS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<DataSet> = mapOf(
+            DataSetFields.COMPULSORY_DATA_ELEMENT_OPERANDS to
+                DataSetCompulsoryDataElementOperandChildrenAppender::create,
+            DataSetFields.DATA_INPUT_PERIODS to DataInputPeriodChildrenAppender::create,
+            DataSetFields.DATA_SET_ELEMENTS to DataSetElementChildrenAppender::create,
+            DataSetFields.INDICATORS to DataSetIndicatorChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
index fbd231af29..c3fd6483b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -33,7 +33,8 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -54,13 +55,14 @@ import javax.inject.Inject
 @Suppress("SpreadOperator", "TooManyFunctions")
 class DataSetCompleteRegistrationCollectionRepository @Inject internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataSetCompleteRegistration>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     handler: DataSetCompleteRegistrationHandler,
     private val postCall: DataSetCompleteRegistrationPostCall,
     private val credentialsRepository: UserCredentialsObjectRepository,
 ) : ReadOnlyCollectionRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationCollectionRepository>(
     dataSetCompleteRegistrationStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -68,7 +70,7 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     ) { s: RepositoryScope ->
         DataSetCompleteRegistrationCollectionRepository(
             dataSetCompleteRegistrationStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
             handler,
             postCall,
@@ -89,6 +91,7 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
             .byAttributeOptionComboUid().eq(attributeOptionCombo).scope
         return DataSetCompleteRegistrationObjectRepository(
             dataSetCompleteRegistrationStore,
+            databaseAdapter,
             credentialsRepository,
             childrenAppenders,
             updatedScope,
@@ -147,6 +150,10 @@ class DataSetCompleteRegistrationCollectionRepository @Inject internal construct
     }
 
     fun bySyncState(): EnumFilterConnector<DataSetCompleteRegistrationCollectionRepository, State> {
-        return cf.enumC<State>(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE)
+        return cf.enumC(DataSetCompleteRegistrationTableInfo.Columns.SYNC_STATE)
+    }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<DataSetCompleteRegistration> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
index ae0ff8ee3f..d08aa6cd52 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationObjectRepository.kt
@@ -29,7 +29,8 @@ package org.hisp.dhis.android.core.dataset
 
 import android.util.Log
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
@@ -44,8 +45,9 @@ import java.util.Date
 
 class DataSetCompleteRegistrationObjectRepository internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
+    databaseAdapter: DatabaseAdapter,
     private val credentialsRepository: UserCredentialsObjectRepository,
-    childrenAppenders: Map<String, ChildrenAppender<DataSetCompleteRegistration>>,
+    childrenAppenders: ChildrenAppenderGetter<DataSetCompleteRegistration>,
     scope: RepositoryScope,
     private val period: String,
     private val organisationUnit: String,
@@ -53,11 +55,13 @@ class DataSetCompleteRegistrationObjectRepository internal constructor(
     private val attributeOptionCombo: String,
 ) : ReadOnlyOneObjectRepositoryImpl<DataSetCompleteRegistration, DataSetCompleteRegistrationObjectRepository>(
     dataSetCompleteRegistrationStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         DataSetCompleteRegistrationObjectRepository(
             dataSetCompleteRegistrationStore,
+            databaseAdapter,
             credentialsRepository,
             childrenAppenders,
             s,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
index 212d9600e6..81899c69a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.dataset
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -43,9 +44,11 @@ import javax.inject.Inject
 @Reusable
 class DataSetInstanceCollectionRepository @Inject internal constructor(
     store: DataSetInstanceStore,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<DataSetInstance, DataSetInstanceCollectionRepository>(
     store,
+    databaseAdapter,
     emptyMap(),
     scope,
     FilterConnectorFactory(
@@ -53,6 +56,7 @@ class DataSetInstanceCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         DataSetInstanceCollectionRepository(
             store,
+            databaseAdapter,
             s,
         )
     },
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
index 1a201c1a01..382b6ae691 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.dataset
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -43,9 +44,11 @@ import javax.inject.Inject
 @Reusable
 class DataSetInstanceSummaryCollectionRepository @Inject internal constructor(
     store: DataSetInstanceSummaryStore,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<DataSetInstanceSummary, DataSetInstanceSummaryCollectionRepository>(
     store,
+    databaseAdapter,
     emptyMap(),
     scope,
     FilterConnectorFactory(
@@ -53,6 +56,7 @@ class DataSetInstanceSummaryCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         DataSetInstanceSummaryCollectionRepository(
             store,
+            databaseAdapter,
             s,
         )
     },
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
index 7bb07aebb8..b90b327be1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
@@ -28,24 +28,29 @@
 package org.hisp.dhis.android.core.dataset
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.dataset.internal.SectionDataElementChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.SectionFields
+import org.hisp.dhis.android.core.dataset.internal.SectionGreyedFieldsChildrenAppender
+import org.hisp.dhis.android.core.dataset.internal.SectionIndicatorsChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.SectionStore
 import javax.inject.Inject
 
 @Reusable
 class SectionCollectionRepository @Inject internal constructor(
     store: SectionStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Section>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Section, SectionCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -53,7 +58,7 @@ class SectionCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         SectionCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -89,4 +94,12 @@ class SectionCollectionRepository @Inject internal constructor(
     fun withIndicators(): SectionCollectionRepository {
         return cf.withChild(SectionFields.INDICATORS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Section> = mapOf(
+            SectionFields.GREYED_FIELDS to SectionGreyedFieldsChildrenAppender::create,
+            SectionFields.DATA_ELEMENTS to SectionDataElementChildrenAppender::create,
+            SectionFields.INDICATORS to SectionIndicatorsChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
index f0bda1c7b2..8d3bf4958c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 
 @Module
 internal class DataSetCompleteRegistrationEntityDIModule {
@@ -47,10 +45,4 @@ internal class DataSetCompleteRegistrationEntityDIModule {
     fun handler(store: DataSetCompleteRegistrationStore): DataSetCompleteRegistrationHandler {
         return DataSetCompleteRegistrationHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<DataSetCompleteRegistration>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
index 6b05b145f4..335ec89c88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
@@ -31,10 +31,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
-import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenAppender
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
 
 @Module
@@ -73,17 +70,4 @@ internal class DataSetEntityDIModule {
             linkCleaner,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<DataSet>> {
-        return mapOf(
-            DataSetFields.COMPULSORY_DATA_ELEMENT_OPERANDS to
-                DataSetCompulsoryDataElementOperandChildrenAppender.create(databaseAdapter),
-
-            DataSetFields.DATA_INPUT_PERIODS to DataInputPeriodChildrenAppender.create(databaseAdapter),
-            DataSetFields.DATA_SET_ELEMENTS to DataSetElementChildrenAppender.create(databaseAdapter),
-            DataSetFields.INDICATORS to DataSetIndicatorChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
index ce5cc1dcc3..799085cf44 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.dataset.Section
 
 @Module
 internal class SectionEntityDIModule {
@@ -41,14 +39,4 @@ internal class SectionEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): SectionStore {
         return SectionStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Section>> {
-        return mapOf(
-            SectionFields.GREYED_FIELDS to SectionGreyedFieldsChildrenAppender.create(databaseAdapter),
-            SectionFields.DATA_ELEMENTS to SectionDataElementChildrenAppender.create(databaseAdapter),
-            SectionFields.INDICATORS to SectionIndicatorsChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
index 3ac77350ce..3c0913dd6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
@@ -31,7 +31,8 @@ package org.hisp.dhis.android.core.datastore
 import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -50,13 +51,14 @@ import javax.inject.Inject
 class DataStoreCollectionRepository @Inject internal constructor(
     private val store: DataStoreEntryStore,
     private val call: DataStorePostCall,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataStoreEntry>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<DataStoreEntry, DataStoreCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
-    FilterConnectorFactory(scope) { s -> DataStoreCollectionRepository(store, call, childrenAppenders, s) },
+    FilterConnectorFactory(scope) { s -> DataStoreCollectionRepository(store, call, databaseAdapter, s) },
 ),
     ReadOnlyWithUploadCollectionRepository<DataStoreEntry> {
     override fun upload(): Observable<D2Progress> {
@@ -76,7 +78,7 @@ class DataStoreCollectionRepository @Inject internal constructor(
             .byKey().eq(key)
             .scope
 
-        return DataStoreObjectRepository(store, childrenAppenders, valueScope, namespace, key)
+        return DataStoreObjectRepository(store, databaseAdapter, childrenAppenders, valueScope, namespace, key)
     }
 
     fun byNamespace(): StringFilterConnector<DataStoreCollectionRepository> {
@@ -98,4 +100,8 @@ class DataStoreCollectionRepository @Inject internal constructor(
     fun byDeleted(): BooleanFilterConnector<DataStoreCollectionRepository> {
         return cf.bool(DeletableColumns.DELETED)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<DataStoreEntry> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
index a477aa32e0..3fdb67f753 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
@@ -30,8 +30,9 @@ package org.hisp.dhis.android.core.datastore
 
 import dagger.Reusable
 import io.reactivex.Completable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
@@ -42,16 +43,18 @@ import javax.inject.Inject
 @Reusable
 class DataStoreObjectRepository @Inject internal constructor(
     store: ObjectWithoutUidStore<DataStoreEntry>,
-    childrenAppenders: Map<String, ChildrenAppender<DataStoreEntry>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<DataStoreEntry>,
     scope: RepositoryScope,
     private val namespace: String,
     private val key: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<DataStoreEntry, DataStoreObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s ->
-        DataStoreObjectRepository(store, childrenAppenders, s, namespace, key)
+        DataStoreObjectRepository(store, databaseAdapter, childrenAppenders, s, namespace, key)
     },
 ),
     ReadWriteValueObjectRepository<DataStoreEntry> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
index 6da15d2ce9..1546101658 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.datastore
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
@@ -39,10 +40,11 @@ import javax.inject.Inject
 @Reusable
 class LocalDataStoreCollectionRepository @Inject internal constructor(
     private val store: LocalDataStoreStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<KeyValuePair>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<KeyValuePair, LocalDataStoreCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -50,7 +52,7 @@ class LocalDataStoreCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         LocalDataStoreCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -58,7 +60,7 @@ class LocalDataStoreCollectionRepository @Inject internal constructor(
 
     fun value(key: String): LocalDataStoreObjectRepository {
         val updatedScope = byKey().eq(key).scope
-        return LocalDataStoreObjectRepository(store, childrenAppenders, updatedScope, key)
+        return LocalDataStoreObjectRepository(store, databaseAdapter, childrenAppenders, updatedScope, key)
     }
 
     fun byKey(): StringFilterConnector<LocalDataStoreCollectionRepository> {
@@ -68,4 +70,9 @@ class LocalDataStoreCollectionRepository @Inject internal constructor(
     fun byValue(): StringFilterConnector<LocalDataStoreCollectionRepository> {
         return cf.string(LocalDataStoreTableInfo.Columns.VALUE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<KeyValuePair> = mapOf()
+    }
+
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
index 65f4cc8be5..9cb6fa0ccb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreObjectRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.datastore
 
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
@@ -38,16 +39,19 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 
 class LocalDataStoreObjectRepository internal constructor(
     store: LocalDataStoreStore,
-    childrenAppenders: Map<String, ChildrenAppender<KeyValuePair>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<KeyValuePair>,
     scope: RepositoryScope,
     private val key: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<KeyValuePair, LocalDataStoreObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         LocalDataStoreObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             s,
             key,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
index eb09c03002..9703b08824 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
@@ -49,12 +49,6 @@ internal class DataStoreEntityDIModule {
         return DataStoreHandler(store)
     }
 
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<DataStoreEntry>> {
-        return emptyMap()
-    }
-
     @Provides
     @Reusable
     fun downloaderParams(): DataStoreDownloadParams {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
index f2c5a885ef..ba386c3ef8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.datastore.KeyValuePair
 import retrofit2.Retrofit
 
 @Module
@@ -49,10 +47,4 @@ internal class LocalDataStoreEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): LocalDataStoreStore {
         return LocalDataStoreStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<KeyValuePair>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
index f257c89997..831f651d97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
@@ -33,7 +33,8 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUploadCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.*
@@ -50,15 +51,16 @@ import javax.inject.Inject
 @Reusable
 class DataValueCollectionRepository @Inject internal constructor(
     private val store: DataValueStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataValue>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     private val postCall: DataValuePostCall,
 ) : ReadOnlyCollectionRepositoryImpl<DataValue, DataValueCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
-        DataValueCollectionRepository(store, childrenAppenders, s, postCall)
+        DataValueCollectionRepository(store, databaseAdapter, s, postCall)
     },
 ),
     ReadOnlyWithUploadCollectionRepository<DataValue> {
@@ -87,6 +89,7 @@ class DataValueCollectionRepository @Inject internal constructor(
             .byAttributeOptionComboUid().eq(attributeOptionCombo).scope
         return DataValueObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             updatedScope,
             period,
@@ -164,4 +167,8 @@ class DataValueCollectionRepository @Inject internal constructor(
     fun byDeleted(): BooleanFilterConnector<DataValueCollectionRepository> {
         return cf.bool(DataValueTableInfo.Columns.DELETED)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<DataValue> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
index 1b5ab6948f..d237876524 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.datavalue
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -47,10 +48,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class DataValueConflictCollectionRepository @Inject internal constructor(
     store: DataValueConflictStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<DataValueConflict>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<DataValueConflict, DataValueConflictCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -58,7 +60,7 @@ class DataValueConflictCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         DataValueConflictCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -116,4 +118,8 @@ class DataValueConflictCollectionRepository @Inject internal constructor(
     fun byCreated(): DateFilterConnector<DataValueConflictCollectionRepository> {
         return cf.date(DataValueConflictTableInfo.Columns.CREATED)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<DataValueConflict> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
index 736741955d..5603b6f160 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueObjectRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.datavalue
 
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
@@ -40,7 +41,8 @@ import java.util.Date
 
 class DataValueObjectRepository internal constructor(
     store: DataValueStore,
-    childrenAppenders: Map<String, ChildrenAppender<DataValue>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<DataValue>,
     scope: RepositoryScope,
     private val period: String,
     private val organisationUnit: String,
@@ -49,11 +51,13 @@ class DataValueObjectRepository internal constructor(
     private val attributeOptionCombo: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<DataValue, DataValueObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         DataValueObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             s,
             period,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
index b353f62061..b3b4af40db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
@@ -32,8 +32,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.datavalue.DataValueConflict
 
 @Module
 internal class DataValueConflictEntityDIModule {
@@ -43,10 +41,4 @@ internal class DataValueConflictEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): DataValueConflictStore {
         return DataValueConflictStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<DataValueConflict>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
index d98d39f6c9..628c134169 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.datavalue.DataValue
 
 @Module
 internal class DataValueEntityDIModule {
@@ -47,10 +45,4 @@ internal class DataValueEntityDIModule {
     fun handler(dataValueStore: DataValueStore): DataValueHandler {
         return DataValueHandler(dataValueStore)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<DataValue>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
index 80c260e3cd..7657f323ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
@@ -28,8 +28,9 @@
 package org.hisp.dhis.android.core.enrollment
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -46,25 +47,27 @@ import org.hisp.dhis.android.core.common.internal.TrackerDataManager
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentFields
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentProjectionTransformer
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
+import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender
 import javax.inject.Inject
 
 @Reusable
 @Suppress("TooManyFunctions")
 class EnrollmentCollectionRepository @Inject internal constructor(
     private val enrollmentStore: EnrollmentStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Enrollment>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     transformer: EnrollmentProjectionTransformer,
     private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidCollectionRepositoryImpl<Enrollment, EnrollmentCreateProjection, EnrollmentCollectionRepository>(
     enrollmentStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     transformer,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
         EnrollmentCollectionRepository(
             enrollmentStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
             transformer,
             trackerDataManager,
@@ -77,7 +80,8 @@ class EnrollmentCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): EnrollmentObjectRepository {
         val updatedScope = withUidFilterItem(scope, uid)
-        return EnrollmentObjectRepository(enrollmentStore, uid, childrenAppenders, updatedScope, trackerDataManager)
+        return EnrollmentObjectRepository(enrollmentStore, uid, databaseAdapter, childrenAppenders,
+            updatedScope, trackerDataManager)
     }
 
     fun byUid(): StringFilterConnector<EnrollmentCollectionRepository> {
@@ -183,4 +187,10 @@ class EnrollmentCollectionRepository @Inject internal constructor(
     fun withNotes(): EnrollmentCollectionRepository {
         return cf.withChild(EnrollmentFields.NOTES)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Enrollment> = mapOf(
+            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
index 44be3a5da4..8e66ff4372 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentObjectRepository.kt
@@ -27,9 +27,10 @@
  */
 package org.hisp.dhis.android.core.enrollment
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -44,17 +45,20 @@ import java.util.Date
 class EnrollmentObjectRepository internal constructor(
     store: EnrollmentStore,
     uid: String?,
-    childrenAppenders: Map<String, ChildrenAppender<Enrollment>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<Enrollment>,
     scope: RepositoryScope,
     private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<Enrollment, EnrollmentObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         EnrollmentObjectRepository(
             store,
             uid,
+            databaseAdapter,
             childrenAppenders,
             s,
             trackerDataManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
index 958816ae2c..db982c6fb3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
@@ -31,11 +31,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.event.internal.EventHandler
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
-import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender
 import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
 import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
@@ -76,12 +73,4 @@ internal class EnrollmentEntityDIModule {
             relationshipOrphanCleaner,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Enrollment>> {
-        return mapOf(
-            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index 0119546e26..cafb1ae435 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -30,8 +30,9 @@ package org.hisp.dhis.android.core.event
 import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -53,8 +54,10 @@ import org.hisp.dhis.android.core.event.internal.EventFields
 import org.hisp.dhis.android.core.event.internal.EventPostParentCall
 import org.hisp.dhis.android.core.event.internal.EventProjectionTransformer
 import org.hisp.dhis.android.core.event.internal.EventStore
+import org.hisp.dhis.android.core.note.internal.NoteForEventChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueChildrenAppender
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
 import org.hisp.dhis.android.core.user.internal.UserStore
 import javax.inject.Inject
@@ -64,7 +67,7 @@ import javax.inject.Inject
 class EventCollectionRepository @Inject internal constructor(
     private val eventStore: EventStore,
     private val userStore: UserStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Event>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     private val postCall: EventPostParentCall,
     transformer: EventProjectionTransformer,
@@ -72,6 +75,7 @@ class EventCollectionRepository @Inject internal constructor(
     private val jobQueryCall: JobQueryCall,
 ) : ReadWriteWithUidCollectionRepositoryImpl<Event, EventCreateProjection, EventCollectionRepository>(
     eventStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     transformer,
@@ -79,7 +83,7 @@ class EventCollectionRepository @Inject internal constructor(
         EventCollectionRepository(
             eventStore,
             userStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
             postCall,
             transformer,
@@ -113,7 +117,8 @@ class EventCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): EventObjectRepository {
         val updatedScope = withUidFilterItem(scope, uid)
-        return EventObjectRepository(eventStore, userStore, uid, childrenAppenders, updatedScope, trackerDataManager)
+        return EventObjectRepository(eventStore, userStore, uid, databaseAdapter,childrenAppenders,
+            updatedScope, trackerDataManager)
     }
 
     fun byUid(): StringFilterConnector<EventCollectionRepository> {
@@ -310,4 +315,11 @@ class EventCollectionRepository @Inject internal constructor(
     fun countTrackedEntityInstances(): Int {
         return eventStore.countTeisWhereEvents(whereClause)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Event> = mapOf(
+            EventFields.TRACKED_ENTITY_DATA_VALUES to TrackedEntityDataValueChildrenAppender::create,
+            EventFields.NOTES to NoteForEventChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
index 0571faf5f6..0b2c8dc70c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.event
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -36,6 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.AssignedUserMode
+import org.hisp.dhis.android.core.event.internal.EventFilterEventDataFilterChildrenAppender
 import org.hisp.dhis.android.core.event.internal.EventFilterStore
 import org.hisp.dhis.android.core.event.internal.EventQueryCriteriaFields
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
@@ -45,10 +47,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class EventFilterCollectionRepository @Inject internal constructor(
     store: EventFilterStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<EventFilter>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<EventFilter, EventFilterCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -56,7 +59,7 @@ class EventFilterCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         EventFilterCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -124,4 +127,10 @@ class EventFilterCollectionRepository @Inject internal constructor(
     fun withEventDataFilters(): EventFilterCollectionRepository {
         return cf.withChild(EventQueryCriteriaFields.DATA_FILTERS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<EventFilter> = mapOf(
+            EventQueryCriteriaFields.DATA_FILTERS to EventFilterEventDataFilterChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
index 67fcb17781..8e0197ced3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventObjectRepository.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.event
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -40,19 +40,21 @@ import org.hisp.dhis.android.core.common.Unit
 import org.hisp.dhis.android.core.common.internal.TrackerDataManager
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.user.User
+import org.hisp.dhis.android.core.user.internal.UserStore
 import java.util.Date
 
 @Suppress("TooManyFunctions")
 class EventObjectRepository internal constructor(
     store: EventStore,
-    private val userStore: IdentifiableObjectStore<User>,
+    private val userStore: UserStore,
     uid: String?,
-    childrenAppenders: Map<String, ChildrenAppender<Event>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<Event>,
     scope: RepositoryScope,
     private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<Event, EventObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
@@ -60,6 +62,7 @@ class EventObjectRepository internal constructor(
             store,
             userStore,
             uid,
+            databaseAdapter,
             childrenAppenders,
             s,
             trackerDataManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
index d975d66430..cb2dc2e0b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
@@ -31,16 +31,12 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
-import org.hisp.dhis.android.core.note.internal.NoteForEventChildrenAppender
 import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
 import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
 
 @Module
@@ -75,13 +71,4 @@ internal class EventEntityDIModule {
             relationshipOrphanCleaner,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Event>> {
-        return mapOf(
-            EventFields.TRACKED_ENTITY_DATA_VALUES to TrackedEntityDataValueChildrenAppender.create(databaseAdapter),
-            EventFields.NOTES to NoteForEventChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
index d7ae5b3aeb..6b94a4b637 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.event.EventFilter
 
 @Module
 internal class EventFilterEntityDIModule {
@@ -53,12 +51,4 @@ internal class EventFilterEntityDIModule {
             eventDataFilterHandler,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<EventFilter>> {
-        return mapOf(
-            EventQueryCriteriaFields.DATA_FILTERS to EventFilterEventDataFilterChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
index ac498f07da..230ca9e7cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.expressiondimensionitem
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
@@ -39,10 +40,11 @@ import javax.inject.Inject
 @Reusable
 class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
     store: ExpressionDimensionItemStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ExpressionDimensionItem>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ExpressionDimensionItem, ExpressionDimensionItemCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -50,7 +52,7 @@ class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ExpressionDimensionItemCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -58,4 +60,8 @@ class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
     fun byExpression(): StringFilterConnector<ExpressionDimensionItemCollectionRepository> {
         return cf.string(ExpressionDimensionItemTableInfo.Columns.EXPRESSION)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ExpressionDimensionItem> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
index 676c0ab0d0..e005a2a879 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import retrofit2.Retrofit
 
 @Module
@@ -55,10 +53,4 @@ internal class ExpressionDimensionItemEntityDIModule {
     fun service(retrofit: Retrofit): ExpressionDimensionItemService {
         return retrofit.create(ExpressionDimensionItemService::class.java)
     }
-
-    @Reusable
-    @Provides
-    fun childrenAppenders(): Map<String, ChildrenAppender<ExpressionDimensionItem>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
index c43ff1a30d..fcb838a3c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
@@ -32,8 +32,9 @@ import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -58,20 +59,21 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class FileResourceCollectionRepository @Inject internal constructor(
     private val fileResourceStore: FileResourceStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<FileResource>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     transformer: FileResourceProjectionTransformer,
     dataStatePropagator: DataStatePropagator,
     private val context: Context,
 ) : ReadWriteWithUidCollectionRepositoryImpl<FileResource, File, FileResourceCollectionRepository>(
     fileResourceStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     transformer,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
         FileResourceCollectionRepository(
             fileResourceStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
             transformer,
             dataStatePropagator,
@@ -125,7 +127,7 @@ class FileResourceCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): FileResourceObjectRepository {
         val updatedScope = withUidFilterItem(scope, uid)
-        return FileResourceObjectRepository(fileResourceStore, uid, childrenAppenders, updatedScope)
+        return FileResourceObjectRepository(fileResourceStore, uid, databaseAdapter, childrenAppenders, updatedScope)
     }
 
     fun byUid(): StringFilterConnector<FileResourceCollectionRepository> {
@@ -167,4 +169,8 @@ class FileResourceCollectionRepository @Inject internal constructor(
     fun bySyncState(): EnumFilterConnector<FileResourceCollectionRepository, State> {
         return cf.enumC(FileResourceTableInfo.Columns.SYNC_STATE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<FileResource> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
index 95d7b506fd..d5a09f7a94 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceObjectRepository.kt
@@ -27,7 +27,8 @@
  */
 package org.hisp.dhis.android.core.fileresource
 
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -36,16 +37,19 @@ import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 class FileResourceObjectRepository internal constructor(
     store: FileResourceStore,
     uid: String?,
-    childrenAppenders: Map<String, ChildrenAppender<FileResource>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<FileResource>,
     scope: RepositoryScope,
 ) : ReadOnlyOneObjectRepositoryImpl<FileResource, FileResourceObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         FileResourceObjectRepository(
             store,
             uid,
+            databaseAdapter,
             childrenAppenders,
             s,
         )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
index ceff4dddfa..3facb66e11 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.fileresource.FileResource
 
 @Module
 internal class FileResourceEntityDIModule {
@@ -49,12 +47,6 @@ internal class FileResourceEntityDIModule {
         return FileResourceHandler(store)
     }
 
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<FileResource>> {
-        return emptyMap()
-    }
-
     @Provides
     @Reusable
     fun downloadParams(): FileResourceDownloadParams {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
index 0fd0418f25..2c44f87691 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.imports
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class TrackerImportConflictCollectionRepository @Inject internal constructor(
     store: TrackerImportConflictStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackerImportConflict>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<TrackerImportConflict, TrackerImportConflictCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class TrackerImportConflictCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         TrackerImportConflictCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -92,4 +94,8 @@ class TrackerImportConflictCollectionRepository @Inject internal constructor(
     fun byCreated(): DateFilterConnector<TrackerImportConflictCollectionRepository> {
         return cf.date(TrackerImportConflictTableInfo.Columns.CREATED)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackerImportConflict> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
index 271495f55e..7939646a55 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.imports.TrackerImportConflict
 
 @Module
 internal class TrackerImportConflictEntityDIModule {
@@ -41,10 +39,4 @@ internal class TrackerImportConflictEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackerImportConflictStore {
         return TrackerImportConflictStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<TrackerImportConflict>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
index f4ee8df706..9e01cc0cf4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.indicator
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -38,6 +39,7 @@ import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.common.NameableWithStyleColumns
 import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
 import org.hisp.dhis.android.core.indicator.internal.IndicatorFields
+import org.hisp.dhis.android.core.indicator.internal.IndicatorLegendSetChildrenAppender
 import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
 import javax.inject.Inject
 
@@ -45,10 +47,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class IndicatorCollectionRepository @Inject internal constructor(
     store: IndicatorStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Indicator>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<Indicator, IndicatorCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -56,7 +59,7 @@ class IndicatorCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         IndicatorCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -118,4 +121,10 @@ class IndicatorCollectionRepository @Inject internal constructor(
             listOf(dataSetUid),
         )
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Indicator> = mapOf(
+            IndicatorFields.LEGEND_SETS to IndicatorLegendSetChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
index 509fa84bbb..2c51f6031c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.indicator
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -40,10 +41,11 @@ import javax.inject.Inject
 @Reusable
 class IndicatorTypeCollectionRepository @Inject internal constructor(
     store: IndicatorTypeStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<IndicatorType>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<IndicatorType, IndicatorTypeCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +53,7 @@ class IndicatorTypeCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         IndicatorTypeCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -63,4 +65,8 @@ class IndicatorTypeCollectionRepository @Inject internal constructor(
     fun byFactor(): IntegerFilterConnector<IndicatorTypeCollectionRepository> {
         return cf.integer(IndicatorTypeTableInfo.Columns.FACTOR)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<IndicatorType> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
index cac26edbaf..f22259f661 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.indicator.Indicator
 
 @Module
 internal class IndicatorEntityDIModule {
@@ -41,12 +39,4 @@ internal class IndicatorEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): IndicatorStore {
         return IndicatorStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Indicator>> {
-        return mapOf(
-            IndicatorFields.LEGEND_SETS to IndicatorLegendSetChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
index fc619620f8..cfed6946bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.indicator.IndicatorType
 
 @Module
 internal class IndicatorTypeEntityDIModule {
@@ -41,10 +39,4 @@ internal class IndicatorTypeEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): IndicatorTypeStore {
         return IndicatorTypeStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<IndicatorType>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
index 10d59ee61d..f197741161 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.legendset
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -40,10 +41,11 @@ import javax.inject.Inject
 @Reusable
 class LegendCollectionRepository @Inject internal constructor(
     store: LegendStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Legend>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Legend, LegendCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +53,7 @@ class LegendCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         LegendCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -71,4 +73,8 @@ class LegendCollectionRepository @Inject internal constructor(
     fun byColor(): StringFilterConnector<LegendCollectionRepository> {
         return cf.string(LegendTableInfo.Columns.COLOR)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Legend> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
index 423409a2f8..bdf10cc50a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
@@ -28,11 +28,13 @@
 package org.hisp.dhis.android.core.legendset
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.legendset.internal.LegendChildrenAppender
 import org.hisp.dhis.android.core.legendset.internal.LegendSetFields
 import org.hisp.dhis.android.core.legendset.internal.LegendSetStore
 import javax.inject.Inject
@@ -40,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class LegendSetCollectionRepository @Inject internal constructor(
     store: LegendSetStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<LegendSet>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<LegendSet, LegendSetCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +54,7 @@ class LegendSetCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         LegendSetCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -63,4 +66,10 @@ class LegendSetCollectionRepository @Inject internal constructor(
     fun withLegends(): LegendSetCollectionRepository {
         return cf.withChild(LegendSetFields.LEGENDS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<LegendSet> = mapOf(
+            LegendSetFields.LEGENDS to LegendChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
index 3d0bbdc09b..6469acbd08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.legendset.Legend
 
 @Module
 internal class LegendEntityDIModule {
@@ -47,10 +45,4 @@ internal class LegendEntityDIModule {
     fun handler(store: LegendStore): LegendHandler {
         return LegendHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<Legend>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
index efd2bc6238..56e841397e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.legendset.LegendSet
 
 @Module
 internal class LegendSetEntityDIModule {
@@ -55,12 +53,4 @@ internal class LegendSetEntityDIModule {
             legendCleaner,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<LegendSet>> {
-        return mapOf(
-            LegendSetFields.LEGENDS to LegendChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
index 0cedd12a76..0fdc137e9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.maintenance
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -42,10 +43,11 @@ import javax.inject.Inject
 @Reusable
 class D2ErrorCollectionRepository @Inject internal constructor(
     store: D2ErrorStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<D2Error>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<D2Error, D2ErrorCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -53,7 +55,7 @@ class D2ErrorCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         D2ErrorCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -81,4 +83,8 @@ class D2ErrorCollectionRepository @Inject internal constructor(
     fun byCreated(): DateFilterConnector<D2ErrorCollectionRepository> {
         return cf.date(D2ErrorTableInfo.Columns.CREATED)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<D2Error> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
index 77f79035e9..3e2d64a9a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.maintenance
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -40,10 +41,11 @@ import javax.inject.Inject
 @Reusable
 class ForeignKeyViolationCollectionRepository @Inject internal constructor(
     store: ForeignKeyViolationStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ForeignKeyViolation>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<ForeignKeyViolation, ForeignKeyViolationCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +53,7 @@ class ForeignKeyViolationCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ForeignKeyViolationCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -87,4 +89,8 @@ class ForeignKeyViolationCollectionRepository @Inject internal constructor(
     fun byCreated(): DateFilterConnector<ForeignKeyViolationCollectionRepository> {
         return cf.date(ForeignKeyViolationTableInfo.Columns.CREATED)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ForeignKeyViolation> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
index 118bc998ec..358be003a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.maintenance.D2Error
 
 @Module
 internal class D2ErrorEntityDIModule {
@@ -41,10 +39,4 @@ internal class D2ErrorEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): D2ErrorStore {
         return D2ErrorStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<D2Error>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
index 23d0016e35..f6ea2df281 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation
 
 @Module
 internal class ForeignKeyViolationEntityDIModule {
@@ -41,10 +39,4 @@ internal class ForeignKeyViolationEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ForeignKeyViolationStore {
         return ForeignKeyViolationStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<ForeignKeyViolation>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
index 6d3c91ad42..87f323cb2e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
@@ -28,28 +28,31 @@
 package org.hisp.dhis.android.core.map.layer
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.map.layer.internal.MapLayerImagerProviderChildrenAppender
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerStore
 import javax.inject.Inject
 
 @Reusable
 class MapLayerCollectionRepository @Inject internal constructor(
     store: MapLayerStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<MapLayer>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyWithUidCollectionRepositoryImpl<MapLayer, MapLayerCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
         scope,
-    ) { s: RepositoryScope -> MapLayerCollectionRepository(store, childrenAppenders, s) },
+    ) { s: RepositoryScope -> MapLayerCollectionRepository(store, databaseAdapter, s) },
 ) {
 
     fun byUid(): StringFilterConnector<MapLayerCollectionRepository> {
@@ -83,4 +86,10 @@ class MapLayerCollectionRepository @Inject internal constructor(
     fun withImageryProviders(): MapLayerCollectionRepository {
         return cf.withChild(MapLayer.IMAGERY_PROVIDERS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<MapLayer> = mapOf(
+            MapLayer.IMAGERY_PROVIDERS to ::MapLayerImagerProviderChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
index 579c22090d..c16dee99f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.map.layer.MapLayer
 
 @Module
 internal class MapLayerEntityDIModule {
@@ -51,14 +49,4 @@ internal class MapLayerEntityDIModule {
     ): MapLayerHandler {
         return MapLayerHandler(store, imageryProviderHandler)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        store: MapLayerImageryProviderStore,
-    ): Map<String, ChildrenAppender<MapLayer>> {
-        return mapOf(
-            MapLayer.IMAGERY_PROVIDERS to MapLayerImagerProviderChildrenAppender(store),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
index 20d6b7b0da..83148bd408 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImagerProviderChildrenAppender.kt
@@ -27,12 +27,14 @@
  */
 package org.hisp.dhis.android.core.map.layer.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.map.layer.MapLayer
 
 internal class MapLayerImagerProviderChildrenAppender(
-    private val mapLayerImageryProviderStore: MapLayerImageryProviderStore,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<MapLayer>() {
+    private val mapLayerImageryProviderStore = MapLayerImageryProviderStoreImpl(databaseAdapter)
 
     override fun appendChildren(mapLayer: MapLayer): MapLayer {
         return mapLayer.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
index 8f70175095..81a18f81ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
@@ -28,8 +28,9 @@
 package org.hisp.dhis.android.core.note
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -49,12 +50,13 @@ import javax.inject.Inject
 @Reusable
 class NoteCollectionRepository @Inject internal constructor(
     store: NoteStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Note>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     transformer: NoteProjectionTransformer,
     private val dataStatePropagator: DataStatePropagator,
 ) : ReadWriteWithUidCollectionRepositoryImpl<Note, NoteCreateProjection, NoteCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     transformer,
@@ -63,7 +65,7 @@ class NoteCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         NoteCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
             transformer,
             dataStatePropagator,
@@ -104,10 +106,14 @@ class NoteCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): ReadOnlyObjectRepository<Note> {
         val updatedScope: RepositoryScope = withUidFilterItem(scope, uid)
-        return ReadOnlyOneObjectRepositoryFinalImpl(store, childrenAppenders, updatedScope)
+        return ReadOnlyOneObjectRepositoryFinalImpl(store, databaseAdapter, childrenAppenders, updatedScope)
     }
 
     override fun propagateState(m: Note, action: HandleAction?) {
         dataStatePropagator.propagateNoteCreation(m)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Note> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
index 576be3365b..1e27288d88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.note.Note
 
 @Module
 internal class NoteEntityDIModule {
@@ -47,10 +45,4 @@ internal class NoteEntityDIModule {
     fun handler(store: NoteStore): NoteHandler {
         return NoteHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<Note>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
index c7342de9e1..4ef96ade32 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.option
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class OptionCollectionRepository @Inject internal constructor(
     store: OptionStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Option>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Option, OptionCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class OptionCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         OptionCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -76,4 +78,8 @@ class OptionCollectionRepository @Inject internal constructor(
     fun orderBySortOrder(direction: OrderByDirection?): OptionCollectionRepository {
         return cf.withOrderBy(OptionTableInfo.Columns.SORT_ORDER, direction)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Option> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
index 4b642d2eca..57a0f2efdb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
@@ -28,22 +28,25 @@
 package org.hisp.dhis.android.core.option
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.option.internal.OptionGroupFields
+import org.hisp.dhis.android.core.option.internal.OptionGroupOptionChildrenAppender
 import org.hisp.dhis.android.core.option.internal.OptionGroupStore
 import javax.inject.Inject
 
 @Reusable
 class OptionGroupCollectionRepository @Inject internal constructor(
     store: OptionGroupStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<OptionGroup>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<OptionGroup, OptionGroupCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -51,7 +54,7 @@ class OptionGroupCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         OptionGroupCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -63,4 +66,10 @@ class OptionGroupCollectionRepository @Inject internal constructor(
     fun withOptions(): OptionGroupCollectionRepository {
         return cf.withChild(OptionGroupFields.OPTIONS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<OptionGroup> = mapOf(
+            OptionGroupFields.OPTIONS to OptionGroupOptionChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
index a107bb1dd1..c8e04ac95e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.option
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class OptionSetCollectionRepository @Inject internal constructor(
     store: OptionSetStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<OptionSet>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<OptionSet, OptionSetCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class OptionSetCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         OptionSetCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -64,4 +66,8 @@ class OptionSetCollectionRepository @Inject internal constructor(
     fun byValueType(): EnumFilterConnector<OptionSetCollectionRepository, ValueType> {
         return cf.enumC(OptionSetTableInfo.Columns.VALUE_TYPE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<OptionSet> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
index df2fad58f1..5938639dec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.option.Option
 
 @Module
 internal class OptionEntityDIModule {
@@ -53,10 +51,4 @@ internal class OptionEntityDIModule {
             optionCleaner,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<Option>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
index a84f4a447f..90c23150c7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.option.OptionGroup
 
 @Module
 internal class OptionGroupEntityDIModule {
@@ -55,12 +53,4 @@ internal class OptionGroupEntityDIModule {
             collectionCleaner,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<OptionGroup>> {
-        return mapOf(
-            OptionGroupFields.OPTIONS to OptionGroupOptionChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
index 1ccb60143d..eb9f38db21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.option.OptionSet
 
 @Module
 internal class OptionSetEntityDIModule {
@@ -47,10 +45,4 @@ internal class OptionSetEntityDIModule {
     fun handler(store: OptionSetStore): OptionSetHandler {
         return OptionSetHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<OptionSet>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
index d59e84da4e..76f04f6606 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.organisationunit
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -39,7 +40,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.FeatureType
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitDataSetChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitFields
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupProgramChildrenAppender
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import javax.inject.Inject
@@ -48,10 +52,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class OrganisationUnitCollectionRepository @Inject internal constructor(
     store: OrganisationUnitStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnit>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnit, OrganisationUnitCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -59,7 +64,7 @@ class OrganisationUnitCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         OrganisationUnitCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -139,4 +144,13 @@ class OrganisationUnitCollectionRepository @Inject internal constructor(
     fun withOrganisationUnitGroups(): OrganisationUnitCollectionRepository {
         return cf.withChild(OrganisationUnitFields.ORGANISATION_UNIT_GROUPS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<OrganisationUnit> = mapOf(
+            OrganisationUnitFields.PROGRAMS to OrganisationUnitProgramChildrenAppender::create,
+            OrganisationUnitFields.DATA_SETS to OrganisationUnitDataSetChildrenAppender::create,
+            OrganisationUnitFields.ORGANISATION_UNIT_GROUPS to
+                OrganisationUnitOrganisationUnitGroupProgramChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
index 4354838468..2cc2fe6999 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.organisationunit
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
@@ -39,10 +40,11 @@ import javax.inject.Inject
 @Reusable
 class OrganisationUnitGroupCollectionRepository @Inject internal constructor(
     store: OrganisationUnitGroupStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnitGroup>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnitGroup, OrganisationUnitGroupCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -50,7 +52,7 @@ class OrganisationUnitGroupCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         OrganisationUnitGroupCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -62,4 +64,8 @@ class OrganisationUnitGroupCollectionRepository @Inject internal constructor(
     fun byDisplayShortName(): StringFilterConnector<OrganisationUnitGroupCollectionRepository> {
         return cf.string(OrganisationUnitGroupTableInfo.Columns.DISPLAY_SHORT_NAME)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<OrganisationUnitGroup> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
index 2684a4240d..8f446c8d8d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.organisationunit
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
@@ -39,10 +40,11 @@ import javax.inject.Inject
 @Reusable
 class OrganisationUnitLevelCollectionRepository @Inject internal constructor(
     store: OrganisationUnitLevelStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<OrganisationUnitLevel>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<OrganisationUnitLevel, OrganisationUnitLevelCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -50,7 +52,7 @@ class OrganisationUnitLevelCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         OrganisationUnitLevelCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -58,4 +60,8 @@ class OrganisationUnitLevelCollectionRepository @Inject internal constructor(
     fun byLevel(): IntegerFilterConnector<OrganisationUnitLevelCollectionRepository> {
         return cf.integer(OrganisationUnitLevelTableInfo.Columns.LEVEL)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<OrganisationUnitLevel> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
index 7c9c62fdc0..136058590f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
@@ -31,9 +31,7 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
 
 @Module
@@ -70,15 +68,4 @@ internal class OrganisationUnitEntityDIModule {
     fun pathTransformer(): OrganisationUnitDisplayPathTransformer {
         return OrganisationUnitDisplayPathTransformer()
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<OrganisationUnit>> {
-        return mapOf(
-            OrganisationUnitFields.PROGRAMS to OrganisationUnitProgramChildrenAppender.create(databaseAdapter),
-            OrganisationUnitFields.DATA_SETS to OrganisationUnitDataSetChildrenAppender.create(databaseAdapter),
-            OrganisationUnitFields.ORGANISATION_UNIT_GROUPS to
-                OrganisationUnitOrganisationUnitGroupProgramChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
index eb5f07504e..7de062a942 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 
 @Module
 internal class OrganisationUnitGroupEntityDIModule {
@@ -47,10 +45,4 @@ internal class OrganisationUnitGroupEntityDIModule {
     fun handler(store: OrganisationUnitGroupStore): OrganisationUnitGroupHandler {
         return OrganisationUnitGroupHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<OrganisationUnitGroup>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
index 2750b04aea..d4d6e84c8c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
 import retrofit2.Retrofit
 
 @Module
@@ -54,10 +52,4 @@ internal class OrganisationUnitLevelEntityDIModule {
     fun organisationUnitLevelService(retrofit: Retrofit): OrganisationUnitLevelService {
         return retrofit.create(OrganisationUnitLevelService::class.java)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<OrganisationUnitLevel>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
index 4af75bef4a..ea511a8819 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.period
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class PeriodCollectionRepository @Inject internal constructor(
     store: PeriodStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Period>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<Period, PeriodCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class PeriodCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         PeriodCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -72,4 +74,8 @@ class PeriodCollectionRepository @Inject internal constructor(
     fun byEndDate(): DateFilterConnector<PeriodCollectionRepository> {
         return cf.date(PeriodTableInfo.Columns.END_DATE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Period> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
index 81ebf5e477..6d461777f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.period.Period
 
 @Module
 internal class PeriodEntityDIModule {
@@ -41,10 +39,4 @@ internal class PeriodEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): PeriodStore {
         return PeriodStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<Period>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
index f47887b9ca..7b34645709 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -42,6 +43,7 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.program.internal.ProgramStore
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityTypeChildrenAppender
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import javax.inject.Inject
 
@@ -49,10 +51,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class ProgramCollectionRepository @Inject internal constructor(
     store: ProgramStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Program>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Program, ProgramCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -60,7 +63,7 @@ class ProgramCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -197,4 +200,10 @@ class ProgramCollectionRepository @Inject internal constructor(
     fun withTrackedEntityType(): ProgramCollectionRepository {
         return cf.withChild(ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Program> = mapOf(
+            ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE to ::ProgramTrackedEntityTypeChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
index be85a71372..e2837bc1a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -37,17 +38,20 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilt
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.AnalyticsType
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorFields
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorLegendSetChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore
 import javax.inject.Inject
 
 @Reusable
 class ProgramIndicatorCollectionRepository @Inject internal constructor(
     store: ProgramIndicatorStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramIndicator>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramIndicator, ProgramIndicatorCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -55,7 +59,7 @@ class ProgramIndicatorCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramIndicatorCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -99,4 +103,12 @@ class ProgramIndicatorCollectionRepository @Inject internal constructor(
     fun withAnalyticsPeriodBoundaries(): ProgramIndicatorCollectionRepository {
         return cf.withChild(ProgramIndicatorFields.ANALYTICS_PERIOD_BOUNDARIES)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramIndicator> = mapOf(
+            ProgramIndicatorFields.LEGEND_SETS to ProgramIndicatorLegendSetChildrenAppender::create,
+            ProgramIndicatorFields.ANALYTICS_PERIOD_BOUNDARIES to
+                ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
index 3e86177aa2..acb638e7b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class ProgramRuleActionCollectionRepository @Inject internal constructor(
     store: ProgramRuleActionStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRuleAction>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRuleAction, ProgramRuleActionCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class ProgramRuleActionCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramRuleActionCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -104,4 +106,8 @@ class ProgramRuleActionCollectionRepository @Inject internal constructor(
     fun byOptionGroupUid(): StringFilterConnector<ProgramRuleActionCollectionRepository> {
         return cf.string(ProgramRuleActionTableInfo.Columns.OPTION_GROUP)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramRuleAction> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
index 14d6d0eb8d..a822d3fea3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
@@ -28,12 +28,14 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramRuleActionChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramRuleFields
 import org.hisp.dhis.android.core.program.internal.ProgramRuleStore
 import javax.inject.Inject
@@ -41,10 +43,11 @@ import javax.inject.Inject
 @Reusable
 class ProgramRuleCollectionRepository @Inject internal constructor(
     store: ProgramRuleStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRule>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRule, ProgramRuleCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +55,7 @@ class ProgramRuleCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramRuleCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -76,4 +79,10 @@ class ProgramRuleCollectionRepository @Inject internal constructor(
     fun withProgramRuleActions(): ProgramRuleCollectionRepository {
         return cf.withChild(ProgramRuleFields.PROGRAM_RULE_ACTIONS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramRule> = mapOf(
+            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
index c2ae45bcca..d80e2f284e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class ProgramRuleVariableCollectionRepository @Inject internal constructor(
     store: ProgramRuleVariableStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramRuleVariable>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramRuleVariable, ProgramRuleVariableCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class ProgramRuleVariableCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramRuleVariableCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -83,4 +85,8 @@ class ProgramRuleVariableCollectionRepository @Inject internal constructor(
         > {
         return cf.enumC(ProgramRuleVariableTableInfo.Columns.PROGRAM_RULE_VARIABLE_SOURCE_TYPE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramRuleVariable> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
index 0827b59a2f..3c44466eee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
@@ -28,12 +28,14 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramSectionAttributeChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramSectionFields
 import org.hisp.dhis.android.core.program.internal.ProgramSectionStore
 import javax.inject.Inject
@@ -41,10 +43,11 @@ import javax.inject.Inject
 @Reusable
 class ProgramSectionCollectionRepository @Inject internal constructor(
     store: ProgramSectionStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramSection>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramSection, ProgramSectionCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +55,7 @@ class ProgramSectionCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramSectionCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -90,6 +93,12 @@ class ProgramSectionCollectionRepository @Inject internal constructor(
     }
 
     fun withAttributes(): ProgramSectionCollectionRepository {
-        return cf.withChild(ProgramSectionFields.ATTRIBUTES)
+        return cf.withChild(ProgramSectionFields.TRACKED_ENTITY_ATTRIBUTES)
+    }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramSection> = mapOf(
+            ProgramSectionFields.TRACKED_ENTITY_ATTRIBUTES to ProgramSectionAttributeChildrenAppender::create
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
index df7b2769d3..c82aa58637 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -48,10 +49,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class ProgramStageCollectionRepository @Inject internal constructor(
     store: ProgramStageStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStage>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStage, ProgramStageCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -59,7 +61,7 @@ class ProgramStageCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramStageCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -175,4 +177,8 @@ class ProgramStageCollectionRepository @Inject internal constructor(
     fun orderBySortOrder(direction: OrderByDirection?): ProgramStageCollectionRepository {
         return cf.withOrderBy(ProgramStageTableInfo.Columns.SORT_ORDER, direction)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramStage> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
index 783d772b7f..cee2b97a9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -36,6 +37,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilt
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
+import org.hisp.dhis.android.core.program.internal.DataElementValueTypeRenderingChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementFields
 import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementStore
 import javax.inject.Inject
@@ -43,10 +45,11 @@ import javax.inject.Inject
 @Reusable
 class ProgramStageDataElementCollectionRepository @Inject internal constructor(
     store: ProgramStageDataElementStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageDataElement>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageDataElement, ProgramStageDataElementCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -54,7 +57,7 @@ class ProgramStageDataElementCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramStageDataElementCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -94,4 +97,10 @@ class ProgramStageDataElementCollectionRepository @Inject internal constructor(
     fun orderBySortOrder(direction: OrderByDirection?): ProgramStageDataElementCollectionRepository {
         return cf.withOrderBy(ProgramStageDataElementTableInfo.Columns.SORT_ORDER, direction)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramStageDataElement> = mapOf(
+            ProgramStageDataElementFields.RENDER_TYPE to ::DataElementValueTypeRenderingChildrenAppender
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
index 77b67291d7..88648f0352 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
@@ -28,23 +28,27 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.program.internal.ProgramStageSectionDataElementChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramStageSectionFields
+import org.hisp.dhis.android.core.program.internal.ProgramStageSectionProgramIndicatorChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramStageSectionStore
 import javax.inject.Inject
 
 @Reusable
 class ProgramStageSectionsCollectionRepository @Inject internal constructor(
     store: ProgramStageSectionStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageSection>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageSection, ProgramStageSectionsCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +56,7 @@ class ProgramStageSectionsCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramStageSectionsCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -88,4 +92,11 @@ class ProgramStageSectionsCollectionRepository @Inject internal constructor(
     fun withDataElements(): ProgramStageSectionsCollectionRepository {
         return cf.withChild(ProgramStageSectionFields.DATA_ELEMENTS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramStageSection> = mapOf(
+            ProgramStageSectionFields.PROGRAM_INDICATORS to ProgramStageSectionProgramIndicatorChildrenAppender::create,
+            ProgramStageSectionFields.DATA_ELEMENTS to ProgramStageSectionDataElementChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
index c994087ef3..34604b1604 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.program
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -38,18 +39,20 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeFields
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore
+import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender
 import javax.inject.Inject
 
 @Reusable
 class ProgramTrackedEntityAttributeCollectionRepository @Inject internal constructor(
     store: ProgramTrackedEntityAttributeStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramTrackedEntityAttribute>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<
     ProgramTrackedEntityAttribute,
     ProgramTrackedEntityAttributeCollectionRepository,
     >(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -57,7 +60,7 @@ class ProgramTrackedEntityAttributeCollectionRepository @Inject internal constru
     ) { s: RepositoryScope ->
         ProgramTrackedEntityAttributeCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -99,4 +102,11 @@ class ProgramTrackedEntityAttributeCollectionRepository @Inject internal constru
     ): ProgramTrackedEntityAttributeCollectionRepository {
         return cf.withOrderBy(ProgramTrackedEntityAttributeTableInfo.Columns.SORT_ORDER, direction)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramTrackedEntityAttribute> = mapOf(
+            ProgramTrackedEntityAttributeFields.RENDER_TYPE to
+                ::ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
index 7951030e29..fabf5c959f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
@@ -28,14 +28,15 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStoreImpl
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import javax.inject.Inject
 
 @Reusable
 internal class DataElementValueTypeRenderingChildrenAppender @Inject constructor(
-    store: ValueTypeDeviceRenderingStore,
-) : ValueTypeRenderingChildrenAppender<ProgramStageDataElement>(store) {
+    databaseAdapter: DatabaseAdapter,
+) : ValueTypeRenderingChildrenAppender<ProgramStageDataElement>(ValueTypeDeviceRenderingStoreImpl(databaseAdapter)) {
     override fun appendChildren(m: ProgramStageDataElement): ProgramStageDataElement {
         val valueTypeRendering = getValueTypeDeviceRendering(m)
         return m.toBuilder().renderType(valueTypeRendering).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
index 90496c5402..e07ae78e23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
@@ -31,9 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.Program
-import org.hisp.dhis.android.core.program.ProgramTableInfo
 
 @Module
 internal class ProgramEntityDIModule {
@@ -42,14 +39,4 @@ internal class ProgramEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramStore {
         return ProgramStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        trackedEntityTypeChildrenAppender: ProgramTrackedEntityTypeChildrenAppender,
-    ): Map<String, ChildrenAppender<Program>> {
-        return mapOf(
-            ProgramTableInfo.Columns.TRACKED_ENTITY_TYPE to trackedEntityTypeChildrenAppender,
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
index abdeb139a1..718413766d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramIndicator
 
 @Module
 internal class ProgramIndicatorEntityDIModule {
@@ -41,14 +39,4 @@ internal class ProgramIndicatorEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramIndicatorStore {
         return ProgramIndicatorStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramIndicator>> {
-        return mapOf(
-            ProgramIndicatorFields.LEGEND_SETS to ProgramIndicatorLegendSetChildrenAppender.create(databaseAdapter),
-            ProgramIndicatorFields.ANALYTICS_PERIOD_BOUNDARIES to
-                ProgramIndicatorAnalyticsPeriodBoundaryChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
index 4b09693b57..f6e3b9cd15 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramRuleAction
 
 @Module
 internal class ProgramRuleActionEntityDIModule {
@@ -47,10 +45,4 @@ internal class ProgramRuleActionEntityDIModule {
     fun handler(store: ProgramRuleActionStore): ProgramRuleActionHandler {
         return ProgramRuleActionHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<ProgramRuleAction>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
index 02c18a337a..bb27e2c122 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramRule
 
 @Module
 internal class ProgramRuleEntityDIModule {
@@ -41,12 +39,4 @@ internal class ProgramRuleEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramRuleStore {
         return ProgramRuleStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramRule>> {
-        return mapOf(
-            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
index 34a52adb83..daaa95ace2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramRuleVariable
 
 @Module
 internal class ProgramRuleVariableEntityDIModule {
@@ -47,10 +45,4 @@ internal class ProgramRuleVariableEntityDIModule {
     fun handler(store: ProgramRuleVariableStore): ProgramRuleVariableHandler {
         return ProgramRuleVariableHandler(store)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<ProgramRuleVariable>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
index 15120fd6b5..e16b95c768 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramSection
 
 @Module
 internal class ProgramSectionEntityDIModule {
@@ -41,12 +39,4 @@ internal class ProgramSectionEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramSectionStore {
         return ProgramSectionStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramSection>> {
-        return mapOf(
-            ProgramSectionFields.ATTRIBUTES to ProgramSectionAttributeChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
index 6f2f2a8cc9..9c98a9a06e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramStageDataElement
 
 @Module
 internal class ProgramStageDataElementEntityDIModule {
@@ -41,14 +39,4 @@ internal class ProgramStageDataElementEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramStageDataElementStore {
         return ProgramStageDataElementStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        valueTypeRenderingChildrenAppender: DataElementValueTypeRenderingChildrenAppender,
-    ): Map<String, ChildrenAppender<ProgramStageDataElement>> {
-        return mapOf(
-            ProgramStageDataElementFields.RENDER_TYPE to valueTypeRenderingChildrenAppender,
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
index a058dc09a1..498014d252 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramStage
 
 @Module
 internal class ProgramStageEntityDIModule {
@@ -41,10 +39,4 @@ internal class ProgramStageEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramStageStore {
         return ProgramStageStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<ProgramStage>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
index 573e4fc6a4..fd6fe4b0e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramStageSection
 
 @Module
 internal class ProgramStageSectionEntityDIModule {
@@ -41,15 +39,4 @@ internal class ProgramStageSectionEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionStore {
         return ProgramStageSectionStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<ProgramStageSection>> {
-        return mapOf(
-            ProgramStageSectionFields.PROGRAM_INDICATORS to
-                ProgramStageSectionProgramIndicatorChildrenAppender.create(databaseAdapter),
-            ProgramStageSectionFields.DATA_ELEMENTS to
-                ProgramStageSectionDataElementChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
index abe182a0db..77e3e83b48 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 
 @Module
 internal class ProgramTrackedEntityAttributeEntityDIModule {
@@ -41,14 +39,4 @@ internal class ProgramTrackedEntityAttributeEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ProgramTrackedEntityAttributeStore {
         return ProgramTrackedEntityAttributeStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        valueTypeRenderingChildrenAppender: ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender,
-    ): Map<String, ChildrenAppender<ProgramTrackedEntityAttribute>> {
-        return mapOf(
-            ProgramTrackedEntityAttributeFields.RENDER_TYPE to valueTypeRenderingChildrenAppender,
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
index 7bdbdc356e..ce05541d67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
@@ -28,14 +28,17 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStore
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStoreImpl
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender @Inject constructor(
-    store: ValueTypeDeviceRenderingStore,
-) : ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute>(store) {
+    databaseAdapter: DatabaseAdapter,
+) : ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute>(
+    ValueTypeDeviceRenderingStoreImpl(databaseAdapter)
+) {
     override fun appendChildren(m: ProgramTrackedEntityAttribute): ProgramTrackedEntityAttribute {
         val valueTypeRendering = getValueTypeDeviceRendering(m)
         return m.toBuilder().renderType(valueTypeRendering).build()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
index e177c59bfb..34ee862078 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
@@ -28,15 +28,17 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.Program
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreImpl
 import javax.inject.Inject
 
 @Reusable
 internal class ProgramTrackedEntityTypeChildrenAppender @Inject constructor(
-    private val store: TrackedEntityTypeStore,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<Program>() {
+    private val store = TrackedEntityTypeStoreImpl(databaseAdapter)
     override fun appendChildren(m: Program): Program {
         val builder = m.toBuilder()
         val trackedEntityType = m.trackedEntityType()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
index a3fa637253..4dfc97df1b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.programstageworkinglist
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -39,6 +40,8 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageQueryCriteriaFields
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListAttributeValueFilterChildrenAppender
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListDataFilterChildrenAppender
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStore
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListTableInfo
 import javax.inject.Inject
@@ -47,10 +50,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class ProgramStageWorkingListCollectionRepository @Inject internal constructor(
     store: ProgramStageWorkingListStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ProgramStageWorkingList>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<ProgramStageWorkingList, ProgramStageWorkingListCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -58,7 +62,7 @@ class ProgramStageWorkingListCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ProgramStageWorkingListCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -110,4 +114,13 @@ class ProgramStageWorkingListCollectionRepository @Inject internal constructor(
     fun withAttributeValueFilters(): ProgramStageWorkingListCollectionRepository {
         return cf.withChild(ProgramStageQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ProgramStageWorkingList> = mapOf(
+            ProgramStageQueryCriteriaFields.DATA_FILTERS to
+                ProgramStageWorkingListDataFilterChildrenAppender::create,
+            ProgramStageQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER to
+                ProgramStageWorkingListAttributeValueFilterChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
index 6161beca12..60f825c9d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import retrofit2.Retrofit
 
 @Module
@@ -49,17 +47,4 @@ internal class ProgramStageWorkingListEntityDIModule {
     fun service(retrofit: Retrofit): ProgramStageWorkingListService {
         return retrofit.create(ProgramStageWorkingListService::class.java)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        databaseAdapter: DatabaseAdapter,
-    ): Map<String, ChildrenAppender<ProgramStageWorkingList>> {
-        return mapOf(
-            ProgramStageQueryCriteriaFields.DATA_FILTERS to
-                ProgramStageWorkingListDataFilterChildrenAppender.create(databaseAdapter),
-            ProgramStageQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER to
-                ProgramStageWorkingListAttributeValueFilterChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
index d0d9ca7435..22a515d678 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
@@ -29,9 +29,10 @@ package org.hisp.dhis.android.core.relationship
 
 import dagger.Reusable
 import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseReadOnlyWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -48,6 +49,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
+import org.hisp.dhis.android.core.relationship.internal.RelationshipItemChildrenAppender
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemElementStoreSelector
 import org.hisp.dhis.android.core.relationship.internal.RelationshipManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
@@ -57,7 +59,7 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class RelationshipCollectionRepository @Inject internal constructor(
     private val relationshipStore: RelationshipStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Relationship>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     private val relationshipHandler: RelationshipHandler,
     private val storeSelector: RelationshipItemElementStoreSelector,
@@ -65,6 +67,7 @@ class RelationshipCollectionRepository @Inject internal constructor(
     private val trackerDataManager: TrackerDataManager,
 ) : BaseReadOnlyWithUidCollectionRepositoryImpl<Relationship, RelationshipCollectionRepository>(
     relationshipStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -72,7 +75,7 @@ class RelationshipCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         RelationshipCollectionRepository(
             relationshipStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
             relationshipHandler,
             storeSelector,
@@ -138,7 +141,8 @@ class RelationshipCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): ReadWriteObjectRepository<Relationship> {
         val updatedScope: RepositoryScope = withUidFilterItem(scope, uid)
-        return RelationshipObjectRepository(relationshipStore, uid, childrenAppenders, updatedScope, trackerDataManager)
+        return RelationshipObjectRepository(relationshipStore, uid, databaseAdapter, childrenAppenders,
+            updatedScope, trackerDataManager)
     }
 
     private fun isUpdatableState(state: State?): Boolean {
@@ -209,4 +213,10 @@ class RelationshipCollectionRepository @Inject internal constructor(
     fun withItems(): RelationshipCollectionRepository {
         return cf.withChild(RelationshipFields.ITEMS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Relationship> = mapOf(
+            RelationshipFields.ITEMS to ::RelationshipItemChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
index 256e13ad80..7160e38524 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipObjectRepository.kt
@@ -27,8 +27,9 @@
  */
 package org.hisp.dhis.android.core.relationship
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -38,17 +39,20 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 internal class RelationshipObjectRepository(
     store: RelationshipStore,
     uid: String?,
-    childrenAppenders: Map<String, ChildrenAppender<Relationship>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<Relationship>,
     scope: RepositoryScope,
     private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<Relationship, RelationshipObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         RelationshipObjectRepository(
             store,
             uid,
+            databaseAdapter,
             childrenAppenders,
             s,
             trackerDataManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
index 84136d6568..7fb3a59254 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
@@ -28,8 +28,9 @@
 package org.hisp.dhis.android.core.relationship
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -38,6 +39,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOpe
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.internal.EventStore
+import org.hisp.dhis.android.core.relationship.internal.RelationshipConstraintChildrenAppender
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollectionRepositoryHelper.availableForEnrollmentRawQuery
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollectionRepositoryHelper.availableForEventRawQuery
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollectionRepositoryHelper.availableForTrackedEntityInstanceRawQuery
@@ -52,10 +54,11 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
     private val teiStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<RelationshipType>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<RelationshipType, RelationshipTypeCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
@@ -64,7 +67,7 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
             teiStore,
             enrollmentStore,
             eventStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -160,4 +163,10 @@ class RelationshipTypeCollectionRepository @Inject internal constructor(
                 RelationshipConstraintTableInfo.Columns.PROGRAM_STAGE
         }
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<RelationshipType> = mapOf(
+            RelationshipTypeFields.CONSTRAINTS to ::RelationshipConstraintChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
index cd2cf5d28b..d3aa0c0dc6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
@@ -27,14 +27,19 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.relationship.RelationshipConstraint
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipType
 
-internal class RelationshipConstraintChildrenAppender(private val constraintStore: RelationshipConstraintStore) :
-    ChildrenAppender<RelationshipType>() {
+internal class RelationshipConstraintChildrenAppender(
+    databaseAdapter: DatabaseAdapter
+) : ChildrenAppender<RelationshipType>() {
+    private val constraintStore = RelationshipConstraintStoreImpl(databaseAdapter)
+
     private var constraints: List<RelationshipConstraint>? = null
+
     override fun prepareChildren(collection: Collection<RelationshipType>) {
         constraints = constraintStore.selectAll()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
index cb766e852f..70565765a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
@@ -31,9 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.relationship.Relationship
-import org.hisp.dhis.android.core.relationship.RelationshipFields
 
 @Module
 internal class RelationshipEntityDIModule {
@@ -42,14 +39,4 @@ internal class RelationshipEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): RelationshipStore {
         return RelationshipStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        itemChildrenAppender: RelationshipItemChildrenAppender,
-    ): Map<String, ChildrenAppender<Relationship>> {
-        return mapOf(
-            RelationshipFields.ITEMS to itemChildrenAppender,
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
index 052291db44..8535910b87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
@@ -35,8 +36,9 @@ import javax.inject.Inject
 
 @Reusable
 internal class RelationshipItemChildrenAppender @Inject constructor(
-    private val store: RelationshipItemStore,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<Relationship>() {
+    private val store = RelationshipItemStoreImpl(databaseAdapter)
 
     override fun appendChildren(relationship: Relationship): Relationship {
         val fromItem = store.getForRelationshipUidAndConstraintType(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
index be5a229787..4c84df6e0b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.relationship.RelationshipType
 
 @Module
 internal class RelationshipTypeEntityDIModule {
@@ -54,14 +52,4 @@ internal class RelationshipTypeEntityDIModule {
             relationshipConstraintHandler,
         )
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        constraintStore: RelationshipConstraintStore,
-    ): Map<String, ChildrenAppender<RelationshipType>> {
-        return mapOf(
-            RelationshipTypeFields.CONSTRAINTS to RelationshipConstraintChildrenAppender(constraintStore),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
index 2a806d6466..66257f9f52 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.settings
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -42,10 +43,11 @@ import javax.inject.Inject
 @Reusable
 class AnalyticsTeiSettingCollectionRepository @Inject internal constructor(
     store: AnalyticsTeiSettingStore,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
-    childrenAppenders: MutableMap<String, ChildrenAppender<AnalyticsTeiSetting>>,
 ) : ReadOnlyCollectionRepositoryImpl<AnalyticsTeiSetting, AnalyticsTeiSettingCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope.toBuilder().children(scope.children().withChild(AnalyticsTeiDataChildrenAppender.KEY)).build(),
     FilterConnectorFactory(
@@ -53,8 +55,8 @@ class AnalyticsTeiSettingCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         AnalyticsTeiSettingCollectionRepository(
             store,
+            databaseAdapter,
             s,
-            childrenAppenders,
         )
     },
 ) {
@@ -85,4 +87,10 @@ class AnalyticsTeiSettingCollectionRepository @Inject internal constructor(
     fun byType(): EnumFilterConnector<AnalyticsTeiSettingCollectionRepository, ChartType> {
         return cf.enumC(AnalyticsTeiSettingTableInfo.Columns.TYPE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<AnalyticsTeiSetting> = mapOf(
+            AnalyticsTeiDataChildrenAppender.KEY to ::AnalyticsTeiDataChildrenAppender
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
index e6e2ef20d0..8873b2ef71 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.settings
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -42,10 +43,11 @@ import javax.inject.Inject
 @Reusable
 class SystemSettingCollectionRepository @Inject internal constructor(
     store: SystemSettingStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<SystemSetting>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<SystemSetting, SystemSettingCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -53,7 +55,7 @@ class SystemSettingCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         SystemSettingCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -73,4 +75,8 @@ class SystemSettingCollectionRepository @Inject internal constructor(
     fun style(): ReadOnlyOneObjectRepositoryFinalImpl<SystemSetting> {
         return byKey().eq(SystemSettingKey.STYLE).one()
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<SystemSetting> = mapOf()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
index 05200998f2..a48e51ef63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 
 @Module
 internal class AnalyticsSettingEntityDIModule {
@@ -72,11 +70,4 @@ internal class AnalyticsSettingEntityDIModule {
     fun analyticsTeiWHONutritionDataStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiWHONutritionDataStore {
         return AnalyticsTeiWHONutritionDataStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun teiChildrenAppenders(dataChildrenAppender: AnalyticsTeiDataChildrenAppender):
-        Map<String, ChildrenAppender<AnalyticsTeiSetting>> {
-        return mapOf(AnalyticsTeiDataChildrenAppender.KEY to dataChildrenAppender)
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
index 799b09287d..d3f451c990 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
@@ -39,11 +40,12 @@ import javax.inject.Inject
 
 @Reusable
 internal class AnalyticsTeiDataChildrenAppender @Inject constructor(
-    private val analyticsTeiDataElementStore: AnalyticsTeiDataElementStore,
-    private val analyticsTeiIndicatorStore: AnalyticsTeiIndicatorStore,
-    private val analyticsTeiAttributeStore: AnalyticsTeiAttributeStore,
-    private val analyticsTeiWHONutritionDataStore: AnalyticsTeiWHONutritionDataStore,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<AnalyticsTeiSetting>() {
+    private val analyticsTeiDataElementStore = AnalyticsTeiDataElementStoreImpl(databaseAdapter)
+    private val analyticsTeiIndicatorStore = AnalyticsTeiIndicatorStoreImpl(databaseAdapter)
+    private val analyticsTeiAttributeStore = AnalyticsTeiAttributeStoreImpl(databaseAdapter)
+    private val analyticsTeiWHONutritionDataStore = AnalyticsTeiWHONutritionDataStoreImpl(databaseAdapter)
 
     companion object {
         const val KEY = "DATA"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
index 0f43f8138e..c03526af2e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.settings.SystemSetting
 
 @Module
 internal class SystemSettingEntityDIModule {
@@ -41,10 +39,4 @@ internal class SystemSettingEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): SystemSettingStore {
         return SystemSettingStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<SystemSetting>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
index 00be5e6dea..23583ef905 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.settings.UserSettings
 
 @Module
 internal class UserSettingsEntityDIModule {
@@ -41,10 +39,4 @@ internal class UserSettingsEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): UserSettingsStore {
         return UserSettingsStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<UserSettings>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
index 1f11b5c0f6..25d0aa8a97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.systeminfo
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyFirstObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -39,20 +40,25 @@ import javax.inject.Inject
 @Reusable
 class SystemInfoObjectRepository @Inject internal constructor(
     store: SystemInfoStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<SystemInfo>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     systemInfoCall: SystemInfoCall,
 ) : ReadOnlyFirstObjectWithDownloadRepositoryImpl<SystemInfo, SystemInfoObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     systemInfoCall,
     ObjectRepositoryFactory { cs: RepositoryScope ->
         SystemInfoObjectRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             cs,
             systemInfoCall,
         )
     },
-)
+) {
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<SystemInfo> = emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
index 657befc1e5..0a12d5a43d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.systeminfo.SystemInfo
 
 @Module
 internal class SystemInfoEntityDIModule {
@@ -41,10 +39,4 @@ internal class SystemInfoEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): SystemInfoStore {
         return SystemInfoStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<SystemInfo>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
index cb8593d711..420b656b0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -38,6 +39,7 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeLegendSetChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import javax.inject.Inject
 
@@ -45,10 +47,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
     store: TrackedEntityAttributeStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityAttribute>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityAttribute, TrackedEntityAttributeCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -56,7 +59,7 @@ class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         TrackedEntityAttributeCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -136,4 +139,10 @@ class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
     fun withLegendSets(): TrackedEntityAttributeCollectionRepository {
         return cf.withChild(TrackedEntityAttributeFields.LEGEND_SETS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityAttribute> = mapOf(
+            TrackedEntityAttributeFields.LEGEND_SETS to TrackedEntityAttributeLegendSetChildrenAppender::create
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
index 71f49bb8c1..7ae1fe165d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DeletedFilterConnector
@@ -42,11 +43,12 @@ import javax.inject.Inject
 @Reusable
 class TrackedEntityAttributeValueCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityAttributeValueStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityAttributeValue>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     private val dataStatePropagator: DataStatePropagator,
 ) : ReadOnlyCollectionRepositoryImpl<TrackedEntityAttributeValue, TrackedEntityAttributeValueCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -54,7 +56,7 @@ class TrackedEntityAttributeValueCollectionRepository @Inject internal construct
     ) { s: RepositoryScope ->
         TrackedEntityAttributeValueCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
             dataStatePropagator,
         )
@@ -68,6 +70,7 @@ class TrackedEntityAttributeValueCollectionRepository @Inject internal construct
             .byTrackedEntityInstance().eq(trackedEntityInstance).scope
         return TrackedEntityAttributeValueObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             updatedScope,
             dataStatePropagator,
@@ -99,4 +102,8 @@ class TrackedEntityAttributeValueCollectionRepository @Inject internal construct
     fun byDeleted(): DeletedFilterConnector<TrackedEntityAttributeValueCollectionRepository> {
         return cf.deleted(TrackedEntityAttributeValueTableInfo.Columns.VALUE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityAttributeValue> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
index 435aefb8b7..35e7fa1739 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueObjectRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
@@ -40,18 +41,21 @@ import java.util.Date
 
 class TrackedEntityAttributeValueObjectRepository internal constructor(
     store: TrackedEntityAttributeValueStore,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityAttributeValue>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<TrackedEntityAttributeValue>,
     scope: RepositoryScope,
     private val dataStatePropagator: DataStatePropagator,
     private val trackedEntityAttribute: String,
     private val trackedEntityInstance: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<TrackedEntityAttributeValue, TrackedEntityAttributeValueObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         TrackedEntityAttributeValueObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             s,
             dataStatePropagator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
index 535b0229c8..29545fa89c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -43,11 +44,12 @@ import javax.inject.Inject
 @Reusable
 class TrackedEntityDataValueCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityDataValueStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityDataValue>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     private val dataStatePropagator: DataStatePropagator,
 ) : ReadOnlyCollectionRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -55,7 +57,7 @@ class TrackedEntityDataValueCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         TrackedEntityDataValueCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
             dataStatePropagator,
         )
@@ -65,6 +67,7 @@ class TrackedEntityDataValueCollectionRepository @Inject internal constructor(
         val updatedScope = byEvent().eq(event).byDataElement().eq(dataElement).scope
         return TrackedEntityDataValueObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             updatedScope,
             dataStatePropagator,
@@ -104,4 +107,8 @@ class TrackedEntityDataValueCollectionRepository @Inject internal constructor(
     fun byDeleted(): DeletedFilterConnector<TrackedEntityDataValueCollectionRepository> {
         return cf.deleted(TrackedEntityDataValueTableInfo.Columns.VALUE)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityDataValue> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
index a227ce6682..83686b1fea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueObjectRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
@@ -40,18 +41,21 @@ import java.util.Date
 
 class TrackedEntityDataValueObjectRepository internal constructor(
     store: TrackedEntityDataValueStore,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityDataValue>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<TrackedEntityDataValue>,
     scope: RepositoryScope,
     private val dataStatePropagator: DataStatePropagator,
     private val event: String,
     private val dataElement: String,
 ) : ReadWriteWithValueObjectRepositoryImpl<TrackedEntityDataValue, TrackedEntityDataValueObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         TrackedEntityDataValueObjectRepository(
             store,
+            databaseAdapter,
             childrenAppenders,
             s,
             dataStatePropagator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
index 88d3523dd1..09a4018077 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
@@ -30,8 +30,9 @@ package org.hisp.dhis.android.core.trackedentity
 import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadWriteWithUploadWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadWriteWithUidCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
@@ -47,6 +48,8 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
 import org.hisp.dhis.android.core.common.internal.TrackerDataManager
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
+import org.hisp.dhis.android.core.trackedentity.internal.ProgramOwnerChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePostParentCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceProjectionTransformer
@@ -58,7 +61,7 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     transformer: TrackedEntityInstanceProjectionTransformer,
     private val trackerDataManager: TrackerDataManager,
@@ -70,6 +73,7 @@ class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
     TrackedEntityInstanceCollectionRepository,
     >(
     trackedEntityInstanceStore,
+    databaseAdapter,
     childrenAppenders,
     scope,
     transformer,
@@ -78,7 +82,7 @@ class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         TrackedEntityInstanceCollectionRepository(
             trackedEntityInstanceStore,
-            childrenAppenders,
+            databaseAdapter,
             s,
             transformer,
             trackerDataManager,
@@ -116,6 +120,7 @@ class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
         return TrackedEntityInstanceObjectRepository(
             trackedEntityInstanceStore,
             uid,
+            databaseAdapter,
             childrenAppenders,
             updatedScope,
             trackerDataManager,
@@ -214,4 +219,13 @@ class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
     fun withProgramOwners(): TrackedEntityInstanceCollectionRepository {
         return cf.withChild(TrackedEntityInstanceFields.PROGRAM_OWNERS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance> = mapOf(
+            TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES to
+                TrackedEntityAttributeValueChildrenAppender::create,
+            TrackedEntityInstanceFields.PROGRAM_OWNERS to
+                ::ProgramOwnerChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
index 5b8937ed84..4146ce037b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -41,6 +42,8 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.trackedentity.internal.EntityQueryCriteriaFields
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterEvenFilterChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore
 import javax.inject.Inject
@@ -49,13 +52,14 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class TrackedEntityInstanceFilterCollectionRepository @Inject internal constructor(
     store: TrackedEntityInstanceFilterStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstanceFilter>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<
     TrackedEntityInstanceFilter,
     TrackedEntityInstanceFilterCollectionRepository,
     >(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -63,7 +67,7 @@ class TrackedEntityInstanceFilterCollectionRepository @Inject internal construct
     ) { s: RepositoryScope ->
         TrackedEntityInstanceFilterCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -151,4 +155,13 @@ class TrackedEntityInstanceFilterCollectionRepository @Inject internal construct
     fun withAttributeValueFilters(): TrackedEntityInstanceFilterCollectionRepository {
         return cf.withChild(EntityQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstanceFilter> = mapOf(
+            TrackedEntityInstanceFilterFields.EVENT_FILTERS to
+                TrackedEntityInstanceFilterEvenFilterChildrenAppender::create,
+            EntityQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER to
+                TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
index 7241bf9c63..0d44006053 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceObjectRepository.kt
@@ -27,9 +27,10 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithUidDataObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -46,17 +47,20 @@ import java.util.Date
 class TrackedEntityInstanceObjectRepository internal constructor(
     store: TrackedEntityInstanceStore,
     uid: String?,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    databaseAdapter: DatabaseAdapter,
+    childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance>,
     scope: RepositoryScope,
     private val trackerDataManager: TrackerDataManager,
 ) : ReadWriteWithUidDataObjectRepositoryImpl<TrackedEntityInstance, TrackedEntityInstanceObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { s: RepositoryScope ->
         TrackedEntityInstanceObjectRepository(
             store,
             uid,
+            databaseAdapter,
             childrenAppenders,
             s,
             trackerDataManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
index 7e638ae854..9f048127e7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -41,10 +42,11 @@ import javax.inject.Inject
 @Reusable
 class TrackedEntityTypeAttributeCollectionRepository @Inject internal constructor(
     store: TrackedEntityTypeAttributeStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityTypeAttribute>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<TrackedEntityTypeAttribute, TrackedEntityTypeAttributeCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -52,7 +54,7 @@ class TrackedEntityTypeAttributeCollectionRepository @Inject internal constructo
     ) { s: RepositoryScope ->
         TrackedEntityTypeAttributeCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -80,4 +82,8 @@ class TrackedEntityTypeAttributeCollectionRepository @Inject internal constructo
     fun bySortOrder(): IntegerFilterConnector<TrackedEntityTypeAttributeCollectionRepository> {
         return cf.integer(TrackedEntityTypeAttributeTableInfo.Columns.SORT_ORDER)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityTypeAttribute> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
index f1606f6b3d..6269348ba2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
@@ -28,13 +28,15 @@
 package org.hisp.dhis.android.core.trackedentity
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.FeatureType
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
 import javax.inject.Inject
@@ -42,10 +44,11 @@ import javax.inject.Inject
 @Reusable
 class TrackedEntityTypeCollectionRepository @Inject internal constructor(
     store: TrackedEntityTypeStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityType>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<TrackedEntityType, TrackedEntityTypeCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -53,7 +56,7 @@ class TrackedEntityTypeCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         TrackedEntityTypeCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -73,4 +76,11 @@ class TrackedEntityTypeCollectionRepository @Inject internal constructor(
     fun withTrackedEntityTypeAttributes(): TrackedEntityTypeCollectionRepository {
         return cf.withChild(TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<TrackedEntityType> = mapOf(
+            TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES to
+                TrackedEntityTypeAttributeChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt
index 600df9788b..84b48093fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ProgramOwnerChildrenAppender.kt
@@ -27,16 +27,17 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
+import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStoreImpl
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 
 internal class ProgramOwnerChildrenAppender constructor(
-    private val childStore: ObjectWithoutUidStore<ProgramOwner>,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<TrackedEntityInstance>() {
+    private val childStore = ProgramOwnerStoreImpl(databaseAdapter)
 
     override fun appendChildren(tei: TrackedEntityInstance): TrackedEntityInstance {
         val builder = tei.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
index 10c4e12d0b..e9730f5381 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
@@ -32,8 +32,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 
 @Module
 internal class TrackedEntityAttributeLegendSetDIModule {
@@ -42,13 +40,4 @@ internal class TrackedEntityAttributeLegendSetDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeLegendSetLinkStore {
         return TrackedEntityAttributeLegendSetLinkStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<TrackedEntityAttribute>> {
-        return mapOf(
-            TrackedEntityAttributeFields.LEGEND_SETS to
-                TrackedEntityAttributeLegendSetChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
index c1a23a36a1..68226961a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 
 @Module
 internal class TrackedEntityAttributeValueEntityDIModule {
@@ -41,10 +39,4 @@ internal class TrackedEntityAttributeValueEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeValueStore {
         return TrackedEntityAttributeValueStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<TrackedEntityAttributeValue>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
index 0c8a3be9ed..4a7ce1f8a6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 
 @Module
 internal class TrackedEntityDataValueEntityDIModule {
@@ -41,10 +39,4 @@ internal class TrackedEntityDataValueEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackedEntityDataValueStore {
         return TrackedEntityDataValueStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<TrackedEntityDataValue>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
index 44dd971294..0d32d71ef4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
@@ -31,9 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import retrofit2.Retrofit
 
 @Module
@@ -56,18 +53,4 @@ internal class TrackedEntityInstanceEntityDIModule {
     fun uidHelper(impl: TrackedEntityInstanceUidHelperImpl): TrackedEntityInstanceUidHelper {
         return impl
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        databaseAdapter: DatabaseAdapter,
-        programOwnerStore: ProgramOwnerStore,
-    ): Map<String, ChildrenAppender<TrackedEntityInstance>> {
-        return mapOf(
-            TrackedEntityInstanceFields.TRACKED_ENTITY_ATTRIBUTE_VALUES to
-                TrackedEntityAttributeValueChildrenAppender.create(databaseAdapter),
-            TrackedEntityInstanceFields.PROGRAM_OWNERS to
-                ProgramOwnerChildrenAppender(programOwnerStore),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
index 8a1e9dbaba..b0c2bc811a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 
 @Module
 internal class TrackedEntityInstanceFilterEntityDIModule {
@@ -42,17 +40,4 @@ internal class TrackedEntityInstanceFilterEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceFilterStore {
         return TrackedEntityInstanceFilterStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(
-        databaseAdapter: DatabaseAdapter,
-    ): Map<String, ChildrenAppender<TrackedEntityInstanceFilter>> {
-        return mapOf(
-            TrackedEntityInstanceFilterFields.EVENT_FILTERS to
-                TrackedEntityInstanceFilterEvenFilterChildrenAppender.create(databaseAdapter),
-            EntityQueryCriteriaFields.ATTRIBUTE_VALUE_FILTER to
-                TrackedEntityInstanceFilterAttributeValueFilterChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
index d46f931bfe..ffd6cef168 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 
 @Module
 internal class TrackedEntityTypeAttributeEntityDIModule {
@@ -41,10 +39,4 @@ internal class TrackedEntityTypeAttributeEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackedEntityTypeAttributeStore {
         return TrackedEntityTypeAttributeStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<TrackedEntityTypeAttribute>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
index 184b696996..3c85adc170 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 
 @Module
 internal class TrackedEntityTypeEntityDIModule {
@@ -41,13 +39,4 @@ internal class TrackedEntityTypeEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): TrackedEntityTypeStore {
         return TrackedEntityTypeStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<TrackedEntityType>> {
-        return mapOf(
-            TrackedEntityTypeFields.TRACKED_ENTITY_TYPE_ATTRIBUTES to
-                TrackedEntityTypeAttributeChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index fde09df59a..10962f1403 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -34,10 +34,10 @@ import androidx.paging.PagedList
 import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
@@ -48,6 +48,7 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
@@ -59,7 +60,7 @@ import javax.inject.Inject
 class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
-    private val childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
+    private val databaseAdapter: DatabaseAdapter,
     scope: TrackedEntityInstanceQueryRepositoryScope,
     scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
     versionManager: DHISVersionManager,
@@ -84,7 +85,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
             > =
         ScopedFilterConnectorFactory { s: TrackedEntityInstanceQueryRepositoryScope ->
             TrackedEntityInstanceQueryCollectionRepository(
-                store, trackerParentCallFactory, childrenAppenders,
+                store, trackerParentCallFactory, databaseAdapter,
                 s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
                 onlineHelper, localQueryHelper,
             )
@@ -189,6 +190,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
     private fun getDataFetcher(): TrackedEntityInstanceQueryDataFetcher {
         return TrackedEntityInstanceQueryDataFetcher(
             store,
+            databaseAdapter,
             trackerParentCallFactory,
             scope,
             childrenAppenders,
@@ -242,4 +244,8 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
             }
         }
     }
+
+    internal companion object {
+        val childrenAppenders = TrackedEntityInstanceCollectionRepository.childrenAppenders
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 95dbe48beb..5e9fe601a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -29,9 +29,10 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenSelection
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -40,14 +41,14 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
-import kotlin.collections.HashSet
 
 @Suppress("TooManyFunctions")
 internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val store: TrackedEntityInstanceStore,
+    private val databaseAdapter: DatabaseAdapter,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val scope: TrackedEntityInstanceQueryRepositoryScope,
-    private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    private val childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance>,
     private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
@@ -216,6 +217,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private fun appendAttributes(withoutChildren: List<TrackedEntityInstance>): List<TrackedEntityInstance> {
         return ChildrenAppenderExecutor.appendInObjectCollection(
             withoutChildren,
+            databaseAdapter,
             childrenAppenders,
             ChildrenSelection(
                 setOf(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
index 87b6e310b3..08740641a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -35,10 +35,10 @@ import androidx.paging.PagedList
 import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
@@ -46,7 +46,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMod
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
@@ -57,7 +57,7 @@ import javax.inject.Inject
 class TrackedEntitySearchCollectionRepository @Inject internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
-    private val childrenAppenders: MutableMap<String, ChildrenAppender<TrackedEntityInstance>>,
+    private val databaseAdapter: DatabaseAdapter,
     scope: TrackedEntityInstanceQueryRepositoryScope,
     scopeHelper: TrackedEntityInstanceQueryRepositoryScopeHelper,
     versionManager: DHISVersionManager,
@@ -83,7 +83,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
             > =
         ScopedFilterConnectorFactory { s: TrackedEntityInstanceQueryRepositoryScope ->
             TrackedEntitySearchCollectionRepository(
-                store, trackerParentCallFactory, childrenAppenders,
+                store, trackerParentCallFactory, databaseAdapter,
                 s, scopeHelper, versionManager, filtersRepository, workingListRepository, onlineCache,
                 onlineHelper, localQueryHelper, searchDataFetcherHelper,
             )
@@ -157,6 +157,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
     private fun getDataFetcher(): TrackedEntitySearchDataFetcher {
         return TrackedEntitySearchDataFetcher(
             store,
+            databaseAdapter,
             trackerParentCallFactory,
             scope,
             childrenAppenders,
@@ -211,4 +212,8 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
             }
         }
     }
+
+    internal companion object {
+        val childrenAppenders = TrackedEntityInstanceCollectionRepository.childrenAppenders
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
index c6a6af60ab..db26e82081 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
@@ -30,8 +30,9 @@ package org.hisp.dhis.android.core.trackedentity.search
 
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -42,9 +43,10 @@ import java.util.concurrent.TimeUnit
 
 internal class TrackedEntitySearchDataFetcher(
     store: TrackedEntityInstanceStore,
+    databaseAdapter: DatabaseAdapter,
     trackerParentCallFactory: TrackerParentCallFactory,
     scope: TrackedEntityInstanceQueryRepositoryScope,
-    childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>>,
+    childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance>,
     onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
@@ -53,6 +55,7 @@ internal class TrackedEntitySearchDataFetcher(
 
     private val instanceFetcher = TrackedEntityInstanceQueryDataFetcher(
         store,
+        databaseAdapter,
         trackerParentCallFactory,
         scope,
         childrenAppenders,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index 593fa48f56..480d222e90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -28,41 +28,46 @@
 package org.hisp.dhis.android.core.usecase.stock
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidAndTransformerCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransactionChildrenAppender
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransformer
 import javax.inject.Inject
 
 @Reusable
 class StockUseCaseCollectionRepository @Inject internal constructor(
     store: StockUseCaseStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<InternalStockUseCase>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
     transformer: StockUseCaseTransformer,
 ) : ReadOnlyWithUidCollectionRepository<StockUseCase> by
-ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
-    InternalStockUseCase,
-    StockUseCase,
-    StockUseCaseCollectionRepository,
-    >(
+ReadOnlyWithUidAndTransformerCollectionRepositoryImpl(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(scope) { s: RepositoryScope ->
-        StockUseCaseCollectionRepository(store, childrenAppenders, s, transformer)
+        StockUseCaseCollectionRepository(store, databaseAdapter, s, transformer)
     },
     transformer,
 ) {
     private val cf: FilterConnectorFactory<StockUseCaseCollectionRepository> =
         FilterConnectorFactory(scope) { s: RepositoryScope ->
-            StockUseCaseCollectionRepository(store, childrenAppenders, s, transformer)
+            StockUseCaseCollectionRepository(store, databaseAdapter, s, transformer)
         }
 
     fun withTransactions(): StockUseCaseCollectionRepository {
         return cf.withChild(InternalStockUseCase.TRANSACTIONS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<InternalStockUseCase> = mapOf(
+            InternalStockUseCase.TRANSACTIONS to ::StockUseCaseTransactionChildrenAppender
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
index 8789bc3e4c..e9bd202828 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 
 @Module
 internal class StockUseCaseEntityDIModule {
@@ -41,13 +39,4 @@ internal class StockUseCaseEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): StockUseCaseStore {
         return StockUseCaseStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(linkStore: StockUseCaseTransactionLinkStore):
-        Map<String, ChildrenAppender<InternalStockUseCase>> {
-        val childrenAppender: ChildrenAppender<InternalStockUseCase> =
-            StockUseCaseTransactionChildrenAppender(linkStore)
-        return mapOf(Pair(InternalStockUseCase.TRANSACTIONS, childrenAppender))
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
index df9ea686bd..ad5f583e0a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionChildrenAppender.kt
@@ -27,12 +27,14 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 
 internal class StockUseCaseTransactionChildrenAppender(
-    private val transactionLinkStore: StockUseCaseTransactionLinkStore,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<InternalStockUseCase>() {
+    private val transactionLinkStore = StockUseCaseTransactionLinkStoreImpl(databaseAdapter)
 
     override fun appendChildren(internalStockUseCase: InternalStockUseCase): InternalStockUseCase {
         return internalStockUseCase.toBuilder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
index 5c340f0cec..b76ebf71dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -38,17 +39,22 @@ import javax.inject.Inject
 @Reusable
 class AuthenticatedUserObjectRepository @Inject internal constructor(
     store: AuthenticatedUserStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<AuthenticatedUser>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyOneObjectRepositoryImpl<AuthenticatedUser, AuthenticatedUserObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     ObjectRepositoryFactory { updatedScope: RepositoryScope ->
         AuthenticatedUserObjectRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             updatedScope,
         )
     },
-)
+) {
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<AuthenticatedUser> = emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
index a529d23e00..09574142a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
@@ -39,10 +40,11 @@ import javax.inject.Inject
 @Reusable
 class AuthorityCollectionRepository @Inject internal constructor(
     store: AuthorityStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Authority>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyCollectionRepositoryImpl<Authority, AuthorityCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -50,7 +52,7 @@ class AuthorityCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         AuthorityCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -58,4 +60,8 @@ class AuthorityCollectionRepository @Inject internal constructor(
     fun byName(): StringFilterConnector<AuthorityCollectionRepository> {
         return cf.string(AuthorityTableInfo.Columns.NAME)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Authority> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index 0eb8f62cb7..4bf125b7de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -64,7 +64,7 @@ class UserCredentialsObjectRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<User> = mapOf(
-            UserCredentialsFields.USER_ROLES to { d -> UserRoleChildrenAppender(d) }
+            UserCredentialsFields.USER_ROLES to ::UserRoleChildrenAppender
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
index f6f1771f0e..12b17863db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
@@ -28,27 +28,30 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserFields
+import org.hisp.dhis.android.core.user.internal.UserRoleChildrenAppender
 import org.hisp.dhis.android.core.user.internal.UserStore
 import javax.inject.Inject
 
 @Reusable
 class UserObjectRepository @Inject internal constructor(
     store: UserStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<User>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyOneObjectRepositoryImpl<User, UserObjectRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
-    ObjectRepositoryFactory<UserObjectRepository> { s: RepositoryScope ->
+    ObjectRepositoryFactory { s: RepositoryScope ->
         UserObjectRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -56,4 +59,10 @@ class UserObjectRepository @Inject internal constructor(
     fun withUserRoles(): UserObjectRepository {
         return cf.withChild(UserFields.USER_ROLES)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<User> = mapOf(
+            UserFields.USER_ROLES to ::UserRoleChildrenAppender,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
index 97e32276fe..3a1bf9ad2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.user
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
@@ -38,10 +39,11 @@ import javax.inject.Inject
 @Reusable
 class UserRoleCollectionRepository @Inject internal constructor(
     store: UserRoleStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<UserRole>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<UserRole, UserRoleCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -49,8 +51,12 @@ class UserRoleCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         UserRoleCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
-)
+) {
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<UserRole> = emptyMap()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
index 070f7a8f2c..7d06aa24a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.user.AuthenticatedUser
 
 @Module
 internal class AuthenticatedUserEntityDIModule {
@@ -41,10 +39,4 @@ internal class AuthenticatedUserEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): AuthenticatedUserStore {
         return AuthenticatedUserStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<AuthenticatedUser>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
index 48f7dfd669..0faa61c0a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.user.Authority
 
 @Module
 internal class AuthorityEntityDIModule {
@@ -41,10 +39,4 @@ internal class AuthorityEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): AuthorityStore {
         return AuthorityStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<Authority>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
index 20fafabaa2..03ef318c6f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.user.User
 
 @Module
 internal class UserEntityDIModule {
@@ -41,12 +39,4 @@ internal class UserEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): UserStore {
         return UserStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(userRoleChildrenAppender: UserRoleChildrenAppender): Map<String, ChildrenAppender<User>> {
-        return mapOf(
-            UserFields.USER_ROLES to userRoleChildrenAppender,
-        )
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
index ba16a9a283..7703b88914 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
@@ -28,14 +28,17 @@
 package org.hisp.dhis.android.core.user.internal
 
 import dagger.Reusable
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.User
 import javax.inject.Inject
 
 @Reusable
 internal class UserRoleChildrenAppender @Inject constructor(
-    private val store: UserRoleStore,
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<User>() {
+    private val store = UserRoleStoreImpl(databaseAdapter)
+
     override fun appendChildren(user: User): User {
         val builder = user.toBuilder()
         builder.userRoles(store.selectAll())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
index 9191505fd9..3cc32c0fd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.user.UserRole
 
 @Module
 internal class UserRoleEntityDIModule {
@@ -41,10 +39,4 @@ internal class UserRoleEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): UserRoleStore {
         return UserRoleStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<UserRole>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
index 68454f76c0..2a772dda54 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
@@ -28,7 +28,8 @@
 package org.hisp.dhis.android.core.validation
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -44,10 +45,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class ValidationRuleCollectionRepository @Inject internal constructor(
     store: ValidationRuleStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<ValidationRule>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyNameableCollectionRepositoryImpl<ValidationRule, ValidationRuleCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -55,7 +57,7 @@ class ValidationRuleCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         ValidationRuleCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -122,4 +124,8 @@ class ValidationRuleCollectionRepository @Inject internal constructor(
             dataSetUids,
         )
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<ValidationRule> = emptyMap()
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
index b5127b0e07..0b321c38e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.validation.ValidationRule
 
 @Module
 internal class ValidationRuleEntityDIModule {
@@ -41,10 +39,4 @@ internal class ValidationRuleEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): ValidationRuleStore {
         return ValidationRuleStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(): Map<String, ChildrenAppender<ValidationRule>> {
-        return emptyMap()
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
index f99fcaffcd..db447f951d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
@@ -28,13 +28,15 @@
 package org.hisp.dhis.android.core.visualization
 
 import dagger.Reusable
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.BooleanFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.visualization.internal.VisualizationColumnsRowsFiltersChildrenAppender
 import org.hisp.dhis.android.core.visualization.internal.VisualizationFields
 import org.hisp.dhis.android.core.visualization.internal.VisualizationStore
 import javax.inject.Inject
@@ -43,10 +45,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 class VisualizationCollectionRepository @Inject internal constructor(
     store: VisualizationStore,
-    childrenAppenders: MutableMap<String, ChildrenAppender<Visualization>>,
+    databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
 ) : ReadOnlyIdentifiableCollectionRepositoryImpl<Visualization, VisualizationCollectionRepository>(
     store,
+    databaseAdapter,
     childrenAppenders,
     scope,
     FilterConnectorFactory(
@@ -54,7 +57,7 @@ class VisualizationCollectionRepository @Inject internal constructor(
     ) { s: RepositoryScope ->
         VisualizationCollectionRepository(
             store,
-            childrenAppenders,
+            databaseAdapter,
             s,
         )
     },
@@ -178,4 +181,10 @@ class VisualizationCollectionRepository @Inject internal constructor(
     fun withColumnsRowsAndFilters(): VisualizationCollectionRepository {
         return cf.withChild(VisualizationFields.ITEMS)
     }
+
+    internal companion object {
+        val childrenAppenders: ChildrenAppenderGetter<Visualization> = mapOf(
+            VisualizationFields.ITEMS to VisualizationColumnsRowsFiltersChildrenAppender::create,
+        )
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
index 4406bc76af..226b6bdde8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.visualization.Visualization
 
 @Module
 internal class VisualizationEntityDIModule {
@@ -42,12 +40,4 @@ internal class VisualizationEntityDIModule {
     fun store(databaseAdapter: DatabaseAdapter): VisualizationStore {
         return VisualizationStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    @Reusable
-    fun childrenAppenders(databaseAdapter: DatabaseAdapter): Map<String, ChildrenAppender<Visualization>> {
-        return mapOf(
-            VisualizationFields.ITEMS to VisualizationColumnsRowsFiltersChildrenAppender.create(databaseAdapter),
-        )
-    }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java
deleted file mode 100644
index 036a5d17e0..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.repositories.collection;
-
-import android.content.ContentValues;
-
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore;
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender;
-import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource;
-import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingConfig;
-import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper;
-import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem;
-import org.hisp.dhis.android.core.category.CategoryOption;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import androidx.paging.ItemKeyedDataSource;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(JUnit4.class)
-public class RepositoryPagingShould  {
-
-    private RepositoryScope emptyScope = RepositoryScope.empty();
-
-    @Mock
-    private IdentifiableObjectStore<CategoryOption> store;
-
-    @Mock
-    private CategoryOption object;
-
-    @Mock
-    private CategoryOption key;
-
-    @Mock
-    private ContentValues keyContentValues;
-
-    private List<CategoryOption> objects = Collections.singletonList(object);
-
-    private Map<String, ChildrenAppender<CategoryOption>> childrenAppenders = Collections.emptyMap();
-
-    @Mock
-    private ItemKeyedDataSource.LoadInitialCallback<CategoryOption> initialCallback;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(store.selectWhere(anyString(), anyString(), anyInt())).thenReturn(objects);
-    }
-
-    @Test
-    public void get_initial_page_objects_without_order_by() {
-        RepositoryDataSource<CategoryOption> dataSource = new RepositoryDataSource<>(store, emptyScope, childrenAppenders);
-        dataSource.loadInitial(new ItemKeyedDataSource.LoadInitialParams<>(null, 3, false), initialCallback);
-        verify(store).selectWhere("1", "_id ASC", 3);
-        verify(initialCallback).onResult(objects);
-    }
-
-    @Test
-    public void get_initial_page_objects_with_order_by() {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withOrderBy(emptyScope,
-                RepositoryScopeOrderByItem.builder().column("name").direction(RepositoryScope.OrderByDirection.DESC).build());
-        RepositoryDataSource<CategoryOption> dataSource = new RepositoryDataSource<>(store, updatedScope, childrenAppenders);
-        dataSource.loadInitial(new ItemKeyedDataSource.LoadInitialParams<>(null, 3, false), initialCallback);
-        verify(store).selectWhere("1", "name DESC, _id ASC", 3);
-        verify(initialCallback).onResult(objects);
-    }
-
-    @Test
-    public void get_initial_page_objects_with_forced_order_by_paging_key_asc() {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withOrderBy(emptyScope,
-                RepositoryScopeOrderByItem.builder().column(RepositoryPagingConfig.PAGING_KEY).direction(RepositoryScope.OrderByDirection.ASC).build());
-        RepositoryDataSource<CategoryOption> dataSource = new RepositoryDataSource<>(store, updatedScope, childrenAppenders);
-        dataSource.loadInitial(new ItemKeyedDataSource.LoadInitialParams<>(null, 3, false), initialCallback);
-        verify(store).selectWhere("1", "_id ASC", 3);
-        verify(initialCallback).onResult(objects);
-    }
-
-    @Test
-    public void get_initial_page_objects_with_forced_order_by_paging_key_desc() {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withOrderBy(emptyScope,
-                RepositoryScopeOrderByItem.builder().column(RepositoryPagingConfig.PAGING_KEY).direction(RepositoryScope.OrderByDirection.DESC).build());
-        RepositoryDataSource<CategoryOption> dataSource = new RepositoryDataSource<>(store, updatedScope, childrenAppenders);
-        dataSource.loadInitial(new ItemKeyedDataSource.LoadInitialParams<>(null, 3, false), initialCallback);
-        verify(store).selectWhere("1", "_id DESC", 3);
-        verify(initialCallback).onResult(objects);
-    }
-
-    @Test
-    public void get_initial_page_objects_with_two_order_by() {
-        RepositoryScope updatedScope = RepositoryScopeHelper.withOrderBy(emptyScope,
-                RepositoryScopeOrderByItem.builder().column("c1").direction(RepositoryScope.OrderByDirection.DESC).build());
-        RepositoryScope updatedScope2 = RepositoryScopeHelper.withOrderBy(updatedScope,
-                RepositoryScopeOrderByItem.builder().column("c2").direction(RepositoryScope.OrderByDirection.ASC).build());
-        RepositoryDataSource<CategoryOption> dataSource = new RepositoryDataSource<>(store, updatedScope2, childrenAppenders);
-        dataSource.loadInitial(new ItemKeyedDataSource.LoadInitialParams<>(null, 3, false), initialCallback);
-        verify(store).selectWhere("1", "c1 DESC, c2 ASC, _id ASC", 3);
-        verify(initialCallback).onResult(objects);
-    }
-
-    @Test
-    public void get_after_page_objects_with_order_by_and_filter() {
-        when(key.toContentValues()).thenReturn(keyContentValues);
-        when(keyContentValues.getAsString("_id")).thenReturn("5");
-        when(keyContentValues.getAsString("code")).thenReturn("key-code");
-        when(keyContentValues.getAsString("name")).thenReturn("key-name");
-
-        RepositoryScope filterScope = RepositoryScopeHelper.withFilterItem(emptyScope,
-                RepositoryScopeFilterItem.builder().key("program").operator(FilterItemOperator.EQ).value("'uid'").build());
-
-        RepositoryScope updatedScope = RepositoryScopeHelper.withOrderBy(filterScope,
-                RepositoryScopeOrderByItem.builder().column("code").direction(RepositoryScope.OrderByDirection.DESC).build());
-        RepositoryScope updatedScope2 = RepositoryScopeHelper.withOrderBy(updatedScope,
-                RepositoryScopeOrderByItem.builder().column("name").direction(RepositoryScope.OrderByDirection.ASC).build());
-        RepositoryDataSource<CategoryOption> dataSource = new RepositoryDataSource<>(store, updatedScope2, childrenAppenders);
-        dataSource.loadAfter(new ItemKeyedDataSource.LoadParams<>(key, 3), initialCallback);
-        verify(store).selectWhere(
-                "((code = 'key-code' AND name = 'key-name' AND _id > '5') OR " +
-                        "(code = 'key-code' AND name > 'key-name') OR " +
-                        "(code < 'key-code')) " +
-                        "AND program = 'uid'",
-                "code DESC, name ASC, _id ASC",
-                3);
-        verify(initialCallback).onResult(objects);
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt
new file mode 100644
index 0000000000..39e0f22d16
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt
@@ -0,0 +1,176 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.his.dhis.android.core.arch.repositories.collection
+
+import android.content.ContentValues
+import androidx.paging.ItemKeyedDataSource
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
+import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource
+import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingConfig
+import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeFilterItem
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withFilterItem
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeHelper.withOrderBy
+import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryScopeOrderByItem
+import org.hisp.dhis.android.core.category.CategoryOption
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.MockitoAnnotations
+
+@RunWith(JUnit4::class)
+class RepositoryPagingShould {
+    private val emptyScope = RepositoryScope.empty()
+
+    private val store: IdentifiableObjectStore<CategoryOption> = mock()
+    private val databaseAdapter: DatabaseAdapter = mock()
+    private val `object`: CategoryOption = mock()
+    private val key: CategoryOption = mock()
+    private val keyContentValues: ContentValues = mock()
+
+    private val objects = listOf(`object`)
+    private val childrenAppenders: ChildrenAppenderGetter<CategoryOption> = emptyMap()
+
+    private val initialCallback: ItemKeyedDataSource.LoadInitialCallback<CategoryOption> = mock()
+
+    @Before
+    fun setUp() {
+        whenever(store.selectWhere(any(), any(), any())).doReturn(objects)
+    }
+
+    @Test
+    fun get_initial_page_objects_without_order_by() {
+        val dataSource: RepositoryDataSource<CategoryOption> =
+            RepositoryDataSource(store, databaseAdapter, emptyScope, childrenAppenders)
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback)
+        Mockito.verify(store).selectWhere("1", "_id ASC", 3)
+        Mockito.verify(initialCallback).onResult(objects)
+    }
+
+    @Test
+    fun get_initial_page_objects_with_order_by() {
+        val updatedScope = withOrderBy(
+            emptyScope,
+            RepositoryScopeOrderByItem.builder().column("name").direction(RepositoryScope.OrderByDirection.DESC).build()
+        )
+        val dataSource: RepositoryDataSource<CategoryOption?> =
+            RepositoryDataSource<M?>(store, updatedScope, childrenAppenders)
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
+        Mockito.verify(store).selectWhere("1", "name DESC, _id ASC", 3)
+        Mockito.verify(initialCallback).onResult(objects)
+    }
+
+    @Test
+    fun get_initial_page_objects_with_forced_order_by_paging_key_asc() {
+        val updatedScope = withOrderBy(
+            emptyScope,
+            RepositoryScopeOrderByItem.builder().column(RepositoryPagingConfig.PAGING_KEY)
+                .direction(RepositoryScope.OrderByDirection.ASC).build()
+        )
+        val dataSource: RepositoryDataSource<CategoryOption?> =
+            RepositoryDataSource<M?>(store, updatedScope, childrenAppenders)
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
+        Mockito.verify(store).selectWhere("1", "_id ASC", 3)
+        Mockito.verify(initialCallback).onResult(objects)
+    }
+
+    @Test
+    fun get_initial_page_objects_with_forced_order_by_paging_key_desc() {
+        val updatedScope = withOrderBy(
+            emptyScope,
+            RepositoryScopeOrderByItem.builder().column(RepositoryPagingConfig.PAGING_KEY)
+                .direction(RepositoryScope.OrderByDirection.DESC).build()
+        )
+        val dataSource: RepositoryDataSource<CategoryOption?> =
+            RepositoryDataSource<M?>(store, updatedScope, childrenAppenders)
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
+        Mockito.verify(store).selectWhere("1", "_id DESC", 3)
+        Mockito.verify(initialCallback).onResult(objects)
+    }
+
+    @Test
+    fun get_initial_page_objects_with_two_order_by() {
+        val updatedScope = withOrderBy(
+            emptyScope,
+            RepositoryScopeOrderByItem.builder().column("c1").direction(RepositoryScope.OrderByDirection.DESC).build()
+        )
+        val updatedScope2 = withOrderBy(
+            updatedScope,
+            RepositoryScopeOrderByItem.builder().column("c2").direction(RepositoryScope.OrderByDirection.ASC).build()
+        )
+        val dataSource: RepositoryDataSource<CategoryOption?> =
+            RepositoryDataSource<M?>(store, updatedScope2, childrenAppenders)
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
+        Mockito.verify(store).selectWhere("1", "c1 DESC, c2 ASC, _id ASC", 3)
+        Mockito.verify(initialCallback).onResult(objects)
+    }
+
+    @Test
+    fun get_after_page_objects_with_order_by_and_filter() {
+        Mockito.`when`(key!!.toContentValues()).thenReturn(keyContentValues)
+        Mockito.`when`(keyContentValues!!.getAsString("_id")).thenReturn("5")
+        Mockito.`when`(keyContentValues.getAsString("code")).thenReturn("key-code")
+        Mockito.`when`(keyContentValues.getAsString("name")).thenReturn("key-name")
+        val filterScope = withFilterItem(
+            emptyScope,
+            RepositoryScopeFilterItem.builder().key("program").operator(FilterItemOperator.EQ).value("'uid'").build()
+        )
+        val updatedScope = withOrderBy(
+            filterScope,
+            RepositoryScopeOrderByItem.builder().column("code").direction(RepositoryScope.OrderByDirection.DESC).build()
+        )
+        val updatedScope2 = withOrderBy(
+            updatedScope,
+            RepositoryScopeOrderByItem.builder().column("name").direction(RepositoryScope.OrderByDirection.ASC).build()
+        )
+        val dataSource: RepositoryDataSource<CategoryOption?> =
+            RepositoryDataSource<M?>(store, updatedScope2, childrenAppenders)
+        dataSource.loadAfter(ItemKeyedDataSource.LoadParams(key, 3), initialCallback!!)
+        Mockito.verify(store).selectWhere(
+            "((code = 'key-code' AND name = 'key-name' AND _id > '5') OR " +
+                "(code = 'key-code' AND name > 'key-name') OR " +
+                "(code < 'key-code')) " +
+                "AND program = 'uid'",
+            "code DESC, name ASC, _id ASC",
+            3
+        )
+        Mockito.verify(initialCallback).onResult(objects)
+    }
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index 80b3294180..adc84f8ad9 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -34,7 +34,9 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
+import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositoryMode
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
@@ -59,6 +61,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     private lateinit var multipleEventFilterScope: TrackedEntityInstanceQueryRepositoryScope
 
     private val store: TrackedEntityInstanceStore = mock()
+    private val databaseAdapter: DatabaseAdapter = mock()
     private val trackerParentCallFactory: TrackerParentCallFactory = mock()
     private val onlineCallFactory: TrackedEntityEndpointCallFactory = mock()
     private val trackedEntity: TrackedEntityInstance = mock()
@@ -69,7 +72,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
 
     var captureInstances: KArgumentCaptor<List<TrackedEntityInstance>> = argumentCaptor()
 
-    private val childrenAppenders: Map<String, ChildrenAppender<TrackedEntityInstance>> = mock()
+    private val childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance> = mock()
 
     private val initialCallback: ItemKeyedDataSource.LoadInitialCallback<TrackedEntityInstance> = mock()
     private val calendarProvider = CalendarProviderFactory.calendarProvider
@@ -122,7 +125,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
                 .doReturn(TrackerQueryResult(emptyList(), true))
         }
 
-        whenever(childrenAppenders[anyString()]).doReturn(identityAppender())
+        whenever(childrenAppenders[anyString()]).doReturn { d -> identityAppender(d) }
     }
 
     @Test
@@ -266,6 +269,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
     ): TrackedEntityInstanceQueryDataFetcher {
         return TrackedEntityInstanceQueryDataFetcher(
             store,
+            databaseAdapter,
             trackerParentCallFactory,
             scope,
             childrenAppenders,
@@ -275,7 +279,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
         )
     }
 
-    private fun identityAppender(): ChildrenAppender<TrackedEntityInstance> {
+    private fun identityAppender(databaseAdapter: DatabaseAdapter): ChildrenAppender<TrackedEntityInstance> {
         return object : ChildrenAppender<TrackedEntityInstance>() {
             override fun appendChildren(m: TrackedEntityInstance): TrackedEntityInstance {
                 return m

From 41df303a1a51c9a702d80c79b9d5485f8ad921db Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 10 Oct 2023 08:40:05 +0200
Subject: [PATCH 415/478] [ANDROSDK-1700] Checks

---
 ...derGetter.kt => ChildrenAppenderGetter.kt} |   0
 ...WithTransformerCollectionRepositoryImpl.kt |   2 +-
 ...dAndTransformerCollectionRepositoryImpl.kt |   4 +-
 ...lyFirstObjectWithDownloadRepositoryImpl.kt |   1 -
 .../category/CategoryCollectionRepository.kt  |   2 +-
 .../CategoryComboCollectionRepository.kt      |   2 +-
 .../CategoryOptionCollectionRepository.kt     |   2 +-
 ...CategoryOptionComboCollectionRepository.kt |   2 +-
 .../CategoryOptionComboEntityDIModule.kt      |   2 -
 .../DataElementCollectionRepository.kt        |   2 +-
 .../dataset/SectionCollectionRepository.kt    |   2 +-
 .../LocalDataStoreCollectionRepository.kt     |   1 -
 .../internal/DataStoreEntityDIModule.kt       |   2 -
 .../EnrollmentCollectionRepository.kt         |  12 +-
 .../core/event/EventCollectionRepository.kt   |  11 +-
 .../ProgramRuleCollectionRepository.kt        |   2 +-
 .../ProgramSectionCollectionRepository.kt     |   2 +-
 ...ramStageDataElementCollectionRepository.kt |   2 +-
 ...ibuteValueTypeRenderingChildrenAppender.kt |   2 +-
 .../RelationshipCollectionRepository.kt       |  10 +-
 .../RelationshipConstraintChildrenAppender.kt |   2 +-
 ...AnalyticsTeiSettingCollectionRepository.kt |   2 +-
 ...ckedEntityAttributeCollectionRepository.kt |   2 +-
 .../stock/StockUseCaseCollectionRepository.kt |   2 +-
 .../user/UserCredentialsObjectRepository.kt   |   2 +-
 .../collection/RepositoryPagingShould.kt      | 118 ++++++++++--------
 ...ckedEntityInstanceQueryDataSourceShould.kt |   4 +-
 27 files changed, 115 insertions(+), 82 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/{ChildreAppenderGetter.kt => ChildrenAppenderGetter.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildreAppenderGetter.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderGetter.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildreAppenderGetter.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/repositories/children/internal/ChildrenAppenderGetter.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
index 047aebfc8d..2e3c34d678 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithTransformerCollectionRepositoryImpl.kt
@@ -82,7 +82,7 @@ internal open class ReadOnlyWithTransformerCollectionRepositoryImpl<
             databaseAdapter,
             childrenAppenders,
             scope,
-            transformer
+            transformer,
         )
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
index 39fc0cb2c4..2103163f65 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/collection/internal/ReadOnlyWithUidAndTransformerCollectionRepositoryImpl.kt
@@ -60,7 +60,7 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
     childrenAppenders,
     scope,
     cf,
-    transformer
+    transformer,
 ),
     ReadOnlyWithUidCollectionRepository<T>
     where M : CoreObject, M : ObjectWithUidInterface, T : ObjectWithUidInterface {
@@ -102,7 +102,7 @@ internal class ReadOnlyWithUidAndTransformerCollectionRepositoryImpl<
             databaseAdapter,
             childrenAppenders,
             updatedScope,
-            transformer
+            transformer,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
index e367e6f9ce..559508b430 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/object/internal/ReadOnlyFirstObjectWithDownloadRepositoryImpl.kt
@@ -32,7 +32,6 @@ import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyObjectRepository
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
index e11234a1bc..9d85c00a36 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
@@ -69,7 +69,7 @@ class CategoryCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<Category> = mapOf(
-            CategoryFields.CATEGORY_OPTIONS to CategoryCategoryOptionChildrenAppender::create
+            CategoryFields.CATEGORY_OPTIONS to CategoryCategoryOptionChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
index 7480678bcd..aa29dc35bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
@@ -69,7 +69,7 @@ class CategoryComboCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<CategoryCombo> = mapOf(
-            CategoryComboFields.CATEGORIES to CategoryCategoryComboChildrenAppender::create
+            CategoryComboFields.CATEGORIES to CategoryCategoryComboChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
index 50b1c778b0..3b60717aee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
@@ -101,7 +101,7 @@ class CategoryOptionCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<CategoryOption> = mapOf(
-            CategoryOptionFields.ORGANISATION_UNITS to CategoryOptionOrganisationUnitChildrenAppender::create
+            CategoryOptionFields.ORGANISATION_UNITS to CategoryOptionOrganisationUnitChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
index cafccba71e..010b4aa0f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
@@ -79,7 +79,7 @@ class CategoryOptionComboCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<CategoryOptionCombo> = mapOf(
-            CategoryOptionComboFields.CATEGORY_OPTIONS to CategoryOptionComboCategoryOptionChildrenAppender::create
+            CategoryOptionComboFields.CATEGORY_OPTIONS to CategoryOptionComboCategoryOptionChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
index b895c148ce..22b42e0af5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.category.CategoryOptionCombo
 
 @Module
 internal class CategoryOptionComboEntityDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
index 0d59bdbcfe..049f5705c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
@@ -113,7 +113,7 @@ class DataElementCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<DataElement> = mapOf(
-            DataElementFields.LEGEND_SETS to DataElementLegendSetChildrenAppender::create
+            DataElementFields.LEGEND_SETS to DataElementLegendSetChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
index b90b327be1..487dcd0885 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
@@ -99,7 +99,7 @@ class SectionCollectionRepository @Inject internal constructor(
         val childrenAppenders: ChildrenAppenderGetter<Section> = mapOf(
             SectionFields.GREYED_FIELDS to SectionGreyedFieldsChildrenAppender::create,
             SectionFields.DATA_ELEMENTS to SectionDataElementChildrenAppender::create,
-            SectionFields.INDICATORS to SectionIndicatorsChildrenAppender::create
+            SectionFields.INDICATORS to SectionIndicatorsChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
index 1546101658..0fc59fba68 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
@@ -74,5 +74,4 @@ class LocalDataStoreCollectionRepository @Inject internal constructor(
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<KeyValuePair> = mapOf()
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
index 9703b08824..f7b085ea63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
@@ -31,8 +31,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
-import org.hisp.dhis.android.core.datastore.DataStoreEntry
 
 @Module
 internal class DataStoreEntityDIModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
index 7657f323ff..27461e5c72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
@@ -80,8 +80,14 @@ class EnrollmentCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): EnrollmentObjectRepository {
         val updatedScope = withUidFilterItem(scope, uid)
-        return EnrollmentObjectRepository(enrollmentStore, uid, databaseAdapter, childrenAppenders,
-            updatedScope, trackerDataManager)
+        return EnrollmentObjectRepository(
+            enrollmentStore,
+            uid,
+            databaseAdapter,
+            childrenAppenders,
+            updatedScope,
+            trackerDataManager,
+        )
     }
 
     fun byUid(): StringFilterConnector<EnrollmentCollectionRepository> {
@@ -190,7 +196,7 @@ class EnrollmentCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<Enrollment> = mapOf(
-            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender::create
+            EnrollmentFields.NOTES to NoteForEnrollmentChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index cafb1ae435..7ab2aac616 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -117,8 +117,15 @@ class EventCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): EventObjectRepository {
         val updatedScope = withUidFilterItem(scope, uid)
-        return EventObjectRepository(eventStore, userStore, uid, databaseAdapter,childrenAppenders,
-            updatedScope, trackerDataManager)
+        return EventObjectRepository(
+            eventStore,
+            userStore,
+            uid,
+            databaseAdapter,
+            childrenAppenders,
+            updatedScope,
+            trackerDataManager,
+        )
     }
 
     fun byUid(): StringFilterConnector<EventCollectionRepository> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
index a822d3fea3..18210b11ab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
@@ -82,7 +82,7 @@ class ProgramRuleCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<ProgramRule> = mapOf(
-            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender::create
+            ProgramRuleFields.PROGRAM_RULE_ACTIONS to ProgramRuleActionChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
index 3c44466eee..610e0fcd44 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
@@ -98,7 +98,7 @@ class ProgramSectionCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<ProgramSection> = mapOf(
-            ProgramSectionFields.TRACKED_ENTITY_ATTRIBUTES to ProgramSectionAttributeChildrenAppender::create
+            ProgramSectionFields.TRACKED_ENTITY_ATTRIBUTES to ProgramSectionAttributeChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
index cee2b97a9d..44607810c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
@@ -100,7 +100,7 @@ class ProgramStageDataElementCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<ProgramStageDataElement> = mapOf(
-            ProgramStageDataElementFields.RENDER_TYPE to ::DataElementValueTypeRenderingChildrenAppender
+            ProgramStageDataElementFields.RENDER_TYPE to ::DataElementValueTypeRenderingChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
index ce05541d67..a0b0022015 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
 internal class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender @Inject constructor(
     databaseAdapter: DatabaseAdapter,
 ) : ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute>(
-    ValueTypeDeviceRenderingStoreImpl(databaseAdapter)
+    ValueTypeDeviceRenderingStoreImpl(databaseAdapter),
 ) {
     override fun appendChildren(m: ProgramTrackedEntityAttribute): ProgramTrackedEntityAttribute {
         val valueTypeRendering = getValueTypeDeviceRendering(m)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
index 22a515d678..948729bc8b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
@@ -141,8 +141,14 @@ class RelationshipCollectionRepository @Inject internal constructor(
 
     override fun uid(uid: String?): ReadWriteObjectRepository<Relationship> {
         val updatedScope: RepositoryScope = withUidFilterItem(scope, uid)
-        return RelationshipObjectRepository(relationshipStore, uid, databaseAdapter, childrenAppenders,
-            updatedScope, trackerDataManager)
+        return RelationshipObjectRepository(
+            relationshipStore,
+            uid,
+            databaseAdapter,
+            childrenAppenders,
+            updatedScope,
+            trackerDataManager,
+        )
     }
 
     private fun isUpdatableState(state: State?): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
index d3aa0c0dc6..9ae2c361f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintChildrenAppender.kt
@@ -34,7 +34,7 @@ import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipType
 
 internal class RelationshipConstraintChildrenAppender(
-    databaseAdapter: DatabaseAdapter
+    databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<RelationshipType>() {
     private val constraintStore = RelationshipConstraintStoreImpl(databaseAdapter)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
index 66257f9f52..e480b2be3a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
@@ -90,7 +90,7 @@ class AnalyticsTeiSettingCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<AnalyticsTeiSetting> = mapOf(
-            AnalyticsTeiDataChildrenAppender.KEY to ::AnalyticsTeiDataChildrenAppender
+            AnalyticsTeiDataChildrenAppender.KEY to ::AnalyticsTeiDataChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
index 420b656b0c..0eb7ff806c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
@@ -142,7 +142,7 @@ class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<TrackedEntityAttribute> = mapOf(
-            TrackedEntityAttributeFields.LEGEND_SETS to TrackedEntityAttributeLegendSetChildrenAppender::create
+            TrackedEntityAttributeFields.LEGEND_SETS to TrackedEntityAttributeLegendSetChildrenAppender::create,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index 480d222e90..bbcfe119da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -67,7 +67,7 @@ ReadOnlyWithUidAndTransformerCollectionRepositoryImpl(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<InternalStockUseCase> = mapOf(
-            InternalStockUseCase.TRANSACTIONS to ::StockUseCaseTransactionChildrenAppender
+            InternalStockUseCase.TRANSACTIONS to ::StockUseCaseTransactionChildrenAppender,
         )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index 4bf125b7de..f923522922 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -64,7 +64,7 @@ class UserCredentialsObjectRepository @Inject internal constructor(
 
     internal companion object {
         val childrenAppenders: ChildrenAppenderGetter<User> = mapOf(
-            UserCredentialsFields.USER_ROLES to ::UserRoleChildrenAppender
+            UserCredentialsFields.USER_ROLES to ::UserRoleChildrenAppender,
         )
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt
index 39e0f22d16..69cc8d0886 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/arch/repositories/collection/RepositoryPagingShould.kt
@@ -25,17 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.his.dhis.android.core.arch.repositories.collection
+package org.hisp.dhis.android.core.arch.repositories.collection
 
 import android.content.ContentValues
 import androidx.paging.ItemKeyedDataSource
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryDataSource
 import org.hisp.dhis.android.core.arch.repositories.paging.internal.RepositoryPagingConfig
@@ -50,10 +50,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import org.mockito.ArgumentMatchers
-import org.mockito.Mock
-import org.mockito.Mockito
-import org.mockito.MockitoAnnotations
 
 @RunWith(JUnit4::class)
 class RepositoryPagingShould {
@@ -79,98 +75,122 @@ class RepositoryPagingShould {
     fun get_initial_page_objects_without_order_by() {
         val dataSource: RepositoryDataSource<CategoryOption> =
             RepositoryDataSource(store, databaseAdapter, emptyScope, childrenAppenders)
+
         dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback)
-        Mockito.verify(store).selectWhere("1", "_id ASC", 3)
-        Mockito.verify(initialCallback).onResult(objects)
+        verify(store).selectWhere("1", "_id ASC", 3)
+        verify(initialCallback).onResult(objects)
     }
 
     @Test
     fun get_initial_page_objects_with_order_by() {
         val updatedScope = withOrderBy(
             emptyScope,
-            RepositoryScopeOrderByItem.builder().column("name").direction(RepositoryScope.OrderByDirection.DESC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column("name")
+                .direction(RepositoryScope.OrderByDirection.DESC)
+                .build(),
         )
-        val dataSource: RepositoryDataSource<CategoryOption?> =
-            RepositoryDataSource<M?>(store, updatedScope, childrenAppenders)
-        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
-        Mockito.verify(store).selectWhere("1", "name DESC, _id ASC", 3)
-        Mockito.verify(initialCallback).onResult(objects)
+        val dataSource: RepositoryDataSource<CategoryOption> =
+            RepositoryDataSource(store, databaseAdapter, updatedScope, childrenAppenders)
+
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback)
+        verify(store).selectWhere("1", "name DESC, _id ASC", 3)
+        verify(initialCallback).onResult(objects)
     }
 
     @Test
     fun get_initial_page_objects_with_forced_order_by_paging_key_asc() {
         val updatedScope = withOrderBy(
             emptyScope,
-            RepositoryScopeOrderByItem.builder().column(RepositoryPagingConfig.PAGING_KEY)
-                .direction(RepositoryScope.OrderByDirection.ASC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column(RepositoryPagingConfig.PAGING_KEY)
+                .direction(RepositoryScope.OrderByDirection.ASC)
+                .build(),
         )
-        val dataSource: RepositoryDataSource<CategoryOption?> =
-            RepositoryDataSource<M?>(store, updatedScope, childrenAppenders)
-        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
-        Mockito.verify(store).selectWhere("1", "_id ASC", 3)
-        Mockito.verify(initialCallback).onResult(objects)
+        val dataSource: RepositoryDataSource<CategoryOption> =
+            RepositoryDataSource(store, databaseAdapter, updatedScope, childrenAppenders)
+
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback)
+        verify(store).selectWhere("1", "_id ASC", 3)
+        verify(initialCallback).onResult(objects)
     }
 
     @Test
     fun get_initial_page_objects_with_forced_order_by_paging_key_desc() {
         val updatedScope = withOrderBy(
             emptyScope,
-            RepositoryScopeOrderByItem.builder().column(RepositoryPagingConfig.PAGING_KEY)
-                .direction(RepositoryScope.OrderByDirection.DESC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column(RepositoryPagingConfig.PAGING_KEY)
+                .direction(RepositoryScope.OrderByDirection.DESC)
+                .build(),
         )
-        val dataSource: RepositoryDataSource<CategoryOption?> =
-            RepositoryDataSource<M?>(store, updatedScope, childrenAppenders)
-        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
-        Mockito.verify(store).selectWhere("1", "_id DESC", 3)
-        Mockito.verify(initialCallback).onResult(objects)
+        val dataSource: RepositoryDataSource<CategoryOption> =
+            RepositoryDataSource(store, databaseAdapter, updatedScope, childrenAppenders)
+
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback)
+        verify(store).selectWhere("1", "_id DESC", 3)
+        verify(initialCallback).onResult(objects)
     }
 
     @Test
     fun get_initial_page_objects_with_two_order_by() {
         val updatedScope = withOrderBy(
             emptyScope,
-            RepositoryScopeOrderByItem.builder().column("c1").direction(RepositoryScope.OrderByDirection.DESC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column("c1")
+                .direction(RepositoryScope.OrderByDirection.DESC)
+                .build(),
         )
         val updatedScope2 = withOrderBy(
             updatedScope,
-            RepositoryScopeOrderByItem.builder().column("c2").direction(RepositoryScope.OrderByDirection.ASC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column("c2")
+                .direction(RepositoryScope.OrderByDirection.ASC)
+                .build(),
         )
-        val dataSource: RepositoryDataSource<CategoryOption?> =
-            RepositoryDataSource<M?>(store, updatedScope2, childrenAppenders)
-        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback!!)
-        Mockito.verify(store).selectWhere("1", "c1 DESC, c2 ASC, _id ASC", 3)
-        Mockito.verify(initialCallback).onResult(objects)
+        val dataSource: RepositoryDataSource<CategoryOption> =
+            RepositoryDataSource(store, databaseAdapter, updatedScope2, childrenAppenders)
+
+        dataSource.loadInitial(ItemKeyedDataSource.LoadInitialParams(null, 3, false), initialCallback)
+        verify(store).selectWhere("1", "c1 DESC, c2 ASC, _id ASC", 3)
+        verify(initialCallback).onResult(objects)
     }
 
     @Test
     fun get_after_page_objects_with_order_by_and_filter() {
-        Mockito.`when`(key!!.toContentValues()).thenReturn(keyContentValues)
-        Mockito.`when`(keyContentValues!!.getAsString("_id")).thenReturn("5")
-        Mockito.`when`(keyContentValues.getAsString("code")).thenReturn("key-code")
-        Mockito.`when`(keyContentValues.getAsString("name")).thenReturn("key-name")
+        whenever(key.toContentValues()).doReturn(keyContentValues)
+        whenever(keyContentValues.getAsString("_id")).doReturn("5")
+        whenever(keyContentValues.getAsString("code")).doReturn("key-code")
+        whenever(keyContentValues.getAsString("name")).doReturn("key-name")
         val filterScope = withFilterItem(
             emptyScope,
-            RepositoryScopeFilterItem.builder().key("program").operator(FilterItemOperator.EQ).value("'uid'").build()
+            RepositoryScopeFilterItem.builder()
+                .key("program").operator(FilterItemOperator.EQ).value("'uid'")
+                .build(),
         )
         val updatedScope = withOrderBy(
             filterScope,
-            RepositoryScopeOrderByItem.builder().column("code").direction(RepositoryScope.OrderByDirection.DESC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column("code").direction(RepositoryScope.OrderByDirection.DESC)
+                .build(),
         )
         val updatedScope2 = withOrderBy(
             updatedScope,
-            RepositoryScopeOrderByItem.builder().column("name").direction(RepositoryScope.OrderByDirection.ASC).build()
+            RepositoryScopeOrderByItem.builder()
+                .column("name").direction(RepositoryScope.OrderByDirection.ASC)
+                .build(),
         )
-        val dataSource: RepositoryDataSource<CategoryOption?> =
-            RepositoryDataSource<M?>(store, updatedScope2, childrenAppenders)
-        dataSource.loadAfter(ItemKeyedDataSource.LoadParams(key, 3), initialCallback!!)
-        Mockito.verify(store).selectWhere(
+        val dataSource: RepositoryDataSource<CategoryOption> =
+            RepositoryDataSource(store, databaseAdapter, updatedScope2, childrenAppenders)
+        dataSource.loadAfter(ItemKeyedDataSource.LoadParams(key, 3), initialCallback)
+        verify(store).selectWhere(
             "((code = 'key-code' AND name = 'key-name' AND _id > '5') OR " +
                 "(code = 'key-code' AND name > 'key-name') OR " +
                 "(code < 'key-code')) " +
                 "AND program = 'uid'",
             "code DESC, name ASC, _id ASC",
-            3
+            3,
         )
-        Mockito.verify(initialCallback).onResult(objects)
+        verify(initialCallback).onResult(objects)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index adc84f8ad9..a2f169a8a0 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -125,7 +125,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
                 .doReturn(TrackerQueryResult(emptyList(), true))
         }
 
-        whenever(childrenAppenders[anyString()]).doReturn { d -> identityAppender(d) }
+        whenever(childrenAppenders[anyString()]).doReturn { _ -> identityAppender() }
     }
 
     @Test
@@ -279,7 +279,7 @@ class TrackedEntityInstanceQueryDataSourceShould {
         )
     }
 
-    private fun identityAppender(databaseAdapter: DatabaseAdapter): ChildrenAppender<TrackedEntityInstance> {
+    private fun identityAppender(): ChildrenAppender<TrackedEntityInstance> {
         return object : ChildrenAppender<TrackedEntityInstance>() {
             override fun appendChildren(m: TrackedEntityInstance): TrackedEntityInstance {
                 return m

From ba89132307a29294de521ca7a5e06c0f1f56bb12 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 10 Oct 2023 08:47:17 +0200
Subject: [PATCH 416/478] [ANDROSDK-1700] Replace empty maps

---
 .../hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt   | 3 +--
 .../dhis/android/core/constant/ConstantCollectionRepository.kt | 2 +-
 .../core/datastore/LocalDataStoreCollectionRepository.kt       | 2 +-
 .../ExpressionDimensionItemCollectionRepository.kt             | 2 +-
 .../core/fileresource/FileResourceCollectionRepository.kt      | 2 +-
 .../core/imports/TrackerImportConflictCollectionRepository.kt  | 2 +-
 .../core/indicator/IndicatorTypeCollectionRepository.kt        | 2 +-
 .../dhis/android/core/legendset/LegendCollectionRepository.kt  | 2 +-
 .../android/core/maintenance/D2ErrorCollectionRepository.kt    | 2 +-
 .../dhis/android/core/option/OptionSetCollectionRepository.kt  | 2 +-
 .../OrganisationUnitGroupCollectionRepository.kt               | 2 +-
 .../core/program/ProgramRuleActionCollectionRepository.kt      | 2 +-
 .../core/program/ProgramRuleVariableCollectionRepository.kt    | 2 +-
 .../android/core/settings/SystemSettingCollectionRepository.kt | 2 +-
 14 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index 214e2a7b4f..ec08247c27 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -154,8 +154,7 @@ import javax.inject.Singleton
     ],
 )
 @Suppress("TooManyFunctions")
-internal interface
-D2DIComponent {
+internal interface D2DIComponent {
     fun modules(): D2Modules
     fun metadataModule(): MetadataModuleImpl
     fun aggregatedModule(): AggregatedModuleImpl
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
index 5ae07b8c6c..9733e48ca2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
@@ -62,6 +62,6 @@ class ConstantCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<Constant> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<Constant> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
index 0fc59fba68..2da1526831 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
@@ -72,6 +72,6 @@ class LocalDataStoreCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<KeyValuePair> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<KeyValuePair> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
index 230ca9e7cf..3f296477e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
@@ -62,6 +62,6 @@ class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<ExpressionDimensionItem> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<ExpressionDimensionItem> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
index fcb838a3c6..78581a7e07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
@@ -171,6 +171,6 @@ class FileResourceCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<FileResource> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<FileResource> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
index 2c44f87691..000236f0b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
@@ -96,6 +96,6 @@ class TrackerImportConflictCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<TrackerImportConflict> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<TrackerImportConflict> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
index 2c51f6031c..c467855de9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
@@ -67,6 +67,6 @@ class IndicatorTypeCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<IndicatorType> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<IndicatorType> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
index f197741161..54580201ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
@@ -75,6 +75,6 @@ class LegendCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<Legend> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<Legend> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
index 0fdc137e9e..0c4b39efa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
@@ -85,6 +85,6 @@ class D2ErrorCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<D2Error> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<D2Error> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
index c8e04ac95e..0d9014816b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
@@ -68,6 +68,6 @@ class OptionSetCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<OptionSet> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<OptionSet> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
index 2cc2fe6999..7fecf09f21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
@@ -66,6 +66,6 @@ class OrganisationUnitGroupCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<OrganisationUnitGroup> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<OrganisationUnitGroup> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
index acb638e7b2..ff0ac3dfd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
@@ -108,6 +108,6 @@ class ProgramRuleActionCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<ProgramRuleAction> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<ProgramRuleAction> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
index d80e2f284e..f1446a2f28 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
@@ -87,6 +87,6 @@ class ProgramRuleVariableCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<ProgramRuleVariable> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<ProgramRuleVariable> = emptyMap()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
index 8873b2ef71..66e86dc4d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
@@ -77,6 +77,6 @@ class SystemSettingCollectionRepository @Inject internal constructor(
     }
 
     internal companion object {
-        val childrenAppenders: ChildrenAppenderGetter<SystemSetting> = mapOf()
+        val childrenAppenders: ChildrenAppenderGetter<SystemSetting> = emptyMap()
     }
 }

From ab5e355e9d0b93344c4ce59fb58e108b7a70c5bc Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 10 Oct 2023 11:50:35 +0200
Subject: [PATCH 417/478] Rename .java to .kt

---
 ...rogramEndpointCallShould.java => ProgramEndpointCallShould.kt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/src/test/java/org/hisp/dhis/android/core/program/internal/{ProgramEndpointCallShould.java => ProgramEndpointCallShould.kt} (100%)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
similarity index 100%
rename from core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
rename to core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt

From 8a148c8b22c9aa8b09958699e118faa93e55d08b Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 10 Oct 2023 11:50:35 +0200
Subject: [PATCH 418/478] [ANDROSDK-1756] refactor: - Remove RxJava for
 ProgramModuleDownloader

PENDING:
- ProgramEndpointCallShould test
---
 .../api/executors/internal/APIDownloader.kt   |  17 ++
 .../executors/internal/APIDownloaderImpl.kt   |  60 +++++++-
 .../factories/internal/UidsCallCoroutines.kt  |  35 +++++
 .../core/domain/metadata/MetadataCall.kt      |   2 +-
 .../core/program/internal/ProgramCall.kt      |   7 +-
 .../internal/ProgramModuleDownloader.kt       |  89 +++++------
 .../core/program/internal/ProgramStageCall.kt |   7 +-
 .../internal/TrackedEntityAttributeCall.kt    |   7 +-
 .../internal/TrackedEntityTypeCall.kt         |   7 +-
 .../domain/metadata/MetadataCallShould.kt     |  13 +-
 .../internal/ProgramEndpointCallShould.kt     | 145 +++++++++---------
 .../internal/ProgramModuleDownloaderShould.kt |  72 +++++----
 12 files changed, 286 insertions(+), 175 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index dea7022857..42790da32b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.resource.internal.Resource
 
 @Suppress("TooManyFunctions")
 internal interface APIDownloader {
+
     fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
@@ -43,6 +44,13 @@ internal interface APIDownloader {
         pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>>
 
+    suspend fun <P> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+    ): List<P>
+
     fun <P, O> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
@@ -51,6 +59,15 @@ internal interface APIDownloader {
         transform: (O) -> P,
     ): Single<List<P>>
 
+
+    suspend fun <P, O> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        transform: (O) -> P,
+    ): List<P>
+
     fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 2e052ef29f..cd79c03e6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -31,6 +31,8 @@ import androidx.annotation.VisibleForTesting
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
+import kotlinx.coroutines.rx2.await
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -51,6 +53,22 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>> {
+        return rxSingle {
+            downloadPartitionedCoroutines(
+                uids,
+                pageSize,
+                handler,
+                pageDownloader,
+            ) { it }
+        }
+    }
+
+    override suspend fun <P> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+    ): List<P> {
         return downloadPartitionedWithCustomHandling(
             uids,
             pageSize,
@@ -66,6 +84,25 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
         transform: (O) -> P,
     ): Single<List<P>> {
+        return rxSingle {
+            downloadPartitionedCoroutines(
+                uids,
+                pageSize,
+                handler,
+                pageDownloader,
+                transform,
+            )
+        }
+
+    }
+
+    override suspend fun <P, O> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        transform: (O) -> P
+    ): List<P> {
         return downloadPartitionedWithCustomHandling(
             uids,
             pageSize,
@@ -88,6 +125,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         )
     }
 
+
     private fun <P, O> downloadPartitionedWithoutHandling(
         uids: Set<String>,
         pageSize: Int,
@@ -95,6 +133,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         transform: (O) -> P,
     ): Single<List<P>> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
+
         return Observable.fromIterable(partitions)
             .flatMapSingle(pageDownloader)
             .map { obj: Payload<O> -> obj.items() }
@@ -106,20 +145,25 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
             }
     }
 
-    private fun <P, O> downloadPartitionedWithCustomHandling(
+    // TODO : remove the Single making sure it is not needed by the callers
+    private suspend fun <P, O> downloadPartitionedWithCustomHandling(
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
         transform: (O) -> P,
-    ): Single<List<P>> {
-        return downloadPartitionedWithoutHandling(
-            uids = uids,
-            pageSize = pageSize,
-            pageDownloader = pageDownloader,
-            transform = transform,
-        ).doOnSuccess { oCollection: List<P> ->
+    ): List<P> {
+        return try {
+            val oCollection = downloadPartitionedWithoutHandling(
+                uids = uids,
+                pageSize = pageSize,
+                pageDownloader = pageDownloader,
+                transform = transform,
+            ).await()
             handler.handleMany(oCollection)
+            oCollection
+        } catch (ignored: Exception) {
+            emptyList()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt
new file mode 100644
index 0000000000..d79b8d3136
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import io.reactivex.Single
+
+internal fun interface UidsCallCoroutines<P> {
+    suspend fun download(uids: Set<String>): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 5969691e1b..bcdb8465f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -145,7 +145,7 @@ internal class MetadataCall @Inject constructor(
         organisationUnitModuleDownloader.downloadMetadata(user).blockingAwait()
         emit(progressManager.increaseProgress(OrganisationUnit::class.java, false))
 
-        programDownloader.downloadMetadata().blockingAwait()
+        programDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Program::class.java, false))
 
         dataSetDownloader.downloadMetadata().blockingAwait()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 3c2da17a63..461d4ea206 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -31,6 +31,7 @@ import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.Program
 import javax.inject.Inject
@@ -40,11 +41,11 @@ internal class ProgramCall @Inject internal constructor(
     private val service: ProgramService,
     val handler: ProgramHandler,
     val apiDownloader: APIDownloader,
-) : UidsCall<Program> {
+) : UidsCallCoroutines<Program> {
 
-    override fun download(uids: Set<String>): Single<List<Program>> {
+    override suspend fun download(uids: Set<String>): List<Program> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
-        return apiDownloader.downloadPartitioned(
+        return apiDownloader.downloadPartitionedCoroutines(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 5b5d261330..2485fa467e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -28,10 +28,10 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOf
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionGroupCall
@@ -61,53 +61,48 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val optionCall: OptionCall,
     private val optionGroupCall: OptionGroupCall,
     private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Completable.defer {
-            val orgUnitProgramUids = programOrganisationUnitLinkStore
-                .selectDistinctSlaves(OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM)
+    override suspend fun downloadMetadata() {
+
+        val orgUnitProgramUids = programOrganisationUnitLinkStore
+            .selectDistinctSlaves(OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM)
+
+        val programs = programCall.download(orgUnitProgramUids)
+
+        val programUids = getUids(programs)
+        val programStages = programStageCall.download(programUids)
+        val trackedEntityUids = ProgramParentUidsHelper.getAssignedTrackedEntityUids(programs)
+        val trackedEntityTypes = trackedEntityTypeCall.download(trackedEntityUids)
+
+        val attributes = trackedEntityAttributeCall.download(
+            ProgramParentUidsHelper
+                .getAssignedTrackedEntityAttributeUids(programs, trackedEntityTypes),
+        )
+
+
+        val optionSetUids = ProgramParentUidsHelper.getAssignedOptionSetUids(
+            attributes,
+            programStages,
+        )
+        flowOf(
+            programRuleCall.download(programUids),
+            relationshipTypeCall.download(),
+            optionSetCall.download(optionSetUids),
+            optionCall.download(optionSetUids),
+            optionGroupCall.download(optionSetUids),
+
+            ).collect()
+
+        downloadFiltersAndWorkingLists(programUids)
 
-            programCall.download(orgUnitProgramUids)
-                .flatMapCompletable { programs ->
-                    val programUids = getUids(programs)
-                    programStageCall.download(programUids).flatMapCompletable { programStages ->
-                        val trackedEntityUids = ProgramParentUidsHelper.getAssignedTrackedEntityUids(programs)
-                        trackedEntityTypeCall.download(trackedEntityUids)
-                            .flatMap { trackedEntityTypes ->
-                                trackedEntityAttributeCall.download(
-                                    ProgramParentUidsHelper
-                                        .getAssignedTrackedEntityAttributeUids(programs, trackedEntityTypes),
-                                )
-                            }
-                            .flatMapCompletable { attributes ->
-                                val optionSetUids = ProgramParentUidsHelper.getAssignedOptionSetUids(
-                                    attributes,
-                                    programStages,
-                                )
-                                Single.merge(
-                                    listOf(
-                                        programRuleCall.download(programUids),
-                                        relationshipTypeCall.download(),
-                                        optionSetCall.download(optionSetUids),
-                                        optionCall.download(optionSetUids),
-                                        optionGroupCall.download(optionSetUids),
-                                    ),
-                                ).ignoreElements()
-                            }
-                            .concatWith(downloadFiltersAndWorkingLists(programUids))
-                    }
-                }
-        }
     }
 
-    private fun downloadFiltersAndWorkingLists(programUids: Set<String>): Completable {
-        return Single.merge(
-            listOf(
-                trackedEntityInstanceFilterCall.download(programUids),
-                eventFilterCall.download(programUids),
-                programStageWorkingListCall.download(programUids),
-            ),
-        ).ignoreElements()
+    private suspend fun downloadFiltersAndWorkingLists(programUids: Set<String>) {
+        flowOf(
+            trackedEntityInstanceFilterCall.download(programUids),
+            eventFilterCall.download(programUids),
+            programStageWorkingListCall.download(programUids),
+        ).collect()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 100cd2dc90..a86a01daf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -31,6 +31,7 @@ import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.ProgramStage
@@ -43,9 +44,9 @@ internal class ProgramStageCall @Inject internal constructor(
     private val service: ProgramStageService,
     private val handler: ProgramStageHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<ProgramStage> {
-    override fun download(uids: Set<String>): Single<List<ProgramStage>> {
-        return apiDownloader.downloadPartitioned(
+) : UidsCallCoroutines<ProgramStage> {
+    override suspend fun download(uids: Set<String>): List<ProgramStage> {
+        return apiDownloader.downloadPartitionedCoroutines(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index f32ead88da..ffd50103e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -31,6 +31,7 @@ import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import javax.inject.Inject
 
@@ -39,9 +40,9 @@ internal class TrackedEntityAttributeCall @Inject internal constructor(
     private val service: TrackedEntityAttributeService,
     private val handler: TrackedEntityAttributeHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<TrackedEntityAttribute> {
-    override fun download(uids: Set<String>): Single<List<TrackedEntityAttribute>> {
-        return apiDownloader.downloadPartitioned(
+) : UidsCallCoroutines<TrackedEntityAttribute> {
+    override suspend fun download(uids: Set<String>): List<TrackedEntityAttribute> {
+        return apiDownloader.downloadPartitionedCoroutines(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index efdd2e1b71..851f1fcca6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -31,6 +31,7 @@ import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
@@ -41,10 +42,10 @@ internal class TrackedEntityTypeCall @Inject internal constructor(
     private val service: TrackedEntityTypeService,
     private val handler: TrackedEntityTypeHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<TrackedEntityType> {
-    override fun download(optionSetUids: Set<String>): Single<List<TrackedEntityType>> {
+) : UidsCallCoroutines<TrackedEntityType> {
+    override suspend fun download(optionSetUids: Set<String>): List<TrackedEntityType> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
-        return apiDownloader.downloadPartitioned(
+        return apiDownloader.downloadPartitionedCoroutines(
             optionSetUids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 65f442f925..75cfa3aa1f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.domain.metadata
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
@@ -66,6 +67,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class MetadataCallShould : BaseCallShould() {
     private val user: User = mock()
@@ -116,9 +118,10 @@ class MetadataCallShould : BaseCallShould() {
         userDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(user)
         }
-        whenever(programDownloader.downloadMetadata()).thenReturn(
-            Completable.complete(),
-        )
+        programDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
+
         whenever(organisationUnitDownloader.downloadMetadata(same(user))).thenReturn(
             Completable.complete(),
         )
@@ -209,8 +212,8 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_program_call_fail() {
-        whenever(programDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
+    fun fail_when_program_call_fail() = runTest {
+        whenever(programDownloader.downloadMetadata()) doAnswer { throw networkError }
         downloadAndAssertError()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
index ac8c3fe489..aaf51bb65d 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
@@ -25,94 +25,93 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl;
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.BaseCallShould;
-import org.hisp.dhis.android.core.program.Program;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.internal.util.collections.Sets;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import io.reactivex.Single;
-
-@RunWith(JUnit4.class)
-public class ProgramEndpointCallShould extends BaseCallShould {
-
-    @Mock
-    private ProgramService programService;
-
-    @Mock
-    private ProgramHandler programHandler;
+package org.hisp.dhis.android.core.program.internal
+
+import com.google.common.truth.Truth
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.same
+import com.nhaarman.mockitokotlin2.stub
+import com.nhaarman.mockitokotlin2.verify
+import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import net.bytebuddy.asm.Advice
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.common.BaseCallShould
+import org.hisp.dhis.android.core.program.Program
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers
+import org.mockito.Captor
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.internal.util.collections.Sets
+import kotlin.jvm.functions.Function1
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(JUnit4::class)
+class ProgramEndpointCallShould : BaseCallShould() {
+
+    private val programService: ProgramService = mock()
+    private val programHandler: ProgramHandler = mock()
 
     @Captor
-    private ArgumentCaptor<Fields<Program>> fieldsCaptor;
+    private val fieldsCaptor: ArgumentCaptor<Fields<Program>>? = null
 
     @Captor
-    private ArgumentCaptor<Filter<Program, String>> filterCaptor;
+    private val filterCaptor: ArgumentCaptor<Filter<Program, String>>? = null
 
     @Captor
-    private ArgumentCaptor<String> accessDataReadFilter;
+    private val accessDataReadFilter: ArgumentCaptor<String>? = null
+    private val apiCall = Single.just(Payload.emptyPayload<Program>())
 
-    private Single<Payload<Program>> apiCall = Single.just(Payload.emptyPayload());
-
-    @Mock
-    private APIDownloader mockedApiDownloader;
-
-    private Single<List<Program>> programCallResult = Single.just(Collections.emptyList());
-
-    private Set<String> programUids = Sets.newSet("programUid");
+    private val mockedApiDownloader: APIDownloader = mock()
+    private val programCallResult = Single.just(emptyList<Program>())
+    private val programUids = Sets.newSet("programUid")
 
     @Before
-    @SuppressWarnings("unchecked")
-    public void setUp() throws Exception {
-        super.setUp();
+    @Throws(Exception::class)
+    override fun setUp() {
+        super.setUp()
+
+        mockedApiDownloader.stub {
+            onBlocking {  }
+        }
 
-        when(mockedApiDownloader.downloadPartitioned(same(programUids), anyInt(), any(Handler.class), any())).thenReturn(programCallResult);
-        when(programService.getPrograms(any(Fields.class), any(Filter.class), anyString(),
-                anyBoolean())).thenReturn(apiCall);
     }
 
     @Test
-    public void call_api_downloader() {
-        new ProgramCall(programService, programHandler, mockedApiDownloader).download(programUids).blockingGet();
+    fun call_api_downloader() = runTest{
+        ProgramCall(programService, programHandler, mockedApiDownloader).download(programUids)
 
-        verify(mockedApiDownloader).downloadPartitioned(same(programUids), anyInt(), any(Handler.class), any());
+       verify(mockedApiDownloader).downloadPartitionedCoroutines(same(programUids), any(),any<Handler::class>(), any())
     }
 
     @Test
-    public void call_service_for_real_api_downloader() {
-        when(programService.getPrograms(
-                fieldsCaptor.capture(), filterCaptor.capture(), accessDataReadFilter.capture(), anyBoolean())
-        ).thenReturn(apiCall);
-
-        new ProgramCall(programService, programHandler, new APIDownloaderImpl(resourceHandler)).download(programUids).blockingGet();
-
-        assertThat(fieldsCaptor.getValue()).isEqualTo(ProgramFields.allFields);
-        assertThat(filterCaptor.getValue().values().iterator().next()).isEqualTo("programUid");
-        assertThat(accessDataReadFilter.getValue()).isEqualTo("access.data.read:eq:true");
+    fun call_service_for_real_api_downloader() = runTest {
+        Mockito.`when`(
+            programService.getPrograms(
+                fieldsCaptor!!.capture(),
+                filterCaptor!!.capture(),
+                accessDataReadFilter!!.capture(),
+                ArgumentMatchers.anyBoolean()
+            )
+        ).thenReturn(apiCall)
+        ProgramCall(programService, programHandler, APIDownloaderImpl(resourceHandler)).download(
+            programUids
+        )
+        Truth.assertThat(fieldsCaptor.value).isEqualTo(ProgramFields.allFields)
+        Truth.assertThat(filterCaptor.value.values().iterator().next()).isEqualTo("programUid")
+        Truth.assertThat(accessDataReadFilter.value).isEqualTo("access.data.read:eq:true")
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index e6e60cb952..eb2c5f47c5 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -27,13 +27,17 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
+import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
 import org.hisp.dhis.android.core.option.internal.OptionCall
@@ -56,6 +60,7 @@ import org.mockito.ArgumentMatchers
 import retrofit2.Response
 import javax.net.ssl.HttpsURLConnection
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class ProgramModuleDownloaderShould : BaseCallShould() {
     private val program: Program = mock()
@@ -100,7 +105,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         returnEmptyList(eventFilterCall)
         returnEmptyList(programStageWorkingListCall)
         returnEmptyList(programRuleCall)
-        returnEmptyList(programStageCall)
+        returnEmptyListCoroutines(programStageCall)
         programModuleDownloader = ProgramModuleDownloader(
             programCall,
             programStageCall,
@@ -122,76 +127,85 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.just(emptyList()))
     }
 
-    private fun <O> returnSingletonList(call: UidsCall<O>?, o: O) {
-        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.just(listOf(o)))
+    private fun returnEmptyListCoroutines(call: UidsCallCoroutines<*>?) = runTest {
+        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(emptyList())
+    }
+
+    private fun <O> returnSingletonList(call: UidsCallCoroutines<O>?, o: O) = runTest {
+        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(listOf(o))
     }
 
     private fun returnError(call: UidsCall<*>?) {
         whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.error(RuntimeException()))
     }
 
+    private fun returnErrorCoroutines(call: UidsCallCoroutines<*>?) = runTest {
+        whenever(call!!.download(ArgumentMatchers.anySet())).doAnswer { throw RuntimeException() }
+    }
+
+
     @Test
-    fun succeed_when_endpoint_calls_succeed() {
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun succeed_when_endpoint_calls_succeed() = runTest {
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_call_fails() {
-        returnError(programCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_program_call_fails() = runTest {
+        returnErrorCoroutines(programCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_stage_call_fails() {
-        returnError(programStageCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_program_stage_call_fails() = runTest {
+        returnErrorCoroutines(programStageCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_rule_call_fails() {
+    fun fail_when_program_rule_call_fails() = runTest {
         returnError(programRuleCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_tracked_entity_types_call_fails() {
-        returnError(trackedEntityTypeCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_tracked_entity_types_call_fails() = runTest {
+        returnErrorCoroutines(trackedEntityTypeCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_tracked_entity_attributes_call_fails() {
-        returnError(trackedEntityAttributeCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_tracked_entity_attributes_call_fails() = runTest {
+        returnErrorCoroutines(trackedEntityAttributeCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_tracked_entity_instance_filters_call_fails() {
+    fun fail_when_tracked_entity_instance_filters_call_fails() = runTest {
         returnError(trackedEntityInstanceFilterCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_event_filters_call_fails() {
+    fun fail_when_event_filters_call_fails() = runTest {
         returnError(eventFilterCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_stage_working_list_call_fails() {
+    fun fail_when_program_stage_working_list_call_fails() = runTest {
         returnError(programStageWorkingListCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_relationship_type_call_fails() {
+    fun fail_when_relationship_type_call_fails() = runTest {
         whenever(relationshipTypeCall.download()).thenReturn(Single.error(RuntimeException()))
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_option_call_fails() {
+    fun fail_when_option_call_fails() = runTest {
         returnError(optionCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 }

From 928dd927b5b31095b6e48ae8acc367b9ec54afd7 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 11 Oct 2023 09:23:38 +0200
Subject: [PATCH 419/478] [ANDROSDK-1756] refactor: - Improved the code -
 ProgramEndpointCallShould to kotlin fix: - Bug when returning exception for
 APIDownloaderImpl

PENDING:
- TODOs in ProgramEndpointCallShould, remove the old test, fix it

PENDING:
- TESTS
---
 ...rogramEndpointCallMockIntegrationShould.kt |   7 +-
 ...rogramEndpointCallRealIntegrationShould.kt |  10 +-
 .../api/executors/internal/APIDownloader.kt   |  23 +++
 .../executors/internal/APIDownloaderImpl.kt   |  66 ++++++++-
 .../factories/internal/UidsCallCoroutines.kt  |  33 +++++
 .../core/domain/metadata/MetadataCall.kt      |   2 +-
 .../core/event/internal/EventFilterCall.kt    |  12 +-
 .../core/program/internal/ProgramCall.kt      |  15 +-
 .../internal/ProgramModuleDownloader.kt       |  79 +++++-----
 ...{ProgramService.java => ProgramService.kt} |  33 ++---
 .../core/program/internal/ProgramStageCall.kt |   9 +-
 .../internal/ProgramStageWorkingListCall.kt   |  11 +-
 .../internal/TrackedEntityAttributeCall.kt    |   9 +-
 .../TrackedEntityInstanceFilterCall.kt        |  11 +-
 .../internal/TrackedEntityTypeCall.kt         |   9 +-
 .../domain/metadata/MetadataCallShould.kt     |  13 +-
 ...ould.kt => ProgramEndpointCallShould.java} |  12 +-
 .../ProgramEndpointCallShouldKotlin.kt        | 136 ++++++++++++++++++
 .../internal/ProgramModuleDownloaderShould.kt |  84 ++++++-----
 19 files changed, 412 insertions(+), 162 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramService.java => ProgramService.kt} (76%)
 rename core/src/test/java/org/hisp/dhis/android/core/program/internal/{ProgramEndpointCallShould.kt => ProgramEndpointCallShould.java} (89%)
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
index 55ff3123b7..b1d7972931 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.program.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 import org.hisp.dhis.android.core.category.internal.CreateCategoryComboUtils
@@ -116,9 +117,9 @@ class ProgramEndpointCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnq
                 val programStage = CreateProgramStageUtils.create(1L, "dBwrot7S420", programUid)
                 databaseAdapter.insert(ProgramStageTableInfo.TABLE_INFO.name(), null, programStage)
                 dhis2MockServer.enqueueMockResponse("program/programs.json")
-                val programCall = objects.d2DIComponent.programCall().download(Sets.newSet(programUid))
-
-                programCall.blockingGet()
+                runBlocking {
+                    objects.d2DIComponent.programCall().download(Sets.newSet(programUid))
+                }
 
                 Unit()
             }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt
index fb2fd48b8a..b053c83867 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.program.Program
 import org.junit.Before
@@ -38,7 +38,7 @@ class ProgramEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
      * A quick integration test that is probably flaky, but will help with finding bugs related to the
      * metadataSyncCall. It works against the demo server.
      */
-    private var programCall: Single<List<Program>>? = null
+    private var programCall: List<Program>? = null
 
     @Before
     override fun setUp() {
@@ -46,8 +46,8 @@ class ProgramEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
         programCall = createCall()
     }
 
-    private fun createCall(): Single<List<Program>> {
-        return getD2DIComponent(d2).programCall().download(setOf("lxAQ7Zs9VYR", "AwNmMxxakEo"))
+    private fun createCall(): List<Program> = runBlocking {
+        return@runBlocking getD2DIComponent(d2).programCall().download(setOf("lxAQ7Zs9VYR", "AwNmMxxakEo"))
     }
 
     // @Test
@@ -61,6 +61,6 @@ class ProgramEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             To run the test, you will need to disable foreign key support in database in
             DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
             uncomment the @Test tag */
-        programCall!!.blockingGet()
+        programCall!!
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index dea7022857..c513a9ef90 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -36,6 +36,7 @@ import org.hisp.dhis.android.core.resource.internal.Resource
 
 @Suppress("TooManyFunctions")
 internal interface APIDownloader {
+
     fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
@@ -43,6 +44,20 @@ internal interface APIDownloader {
         pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>>
 
+    suspend fun <P> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+    ): List<P>
+
+    fun <P> downloadPartitionedCoroutinesJavaCompatible(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+    ): List<P>
+
     fun <P, O> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
@@ -51,6 +66,14 @@ internal interface APIDownloader {
         transform: (O) -> P,
     ): Single<List<P>>
 
+    suspend fun <P, O> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        transform: (O) -> P,
+    ): List<P>
+
     fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 2e052ef29f..240f20168c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -31,6 +31,9 @@ import androidx.annotation.VisibleForTesting
 import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.rx2.await
+import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -51,6 +54,22 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<P>>,
     ): Single<List<P>> {
+        return rxSingle {
+            downloadPartitionedCoroutines(
+                uids,
+                pageSize,
+                handler,
+                pageDownloader,
+            ) { it }
+        }
+    }
+
+    override suspend fun <P> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+    ): List<P> {
         return downloadPartitionedWithCustomHandling(
             uids,
             pageSize,
@@ -66,6 +85,24 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
         transform: (O) -> P,
     ): Single<List<P>> {
+        return rxSingle {
+            downloadPartitionedCoroutines(
+                uids,
+                pageSize,
+                handler,
+                pageDownloader,
+                transform,
+            )
+        }
+    }
+
+    override suspend fun <P, O> downloadPartitionedCoroutines(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        transform: (O) -> P,
+    ): List<P> {
         return downloadPartitionedWithCustomHandling(
             uids,
             pageSize,
@@ -75,6 +112,21 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         )
     }
 
+    override fun <P> downloadPartitionedCoroutinesJavaCompatible(
+        uids: Set<String>,
+        pageSize: Int,
+        handler: Handler<P>,
+        pageDownloader: (Set<String>) -> Single<Payload<P>>
+    ): List<P> {
+        return runBlocking {   downloadPartitionedCoroutines(
+            uids,
+            pageSize,
+            handler,
+            pageDownloader,
+        ) { it } }
+
+    }
+
     override fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
@@ -95,6 +147,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         transform: (O) -> P,
     ): Single<List<P>> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
+
         return Observable.fromIterable(partitions)
             .flatMapSingle(pageDownloader)
             .map { obj: Payload<O> -> obj.items() }
@@ -106,21 +159,22 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
             }
     }
 
-    private fun <P, O> downloadPartitionedWithCustomHandling(
+    // TODO : remove the Single making sure it is not needed by the callers
+    private suspend fun <P, O> downloadPartitionedWithCustomHandling(
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
         pageDownloader: (Set<String>) -> Single<Payload<O>>,
         transform: (O) -> P,
-    ): Single<List<P>> {
-        return downloadPartitionedWithoutHandling(
+    ): List<P> {
+        val oCollection = downloadPartitionedWithoutHandling(
             uids = uids,
             pageSize = pageSize,
             pageDownloader = pageDownloader,
             transform = transform,
-        ).doOnSuccess { oCollection: List<P> ->
-            handler.handleMany(oCollection)
-        }
+        ).await()
+        handler.handleMany(oCollection)
+        return oCollection
     }
 
     override fun <K, V> downloadPartitionedMap(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt
new file mode 100644
index 0000000000..a9ff0b1e31
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallCoroutines.kt
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+internal fun interface UidsCallCoroutines<P> {
+    suspend fun download(uids: Set<String>): List<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 5969691e1b..bcdb8465f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -145,7 +145,7 @@ internal class MetadataCall @Inject constructor(
         organisationUnitModuleDownloader.downloadMetadata(user).blockingAwait()
         emit(progressManager.increaseProgress(OrganisationUnit::class.java, false))
 
-        programDownloader.downloadMetadata().blockingAwait()
+        programDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Program::class.java, false))
 
         dataSetDownloader.downloadMetadata().blockingAwait()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index e112099670..423c77f406 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -27,11 +27,9 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import com.google.common.collect.Lists
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -44,12 +42,12 @@ internal class EventFilterCall @Inject internal constructor(
     val handler: EventFilterHandler,
     val apiDownloader: APIDownloader,
     val versionManager: DHISVersionManager,
-) : UidsCall<EventFilter> {
+) : UidsCallCoroutines<EventFilter> {
 
-    override fun download(programUids: Set<String>): Single<List<EventFilter>> {
+    override suspend fun download(programUids: Set<String>): List<EventFilter> {
         return if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
             val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
-            apiDownloader.downloadPartitioned(
+            apiDownloader.downloadPartitionedCoroutines(
                 programUids,
                 MAX_UID_LIST_SIZE,
                 handler,
@@ -62,7 +60,7 @@ internal class EventFilterCall @Inject internal constructor(
                 )
             }
         } else {
-            Single.just(Lists.newArrayList())
+            arrayListOf()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 3c2da17a63..9ef0b10a3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -28,9 +28,9 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.Program
 import javax.inject.Inject
@@ -40,11 +40,11 @@ internal class ProgramCall @Inject internal constructor(
     private val service: ProgramService,
     val handler: ProgramHandler,
     val apiDownloader: APIDownloader,
-) : UidsCall<Program> {
+) : UidsCallCoroutines<Program> {
 
-    override fun download(uids: Set<String>): Single<List<Program>> {
+    override suspend fun download(uids: Set<String>): List<Program> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
-        return apiDownloader.downloadPartitioned(
+        return apiDownloader.downloadPartitionedCoroutines(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
@@ -58,6 +58,11 @@ internal class ProgramCall @Inject internal constructor(
         }
     }
 
+    // TODO : remove this fun and refactor ProgramEndpointCallShould to Kotlin
+    fun coroutineEncapsulationForJavaTest(uids: Set<String>): List<Program> = runBlocking {
+        download(uids)
+    }
+
     companion object {
         private const val MAX_UID_LIST_SIZE = 50
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 5b5d261330..09c5ef56b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -28,10 +28,8 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionGroupCall
@@ -61,53 +59,40 @@ internal class ProgramModuleDownloader @Inject constructor(
     private val optionCall: OptionCall,
     private val optionGroupCall: OptionGroupCall,
     private val programOrganisationUnitLinkStore: OrganisationUnitProgramLinkStore,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Completable.defer {
-            val orgUnitProgramUids = programOrganisationUnitLinkStore
-                .selectDistinctSlaves(OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM)
+    override suspend fun downloadMetadata() {
+        val orgUnitProgramUids = programOrganisationUnitLinkStore
+            .selectDistinctSlaves(OrganisationUnitProgramLinkTableInfo.Columns.PROGRAM)
 
-            programCall.download(orgUnitProgramUids)
-                .flatMapCompletable { programs ->
-                    val programUids = getUids(programs)
-                    programStageCall.download(programUids).flatMapCompletable { programStages ->
-                        val trackedEntityUids = ProgramParentUidsHelper.getAssignedTrackedEntityUids(programs)
-                        trackedEntityTypeCall.download(trackedEntityUids)
-                            .flatMap { trackedEntityTypes ->
-                                trackedEntityAttributeCall.download(
-                                    ProgramParentUidsHelper
-                                        .getAssignedTrackedEntityAttributeUids(programs, trackedEntityTypes),
-                                )
-                            }
-                            .flatMapCompletable { attributes ->
-                                val optionSetUids = ProgramParentUidsHelper.getAssignedOptionSetUids(
-                                    attributes,
-                                    programStages,
-                                )
-                                Single.merge(
-                                    listOf(
-                                        programRuleCall.download(programUids),
-                                        relationshipTypeCall.download(),
-                                        optionSetCall.download(optionSetUids),
-                                        optionCall.download(optionSetUids),
-                                        optionGroupCall.download(optionSetUids),
-                                    ),
-                                ).ignoreElements()
-                            }
-                            .concatWith(downloadFiltersAndWorkingLists(programUids))
-                    }
-                }
-        }
+        val programs = programCall.download(orgUnitProgramUids)
+
+        val programUids = getUids(programs)
+        val programStages = programStageCall.download(programUids)
+        val trackedEntityUids = ProgramParentUidsHelper.getAssignedTrackedEntityUids(programs)
+        val trackedEntityTypes = trackedEntityTypeCall.download(trackedEntityUids)
+
+        val attributes = trackedEntityAttributeCall.download(
+            ProgramParentUidsHelper
+                .getAssignedTrackedEntityAttributeUids(programs, trackedEntityTypes),
+        )
+
+        val optionSetUids = ProgramParentUidsHelper.getAssignedOptionSetUids(
+            attributes,
+            programStages,
+        )
+        programRuleCall.download(programUids)
+        relationshipTypeCall.download()
+        optionSetCall.download(optionSetUids)
+        optionCall.download(optionSetUids)
+        optionGroupCall.download(optionSetUids)
+
+        downloadFiltersAndWorkingLists(programUids)
     }
 
-    private fun downloadFiltersAndWorkingLists(programUids: Set<String>): Completable {
-        return Single.merge(
-            listOf(
-                trackedEntityInstanceFilterCall.download(programUids),
-                eventFilterCall.download(programUids),
-                programStageWorkingListCall.download(programUids),
-            ),
-        ).ignoreElements()
+    private suspend fun downloadFiltersAndWorkingLists(programUids: Set<String>) {
+        trackedEntityInstanceFilterCall.download(programUids)
+        eventFilterCall.download(programUids)
+        programStageWorkingListCall.download(programUids)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt
similarity index 76%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt
index bbad97291b..36119d19ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt
@@ -25,23 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.program.Program;
+import io.reactivex.Single
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.program.Program
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface ProgramService {
+internal interface ProgramService {
     @GET("programs")
-    Single<Payload<Program>> getPrograms(@Query("fields") @Which Fields<Program> fields,
-                                         @Query("filter") @Where Filter<Program, String> uids,
-                                         @Query("filter") String accessDataReadFilter,
-                                         @Query("paging") Boolean paging);
+    fun getPrograms(
+        @Query("fields") @Which fields: Fields<Program>,
+        @Query("filter") @Where uids: Filter<Program, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Single<Payload<Program>>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 100cd2dc90..31900cf857 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.ProgramStage
@@ -43,9 +42,9 @@ internal class ProgramStageCall @Inject internal constructor(
     private val service: ProgramStageService,
     private val handler: ProgramStageHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<ProgramStage> {
-    override fun download(uids: Set<String>): Single<List<ProgramStage>> {
-        return apiDownloader.downloadPartitioned(
+) : UidsCallCoroutines<ProgramStage> {
+    override suspend fun download(uids: Set<String>): List<ProgramStage> {
+        return apiDownloader.downloadPartitionedCoroutines(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
index 9a75405f32..bfa21a2941 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
@@ -43,12 +42,12 @@ internal class ProgramStageWorkingListCall @Inject internal constructor(
     private val handler: ProgramStageWorkingListHandler,
     private val apiDownloader: APIDownloader,
     private val versionManager: DHISVersionManager,
-) : UidsCall<ProgramStageWorkingList> {
-    override fun download(uids: Set<String>): Single<List<ProgramStageWorkingList>> {
+) : UidsCallCoroutines<ProgramStageWorkingList> {
+    override suspend fun download(uids: Set<String>): List<ProgramStageWorkingList> {
         val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
 
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_40)) {
-            apiDownloader.downloadPartitioned(
+            apiDownloader.downloadPartitionedCoroutines(
                 uids,
                 MAX_UID_LIST_SIZE,
                 handler,
@@ -61,7 +60,7 @@ internal class ProgramStageWorkingListCall @Inject internal constructor(
                 )
             }
         } else {
-            Single.just(emptyList())
+            emptyList()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index f32ead88da..aa126c4cea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import javax.inject.Inject
 
@@ -39,9 +38,9 @@ internal class TrackedEntityAttributeCall @Inject internal constructor(
     private val service: TrackedEntityAttributeService,
     private val handler: TrackedEntityAttributeHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<TrackedEntityAttribute> {
-    override fun download(uids: Set<String>): Single<List<TrackedEntityAttribute>> {
-        return apiDownloader.downloadPartitioned(
+) : UidsCallCoroutines<TrackedEntityAttribute> {
+    override suspend fun download(uids: Set<String>): List<TrackedEntityAttribute> {
+        return apiDownloader.downloadPartitionedCoroutines(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
index f5ac508c60..8db605bca7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
@@ -43,12 +42,12 @@ class TrackedEntityInstanceFilterCall @Inject internal constructor(
     private val handler: TrackedEntityInstanceFilterHandler,
     private val apiDownloader: APIDownloader,
     private val versionManager: DHISVersionManager,
-) : UidsCall<TrackedEntityInstanceFilter> {
-    override fun download(uids: Set<String>): Single<List<TrackedEntityInstanceFilter>> {
+) : UidsCallCoroutines<TrackedEntityInstanceFilter> {
+    override suspend fun download(uids: Set<String>): List<TrackedEntityInstanceFilter> {
         val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
 
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
-            apiDownloader.downloadPartitioned(
+            apiDownloader.downloadPartitionedCoroutines(
                 uids,
                 MAX_UID_LIST_SIZE,
                 handler,
@@ -61,7 +60,7 @@ class TrackedEntityInstanceFilterCall @Inject internal constructor(
                 )
             }
         } else {
-            apiDownloader.downloadPartitioned(
+            apiDownloader.downloadPartitionedCoroutines(
                 uids,
                 MAX_UID_LIST_SIZE,
                 handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index efdd2e1b71..5fc4e8211d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
@@ -41,10 +40,10 @@ internal class TrackedEntityTypeCall @Inject internal constructor(
     private val service: TrackedEntityTypeService,
     private val handler: TrackedEntityTypeHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<TrackedEntityType> {
-    override fun download(optionSetUids: Set<String>): Single<List<TrackedEntityType>> {
+) : UidsCallCoroutines<TrackedEntityType> {
+    override suspend fun download(optionSetUids: Set<String>): List<TrackedEntityType> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
-        return apiDownloader.downloadPartitioned(
+        return apiDownloader.downloadPartitionedCoroutines(
             optionSetUids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 65f442f925..75cfa3aa1f 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.domain.metadata
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import io.reactivex.Completable
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
@@ -66,6 +67,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class MetadataCallShould : BaseCallShould() {
     private val user: User = mock()
@@ -116,9 +118,10 @@ class MetadataCallShould : BaseCallShould() {
         userDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(user)
         }
-        whenever(programDownloader.downloadMetadata()).thenReturn(
-            Completable.complete(),
-        )
+        programDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
+
         whenever(organisationUnitDownloader.downloadMetadata(same(user))).thenReturn(
             Completable.complete(),
         )
@@ -209,8 +212,8 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_program_call_fail() {
-        whenever(programDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
+    fun fail_when_program_call_fail() = runTest {
+        whenever(programDownloader.downloadMetadata()) doAnswer { throw networkError }
         downloadAndAssertError()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
similarity index 89%
rename from core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
rename to core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
index ac8c3fe489..fc90f4ce37 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
@@ -59,6 +59,8 @@
 
 import io.reactivex.Single;
 
+// TODO : remove this class
+
 @RunWith(JUnit4.class)
 public class ProgramEndpointCallShould extends BaseCallShould {
 
@@ -82,7 +84,7 @@ public class ProgramEndpointCallShould extends BaseCallShould {
     @Mock
     private APIDownloader mockedApiDownloader;
 
-    private Single<List<Program>> programCallResult = Single.just(Collections.emptyList());
+    private List<Program> programCallResult = Collections.emptyList();
 
     private Set<String> programUids = Sets.newSet("programUid");
 
@@ -91,16 +93,16 @@ public class ProgramEndpointCallShould extends BaseCallShould {
     public void setUp() throws Exception {
         super.setUp();
 
-        when(mockedApiDownloader.downloadPartitioned(same(programUids), anyInt(), any(Handler.class), any())).thenReturn(programCallResult);
+        when(mockedApiDownloader.downloadPartitionedCoroutinesJavaCompatible(same(programUids), anyInt(), any(Handler.class), any())).thenReturn(programCallResult);
         when(programService.getPrograms(any(Fields.class), any(Filter.class), anyString(),
                 anyBoolean())).thenReturn(apiCall);
     }
 
     @Test
     public void call_api_downloader() {
-        new ProgramCall(programService, programHandler, mockedApiDownloader).download(programUids).blockingGet();
+        new ProgramCall(programService, programHandler, mockedApiDownloader).coroutineEncapsulationForJavaTest(programUids);
 
-        verify(mockedApiDownloader).downloadPartitioned(same(programUids), anyInt(), any(Handler.class), any());
+        verify(mockedApiDownloader).downloadPartitionedCoroutinesJavaCompatible(same(programUids), anyInt(), any(Handler.class), any());
     }
 
     @Test
@@ -109,7 +111,7 @@ public void call_service_for_real_api_downloader() {
                 fieldsCaptor.capture(), filterCaptor.capture(), accessDataReadFilter.capture(), anyBoolean())
         ).thenReturn(apiCall);
 
-        new ProgramCall(programService, programHandler, new APIDownloaderImpl(resourceHandler)).download(programUids).blockingGet();
+        new ProgramCall(programService, programHandler, new APIDownloaderImpl(resourceHandler)).coroutineEncapsulationForJavaTest(programUids);
 
         assertThat(fieldsCaptor.getValue()).isEqualTo(ProgramFields.allFields);
         assertThat(filterCaptor.getValue().values().iterator().next()).isEqualTo("programUid");
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt
new file mode 100644
index 0000000000..14e029114e
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program.internal
+
+import com.google.common.truth.Truth.assertThat
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.argumentCaptor
+import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.same
+import com.nhaarman.mockitokotlin2.stub
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
+import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.handlers.internal.Handler
+import org.hisp.dhis.android.core.common.BaseCallShould
+import org.hisp.dhis.android.core.program.Program
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@RunWith(JUnit4::class)
+
+class ProgramEndpointCallShouldKotlin : BaseCallShould() {
+
+    private val programService: ProgramService = mock()
+    private val programHandler: ProgramHandler = mock()
+    private val fieldsCaptor = argumentCaptor<Fields<Program>>()
+    private val filterCaptor = argumentCaptor<Filter<Program, String>>()
+    private val accesDataReadFilter = argumentCaptor<String>()
+
+    private val apiCall: Single<Payload<Program>> = Single.just(Payload.emptyPayload())
+
+    private val mockedApiDownloader: APIDownloader = mock()
+
+    private val programCallResult: List<Program> = emptyList()
+
+    private val programUids: Set<String> = setOf("programUid")
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+        mockedApiDownloader.stub {
+            onBlocking {
+                downloadPartitionedCoroutines(same(programUids), any(), any<Handler<Program>>(), any())
+            }
+            doReturn(programCallResult)
+        }
+
+        programService.stub {
+            onBlocking {
+                getPrograms(
+                    any(),
+                    any(),
+                    any(),
+                    any(),
+                )
+            } doReturn apiCall
+        }
+    }
+
+    @Test
+    fun call_api_downloader() = runTest {
+        ProgramCall(
+            programService,
+            programHandler,
+            mockedApiDownloader,
+        ).download(programUids)
+
+        verify(mockedApiDownloader).downloadPartitionedCoroutines(
+            same(programUids),
+            any(),
+            any<Handler<Program>>(),
+            any(),
+        )
+    }
+
+    @Test
+    fun call_service_for_real_api_downloader() = runTest {
+        whenever(
+            programService.getPrograms(
+                fieldsCaptor.capture(),
+                filterCaptor.capture(),
+                accesDataReadFilter.capture(),
+                any(),
+            )
+        ).doReturn(apiCall)
+
+        ProgramCall(
+            programService,
+            programHandler,
+            APIDownloaderImpl(resourceHandler),
+        ).download(programUids)
+
+        assertThat(fieldsCaptor.firstValue.fields()).isEqualTo(ProgramFields.allFields)
+        assertThat(filterCaptor.firstValue.values().iterator().next()).isEqualTo("programUid")
+        assertThat(accesDataReadFilter).isEqualTo("access.data.read:eq:true")
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index e6e60cb952..93d5dac483 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -27,13 +27,17 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
+import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.ResponseBody
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
 import org.hisp.dhis.android.core.option.internal.OptionCall
@@ -56,6 +60,7 @@ import org.mockito.ArgumentMatchers
 import retrofit2.Response
 import javax.net.ssl.HttpsURLConnection
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class ProgramModuleDownloaderShould : BaseCallShould() {
     private val program: Program = mock()
@@ -96,11 +101,11 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         returnEmptyList(optionSetCall)
         returnEmptyList(optionCall)
         returnEmptyList(optionGroupCall)
-        returnEmptyList(trackedEntityInstanceFilterCall)
-        returnEmptyList(eventFilterCall)
-        returnEmptyList(programStageWorkingListCall)
+        returnEmptyListCoroutines(trackedEntityInstanceFilterCall)
+        returnEmptyListCoroutines(eventFilterCall)
+        returnEmptyListCoroutines(programStageWorkingListCall)
         returnEmptyList(programRuleCall)
-        returnEmptyList(programStageCall)
+        returnEmptyListCoroutines(programStageCall)
         programModuleDownloader = ProgramModuleDownloader(
             programCall,
             programStageCall,
@@ -122,76 +127,85 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.just(emptyList()))
     }
 
-    private fun <O> returnSingletonList(call: UidsCall<O>?, o: O) {
-        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.just(listOf(o)))
+    private fun returnEmptyListCoroutines(call: UidsCallCoroutines<*>?) = runTest {
+        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(emptyList())
+    }
+
+    private fun <O> returnSingletonList(call: UidsCallCoroutines<O>?, o: O) = runTest {
+        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(listOf(o))
     }
 
     private fun returnError(call: UidsCall<*>?) {
         whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.error(RuntimeException()))
     }
 
+    @Suppress("TooGenericExceptionThrown")
+    private fun returnErrorCoroutines(call: UidsCallCoroutines<*>?) = runTest {
+        whenever(call!!.download(ArgumentMatchers.anySet())).doAnswer { throw RuntimeException() }
+    }
+
     @Test
-    fun succeed_when_endpoint_calls_succeed() {
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun succeed_when_endpoint_calls_succeed() = runTest {
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_call_fails() {
-        returnError(programCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_program_call_fails() = runTest {
+        returnErrorCoroutines(programCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_stage_call_fails() {
-        returnError(programStageCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_program_stage_call_fails() = runTest {
+        returnErrorCoroutines(programStageCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_rule_call_fails() {
+    fun fail_when_program_rule_call_fails() = runTest {
         returnError(programRuleCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_tracked_entity_types_call_fails() {
-        returnError(trackedEntityTypeCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_tracked_entity_types_call_fails() = runTest {
+        returnErrorCoroutines(trackedEntityTypeCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_tracked_entity_attributes_call_fails() {
-        returnError(trackedEntityAttributeCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_tracked_entity_attributes_call_fails() = runTest {
+        returnErrorCoroutines(trackedEntityAttributeCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_tracked_entity_instance_filters_call_fails() {
-        returnError(trackedEntityInstanceFilterCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_tracked_entity_instance_filters_call_fails() = runTest {
+        returnErrorCoroutines(trackedEntityInstanceFilterCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_event_filters_call_fails() {
-        returnError(eventFilterCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_event_filters_call_fails() = runTest {
+        returnErrorCoroutines(eventFilterCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_program_stage_working_list_call_fails() {
-        returnError(programStageWorkingListCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+    fun fail_when_program_stage_working_list_call_fails() = runTest {
+        returnErrorCoroutines(programStageWorkingListCall)
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_relationship_type_call_fails() {
+    fun fail_when_relationship_type_call_fails() = runTest {
         whenever(relationshipTypeCall.download()).thenReturn(Single.error(RuntimeException()))
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
-    fun fail_when_option_call_fails() {
+    fun fail_when_option_call_fails() = runTest {
         returnError(optionCall)
-        programModuleDownloader.downloadMetadata().blockingAwait()
+        programModuleDownloader.downloadMetadata()
     }
 }

From 5db53f5b955783f9373fe1f6dcb3a314b8dc1d9d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 12 Oct 2023 12:22:15 +0200
Subject: [PATCH 420/478] [ANDROSDK-1749] Duplicate IMAGE and FILE value type
 attributes when inheriting

---
 .../TrackedEntityInstanceService.java         | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
index 84ef5fbf62..9735f808dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
@@ -29,10 +29,15 @@
 
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
 import org.hisp.dhis.android.core.common.Unit;
+import org.hisp.dhis.android.core.common.ValueType;
+import org.hisp.dhis.android.core.fileresource.FileResource;
+import org.hisp.dhis.android.core.fileresource.FileResourceCollectionRepository;
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeCollectionRepository;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,15 +52,18 @@ public class TrackedEntityInstanceService {
     private final TrackedEntityAttributeCollectionRepository trackedEntityAttributeRepository;
     private final TrackedEntityAttributeValueCollectionRepository trackedEntityAttributeValueRepository;
     private final ProgramTrackedEntityAttributeCollectionRepository programTrackedEntityAttributeRepository;
+    private final FileResourceCollectionRepository fileResourceCollectionRepository;
 
     @Inject
     TrackedEntityInstanceService(TrackedEntityAttributeCollectionRepository trackedEntityAttributeRepository,
                                  TrackedEntityAttributeValueCollectionRepository trackedEntityAttributeValueRepository,
                                  ProgramTrackedEntityAttributeCollectionRepository
-                                         programTrackedEntityAttributeRepository) {
+                                         programTrackedEntityAttributeRepository,
+                                 FileResourceCollectionRepository fileResourceCollectionRepository) {
         this.trackedEntityAttributeRepository = trackedEntityAttributeRepository;
         this.trackedEntityAttributeValueRepository = trackedEntityAttributeValueRepository;
         this.programTrackedEntityAttributeRepository = programTrackedEntityAttributeRepository;
+        this.fileResourceCollectionRepository = fileResourceCollectionRepository;
     }
 
     /**
@@ -93,9 +101,24 @@ public Unit blockingInheritAttributes(String fromTeiUid, String toTeiUid, String
 
             if (!fromTeiAttributes.isEmpty()) {
                 for (TrackedEntityAttributeValue attributeValue : fromTeiAttributes) {
-                    trackedEntityAttributeValueRepository
-                            .value(attributeValue.trackedEntityAttribute(), toTeiUid)
-                            .blockingSet(attributeValue.value());
+
+                    TrackedEntityAttribute attribute = trackedEntityAttributeRepository.uid(
+                            attributeValue.trackedEntityAttribute()).blockingGet();
+
+                    if (attribute.valueType() == ValueType.IMAGE || attribute.valueType() == ValueType.FILE_RESOURCE) {
+                        File file = new File(fileResourceCollectionRepository.uid(attributeValue.value())
+                                .blockingGet().path());
+
+                        String newFileResourceId = fileResourceCollectionRepository.blockingAdd(file);
+
+                        trackedEntityAttributeValueRepository
+                                .value(attributeValue.trackedEntityAttribute(), toTeiUid)
+                                .blockingSet(newFileResourceId);
+                    } else {
+                        trackedEntityAttributeValueRepository
+                                .value(attributeValue.trackedEntityAttribute(), toTeiUid)
+                                .blockingSet(attributeValue.value());
+                    }
                 }
             }
         }

From 6595c68ce32d4c0e19d01183722b6ffcda4f4d39 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Thu, 12 Oct 2023 12:22:43 +0200
Subject: [PATCH 421/478] [ANDROSDK-1749] Add a
 TrackedEntityInstanceServiceMockIntegrationShould test

---
 ...ectionRepositoryMockIntegrationShould.java |  2 +-
 ...yInstanceServiceMockIntegrationShould.java | 80 +++++++++++++++++++
 .../tracked_entity_attributes.json            |  2 +-
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java
index 24e9f65754..f214eb5118 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityAttributeCollectionRepositoryMockIntegrationShould.java
@@ -177,7 +177,7 @@ public void by_inherit() {
                         .byInherit().isTrue()
                         .blockingGet();
 
-        assertThat(trackedEntityAttributes.size()).isEqualTo(1);
+        assertThat(trackedEntityAttributes.size()).isEqualTo(2);
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java
new file mode 100644
index 0000000000..5ca9b4340b
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *  
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *  
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.testapp.trackedentity;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.hisp.dhis.android.core.maintenance.D2Error;
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection;
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(D2JunitRunner.class)
+public class TrackedEntityInstanceServiceMockIntegrationShould extends BaseMockIntegrationTestFullDispatcher {
+
+    @Test
+    public void inherit_attributes() throws D2Error {
+        String fromTeiUid = "nWrB0TfWlvh";
+
+        String newTeiUid = d2.trackedEntityModule().trackedEntityInstances().blockingAdd(
+                TrackedEntityInstanceCreateProjection.create("DiszpKrYNg8", "nEenWmSyUEp")
+        );
+
+        d2.trackedEntityModule().trackedEntityInstanceService()
+                .blockingInheritAttributes(fromTeiUid, newTeiUid,"IpHINAT79UW");
+
+        TrackedEntityInstance fromTEI = d2.trackedEntityModule().trackedEntityInstances().withTrackedEntityAttributeValues()
+                .uid(fromTeiUid).blockingGet();
+
+        TrackedEntityInstance newTEI = d2.trackedEntityModule().trackedEntityInstances().withTrackedEntityAttributeValues()
+                .uid(newTeiUid).blockingGet();
+
+        // Not equal because is an attribute with IMAGE value type
+        assertThat(fromTEI.trackedEntityAttributeValues().get(0).value())
+                .isNotEqualTo(newTEI.trackedEntityAttributeValues().get(0).value());
+        // Equal because is not FILE or IMAGE value type
+        assertThat(fromTEI.trackedEntityAttributeValues().get(1).value())
+                .isEqualTo(newTEI.trackedEntityAttributeValues().get(1).value());
+
+
+        // Remove TEI and attribute values
+        for (TrackedEntityAttributeValue teaValue : d2.trackedEntityModule().trackedEntityAttributeValues()
+                .byTrackedEntityInstance().eq(newTeiUid).blockingGet()) {
+            d2.trackedEntityModule().trackedEntityAttributeValues()
+                    .value(teaValue.trackedEntityAttribute(), teaValue.trackedEntityInstance())
+                    .blockingDeleteIfExist();
+        }
+
+        d2.trackedEntityModule().trackedEntityInstances().uid(newTeiUid).blockingDeleteIfExist();
+    }
+}
\ No newline at end of file
diff --git a/core/src/sharedTest/resources/trackedentity/tracked_entity_attributes.json b/core/src/sharedTest/resources/trackedentity/tracked_entity_attributes.json
index 4afb909d13..8ab655362a 100644
--- a/core/src/sharedTest/resources/trackedentity/tracked_entity_attributes.json
+++ b/core/src/sharedTest/resources/trackedentity/tracked_entity_attributes.json
@@ -13,7 +13,7 @@
       "displayName": "TB number",
       "pattern": "RANDOM(XXX######)",
       "unique": false,
-      "inherit": false,
+      "inherit": true,
       "fieldMask": "XXXXX",
       "access": {
         "read": true,

From 1827c252108aa317dadd6bd5ba2f2644d3b8a858 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 13 Oct 2023 11:09:34 +0200
Subject: [PATCH 422/478] [ANDROSDK-1756] refactor: - Improved the code -
 ProgramEndpointCallShould to kotlin

---
 .../internal/ProgramModuleDownloader.kt       |  11 +-
 .../internal/ProgramEndpointCallShould.java   | 120 ------------------
 ...Kotlin.kt => ProgramEndpointCallShould.kt} |  20 +--
 3 files changed, 10 insertions(+), 141 deletions(-)
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
 rename core/src/test/java/org/hisp/dhis/android/core/program/internal/{ProgramEndpointCallShouldKotlin.kt => ProgramEndpointCallShould.kt} (89%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 09c5ef56b4..e60aa3fc0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -28,6 +28,7 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
+import kotlinx.coroutines.rx2.await
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -81,11 +82,11 @@ internal class ProgramModuleDownloader @Inject constructor(
             attributes,
             programStages,
         )
-        programRuleCall.download(programUids)
-        relationshipTypeCall.download()
-        optionSetCall.download(optionSetUids)
-        optionCall.download(optionSetUids)
-        optionGroupCall.download(optionSetUids)
+        programRuleCall.download(programUids).blockingGet()
+        relationshipTypeCall.download().blockingGet()
+        optionSetCall.download(optionSetUids).blockingGet()
+        optionCall.download(optionSetUids).blockingGet()
+        optionGroupCall.download(optionSetUids).blockingGet()
 
         downloadFiltersAndWorkingLists(programUids)
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
deleted file mode 100644
index fc90f4ce37..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloaderImpl;
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler;
-import org.hisp.dhis.android.core.common.BaseCallShould;
-import org.hisp.dhis.android.core.program.Program;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.internal.util.collections.Sets;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import io.reactivex.Single;
-
-// TODO : remove this class
-
-@RunWith(JUnit4.class)
-public class ProgramEndpointCallShould extends BaseCallShould {
-
-    @Mock
-    private ProgramService programService;
-
-    @Mock
-    private ProgramHandler programHandler;
-
-    @Captor
-    private ArgumentCaptor<Fields<Program>> fieldsCaptor;
-
-    @Captor
-    private ArgumentCaptor<Filter<Program, String>> filterCaptor;
-
-    @Captor
-    private ArgumentCaptor<String> accessDataReadFilter;
-
-    private Single<Payload<Program>> apiCall = Single.just(Payload.emptyPayload());
-
-    @Mock
-    private APIDownloader mockedApiDownloader;
-
-    private List<Program> programCallResult = Collections.emptyList();
-
-    private Set<String> programUids = Sets.newSet("programUid");
-
-    @Before
-    @SuppressWarnings("unchecked")
-    public void setUp() throws Exception {
-        super.setUp();
-
-        when(mockedApiDownloader.downloadPartitionedCoroutinesJavaCompatible(same(programUids), anyInt(), any(Handler.class), any())).thenReturn(programCallResult);
-        when(programService.getPrograms(any(Fields.class), any(Filter.class), anyString(),
-                anyBoolean())).thenReturn(apiCall);
-    }
-
-    @Test
-    public void call_api_downloader() {
-        new ProgramCall(programService, programHandler, mockedApiDownloader).coroutineEncapsulationForJavaTest(programUids);
-
-        verify(mockedApiDownloader).downloadPartitionedCoroutinesJavaCompatible(same(programUids), anyInt(), any(Handler.class), any());
-    }
-
-    @Test
-    public void call_service_for_real_api_downloader() {
-        when(programService.getPrograms(
-                fieldsCaptor.capture(), filterCaptor.capture(), accessDataReadFilter.capture(), anyBoolean())
-        ).thenReturn(apiCall);
-
-        new ProgramCall(programService, programHandler, new APIDownloaderImpl(resourceHandler)).coroutineEncapsulationForJavaTest(programUids);
-
-        assertThat(fieldsCaptor.getValue()).isEqualTo(ProgramFields.allFields);
-        assertThat(filterCaptor.getValue().values().iterator().next()).isEqualTo("programUid");
-        assertThat(accessDataReadFilter.getValue()).isEqualTo("access.data.read:eq:true");
-    }
-}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
similarity index 89%
rename from core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt
rename to core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
index 14e029114e..2513a56f8c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShouldKotlin.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
@@ -56,7 +56,7 @@ import org.junit.runners.JUnit4
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 
-class ProgramEndpointCallShouldKotlin : BaseCallShould() {
+class ProgramEndpointCallShould : BaseCallShould() {
 
     private val programService: ProgramService = mock()
     private val programHandler: ProgramHandler = mock()
@@ -78,19 +78,7 @@ class ProgramEndpointCallShouldKotlin : BaseCallShould() {
         mockedApiDownloader.stub {
             onBlocking {
                 downloadPartitionedCoroutines(same(programUids), any(), any<Handler<Program>>(), any())
-            }
-            doReturn(programCallResult)
-        }
-
-        programService.stub {
-            onBlocking {
-                getPrograms(
-                    any(),
-                    any(),
-                    any(),
-                    any(),
-                )
-            } doReturn apiCall
+            } doReturn programCallResult
         }
     }
 
@@ -127,9 +115,9 @@ class ProgramEndpointCallShouldKotlin : BaseCallShould() {
             APIDownloaderImpl(resourceHandler),
         ).download(programUids)
 
-        assertThat(fieldsCaptor.firstValue.fields()).isEqualTo(ProgramFields.allFields)
+        assertThat(fieldsCaptor.firstValue).isEqualTo(ProgramFields.allFields)
         assertThat(filterCaptor.firstValue.values().iterator().next()).isEqualTo("programUid")
-        assertThat(accesDataReadFilter).isEqualTo("access.data.read:eq:true")
+        assertThat(accesDataReadFilter.firstValue).isEqualTo("access.data.read:eq:true")
 
     }
 

From b133f1f83d4327d964307655e8b99ea04dfcc9d4 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 16 Oct 2023 08:20:32 +0200
Subject: [PATCH 423/478] Rename .java to .kt

---
 .../core/option/{OptionCallShould.java => OptionCallShould.kt}    | 0
 .../option/{OptionSetCallShould.java => OptionSetCallShould.kt}   | 0
 .../internal/{EventFilterService.java => EventFilterService.kt}   | 0
 ...tityAttributeService.java => TrackedEntityAttributeService.kt} | 0
 ...ceFilterService.java => TrackedEntityInstanceFilterService.kt} | 0
 ...{TrackedEntityTypeService.java => TrackedEntityTypeService.kt} | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/androidTest/java/org/hisp/dhis/android/core/option/{OptionCallShould.java => OptionCallShould.kt} (100%)
 rename core/src/androidTest/java/org/hisp/dhis/android/core/option/{OptionSetCallShould.java => OptionSetCallShould.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/event/internal/{EventFilterService.java => EventFilterService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityAttributeService.java => TrackedEntityAttributeService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityInstanceFilterService.java => TrackedEntityInstanceFilterService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/{TrackedEntityTypeService.java => TrackedEntityTypeService.kt} (100%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
similarity index 100%
rename from core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.java
rename to core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
similarity index 100%
rename from core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.java
rename to core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.java
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.java
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.kt

From bc7179d04d3c7b6776761775f207442a5fe4d6a5 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 16 Oct 2023 08:20:33 +0200
Subject: [PATCH 424/478] [ANDROSDK-1756] refactor: - Migrated rest of calls to
 coroutines

PENDING:
- Instrumented tests not passing
---
 ...yComboEndpointCallRealIntegrationShould.kt |  11 +-
 ...tegoryEndpointCallRealIntegrationShould.kt |   5 +-
 .../internal/CategoryEndpointCallShould.kt    |   5 +-
 .../android/core/option/OptionCallShould.kt   | 169 ++++++++---------
 .../core/option/OptionSetCallShould.kt        | 131 ++++++-------
 .../VisualizationEndpointCallShould.kt        |  19 +-
 .../api/executors/internal/APIDownloader.kt   |  60 ++----
 .../executors/internal/APIDownloaderImpl.kt   | 179 +++++++-----------
 .../core/category/internal/CategoryCall.kt    |   7 +-
 .../category/internal/CategoryComboCall.kt    |   7 +-
 .../category/internal/CategoryComboService.kt |   5 +-
 .../internal/CategoryModuleDownloader.kt      |  25 ++-
 .../category/internal/CategoryOptionCall.kt   |   7 +-
 .../CategoryOptionOrganisationUnitsCall.kt    |   5 +-
 .../internal/CategoryOptionService.kt         |   7 +-
 .../core/category/internal/CategoryService.kt |   7 +-
 .../internal/DataSetModuleDownloader.kt       |  18 +-
 .../core/domain/metadata/MetadataCall.kt      |   8 +-
 .../core/event/internal/EventFilterCall.kt    |   2 +-
 .../core/event/internal/EventFilterService.kt |  33 ++--
 .../internal/ExpressionDimensionItemCall.kt   |   7 +-
 ...ExpressionDimensionItemModuleDownloader.kt |  13 +-
 .../ExpressionDimensionItemService.kt         |   7 +-
 .../core/legendset/internal/LegendSetCall.kt  |   7 +-
 .../internal/LegendSetModuleDownloader.kt     |  13 +-
 .../legendset/internal/LegendSetService.kt    |   7 +-
 .../core/option/internal/OptionCall.kt        |   7 +-
 .../core/option/internal/OptionGroupCall.kt   |   7 +-
 ...roupService.java => OptionGroupService.kt} |  30 ++-
 .../core/option/internal/OptionService.kt     |   7 +-
 .../core/option/internal/OptionSetCall.kt     |   7 +-
 ...ionSetService.java => OptionSetService.kt} |  32 ++--
 .../core/program/internal/ProgramCall.kt      |   2 +-
 .../program/internal/ProgramIndicatorCall.kt  |  16 +-
 .../ProgramIndicatorModuleDownloader.kt       |  13 +-
 .../internal/ProgramIndicatorService.kt       |   5 +-
 .../internal/ProgramModuleDownloader.kt       |  11 +-
 .../core/program/internal/ProgramRuleCall.kt  |   7 +-
 ...RuleService.java => ProgramRuleService.kt} |  28 +--
 .../core/program/internal/ProgramService.kt   |   7 +-
 .../core/program/internal/ProgramStageCall.kt |   2 +-
 ...ageService.java => ProgramStageService.kt} |  30 +--
 .../internal/ProgramStageWorkingListCall.kt   |   2 +-
 .../ProgramStageWorkingListService.kt         |   7 +-
 .../internal/RelationshipTypeCall.kt          |   7 +-
 ...ervice.java => RelationshipTypeService.kt} |  35 ++--
 .../internal/TrackedEntityAttributeCall.kt    |   2 +-
 .../internal/TrackedEntityAttributeService.kt |  36 ++--
 .../TrackedEntityInstanceFilterCall.kt        |   4 +-
 .../TrackedEntityInstanceFilterService.kt     |  46 ++---
 .../internal/TrackedEntityTypeCall.kt         |   2 +-
 .../internal/TrackedEntityTypeService.kt      |  38 ++--
 .../internal/ValidationPackageDIModule.kt     |   2 +-
 .../validation/internal/ValidationRuleCall.kt |   7 +-
 ...eService.java => ValidationRuleService.kt} |  40 ++--
 .../ValidationRuleUidsCallCoroutines.kt       |  37 ++++
 .../internal/ValidationRuleUidsCallImpl.kt    |  42 ++--
 .../internal/VisualizationCall.kt             |  47 +++--
 .../internal/VisualizationModuleDownloader.kt |   2 +-
 .../internal/VisualizationService.kt          |   9 +-
 .../domain/metadata/MetadataCallShould.kt     |  20 +-
 .../internal/ProgramEndpointCallShould.kt     |  14 +-
 .../internal/ProgramModuleDownloaderShould.kt |  20 +-
 63 files changed, 652 insertions(+), 742 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionGroupService.java => OptionGroupService.kt} (78%)
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionSetService.java => OptionSetService.kt} (78%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramRuleService.java => ProgramRuleService.kt} (77%)
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramStageService.java => ProgramStageService.kt} (74%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipTypeService.java => RelationshipTypeService.kt} (76%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationRuleService.java => ValidationRuleService.kt} (71%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
index 41f1c1e405..547a8680f9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
@@ -28,15 +28,18 @@
 package org.hisp.dhis.android.core.category.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
-    fun download_categories_combos_and_relatives() {
+    fun download_categories_combos_and_relatives() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
         d2.databaseAdapter().setForeignKeyConstraintsEnabled(false)
         assertNotCombosInDB()
@@ -45,7 +48,7 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
         val categoryComboEndpointCall = getD2DIComponent(d2).internalModules().category.categoryComboCall.download(
             setOf("bjDvmb4bfuf"),
         )
-        val categoryCombos = categoryComboEndpointCall.blockingGet()
+        val categoryCombos = categoryComboEndpointCall
         assertThat(categoryCombos.isEmpty()).isFalse()
 
         downloadCategories()
@@ -59,10 +62,10 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
         assertThereAreCategoriesInDB()
     }
 
-    private fun downloadCategories() {
+    private fun downloadCategories() = runTest {
         getD2DIComponent(d2).internalModules().category.categoryCall.download(
             setOf("GLevLNI9wkl"),
-        ).blockingGet()
+        )
     }
 
     private fun assertNotCombosInDB() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
index a57e9c7326..07b4775a3b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
@@ -28,17 +28,18 @@
 package org.hisp.dhis.android.core.category.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 
 class CategoryEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test
-    fun call_categories_endpoint() {
+    fun call_categories_endpoint() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
         val categoryEndpointCall = getD2DIComponent(d2).internalModules().category.categoryCall.download(
             setOf("cX5k9anHEHd"),
         )
-        val categories = categoryEndpointCall.blockingGet()
+        val categories = categoryEndpointCall
         assertThat(categories.isEmpty()).isFalse()
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
index 85b8b4603a..6ad5086c89 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
@@ -28,19 +28,20 @@
 package org.hisp.dhis.android.core.category.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
 import org.junit.Test
 
 class CategoryEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     @Test
-    fun download_category_successfully() {
+    fun download_category_successfully() = runTest {
         val categoriesSingle = objects.d2DIComponent.internalModules().category.categoryCall.download(
             setOf("vGs6omsRekv", "KfdsGBcoiCa", "cX5k9anHEHd", "x3uo8LqiTBk"),
         )
         dhis2MockServer.enqueueMockResponse("category/categories.json")
 
-        val categories = categoriesSingle.blockingGet()
+        val categories = categoriesSingle
         assertThat(categories.isEmpty()).isFalse()
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
index 69784d4e55..867bb51010 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
@@ -25,110 +25,101 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.option;
-
-import androidx.test.runner.AndroidJUnit4;
-
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl;
-import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import io.reactivex.Single;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class)
-public class OptionCallShould extends BaseMockIntegrationTestEmptyEnqueable {
-
-    private Single<List<Option>> optionCall;
-    private D2CallExecutor d2CallExecutor;
+package org.hisp.dhis.android.core.option
+
+import androidx.test.runner.AndroidJUnit4
+import com.google.common.truth.Truth
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OptionCallShould : BaseMockIntegrationTestEmptyEnqueable() {
+    private var optionCall: List<Option>? = null
+    private var d2CallExecutor: D2CallExecutor? = null
 
     @Before
-    public void setUp() throws Exception {
-        dhis2MockServer.enqueueMockResponse("option/option_sets.json");
-        dhis2MockServer.enqueueMockResponse("option/options.json");
-        Set<String> uids = new HashSet<>();
-
-        uids.add("Y1ILwhy5VDY");
-        uids.add("egT1YqFWsVk");
-        uids.add("non_existent_option_uid");
-        uids.add("Z1ILwhy5VDY");
-
-        optionCall = objects.d2DIComponent.optionCall().download(uids);
-
-        d2CallExecutor = D2CallExecutor.create(databaseAdapter);
-
-        executeOptionSetCall();
+    @Throws(Exception::class)
+    fun setUp() {
+        dhis2MockServer.enqueueMockResponse("option/option_sets.json")
+        dhis2MockServer.enqueueMockResponse("option/options.json")
+        val uids: MutableSet<String> = HashSet()
+        uids.add("Y1ILwhy5VDY")
+        uids.add("egT1YqFWsVk")
+        uids.add("non_existent_option_uid")
+        uids.add("Z1ILwhy5VDY")
+        runBlocking {
+            optionCall = objects.d2DIComponent.optionCall().download(uids)
+        }
+        d2CallExecutor = D2CallExecutor.create(databaseAdapter)
+        executeOptionSetCall()
     }
 
     @Test
-    public void persist_options_in_data_base_when_call() throws Exception {
-        executeOptionCall();
-
-        OptionCollectionRepository options = d2.optionModule().options();
-        assertThat(options.blockingCount()).isEqualTo(3);
-        assertThat(options.uid("Y1ILwhy5VDY").blockingExists()).isTrue();
-        assertThat(options.uid("egT1YqFWsVk").blockingExists()).isTrue();
-        assertThat(options.uid("non_existent_option_uid").blockingExists()).isFalse();
-        assertThat(options.uid("Z1ILwhy5VDY").blockingExists()).isTrue();
+    @Throws(Exception::class)
+    fun persist_options_in_data_base_when_call() {
+        executeOptionCall()
+        val options = d2.optionModule().options()
+        Truth.assertThat(options.blockingCount()).isEqualTo(3)
+        Truth.assertThat(options.uid("Y1ILwhy5VDY").blockingExists()).isTrue()
+        Truth.assertThat(options.uid("egT1YqFWsVk").blockingExists()).isTrue()
+        Truth.assertThat(options.uid("non_existent_option_uid").blockingExists()).isFalse()
+        Truth.assertThat(options.uid("Z1ILwhy5VDY").blockingExists()).isTrue()
     }
 
     @Test
-    public void return_options_after_call() throws Exception {
-        List<Option> optionList = executeOptionCall();
-
-        assertThat(optionList.size()).isEqualTo(4);
-
-        Option option = optionList.get(0);
-
-        assertThat(option.uid()).isEqualTo("Y1ILwhy5VDY");
-        assertThat(option.code()).isEqualTo("0-14 years");
-        assertThat(option.name()).isEqualTo("0-14 years");
-        assertThat(option.displayName()).isEqualTo("0-14 years");
-        assertThat(option.created()).isEqualTo(
-                BaseIdentifiableObject.DATE_FORMAT.parse("2014-08-18T12:39:16.000"));
-        assertThat(option.lastUpdated()).isEqualTo(
-                BaseIdentifiableObject.DATE_FORMAT.parse("2014-08-18T12:39:16.000"));
-        assertThat(option.optionSet().uid()).isEqualTo("VQ2lai3OfVG");
-        assertThat(option.sortOrder()).isEqualTo(1);
+    @Throws(Exception::class)
+    fun return_options_after_call() {
+        val optionList = executeOptionCall()
+        Truth.assertThat(optionList!!.size).isEqualTo(4)
+        val option = optionList[0]
+        Truth.assertThat(option.uid()).isEqualTo("Y1ILwhy5VDY")
+        Truth.assertThat(option.code()).isEqualTo("0-14 years")
+        Truth.assertThat(option.name()).isEqualTo("0-14 years")
+        Truth.assertThat(option.displayName()).isEqualTo("0-14 years")
+        Truth.assertThat(option.created()).isEqualTo(
+            BaseIdentifiableObject.DATE_FORMAT.parse("2014-08-18T12:39:16.000"),
+        )
+        Truth.assertThat(option.lastUpdated()).isEqualTo(
+            BaseIdentifiableObject.DATE_FORMAT.parse("2014-08-18T12:39:16.000"),
+        )
+        Truth.assertThat(option.optionSet()!!.uid()).isEqualTo("VQ2lai3OfVG")
+        Truth.assertThat(option.sortOrder()).isEqualTo(1)
     }
 
-    private void executeOptionSetCall() throws Exception {
-        d2CallExecutor.executeD2CallTransactionally(() -> {
-            List<OptionSet> optionSets = null;
+    @Throws(Exception::class)
+    private fun executeOptionSetCall() = runTest {
+        d2CallExecutor!!.executeD2CallTransactionally<List<OptionSet>> {
+            var optionSets: List<OptionSet>? = null
             try {
-                Set<String> uids = new HashSet<>();
-                uids.add("POc7DkGU3QU");
-
-                optionSets = objects.d2DIComponent.optionSetCall().download(uids).blockingGet();
-            } catch (Exception ignored) {
+                val uids: MutableSet<String> = HashSet()
+                uids.add("POc7DkGU3QU")
+                runBlocking {
+                    optionSets = objects.d2DIComponent.optionSetCall().download(uids)
+                }
+            } catch (ignored: Exception) {
             }
-
-            ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors();
-            return optionSets;
-        });
+            ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
+            optionSets
+        }
     }
 
-    private List<Option> executeOptionCall() throws Exception{
-
-        return d2CallExecutor.executeD2CallTransactionally(() -> {
-            List<Option> options = null;
+    @Throws(Exception::class)
+    private fun executeOptionCall(): List<Option>? {
+        return d2CallExecutor!!.executeD2CallTransactionally {
+            var options: List<Option>? = null
             try {
-                options = optionCall.blockingGet();
-            } catch (Exception ignored) {
+                options = optionCall!!
+            } catch (ignored: Exception) {
             }
-
-            ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors();
-            return options;
-        });
+            ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
+            options
+        }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
index 1d5fe8f466..785f0fa2ca 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
@@ -25,87 +25,78 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.option;
-
-import androidx.test.runner.AndroidJUnit4;
-
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl;
-import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import io.reactivex.Single;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class)
-public class OptionSetCallShould extends BaseMockIntegrationTestEmptyEnqueable {
-
-    private Single<List<OptionSet>> optionSetCall;
-    private D2CallExecutor d2CallExecutor;
+package org.hisp.dhis.android.core.option
+
+import androidx.test.runner.AndroidJUnit4
+import com.google.common.truth.Truth
+import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.common.BaseIdentifiableObject
+import org.hisp.dhis.android.core.common.ValueType
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OptionSetCallShould : BaseMockIntegrationTestEmptyEnqueable() {
+    private var optionSetCall: List<OptionSet>? = null
+    private var d2CallExecutor: D2CallExecutor? = null
 
     @Before
-    public void setUp() throws D2Error {
-        dhis2MockServer.enqueueMockResponse("option/option_sets.json");
-        Set<String> uids = new HashSet<>();
-        uids.add("POc7DkGU3QU");
-
-        optionSetCall = objects.d2DIComponent.optionSetCall().download(uids);
-
-        d2CallExecutor = D2CallExecutor.create(databaseAdapter);
+    @Throws(D2Error::class)
+    fun setUp() {
+        dhis2MockServer.enqueueMockResponse("option/option_sets.json")
+        val uids: MutableSet<String> = HashSet()
+        uids.add("POc7DkGU3QU")
+        runBlocking {
+            optionSetCall = objects.d2DIComponent.optionSetCall().download(uids)
+        }
+        d2CallExecutor = D2CallExecutor.create(databaseAdapter)
     }
 
     @Test
-    public void persist_option_sets_in_data_base_when_call() throws Exception {
-        executeOptionSetCall();
-
-        OptionSetCollectionRepository optionSets = d2.optionModule().optionSets();
-        assertThat(optionSets.blockingCount()).isEqualTo(2);
-        assertThat(optionSets.uid("VQ2lai3OfVG").blockingExists()).isTrue();
-        assertThat(optionSets.uid("TQ2lai3OfVG").blockingExists()).isTrue();
+    @Throws(Exception::class)
+    fun persist_option_sets_in_data_base_when_call() {
+        executeOptionSetCall()
+        val optionSets = d2.optionModule().optionSets()
+        Truth.assertThat(optionSets.blockingCount()).isEqualTo(2)
+        Truth.assertThat(optionSets.uid("VQ2lai3OfVG").blockingExists()).isTrue()
+        Truth.assertThat(optionSets.uid("TQ2lai3OfVG").blockingExists()).isTrue()
     }
 
     @Test
-    public void return_option_set_after_call() throws Exception {
-        List<OptionSet> optionSetList = executeOptionSetCall();
-
-        assertThat(optionSetList.size()).isEqualTo(2);
-
-        OptionSet optionSet = optionSetList.get(0);
-
-        assertThat(optionSet.uid()).isEqualTo("VQ2lai3OfVG");
-        assertThat(optionSet.code()).isNull();
-        assertThat(optionSet.name()).isEqualTo("Age category");
-        assertThat(optionSet.displayName()).isEqualTo("Age category");
-        assertThat(optionSet.created()).isEqualTo(
-                BaseIdentifiableObject.DATE_FORMAT.parse("2014-06-22T10:59:26.564"));
-        assertThat(optionSet.lastUpdated()).isEqualTo(
-                BaseIdentifiableObject.DATE_FORMAT.parse("2015-08-06T14:23:38.789"));
-        assertThat(optionSet.version()).isEqualTo(1);
-        assertThat(optionSet.valueType()).isEqualTo(ValueType.TEXT);
+    @Throws(Exception::class)
+    fun return_option_set_after_call() {
+        val optionSetList = executeOptionSetCall()
+        Truth.assertThat(optionSetList!!.size).isEqualTo(2)
+        val optionSet = optionSetList[0]
+        Truth.assertThat(optionSet.uid()).isEqualTo("VQ2lai3OfVG")
+        Truth.assertThat(optionSet.code()).isNull()
+        Truth.assertThat(optionSet.name()).isEqualTo("Age category")
+        Truth.assertThat(optionSet.displayName()).isEqualTo("Age category")
+        Truth.assertThat(optionSet.created()).isEqualTo(
+            BaseIdentifiableObject.DATE_FORMAT.parse("2014-06-22T10:59:26.564"),
+        )
+        Truth.assertThat(optionSet.lastUpdated()).isEqualTo(
+            BaseIdentifiableObject.DATE_FORMAT.parse("2015-08-06T14:23:38.789"),
+        )
+        Truth.assertThat(optionSet.version()).isEqualTo(1)
+        Truth.assertThat(optionSet.valueType()).isEqualTo(ValueType.TEXT)
     }
 
-    private List<OptionSet> executeOptionSetCall() throws Exception{
-
-        return d2CallExecutor.executeD2CallTransactionally(() -> {
-            List<OptionSet> optionSets = null;
+    @Throws(Exception::class)
+    private fun executeOptionSetCall(): List<OptionSet>? {
+        return d2CallExecutor!!.executeD2CallTransactionally {
+            var optionSets: List<OptionSet>? = null
             try {
-                optionSets = optionSetCall.blockingGet();
-            } catch (Exception ignored) {
+                optionSets = optionSetCall!!
+            } catch (ignored: Exception) {
             }
-
-            ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors();
-            return optionSets;
-        });
+            ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
+            optionSets
+        }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
index b613473ee0..9d07b1c2ac 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import com.google.common.collect.Lists
 import com.google.common.truth.Truth
-import io.reactivex.Single
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.hisp.dhis.android.core.visualization.Visualization
@@ -41,18 +41,21 @@ import org.junit.runner.RunWith
 class VisualizationEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     companion object {
-        private lateinit var visualizationsSingle: Single<List<Visualization>>
+        private lateinit var visualizationsSingle: List<Visualization>
 
         @BeforeClass
         @JvmStatic
         @Throws(Exception::class)
         internal fun setUpClass() {
             BaseMockIntegrationTestEmptyEnqueable.setUpClass()
-            visualizationsSingle = objects.d2DIComponent.internalModules().visualization.visualizationCall.download(
-                HashSet(
-                    Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe"),
-                ),
-            )
+
+            runBlocking {
+                visualizationsSingle = objects.d2DIComponent.internalModules().visualization.visualizationCall.download(
+                    HashSet(
+                        Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe"),
+                    ),
+                )
+            }
         }
     }
 
@@ -69,7 +72,7 @@ class VisualizationEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable()
         dhis2MockServer.enqueueMockResponse("visualization/visualizations_2.json")
         d2.databaseAdapter().setForeignKeyConstraintsEnabled(false)
 
-        var visualizations = visualizationsSingle.blockingGet()
+        var visualizations = visualizationsSingle
         Truth.assertThat(visualizations.isEmpty()).isFalse()
         visualizations = d2.visualizationModule().visualizations().blockingGet()
         Truth.assertThat(visualizations.isEmpty()).isFalse()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index c513a9ef90..874b61827e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -37,68 +37,46 @@ import org.hisp.dhis.android.core.resource.internal.Resource
 @Suppress("TooManyFunctions")
 internal interface APIDownloader {
 
-    fun <P> downloadPartitioned(
+    suspend fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
-    ): Single<List<P>>
-
-    suspend fun <P> downloadPartitionedCoroutines(
-        uids: Set<String>,
-        pageSize: Int,
-        handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
-    ): List<P>
-
-    fun <P> downloadPartitionedCoroutinesJavaCompatible(
-        uids: Set<String>,
-        pageSize: Int,
-        handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+        pageDownloader: suspend (Set<String>) -> Payload<P>,
     ): List<P>
 
-    fun <P, O> downloadPartitioned(
+    suspend fun <P, O> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<O>>,
-        transform: (O) -> P,
-    ): Single<List<P>>
-
-    suspend fun <P, O> downloadPartitionedCoroutines(
-        uids: Set<String>,
-        pageSize: Int,
-        handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        pageDownloader: suspend(Set<String>) -> Payload<O>,
         transform: (O) -> P,
     ): List<P>
 
-    fun <P> downloadPartitioned(
+    suspend fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
-    ): Single<List<P>>
+        pageDownloader: suspend(Set<String>) -> Payload<P>,
+    ): List<P>
 
-    fun <K, V> downloadPartitionedMap(
+    suspend fun <K, V> downloadPartitionedMap(
         uids: Set<String>,
         pageSize: Int,
         handler: (Map<K, V>) -> Any,
-        pageDownloader: (Set<String>) -> Single<out Map<K, V>>,
-    ): Single<Map<K, V>>
+        pageDownloader: suspend(Set<String>) -> Map<K, V>,
+    ): Map<K, V>
 
-    fun <P, O : CoreObject> downloadLink(
+    suspend fun <P, O : CoreObject> downloadLink(
         masterUid: String,
         handler: LinkHandler<P, O>,
-        downloader: (String) -> Single<Payload<P>>,
+        downloader: suspend(String) -> Payload<P>,
         transform: ((P) -> O),
-    ): Single<List<P>>
+    ): List<P>
 
-    fun <P> downloadWithLastUpdated(
+    suspend fun <P> downloadWithLastUpdated(
         handler: Handler<P>,
         resourceType: Resource.Type,
-        downloader: (String?) -> Single<Payload<P>>,
-    ): Single<List<P>>
+        downloader: suspend(String?) -> Payload<P>,
+    ): List<P>
 
     fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>>
     fun <P> downloadList(handler: Handler<P>, downloader: Single<List<P>>): Single<List<P>>
@@ -109,8 +87,8 @@ internal interface APIDownloader {
 
     suspend fun <P> downloadObjectAsCoroutine(handler: Handler<P>, downloader: suspend () -> P): P
 
-    fun <P> downloadPagedPayload(
+    suspend fun <P> downloadPagedPayload(
         pageSize: Int,
-        downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>,
-    ): Single<Payload<P>>
+        downloader: suspend(page: Int, pageSize: Int) -> Payload<P>,
+    ): Payload<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 240f20168c..a6e9694c83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -29,11 +29,7 @@ package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import androidx.annotation.VisibleForTesting
 import dagger.Reusable
-import io.reactivex.Observable
 import io.reactivex.Single
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.rx2.await
-import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -48,27 +44,11 @@ import javax.inject.Inject
 @Suppress("TooManyFunctions")
 internal class APIDownloaderImpl @Inject constructor(private val resourceHandler: ResourceHandler) : APIDownloader {
 
-    override fun <P> downloadPartitioned(
+    override suspend fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
-    ): Single<List<P>> {
-        return rxSingle {
-            downloadPartitionedCoroutines(
-                uids,
-                pageSize,
-                handler,
-                pageDownloader,
-            ) { it }
-        }
-    }
-
-    override suspend fun <P> downloadPartitionedCoroutines(
-        uids: Set<String>,
-        pageSize: Int,
-        handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
+        pageDownloader: suspend(Set<String>) -> Payload<P>,
     ): List<P> {
         return downloadPartitionedWithCustomHandling(
             uids,
@@ -78,29 +58,11 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         ) { it }
     }
 
-    override fun <P, O> downloadPartitioned(
-        uids: Set<String>,
-        pageSize: Int,
-        handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<O>>,
-        transform: (O) -> P,
-    ): Single<List<P>> {
-        return rxSingle {
-            downloadPartitionedCoroutines(
-                uids,
-                pageSize,
-                handler,
-                pageDownloader,
-                transform,
-            )
-        }
-    }
-
-    override suspend fun <P, O> downloadPartitionedCoroutines(
+    override suspend fun <P, O> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        pageDownloader: suspend(Set<String>) -> Payload<O>,
         transform: (O) -> P,
     ): List<P> {
         return downloadPartitionedWithCustomHandling(
@@ -112,26 +74,11 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         )
     }
 
-    override fun <P> downloadPartitionedCoroutinesJavaCompatible(
+    override suspend fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>
+        pageDownloader: suspend(Set<String>) -> Payload<P>,
     ): List<P> {
-        return runBlocking {   downloadPartitionedCoroutines(
-            uids,
-            pageSize,
-            handler,
-            pageDownloader,
-        ) { it } }
-
-    }
-
-    override fun <P> downloadPartitioned(
-        uids: Set<String>,
-        pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<P>>,
-    ): Single<List<P>> {
         return downloadPartitionedWithoutHandling(
             uids = uids,
             pageSize = pageSize,
@@ -140,23 +87,22 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         )
     }
 
-    private fun <P, O> downloadPartitionedWithoutHandling(
+    private suspend fun <P, O> downloadPartitionedWithoutHandling(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        pageDownloader: suspend(Set<String>) -> Payload<O>,
         transform: (O) -> P,
-    ): Single<List<P>> {
+    ): List<P> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
 
-        return Observable.fromIterable(partitions)
-            .flatMapSingle(pageDownloader)
-            .map { obj: Payload<O> -> obj.items() }
-            .reduce(emptyList()) { items: List<O>, items2: List<O> ->
-                items + items2
-            }
-            .map { items: List<O> ->
-                items.map { transform(it) }
-            }
+        val results = mutableListOf<P>()
+
+        partitions.forEach { partition ->
+            val transformedItems = pageDownloader(partition).items().map { transform(it) }
+            results.addAll(transformedItems)
+        }
+
+        return results
     }
 
     // TODO : remove the Single making sure it is not needed by the callers
@@ -164,7 +110,7 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: (Set<String>) -> Single<Payload<O>>,
+        pageDownloader: suspend(Set<String>) -> Payload<O>,
         transform: (O) -> P,
     ): List<P> {
         val oCollection = downloadPartitionedWithoutHandling(
@@ -172,55 +118,53 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
             pageSize = pageSize,
             pageDownloader = pageDownloader,
             transform = transform,
-        ).await()
+        )
         handler.handleMany(oCollection)
         return oCollection
     }
 
-    override fun <K, V> downloadPartitionedMap(
+    override suspend fun <K, V> downloadPartitionedMap(
         uids: Set<String>,
         pageSize: Int,
         handler: (Map<K, V>) -> Any,
-        pageDownloader: (Set<String>) -> Single<out Map<K, V>>,
-    ): Single<Map<K, V>> {
+        pageDownloader: suspend(Set<String>) -> Map<K, V>,
+    ): Map<K, V> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
-        return Observable.fromIterable(partitions)
-            .flatMapSingle(pageDownloader)
-            .reduce(
-                mapOf(),
-            ) { items: Map<K, V>, items2: Map<K, V> ->
-                items + items2
-            }
-            .doOnSuccess { map: Map<K, V> -> handler(map) }
+
+        val results = partitions.map { partition ->
+            pageDownloader(partition)
+        }
+        val resultsMap = results.fold(mapOf<K, V>()) { acc, map ->
+            acc + map
+        }
+        handler(resultsMap)
+        return resultsMap
     }
 
-    override fun <P, O : CoreObject> downloadLink(
+    override suspend fun <P, O : CoreObject> downloadLink(
         masterUid: String,
         handler: LinkHandler<P, O>,
-        downloader: (String) -> Single<Payload<P>>,
+        downloader: suspend(String) -> Payload<P>,
         transform: (P) -> O,
-    ): Single<List<P>> {
-        return Single.just(masterUid)
-            .flatMap(downloader)
-            .map { obj: Payload<P> -> obj.items() }
-            .doOnSuccess { items: List<P> -> handler.handleMany(masterUid, items, transform) }
+    ): List<P> {
+        val items = downloader.invoke(masterUid).items()
+        handler.handleMany(masterUid, items, transform)
+
+        return items
     }
 
-    override fun <P> downloadWithLastUpdated(
+    override suspend fun <P> downloadWithLastUpdated(
         handler: Handler<P>,
         resourceType: Resource.Type,
-        downloader: (String?) -> Single<Payload<P>>,
-    ): Single<List<P>> {
-        return Single.defer {
-            downloader(
-                resourceHandler.getLastUpdated(resourceType),
-            )
-        }
-            .map { obj: Payload<P> -> obj.items() }
-            .doOnSuccess { items: List<P> ->
-                handler.handleMany(items)
-                resourceHandler.handleResource(resourceType)
-            }
+        downloader: suspend(String?) -> Payload<P>,
+    ): List<P> {
+        val items = downloader(
+            resourceHandler.getLastUpdated(resourceType),
+        ).items()
+
+        handler.handleMany(items)
+        resourceHandler.handleResource(resourceType)
+        return items
     }
 
     override fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>> {
@@ -249,18 +193,25 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
             .also { handler.handle(it) }
     }
 
-    override fun <P> downloadPagedPayload(
+    override suspend fun <P> downloadPagedPayload(
         pageSize: Int,
-        downloader: (page: Int, pageSize: Int) -> Single<Payload<P>>,
-    ): Single<Payload<P>> {
+        downloader: suspend(page: Int, pageSize: Int) -> Payload<P>,
+    ): Payload<P> {
         var page = 1
-        return Single.defer { downloader(page++, pageSize) }
-            .map { it.items() }
-            .repeat()
-            .takeUntil { list -> list.size < pageSize }
-            .reduce(emptyList()) { items: List<P>, items2: List<P> ->
-                items + items2
+
+        val itemsList = mutableListOf<P>()
+
+        while (true) {
+            val payload = downloader(page++, pageSize)
+            val items = payload.items()
+
+            itemsList.addAll(items)
+
+            if (items.size < pageSize) {
+                break
             }
-            .map { list -> Payload(list) }
+        }
+
+        return Payload(itemsList)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
index 16cc2df3a9..2a1f530635 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.category.Category
 import javax.inject.Inject
 
@@ -39,13 +38,13 @@ internal class CategoryCall @Inject constructor(
     private val handler: CategoryHandler,
     private val service: CategoryService,
     private val apiDownloader: APIDownloader,
-) : UidsCall<Category> {
+) : UidsCallCoroutines<Category> {
 
     companion object {
         private const val MAX_UID_LIST_SIZE = 90
     }
 
-    override fun download(uids: Set<String>): Single<List<Category>> {
+    override suspend fun download(uids: Set<String>): List<Category> {
         return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
index 4097c2ee97..14d1ce74c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.category.CategoryCombo
 import javax.inject.Inject
 
@@ -39,8 +38,8 @@ internal class CategoryComboCall @Inject constructor(
     private val service: CategoryComboService,
     private val handler: CategoryComboHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<CategoryCombo> {
-    override fun download(uids: Set<String>): Single<List<CategoryCombo>> {
+) : UidsCallCoroutines<CategoryCombo> {
+    override suspend fun download(uids: Set<String>): List<CategoryCombo> {
         return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler) { partitionUids: Set<String> ->
             service.getCategoryCombos(
                 CategoryComboFields.allFields,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt
index ba5628216b..67c61f7a77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -39,9 +38,9 @@ import retrofit2.http.Query
 
 internal interface CategoryComboService {
     @GET("categoryCombos")
-    fun getCategoryCombos(
+    suspend fun getCategoryCombos(
         @Query("fields") @Which fields: Fields<CategoryCombo>,
         @Query("filter") @Where uids: Filter<CategoryCombo, String>,
         @Query("paging") paging: Boolean?,
-    ): Single<Payload<CategoryCombo>>
+    ): Payload<CategoryCombo>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 67c6d0ada7..21e45328e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -28,9 +28,7 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import javax.inject.Inject
 
 @Reusable
@@ -42,22 +40,21 @@ class CategoryModuleDownloader @Inject internal constructor(
     private val categoryComboUidsSeeker: CategoryComboUidsSeeker,
     private val categoryCategoryOptionLinkPersistor: CategoryCategoryOptionLinkPersistor,
     private val categoryOptionComboIntegrityChecker: CategoryOptionComboIntegrityChecker,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Single.fromCallable { categoryComboUidsSeeker.seekUids() }
-            .flatMap { categoryComboCall.download(it) }
-            .flatMap { comboUids ->
-                val categoryUids = CategoryParentUidsHelper.getCategoryUids(comboUids)
-                categoryCall.download(categoryUids).flatMap { categories ->
-                    categoryOptionCall.download(categoryUids)
-                        .flatMap { categoryOptions ->
+    override suspend fun downloadMetadata() {
+        categoryComboUidsSeeker.seekUids().let { uids ->
+            categoryComboCall.download(uids).let { comboUids ->
+                CategoryParentUidsHelper.getCategoryUids(comboUids).let { categoryUids ->
+                    categoryCall.download(categoryUids).let { categories ->
+                        categoryOptionCall.download(categoryUids).also { categoryOptions ->
                             categoryCategoryOptionLinkPersistor.handleMany(categories, categoryOptions)
                             categoryOptionOrganisationUnitsCall.download(categoryOptions.map { it.uid() }.toSet())
+                            categoryOptionComboIntegrityChecker.removeIncompleteCategoryOptionCombos()
                         }
+                    }
                 }
             }
-            .map { categoryOptionComboIntegrityChecker.removeIncompleteCategoryOptionCombos() }
-            .ignoreElement()
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
index 8f9afaf033..01ef7f6c03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -42,7 +41,7 @@ internal class CategoryOptionCall @Inject constructor(
     private val handler: CategoryOptionHandler,
     private val service: CategoryOptionService,
     private val apiDownloader: APIDownloader,
-) : UidsCall<CategoryOption> {
+) : UidsCallCoroutines<CategoryOption> {
 
     companion object {
         private const val QUERY_WITHOUT_UIDS_LENGTH = (
@@ -52,7 +51,7 @@ internal class CategoryOptionCall @Inject constructor(
             ).length
     }
 
-    override fun download(uids: Set<String>): Single<List<CategoryOption>> {
+    override suspend fun download(uids: Set<String>): List<CategoryOption> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
         return apiDownloader.downloadPartitioned(
             uids,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
index 9b4cbfbd56..9268d5a146 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.category.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
@@ -48,7 +47,7 @@ internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
         private const val QUERY_WITHOUT_UIDS_LENGTH = ("categoryOptions/orgUnits?categoryOptions=").length
     }
 
-    fun download(uids: Set<String>): Single<Map<String, List<String>>> {
+    suspend fun download(uids: Set<String>): Map<String, List<String>> {
         return if (dhisVersionManager.isGreaterOrEqualThan(DHISVersion.V2_37)) {
             apiDownloader.downloadPartitionedMap(
                 uids = uids,
@@ -62,7 +61,7 @@ internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
                 },
             )
         } else {
-            Single.just(emptyMap())
+            emptyMap()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
index e72214e208..c4af0dd82a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -39,15 +38,15 @@ import retrofit2.http.Query
 internal interface CategoryOptionService {
 
     @GET("categoryOptions")
-    fun getCategoryOptions(
+    suspend fun getCategoryOptions(
         @Query("fields") @Which fields: Fields<CategoryOption>,
         @Query("filter") categoryUidsFilterString: String,
         @Query("filter") accessDataReadFilter: String,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<CategoryOption>>
+    ): Payload<CategoryOption>
 
     @GET("categoryOptions/orgUnits")
     fun getCategoryOptionOrgUnits(
         @Query("categoryOptions") categoryOptions: String,
-    ): Single<CategoryOptionOrganisationUnits>
+    ): CategoryOptionOrganisationUnits
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt
index 8276efc756..a957dbb34f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -37,11 +36,11 @@ import org.hisp.dhis.android.core.category.Category
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface CategoryService {
+internal fun interface CategoryService {
     @GET("categories")
-    fun getCategories(
+    suspend fun getCategories(
         @Query("fields") @Which fields: Fields<Category>,
         @Query("filter") @Where uids: Filter<Category, String>,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<Category>>
+    ): Payload<Category>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index bab6f1a97f..5ed6b8dd30 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import dagger.Reusable
 import io.reactivex.Completable
+import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
@@ -39,9 +40,10 @@ import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
-import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCall
+import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCallCoroutines
 import javax.inject.Inject
 
+@Suppress("LongParameterList")
 @Reusable
 internal class DataSetModuleDownloader @Inject internal constructor(
     private val dataSetCallFactory: UidsCallFactory<DataSet>,
@@ -49,7 +51,7 @@ internal class DataSetModuleDownloader @Inject internal constructor(
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val validationRuleCall: ValidationRuleCall,
-    private val validationRuleUidsCall: ValidationRuleUidsCall,
+    private val validationRuleUidsCall: ValidationRuleUidsCallCoroutines,
     private val periodHandler: PeriodHandler,
     private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore,
 ) : UntypedModuleDownloader {
@@ -65,11 +67,15 @@ internal class DataSetModuleDownloader @Inject internal constructor(
             ).call()
 
             val optionSetUids = DataSetParentUidsHelper.getAssignedOptionSetUids(dataElements)
-            optionSetCall.download(optionSetUids).blockingGet()
-            optionCall.download(optionSetUids).blockingGet()
+            runBlocking {
+                optionSetCall.download(optionSetUids)
+                optionCall.download(optionSetUids)
+            }
 
-            val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets)).blockingGet()
-            validationRuleCall.download(getUids(validationRuleUids)).blockingGet()
+            runBlocking {
+                val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
+                validationRuleCall.download(getUids(validationRuleUids))
+            }
             periodHandler.generateAndPersist()
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index bcdb8465f8..2e3329c50a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -151,22 +151,22 @@ internal class MetadataCall @Inject constructor(
         dataSetDownloader.downloadMetadata().blockingAwait()
         emit(progressManager.increaseProgress(DataSet::class.java, false))
 
-        categoryDownloader.downloadMetadata().blockingAwait()
+        categoryDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Category::class.java, false))
 
         visualizationDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Visualization::class.java, false))
 
-        programIndicatorModuleDownloader.downloadMetadata().blockingAwait()
+        programIndicatorModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(ProgramIndicator::class.java, false))
 
         indicatorModuleDownloader.downloadMetadata().blockingAwait()
         emit(progressManager.increaseProgress(Indicator::class.java, false))
 
-        legendSetModuleDownloader.downloadMetadata().blockingAwait()
+        legendSetModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(LegendSet::class.java, false))
 
-        expressionDimensionItemModuleDownloader.downloadMetadata().blockingAwait()
+        expressionDimensionItemModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(ExpressionDimensionItem::class.java, true))
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index 423c77f406..420266b2e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -47,7 +47,7 @@ internal class EventFilterCall @Inject internal constructor(
     override suspend fun download(programUids: Set<String>): List<EventFilter> {
         return if (versionManager.isGreaterThan(DHISVersion.V2_31)) {
             val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
-            apiDownloader.downloadPartitionedCoroutines(
+            apiDownloader.downloadPartitioned(
                 programUids,
                 MAX_UID_LIST_SIZE,
                 handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.kt
index 4260bd6a65..af3c11a276 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterService.kt
@@ -25,24 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event.internal;
+package org.hisp.dhis.android.core.event.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.event.EventFilter;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.event.EventFilter
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface EventFilterService {
+internal fun interface EventFilterService {
     @GET("eventFilters")
-    Single<Payload<EventFilter>> getEventFilters(
-            @Query("filter") @Where Filter<EventFilter, String> uids,
-            @Query("filter") String accessDataReadFilter,
-            @Query("fields") @Which Fields<EventFilter> fields,
-            @Query("paging") Boolean paging);
+    suspend fun getEventFilters(
+        @Query("filter") @Where uids: Filter<EventFilter?, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("fields") @Which fields: Fields<EventFilter>,
+        @Query("paging") paging: Boolean,
+    ): Payload<EventFilter>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
index 8f186648fb..1676dae0d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import javax.inject.Inject
 
@@ -39,8 +38,8 @@ internal class ExpressionDimensionItemCall @Inject constructor(
     private val service: ExpressionDimensionItemService,
     private val handler: ExpressionDimensionItemHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<ExpressionDimensionItem> {
-    override fun download(uids: Set<String>): Single<List<ExpressionDimensionItem>> {
+) : UidsCallCoroutines<ExpressionDimensionItem> {
+    override suspend fun download(uids: Set<String>): List<ExpressionDimensionItem> {
         return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
index 53a5319fce..d42289f7c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
@@ -29,19 +29,16 @@
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import javax.inject.Inject
 
 @Reusable
 internal class ExpressionDimensionItemModuleDownloader @Inject internal constructor(
     private val expressionDimensionItemUidsSeeker: ExpressionDimensionItemUidsSeeker,
     private val expressionDimensionItemCall: ExpressionDimensionItemCall,
-) : UntypedModuleDownloader {
-    override fun downloadMetadata(): Completable {
-        return Single.fromCallable { expressionDimensionItemUidsSeeker.seekUids() }
-            .flatMap { expressionDimensionItemCall.download(it) }
-            .ignoreElement()
+) : UntypedModuleDownloaderCoroutines {
+    override suspend fun downloadMetadata() {
+        val uids = expressionDimensionItemUidsSeeker.seekUids()
+        expressionDimensionItemCall.download(uids)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt
index 2de8f44835..c6945dd710 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -36,12 +35,12 @@ import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import retrofit2.http.*
 
-internal interface ExpressionDimensionItemService {
+internal fun interface ExpressionDimensionItemService {
 
     @GET("expressionDimensionItems")
-    fun getExpressionDimensionItems(
+    suspend fun getExpressionDimensionItems(
         @Query("filter") @Where uids: Filter<ExpressionDimensionItem, String>,
         @Query("fields") @Which fields: Fields<ExpressionDimensionItem>,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<ExpressionDimensionItem>>
+    ): Payload<ExpressionDimensionItem>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
index a9b463fa5d..d622e3735b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
@@ -29,9 +29,8 @@
 package org.hisp.dhis.android.core.legendset.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.legendset.LegendSet
 import javax.inject.Inject
 
@@ -40,8 +39,8 @@ internal class LegendSetCall @Inject constructor(
     private val service: LegendSetService,
     private val handler: LegendSetHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<LegendSet> {
-    override fun download(uids: Set<String>): Single<List<LegendSet>> {
+) : UidsCallCoroutines<LegendSet> {
+    override suspend fun download(uids: Set<String>): List<LegendSet> {
         return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler) { partitionUids ->
             service.getLegendSets(LegendSetFields.allFields, LegendSetFields.uid.`in`(partitionUids), false)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
index f69e171a62..7f2596e98c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
@@ -29,19 +29,16 @@
 package org.hisp.dhis.android.core.legendset.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import javax.inject.Inject
 
 @Reusable
 internal class LegendSetModuleDownloader @Inject internal constructor(
     private val legendSetUidsSeeker: LegendSetUidsSeeker,
     private val legendSetCall: LegendSetCall,
-) : UntypedModuleDownloader {
-    override fun downloadMetadata(): Completable {
-        return Single.fromCallable { legendSetUidsSeeker.seekUids() }
-            .flatMap { legendSetCall.download(it) }
-            .ignoreElement()
+) : UntypedModuleDownloaderCoroutines {
+    override suspend fun downloadMetadata() {
+        val uids = legendSetUidsSeeker.seekUids()
+        legendSetCall.download(uids)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt
index 9255814576..101c60836c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetService.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.legendset.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -38,11 +37,11 @@ import org.hisp.dhis.android.core.legendset.LegendSet
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface LegendSetService {
+internal fun interface LegendSetService {
     @GET("legendSets")
-    fun getLegendSets(
+    suspend fun getLegendSets(
         @Query("fields") @Which fields: Fields<LegendSet>,
         @Query("filter") @Where uids: Filter<LegendSet, String>,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<LegendSet>>
+    ): Payload<LegendSet>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
index 7315397b5d..a8f3c69b53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.Option
 import javax.inject.Inject
@@ -40,8 +39,8 @@ class OptionCall @Inject internal constructor(
     private val service: OptionService,
     private val handler: OptionHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<Option> {
-    override fun download(uids: Set<String>): Single<List<Option>> {
+) : UidsCallCoroutines<Option> {
+    override suspend fun download(uids: Set<String>): List<Option> {
         return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index ce19c68cf9..3bbc9e886b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.option.OptionGroup
 import java.lang.Boolean
 import javax.inject.Inject
@@ -40,8 +39,8 @@ class OptionGroupCall @Inject internal constructor(
     private val service: OptionGroupService,
     private val handler: OptionGroupHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<OptionGroup> {
-    override fun download(optionSetUids: Set<String>): Single<List<OptionGroup>> {
+) : UidsCallCoroutines<OptionGroup> {
+    override suspend fun download(optionSetUids: Set<String>): List<OptionGroup> {
         return apiDownloader.downloadPartitioned(
             optionSetUids,
             MAX_UID_LIST_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupService.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupService.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupService.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupService.kt
index f5221a980e..185a64caef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupService.kt
@@ -25,22 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.option.OptionGroup;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface OptionGroupService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.option.OptionGroup
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal fun interface OptionGroupService {
     @GET("optionGroups")
-    Single<Payload<OptionGroup>> optionGroups(@Query("fields") @Which Fields<OptionGroup> fields,
-                                              @Query("filter") String dataSetUidsFilter,
-                                              @Query("paging") boolean paging);
-}
\ No newline at end of file
+    suspend fun optionGroups(
+        @Query("fields") @Which fields: Fields<OptionGroup>,
+        @Query("filter") dataSetUidsFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<OptionGroup>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt
index 2dc004fbbb..10eb7121fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -35,13 +34,13 @@ import org.hisp.dhis.android.core.option.Option
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface OptionService {
+internal fun interface OptionService {
     @GET("options")
-    fun getOptions(
+    suspend fun getOptions(
         @Query("fields") @Which fields: Fields<Option>,
         @Query("filter") optionSetUidsFilterString: String,
         @Query("paging") paging: Boolean,
         @Query("page") page: Int,
         @Query("pageSize") pageSize: Int,
-    ): Single<Payload<Option>>
+    ): Payload<Option>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
index 69d9389f5c..5897b19b66 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.option.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.option.OptionSet
 import javax.inject.Inject
 
@@ -39,13 +38,13 @@ internal class OptionSetCall @Inject constructor(
     private val service: OptionSetService,
     private val handler: OptionSetHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<OptionSet> {
+) : UidsCallCoroutines<OptionSet> {
 
     companion object {
         const val MAX_UID_LIST_SIZE = 130
     }
 
-    override fun download(uids: Set<String>): Single<List<OptionSet>> {
+    override suspend fun download(uids: Set<String>): List<OptionSet> {
         return apiDownloader.downloadPartitioned(uids, MAX_UID_LIST_SIZE, handler) { partitionUids: Set<String> ->
             service.optionSets(OptionSetFields.allFields, OptionSetFields.uid.`in`(partitionUids), false)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetService.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetService.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetService.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetService.kt
index 2c161d3bf3..374faea296 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetService.kt
@@ -25,24 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.option.internal
 
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.option.OptionSet;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface OptionSetService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.option.OptionSet
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal fun interface OptionSetService {
     @GET("optionSets")
-    Single<Payload<OptionSet>> optionSets(@Query("fields") @Which Fields<OptionSet> fields,
-                                          @Query("filter") @Where Filter<OptionSet, String> filter,
-                                          @Query("paging") boolean paging);
+    suspend fun optionSets(
+        @Query("fields") @Which fields: Fields<OptionSet>,
+        @Query("filter") @Where filter: Filter<OptionSet, String>,
+        @Query("paging") paging: Boolean,
+    ): Payload<OptionSet>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 9ef0b10a3c..4808a9ae35 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -44,7 +44,7 @@ internal class ProgramCall @Inject internal constructor(
 
     override suspend fun download(uids: Set<String>): List<Program> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
-        return apiDownloader.downloadPartitionedCoroutines(
+        return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
index cf9bea3a8d..fd459f7cfc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
@@ -29,9 +29,8 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramIndicator
 import javax.inject.Inject
@@ -42,13 +41,13 @@ internal class ProgramIndicatorCall @Inject constructor(
     private val handler: ProgramIndicatorHandler,
     private val apiDownloader: APIDownloader,
     private val programStore: ProgramStore,
-) : UidsCall<ProgramIndicator> {
+) : UidsCallCoroutines<ProgramIndicator> {
 
     companion object {
         const val MAX_UID_LIST_SIZE = 50
     }
 
-    override fun download(uids: Set<String>): Single<List<ProgramIndicator>> {
+    override suspend fun download(uids: Set<String>): List<ProgramIndicator> {
         val programUids = programStore.selectUids()
         val firstPayload = apiDownloader.downloadPartitioned(
             uids = programUids.toSet(),
@@ -80,11 +79,8 @@ internal class ProgramIndicatorCall @Inject constructor(
             },
         )
 
-        return Single.merge(firstPayload, secondPayload).reduce { t1, t2 ->
-            val data = t1 + t2
-            data.distinctBy { it.uid() }
-        }.doOnSuccess {
-            handler.handleMany(it)
-        }.toSingle()
+        val mergedData = (firstPayload + secondPayload).distinctBy { it.uid() }
+        handler.handleMany(mergedData)
+        return mergedData
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
index 0906e4611d..a796914461 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
@@ -29,20 +29,17 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Completable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import javax.inject.Inject
 
 @Reusable
 internal class ProgramIndicatorModuleDownloader @Inject constructor(
     private val programIndicatorCall: ProgramIndicatorCall,
     private val programIndicatorUidsSeeker: ProgramIndicatorUidsSeeker,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Single.fromCallable { programIndicatorUidsSeeker.seekUids() }
-            .flatMap { programIndicatorCall.download(it) }
-            .ignoreElement()
+    override suspend fun downloadMetadata() {
+        val uids = programIndicatorUidsSeeker.seekUids()
+        programIndicatorCall.download(uids)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
index ce0cfabf46..46cf0a25a6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorService.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.program.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -40,11 +39,11 @@ import retrofit2.http.Query
 
 internal interface ProgramIndicatorService {
     @GET("programIndicators")
-    fun getProgramIndicator(
+    suspend fun getProgramIndicator(
         @Query("fields") @Which fields: Fields<ProgramIndicator>,
         @Query("filter") @Where displayInForm: Filter<ProgramIndicator, Boolean>?,
         @Query("filter") program: String?,
         @Query("filter") @Where uids: Filter<ProgramIndicator, String>?,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<ProgramIndicator>>
+    ): Payload<ProgramIndicator>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index e60aa3fc0c..09c5ef56b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import kotlinx.coroutines.rx2.await
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -82,11 +81,11 @@ internal class ProgramModuleDownloader @Inject constructor(
             attributes,
             programStages,
         )
-        programRuleCall.download(programUids).blockingGet()
-        relationshipTypeCall.download().blockingGet()
-        optionSetCall.download(optionSetUids).blockingGet()
-        optionCall.download(optionSetUids).blockingGet()
-        optionGroupCall.download(optionSetUids).blockingGet()
+        programRuleCall.download(programUids)
+        relationshipTypeCall.download()
+        optionSetCall.download(optionSetUids)
+        optionCall.download(optionSetUids)
+        optionGroupCall.download(optionSetUids)
 
         downloadFiltersAndWorkingLists(programUids)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index 959f26603e..a59a6dfcf8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import javax.inject.Inject
@@ -40,8 +39,8 @@ internal class ProgramRuleCall @Inject constructor(
     private val service: ProgramRuleService,
     private val handler: ProgramRuleHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<ProgramRule> {
-    override fun download(programUids: Set<String>): Single<List<ProgramRule>> {
+) : UidsCallCoroutines<ProgramRule> {
+    override suspend fun download(programUids: Set<String>): List<ProgramRule> {
         return apiDownloader.downloadPartitioned(
             programUids,
             MAX_UID_LIST_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleService.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleService.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleService.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleService.kt
index 5b94f151e5..1732658551 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleService.kt
@@ -25,20 +25,20 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.program.ProgramRule;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.program.ProgramRule
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface ProgramRuleService {
+internal fun interface ProgramRuleService {
     @GET("programRules")
-    Single<Payload<ProgramRule>> getProgramRules(@Query("fields") @Which Fields<ProgramRule> fields,
-                                                 @Query("filter") String programUidsFilterString,
-                                                 @Query("paging") Boolean paging);
-}
\ No newline at end of file
+    suspend fun getProgramRules(
+        @Query("fields") @Which fields: Fields<ProgramRule>,
+        @Query("filter") programUidsFilterString: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<ProgramRule>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt
index 36119d19ca..4657f26f3e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -37,12 +36,12 @@ import org.hisp.dhis.android.core.program.Program
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface ProgramService {
+internal fun interface ProgramService {
     @GET("programs")
-    fun getPrograms(
+    suspend fun getPrograms(
         @Query("fields") @Which fields: Fields<Program>,
         @Query("filter") @Where uids: Filter<Program, String>,
         @Query("filter") accessDataReadFilter: String,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<Program>>
+    ): Payload<Program>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 31900cf857..8b3b71e02b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -44,7 +44,7 @@ internal class ProgramStageCall @Inject internal constructor(
     private val apiDownloader: APIDownloader,
 ) : UidsCallCoroutines<ProgramStage> {
     override suspend fun download(uids: Set<String>): List<ProgramStage> {
-        return apiDownloader.downloadPartitionedCoroutines(
+        return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt
similarity index 74%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt
index ca64ecd56c..7cc0ac0d56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt
@@ -25,21 +25,21 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.program.internal;
+package org.hisp.dhis.android.core.program.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.program.ProgramStage;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.program.ProgramStage
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface ProgramStageService {
+internal fun interface ProgramStageService {
     @GET("programStages")
-    Single<Payload<ProgramStage>> getProgramStages(@Query("fields") @Which Fields<ProgramStage> fields,
-                                                   @Query("filter") String programUidsFilterString,
-                                                   @Query("filter") String accessDataReadFilter,
-                                                   @Query("paging") Boolean paging);
-}
\ No newline at end of file
+    suspend fun getProgramStages(
+        @Query("fields") @Which fields: Fields<ProgramStage?>?,
+        @Query("filter") programUidsFilterString: String?,
+        @Query("filter") accessDataReadFilter: String?,
+        @Query("paging") paging: Boolean?,
+    ): Payload<ProgramStage>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
index bfa21a2941..cea4b57221 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
@@ -47,7 +47,7 @@ internal class ProgramStageWorkingListCall @Inject internal constructor(
         val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
 
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_40)) {
-            apiDownloader.downloadPartitionedCoroutines(
+            apiDownloader.downloadPartitioned(
                 uids,
                 MAX_UID_LIST_SIZE,
                 handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt
index 648c0aa5b0..83048ad52d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.filters.internal.Where
@@ -36,13 +35,13 @@ import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import retrofit2.http.*
 
-internal interface ProgramStageWorkingListService {
+internal fun interface ProgramStageWorkingListService {
 
     @GET("programStageWorkingLists")
-    fun getProgramStageWorkingLists(
+    suspend fun getProgramStageWorkingLists(
         @Query("filter") @Where uids: Filter<ProgramStageWorkingList, String>,
         @Query("filter") accessDataReadFilter: String,
         @Query("fields") @Which fields: Fields<ProgramStageWorkingList>,
         @Query("paging") paging: Boolean,
-    ): Single<Payload<ProgramStageWorkingList>>
+    ): Payload<ProgramStageWorkingList>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index c5f42695f0..a3a7998100 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.relationship.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.resource.internal.Resource
@@ -41,9 +40,9 @@ internal class RelationshipTypeCall @Inject internal constructor(
     private val service: RelationshipTypeService,
     private val handler: RelationshipTypeHandler,
     private val apiDownloader: APIDownloader,
-) : ListCall<RelationshipType> {
+) : ListCallCoroutines<RelationshipType> {
     private val resourceType = Resource.Type.RELATIONSHIP_TYPE
-    override fun download(): Single<List<RelationshipType>> {
+    override suspend fun download(): List<RelationshipType> {
         return apiDownloader.downloadWithLastUpdated(
             handler,
             resourceType,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt
similarity index 76%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt
index 622da04183..8350578d42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt
@@ -25,26 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.relationship.internal;
+package org.hisp.dhis.android.core.relationship.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.relationship.RelationshipType;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface RelationshipTypeService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.relationship.RelationshipType
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal interface RelationshipTypeService {
     @GET("relationshipTypes")
-    Single<Payload<RelationshipType>> getRelationshipTypes(
-            @Query("fields") @Which Fields<RelationshipType> fields,
-            @Query("filter") @Where Filter<RelationshipType, String> lastUpdated,
-            @Query("filter") String accessDataReadFilter,
-            @Query("paging") Boolean paging
-    );
+    suspend fun getRelationshipTypes(
+        @Query("fields") @Which fields: Fields<RelationshipType>,
+        @Query("filter") @Where lastUpdated: Filter<RelationshipType, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<RelationshipType>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index aa126c4cea..6b0cabae50 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -40,7 +40,7 @@ internal class TrackedEntityAttributeCall @Inject internal constructor(
     private val apiDownloader: APIDownloader,
 ) : UidsCallCoroutines<TrackedEntityAttribute> {
     override suspend fun download(uids: Set<String>): List<TrackedEntityAttribute> {
-        return apiDownloader.downloadPartitionedCoroutines(
+        return apiDownloader.downloadPartitioned(
             uids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.kt
index 474b836a3f..f754090054 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeService.kt
@@ -25,28 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface TrackedEntityAttributeService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal fun interface TrackedEntityAttributeService {
     @GET("trackedEntityAttributes")
-    Single<Payload<TrackedEntityAttribute>> getTrackedEntityAttributes(
-            @NonNull @Query("fields") @Which Fields<TrackedEntityAttribute> fields,
-            @NonNull @Query("filter") @Where Filter<TrackedEntityAttribute, String> idFilter,
-            @NonNull @Query("paging") boolean paging
-    );
+    suspend fun getTrackedEntityAttributes(
+        @Query("fields") @Which fields: Fields<TrackedEntityAttribute>,
+        @Query("filter") @Where idFilter: Filter<TrackedEntityAttribute, String>,
+        @Query("paging") paging: Boolean,
+    ): Payload<TrackedEntityAttribute>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
index 8db605bca7..a55687acda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
@@ -47,7 +47,7 @@ class TrackedEntityInstanceFilterCall @Inject internal constructor(
         val accessDataReadFilter = "access." + DataAccessFields.read.eq(true).generateString()
 
         return if (versionManager.isGreaterOrEqualThan(DHISVersion.V2_38)) {
-            apiDownloader.downloadPartitionedCoroutines(
+            apiDownloader.downloadPartitioned(
                 uids,
                 MAX_UID_LIST_SIZE,
                 handler,
@@ -60,7 +60,7 @@ class TrackedEntityInstanceFilterCall @Inject internal constructor(
                 )
             }
         } else {
-            apiDownloader.downloadPartitionedCoroutines(
+            apiDownloader.downloadPartitioned(
                 uids,
                 MAX_UID_LIST_SIZE,
                 handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.kt
index 00107320c1..e34835bfa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterService.kt
@@ -25,32 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.internal;
+package org.hisp.dhis.android.core.trackedentity.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterAPI37;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterAPI37
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface TrackedEntityInstanceFilterService {
+internal interface TrackedEntityInstanceFilterService {
     @GET("trackedEntityInstanceFilters")
-    Single<Payload<TrackedEntityInstanceFilterAPI37>> getTrackedEntityInstanceFiltersAPI37(
-            @Query("filter") @Where Filter<TrackedEntityInstanceFilter, String> uids,
-            @Query("filter") String accessDataReadFilter,
-            @Query("fields") @Which Fields<TrackedEntityInstanceFilter> fields,
-            @Query("paging") Boolean paging);
+    suspend fun getTrackedEntityInstanceFiltersAPI37(
+        @Query("filter") @Where uids: Filter<TrackedEntityInstanceFilter, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("fields") @Which fields: Fields<TrackedEntityInstanceFilter>,
+        @Query("paging") paging: Boolean,
+    ): Payload<TrackedEntityInstanceFilterAPI37>
 
     @GET("trackedEntityInstanceFilters")
-    Single<Payload<TrackedEntityInstanceFilter>> getTrackedEntityInstanceFilters(
-            @Query("filter") @Where Filter<TrackedEntityInstanceFilter, String> uids,
-            @Query("filter") String accessDataReadFilter,
-            @Query("fields") @Which Fields<TrackedEntityInstanceFilter> fields,
-            @Query("paging") Boolean paging);
+    suspend fun getTrackedEntityInstanceFilters(
+        @Query("filter") @Where uids: Filter<TrackedEntityInstanceFilter, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("fields") @Which fields: Fields<TrackedEntityInstanceFilter>,
+        @Query("paging") paging: Boolean,
+    ): Payload<TrackedEntityInstanceFilter>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index 5fc4e8211d..7daf36f389 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -43,7 +43,7 @@ internal class TrackedEntityTypeCall @Inject internal constructor(
 ) : UidsCallCoroutines<TrackedEntityType> {
     override suspend fun download(optionSetUids: Set<String>): List<TrackedEntityType> {
         val accessDataReadFilter = "access.data." + DataAccessFields.read.eq(true).generateString()
-        return apiDownloader.downloadPartitionedCoroutines(
+        return apiDownloader.downloadPartitioned(
             optionSetUids,
             MAX_UID_LIST_SIZE,
             handler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.kt
index efc782ad57..49f705838b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeService.kt
@@ -25,29 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.trackedentity.internal
 
-package org.hisp.dhis.android.core.trackedentity.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityType;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface TrackedEntityTypeService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+internal fun interface TrackedEntityTypeService {
     @GET("trackedEntityTypes")
-    Single<Payload<TrackedEntityType>> getTrackedEntityTypes(
-            @NonNull @Query("fields") @Which Fields<TrackedEntityType> fields,
-            @NonNull @Query("filter") @Where Filter<TrackedEntityType, String> idFilter,
-            @NonNull @Query("filter") String accessDataReadFilter,
-            @NonNull @Query("paging") boolean paging
-    );
+    suspend fun getTrackedEntityTypes(
+        @Query("fields") @Which fields: Fields<TrackedEntityType>,
+        @Query("filter") @Where idFilter: Filter<TrackedEntityType, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<TrackedEntityType>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
index b3fa25ae9c..e6d4ebd138 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
@@ -44,7 +44,7 @@ import retrofit2.Retrofit
 internal class ValidationPackageDIModule {
     @Provides
     @Reusable
-    fun validationRuleUidsCall(impl: ValidationRuleUidsCallImpl): ValidationRuleUidsCall {
+    fun validationRuleUidsCall(impl: ValidationRuleUidsCallImpl): ValidationRuleUidsCallCoroutines {
         return impl
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index 1475c78223..4b5330d8f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -28,9 +28,8 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.ValidationRule
 import java.lang.Boolean
@@ -41,8 +40,8 @@ class ValidationRuleCall @Inject internal constructor(
     private val service: ValidationRuleService,
     private val handler: ValidationRuleHandler,
     private val apiDownloader: APIDownloader,
-) : UidsCall<ValidationRule> {
-    override fun download(validationRuleUids: Set<String>): Single<List<ValidationRule>> {
+) : UidsCallCoroutines<ValidationRule> {
+    override suspend fun download(validationRuleUids: Set<String>): List<ValidationRule> {
         return apiDownloader.downloadPartitioned(
             validationRuleUids,
             MAX_UID_LIST_SIZE,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleService.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleService.kt
similarity index 71%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleService.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleService.kt
index 511bfd5ddc..5307e208d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleService.kt
@@ -25,28 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.validation.internal;
+package org.hisp.dhis.android.core.validation.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.common.ObjectWithUid;
-import org.hisp.dhis.android.core.validation.ValidationRule;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.hisp.dhis.android.core.validation.ValidationRule
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-interface ValidationRuleService {
+internal interface ValidationRuleService {
     @GET("validationRules")
-    Single<Payload<ValidationRule>> getValidationRules(
-            @Query("fields") @Which Fields<ValidationRule> fields,
-            @Query("filter") String uidsFilterString,
-            @Query("paging") Boolean paging);
+    suspend fun getValidationRules(
+        @Query("fields") @Which fields: Fields<ValidationRule>,
+        @Query("filter") uidsFilterString: String,
+        @Query("paging") paging: Boolean?,
+    ): Payload<ValidationRule>
 
     @GET("validationRules")
-    Single<Payload<ObjectWithUid>> getDataSetValidationRuleUids(
-            @Query("dataSet") String dataSetUid,
-            @Query("fields") String id,
-            @Query("paging") Boolean paging);
-}
\ No newline at end of file
+    suspend fun getDataSetValidationRuleUids(
+        @Query("dataSet") dataSetUid: String,
+        @Query("fields") id: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<ObjectWithUid>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt
new file mode 100644
index 0000000000..bfb922f5a4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.validation.internal
+
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
+import org.hisp.dhis.android.core.common.ObjectWithUid
+
+/**
+ * TODO: Remove [ValidationRuleUidsCall]
+ */
+internal fun interface ValidationRuleUidsCallCoroutines : UidsCallCoroutines<ObjectWithUid>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index 3bee1d430d..f0d2655c97 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.validation.internal
 
 import dagger.Reusable
-import io.reactivex.Observable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -42,29 +40,25 @@ internal class ValidationRuleUidsCallImpl @Inject constructor(
     private val service: ValidationRuleService,
     private val linkHandler: DataSetValidationRuleLinkHandler,
     private val apiDownloader: APIDownloader,
-) : ValidationRuleUidsCall {
+) : ValidationRuleUidsCallCoroutines {
 
-    override fun download(uids: Set<String>): Single<List<ObjectWithUid>> {
-        return Observable.fromIterable(uids)
-            .flatMapSingle { dataSetUid: String ->
-                apiDownloader.downloadLink(
-                    dataSetUid,
-                    linkHandler,
-                    { _: String ->
-                        service.getDataSetValidationRuleUids(
-                            dataSetUid,
-                            BaseIdentifiableObject.UID,
-                            Boolean.FALSE,
-                        )
-                    },
-                ) { validationRule: ObjectWithUid ->
-                    DataSetValidationRuleLink.builder()
-                        .dataSet(dataSetUid)
-                        .validationRule(validationRule.uid()).build()
-                }
-            }
-            .reduce(ArrayList()) { items1: List<ObjectWithUid>, items2: List<ObjectWithUid> ->
-                items1 + items2 // Use the + operator to concatenate lists
+    override suspend fun download(uids: Set<String>): List<ObjectWithUid> {
+        return uids.flatMap {
+            apiDownloader.downloadLink(
+                it,
+                linkHandler,
+                {
+                    service.getDataSetValidationRuleUids(
+                        it,
+                        BaseIdentifiableObject.UID,
+                        Boolean.FALSE,
+                    )
+                },
+            ) { validationRule: ObjectWithUid ->
+                DataSetValidationRuleLink.builder()
+                    .dataSet(it)
+                    .validationRule(validationRule.uid()).build()
             }
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
index 7c2bd2ae3d..e02d6df891 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
@@ -28,10 +28,9 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import dagger.Reusable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
@@ -44,14 +43,14 @@ internal class VisualizationCall @Inject constructor(
     private val service: VisualizationService,
     private val dhis2VersionManager: DHISVersionManager,
     private val apiDownloader: APIDownloader,
-) : UidsCall<Visualization> {
+) : UidsCallCoroutines<Visualization> {
 
     companion object {
         // Workaround for DHIS2-15322. Force queries to entity endpoint instead of list endpoint.
         private const val MAX_UID_LIST_SIZE = 1
     }
 
-    override fun download(uids: Set<String>): Single<List<Visualization>> {
+    override suspend fun download(uids: Set<String>): List<Visualization> {
         val accessFilter = "access." + AccessFields.read.eq(true).generateString()
 
         return if (dhis2VersionManager.isGreaterOrEqualThan(DHISVersion.V2_34)) {
@@ -61,14 +60,17 @@ internal class VisualizationCall @Inject constructor(
                     MAX_UID_LIST_SIZE,
                     handler,
                 ) { partitionUids: Set<String> ->
-                    service.getSingleVisualization(
-                        partitionUids.first(),
-                        VisualizationFields.allFields,
-                        accessFilter = accessFilter,
-                        paging = false,
-                    )
-                        .map { Payload(listOf(it)) }
-                        .onErrorReturnItem(Payload())
+                    try {
+                        val visualization = service.getSingleVisualization(
+                            partitionUids.first(),
+                            VisualizationFields.allFields,
+                            accessFilter = accessFilter,
+                            paging = false,
+                        )
+                        Payload(listOf(visualization))
+                    } catch (e: Exception) {
+                        Payload()
+                    }
                 }
             } else {
                 apiDownloader.downloadPartitioned(
@@ -76,18 +78,21 @@ internal class VisualizationCall @Inject constructor(
                     MAX_UID_LIST_SIZE,
                     handler,
                 ) { partitionUids: Set<String> ->
-                    service.getSingleVisualizations36(
-                        partitionUids.first(),
-                        VisualizationFields.allFieldsAPI36,
-                        accessFilter = accessFilter,
-                        paging = false,
-                    )
-                        .map { Payload(listOf(it.toVisualization())) }
-                        .onErrorReturnItem(Payload())
+                    try {
+                        val visualization36 = service.getSingleVisualizations36(
+                            partitionUids.first(),
+                            VisualizationFields.allFieldsAPI36,
+                            accessFilter = accessFilter,
+                            paging = false,
+                        )
+                        Payload(listOf(visualization36.toVisualization()))
+                    } catch (e: Exception) {
+                        Payload()
+                    }
                 }
             }
         } else {
-            Single.just(listOf())
+            emptyList()
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index 0fa0a22bf0..7a60b497cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -42,6 +42,6 @@ internal class VisualizationModuleDownloader @Inject internal constructor(
 
     override suspend fun downloadMetadata(): List<Visualization> {
         val visualizations = analyticsDhisVisualizationStore.selectAll().map { it.uid() }.toSet()
-        return visualizationCall.download(visualizations).blockingGet()
+        return visualizationCall.download(visualizations)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt
index 7e29d5464b..311f5bc725 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationService.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Which
 import org.hisp.dhis.android.core.visualization.Visualization
@@ -39,20 +38,20 @@ import retrofit2.http.Query
 internal interface VisualizationService {
 
     @GET("$VISUALIZATIONS/{$VISUALIZATION_UID}")
-    fun getSingleVisualization(
+    suspend fun getSingleVisualization(
         @Path(VISUALIZATION_UID) uid: String,
         @Query("fields") @Which fields: Fields<Visualization>,
         @Query("filter") accessFilter: String,
         @Query("paging") paging: Boolean,
-    ): Single<Visualization>
+    ): Visualization
 
     @GET("$VISUALIZATIONS/{$VISUALIZATION_UID}")
-    fun getSingleVisualizations36(
+    suspend fun getSingleVisualizations36(
         @Path(VISUALIZATION_UID) uid: String,
         @Query("fields") @Which fields: Fields<Visualization>,
         @Query("filter") accessFilter: String,
         @Query("paging") paging: Boolean,
-    ): Single<VisualizationAPI36>
+    ): VisualizationAPI36
 
     companion object {
         const val VISUALIZATIONS = "visualizations"
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 75cfa3aa1f..70ef5dc445 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -128,17 +128,25 @@ class MetadataCallShould : BaseCallShould() {
         whenever(dataSetDownloader.downloadMetadata()).thenReturn(
             Completable.complete(),
         )
-        whenever(programIndicatorModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
+        programIndicatorModuleDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
         visualizationDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(emptyList())
         }
-        whenever(legendSetModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
-        whenever(expressionDimensIndicatorModuleDownloader.downloadMetadata()).thenReturn(Completable.complete())
+        legendSetModuleDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
+        expressionDimensIndicatorModuleDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
         constantDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(emptyList())
         }
         whenever(indicatorDownloader.downloadMetadata()).thenReturn(Completable.complete())
-        whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.complete())
+        categoryDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
         whenever(smsModule.configCase()).thenReturn(configCase)
         whenever(configCase.refreshMetadataIdsCallable()).thenReturn(Completable.complete())
         generalSettingCall.stub {
@@ -198,8 +206,8 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_category_download_call_fail() {
-        whenever(categoryDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
+    fun fail_when_category_download_call_fail() = runTest {
+        whenever(categoryDownloader.downloadMetadata()).doAnswer { throw networkError }
         downloadAndAssertError()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
index 2513a56f8c..5e7a55d4a7 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallShould.kt
@@ -37,7 +37,6 @@ import com.nhaarman.mockitokotlin2.same
 import com.nhaarman.mockitokotlin2.stub
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import io.reactivex.Single
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
@@ -55,7 +54,6 @@ import org.junit.runners.JUnit4
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
-
 class ProgramEndpointCallShould : BaseCallShould() {
 
     private val programService: ProgramService = mock()
@@ -64,7 +62,7 @@ class ProgramEndpointCallShould : BaseCallShould() {
     private val filterCaptor = argumentCaptor<Filter<Program, String>>()
     private val accesDataReadFilter = argumentCaptor<String>()
 
-    private val apiCall: Single<Payload<Program>> = Single.just(Payload.emptyPayload())
+    private val apiCall: Payload<Program> = Payload.emptyPayload()
 
     private val mockedApiDownloader: APIDownloader = mock()
 
@@ -77,7 +75,7 @@ class ProgramEndpointCallShould : BaseCallShould() {
         super.setUp()
         mockedApiDownloader.stub {
             onBlocking {
-                downloadPartitionedCoroutines(same(programUids), any(), any<Handler<Program>>(), any())
+                downloadPartitioned(same(programUids), any(), any<Handler<Program>>(), any())
             } doReturn programCallResult
         }
     }
@@ -90,7 +88,7 @@ class ProgramEndpointCallShould : BaseCallShould() {
             mockedApiDownloader,
         ).download(programUids)
 
-        verify(mockedApiDownloader).downloadPartitionedCoroutines(
+        verify(mockedApiDownloader).downloadPartitioned(
             same(programUids),
             any(),
             any<Handler<Program>>(),
@@ -106,7 +104,7 @@ class ProgramEndpointCallShould : BaseCallShould() {
                 filterCaptor.capture(),
                 accesDataReadFilter.capture(),
                 any(),
-            )
+            ),
         ).doReturn(apiCall)
 
         ProgramCall(
@@ -118,7 +116,5 @@ class ProgramEndpointCallShould : BaseCallShould() {
         assertThat(fieldsCaptor.firstValue).isEqualTo(ProgramFields.allFields)
         assertThat(filterCaptor.firstValue.values().iterator().next()).isEqualTo("programUid")
         assertThat(accesDataReadFilter.firstValue).isEqualTo("access.data.read:eq:true")
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index 93d5dac483..948c702032 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -30,6 +30,7 @@ package org.hisp.dhis.android.core.program.internal
 import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.stub
 import com.nhaarman.mockitokotlin2.whenever
 import io.reactivex.Single
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -97,14 +98,16 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         returnSingletonList(trackedEntityTypeCall, trackedEntityType)
         returnSingletonList(trackedEntityAttributeCall, trackedEntityAttribute)
         returnSingletonList(programCall, program)
-        whenever(relationshipTypeCall.download()).doReturn(Single.just(emptyList()))
-        returnEmptyList(optionSetCall)
-        returnEmptyList(optionCall)
-        returnEmptyList(optionGroupCall)
+        relationshipTypeCall.stub {
+            onBlocking { download() } doReturn emptyList()
+        }
+        returnEmptyListCoroutines(optionSetCall)
+        returnEmptyListCoroutines(optionCall)
+        returnEmptyListCoroutines(optionGroupCall)
         returnEmptyListCoroutines(trackedEntityInstanceFilterCall)
         returnEmptyListCoroutines(eventFilterCall)
         returnEmptyListCoroutines(programStageWorkingListCall)
-        returnEmptyList(programRuleCall)
+        returnEmptyListCoroutines(programRuleCall)
         returnEmptyListCoroutines(programStageCall)
         programModuleDownloader = ProgramModuleDownloader(
             programCall,
@@ -163,7 +166,7 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
 
     @Test(expected = Exception::class)
     fun fail_when_program_rule_call_fails() = runTest {
-        returnError(programRuleCall)
+        returnErrorCoroutines(programRuleCall)
         programModuleDownloader.downloadMetadata()
     }
 
@@ -197,15 +200,16 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         programModuleDownloader.downloadMetadata()
     }
 
+    @Suppress("TooGenericExceptionThrown")
     @Test(expected = Exception::class)
     fun fail_when_relationship_type_call_fails() = runTest {
-        whenever(relationshipTypeCall.download()).thenReturn(Single.error(RuntimeException()))
+        whenever(relationshipTypeCall.download()).doAnswer { throw RuntimeException() }
         programModuleDownloader.downloadMetadata()
     }
 
     @Test(expected = Exception::class)
     fun fail_when_option_call_fails() = runTest {
-        returnError(optionCall)
+        returnErrorCoroutines(optionCall)
         programModuleDownloader.downloadMetadata()
     }
 }

From ba06efe0b9709b4620436e121523940a573d5e4c Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 16 Oct 2023 16:11:24 +0200
Subject: [PATCH 425/478] [ANDROSDK-1756] refactor: - Migrated rest of calls to
 coroutines

fix:
- Instrumented tests
---
 .../internal/CategoryEndpointCallShould.kt    |  5 +-
 .../android/core/option/OptionCallShould.kt   | 47 ++++++++++---------
 .../core/option/OptionSetCallShould.kt        | 28 ++++++-----
 .../VisualizationEndpointCallShould.kt        | 34 ++++----------
 .../internal/CategoryModuleDownloader.kt      | 21 ++++-----
 .../internal/CategoryOptionService.kt         |  2 +-
 .../internal/ProgramModuleDownloader.kt       |  1 +
 .../internal/RelationshipTypeService.kt       |  4 +-
 .../ValidationRuleUidsCallCoroutines.kt       |  3 --
 .../internal/VisualizationCall.kt             |  4 +-
 .../internal/ProgramModuleDownloaderShould.kt | 10 ----
 11 files changed, 67 insertions(+), 92 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
index 6ad5086c89..8eaff79549 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
@@ -28,18 +28,21 @@
 package org.hisp.dhis.android.core.category.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
 import org.junit.Test
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class CategoryEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     @Test
     fun download_category_successfully() = runTest {
+        dhis2MockServer.enqueueMockResponse("category/categories.json")
+
         val categoriesSingle = objects.d2DIComponent.internalModules().category.categoryCall.download(
             setOf("vGs6omsRekv", "KfdsGBcoiCa", "cX5k9anHEHd", "x3uo8LqiTBk"),
         )
-        dhis2MockServer.enqueueMockResponse("category/categories.json")
 
         val categories = categoriesSingle
         assertThat(categories.isEmpty()).isFalse()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
index 867bb51010..b3efbb5678 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
@@ -29,9 +29,9 @@ package org.hisp.dhis.android.core.option
 
 import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
@@ -39,31 +39,33 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(AndroidJUnit4::class)
 class OptionCallShould : BaseMockIntegrationTestEmptyEnqueable() {
-    private var optionCall: List<Option>? = null
-    private var d2CallExecutor: D2CallExecutor? = null
+    private lateinit var optionCall: suspend () -> List<Option>
+    private lateinit var coroutineAPICallExecutor: CoroutineAPICallExecutor
 
     @Before
     @Throws(Exception::class)
     fun setUp() {
         dhis2MockServer.enqueueMockResponse("option/option_sets.json")
         dhis2MockServer.enqueueMockResponse("option/options.json")
-        val uids: MutableSet<String> = HashSet()
-        uids.add("Y1ILwhy5VDY")
-        uids.add("egT1YqFWsVk")
-        uids.add("non_existent_option_uid")
-        uids.add("Z1ILwhy5VDY")
-        runBlocking {
-            optionCall = objects.d2DIComponent.optionCall().download(uids)
-        }
-        d2CallExecutor = D2CallExecutor.create(databaseAdapter)
+        val uids = hashSetOf(
+            "Y1ILwhy5VDY",
+            "egT1YqFWsVk",
+            "non_existent_option_uid",
+            "Z1ILwhy5VDY",
+        )
+
+        optionCall = { objects.d2DIComponent.optionCall().download(uids) }
+
+        coroutineAPICallExecutor = objects.d2DIComponent.coroutineApiCallExecutor()
         executeOptionSetCall()
     }
 
     @Test
     @Throws(Exception::class)
-    fun persist_options_in_data_base_when_call() {
+    fun persist_options_in_data_base_when_call() = runTest {
         executeOptionCall()
         val options = d2.optionModule().options()
         Truth.assertThat(options.blockingCount()).isEqualTo(3)
@@ -75,7 +77,7 @@ class OptionCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     @Test
     @Throws(Exception::class)
-    fun return_options_after_call() {
+    fun return_options_after_call() = runTest {
         val optionList = executeOptionCall()
         Truth.assertThat(optionList!!.size).isEqualTo(4)
         val option = optionList[0]
@@ -95,27 +97,26 @@ class OptionCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     @Throws(Exception::class)
     private fun executeOptionSetCall() = runTest {
-        d2CallExecutor!!.executeD2CallTransactionally<List<OptionSet>> {
+        coroutineAPICallExecutor.wrapTransactionally<List<OptionSet>> {
             var optionSets: List<OptionSet>? = null
             try {
                 val uids: MutableSet<String> = HashSet()
                 uids.add("POc7DkGU3QU")
-                runBlocking {
-                    optionSets = objects.d2DIComponent.optionSetCall().download(uids)
-                }
+
+                optionSets = objects.d2DIComponent.optionSetCall().download(uids)
             } catch (ignored: Exception) {
             }
             ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
-            optionSets
+            optionSets!!
         }
     }
 
     @Throws(Exception::class)
-    private fun executeOptionCall(): List<Option>? {
-        return d2CallExecutor!!.executeD2CallTransactionally {
+    private suspend fun executeOptionCall(): List<Option>? {
+        return coroutineAPICallExecutor.wrapTransactionally {
             var options: List<Option>? = null
             try {
-                options = optionCall!!
+                options = optionCall.invoke()
             } catch (ignored: Exception) {
             }
             ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
index 785f0fa2ca..9ca71cf65c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
@@ -29,8 +29,9 @@ package org.hisp.dhis.android.core.option
 
 import androidx.test.runner.AndroidJUnit4
 import com.google.common.truth.Truth
-import kotlinx.coroutines.runBlocking
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.maintenance.D2Error
@@ -40,10 +41,11 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(AndroidJUnit4::class)
 class OptionSetCallShould : BaseMockIntegrationTestEmptyEnqueable() {
-    private var optionSetCall: List<OptionSet>? = null
-    private var d2CallExecutor: D2CallExecutor? = null
+    private lateinit var optionSetCall: suspend () -> List<OptionSet>
+    private lateinit var coroutineAPICallExecutor: CoroutineAPICallExecutor
 
     @Before
     @Throws(D2Error::class)
@@ -51,15 +53,15 @@ class OptionSetCallShould : BaseMockIntegrationTestEmptyEnqueable() {
         dhis2MockServer.enqueueMockResponse("option/option_sets.json")
         val uids: MutableSet<String> = HashSet()
         uids.add("POc7DkGU3QU")
-        runBlocking {
-            optionSetCall = objects.d2DIComponent.optionSetCall().download(uids)
-        }
-        d2CallExecutor = D2CallExecutor.create(databaseAdapter)
+
+        optionSetCall = { objects.d2DIComponent.optionSetCall().download(uids) }
+
+        coroutineAPICallExecutor = objects.d2DIComponent.coroutineApiCallExecutor()
     }
 
     @Test
     @Throws(Exception::class)
-    fun persist_option_sets_in_data_base_when_call() {
+    fun persist_option_sets_in_data_base_when_call() = runTest {
         executeOptionSetCall()
         val optionSets = d2.optionModule().optionSets()
         Truth.assertThat(optionSets.blockingCount()).isEqualTo(2)
@@ -69,7 +71,7 @@ class OptionSetCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     @Test
     @Throws(Exception::class)
-    fun return_option_set_after_call() {
+    fun return_option_set_after_call() = runTest {
         val optionSetList = executeOptionSetCall()
         Truth.assertThat(optionSetList!!.size).isEqualTo(2)
         val optionSet = optionSetList[0]
@@ -88,11 +90,11 @@ class OptionSetCallShould : BaseMockIntegrationTestEmptyEnqueable() {
     }
 
     @Throws(Exception::class)
-    private fun executeOptionSetCall(): List<OptionSet>? {
-        return d2CallExecutor!!.executeD2CallTransactionally {
+    private suspend fun executeOptionSetCall(): List<OptionSet>? {
+        return coroutineAPICallExecutor.wrapTransactionally {
             var optionSets: List<OptionSet>? = null
             try {
-                optionSets = optionSetCall!!
+                optionSets = optionSetCall.invoke()
             } catch (ignored: Exception) {
             }
             ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
index 9d07b1c2ac..2f8f87666e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
@@ -29,38 +29,19 @@ package org.hisp.dhis.android.core.visualization.internal
 
 import com.google.common.collect.Lists
 import com.google.common.truth.Truth
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
-import org.hisp.dhis.android.core.visualization.Visualization
-import org.junit.BeforeClass
 import org.junit.Test
 import org.junit.runner.RunWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(D2JunitRunner::class)
 class VisualizationEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable() {
 
-    companion object {
-        private lateinit var visualizationsSingle: List<Visualization>
-
-        @BeforeClass
-        @JvmStatic
-        @Throws(Exception::class)
-        internal fun setUpClass() {
-            BaseMockIntegrationTestEmptyEnqueable.setUpClass()
-
-            runBlocking {
-                visualizationsSingle = objects.d2DIComponent.internalModules().visualization.visualizationCall.download(
-                    HashSet(
-                        Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe"),
-                    ),
-                )
-            }
-        }
-    }
-
     @Test
-    fun download_persist_and_get_visualizations_successfully() {
+    fun download_persist_and_get_visualizations_successfully() = runTest {
         if (d2.userModule().blockingIsLogged()) {
             d2.userModule().blockingLogOut()
         }
@@ -72,7 +53,12 @@ class VisualizationEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable()
         dhis2MockServer.enqueueMockResponse("visualization/visualizations_2.json")
         d2.databaseAdapter().setForeignKeyConstraintsEnabled(false)
 
-        var visualizations = visualizationsSingle
+        var visualizations = objects.d2DIComponent.internalModules().visualization.visualizationCall.download(
+            HashSet(
+                Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe"),
+            ),
+        )
+
         Truth.assertThat(visualizations.isEmpty()).isFalse()
         visualizations = d2.visualizationModule().visualizations().blockingGet()
         Truth.assertThat(visualizations.isEmpty()).isFalse()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 21e45328e6..0d33a82892 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -43,18 +43,13 @@ class CategoryModuleDownloader @Inject internal constructor(
 ) : UntypedModuleDownloaderCoroutines {
 
     override suspend fun downloadMetadata() {
-        categoryComboUidsSeeker.seekUids().let { uids ->
-            categoryComboCall.download(uids).let { comboUids ->
-                CategoryParentUidsHelper.getCategoryUids(comboUids).let { categoryUids ->
-                    categoryCall.download(categoryUids).let { categories ->
-                        categoryOptionCall.download(categoryUids).also { categoryOptions ->
-                            categoryCategoryOptionLinkPersistor.handleMany(categories, categoryOptions)
-                            categoryOptionOrganisationUnitsCall.download(categoryOptions.map { it.uid() }.toSet())
-                            categoryOptionComboIntegrityChecker.removeIncompleteCategoryOptionCombos()
-                        }
-                    }
-                }
-            }
-        }
+        val uids = categoryComboUidsSeeker.seekUids()
+        val comboUids = categoryComboCall.download(uids)
+        val categoryUids = CategoryParentUidsHelper.getCategoryUids(comboUids)
+        val categories = categoryCall.download(categoryUids)
+        val categoryOptions = categoryOptionCall.download(categoryUids)
+        categoryCategoryOptionLinkPersistor.handleMany(categories, categoryOptions)
+        categoryOptionOrganisationUnitsCall.download(categoryOptions.map { it.uid() }.toSet())
+        categoryOptionComboIntegrityChecker.removeIncompleteCategoryOptionCombos()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
index c4af0dd82a..8f523268cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionService.kt
@@ -46,7 +46,7 @@ internal interface CategoryOptionService {
     ): Payload<CategoryOption>
 
     @GET("categoryOptions/orgUnits")
-    fun getCategoryOptionOrgUnits(
+    suspend fun getCategoryOptionOrgUnits(
         @Query("categoryOptions") categoryOptions: String,
     ): CategoryOptionOrganisationUnits
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 09c5ef56b4..6fa40aef83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -81,6 +81,7 @@ internal class ProgramModuleDownloader @Inject constructor(
             attributes,
             programStages,
         )
+
         programRuleCall.download(programUids)
         relationshipTypeCall.download()
         optionSetCall.download(optionSetUids)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt
index 8350578d42..0d274b88a6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeService.kt
@@ -36,11 +36,11 @@ import org.hisp.dhis.android.core.relationship.RelationshipType
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-internal interface RelationshipTypeService {
+internal fun interface RelationshipTypeService {
     @GET("relationshipTypes")
     suspend fun getRelationshipTypes(
         @Query("fields") @Which fields: Fields<RelationshipType>,
-        @Query("filter") @Where lastUpdated: Filter<RelationshipType, String>,
+        @Query("filter") @Where lastUpdated: Filter<RelationshipType, String>?,
         @Query("filter") accessDataReadFilter: String,
         @Query("paging") paging: Boolean,
     ): Payload<RelationshipType>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt
index bfb922f5a4..735a1bfcad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallCoroutines.kt
@@ -31,7 +31,4 @@ package org.hisp.dhis.android.core.validation.internal
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 
-/**
- * TODO: Remove [ValidationRuleUidsCall]
- */
 internal fun interface ValidationRuleUidsCallCoroutines : UidsCallCoroutines<ObjectWithUid>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
index e02d6df891..7470340c2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
@@ -68,7 +68,7 @@ internal class VisualizationCall @Inject constructor(
                             paging = false,
                         )
                         Payload(listOf(visualization))
-                    } catch (e: Exception) {
+                    } catch (ignored: Exception) {
                         Payload()
                     }
                 }
@@ -86,7 +86,7 @@ internal class VisualizationCall @Inject constructor(
                             paging = false,
                         )
                         Payload(listOf(visualization36.toVisualization()))
-                    } catch (e: Exception) {
+                    } catch (ignored: Exception) {
                         Payload()
                     }
                 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
index 948c702032..8f4f487b58 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloaderShould.kt
@@ -32,12 +32,10 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.stub
 import com.nhaarman.mockitokotlin2.whenever
-import io.reactivex.Single
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.ResponseBody
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -126,10 +124,6 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         )
     }
 
-    private fun returnEmptyList(call: UidsCall<*>?) {
-        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.just(emptyList()))
-    }
-
     private fun returnEmptyListCoroutines(call: UidsCallCoroutines<*>?) = runTest {
         whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(emptyList())
     }
@@ -138,10 +132,6 @@ class ProgramModuleDownloaderShould : BaseCallShould() {
         whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(listOf(o))
     }
 
-    private fun returnError(call: UidsCall<*>?) {
-        whenever(call!!.download(ArgumentMatchers.anySet())).doReturn(Single.error(RuntimeException()))
-    }
-
     @Suppress("TooGenericExceptionThrown")
     private fun returnErrorCoroutines(call: UidsCallCoroutines<*>?) = runTest {
         whenever(call!!.download(ArgumentMatchers.anySet())).doAnswer { throw RuntimeException() }

From 5ad94894ccfcb380857f809ef455f86026b6b0b5 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 17 Oct 2023 09:29:30 +0200
Subject: [PATCH 426/478] [ANDROSDK-1756] style: - Remove TODOs

---
 .../core/arch/api/executors/internal/APIDownloaderImpl.kt   | 1 -
 .../hisp/dhis/android/core/program/internal/ProgramCall.kt  | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index a6e9694c83..b025af9ec3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -105,7 +105,6 @@ internal class APIDownloaderImpl @Inject constructor(private val resourceHandler
         return results
     }
 
-    // TODO : remove the Single making sure it is not needed by the callers
     private suspend fun <P, O> downloadPartitionedWithCustomHandling(
         uids: Set<String>,
         pageSize: Int,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 4808a9ae35..5631c49aa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.program.internal
 
 import dagger.Reusable
-import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
@@ -58,11 +57,6 @@ internal class ProgramCall @Inject internal constructor(
         }
     }
 
-    // TODO : remove this fun and refactor ProgramEndpointCallShould to Kotlin
-    fun coroutineEncapsulationForJavaTest(uids: Set<String>): List<Program> = runBlocking {
-        download(uids)
-    }
-
     companion object {
         private const val MAX_UID_LIST_SIZE = 50
     }

From ba7790f046348c664ee17f026a9a5de3cc4f10a1 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 17 Oct 2023 09:41:12 +0200
Subject: [PATCH 427/478] [ANDROSDK-1756] style: - Remove non nulls - Remove
 Java's Boolean

---
 .../android/core/program/internal/ProgramStageService.kt  | 8 ++++----
 .../validation/internal/ValidationRuleUidsCallImpl.kt     | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt
index 7cc0ac0d56..e64e5c35d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageService.kt
@@ -37,9 +37,9 @@ import retrofit2.http.Query
 internal fun interface ProgramStageService {
     @GET("programStages")
     suspend fun getProgramStages(
-        @Query("fields") @Which fields: Fields<ProgramStage?>?,
-        @Query("filter") programUidsFilterString: String?,
-        @Query("filter") accessDataReadFilter: String?,
-        @Query("paging") paging: Boolean?,
+        @Query("fields") @Which fields: Fields<ProgramStage>,
+        @Query("filter") programUidsFilterString: String,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("paging") paging: Boolean,
     ): Payload<ProgramStage>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index f0d2655c97..54f538088b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -32,7 +32,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
-import java.lang.Boolean
 import javax.inject.Inject
 
 @Reusable
@@ -51,7 +50,7 @@ internal class ValidationRuleUidsCallImpl @Inject constructor(
                     service.getDataSetValidationRuleUids(
                         it,
                         BaseIdentifiableObject.UID,
-                        Boolean.FALSE,
+                        false,
                     )
                 },
             ) { validationRule: ObjectWithUid ->

From 69795aa5764b80fd00c7bf17dd30a4a947e0e67a Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 17 Oct 2023 12:41:33 +0200
Subject: [PATCH 428/478] [ANDROSDK-1749] Fix test

---
 ...yInstanceServiceMockIntegrationShould.java | 64 ++++++++++++++-----
 .../TrackedEntityInstanceService.java         |  7 +-
 2 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java
index 5ca9b4340b..cca491ed13 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/TrackedEntityInstanceServiceMockIntegrationShould.java
@@ -30,8 +30,16 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper.getFileResourceDirectory;
+import static org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.writeInputStream;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.hisp.dhis.android.core.data.fileresource.RandomGeneratedInputStream;
+import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection;
 import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection;
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
@@ -39,42 +47,64 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.File;
+import java.io.InputStream;
+
 @RunWith(D2JunitRunner.class)
 public class TrackedEntityInstanceServiceMockIntegrationShould extends BaseMockIntegrationTestFullDispatcher {
 
     @Test
     public void inherit_attributes() throws D2Error {
-        String fromTeiUid = "nWrB0TfWlvh";
+        File file = storeFile("to_inherit_file");
+
+        String fromTeiUid = d2.trackedEntityModule().trackedEntityInstances().blockingAdd(
+                TrackedEntityInstanceCreateProjection.create("DiszpKrYNg8", "nEenWmSyUEp")
+        );
+
+        d2.enrollmentModule().enrollments().blockingAdd(
+                EnrollmentCreateProjection.create("DiszpKrYNg8", "IpHINAT79UW", fromTeiUid)
+        );
+
+        d2.trackedEntityModule().trackedEntityAttributeValues().value("cejWyOfXge6", fromTeiUid)
+                .blockingSet("value1");
+
+        String fileResourceUid = d2.fileResourceModule().fileResources().blockingAdd(file);
+
+        d2.trackedEntityModule().trackedEntityAttributeValues().value("aejWyOfXge6", fromTeiUid)
+                .blockingSet(fileResourceUid);
 
-        String newTeiUid = d2.trackedEntityModule().trackedEntityInstances().blockingAdd(
+
+        String toTeiUid = d2.trackedEntityModule().trackedEntityInstances().blockingAdd(
                 TrackedEntityInstanceCreateProjection.create("DiszpKrYNg8", "nEenWmSyUEp")
         );
 
         d2.trackedEntityModule().trackedEntityInstanceService()
-                .blockingInheritAttributes(fromTeiUid, newTeiUid,"IpHINAT79UW");
+                .blockingInheritAttributes(fromTeiUid, toTeiUid,"IpHINAT79UW");
 
-        TrackedEntityInstance fromTEI = d2.trackedEntityModule().trackedEntityInstances().withTrackedEntityAttributeValues()
+        TrackedEntityInstance fromTEI = d2.trackedEntityModule().trackedEntityInstances()
+                .withTrackedEntityAttributeValues()
                 .uid(fromTeiUid).blockingGet();
 
-        TrackedEntityInstance newTEI = d2.trackedEntityModule().trackedEntityInstances().withTrackedEntityAttributeValues()
-                .uid(newTeiUid).blockingGet();
+        TrackedEntityInstance newTEI = d2.trackedEntityModule().trackedEntityInstances()
+                .withTrackedEntityAttributeValues()
+                .uid(toTeiUid).blockingGet();
 
-        // Not equal because is an attribute with IMAGE value type
+        // NOT equal because is an attribute with IMAGE value type
         assertThat(fromTEI.trackedEntityAttributeValues().get(0).value())
                 .isNotEqualTo(newTEI.trackedEntityAttributeValues().get(0).value());
+
         // Equal because is not FILE or IMAGE value type
         assertThat(fromTEI.trackedEntityAttributeValues().get(1).value())
                 .isEqualTo(newTEI.trackedEntityAttributeValues().get(1).value());
 
+        d2.trackedEntityModule().trackedEntityInstances().uid(fromTeiUid).blockingDeleteIfExist();
+        d2.trackedEntityModule().trackedEntityInstances().uid(toTeiUid).blockingDeleteIfExist();
+    }
 
-        // Remove TEI and attribute values
-        for (TrackedEntityAttributeValue teaValue : d2.trackedEntityModule().trackedEntityAttributeValues()
-                .byTrackedEntityInstance().eq(newTeiUid).blockingGet()) {
-            d2.trackedEntityModule().trackedEntityAttributeValues()
-                    .value(teaValue.trackedEntityAttribute(), teaValue.trackedEntityInstance())
-                    .blockingDeleteIfExist();
-        }
-
-        d2.trackedEntityModule().trackedEntityInstances().uid(newTeiUid).blockingDeleteIfExist();
+    private File storeFile(String fileName) {
+        InputStream inputStream  = new RandomGeneratedInputStream(1024);
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        File destinationFile = new File(getFileResourceDirectory(context), fileName + ".png");
+        return writeInputStream(inputStream, destinationFile, 1024);
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
index 9735f808dc..030b4db883 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
@@ -30,9 +30,7 @@
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
 import org.hisp.dhis.android.core.common.Unit;
 import org.hisp.dhis.android.core.common.ValueType;
-import org.hisp.dhis.android.core.fileresource.FileResource;
 import org.hisp.dhis.android.core.fileresource.FileResourceCollectionRepository;
-import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil;
 import org.hisp.dhis.android.core.maintenance.D2Error;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute;
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeCollectionRepository;
@@ -74,7 +72,7 @@ public class TrackedEntityInstanceService {
      * {@link #inheritAttributes(String, String, String)}.
      *
      * @param fromTeiUid TrackedEntityInstance to inherit values from.
-     * @param toTeiUid TrackedEntityInstance that receive the inherited values.
+     * @param toTeiUid   TrackedEntityInstance that receive the inherited values.
      * @param programUid Only attributes associated to this program will be inherited.
      * @return Unit
      */
@@ -106,6 +104,7 @@ public Unit blockingInheritAttributes(String fromTeiUid, String toTeiUid, String
                             attributeValue.trackedEntityAttribute()).blockingGet();
 
                     if (attribute.valueType() == ValueType.IMAGE || attribute.valueType() == ValueType.FILE_RESOURCE) {
+
                         File file = new File(fileResourceCollectionRepository.uid(attributeValue.value())
                                 .blockingGet().path());
 
@@ -132,7 +131,7 @@ public Unit blockingInheritAttributes(String fromTeiUid, String toTeiUid, String
      * relationships. Inherited values are persisted in database.
      *
      * @param fromTeiUid TrackedEntityInstance to inherit values from.
-     * @param toTeiUid TrackedEntityInstance that receive the inherited values.
+     * @param toTeiUid   TrackedEntityInstance that receive the inherited values.
      * @param programUid Only attributes associated to this program will be inherited.
      * @return Unit
      */

From f6ee5fad9b98fdbce8265a24c8089286b5804e67 Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Tue, 17 Oct 2023 14:57:38 +0200
Subject: [PATCH 429/478] [ANDROSDK-1749] PMD

---
 .../TrackedEntityInstanceService.java         | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
index 030b4db883..1946cad142 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
@@ -99,30 +99,33 @@ public Unit blockingInheritAttributes(String fromTeiUid, String toTeiUid, String
 
             if (!fromTeiAttributes.isEmpty()) {
                 for (TrackedEntityAttributeValue attributeValue : fromTeiAttributes) {
+                    inheritAttribute(attributeValue, toTeiUid);
+                }
+            }
+        }
+
+        return new Unit();
+    }
 
-                    TrackedEntityAttribute attribute = trackedEntityAttributeRepository.uid(
-                            attributeValue.trackedEntityAttribute()).blockingGet();
+    private void inheritAttribute(TrackedEntityAttributeValue attributeValue, String toTeiUid) throws D2Error {
+        TrackedEntityAttribute attribute = trackedEntityAttributeRepository.uid(
+                attributeValue.trackedEntityAttribute()).blockingGet();
 
-                    if (attribute.valueType() == ValueType.IMAGE || attribute.valueType() == ValueType.FILE_RESOURCE) {
+        if (attribute.valueType() == ValueType.IMAGE || attribute.valueType() == ValueType.FILE_RESOURCE) {
 
-                        File file = new File(fileResourceCollectionRepository.uid(attributeValue.value())
-                                .blockingGet().path());
+            File file = new File(fileResourceCollectionRepository.uid(attributeValue.value())
+                    .blockingGet().path());
 
-                        String newFileResourceId = fileResourceCollectionRepository.blockingAdd(file);
+            String newFileResourceId = fileResourceCollectionRepository.blockingAdd(file);
 
-                        trackedEntityAttributeValueRepository
-                                .value(attributeValue.trackedEntityAttribute(), toTeiUid)
-                                .blockingSet(newFileResourceId);
-                    } else {
-                        trackedEntityAttributeValueRepository
-                                .value(attributeValue.trackedEntityAttribute(), toTeiUid)
-                                .blockingSet(attributeValue.value());
-                    }
-                }
-            }
+            trackedEntityAttributeValueRepository
+                    .value(attributeValue.trackedEntityAttribute(), toTeiUid)
+                    .blockingSet(newFileResourceId);
+        } else {
+            trackedEntityAttributeValueRepository
+                    .value(attributeValue.trackedEntityAttribute(), toTeiUid)
+                    .blockingSet(attributeValue.value());
         }
-
-        return new Unit();
     }
 
     /**

From df423de69e424b9c570710c8743fc8ad27d4c9c2 Mon Sep 17 00:00:00 2001
From: dhis2-bot <apps@dhis2.org>
Date: Tue, 17 Oct 2023 23:26:49 +0000
Subject: [PATCH 430/478] fix(translations): sync translations from transifex
 (develop)

---
 core/src/main/res/values-uz/strings.xml | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 core/src/main/res/values-uz/strings.xml

diff --git a/core/src/main/res/values-uz/strings.xml b/core/src/main/res/values-uz/strings.xml
new file mode 100644
index 0000000000..e59165d17d
--- /dev/null
+++ b/core/src/main/res/values-uz/strings.xml
@@ -0,0 +1,37 @@
+<!--
+  ~  Copyright (c) 2004-2023, University of Oslo
+  ~  All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~  Redistributions of source code must retain the above copyright notice, this
+  ~  list of conditions and the following disclaimer.
+  ~
+  ~  Redistributions in binary form must reproduce the above copyright notice,
+  ~  this list of conditions and the following disclaimer in the documentation
+  ~  and/or other materials provided with the distribution.
+  ~  Neither the name of the HISP project nor the names of its contributors may
+  ~  be used to endorse or promote products derived from this software without
+  ~  specific prior written permission.
+  ~
+  ~  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ~  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  ~  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+  ~  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  ~  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  ~  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  ~  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  ~  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<resources>
+    <!-- Tracker import errors -->
+    <string name="E1000">Кириш рухсатига эга эмассиз%s</string>
+    <string name="E1001">Бу ерга кириш рухсатига эга эмассиз%s</string>
+    <string name="E1002">%s аллақачон мавжуд. (%s: %s)</string>
+    <string name="E1003">%s сиз излаётган майдондан ташқарида</string>
+    <string name="E1005">%s тури топилмади</string>
+    <string name="E1006">Атрибут %s мавжуд эмас</string>
+    </resources>
\ No newline at end of file

From b75afb660c46de255d5693fb31b2cdf23df89b1d Mon Sep 17 00:00:00 2001
From: Marcos Campos <marcamsn@gmail.com>
Date: Wed, 18 Oct 2023 10:10:30 +0200
Subject: [PATCH 431/478] [ANDROSDK-1743-B] Not filter null values when
 returning attribute values

---
 .../search/TrackedEntitySearchItemHelper.kt   | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
index 6995e3381d..4014376083 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchItemHelper.kt
@@ -75,7 +75,7 @@ object TrackedEntitySearchItemHelper {
         attributes: List<SimpleTrackedEntityAttribute>,
         attributeValues: List<TrackedEntityAttributeValue>?,
     ): List<TrackedEntitySearchItemAttribute> {
-        return attributes.mapNotNull { attribute ->
+        return attributes.map { attribute ->
             from(attribute, attributeValues)
         }
     }
@@ -83,20 +83,19 @@ object TrackedEntitySearchItemHelper {
     private fun from(
         attribute: SimpleTrackedEntityAttribute,
         attributeValues: List<TrackedEntityAttributeValue>?,
-    ): TrackedEntitySearchItemAttribute? {
-        return attributeValues?.find { it.trackedEntityAttribute() == attribute.attribute }?.let { value ->
-            TrackedEntitySearchItemAttribute(
-                attribute = attribute.attribute,
-                displayName = attribute.displayName,
-                displayFormName = attribute.displayFormName ?: attribute.displayName,
-                value = value.value(),
-                created = value.created(),
-                lastUpdated = value.lastUpdated(),
-                valueType = attribute.valueType,
-                displayInList = attribute.displayInList,
-                optionSet = attribute.optionSet,
-            )
-        }
+    ): TrackedEntitySearchItemAttribute {
+        val value = attributeValues?.find { it.trackedEntityAttribute() == attribute.attribute }
+        return TrackedEntitySearchItemAttribute(
+            attribute = attribute.attribute,
+            displayName = attribute.displayName,
+            displayFormName = attribute.displayFormName ?: attribute.displayName,
+            value = value?.value(),
+            created = value?.created(),
+            lastUpdated = value?.lastUpdated(),
+            valueType = attribute.valueType,
+            displayInList = attribute.displayInList,
+            optionSet = attribute.optionSet,
+        )
     }
 
     private fun toTrackedEntityAttributeValue(a: TrackedEntitySearchItemAttribute): TrackedEntityAttributeValue {

From b351fb9e6cd2b5b336eb5b94dd66b064b350d15f Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 10 Oct 2023 10:59:58 +0200
Subject: [PATCH 432/478] [ANDROSDK-1699] Replace Dagger by Koin

---
 build.gradle.kts                              |   2 +-
 core/build.gradle.kts                         |  14 +-
 .../core/MockIntegrationTestObjects.kt        |   9 +-
 .../core/MultiUserMockIntegrationShould.kt    |   3 +-
 .../BaseEvaluatorIntegrationShould.kt         |   2 -
 .../collection/PagingMockIntegrationShould.kt |   2 +-
 ...llectionRepositoryImplIntegrationShould.kt |   2 +-
 ...llectionRepositoryImplIntegrationShould.kt |   4 +-
 ...yComboEndpointCallRealIntegrationShould.kt |   4 +-
 ...tegoryEndpointCallRealIntegrationShould.kt |   2 +-
 .../internal/CategoryEndpointCallShould.kt    |   2 +-
 ...lementEndpointCallRealIntegrationShould.kt |   2 +-
 ...ataSetEndpointCallRealIntegrationShould.kt |   2 +-
 .../android/core/option/OptionCallShould.java |   0
 .../android/core/option/OptionCallShould.kt   |   6 +-
 .../core/option/OptionSetCallShould.java      |   0
 .../core/option/OptionSetCallShould.kt        |   4 +-
 ...ganisationUnitCallMockIntegrationShould.kt |  16 +-
 ...d.java => PeriodStoreIntegrationShould.kt} |  77 +++---
 ...rogramEndpointCallMockIntegrationShould.kt |   2 +-
 ...rogramEndpointCallRealIntegrationShould.kt |   2 +-
 .../BasePayloadGeneratorMockIntegration.kt    |   2 +-
 .../OpenIdConnectRealIntegrationShould.kt     |   2 +-
 .../LogoutCallRealIntegrationShould.kt        |   6 +-
 ...cateWithEncryptionMockIntegrationShould.kt |  42 ++-
 .../internal/UserCallMockIntegrationShould.kt |   2 +-
 .../mock/BaseMockIntegrationTest.kt           |  18 ++
 .../BaseMockIntegrationTestEmptyDispatcher.kt |  12 +-
 .../BaseMockIntegrationTestEmptyEnqueable.kt  |  14 +-
 .../BaseMockIntegrationTestFullDispatcher.kt  |  14 +-
 ...nTestLocalAnalyticsSuperLargeDispatcher.kt |  14 +-
 ...seMockIntegrationTestMetadataDispatcher.kt |  14 +-
 ...aseMockIntegrationTestMetadataEnqueable.kt |  16 +-
 .../mock/MockIntegrationTestObjectsFactory.kt |  14 +-
 .../core/utils/runner/D2JunitTestListener.kt  |   4 -
 .../VisualizationEndpointCallShould.kt        |   2 +-
 .../wipe/WipeDBCallMockIntegrationShould.kt   |  11 -
 .../LocalAnalyticsDatabaseFiller.kt           |   2 +-
 .../FileResourceAddMockIntegrationShould.kt   |   8 +-
 ...aseTrackerConflictMockIntegrationShould.kt |   2 +-
 ...ckerConflictHelperMockIntegrationShould.kt |   6 +-
 .../AccountManagerMockIntegrationShould.kt    |  75 ++++--
 core/src/main/assets/migrations/152.sql       |  11 +
 core/src/main/assets/snapshots/snapshot.sql   |   4 +-
 .../java/org/hisp/dhis/android/core/D2.kt     |  16 +-
 .../org/hisp/dhis/android/core/D2Manager.kt   |  16 +-
 ...EntityDIModule.kt => AnalyticsDIModule.kt} |  35 +--
 .../core/analytics/AnalyticsModuleImpl.kt     |   7 +-
 .../analytics/AnalyticsPackageDIModule.kt     |  49 ----
 .../android/core/analytics/LegendEvaluator.kt |   5 +-
 .../AnalyticsOrganisationUnitHelper.kt        |   5 +-
 .../internal/AnalyticsRepositoryImpl.kt       |   5 +-
 .../aggregated/internal/AnalyticsService.kt   |   5 +-
 .../AnalyticsServiceDimensionHelper.kt        |   5 +-
 .../AnalyticsServiceEvaluatorHelper.kt        |   5 +-
 .../AnalyticsServiceMetadataHelper.kt         |   5 +-
 .../AnalyticsVisualizationsRepositoryImpl.kt  |   5 +-
 .../AnalyticsVisualizationsService.kt         |   5 +-
 ...icsVisualizationsServiceDimensionHelper.kt |   5 +-
 .../evaluator/DataElementSQLEvaluator.kt      |   5 +-
 .../evaluator/EventDataItemSQLEvaluator.kt    |   5 +-
 .../ExpressionDimensionItemEvaluator.kt       |   5 +-
 .../internal/evaluator/IndicatorEvaluator.kt  |   5 +-
 .../evaluator/IndicatorSQLEvaluator.kt        |   5 +-
 .../evaluator/ProgramIndicatorEvaluator.kt    |   5 +-
 .../evaluator/ProgramIndicatorSQLEvaluator.kt |   5 +-
 .../AnalyticExpressionEngine.kt               |   5 +-
 .../AnalyticExpressionEngineFactory.kt        |   5 +-
 .../ExpressionDimensionItemEngine.kt          |   5 +-
 .../indicatorengine/IndicatorContext.kt       |   9 +-
 .../indicatorengine/IndicatorEngine.kt        |   5 +-
 .../indicatorengine/IndicatorSQLEngine.kt     |   5 +-
 .../mock/MockAnalyticsRepository.kt           |  59 -----
 .../MockAnalyticsVisualizationsRepository.kt  |  63 -----
 .../linelist/EventLineListRepositoryImpl.kt   |   7 +-
 .../linelist/EventLineListServiceImpl.kt      |   5 +-
 .../linelist/LineListEntityDIModule.kt        |  54 ----
 .../ArchDIModule.kt}                          |  35 +--
 .../internal/CookieAuthenticatorHelper.kt     |   5 +-
 .../internal/OpenIDConnectAuthenticator.kt    |   7 +-
 .../internal/ParentAuthenticator.kt           |   7 +-
 .../PasswordAndCookieAuthenticator.kt         |   7 +-
 .../internal/UserIdAuthenticatorHelper.kt     |   7 +-
 .../internal/APICallExecutorImpl.java         |   5 -
 .../executors/internal/APIDownloaderImpl.kt   |   7 +-
 .../api/executors/internal/APIErrorMapper.kt  |   7 +-
 .../internal/APIExecutorsDIModule.java        |  61 -----
 .../internal/CoroutineAPICallExecutorImpl.kt  |   7 +-
 .../internal/RxAPICallExecutorImpl.kt         |   7 +-
 ...ientDIModule.java => APIClientDIModule.kt} |  54 ++--
 .../arch/api/internal/ServicesDIModule.kt     | 102 ++++++++
 .../arch/cache/internal/ExpirableCache.kt     |   2 +-
 .../executors/internal/D2CallExecutor.java    |   6 -
 .../arch/d2/internal/AppContextDIModule.kt    |  23 +-
 .../core/arch/d2/internal/D2DIComponent.kt    | 242 ++++--------------
 .../arch/d2/internal/D2DIComponentFactory.kt  | 142 ++++++++++
 .../arch/d2/internal/D2InternalModules.kt     |   7 +-
 .../core/arch/d2/internal/D2Modules.kt        |   7 +-
 .../core/arch/d2/internal/JavaDIClasses.kt    |  64 +++++
 .../access/internal/BaseDatabaseOpenHelper.kt |   2 +-
 .../internal/DatabaseAdapterFactory.java      |  10 +-
 .../db/access/internal/DatabaseDIModule.java  |  52 ----
 .../db/access/internal/DatabaseDIModule.kt}   |  17 +-
 .../db/access/internal/DatabaseExport.java    |  10 +-
 .../internal/DatabaseImportExportImpl.kt      |   7 +-
 .../internal/MultiDimensionalPartitioner.kt   |   7 +-
 .../internal/JSONSerializationDIModule.java   |  45 ----
 .../internal/JSONSerializationDIModule.kt}    |  18 +-
 .../di/internal/RepositoriesDIModule.kt       |  11 +-
 .../storage/internal/ChunkedSecureStore.kt    |   5 +-
 .../internal/CredentialsSecureStoreImpl.kt    |   6 +-
 .../internal/KeyValueStorageDIModule.java     |  70 -----
 .../internal/KeyValueStorageDIModule.kt       |  38 +++
 .../storage/internal/UserIdInMemoryStore.kt   |   3 +
 .../AttributeDIModule.kt}                     |  18 +-
 .../attribute/internal/AttributeHandler.kt    |   5 +-
 .../internal/AttributeModuleWiper.java        |  59 -----
 ...ityDIModule.kt => AttributeModuleWiper.kt} |  28 +-
 .../attribute/internal/AttributeStoreImpl.kt  |   2 +
 .../DataElementAttributeValueLinkHandler.kt   |   2 +
 .../DataElementAttributeValueLinkStoreImpl.kt |   2 +
 .../ProgramAttributeValueLinkHandler.kt       |   2 +
 .../ProgramAttributeValueLinkStoreImpl.kt     |   2 +
 .../ProgramStageAttributeValueLinkHandler.kt  |   2 +
 ...ProgramStageAttributeValueLinkStoreImpl.kt |   2 +
 .../category/CategoryCollectionRepository.kt  |   7 +-
 .../CategoryComboCollectionRepository.kt      |   7 +-
 .../android/core/category/CategoryDIModule.kt |  36 +++
 .../CategoryOptionCollectionRepository.kt     |   7 +-
 ...CategoryOptionComboCollectionRepository.kt |   7 +-
 .../category/CategoryOptionComboService.kt    |   7 +-
 .../core/category/internal/CategoryCall.kt    |   7 +-
 .../CategoryCategoryComboEntityDIModule.kt    |  50 ----
 .../CategoryCategoryComboLinkHandler.kt       |   5 +-
 .../CategoryCategoryComboLinkStoreImpl.kt     |   2 +
 .../CategoryCategoryOptionEntityDIModule.kt   |  50 ----
 .../CategoryCategoryOptionLinkHandler.kt      |   2 +
 .../CategoryCategoryOptionLinkPersistor.kt    |   7 +-
 .../CategoryCategoryOptionLinkStoreImpl.kt    |   2 +
 .../category/internal/CategoryComboCall.kt    |   7 +-
 .../internal/CategoryComboEntityDIModule.kt   |  53 ----
 .../category/internal/CategoryComboHandler.kt |   2 +
 .../internal/CategoryComboStoreImpl.kt        |   2 +
 .../internal/CategoryComboUidsSeeker.kt       |   7 +-
 .../core/category/internal/CategoryHandler.kt |   2 +
 .../internal/CategoryInternalModule.kt        |   7 +-
 .../internal/CategoryModuleDownloader.kt      |   7 +-
 .../category/internal/CategoryModuleImpl.kt   |  14 +-
 .../category/internal/CategoryModuleWiper.kt  |   7 +-
 .../category/internal/CategoryOptionCall.kt   |   7 +-
 ...OptionComboCategoryOptionEntityDIModule.kt |  50 ----
 ...ategoryOptionComboCategoryOptionHandler.kt |   2 +
 ...yOptionComboCategoryOptionLinkStoreImpl.kt |   2 +
 .../CategoryOptionComboEntityDIModule.kt      |  51 ----
 .../internal/CategoryOptionComboHandler.kt    |   2 +
 .../CategoryOptionComboIntegrityChecker.kt    |   7 +-
 .../CategoryOptionComboOrphanCleaner.kt       |   7 +-
 .../internal/CategoryOptionComboStoreImpl.kt  |   2 +
 .../internal/CategoryOptionEntityDIModule.kt  |  49 ----
 .../internal/CategoryOptionHandler.kt         |   5 +-
 ...oryOptionOrganisationUnitEntityDIModule.kt |  49 ----
 ...tegoryOptionOrganisationUnitLinkHandler.kt |   2 +
 ...goryOptionOrganisationUnitLinkStoreImpl.kt |   2 +
 .../CategoryOptionOrganisationUnitsCall.kt    |   7 +-
 .../internal/CategoryOptionStoreImpl.kt       |   2 +
 .../internal/CategoryPackageDIModule.kt       |  73 ------
 .../category/internal/CategoryStoreImpl.kt    |   2 +
 ...onPackageDIModule.kt => CommonDIModule.kt} |  35 +--
 .../core/common/DateFilterPeriodHelper.kt     |  10 +-
 ...nModuleWiper.java => CommonModuleWiper.kt} |  40 +--
 .../internal/DataStatePropagatorImpl.kt       |   7 +-
 .../common/internal/TrackerDataManagerImpl.kt |   7 +-
 .../ValueTypeDeviceRenderingEntityDIModule.kt |  48 ----
 .../ValueTypeDeviceRenderingHandler.kt        |   2 +
 .../ValueTypeDeviceRenderingStoreImpl.kt      |   2 +
 .../ValueTypeRenderingEntityDIModule.kt       |  42 ---
 .../internal/ValueTypeRenderingHandler.kt     |   2 +
 .../internal/ConfigurationDIModule.kt}        |  30 +--
 .../internal/DatabaseConfigurationHelper.kt   |   7 +-
 .../DatabaseConfigurationInsecureStoreImpl.kt |   2 +
 .../DatabaseConfigurationMigration.kt         |   7 +-
 .../DatabaseEncryptionPasswordGenerator.java  |  10 +-
 .../DatabaseEncryptionPasswordManager.java    |   4 +-
 .../internal/DatabaseNameGenerator.kt         |   7 +-
 .../configuration/internal/DatabaseRenamer.kt |   7 +-
 .../internal/MultiUserDatabaseManager.kt      |   8 +-
 .../MultiUserDatabaseManagerForD2Manager.kt   |   7 +-
 .../constant/ConstantCollectionRepository.kt  |   7 +-
 .../android/core/constant/ConstantDIModule.kt |  36 +++
 .../internal/ConstantCollectionCleaner.kt     |   7 +-
 .../internal/ConstantCoroutineCallFactory.kt  |   7 +-
 .../core/constant/internal/ConstantHandler.kt |   2 +
 .../internal/ConstantModuleDownloader.kt      |   7 +-
 .../constant/internal/ConstantModuleImpl.java |  52 ----
 .../internal/ConstantModuleImpl.kt}           |  21 +-
 .../internal/ConstantModuleWiper.java         |  58 -----
 .../internal/ConstantModuleWiper.kt}          |  28 +-
 .../internal/ConstantPackageDIModule.kt       |  73 ------
 .../constant/internal/ConstantStoreImpl.kt    |   2 +
 .../DataApprovalCollectionRepository.kt       |   7 +-
 .../core/dataapproval/DataApprovalDIModule.kt |  36 +++
 .../dataapproval/internal/DataApprovalCall.kt |   7 +-
 .../internal/DataApprovalEntityDIModule.kt    |  48 ----
 .../internal/DataApprovalHandler.kt           |   2 +
 .../internal/DataApprovalStoreImpl.kt         |   2 +
 .../DataElementCollectionRepository.kt        |   7 +-
 .../core/dataelement/DataElementDIModule.kt   |  36 +++
 ...DataElementAttributeValueEntityDIModule.kt |  53 ----
 .../DataElementEndpointCallFactory.kt         |   7 +-
 .../internal/DataElementEntityDIModule.kt     |  61 -----
 .../internal/DataElementHandler.kt            |  10 +-
 .../DataElementLegendSetEntityDIModule.kt     |  53 ----
 .../internal/DataElementModuleImpl.java       |  51 ----
 .../internal/DataElementModuleImpl.kt}        |  21 +-
 ...leWiper.java => DataElementModuleWiper.kt} |  44 ++--
 .../DataElementOperandEntityDIModule.kt       |  48 ----
 .../internal/DataElementOperandHandler.kt     |   5 +-
 .../internal/DataElementOperandStoreImpl.kt   |   2 +
 .../internal/DataElementPackageDIModule.kt    |  64 -----
 .../internal/DataElementService.java          |   2 +-
 .../internal/DataElementStoreImpl.kt          |   2 +
 .../dataset/DataSetCollectionRepository.kt    |   7 +-
 ...ompleteRegistrationCollectionRepository.kt |   7 +-
 .../android/core/dataset/DataSetDIModule.kt   |  36 +++
 .../DataSetInstanceCollectionRepository.kt    |   7 +-
 ...aSetInstanceSummaryCollectionRepository.kt |   7 +-
 .../dataset/SectionCollectionRepository.kt    |   7 +-
 .../internal/DataInputPeriodEntityDIModule.kt |  48 ----
 .../internal/DataInputPeriodHandler.kt        |   2 +
 .../internal/DataInputPeriodStoreImpl.kt      |   2 +
 .../internal/DataSetCollectionCleaner.kt      |   7 +-
 .../DataSetCompleteRegistrationCall.kt        |   7 +-
 ...ataSetCompleteRegistrationCallProcessor.kt |   7 +-
 ...taSetCompleteRegistrationEntityDIModule.kt |  48 ----
 .../DataSetCompleteRegistrationHandler.kt     |   2 +
 ...aSetCompleteRegistrationImportHandler.java | 116 ---------
 ...ataSetCompleteRegistrationImportHandler.kt | 109 ++++++++
 .../DataSetCompleteRegistrationPostCall.kt    |   7 +-
 .../DataSetCompleteRegistrationStoreImpl.kt   |   2 +
 ...pulsoryDataElementOperandEntityDIModule.kt |  50 ----
 ...aSetCompulsoryDataElementOperandHandler.kt |   2 +
 ...mpulsoryDataElementOperandLinkStoreImpl.kt |   2 +
 .../internal/DataSetElementEntityDIModule.kt  |  48 ----
 .../dataset/internal/DataSetElementHandler.kt |   2 +
 .../internal/DataSetElementStoreImpl.kt       |   2 +
 .../internal/DataSetEndpointCallFactory.kt    |   7 +-
 .../dataset/internal/DataSetEntityDIModule.kt |  73 ------
 .../core/dataset/internal/DataSetHandler.kt   |   2 +
 .../internal/DataSetInstanceEntityDIModule.kt |  48 ----
 .../internal/DataSetInstanceServiceImpl.kt    |   7 +-
 .../internal/DataSetInstanceStoreImpl.kt      |   2 +
 .../DataSetInstanceSummaryStoreImpl.kt        |   2 +
 .../internal/DataSetModuleDownloader.kt       |  16 +-
 .../dataset/internal/DataSetModuleImpl.java   |  97 -------
 ...ackageDIModule.kt => DataSetModuleImpl.kt} |  70 +++--
 ...ModuleWiper.java => DataSetModuleWiper.kt} |  75 +++---
 .../DataSetOrganisationUnitLinkCleaner.kt     |   7 +-
 ...taSetOrganisationUnitLinkEntityDIModule.kt |  49 ----
 .../DataSetOrganisationUnitLinkHandler.kt     |   2 +
 .../DataSetOrganisationUnitLinkStoreImpl.kt   |   2 +
 .../core/dataset/internal/DataSetService.java |   2 +-
 .../core/dataset/internal/DataSetStoreImpl.kt |   2 +
 .../SectionDataElementEntityDIModule.kt       |  48 ----
 .../internal/SectionDataElementLinkHandler.kt |   2 +
 .../SectionDataElementLinkStoreImpl.kt        |   2 +
 .../dataset/internal/SectionEntityDIModule.kt |  42 ---
 .../SectionGreyedFieldsEntityDIModule.kt      |  48 ----
 .../SectionGreyedFieldsLinkHandler.kt         |   2 +
 .../SectionGreyedFieldsLinkStoreImpl.kt       |   2 +
 .../core/dataset/internal/SectionHandler.kt   |   7 +-
 .../SectionIndicatorEntityDIModule.kt         |  49 ----
 .../internal/SectionIndicatorLinkHandler.kt   |   2 +
 .../internal/SectionIndicatorLinkStoreImpl.kt |   2 +
 .../dataset/internal/SectionOrphanCleaner.kt  |   7 +-
 .../core/dataset/internal/SectionStoreImpl.kt |   2 +
 .../DataStoreCollectionRepository.kt          |   7 +-
 .../DataStoreDIModule.kt}                     |  21 +-
 .../core/datastore/DataStoreDownloader.kt     |   7 +-
 .../datastore/DataStoreObjectRepository.kt    |   9 +-
 .../LocalDataStoreCollectionRepository.kt     |   7 +-
 .../internal/DataStoreDownloadCall.kt         |   7 +-
 .../internal/DataStoreEntityDIModule.kt       |  55 ----
 .../internal/DataStoreEntryStoreImpl.kt       |   2 +
 .../datastore/internal/DataStoreHandler.kt    |   2 +
 .../internal/DataStoreImportHandler.kt        |   7 +-
 .../datastore/internal/DataStoreModuleImpl.kt |   7 +-
 .../internal/DataStoreModuleWiper.kt          |   7 +-
 .../internal/DataStorePackageDIModule.kt      |  47 ----
 .../datastore/internal/DataStorePostCall.kt   |   7 +-
 .../datastore/internal/DataStoreService.kt    |   5 +
 .../internal/LocalDataStoreEntityDIModule.kt  |  50 ----
 .../internal/LocalDataStoreStoreImpl.kt       |   2 +
 .../DataValueCollectionRepository.kt          |   7 +-
 .../DataValueConflictCollectionRepository.kt  |   7 +-
 .../core/datavalue/DataValueDIModule.kt       |  36 +++
 .../core/datavalue/internal/DataValueCall.kt  |   7 +-
 .../internal/DataValueConflictParser.kt       |   7 +-
 .../internal/DataValueConflictStoreImpl.kt    |   2 +
 .../internal/DataValueFileResourcePostCall.kt |   7 +-
 .../datavalue/internal/DataValueHandler.kt    |   5 +-
 .../internal/DataValueImportHandler.kt        |   7 +-
 .../internal/DataValueModuleImpl.java         |  61 -----
 ...kageDIModule.kt => DataValueModuleImpl.kt} |  26 +-
 .../internal/DataValueModuleWiper.kt          |   7 +-
 .../datavalue/internal/DataValuePostCall.kt   |   7 +-
 .../datavalue/internal/DataValueStoreImpl.kt  |   2 +
 .../InvalidDataElementType37Conflict.kt       |   6 +-
 .../InvalidDataElementTypeConflict.kt         |   1 -
 .../android/core/domain/DomainDIModule.kt     |  35 +++
 .../data/internal/AggregatedDataCall.kt       |   7 +-
 .../AggregatedDataCallBundleFactory.kt        |   7 +-
 .../internal/AggregatedDataDownloaderImpl.kt  |   7 +-
 .../internal/AggregatedDataPackageDIModule.kt |  50 ----
 .../internal/AggregatedDataSyncHashHelper.kt  |   7 +-
 ...AggregatedDataSyncLastUpdatedCalculator.kt |   7 +-
 .../internal/AggregatedDataSyncStoreImpl.kt   |   2 +
 .../internal/AggregatedModuleImpl.kt          |   7 +-
 .../core/domain/metadata/MetadataCall.kt      |   7 +-
 .../metadata/internal/MetadataModuleImpl.kt   |   7 +-
 .../EnrollmentCollectionRepository.kt         |   7 +-
 .../core/enrollment/EnrollmentDIModule.kt     |  36 +++
 .../internal/EnrollmentEntityDIModule.kt      |  76 ------
 .../enrollment/internal/EnrollmentHandler.kt  |  13 +-
 .../internal/EnrollmentImportHandler.kt       |   7 +-
 .../internal/EnrollmentModuleImpl.kt          |   7 +-
 ...geDIModule.kt => EnrollmentModuleWiper.kt} |  31 +--
 .../EnrollmentPersistenceCallFactory.kt       |   7 +-
 .../EnrollmentProjectionTransformer.kt        |   7 +-
 .../internal/EnrollmentServiceImpl.kt         |   7 +-
 .../internal/EnrollmentStoreImpl.kt           |   2 +
 .../enrollment/internal/EventOrphanCleaner.kt |   7 +-
 .../NewEnrollmentEndpointCallFactory.kt       |   7 +-
 .../OldEnrollmentEndpointCallFactory.kt       |   7 +-
 .../core/event/EventCollectionRepository.kt   |   7 +-
 ...ueryEntityDIModule.kt => EventDIModule.kt} |  15 +-
 .../android/core/event/EventDownloader.kt     |   7 +-
 .../event/EventFilterCollectionRepository.kt  |   7 +-
 .../event/internal/EventDataFilterHandler.kt  |   2 +
 .../internal/EventDataFilterStoreImpl.kt      |   2 +
 .../core/event/internal/EventDateUtils.kt     |   7 +-
 .../core/event/internal/EventDownloadCall.kt  |   7 +-
 .../internal/EventEndpointCallFactory.kt      |   2 -
 .../event/internal/EventEntityDIModule.kt     |  74 ------
 .../core/event/internal/EventFilterCall.kt    |   7 +-
 .../internal/EventFilterEntityDIModule.kt     |  54 ----
 .../core/event/internal/EventFilterHandler.kt |   2 +
 .../event/internal/EventFilterStoreImpl.kt    |   2 +
 .../core/event/internal/EventHandler.kt       |   7 +-
 .../core/event/internal/EventImportHandler.kt |   7 +-
 .../event/internal/EventLastUpdatedManager.kt |   7 +-
 .../core/event/internal/EventModuleImpl.kt    |   7 +-
 .../core/event/internal/EventModuleWiper.java |  58 -----
 ...rEntityDIModule.kt => EventModuleWiper.kt} |  27 +-
 .../event/internal/EventPackageDIModule.kt    |  64 -----
 .../internal/EventPersistenceCallFactory.kt   |   7 +-
 .../event/internal/EventPostParentCall.kt     |   7 +-
 .../event/internal/EventPostStateManager.kt   |   7 +-
 .../internal/EventProjectionTransformer.kt    |   7 +-
 .../event/internal/EventQueryBundleFactory.kt |   7 +-
 .../core/event/internal/EventServiceImpl.kt   |   7 +-
 .../core/event/internal/EventStoreImpl.kt     |   2 +
 .../core/event/internal/EventSyncStoreImpl.kt |   2 +
 .../internal/NewEventEndpointCallFactory.kt   |   7 +-
 .../internal/OldEventEndpointCallFactory.kt   |   7 +-
 .../EventCollectionRepositoryAdapter.kt       |   7 +-
 .../search/EventQueryCollectionRepository.kt  |   7 +-
 .../search/EventQueryRepositoryScope.java     |   2 +-
 ...essionDimensionItemCollectionRepository.kt |   7 +-
 .../ExpressionDimensionItemDIModule.kt        |  36 +++
 .../internal/ExpressionDimensionItemCall.kt   |   7 +-
 .../ExpressionDimensionItemEntityDIModule.kt  |  56 ----
 .../ExpressionDimensionItemHandler.kt         |   2 +
 ...ExpressionDimensionItemModuleDownloader.kt |   7 +-
 .../ExpressionDimensionItemModuleImpl.kt      |   7 +-
 .../ExpressionDimensionItemModuleWiper.kt     |   7 +-
 .../ExpressionDimensionItemPackageDIModule.kt |  47 ----
 .../ExpressionDimensionItemStoreImpl.kt       |   2 +
 .../ExpressionDimensionItemUidsSeeker.kt      |   7 +-
 .../FileResourceCollectionRepository.kt       |   7 +-
 .../FileResourceDIModule.kt}                  |  21 +-
 .../fileresource/FileResourceDownloader.kt    |   7 +-
 .../core/fileresource/FileResourceRoutine.kt  |   7 +-
 .../internal/FileResourceDownloadCall.kt      |   7 +-
 .../FileResourceDownloadCallHelper.kt         |   7 +-
 .../internal/FileResourceEntityDIModule.kt    |  55 ----
 .../internal/FileResourceHandler.kt           |   2 +
 .../internal/FileResourceHelper.kt            |   5 +-
 .../internal/FileResourceModuleImpl.kt        |  13 +-
 .../internal/FileResourceModuleWiper.kt       |   7 +-
 .../internal/FileResourcePostCall.kt          |   7 +-
 .../FileResourceProjectionTransformer.kt      |   7 +-
 .../internal/FileResourceStoreImpl.kt         |   2 +
 .../android/core/imports/ImportsDIModule.kt   |  36 +++
 ...ackerImportConflictCollectionRepository.kt |   7 +-
 .../android/core/imports/TrackerJobManager.kt |   5 +-
 .../imports/internal/ImportModuleImpl.java    |  59 -----
 ...tEntityDIModule.kt => ImportModuleImpl.kt} |  24 +-
 ...ackageDIModule.kt => ImportModuleWiper.kt} |  25 +-
 .../imports/internal/TEIWebResponseHandler.kt |   7 +-
 .../internal/TrackerImportConflictParser.kt   |   7 +-
 .../TrackerImportConflictStoreImpl.kt         |   2 +
 .../TrackerImportConflictItemContext.kt       |   9 +-
 .../IndicatorCollectionRepository.kt          |   7 +-
 .../core/indicator/IndicatorDIModule.kt       |  36 +++
 .../IndicatorTypeCollectionRepository.kt      |   7 +-
 .../DataSetIndicatorEngineImpl.kt             |   7 +-
 .../DataSetIndicatorEvaluator.kt              |   7 +-
 .../internal/DataSetIndicatorLinkHandler.kt   |   7 +-
 .../internal/DataSetIndicatorLinkStoreImpl.kt |   2 +
 .../internal/IndicatorEndpointCallFactory.kt  |   7 +-
 .../internal/IndicatorEntityDIModule.kt       |  42 ---
 .../indicator/internal/IndicatorHandler.kt    |   7 +-
 .../internal/IndicatorModuleDownloader.kt     |  14 +-
 .../internal/IndicatorModuleImpl.java         |  71 -----
 ...tityDIModule.kt => IndicatorModuleImpl.kt} |  31 ++-
 .../internal/IndicatorModuleWiper.java        |  63 -----
 .../internal/IndicatorModuleWiper.kt}         |  48 ++--
 .../internal/IndicatorPackageDIModule.kt      |  78 ------
 .../indicator/internal/IndicatorStoreImpl.kt  |   2 +
 .../IndicatorTypeEndpointCallFactory.kt       |   7 +-
 .../internal/IndicatorTypeEntityDIModule.kt   |  42 ---
 .../internal/IndicatorTypeHandler.kt          |   7 +-
 .../internal/IndicatorTypeStoreImpl.kt        |   2 +
 .../indicator/internal/IndicatorUidsSeeker.kt |   7 +-
 .../legendset/LegendCollectionRepository.kt   |   7 +-
 .../LegendSetCollectionRepository.kt          |   7 +-
 .../core/legendset/LegendSetDIModule.kt       |  36 +++
 .../DataElementLegendSetLinkHandler.kt        |   2 +
 .../DataElementLegendSetLinkStoreImpl.kt      |   2 +
 .../IndicatorLegendSetEntityDIModule.kt       |  50 ----
 .../internal/IndicatorLegendSetLinkHandler.kt |   2 +
 .../IndicatorLegendSetLinkStoreImpl.kt        |   2 +
 .../core/legendset/internal/LegendHandler.kt  |   2 +
 .../core/legendset/internal/LegendSetCall.kt  |   7 +-
 .../legendset/internal/LegendSetHandler.kt    |   2 +
 .../internal/LegendSetLegendOrphanCleaner.kt  |   7 +-
 .../internal/LegendSetModuleDownloader.kt     |   7 +-
 .../internal/LegendSetModuleImpl.java         |  61 -----
 ...kageDIModule.kt => LegendSetModuleImpl.kt} |  32 +--
 .../internal/LegendSetModuleWiper.java        |  63 -----
 ...ityDIModule.kt => LegendSetModuleWiper.kt} |  40 ++-
 .../legendset/internal/LegendSetStoreImpl.kt  |   2 +
 .../legendset/internal/LegendSetUidsSeeker.kt |   7 +-
 .../legendset/internal/LegendStoreImpl.kt     |   2 +
 .../ProgramIndicatorLegendSetLinkHandler.kt   |   2 +
 .../ProgramIndicatorLegendSetLinkStoreImpl.kt |   2 +
 .../D2ErrorCollectionRepository.kt            |   7 +-
 ...ForeignKeyViolationCollectionRepository.kt |   7 +-
 .../core/maintenance/MaintenanceDIModule.kt   |  36 +++
 .../internal/D2ErrorEntityDIModule.kt         |  42 ---
 .../maintenance/internal/D2ErrorStoreImpl.kt  |   2 +
 .../internal/ForeignKeyCleanerImpl.java       |   4 +-
 .../internal/ForeignKeyViolationStoreImpl.kt  |   2 +
 .../internal/MaintenanceModuleImpl.java       |  72 ------
 ...geDIModule.kt => MaintenanceModuleImpl.kt} |  46 ++--
 .../internal/MaintenanceModuleWiper.java      |  60 -----
 ...yDIModule.kt => MaintenanceModuleWiper.kt} |  28 +-
 .../MapDIModule.kt}                           |  11 +-
 .../core/map/internal/MapModuleImpl.kt        |   7 +-
 .../core/map/internal/MapModuleWiper.kt       |   7 +-
 .../core/map/internal/MapPackageDIModule.kt   |  52 ----
 .../map/layer/MapLayerCollectionRepository.kt |   7 +-
 .../core/map/layer/MapLayerDownloader.kt      |   7 +-
 .../map/layer/internal/MapLayerCallFactory.kt |   7 +-
 .../layer/internal/MapLayerEntityDIModule.kt  |  52 ----
 .../map/layer/internal/MapLayerHandler.kt     |   2 +
 .../MapLayerImageryProviderEntityDIModule.kt  |  49 ----
 .../MapLayerImageryProviderHandler.kt         |   2 +
 .../MapLayerImageryProviderStoreImpl.kt       |   2 +
 .../map/layer/internal/MapLayerStoreImpl.kt   |   2 +
 .../layer/internal/bing/BingCallFactory.kt    |   7 +-
 .../map/layer/internal/osm/OSMCallFactory.kt  |   7 +-
 .../core/note/NoteCollectionRepository.kt     |   7 +-
 .../dhis/android/core/note/NoteDIModule.kt    |  36 +++
 .../note/internal/NoteDHISVersionManager.java |  73 ------
 .../internal/NoteDHISVersionManager.kt}       |  57 +++--
 .../android/core/note/internal/NoteHandler.kt |   2 +
 .../core/note/internal/NoteModuleImpl.java    |  51 ----
 ...tePackageDIModule.kt => NoteModuleImpl.kt} |  17 +-
 .../internal/NoteProjectionTransformer.kt     |   7 +-
 .../core/note/internal/NoteStoreImpl.kt       |   2 +
 .../note/internal/NoteUniquenessManager.java  |   8 +-
 .../core/option/OptionCollectionRepository.kt |   7 +-
 .../android/core/option/OptionDIModule.kt     |  36 +++
 .../option/OptionGroupCollectionRepository.kt |   7 +-
 .../android/core/option/OptionServiceImpl.kt  |   7 +-
 .../option/OptionSetCollectionRepository.kt   |   7 +-
 .../core/option/internal/OptionCall.kt        |   7 +-
 .../option/internal/OptionEntityDIModule.kt   |  54 ----
 .../core/option/internal/OptionGroupCall.kt   |   8 +-
 .../internal/OptionGroupCollectionCleaner.kt  |   7 +-
 .../internal/OptionGroupEntityDIModule.kt     |  56 ----
 .../option/internal/OptionGroupHandler.kt     |   5 +-
 .../OptionGroupOptionEntityDIModule.kt        |  48 ----
 .../internal/OptionGroupOptionLinkHandler.kt  |   2 +
 .../OptionGroupOptionLinkStoreImpl.kt         |   2 +
 .../option/internal/OptionGroupStoreImpl.kt   |   2 +
 .../core/option/internal/OptionHandler.kt     |   2 +
 .../option/internal/OptionModuleImpl.java     |  80 ------
 ...PackageDIModule.kt => OptionModuleImpl.kt} |  50 ++--
 .../option/internal/OptionModuleWiper.java    |  65 -----
 .../internal/OptionModuleWiper.kt}            |  52 ++--
 .../core/option/internal/OptionSetCall.kt     |   7 +-
 .../internal/OptionSetEntityDIModule.kt       |  48 ----
 .../core/option/internal/OptionSetHandler.kt  |   2 +
 .../option/internal/OptionSetStoreImpl.kt     |   2 +
 .../core/option/internal/OptionStoreImpl.kt   |   2 +
 .../internal/OptionSubCollectionCleaner.kt    |   7 +-
 .../OrganisationUnitCollectionRepository.kt   |   7 +-
 .../OrganisationUnitDIModule.kt               |  36 +++
 ...ganisationUnitGroupCollectionRepository.kt |   7 +-
 ...ganisationUnitLevelCollectionRepository.kt |   7 +-
 .../OrganisationUnitService.kt                |   7 +-
 .../internal/OrganisationUnitCall.kt          |   7 +-
 .../OrganisationUnitCollectionCleaner.kt      |   7 +-
 .../OrganisationUnitDisplayPathTransformer.kt |   4 +-
 .../OrganisationUnitEntityDIModule.kt         |  71 -----
 .../OrganisationUnitGroupEntityDIModule.kt    |  48 ----
 .../internal/OrganisationUnitGroupHandler.kt  |   2 +
 .../OrganisationUnitGroupStoreImpl.kt         |   2 +
 .../internal/OrganisationUnitHandler.kt       |   6 +-
 .../OrganisationUnitLevelEndpointCall.kt      |   7 +-
 .../OrganisationUnitLevelEntityDIModule.kt    |  55 ----
 .../internal/OrganisationUnitLevelHandler.kt  |   2 +
 .../OrganisationUnitLevelStoreImpl.kt         |   2 +
 .../OrganisationUnitModuleDownloader.kt       |   7 +-
 .../internal/OrganisationUnitModuleImpl.java  |  79 ------
 ...odule.kt => OrganisationUnitModuleImpl.kt} |  46 ++--
 ...er.java => OrganisationUnitModuleWiper.kt} |  59 ++---
 ...OrganisationUnitGroupLinkEntityDIModule.kt |  51 ----
 ...ionUnitOrganisationUnitGroupLinkHandler.kt |   2 +
 ...nUnitOrganisationUnitGroupLinkStoreImpl.kt |   2 +
 ...ganisationUnitProgramLinkEntityDIModule.kt |  49 ----
 .../OrganisationUnitProgramLinkHandler.kt     |   2 +
 .../OrganisationUnitProgramLinkStoreImpl.kt   |   2 +
 .../internal/OrganisationUnitService.java     |   2 +-
 .../internal/OrganisationUnitStoreImpl.kt     |   2 +
 .../core/parser/internal/ParserDIModule.kt    |  35 +++
 .../internal/expression/CommonParser.kt       |   1 -
 .../internal/service/ExpressionService.kt     |   5 +-
 .../service/utils/ExpressionHelper.kt         |   1 -
 .../core/period/PeriodCollectionRepository.kt |   7 +-
 ...odPackageDIModule.kt => PeriodDIModule.kt} |  32 ++-
 .../internal/ParentPeriodGeneratorImpl.kt     |   3 +-
 ...anager.java => PeriodForDataSetManager.kt} | 107 ++++----
 .../core/period/internal/PeriodHandler.java   |  56 ----
 ...riodEntityDIModule.kt => PeriodHandler.kt} |  21 +-
 .../core/period/internal/PeriodHelper.java    |  38 ++-
 .../period/internal/PeriodModuleImpl.java     |  59 -----
 .../core/period/internal/PeriodModuleImpl.kt  |  46 ++++
 .../period/internal/PeriodModuleWiper.java    |  58 -----
 .../internal/PeriodModuleWiper.kt}            |  28 +-
 .../core/period/internal/PeriodParser.java    |   7 +-
 .../core/period/internal/PeriodStoreImpl.kt   |   2 +
 .../program/ProgramCollectionRepository.kt    |   7 +-
 .../android/core/program/ProgramDIModule.kt   |  36 +++
 .../ProgramIndicatorCollectionRepository.kt   |   7 +-
 .../ProgramRuleActionCollectionRepository.kt  |   7 +-
 .../ProgramRuleCollectionRepository.kt        |   7 +-
 ...ProgramRuleVariableCollectionRepository.kt |   7 +-
 .../ProgramSectionCollectionRepository.kt     |   7 +-
 .../ProgramStageCollectionRepository.kt       |   7 +-
 ...ramStageDataElementCollectionRepository.kt |   7 +-
 ...rogramStageSectionsCollectionRepository.kt |   7 +-
 ...ckedEntityAttributeCollectionRepository.kt |   7 +-
 .../AnalyticsPeriodBoundaryEntityDIModule.kt  |  48 ----
 .../AnalyticsPeriodBoundaryHandler.kt         |   2 +
 .../AnalyticsPeriodBoundaryStoreImpl.kt       |   2 +
 ...ementValueTypeRenderingChildrenAppender.kt |   5 +-
 .../ProgramAttributeValueEntityDIModule.kt    |  51 ----
 .../core/program/internal/ProgramCall.kt      |   7 +-
 .../internal/ProgramCollectionCleaner.kt      |   7 +-
 .../program/internal/ProgramEntityDIModule.kt |  42 ---
 .../core/program/internal/ProgramHandler.kt   |   7 +-
 .../program/internal/ProgramIndicatorCall.kt  |   7 +-
 .../ProgramIndicatorEntityDIModule.kt         |  42 ---
 .../internal/ProgramIndicatorHandler.kt       |   7 +-
 ...ProgramIndicatorLegendSetEntityDIModule.kt |  51 ----
 .../ProgramIndicatorModuleDownloader.kt       |   7 +-
 .../internal/ProgramIndicatorStoreImpl.kt     |   2 +
 .../internal/ProgramIndicatorUidsSeeker.kt    |   7 +-
 .../internal/ProgramModuleDownloader.kt       |   7 +-
 .../program/internal/ProgramModuleImpl.kt     |  19 +-
 ...ModuleWiper.java => ProgramModuleWiper.kt} |  92 +++----
 .../ProgramOrganisationUnitLinkCleaner.kt     |   7 +-
 .../program/internal/ProgramOrphanCleaner.kt  |   7 +-
 .../internal/ProgramPackageDIModule.kt        |  89 -------
 .../ProgramRuleActionEntityDIModule.kt        |  48 ----
 .../internal/ProgramRuleActionHandler.kt      |   2 +
 .../ProgramRuleActionOrphanCleaner.kt         |   7 +-
 .../internal/ProgramRuleActionStoreImpl.kt    |   2 +
 .../core/program/internal/ProgramRuleCall.kt  |   7 +-
 .../internal/ProgramRuleEntityDIModule.kt     |  42 ---
 .../program/internal/ProgramRuleHandler.kt    |   7 +-
 .../program/internal/ProgramRuleStoreImpl.kt  |   2 +
 .../ProgramRuleSubCollectionCleaner.kt        |   7 +-
 .../ProgramRuleVariableEntityDIModule.kt      |  48 ----
 .../internal/ProgramRuleVariableHandler.kt    |   2 +
 .../ProgramRuleVariableOrphanCleaner.kt       |   7 +-
 .../internal/ProgramRuleVariableStoreImpl.kt  |   2 +
 .../ProgramSectionAttributeEntityDIModule.kt  |  48 ----
 .../ProgramSectionAttributeLinkHandler.kt     |   2 +
 .../ProgramSectionAttributeLinkStoreImpl.kt   |   2 +
 .../internal/ProgramSectionEntityDIModule.kt  |  42 ---
 .../program/internal/ProgramSectionHandler.kt |   7 +-
 .../internal/ProgramSectionOrphanCleaner.kt   |   7 +-
 .../internal/ProgramSectionStoreImpl.kt       |   2 +
 ...rogramStageAttributeValueEntityDIModule.kt |  51 ----
 .../core/program/internal/ProgramStageCall.kt |   7 +-
 .../ProgramStageDataElementEntityDIModule.kt  |  42 ---
 .../ProgramStageDataElementHandler.kt         |   7 +-
 .../ProgramStageDataElementOrphanCleaner.kt   |   7 +-
 .../ProgramStageDataElementStoreImpl.kt       |   2 +
 .../internal/ProgramStageEntityDIModule.kt    |  42 ---
 .../program/internal/ProgramStageHandler.kt   |   7 +-
 ...amStageSectionDataElementEntityDIModule.kt |  48 ----
 ...ogramStageSectionDataElementLinkHandler.kt |   2 +
 ...ramStageSectionDataElementLinkStoreImpl.kt |   2 +
 .../ProgramStageSectionEntityDIModule.kt      |  42 ---
 .../internal/ProgramStageSectionHandler.kt    |   7 +-
 .../ProgramStageSectionOrphanCleaner.kt       |   7 +-
 ...geSectionProgramIndicatorEntityDIModule.kt |  50 ----
 ...StageSectionProgramIndicatorLinkHandler.kt |   2 +
 ...ageSectionProgramIndicatorLinkStoreImpl.kt |   2 +
 .../internal/ProgramStageSectionStoreImpl.kt  |   2 +
 .../program/internal/ProgramStageStoreImpl.kt |   2 +
 .../ProgramStageSubCollectionCleaner.kt       |   7 +-
 .../core/program/internal/ProgramStoreImpl.kt |   2 +
 ...ramTrackedEntityAttributeEntityDIModule.kt |  42 ---
 .../ProgramTrackedEntityAttributeHandler.kt   |   7 +-
 ...gramTrackedEntityAttributeOrphanCleaner.kt |   7 +-
 .../ProgramTrackedEntityAttributeStoreImpl.kt |   2 +
 ...ibuteValueTypeRenderingChildrenAppender.kt |   5 +-
 ...rogramTrackedEntityTypeChildrenAppender.kt |   5 +-
 .../ProgramIndicatorEngineEntityDIModule.kt   |  43 ----
 .../internal/ProgramIndicatorEngineImpl.kt    |   5 +-
 .../internal/ProgramIndicatorExecutor.kt      |  16 +-
 .../internal/ProgramIndicatorSQLExecutor.kt   |   7 +-
 .../internal/TrackerHeaderEngine.kt           |   7 +-
 ...ramStageWorkingListCollectionRepository.kt |   7 +-
 .../ProgramStageWorkingListDIModule.kt        |  36 +++
 ...gListAttributeValueFilterEntityDIModule.kt |  51 ----
 ...eWorkingListAttributeValueFilterHandler.kt |   2 +
 ...orkingListAttributeValueFilterStoreImpl.kt |   2 +
 .../internal/ProgramStageWorkingListCall.kt   |   7 +-
 .../ProgramStageWorkingListEntityDIModule.kt  |  50 ----
 ...orkingListEventDataFilterEntityDIModule.kt |  49 ----
 ...mStageWorkingListEventDataFilterHandler.kt |   2 +
 ...tageWorkingListEventDataFilterStoreImpl.kt |   2 +
 .../ProgramStageWorkingListHandler.kt         |   7 +-
 .../ProgramStageWorkingListModuleWiper.kt     |   7 +-
 .../ProgramStageWorkingListPackageDIModule.kt |  39 ---
 .../ProgramStageWorkingListStoreImpl.kt       |   2 +
 .../RelationshipCollectionRepository.kt       |   7 +-
 .../core/relationship/RelationshipDIModule.kt |  36 +++
 .../relationship/RelationshipServiceImpl.kt   |   7 +-
 .../RelationshipTypeCollectionRepository.kt   |   7 +-
 .../EnrollmentRelationshipOrphanCleaner.kt    |   7 +-
 .../EventRelationshipOrphanCleaner.kt         |   7 +-
 .../RelationshipConstraintEntityDIModule.kt   |  48 ----
 .../internal/RelationshipConstraintHandler.kt |   2 +
 .../RelationshipConstraintStoreImpl.kt        |   2 +
 .../RelationshipDHISVersionManager.java       |   6 -
 ...lationshipDownloadAndPersistCallFactory.kt |   7 +-
 .../internal/RelationshipEntityDIModule.kt    |  42 ---
 .../internal/RelationshipHandler.kt           |   7 +-
 .../internal/RelationshipImportHandler.kt     |   6 +-
 .../RelationshipItemChildrenAppender.kt       |   7 +-
 ...elationshipItemElementStoreSelectorImpl.kt |   2 +
 .../RelationshipItemEntityDIModule.kt         |  65 -----
 .../internal/RelationshipItemHandler.kt       |   2 +
 .../internal/RelationshipItemStoreImpl.kt     |   2 +
 .../internal/RelationshipManager.kt           |   7 +-
 .../internal/RelationshipModuleImpl.java      |  72 ------
 ...eDIModule.kt => RelationshipModuleImpl.kt} |  43 ++--
 ...eWiper.java => RelationshipModuleWiper.kt} |  55 ++--
 .../internal/RelationshipPostCall.kt          |   7 +-
 .../internal/RelationshipStoreImpl.kt         |   2 +
 .../internal/RelationshipTypeCall.kt          |   7 +-
 .../RelationshipTypeEntityDIModule.kt         |  55 ----
 .../internal/RelationshipTypeHandler.kt       |   2 +
 .../internal/RelationshipTypeStoreImpl.kt     |   2 +
 .../internal/TEIRelationshipOrphanCleaner.kt  |   7 +-
 ...PackageDIModule.kt => ResourceDIModule.kt} |   9 +-
 .../core/resource/internal/ResourceHandler.kt |   5 +-
 .../internal/ResourceModuleWiper.java         |  57 -----
 .../internal/ResourceModuleWiper.kt}          |  27 +-
 .../resource/internal/ResourceStoreImpl.kt    |   2 +
 ...isVisualizationsSettingObjectRepository.kt |   7 +-
 .../AnalyticsSettingObjectRepository.kt       |   7 +-
 ...AnalyticsTeiSettingCollectionRepository.kt |   7 +-
 .../AppearanceSettingsObjectRepository.kt     |   7 +-
 .../DataSetSettingsObjectRepository.kt        |   7 +-
 .../GeneralSettingObjectRepository.kt         |   7 +-
 .../LatestAppVersionObjectRepository.kt       |   7 +-
 .../ProgramSettingsObjectRepository.kt        |   7 +-
 .../android/core/settings/SettingsDIModule.kt |  36 +++
 .../SynchronizationSettingObjectRepository.kt |   7 +-
 .../SystemSettingCollectionRepository.kt      |   7 +-
 .../settings/UserSettingsObjectRepository.kt  |   7 +-
 ...nalyticsDhisVisualizationSettingHandler.kt |   7 +-
 .../AnalyticsDhisVisualizationStoreImpl.kt    |   2 +
 .../settings/internal/AnalyticsSettingCall.kt |   7 +-
 .../AnalyticsSettingEntityDIModule.kt         |  73 ------
 .../internal/AnalyticsTeiAttributeHandler.kt  |   7 +-
 .../AnalyticsTeiAttributeStoreImpl.kt         |   2 +
 .../AnalyticsTeiDataChildrenAppender.kt       |   7 +-
 .../AnalyticsTeiDataElementHandler.kt         |   7 +-
 .../AnalyticsTeiDataElementStoreImpl.kt       |   2 +
 .../internal/AnalyticsTeiIndicatorHandler.kt  |   7 +-
 .../AnalyticsTeiIndicatorStoreImpl.kt         |   2 +
 .../internal/AnalyticsTeiSettingHandler.kt    |   7 +-
 .../internal/AnalyticsTeiSettingStoreImpl.kt  |   2 +
 .../AnalyticsTeiWHONutritionDataHandler.kt    |   7 +-
 .../AnalyticsTeiWHONutritionDataStoreImpl.kt  |   2 +
 .../internal/AppearanceSettingCall.kt         |   7 +-
 .../settings/internal/DataSetSettingCall.kt   |   7 +-
 .../internal/DataSetSettingEntityDIModule.kt  |  42 ---
 .../internal/DataSetSettingHandler.kt         |   7 +-
 .../internal/DataSetSettingStoreImpl.kt       |   2 +
 .../internal/FilterSettingEntityDIModule.kt   |  44 ----
 .../settings/internal/FilterSettingHandler.kt |   7 +-
 .../internal/FilterSettingStoreImpl.kt        |   2 +
 .../settings/internal/GeneralSettingCall.kt   |   7 +-
 .../internal/GeneralSettingEntityDIModule.kt  |  43 ----
 .../internal/GeneralSettingHandler.kt         |   7 +-
 .../internal/GeneralSettingStoreImpl.kt       |   2 +
 .../settings/internal/LatestAppVersionCall.kt |   7 +-
 .../internal/LatestAppVersionDIModule.kt      |  44 ----
 .../internal/LatestAppVersionHandler.kt       |   7 +-
 .../internal/LatestAppVersionStoreImpl.kt     |   2 +
 ...ogramConfigurationSettingEntityDIModule.kt |  44 ----
 .../ProgramConfigurationSettingHandler.kt     |   7 +-
 .../ProgramConfigurationSettingStoreImpl.kt   |   2 +
 .../settings/internal/ProgramSettingCall.kt   |   7 +-
 .../internal/ProgramSettingEntityDIModule.kt  |  42 ---
 .../internal/ProgramSettingHandler.kt         |   7 +-
 .../internal/ProgramSettingStoreImpl.kt       |   2 +
 .../settings/internal/SettingAppService.kt    |   5 +-
 .../internal/SettingModuleDownloader.kt       |   7 +-
 .../settings/internal/SettingModuleImpl.java  | 125 ---------
 .../settings/internal/SettingModuleImpl.kt    |  89 +++++++
 ...ModuleWiper.java => SettingModuleWiper.kt} |  89 +++----
 .../internal/SettingPackageDIModule.kt        |  75 ------
 .../settings/internal/SettingsAppInfoCall.kt  |   7 +-
 .../internal/SettingsAppInfoManagerImpl.kt    |   5 +-
 .../internal/SynchronizationSettingCall.kt    |   7 +-
 .../SynchronizationSettingEntityDIModule.kt   |  43 ----
 .../internal/SynchronizationSettingHandler.kt |   7 +-
 .../SynchronizationSettingStoreImpl.kt        |   2 +
 .../settings/internal/SystemSettingCall.kt    |   7 +-
 .../internal/SystemSettingEntityDIModule.kt   |  42 ---
 .../settings/internal/SystemSettingHandler.kt |   7 +-
 .../internal/SystemSettingStoreImpl.kt        |   2 +
 .../internal/SystemSettingsSplitter.kt        |   7 +-
 .../settings/internal/UserSettingsCall.kt     |   7 +-
 .../internal/UserSettingsEntityDIModule.kt    |  42 ---
 .../settings/internal/UserSettingsHandler.kt  |   7 +-
 .../internal/UserSettingsStoreImpl.kt         |   2 +
 .../core/sms/{internal => }/SmsDIModule.kt    |  39 +--
 .../internal/DataSetsStore.java               |  13 +-
 .../internal/FileResourceCleaner.java         |  11 +-
 .../internal/LocalDbRepositoryImpl.kt         |   5 +-
 .../internal/MetadataIdsStore.kt              |   7 +-
 .../internal/OngoingSubmissionsStore.kt       |   7 +-
 .../core/sms/internal/SMSModuleWiper.kt       |   7 +-
 .../{SmsModuleImpl.java => SmsModuleImpl.kt}  |  72 ++----
 .../core/systeminfo/SystemInfoDIModule.kt     |  88 +++++++
 .../systeminfo/SystemInfoObjectRepository.kt  |   7 +-
 .../internal/DHISVersionManagerImpl.kt        |   5 +-
 .../core/systeminfo/internal/PingCall.kt      |   7 +-
 .../systeminfo/internal/SystemInfoCall.kt     |   7 +-
 .../systeminfo/internal/SystemInfoHandler.kt  |   7 +-
 .../internal/SystemInfoModuleDownloader.kt    |   7 +-
 .../internal/SystemInfoModuleImpl.kt          |   7 +-
 .../internal/SystemInfoModuleWiper.java       |  57 -----
 ...tyDIModule.kt => SystemInfoModuleWiper.kt} |  23 +-
 .../internal/SystemInfoPackageDIModule.kt     |  61 -----
 .../internal/SystemInfoStoreImpl.kt           |   2 +
 ...ckedEntityAttributeCollectionRepository.kt |   7 +-
 ...ckedEntityAttributeReservedValueManager.kt |  14 +-
 ...ntityAttributeValueCollectionRepository.kt |   7 +-
 ...tyDIModule.kt => TrackedEntityDIModule.kt} |  25 +-
 ...ckedEntityDataValueCollectionRepository.kt |   7 +-
 ...ackedEntityInstanceCollectionRepository.kt |   7 +-
 ...ntityInstanceFilterCollectionRepository.kt |   7 +-
 .../TrackedEntityInstanceService.java         |  16 +-
 .../TrackedEntityPackageDIModule.kt           | 106 --------
 ...EntityTypeAttributeCollectionRepository.kt |   7 +-
 .../TrackedEntityTypeCollectionRepository.kt  |   7 +-
 .../AttributeValueFilterEntityDIModule.kt     |  42 ---
 .../internal/AttributeValueFilterHandler.kt   |   7 +-
 .../internal/AttributeValueFilterStoreImpl.kt |   2 +
 .../NewTrackedEntityEndpointCallFactory.kt    |   7 +-
 ...porterTrackedEntityPostPayloadGenerator.kt |   7 +-
 ...erImporterTrackedEntityPostStateManager.kt |   7 +-
 .../OldTrackedEntityEndpointCallFactory.kt    |   7 +-
 ...OldTrackerImporterFileResourcesPostCall.kt |   7 +-
 .../OldTrackerImporterPayloadGenerator.kt     |   7 +-
 .../internal/OldTrackerImporterPostCall.kt    |   7 +-
 .../internal/ReservedValueSettingDIModule.kt  |  42 ---
 .../internal/ReservedValueSettingStoreImpl.kt |   2 +
 .../internal/StatePersistorHelper.kt          |   7 +-
 .../internal/TrackedEntityAttributeCall.kt    |   7 +-
 .../TrackedEntityAttributeEntityDIModule.kt   |  42 ---
 .../internal/TrackedEntityAttributeHandler.kt |   7 +-
 ...TrackedEntityAttributeLegendSetDIModule.kt |  43 ----
 ...ckedEntityAttributeLegendSetLinkHandler.kt |   7 +-
 ...edEntityAttributeLegendSetLinkStoreImpl.kt |   2 +
 ...tributeReservedValueEndpointCallFactory.kt |   7 +-
 ...ityAttributeReservedValueEntityDIModule.kt |  49 ----
 ...ckedEntityAttributeReservedValueHandler.kt |   7 +-
 ...edEntityAttributeReservedValueStoreImpl.kt |   2 +
 .../TrackedEntityAttributeStoreImpl.kt        |   2 +
 ...ackedEntityAttributeValueEntityDIModule.kt |  42 ---
 .../TrackedEntityAttributeValueHandler.kt     |   7 +-
 .../TrackedEntityAttributeValueStoreImpl.kt   |   2 +
 .../TrackedEntityDataValueEntityDIModule.kt   |  42 ---
 .../internal/TrackedEntityDataValueHandler.kt |   7 +-
 .../TrackedEntityDataValueStoreImpl.kt        |   2 +
 .../TrackedEntityEnrollmentOrphanCleaner.kt   |   7 +-
 .../TrackedEntityInstanceDownloadCall.kt      |   7 +-
 .../TrackedEntityInstanceDownloader.kt        |   7 +-
 .../TrackedEntityInstanceEntityDIModule.kt    |  56 ----
 ...EntityInstanceEventFilterEntityDIModule.kt |  42 ---
 ...TrackedEntityInstanceEventFilterHandler.kt |   7 +-
 ...ackedEntityInstanceEventFilterStoreImpl.kt |   2 +
 .../TrackedEntityInstanceFilterCall.kt        |   7 +-
 ...ackedEntityInstanceFilterEntityDIModule.kt |  43 ----
 .../TrackedEntityInstanceFilterHandler.kt     |   7 +-
 .../TrackedEntityInstanceFilterStoreImpl.kt   |   2 +
 .../internal/TrackedEntityInstanceHandler.kt  |   7 +-
 .../TrackedEntityInstanceImportHandler.kt     |   7 +-
 ...TrackedEntityInstanceLastUpdatedManager.kt |   7 +-
 ...kedEntityInstancePersistenceCallFactory.kt |   7 +-
 .../TrackedEntityInstancePostParentCall.kt    |   7 +-
 ...ckedEntityInstanceProjectionTransformer.kt |   7 +-
 .../TrackedEntityInstanceStoreImpl.kt         |   2 +
 ...TrackedEntityInstanceSyncEntityDIModule.kt |  42 ---
 .../TrackedEntityInstanceSyncStoreImpl.kt     |   2 +
 .../TrackedEntityInstanceUidHelperImpl.kt     |   7 +-
 .../internal/TrackedEntityModuleImpl.kt       |  17 +-
 .../internal/TrackedEntityModuleWiper.kt      |   7 +-
 ...rackedEntityTypeAttributeEntityDIModule.kt |  42 ---
 .../TrackedEntityTypeAttributeHandler.kt      |   7 +-
 .../TrackedEntityTypeAttributeStoreImpl.kt    |   2 +
 .../internal/TrackedEntityTypeCall.kt         |   7 +-
 .../TrackedEntityTypeCollectionCleaner.kt     |   7 +-
 .../TrackedEntityTypeEntityDIModule.kt        |  42 ---
 .../internal/TrackedEntityTypeHandler.kt      |   7 +-
 .../internal/TrackedEntityTypeStoreImpl.kt    |   2 +
 .../internal/TrackerParentCallFactory.kt      |   7 +-
 .../internal/TrackerPostStateManager.kt       |   7 +-
 .../internal/TrackerQueryBundleFactory.kt     |   7 +-
 .../TrackerQueryFactoryCommonHelper.kt        |   7 +-
 .../ownership/OwnershipEntityDIModule.kt      |  62 -----
 .../ownership/OwnershipManagerImpl.kt         |   5 +-
 .../ownership/ProgramOwnerHandler.kt          |   7 +-
 .../ownership/ProgramOwnerPostCall.kt         |   7 +-
 .../ownership/ProgramOwnerStoreImpl.kt        |   2 +
 .../ownership/ProgramTempOwnerStoreImpl.kt    |   2 +
 .../search/SearchGridMapper.java              |  12 +-
 .../TrackedEntityInstanceLocalQueryHelper.kt  |   7 +-
 .../TrackedEntityInstanceOnlineCache.kt       |  35 +++
 .../TrackedEntityInstanceQueryCallFactory.kt  |   7 +-
 ...EntityInstanceQueryCollectionRepository.kt |  10 +-
 .../TrackedEntityInstanceQueryDataFetcher.kt  |   3 +-
 .../TrackedEntityInstanceQueryOnlineHelper.kt |   5 +-
 ...kedEntityInstanceQueryRepositoryScope.java |   2 +-
 ...ntityInstanceQueryRepositoryScopeHelper.kt |   7 +-
 ...TrackedEntitySearchCollectionRepository.kt |  10 +-
 .../search/TrackedEntitySearchDataFetcher.kt  |   3 +-
 .../TrackedEntitySearchDataFetcherHelper.kt   |   7 +-
 .../android/core/tracker/TrackerDIModule.kt   |  35 +++
 .../tracker/TrackerPostParentCallHelper.kt    |   5 +-
 .../TrackerExporterPackageDIModule.kt         |  42 ---
 .../tracker/importer/internal/JobQueryCall.kt |   7 +-
 .../internal/JobReportEnrollmentHandler.kt    |   7 +-
 .../internal/JobReportEventHandler.kt         |   7 +-
 .../internal/JobReportFileResourceHandler.kt  |   7 +-
 .../importer/internal/JobReportHandler.kt     |   7 +-
 .../internal/JobReportRelationshipHandler.kt  |   7 +-
 .../internal/JobReportTrackedEntityHandler.kt |   7 +-
 .../internal/TrackerConflictHelper.kt         |   7 +-
 .../TrackerImporterBreakTheGlassHelper.kt     |   7 +-
 .../TrackerImporterFileResourcesPostCall.kt   |   7 +-
 .../TrackerImporterPackageDIModule.kt         |  49 ----
 .../internal/TrackerImporterPostCall.kt       |   7 +-
 .../TrackerImporterProgramOwnerPostCall.kt    |   7 +-
 .../internal/TrackerJobModuleWiper.kt         |   7 +-
 .../internal/TrackerJobObjectHandler.kt       |   7 +-
 .../internal/TrackerJobObjectStoreImpl.kt     |   2 +
 .../interpreters/InterpreterHelper.kt         |   7 +-
 .../interpreters/InterpreterSelector.kt       |   7 +-
 .../android/core/usecase/UseCaseDIModule.kt   |  35 +++
 .../core/usecase/UseCaseModuleDownloader.kt   |   7 +-
 .../usecase/internal/UseCaseModuleImpl.kt     |   7 +-
 .../usecase/internal/UseCaseModuleWiper.kt    |   7 +-
 .../internal/UseCasePackageDIModule.kt        |  58 -----
 .../stock/StockUseCaseCollectionRepository.kt |   7 +-
 .../stock/internal/StockUseCaseCall.kt        |   7 +-
 .../internal/StockUseCaseEntityDIModule.kt    |  42 ---
 .../stock/internal/StockUseCaseHandler.kt     |   7 +-
 .../stock/internal/StockUseCaseStoreImpl.kt   |   2 +
 .../StockUseCaseTransactionEntityDIModule.kt  |  42 ---
 .../StockUseCaseTransactionLinkHandler.kt     |   7 +-
 .../StockUseCaseTransactionLinkStoreImpl.kt   |   2 +
 .../stock/internal/StockUseCaseTransformer.kt |   7 +-
 .../user/AuthenticatedUserObjectRepository.kt |   7 +-
 .../user/AuthorityCollectionRepository.kt     |   7 +-
 .../user/UserCredentialsObjectRepository.kt   |   7 +-
 .../dhis/android/core/user/UserDIModule.kt    |  35 +++
 .../android/core/user/UserObjectRepository.kt |   7 +-
 .../core/user/UserRoleCollectionRepository.kt |   7 +-
 .../core/user/internal/AccountManagerImpl.kt  |   7 +-
 .../AuthenticatedUserEntityDIModule.kt        |  42 ---
 .../internal/AuthenticatedUserStoreImpl.kt    |   2 +
 .../internal/AuthorityEndpointCallFactory.kt  |   7 +-
 .../user/internal/AuthorityEntityDIModule.kt  |  42 ---
 .../core/user/internal/AuthorityHandler.kt    |   7 +-
 .../core/user/internal/AuthorityService.java  |   2 +-
 .../core/user/internal/AuthorityStoreImpl.kt  |   2 +
 .../internal/IsUserLoggedInCallableFactory.kt |   5 +-
 .../android/core/user/internal/LogInCall.kt   |   7 +-
 .../user/internal/LogInDatabaseManager.kt     |   7 +-
 .../core/user/internal/LogInExceptions.kt     |   7 +-
 .../android/core/user/internal/LogOutCall.kt  |   5 +-
 .../UserAccountDisabledErrorCatcher.kt        |   7 +-
 .../UserAuthenticateCallErrorCatcher.kt       |   7 +-
 .../android/core/user/internal/UserCall.kt    |   7 +-
 .../core/user/internal/UserEntityDIModule.kt  |  42 ---
 .../android/core/user/internal/UserHandler.kt |   7 +-
 .../core/user/internal/UserInternalModule.kt  |   7 +-
 .../user/internal/UserModuleDownloader.kt     |   7 +-
 .../core/user/internal/UserModuleImpl.kt      |   7 +-
 ...serModuleWiper.java => UserModuleWiper.kt} |  58 ++---
 .../UserOrganisationUnitLinkEntityDIModule.kt |  42 ---
 .../UserOrganisationUnitLinkHandler.kt        |   7 +-
 .../UserOrganisationUnitLinkStoreImpl.kt      |   2 +
 .../core/user/internal/UserPackageDIModule.kt |  63 -----
 .../user/internal/UserRoleChildrenAppender.kt |   7 +-
 .../internal/UserRoleCollectionCleaner.kt     |   7 +-
 .../user/internal/UserRoleEntityDIModule.kt   |  42 ---
 .../core/user/internal/UserRoleHandler.kt     |   7 +-
 .../core/user/internal/UserRoleStoreImpl.kt   |   2 +
 .../core/user/internal/UserStoreImpl.kt       |   2 +
 .../UserUserCredentialsTransformer.kt         |   7 +-
 .../user/openid/OpenIDConnectHandlerImpl.kt   |   7 +-
 .../user/openid/OpenIDConnectLogoutHandler.kt |   9 +-
 .../openid/OpenIDConnectTokenRefresher.kt     |   7 +-
 .../core/validation/ValidationDIModule.kt     |  35 +++
 .../ValidationRuleCollectionRepository.kt     |   7 +-
 .../engine/internal/ValidationEngineImpl.kt   |   5 +-
 .../engine/internal/ValidationExecutor.kt     |   5 +-
 ...DataSetValidationRuleLinkEntityDIModule.kt |  42 ---
 .../DataSetValidationRuleLinkHandler.kt       |   7 +-
 .../DataSetValidationRuleLinkStoreImpl.kt     |   2 +
 .../internal/ValidationModuleImpl.java        |  62 -----
 .../ValidationModuleImpl.kt}                  |  25 +-
 ...uleWiper.java => ValidationModuleWiper.kt} |  46 ++--
 .../internal/ValidationPackageDIModule.kt     |  62 -----
 .../validation/internal/ValidationRuleCall.kt |   8 +-
 .../ValidationRuleCollectionCleaner.kt        |   7 +-
 .../internal/ValidationRuleEntityDIModule.kt  |  42 ---
 .../internal/ValidationRuleHandler.kt         |   7 +-
 .../internal/ValidationRuleStoreImpl.kt       |   2 +
 .../internal/ValidationRuleUidsCallImpl.kt    |   7 +-
 .../VisualizationCollectionRepository.kt      |   7 +-
 .../visualization/VisualizationDIModule.kt    |  35 +++
 .../internal/VisualizationCall.kt             |   7 +-
 .../VisualizationCollectionCleaner.kt         |   7 +-
 ...isualizationDimensionItemEntityDIModule.kt |  43 ----
 .../VisualizationDimensionItemHandler.kt      |   7 +-
 .../VisualizationDimensionItemStoreImpl.kt    |   2 +
 .../internal/VisualizationEntityDIModule.kt   |  43 ----
 .../internal/VisualizationHandler.kt          |   7 +-
 .../internal/VisualizationInternalModule.kt   |   7 +-
 .../internal/VisualizationModuleDownloader.kt |   7 +-
 .../internal/VisualizationModuleImpl.kt       |   7 +-
 .../internal/VisualizationModuleWiper.kt      |   7 +-
 .../internal/VisualizationPackageDIModule.kt  |  54 ----
 .../internal/VisualizationStoreImpl.kt        |   2 +
 .../core/wipe/internal/D2ModuleWipers.kt      |   7 +-
 .../android/core/wipe/internal/TableWiper.kt  |   7 +-
 .../core/wipe/internal/WipeDIModule.kt        |  19 +-
 .../core/wipe/internal/WipeModuleImpl.kt      |   2 +
 .../internal/EnrollmentHandlerShould.kt       |   8 +-
 .../internal/conflicts/BaseConflictShould.kt  |   7 +-
 .../ProgramIndicatorExecutorShould.kt         |  10 +-
 ...ckedEntityInstanceQueryDataSourceShould.kt |   7 +-
 990 files changed, 4785 insertions(+), 12319 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.java
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.java
 rename core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/{PeriodStoreIntegrationShould.java => PeriodStoreIntegrationShould.kt} (50%)
 create mode 100644 core/src/main/assets/migrations/152.sql
 rename core/src/main/java/org/hisp/dhis/android/core/analytics/{aggregated/AggregatedEntityDIModule.kt => AnalyticsDIModule.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{fileresource/internal/FileResourcePackageDIModule.kt => arch/ArchDIModule.kt} (72%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIExecutorsDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/{APIClientDIModule.java => APIClientDIModule.kt} (63%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponentFactory.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{resource/internal/ResourceEntityDIModule.kt => arch/db/access/internal/DatabaseDIModule.kt} (83%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.java
 rename core/src/main/java/org/hisp/dhis/android/core/{map/layer/internal/bing/BingEntityDIModule.kt => arch/json/internal/JSONSerializationDIModule.kt} (82%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{indicator/datasetindicatorengine/IndicatorEngineEntityDIModule.kt => attribute/AttributeDIModule.kt} (83%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/attribute/internal/{AttributeEntityDIModule.kt => AttributeModuleWiper.kt} (76%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/CategoryDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/common/{internal/CommonPackageDIModule.kt => CommonDIModule.kt} (73%)
 rename core/src/main/java/org/hisp/dhis/android/core/common/internal/{CommonModuleWiper.java => CommonModuleWiper.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{category/internal/CategoryEntityDIModule.kt => configuration/internal/ConfigurationDIModule.kt} (75%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/ConstantDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/{dataapproval/internal/DataApprovalPackageDIModule.kt => constant/internal/ConstantModuleImpl.kt} (78%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/{legendset/internal/LegendEntityDIModule.kt => constant/internal/ConstantModuleWiper.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/{systeminfo/internal/SystemInfoEntityDIModule.kt => dataelement/internal/DataElementModuleImpl.kt} (77%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementModuleWiper.java => DataElementModuleWiper.kt} (72%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetPackageDIModule.kt => DataSetModuleImpl.kt} (50%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetModuleWiper.java => DataSetModuleWiper.kt} (63%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{datavalue/internal/DataValueConflictEntityDIModule.kt => datastore/DataStoreDIModule.kt} (79%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/{DataValuePackageDIModule.kt => DataValueModuleImpl.kt} (73%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/domain/DomainDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/{EnrollmentPackageDIModule.kt => EnrollmentModuleWiper.kt} (73%)
 rename core/src/main/java/org/hisp/dhis/android/core/event/{search/EventQueryEntityDIModule.kt => EventDIModule.kt} (84%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/event/internal/{EventDataFilterEntityDIModule.kt => EventModuleWiper.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/{event/internal/EventSyncEntityDIModule.kt => fileresource/FileResourceDIModule.kt} (78%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/imports/ImportsDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/imports/internal/{TrackerImportConflictEntityDIModule.kt => ImportModuleImpl.kt} (73%)
 rename core/src/main/java/org/hisp/dhis/android/core/imports/internal/{ImportPackageDIModule.kt => ImportModuleWiper.kt} (75%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{DataSetIndicatorEntityDIModule.kt => IndicatorModuleImpl.kt} (64%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/{imports/internal/ImportModuleWiper.java => indicator/internal/IndicatorModuleWiper.kt} (68%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/internal/{LegendPackageDIModule.kt => LegendSetModuleImpl.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/legendset/internal/{LegendSetEntityDIModule.kt => LegendSetModuleWiper.kt} (69%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenanceDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/{MaintenancePackageDIModule.kt => MaintenanceModuleImpl.kt} (62%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/{ForeignKeyViolationEntityDIModule.kt => MaintenanceModuleWiper.kt} (71%)
 rename core/src/main/java/org/hisp/dhis/android/core/{attribute/internal/AttributePackageDIModule.kt => map/MapDIModule.kt} (90%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/note/NoteDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.java
 rename core/src/main/java/org/hisp/dhis/android/core/{configuration/internal/ConfigurationPackageDIModule.kt => note/internal/NoteDHISVersionManager.kt} (58%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/note/internal/{NotePackageDIModule.kt => NoteModuleImpl.kt} (85%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/OptionDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/option/internal/{OptionPackageDIModule.kt => OptionModuleImpl.kt} (63%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/{enrollment/internal/EnrollmentModuleWiper.java => option/internal/OptionModuleWiper.kt} (66%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitPackageDIModule.kt => OrganisationUnitModuleImpl.kt} (57%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitModuleWiper.java => OrganisationUnitModuleWiper.kt} (66%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/parser/internal/ParserDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/period/{internal/PeriodPackageDIModule.kt => PeriodDIModule.kt} (77%)
 rename core/src/main/java/org/hisp/dhis/android/core/period/internal/{PeriodForDataSetManager.java => PeriodForDataSetManager.kt} (50%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.java
 rename core/src/main/java/org/hisp/dhis/android/core/period/internal/{PeriodEntityDIModule.kt => PeriodHandler.kt} (82%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/{datavalue/internal/DataValueEntityDIModule.kt => period/internal/PeriodModuleWiper.kt} (75%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/ProgramDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/program/internal/{ProgramModuleWiper.java => ProgramModuleWiper.kt} (58%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipPackageDIModule.kt => RelationshipModuleImpl.kt} (65%)
 rename core/src/main/java/org/hisp/dhis/android/core/relationship/internal/{RelationshipModuleWiper.java => RelationshipModuleWiper.kt} (70%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/resource/internal/{ResourcePackageDIModule.kt => ResourceDIModule.kt} (92%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/{note/internal/NoteEntityDIModule.kt => resource/internal/ResourceModuleWiper.kt} (77%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/SettingsDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.java
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.kt
 rename core/src/main/java/org/hisp/dhis/android/core/settings/internal/{SettingModuleWiper.java => SettingModuleWiper.kt} (77%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/sms/{internal => }/SmsDIModule.kt (87%)
 rename core/src/main/java/org/hisp/dhis/android/core/sms/internal/{SmsModuleImpl.java => SmsModuleImpl.kt} (56%)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.java
 rename core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/{PingEntityDIModule.kt => SystemInfoModuleWiper.kt} (77%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/trackedentity/{search/TrackedEntityInstanceQueryEntityDIModule.kt => TrackedEntityDIModule.kt} (75%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineCache.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/UserDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{UserModuleWiper.java => UserModuleWiper.kt} (64%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/ValidationDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.java
 rename core/src/main/java/org/hisp/dhis/android/core/validation/{engine/internal/ValidationEngineEntityDIModule.kt => internal/ValidationModuleImpl.kt} (72%)
 rename core/src/main/java/org/hisp/dhis/android/core/validation/internal/{ValidationModuleWiper.java => ValidationModuleWiper.kt} (72%)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index d2ef050236..5fde06114b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 buildscript {
-    val kotlinVersion = "1.9.0"
+    val kotlinVersion = "1.9.10"
 
     repositories {
         google()
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 1400ad0581..2404072f25 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -28,6 +28,7 @@
 
 plugins {
     id("com.android.library")
+    id("com.google.devtools.ksp") version "1.9.10-1.0.13"
     id("kotlin-android")
     id("kotlin-kapt")
     id("io.gitlab.arturbosch.detekt") version "1.21.0"
@@ -64,7 +65,6 @@ val autoValue = "1.10.2"
 val autoValueCursor = "2.0.1"
 val retrofit = "2.9.0"
 val okHttp = "4.10.0"
-val dagger = "2.47"
 val rxJava = "2.2.21"
 val rxAndroid = "2.1.1"
 val sqlCipher = "4.4.3"
@@ -74,6 +74,8 @@ val expressionParser = "1.0.33"
 // Kotlin
 val kotlinxDatetime = "0.4.0"
 val coroutines = "1.6.4"
+val koin = "3.5.0"
+val koinKsp = "1.3.0"
 
 // test dependencies
 val coreTesting = "2.2.0"
@@ -126,6 +128,9 @@ android {
     }
 
     sourceSets {
+        sourceSets.getByName("main") {
+            java.srcDirs("build/generated/ksp/main/kotlin")
+        }
         sourceSets.getByName("test") {
             resources.srcDirs("src/sharedTest/resources")
         }
@@ -165,9 +170,10 @@ dependencies {
     api("com.google.auto.value:auto-value-annotations:$autoValue")
     kapt("com.google.auto.value:auto-value:$autoValue")
 
-    // Dagger
-    api("com.google.dagger:dagger:$dagger")
-    kapt("com.google.dagger:dagger-compiler:$dagger")
+    // Koin
+    implementation("io.insert-koin:koin-core:$koin")
+    implementation("io.insert-koin:koin-annotations:$koinKsp")
+    ksp("io.insert-koin:koin-ksp-compiler:$koinKsp")
 
     // Jackson
     api("com.fasterxml.jackson.core:jackson-databind:$jackson")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
index bc4b583e16..57a23fd391 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MockIntegrationTestObjects.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core
 
 import android.util.Log
 import org.hisp.dhis.android.core.D2Factory.clear
-import org.hisp.dhis.android.core.D2Factory.forNewDatabase
 import org.hisp.dhis.android.core.arch.d2.internal.D2DIComponent
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.mockwebserver.Dhis2MockServer
@@ -38,11 +37,11 @@ import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.utils.integration.mock.MockIntegrationTestDatabaseContent
 import java.io.IOException
 import java.util.*
-import kotlin.Throws
 
-class MockIntegrationTestObjects(val content: MockIntegrationTestDatabaseContent) {
-
-    val d2: D2 = forNewDatabase()
+class MockIntegrationTestObjects(
+    val d2: D2,
+    val content: MockIntegrationTestDatabaseContent,
+) {
     val databaseAdapter: DatabaseAdapter = d2.databaseAdapter()
 
     private var serverDate = Date()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
index ad860a8e2e..bc8fe499e4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/MultiUserMockIntegrationShould.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
+import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
 import org.hisp.dhis.android.core.data.category.CategoryOptionSamples
 import org.hisp.dhis.android.core.mockwebserver.Dhis2MockServer
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
@@ -101,7 +102,7 @@ class MultiUserMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
         @AfterClass
         @JvmStatic
         fun tearDownTestClass() {
-            d2.userModule().accountManager().setMaxAccounts(1)
+            d2.userModule().accountManager().setMaxAccounts(MultiUserDatabaseManager.DefaultTestMaxAccounts)
         }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
index 698200d415..5652ca1ce8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/BaseEvaluatorIntegrationShould.kt
@@ -209,7 +209,6 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
 
     @Before
     fun setUpBase() {
-        println("AAAA setUpBase")
         organisationUnitLevelStore.insert(level1)
         organisationUnitLevelStore.insert(level2)
 
@@ -262,7 +261,6 @@ internal open class BaseEvaluatorIntegrationShould : BaseMockIntegrationTestEmpt
 
     @After
     fun tearDown() {
-        println("AAAA tearDown")
         organisationUnitLevelStore.delete()
         organisationUnitStore.delete()
         organisationUnitGroupStore.delete()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index ca5531cc58..91630f051f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -57,7 +57,7 @@ class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Before
     fun setUp() {
-        store = objects.d2DIComponent.categoryOptionStore()
+        store = objects.d2DIComponent.categoryOptionStore
         allValues = store.selectWhere("1", orderByClause, 8)
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.kt
index d44dfa310a..0e74fcba09 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyCollectionRepositoryImplIntegrationShould.kt
@@ -114,7 +114,7 @@ class ReadOnlyCollectionRepositoryImplIntegrationShould : BaseMockIntegrationTes
         fun setUpTestClass() {
             setUpClass()
             typeMap = RelationshipTypeSamples.typeMap
-            val handler = objects.d2DIComponent.relationshipTypeHandler()
+            val handler = objects.d2DIComponent.relationshipTypeHandler
             handler.handle(RelationshipTypeSamples.RELATIONSHIP_TYPE_1)
             handler.handle(RelationshipTypeSamples.RELATIONSHIP_TYPE_2)
             relationshipTypeCollectionRepository = d2.relationshipModule().relationshipTypes()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
index bed4797c36..12c2fc1f05 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould.kt
@@ -129,8 +129,8 @@ class ReadOnlyIdentifiableCollectionRepositoryImplIntegrationShould : BaseMockIn
         @JvmStatic
         fun setUpTestClass() {
             setUpClass()
-            val rtHandler = objects.d2DIComponent.relationshipTypeHandler()
-            val tetHandler = objects.d2DIComponent.trackedEntityTypeHandler()
+            val rtHandler = objects.d2DIComponent.relationshipTypeHandler
+            val tetHandler = objects.d2DIComponent.trackedEntityTypeHandler
 
             tetHandler.handle(TrackedEntityTypeSamples.get())
             rtHandler.handle(RelationshipTypeSamples.RELATIONSHIP_TYPE_1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
index 547a8680f9..a4f8729e58 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboEndpointCallRealIntegrationShould.kt
@@ -45,7 +45,7 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
         assertNotCombosInDB()
         assertThat(categoryCategoryComboLinks.isEmpty()).isTrue()
 
-        val categoryComboEndpointCall = getD2DIComponent(d2).internalModules().category.categoryComboCall.download(
+        val categoryComboEndpointCall = getD2DIComponent(d2).internalModules.category.categoryComboCall.download(
             setOf("bjDvmb4bfuf"),
         )
         val categoryCombos = categoryComboEndpointCall
@@ -63,7 +63,7 @@ class CategoryComboEndpointCallRealIntegrationShould : BaseRealIntegrationTest()
     }
 
     private fun downloadCategories() = runTest {
-        getD2DIComponent(d2).internalModules().category.categoryCall.download(
+        getD2DIComponent(d2).internalModules.category.categoryCall.download(
             setOf("GLevLNI9wkl"),
         )
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
index 07b4775a3b..acd89a2674 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallRealIntegrationShould.kt
@@ -36,7 +36,7 @@ class CategoryEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     // @Test
     fun call_categories_endpoint() = runTest {
         d2.userModule().logIn(username, password, url).blockingGet()
-        val categoryEndpointCall = getD2DIComponent(d2).internalModules().category.categoryCall.download(
+        val categoryEndpointCall = getD2DIComponent(d2).internalModules.category.categoryCall.download(
             setOf("cX5k9anHEHd"),
         )
         val categories = categoryEndpointCall
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
index 8eaff79549..a670d5fe2d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryEndpointCallShould.kt
@@ -40,7 +40,7 @@ class CategoryEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable() {
     fun download_category_successfully() = runTest {
         dhis2MockServer.enqueueMockResponse("category/categories.json")
 
-        val categoriesSingle = objects.d2DIComponent.internalModules().category.categoryCall.download(
+        val categoriesSingle = objects.d2DIComponent.internalModules.category.categoryCall.download(
             setOf("vGs6omsRekv", "KfdsGBcoiCa", "cX5k9anHEHd", "x3uo8LqiTBk"),
         )
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
index 97eaf33d59..43b0602222 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
@@ -51,7 +51,7 @@ class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             "P3jJH5Tu5VC",
             "FQ2o8UBlcrS",
         )
-        return getD2DIComponent(d2).dataElementCallFactory().create(uids)
+        return getD2DIComponent(d2).dataElementCallFactory.create(uids)
     }
 
     // @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
index a4d4a46669..70b2409ce9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
@@ -47,7 +47,7 @@ class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     private fun createCall(): Callable<List<DataSet>> {
-        return getD2DIComponent(d2).dataSetCallFactory().create(setOf("lyLU2wR22tC", "BfMAe6Itzgt"))
+        return getD2DIComponent(d2).dataSetCallFactory.create(setOf("lyLU2wR22tC", "BfMAe6Itzgt"))
     }
 
     // @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
index b3efbb5678..d3a157402b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionCallShould.kt
@@ -57,9 +57,9 @@ class OptionCallShould : BaseMockIntegrationTestEmptyEnqueable() {
             "Z1ILwhy5VDY",
         )
 
-        optionCall = { objects.d2DIComponent.optionCall().download(uids) }
+        optionCall = { objects.d2DIComponent.optionCall.download(uids) }
 
-        coroutineAPICallExecutor = objects.d2DIComponent.coroutineApiCallExecutor()
+        coroutineAPICallExecutor = objects.d2DIComponent.coroutineApiCallExecutor
         executeOptionSetCall()
     }
 
@@ -103,7 +103,7 @@ class OptionCallShould : BaseMockIntegrationTestEmptyEnqueable() {
                 val uids: MutableSet<String> = HashSet()
                 uids.add("POc7DkGU3QU")
 
-                optionSets = objects.d2DIComponent.optionSetCall().download(uids)
+                optionSets = objects.d2DIComponent.optionSetCall.download(uids)
             } catch (ignored: Exception) {
             }
             ForeignKeyCleanerImpl.create(databaseAdapter).cleanForeignKeyErrors()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.java
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
index 9ca71cf65c..572a244eef 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/option/OptionSetCallShould.kt
@@ -54,9 +54,9 @@ class OptionSetCallShould : BaseMockIntegrationTestEmptyEnqueable() {
         val uids: MutableSet<String> = HashSet()
         uids.add("POc7DkGU3QU")
 
-        optionSetCall = { objects.d2DIComponent.optionSetCall().download(uids) }
+        optionSetCall = { objects.d2DIComponent.optionSetCall.download(uids) }
 
-        coroutineAPICallExecutor = objects.d2DIComponent.coroutineApiCallExecutor()
+        coroutineAPICallExecutor = objects.d2DIComponent.coroutineApiCallExecutor
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
index eea6fee900..143dcfdac3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
@@ -31,7 +31,6 @@ import android.content.ContentValues
 import com.google.common.truth.Truth.assertThat
 import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.data.organisationunit.OrganisationUnitSamples
@@ -43,14 +42,15 @@ import org.hisp.dhis.android.core.program.ProgramTableInfo
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
 import org.hisp.dhis.android.core.user.UserTableInfo
+import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStoreImpl
+import org.hisp.dhis.android.core.user.internal.UserStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyEnqueable
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.AfterClass
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.IOException
 
 @RunWith(D2JunitRunner::class)
 class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
@@ -60,7 +60,6 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
     private val expectedAdonkiaCHP = OrganisationUnitSamples.getAdonkiaCHP()
 
     @Before
-    @Throws(IOException::class)
     fun setUp() {
         dhis2MockServer.enqueueMockResponse("organisationunit/admin_organisation_units.json")
         val orgUnit = OrganisationUnit.builder().uid("O6uvpzGd5pu").path("/ImspTQPwCqd/O6uvpzGd5pu").build()
@@ -71,10 +70,10 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
 
         // Create a user with the root as assigned organisation unit (for the test):
         val user = UserInternalAccessor.insertOrganisationUnits(User.builder(), organisationUnits)
-            .uid("user_uid").build()
+            .uid(userId).build()
         databaseAdapter.insert(UserTableInfo.TABLE_INFO.name(), null, user.toContentValues())
         val userContentValues = ContentValues()
-        userContentValues.put(IdentifiableColumns.UID, "user_uid")
+        userContentValues.put(IdentifiableColumns.UID, userId)
         databaseAdapter.insert(UserTableInfo.TABLE_INFO.name(), null, userContentValues)
 
         // inserting programs for creating OrgUnitProgramLinks
@@ -85,7 +84,7 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
         insertDataSet()
         val organisationUnitHandler = OrganisationUnitHandler(
             OrganisationUnitStoreImpl(databaseAdapter),
-            LinkHandlerImpl(UserOrganisationUnitLinkStoreImpl(databaseAdapter)),
+            UserOrganisationUnitLinkHandler(UserOrganisationUnitLinkStoreImpl(databaseAdapter)),
             OrganisationUnitProgramLinkHandler(OrganisationUnitProgramLinkStoreImpl(databaseAdapter)),
             DataSetOrganisationUnitLinkHandler(DataSetOrganisationUnitLinkStoreImpl(databaseAdapter)),
             OrganisationUnitGroupHandler(OrganisationUnitGroupStoreImpl(databaseAdapter)),
@@ -149,12 +148,15 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
     }
 
     companion object {
+        private const val userId = "user_uid"
+
         @AfterClass
         @JvmStatic
-        fun tearDown() {
+        fun tearDownClass() {
             d2.databaseAdapter().delete(ProgramTableInfo.TABLE_INFO.name())
             d2.databaseAdapter().delete(DataSetTableInfo.TABLE_INFO.name())
             d2.databaseAdapter().delete(CategoryComboTableInfo.TABLE_INFO.name())
+            UserStoreImpl(d2.databaseAdapter()).delete(userId)
         }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.kt
similarity index 50%
rename from core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java
rename to core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.kt
index 799b45e7d4..61f518a7b7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/period/internal/PeriodStoreIntegrationShould.kt
@@ -25,55 +25,48 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.period.internal
 
-package org.hisp.dhis.android.core.period.internal;
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould
+import org.hisp.dhis.android.core.data.period.PeriodSamples
+import org.hisp.dhis.android.core.period.Period
+import org.hisp.dhis.android.core.period.PeriodTableInfo
+import org.hisp.dhis.android.core.period.PeriodType
+import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory.createFixed
+import org.hisp.dhis.android.core.period.internal.ParentPeriodGeneratorImpl.Companion.create
+import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.Date
 
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.data.database.ObjectWithoutUidStoreAbstractIntegrationShould;
-import org.hisp.dhis.android.core.data.period.PeriodSamples;
-import org.hisp.dhis.android.core.period.Period;
-import org.hisp.dhis.android.core.period.PeriodTableInfo;
-import org.hisp.dhis.android.core.period.PeriodType;
-import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory;
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+@RunWith(D2JunitRunner::class)
+class PeriodStoreIntegrationShould : ObjectWithoutUidStoreAbstractIntegrationShould<Period>(
+    PeriodStoreImpl(TestDatabaseAdapterFactory.get()),
+    PeriodTableInfo.TABLE_INFO,
+    TestDatabaseAdapterFactory.get(),
+) {
+    private val periodStore: PeriodStore = PeriodStoreImpl(TestDatabaseAdapterFactory.get())
 
-import java.text.ParseException;
-import java.util.Date;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(D2JunitRunner.class)
-public class PeriodStoreIntegrationShould extends ObjectWithoutUidStoreAbstractIntegrationShould<Period> {
-
-    private PeriodStore periodStore;
-
-    public PeriodStoreIntegrationShould() {
-        super(new PeriodStoreImpl(TestDatabaseAdapterFactory.get()), PeriodTableInfo.TABLE_INFO,
-                TestDatabaseAdapterFactory.get());
-        this.periodStore = new PeriodStoreImpl(TestDatabaseAdapterFactory.get());
+    override fun buildObject(): Period {
+        return PeriodSamples.getPeriod()
     }
 
-    @Override
-    protected Period buildObject() {
-        return PeriodSamples.getPeriod();
-    }
-
-    @Override
-    protected Period buildObjectToUpdate() {
+    override fun buildObjectToUpdate(): Period {
         return PeriodSamples.getPeriod().toBuilder()
-                .startDate(new Date())
-                .build();
+            .startDate(Date())
+            .build()
     }
 
     @Test
-    public void select_correct_period_passing_period_type_and_a_date() throws ParseException {
-        new PeriodHandler(periodStore, ParentPeriodGeneratorImpl.create(CalendarProviderFactory.createFixed())).generateAndPersist();
-
-        Period period = periodStore.selectPeriodByTypeAndDate(PeriodType.SixMonthly,
-                BaseIdentifiableObject.DATE_FORMAT.parse("2019-03-02T12:24:25.319"));
-
-        assertThat(period.periodId()).isEqualTo("2019S1");
+    fun select_correct_period_passing_period_type_and_a_date() {
+        PeriodHandler(periodStore, create(createFixed())).generateAndPersist()
+        val period = periodStore.selectPeriodByTypeAndDate(
+            PeriodType.SixMonthly,
+            DateUtils.DATE_FORMAT.parse("2019-03-02T12:24:25.319"),
+        )
+        assertThat(period!!.periodId()).isEqualTo("2019S1")
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
index b1d7972931..465dd51e43 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallMockIntegrationShould.kt
@@ -118,7 +118,7 @@ class ProgramEndpointCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnq
                 databaseAdapter.insert(ProgramStageTableInfo.TABLE_INFO.name(), null, programStage)
                 dhis2MockServer.enqueueMockResponse("program/programs.json")
                 runBlocking {
-                    objects.d2DIComponent.programCall().download(Sets.newSet(programUid))
+                    objects.d2DIComponent.programCall.download(Sets.newSet(programUid))
                 }
 
                 Unit()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt
index b053c83867..0c5f01c20c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramEndpointCallRealIntegrationShould.kt
@@ -47,7 +47,7 @@ class ProgramEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     private fun createCall(): List<Program> = runBlocking {
-        return@runBlocking getD2DIComponent(d2).programCall().download(setOf("lxAQ7Zs9VYR", "AwNmMxxakEo"))
+        return@runBlocking getD2DIComponent(d2).programCall.download(setOf("lxAQ7Zs9VYR", "AwNmMxxakEo"))
     }
 
     // @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
index 868362febf..6ddf0a2522 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/internal/BasePayloadGeneratorMockIntegration.kt
@@ -263,7 +263,7 @@ open class BasePayloadGeneratorMockIntegration : BaseMockIntegrationTestMetadata
         @Throws(Exception::class)
         fun setUp() {
             setUpClass()
-            oldTrackerPayloadGenerator = objects.d2DIComponent.oldTrackerImporterPayloadGenerator()
+            oldTrackerPayloadGenerator = objects.d2DIComponent.oldTrackerImporterPayloadGenerator
             teiStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
             teiDataValueStore = TrackedEntityDataValueStoreImpl(databaseAdapter)
             eventStore = EventStoreImpl(databaseAdapter)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt
index 6b2f5eeb64..bfe2973fe0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/OpenIdConnectRealIntegrationShould.kt
@@ -35,7 +35,7 @@ class OpenIdConnectRealIntegrationShould : BaseRealIntegrationTest() {
 
     // @Test(expected = D2Error::class)
     fun throw_error_when_not_passing_token() {
-        val logInCall = getD2DIComponent(d2).internalModules().user.logInCall
+        val logInCall = getD2DIComponent(d2).internalModules.user.logInCall
         runBlocking {
             logInCall.blockingLogInOpenIDConnect(url, AuthState())
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
index 318ec07b10..a183f5cc45 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/LogoutCallRealIntegrationShould.kt
@@ -60,7 +60,7 @@ class LogoutCallRealIntegrationShould : BaseRealIntegrationTest() {
 
         val authenticatedUser = authenticatedUserStore!!.selectFirst()
         assertThat(authenticatedUser).isNotNull()
-        assertThat(getD2DIComponent(d2).credentialsSecureStore().get()).isNull()
+        assertThat(getD2DIComponent(d2).credentialsSecureStore.get()).isNull()
     }
 
     // @Test
@@ -74,12 +74,12 @@ class LogoutCallRealIntegrationShould : BaseRealIntegrationTest() {
 
         var authenticatedUser = authenticatedUserStore!!.selectFirst()
         assertThat(authenticatedUser).isNotNull()
-        assertThat(getD2DIComponent(d2).credentialsSecureStore().get()).isNull()
+        assertThat(getD2DIComponent(d2).credentialsSecureStore.get()).isNull()
 
         d2.userModule().logIn(username, password, url).blockingGet()
         authenticatedUser = authenticatedUserStore!!.selectFirst()
         assertThat(authenticatedUser).isNotNull()
-        assertThat(getD2DIComponent(d2).credentialsSecureStore().get()).isNull()
+        assertThat(getD2DIComponent(d2).credentialsSecureStore.get()).isNull()
     }
 
     // @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt
index ac7c4cdbdf..26b1bb7b68 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateWithEncryptionMockIntegrationShould.kt
@@ -28,18 +28,21 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
-import org.hisp.dhis.android.core.D2
-import org.hisp.dhis.android.core.D2Factory.clear
-import org.hisp.dhis.android.core.D2Factory.forNewDatabase
-import org.hisp.dhis.android.core.mockwebserver.Dhis2MockServer
+import org.hisp.dhis.android.core.data.server.RealServerMother
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestEmptyDispatcher
 import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
-import org.junit.AfterClass
-import org.junit.BeforeClass
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(D2JunitRunner::class)
-class UserAuthenticateWithEncryptionMockIntegrationShould {
+class UserAuthenticateWithEncryptionMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher() {
+
+    @Before
+    fun setUp() {
+        tryLogout()
+    }
+
     @Test
     fun return_false_for_blocking_is_logged_when_not_logged() {
         assertThat(d2.userModule().blockingIsLogged()).isFalse()
@@ -92,29 +95,14 @@ class UserAuthenticateWithEncryptionMockIntegrationShould {
         DatabaseAdapterFactory.setExperimentalEncryption(false);
     }*/
     private fun logIn() {
-        d2.userModule().blockingLogIn("test_user", "test_password", dhis2MockServer.baseEndpoint)
+        freshLogin(
+            RealServerMother.username,
+            RealServerMother.password,
+            dhis2MockServer.baseEndpoint,
+        )
     }
 
     private fun logOut() {
         d2.userModule().blockingLogOut()
     }
-
-    companion object {
-        private lateinit var d2: D2
-        private lateinit var dhis2MockServer: Dhis2MockServer
-
-        @BeforeClass
-        @JvmStatic
-        fun setUpClass() {
-            d2 = forNewDatabase()
-            dhis2MockServer = Dhis2MockServer(0)
-            dhis2MockServer.setRequestDispatcher()
-        }
-
-        @AfterClass
-        @JvmStatic
-        fun tearDown() {
-            clear()
-        }
-    }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
index a6fa0192c7..66c834138c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
@@ -47,7 +47,7 @@ class UserCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
     @Before
     fun setUp() {
         userStore = UserStoreImpl(databaseAdapter)
-        userCall = objects.d2DIComponent.internalModules().user.userCall
+        userCall = objects.d2DIComponent.internalModules.user.userCall
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt
index cfabf56b5f..2ad13ea217 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTest.kt
@@ -68,6 +68,24 @@ abstract class BaseMockIntegrationTest {
             return tuple.isNewInstance
         }
 
+        fun freshLogin(username: String, password: String, url: String) {
+            try {
+                d2.userModule().logOut().blockingAwait()
+            } catch (e: RuntimeException) {
+                // Do nothing
+            } finally {
+                d2.userModule().blockingLogIn(username, password, url)
+            }
+        }
+
+        fun tryLogout() {
+            try {
+                d2.userModule().logOut().blockingAwait()
+            } catch (e: RuntimeException) {
+                // Do nothing
+            }
+        }
+
         @JvmStatic
         fun removeObjects(content: MockIntegrationTestDatabaseContent) {
             MockIntegrationTestObjectsFactory.removeObjects(content)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
index 5595292834..93adc53403 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyDispatcher.kt
@@ -37,13 +37,13 @@ abstract class BaseMockIntegrationTestEmptyDispatcher : BaseMockIntegrationTest(
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.EmptyDispatcher)
             if (isNewInstance) {
-                objects.dhis2MockServer.setRequestDispatcher()
-                objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username,
-                    RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint,
-                )
+                dhis2MockServer.setRequestDispatcher()
             }
+            freshLogin(
+                RealServerMother.username,
+                RealServerMother.password,
+                dhis2MockServer.baseEndpoint,
+            )
         }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
index 78747f946b..e79d2219a0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestEmptyEnqueable.kt
@@ -36,14 +36,12 @@ abstract class BaseMockIntegrationTestEmptyEnqueable : BaseMockIntegrationTest()
         @JvmStatic
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.EmptyEnqueable)
-            if (isNewInstance || !objects.d2.userModule().blockingIsLogged()) {
-                dhis2MockServer.enqueueLoginResponses()
-                objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username,
-                    RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint,
-                )
-            }
+            dhis2MockServer.enqueueLoginResponses()
+            freshLogin(
+                RealServerMother.username,
+                RealServerMother.password,
+                dhis2MockServer.baseEndpoint,
+            )
         }
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
index bcbaf75e91..a9e7ec2c63 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestFullDispatcher.kt
@@ -51,9 +51,9 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
         @JvmStatic
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.FullDispatcher)
+            dhis2MockServer.setRequestDispatcher()
+            freshLogin("android", "Android123", dhis2MockServer.baseEndpoint)
             if (isNewInstance) {
-                dhis2MockServer.setRequestDispatcher()
-                freshLogin()
                 downloadMetadata()
                 downloadTrackedEntityInstances()
                 downloadEvents()
@@ -72,16 +72,6 @@ abstract class BaseMockIntegrationTestFullDispatcher : BaseMockIntegrationTest()
             dhis2MockServer.shutdown()
         }
 
-        private fun freshLogin() {
-            try {
-                d2.userModule().logOut().blockingAwait()
-            } catch (e: RuntimeException) {
-                // Do nothing
-            } finally {
-                d2.userModule().blockingLogIn("android", "Android123", dhis2MockServer.baseEndpoint)
-            }
-        }
-
         private fun downloadMetadata() {
             d2.metadataModule().blockingDownload()
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
index 6f58261f86..eebd49c104 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher.kt
@@ -44,14 +44,12 @@ abstract class BaseMockIntegrationTestLocalAnalyticsSuperLargeDispatcher : BaseM
         @JvmStatic
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.LocalAnalyticsSuperLargeDispatcher)
-            if (isNewInstance) {
-                objects.dhis2MockServer.setRequestDispatcher()
-                objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username,
-                    RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint!!,
-                )
-            }
+            dhis2MockServer.setRequestDispatcher()
+            freshLogin(
+                RealServerMother.username,
+                RealServerMother.password,
+                dhis2MockServer.baseEndpoint!!,
+            )
 
             objects.d2.let {
                 val filler = LocalAnalyticsDatabaseFiller(it)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
index fd678d9b49..795f24bc2c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataDispatcher.kt
@@ -37,14 +37,14 @@ abstract class BaseMockIntegrationTestMetadataDispatcher : BaseMockIntegrationTe
         @JvmStatic
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.MetadataDispatcher)
+            dhis2MockServer.setRequestDispatcher()
+            freshLogin(
+                RealServerMother.username,
+                RealServerMother.password,
+                dhis2MockServer.baseEndpoint,
+            )
             if (isNewInstance) {
-                objects.dhis2MockServer.setRequestDispatcher()
-                objects.d2.userModule().blockingLogIn(
-                    RealServerMother.username,
-                    RealServerMother.password,
-                    objects.dhis2MockServer.baseEndpoint,
-                )
-                objects.d2.metadataModule().blockingDownload()
+                d2.metadataModule().blockingDownload()
             }
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
index 17bc4023d6..92f2c54230 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/BaseMockIntegrationTestMetadataEnqueable.kt
@@ -35,15 +35,15 @@ abstract class BaseMockIntegrationTestMetadataEnqueable : BaseMockIntegrationTes
         @JvmStatic
         fun setUpClass() {
             val isNewInstance = setUpClass(MockIntegrationTestDatabaseContent.MetadataEnqueable)
+            dhis2MockServer.enqueueLoginResponses()
+            freshLogin(
+                "android",
+                "Android123",
+                dhis2MockServer.baseEndpoint,
+            )
             if (isNewInstance) {
-                objects.dhis2MockServer.enqueueLoginResponses()
-                objects.d2.userModule().blockingLogIn(
-                    "android",
-                    "Android123",
-                    objects.dhis2MockServer.baseEndpoint,
-                )
-                objects.dhis2MockServer.enqueueMetadataResponses()
-                objects.d2.metadataModule().blockingDownload()
+                dhis2MockServer.enqueueMetadataResponses()
+                d2.metadataModule().blockingDownload()
             }
         }
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt
index 736dd2a3ce..b75c879b35 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/integration/mock/MockIntegrationTestObjectsFactory.kt
@@ -27,17 +27,29 @@
  */
 package org.hisp.dhis.android.core.utils.integration.mock
 
+import org.hisp.dhis.android.core.D2
+import org.hisp.dhis.android.core.D2Factory
 import org.hisp.dhis.android.core.MockIntegrationTestObjects
+import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
+import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory.setFixed
 
 internal object MockIntegrationTestObjectsFactory {
     private val instances: MutableMap<MockIntegrationTestDatabaseContent, MockIntegrationTestObjects> = HashMap()
 
+    private val d2: D2
+
+    init {
+        setFixed()
+        d2 = D2Factory.forNewDatabase()
+        d2.userModule().accountManager().setMaxAccounts(MultiUserDatabaseManager.DefaultTestMaxAccounts)
+    }
+
     fun getObjects(content: MockIntegrationTestDatabaseContent): IntegrationTestObjectsWithIsNewInstance {
         val instance = instances[content]
         return if (instance != null) {
             IntegrationTestObjectsWithIsNewInstance(instance, false)
         } else {
-            val newInstance = MockIntegrationTestObjects(content)
+            val newInstance = MockIntegrationTestObjects(d2, content)
             instances[content] = newInstance
             IntegrationTestObjectsWithIsNewInstance(newInstance, true)
         }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
index f1b2bda097..c2b2830e5d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
@@ -28,8 +28,6 @@
 package org.hisp.dhis.android.core.utils.runner
 
 import android.util.Log
-import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory.setFixed
-import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory.setRegular
 import org.hisp.dhis.android.core.utils.DatabaseRemover
 import org.hisp.dhis.android.core.utils.integration.mock.MockIntegrationTestObjectsFactory.tearDown
 import org.hisp.dhis.android.core.utils.integration.mock.TestDatabaseAdapterFactory
@@ -40,13 +38,11 @@ import org.junit.runner.notification.RunListener
 class D2JunitTestListener : RunListener() {
     override fun testRunStarted(description: Description) {
         Log.e("D2JunitTestListener", "Test run started")
-        setFixed()
     }
 
     override fun testRunFinished(result: Result) {
         Log.i("D2JunitTestListener", "Test run finished")
         TestDatabaseAdapterFactory.tearDown()
-        setRegular()
         tearDown()
         DatabaseRemover.removeAllDatabases()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
index 2f8f87666e..dd04a3bd55 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEndpointCallShould.kt
@@ -53,7 +53,7 @@ class VisualizationEndpointCallShould : BaseMockIntegrationTestEmptyEnqueable()
         dhis2MockServer.enqueueMockResponse("visualization/visualizations_2.json")
         d2.databaseAdapter().setForeignKeyConstraintsEnabled(false)
 
-        var visualizations = objects.d2DIComponent.internalModules().visualization.visualizationCall.download(
+        var visualizations = objects.d2DIComponent.internalModules.visualization.visualizationCall.download(
             HashSet(
                 Lists.newArrayList("PYBH8ZaAQnC", "FAFa11yFeFe"),
             ),
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
index 218c1bcd3e..7dd36fcd9a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/wipe/WipeDBCallMockIntegrationShould.kt
@@ -65,7 +65,6 @@ class WipeDBCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
 
     @Test
     fun have_empty_database_when_wipe_db_after_sync_data() {
-        givenAFreshLoginInDatabase()
         activateSMSModule()
         givenAMetadataInDatabase()
         givenDataInDatabase()
@@ -78,16 +77,6 @@ class WipeDBCallMockIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         assertThatDatabase(databaseAdapter).isEmpty
     }
 
-    private fun givenAFreshLoginInDatabase() {
-        try {
-            d2.userModule().logOut().blockingAwait()
-        } catch (e: RuntimeException) {
-            // Do nothing
-        } finally {
-            d2.userModule().blockingLogIn("android", "Android123", dhis2MockServer.baseEndpoint)
-        }
-    }
-
     private fun activateSMSModule() {
         d2.smsModule().configCase().setModuleEnabled(true).blockingAwait()
     }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
index bc504ebd07..c2668690b4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/localanalytics/dbgeneration/LocalAnalyticsDatabaseFiller.kt
@@ -91,7 +91,7 @@ internal class LocalAnalyticsDatabaseFiller(private val d2: D2) {
         val trackerDataElements = generator.getDataElementsTracker(defaultCategoryCombo)
         DataElementStoreImpl(da).insert(aggregatedDataElements + trackerDataElements)
 
-        d2DIComponent.periodHandler().generateAndPersist()
+        d2DIComponent.periodHandler.generateAndPersist()
 
         val programs = generator.getPrograms(defaultCategoryCombo)
         ProgramStoreImpl(da).insert(programs)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
index ff962d46ab..1e338e583e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceAddMockIntegrationShould.kt
@@ -48,13 +48,11 @@ class FileResourceAddMockIntegrationShould : BaseMockIntegrationTestEmptyDispatc
         val file = storeFile()
         assertThat(file.exists()).isTrue()
 
-        val fileResources1 = d2.fileResourceModule().fileResources().blockingGet()
-
-        assertThat(fileResources1.size).isEqualTo(0)
+        val initialFileResources = d2.fileResourceModule().fileResources().blockingGet()
 
         val fileResourceUid = d2.fileResourceModule().fileResources().blockingAdd(file)
-        val fileResources2 = d2.fileResourceModule().fileResources().blockingGet()
-        assertThat(fileResources2.size).isEqualTo(1)
+        val finalFileResources = d2.fileResourceModule().fileResources().blockingGet()
+        assertThat(finalFileResources.size).isEqualTo(initialFileResources.size + 1)
 
         val fileResource = d2.fileResourceModule().fileResources()
             .uid(fileResourceUid)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt
index 16618b024a..fce03e3002 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/BaseTrackerConflictMockIntegrationShould.kt
@@ -58,7 +58,7 @@ internal abstract class BaseTrackerConflictMockIntegrationShould : BaseMockInteg
     fun generate_correct_display_descriptions_for_error() {
         val trackerConflictHelper = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector(),
+            objects.d2DIComponent.interpreterSelector,
         )
         val trackerImportConflict = trackerConflictHelper.getConflictBuilder(errorReport).build()
         assertThat(trackerImportConflict.displayDescription()).isEqualTo(expectedDescription)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
index 4b2729f9e9..486f05c89b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
@@ -44,7 +44,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
     fun generate_correct_display_descriptions_if_passing_correct_error_report() {
         val trackerImportConflict = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector(),
+            objects.d2DIComponent.interpreterSelector,
         ).getConflictBuilder(errorReport).build()
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo(
@@ -57,7 +57,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
     fun return_default_message_when_passing_wrong_error_report() {
         val trackerImportConflict = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector(),
+            objects.d2DIComponent.interpreterSelector,
         ).getConflictBuilder(wrongCodeErrorReport).build()
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo("Event: `event1`, Enrollment value is NULL.")
@@ -67,7 +67,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
     fun generate_correct_display_descriptions_for_E1000_error() {
         val trackerImportConflict = TrackerConflictHelper(
             InstrumentationRegistry.getInstrumentation().context,
-            objects.d2DIComponent.interpreterSelector(),
+            objects.d2DIComponent.interpreterSelector,
         ).getConflictBuilder(errorReportE1000).build()
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo("You do not have access to Ngelehun CHC")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt
index 5b340b98a2..1ce17450f0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/AccountManagerMockIntegrationShould.kt
@@ -44,18 +44,29 @@ import java.util.*
 
 @RunWith(D2JunitRunner::class)
 class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
+
+    private val user1 = "username1"
+    private val pass1 = "password1"
+    private val user2 = "username2"
+    private val pass2 = "password2"
+
     @Test
     fun find_accounts_after_login() {
+        val initialAccountSize = d2.userModule().accountManager().getAccounts().size
+
         if (d2.userModule().blockingIsLogged()) {
             d2.userModule().blockingLogOut()
         }
         dhis2MockServer.enqueueLoginResponses()
-        d2.userModule().blockingLogIn("u1", "pass1", dhis2MockServer.baseEndpoint)
+        d2.userModule().blockingLogIn(user1, pass1, dhis2MockServer.baseEndpoint)
 
         val accountList = d2.userModule().accountManager().getAccounts()
 
-        assertThat(accountList.size).isEqualTo(1)
-        assertThat(accountList[0].username()).isEqualTo("u1")
+        assertThat(accountList.size).isEqualTo(initialAccountSize + 1)
+        val account = accountList.find { it.username() == user1 }
+        assertThat(account).isNotNull()
+
+        loginAndDeleteAccount(user1, pass1, dhis2MockServer)
     }
 
     @Test
@@ -63,7 +74,7 @@ class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
         d2.userModule().accountManager().setMaxAccounts(5)
         assertThat(d2.userModule().accountManager().getMaxAccounts()).isEqualTo(5)
 
-        val defaultMaxAccounts = MultiUserDatabaseManager.DefaultMaxAccounts
+        val defaultMaxAccounts = MultiUserDatabaseManager.DefaultTestMaxAccounts
         d2.userModule().accountManager().setMaxAccounts(defaultMaxAccounts)
         assertThat(d2.userModule().accountManager().getMaxAccounts()).isEqualTo(defaultMaxAccounts)
     }
@@ -73,7 +84,7 @@ class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
         d2.userModule().accountManager().setMaxAccounts(null)
         assertThat(d2.userModule().accountManager().getMaxAccounts()).isNull()
 
-        d2.userModule().accountManager().setMaxAccounts(MultiUserDatabaseManager.DefaultMaxAccounts)
+        d2.userModule().accountManager().setMaxAccounts(MultiUserDatabaseManager.DefaultTestMaxAccounts)
     }
 
     @Test
@@ -82,14 +93,17 @@ class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
             d2.userModule().blockingLogOut()
         }
         dhis2MockServer.enqueueLoginResponses()
-        d2.userModule().blockingLogIn("u1", "pass1", dhis2MockServer.baseEndpoint)
+        d2.userModule().blockingLogIn(user1, pass1, dhis2MockServer.baseEndpoint)
         try {
             d2.userModule().accountManager().deleteCurrentAccount()
             val accountList = d2.userModule().accountManager().getAccounts()
-            assertThat(accountList.size).isEqualTo(0)
+            val account = accountList.find { it.username() == user1 }
+            assertThat(account).isNull()
         } catch (e: D2Error) {
             Assert.fail("Should not throw a D2Error")
         }
+
+        loginAndDeleteAccount(user1, pass1, dhis2MockServer)
     }
 
     @Test
@@ -98,7 +112,7 @@ class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
             d2.userModule().blockingLogOut()
         }
         dhis2MockServer.enqueueLoginResponses()
-        d2.userModule().blockingLogIn("u1", "pass1", dhis2MockServer.baseEndpoint)
+        d2.userModule().blockingLogIn(user1, pass1, dhis2MockServer.baseEndpoint)
         d2.userModule().blockingLogOut()
         try {
             d2.userModule().accountManager().deleteCurrentAccount()
@@ -106,50 +120,50 @@ class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
         } catch (e: D2Error) {
             assertThat(e.errorCode()).isEqualTo(D2ErrorCode.NO_AUTHENTICATED_USER)
             val accountList = d2.userModule().accountManager().getAccounts()
-            assertThat(accountList.size).isEqualTo(1)
+            val account = accountList.find { it.username() == user1 }
+            assertThat(account).isNotNull()
         } catch (e: Exception) {
             Assert.fail("Should throw a D2Error")
         }
+
+        loginAndDeleteAccount(user1, pass1, dhis2MockServer)
     }
 
     @Test
     fun evaluate_sync_status() {
+        val initialAccountSize = d2.userModule().accountManager().getAccounts().size
+
         if (d2.userModule().blockingIsLogged()) {
             d2.userModule().blockingLogOut()
         }
-        d2.userModule().accountManager().setMaxAccounts(5)
 
         dhis2MockServer.enqueueLoginResponses()
-        d2.userModule().blockingLogIn("u1", "pass1", dhis2MockServer.baseEndpoint)
+        d2.userModule().blockingLogIn(user1, pass1, dhis2MockServer.baseEndpoint)
 
         val accounts = d2.userModule().accountManager().getAccounts()
-        assertThat(accounts.size).isEqualTo(1)
-        assertThat(accounts.first().syncState()).isEqualTo(State.SYNCED)
+        assertThat(accounts.size).isEqualTo(initialAccountSize + 1)
+        val u1Account = accounts.find { it.username() == user1 }!!
+        assertThat(u1Account.syncState()).isEqualTo(State.SYNCED)
 
         d2.userModule().blockingLogOut()
 
         val server2 = Dhis2MockServer(0)
         server2.enqueueLoginResponses()
-        d2.userModule().blockingLogIn("u2", "pass2", server2.baseEndpoint)
+        d2.userModule().blockingLogIn(user2, pass2, server2.baseEndpoint)
         server2.enqueueMetadataResponses()
         d2.metadataModule().blockingDownload()
         addDataValue()
 
         val accounts2 = d2.userModule().accountManager().getAccounts()
-        assertThat(accounts2.size).isEqualTo(2)
+        assertThat(accounts2.size).isEqualTo(initialAccountSize + 2)
 
-        println(accounts2)
+        val account1 = accounts2.find { it.username() == user1 }!!
+        val account2 = accounts2.find { it.username() == user2 }!!
+        assertThat(account1.syncState()).isEqualTo(State.SYNCED)
+        assertThat(account2.syncState()).isEqualTo(State.TO_UPDATE)
 
-        accounts2.forEach { account ->
-            when (account.username()) {
-                "u1" -> assertThat(account.syncState()).isEqualTo(State.SYNCED)
-                "u2" -> assertThat(account.syncState()).isEqualTo(State.TO_UPDATE)
-                else -> Assert.fail("Should not get here")
-            }
-        }
-
-        d2.userModule().accountManager().deleteCurrentAccount()
-        d2.userModule().accountManager().setMaxAccounts(MultiUserDatabaseManager.DefaultMaxAccounts)
+        loginAndDeleteAccount(user1, pass1, dhis2MockServer)
+        loginAndDeleteAccount(user2, pass2, server2)
     }
 
     private fun addDataValue() {
@@ -163,6 +177,15 @@ class AccountManagerMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueabl
             .blockingSet("45")
     }
 
+    private fun loginAndDeleteAccount(username: String, password: String, server: Dhis2MockServer) {
+        if (d2.userModule().blockingIsLogged()) {
+            d2.userModule().blockingLogOut()
+        }
+        server.enqueueLoginResponses()
+        d2.userModule().blockingLogIn(username, password, server.baseEndpoint)
+        d2.userModule().accountManager().deleteCurrentAccount()
+    }
+
     companion object {
         @JvmStatic
         @BeforeClass
diff --git a/core/src/main/assets/migrations/152.sql b/core/src/main/assets/migrations/152.sql
new file mode 100644
index 0000000000..4436a08684
--- /dev/null
+++ b/core/src/main/assets/migrations/152.sql
@@ -0,0 +1,11 @@
+# Add ON CASCADE to Period references
+
+ALTER TABLE DataValue RENAME TO DataValue_Old;
+CREATE TABLE DataValue (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataElement TEXT NOT NULL, period TEXT NOT NULL, organisationUnit TEXT NOT NULL, categoryOptionCombo TEXT NOT NULL, attributeOptionCombo TEXT NOT NULL, value TEXT, storedBy TEXT, created TEXT, lastUpdated TEXT, comment TEXT, followUp INTEGER, syncState TEXT, deleted INTEGER, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (period) REFERENCES Period (periodId) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (categoryOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (dataElement, period, organisationUnit, categoryOptionCombo, attributeOptionCombo));
+INSERT INTO DataValue(_id, dataElement, period, organisationUnit, categoryOptionCombo, attributeOptionCombo, value, storedBy, created, lastUpdated, comment, followUp, syncState, deleted) SELECT _id, dataElement, period, organisationUnit, categoryOptionCombo, attributeOptionCombo, value, storedBy, created, lastUpdated, comment, followUp, syncState, deleted FROM DataValue_Old;
+DROP TABLE IF EXISTS DataValue_Old;
+
+ALTER TABLE DataApproval RENAME TO DataApproval_Old;
+CREATE TABLE DataApproval (_id INTEGER PRIMARY KEY AUTOINCREMENT, workflow TEXT NOT NULL, organisationUnit TEXT NOT NULL, period TEXT NOT NULL, attributeOptionCombo TEXT NOT NULL, state TEXT, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (period) REFERENCES Period (periodId) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (attributeOptionCombo, period, organisationUnit, workflow));
+INSERT INTO DataApproval(_id, workflow, organisationUnit, period, attributeOptionCombo, state) SELECT _id, workflow, organisationUnit, period, attributeOptionCombo, state FROM DataApproval_Old;
+DROP TABLE IF EXISTS DataApproval_Old;
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index 200838ee2b..e186f46bdd 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -59,7 +59,7 @@ CREATE TABLE OptionGroupOptionLink (_id INTEGER PRIMARY KEY AUTOINCREMENT, optio
 CREATE TABLE ProgramRuleAction (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, data TEXT, content TEXT, location TEXT, trackedEntityAttribute TEXT, programIndicator TEXT, programStageSection TEXT, programRuleActionType TEXT, programStage TEXT, dataElement TEXT, programRule TEXT NOT NULL, option TEXT, optionGroup TEXT, FOREIGN KEY (programRule) REFERENCES ProgramRule (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (trackedEntityAttribute) REFERENCES TrackedEntityAttribute (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programIndicator) REFERENCES ProgramIndicator (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStageSection) REFERENCES ProgramStageSection (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (option) REFERENCES Option (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (optionGroup) REFERENCES OptionGroup (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE OrganisationUnitLevel (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, level INTEGER);
 CREATE TABLE ProgramSection (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, description TEXT, program TEXT, sortOrder INTEGER, formName TEXT, color TEXT, icon TEXT, desktopRenderType TEXT, mobileRenderType TEXT, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
-CREATE TABLE DataApproval (_id INTEGER PRIMARY KEY AUTOINCREMENT, workflow TEXT NOT NULL, organisationUnit TEXT NOT NULL, period TEXT NOT NULL, attributeOptionCombo TEXT NOT NULL, state TEXT, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (period) REFERENCES Period (periodId), FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (attributeOptionCombo, period, organisationUnit, workflow));
+CREATE TABLE DataApproval (_id INTEGER PRIMARY KEY AUTOINCREMENT, workflow TEXT NOT NULL, organisationUnit TEXT NOT NULL, period TEXT NOT NULL, attributeOptionCombo TEXT NOT NULL, state TEXT, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (period) REFERENCES Period (periodId) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (attributeOptionCombo, period, organisationUnit, workflow));
 CREATE TABLE TrackedEntityAttribute (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, code TEXT, name TEXT, displayName TEXT, created TEXT, lastUpdated TEXT, shortName TEXT, displayShortName TEXT, description TEXT, displayDescription TEXT, pattern TEXT, sortOrderInListNoProgram INTEGER, optionSet TEXT, valueType TEXT, expression TEXT, programScope INTEGER, displayInListNoProgram INTEGER, generated INTEGER, displayOnVisitSchedule INTEGER, orgunitScope INTEGER, uniqueProperty INTEGER, inherit INTEGER, formName TEXT, fieldMask TEXT, color TEXT, icon TEXT, displayFormName TEXT, aggregationType TEXT, confidential INTEGER, FOREIGN KEY (optionSet) REFERENCES OptionSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE TrackerImportConflict (_id INTEGER PRIMARY KEY AUTOINCREMENT, conflict TEXT, value TEXT, trackedEntityInstance TEXT, enrollment TEXT, event TEXT, tableReference TEXT, errorCode TEXT, status TEXT, created TEXT, displayDescription TEXT, trackedEntityAttribute TEXT, dataElement TEXT, FOREIGN KEY (trackedEntityInstance) REFERENCES TrackedEntityInstance (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (enrollment) REFERENCES Enrollment (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (event) REFERENCES Event (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE DataSetOrganisationUnitLink (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSet TEXT NOT NULL, organisationUnit TEXT NOT NULL, FOREIGN KEY (dataSet) REFERENCES DataSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (organisationUnit, dataSet));
@@ -70,7 +70,7 @@ CREATE TABLE Program (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL U
 CREATE TABLE TrackedEntityInstance (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, created TEXT, lastUpdated TEXT, createdAtClient TEXT, lastUpdatedAtClient TEXT, organisationUnit TEXT, trackedEntityType TEXT, geometryType TEXT, geometryCoordinates TEXT, syncState TEXT, aggregatedSyncState TEXT, deleted INTEGER, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (trackedEntityType) REFERENCES TrackedEntityType (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE Enrollment (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, created TEXT, lastUpdated TEXT, createdAtClient TEXT, lastUpdatedAtClient TEXT, organisationUnit TEXT NOT NULL, program TEXT NOT NULL, enrollmentDate TEXT, incidentDate TEXT, followup INTEGER, status TEXT, trackedEntityInstance TEXT NOT NULL, syncState TEXT, aggregatedSyncState TEXT, geometryType TEXT, geometryCoordinates TEXT, deleted INTEGER, completedDate TEXT, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (trackedEntityInstance) REFERENCES TrackedEntityInstance (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE Event (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, enrollment TEXT, created TEXT, lastUpdated TEXT, createdAtClient TEXT, lastUpdatedAtClient TEXT, status TEXT, geometryType TEXT, geometryCoordinates TEXT, program TEXT NOT NULL, programStage TEXT NOT NULL, organisationUnit TEXT NOT NULL, eventDate TEXT, completedDate TEXT, dueDate TEXT, syncState TEXT, aggregatedSyncState TEXT, attributeOptionCombo TEXT, deleted INTEGER, assignedUser TEXT, completedBy TEXT, FOREIGN KEY (program) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (programStage) REFERENCES ProgramStage (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (enrollment) REFERENCES Enrollment (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
-CREATE TABLE DataValue (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataElement TEXT NOT NULL, period TEXT NOT NULL, organisationUnit TEXT NOT NULL, categoryOptionCombo TEXT NOT NULL, attributeOptionCombo TEXT NOT NULL, value TEXT, storedBy TEXT, created TEXT, lastUpdated TEXT, comment TEXT, followUp INTEGER, syncState TEXT, deleted INTEGER, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (period) REFERENCES Period (periodId), FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (categoryOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (dataElement, period, organisationUnit, categoryOptionCombo, attributeOptionCombo));
+CREATE TABLE DataValue (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataElement TEXT NOT NULL, period TEXT NOT NULL, organisationUnit TEXT NOT NULL, categoryOptionCombo TEXT NOT NULL, attributeOptionCombo TEXT NOT NULL, value TEXT, storedBy TEXT, created TEXT, lastUpdated TEXT, comment TEXT, followUp INTEGER, syncState TEXT, deleted INTEGER, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (period) REFERENCES Period (periodId) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (organisationUnit) REFERENCES OrganisationUnit (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (categoryOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (attributeOptionCombo) REFERENCES CategoryOptionCombo (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, UNIQUE (dataElement, period, organisationUnit, categoryOptionCombo, attributeOptionCombo));
 CREATE TABLE TrackedEntityDataValue (_id INTEGER PRIMARY KEY AUTOINCREMENT, event TEXT NOT NULL, dataElement TEXT NOT NULL, storedBy TEXT, value TEXT, created TEXT, lastUpdated TEXT, providedElsewhere INTEGER, FOREIGN KEY (event) REFERENCES Event (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (dataElement) REFERENCES DataElement (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE TrackedEntityAttributeValue (_id INTEGER PRIMARY KEY AUTOINCREMENT, created TEXT, lastUpdated TEXT, value TEXT, trackedEntityAttribute TEXT NOT NULL, trackedEntityInstance TEXT NOT NULL, FOREIGN KEY (trackedEntityAttribute) REFERENCES trackedEntityAttribute (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY (trackedEntityInstance) REFERENCES TrackedEntityInstance (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE FileResource (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT NOT NULL UNIQUE, name TEXT, created TEXT, lastUpdated TEXT, contentType TEXT, contentLength INTEGER, path TEXT, syncState TEXT, domain TEXT);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2.kt b/core/src/main/java/org/hisp/dhis/android/core/D2.kt
index d90f4e0061..020ab99b85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2.kt
@@ -70,28 +70,28 @@ import retrofit2.Retrofit
 
 @Suppress("TooManyFunctions")
 class D2 internal constructor(internal val d2DIComponent: D2DIComponent) {
-    private val modules: D2Modules = d2DIComponent.modules()
+    private val modules: D2Modules = d2DIComponent.modules
 
     @VisibleForTesting
     fun retrofit(): Retrofit {
-        return d2DIComponent.retrofit()
+        return d2DIComponent.retrofit
     }
 
     @VisibleForTesting
     internal fun coroutineAPICallExecutor(): CoroutineAPICallExecutor {
-        return d2DIComponent.coroutineApiCallExecutor()
+        return d2DIComponent.coroutineApiCallExecutor
     }
 
     fun databaseAdapter(): DatabaseAdapter {
-        return d2DIComponent.databaseAdapter()
+        return d2DIComponent.databaseAdapter
     }
 
     fun metadataModule(): WithProgressDownloader {
-        return d2DIComponent.metadataModule()
+        return d2DIComponent.metadataModule
     }
 
     fun aggregatedModule(): AggregatedModule {
-        return d2DIComponent.aggregatedModule()
+        return d2DIComponent.aggregatedModule
     }
 
     fun analyticsModule(): AnalyticsModule {
@@ -221,7 +221,7 @@ class D2 internal constructor(internal val d2DIComponent: D2DIComponent) {
     }
 
     fun wipeModule(): WipeModule {
-        return d2DIComponent.wipeModule()
+        return d2DIComponent.wipeModule
     }
 
     fun smsModule(): SmsModule {
@@ -229,6 +229,6 @@ class D2 internal constructor(internal val d2DIComponent: D2DIComponent) {
     }
 
     internal fun context(): Context {
-        return d2DIComponent.appContext()
+        return d2DIComponent.appContext
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
index cc7b1bbf4c..952f4f8cf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/D2Manager.kt
@@ -34,11 +34,13 @@ import org.hisp.dhis.android.core.D2ConfigurationValidator.validateAndSetDefault
 import org.hisp.dhis.android.core.NotClosedObjectsDetector.enableNotClosedObjectsDetection
 import org.hisp.dhis.android.core.arch.api.ssl.internal.SSLContextInitializer
 import org.hisp.dhis.android.core.arch.d2.internal.D2DIComponent
+import org.hisp.dhis.android.core.arch.d2.internal.D2DIComponentFactory
 import org.hisp.dhis.android.core.arch.storage.internal.AndroidInsecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.AndroidSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.SecureStore
+import org.koin.ksp.generated.*
 
 /**
  * Helper class that offers static methods to setup and initialize the D2 instance. Also, it ensures that D2 is a
@@ -94,7 +96,7 @@ object D2Manager {
             val insecureStore = testingInsecureStore ?: AndroidInsecureStore(context)
 
             val d2Configuration = validateAndSetDefaultValues(d2Config)
-            d2DIComponent = D2DIComponent.create(d2Configuration, secureStore, insecureStore)
+            d2DIComponent = D2DIComponentFactory.create(d2Configuration, secureStore, insecureStore)
 
             if (isTestMode) {
                 enableNotClosedObjectsDetection()
@@ -104,10 +106,10 @@ object D2Manager {
                 SSLContextInitializer.initializeSSLContext()
             }
 
-            val multiUserDatabaseManager = d2DIComponent.multiUserDatabaseManagerForD2Manager()
+            val multiUserDatabaseManager = d2DIComponent.multiUserDatabaseManagerForD2Manager
             multiUserDatabaseManager.applyMigration()
 
-            val credentials = d2DIComponent.credentialsSecureStore().get()
+            val credentials = d2DIComponent.credentialsSecureStore.get()
 
             if (wantToImportDBForExternalTesting()) {
                 multiUserDatabaseManager.loadDbForTesting(
@@ -124,7 +126,7 @@ object D2Manager {
 
             if (credentials != null) {
                 d2!!.userModule().user().blockingGet()?.uid()?.let { uid ->
-                    d2DIComponent.userIdInMemoryStore().set(uid)
+                    d2DIComponent.userIdInMemoryStore.set(uid)
                 }
             }
 
@@ -169,7 +171,7 @@ object D2Manager {
     @VisibleForTesting
     @JvmStatic
     fun removeCredentials() {
-        d2DIComponent.credentialsSecureStore().remove()
+        d2DIComponent.credentialsSecureStore.remove()
     }
 
     @VisibleForTesting
@@ -178,8 +180,8 @@ object D2Manager {
         if (testingServerUrl.isNullOrEmpty()) {
             throw NoSuchFieldException("No testing Server Url")
         }
-        d2DIComponent.credentialsSecureStore().set(Credentials(username, testingServerUrl!!, password, null))
-        d2DIComponent.userIdInMemoryStore().set(username)
+        d2DIComponent.credentialsSecureStore.set(Credentials(username, testingServerUrl!!, password, null))
+        d2DIComponent.userIdInMemoryStore.set(username)
     }
 
     private fun wantToImportDBForExternalTesting(): Boolean {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AggregatedEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsDIModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AggregatedEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsDIModule.kt
index 5a35f52a99..cbaaa1ed55 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/AggregatedEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsDIModule.kt
@@ -25,39 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.analytics.aggregated
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsRepositoryImpl
+package org.hisp.dhis.android.core.analytics
+
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsRepositoryParams
-import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsVisualizationsRepositoryImpl
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsVisualizationsRepositoryParams
+import org.hisp.dhis.android.core.analytics.linelist.EventLineListParams
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-internal class AggregatedEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun analytics(impl: AnalyticsRepositoryImpl): AnalyticsRepository {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun visualizations(impl: AnalyticsVisualizationsRepositoryImpl): AnalyticsVisualizationsRepository {
-        return impl
+@ComponentScan
+internal class AnalyticsDIModule {
+    @Singleton
+    fun eventLineListParams(): EventLineListParams {
+        return EventLineListParams()
     }
 
-    @Provides
-    @Reusable
+    @Singleton
     fun emptyAnalyticsParams(): AnalyticsRepositoryParams {
         return AnalyticsRepositoryParams(listOf(), listOf())
     }
 
-    @Provides
-    @Reusable
+    @Singleton
     fun emptyAnalyticsVisualizationsParam(): AnalyticsVisualizationsRepositoryParams {
         return AnalyticsVisualizationsRepositoryParams(null, null, null)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt
index d49c2bd3c2..4f78431fc2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsModuleImpl.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.analytics
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsRepository
 import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsVisualizationsRepository
 import org.hisp.dhis.android.core.analytics.linelist.EventLineListRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsModuleImpl @Inject constructor(
+@Singleton
+internal class AnalyticsModuleImpl(
     private val eventLineListRepository: EventLineListRepository,
     private val analyticsRepository: AnalyticsRepository,
     private val analyticsVisualizationsRepository: AnalyticsVisualizationsRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt
deleted file mode 100644
index eca9bfd5c1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/AnalyticsPackageDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.analytics
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.analytics.aggregated.AggregatedEntityDIModule
-import org.hisp.dhis.android.core.analytics.linelist.LineListEntityDIModule
-
-@Module(
-    includes = [
-        AggregatedEntityDIModule::class,
-        LineListEntityDIModule::class,
-    ],
-)
-internal class AnalyticsPackageDIModule {
-
-    @Provides
-    @Reusable
-    fun module(impl: AnalyticsModuleImpl): AnalyticsModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
index f281811cb6..89f90264af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/LegendEvaluator.kt
@@ -33,10 +33,11 @@ import org.hisp.dhis.android.core.indicator.IndicatorCollectionRepository
 import org.hisp.dhis.android.core.legendset.LegendCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("TooGenericExceptionCaught")
-internal class LegendEvaluator @Inject constructor(
+internal class LegendEvaluator(
     private val dataElementRepository: DataElementCollectionRepository,
     private val programIndicatorRepository: ProgramIndicatorCollectionRepository,
     private val indicatorRepository: IndicatorCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
index 825f876713..1c4cc89d67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsOrganisationUnitHelper.kt
@@ -38,9 +38,10 @@ import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLeve
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrganisationUnitGroupLinkStore
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsOrganisationUnitHelper @Inject constructor(
+@Singleton
+internal class AnalyticsOrganisationUnitHelper(
     private val userOrganisationUnitStore: UserOrganisationUnitLinkStore,
     private val organisationUnitStore: OrganisationUnitStore,
     private val organisationUnitLevelStore: OrganisationUnitLevelStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt
index fcab21ab63..058cdcef05 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsRepositoryImpl.kt
@@ -36,9 +36,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionalResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.common.AggregationType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsRepositoryImpl @Inject constructor(
+@Singleton
+internal class AnalyticsRepositoryImpl(
     private val params: AnalyticsRepositoryParams,
     private val analyticsService: AnalyticsService,
 ) : AnalyticsRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt
index 9a2eaf4690..6a17cfa285 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsService.kt
@@ -35,9 +35,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionalResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.antlr.ParserException
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsService @Inject constructor(
+@Singleton
+internal class AnalyticsService(
     private val analyticsServiceDimensionHelper: AnalyticsServiceDimensionHelper,
     private val analyticsServiceMetadataHelper: AnalyticsServiceMetadataHelper,
     private val analyticsServiceEvaluatorHelper: AnalyticsServiceEvaluatorHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt
index 5e6b3d7576..f3439aeba6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceDimensionHelper.kt
@@ -33,9 +33,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.Dimension
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsServiceDimensionHelper @Inject constructor(
+@Singleton
+internal class AnalyticsServiceDimensionHelper(
     private val periodGenerator: ParentPeriodGenerator,
     private val periodHelper: PeriodHelper,
     private val analyticsOrganisationUnitHelper: AnalyticsOrganisationUnitHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
index ec20fff0f3..1ecb61fa9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceEvaluatorHelper.kt
@@ -40,9 +40,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.EventD
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ExpressionDimensionItemEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.IndicatorEvaluator
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.ProgramIndicatorSQLEvaluator
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsServiceEvaluatorHelper @Inject constructor(
+@Singleton
+internal class AnalyticsServiceEvaluatorHelper(
     private val dataElementEvaluator: DataElementSQLEvaluator,
     private val programIndicatorEvaluator: ProgramIndicatorSQLEvaluator,
     private val indicatorEvaluator: IndicatorEvaluator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
index d1b35abf22..1b6a5f1eb8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsServiceMetadataHelper.kt
@@ -48,10 +48,11 @@ import org.hisp.dhis.android.core.period.internal.PeriodHelper
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("LongParameterList")
-internal class AnalyticsServiceMetadataHelper @Inject constructor(
+internal class AnalyticsServiceMetadataHelper(
     private val categoryStore: CategoryStore,
     private val categoryOptionStore: CategoryOptionStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt
index 8d0ac7fc7c..e40feb17d8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsRepositoryImpl.kt
@@ -34,9 +34,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsVisualizationsRe
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.GridAnalyticsResponse
 import org.hisp.dhis.android.core.arch.helpers.Result
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsVisualizationsRepositoryImpl @Inject constructor(
+@Singleton
+internal class AnalyticsVisualizationsRepositoryImpl(
     private val params: AnalyticsVisualizationsRepositoryParams,
     private val service: AnalyticsVisualizationsService,
 ) : AnalyticsVisualizationsRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
index 48a8c440be..9db5518296 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsService.kt
@@ -35,9 +35,10 @@ import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.visualization.LegendStrategy
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsVisualizationsService @Inject constructor(
+@Singleton
+internal class AnalyticsVisualizationsService(
     private val analyticsRepository: AnalyticsRepository,
     private val visualizationCollectionRepository: VisualizationCollectionRepository,
     private val dimensionHelper: AnalyticsVisualizationsServiceDimensionHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
index 9bb199ba11..93da4b86d4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/AnalyticsVisualizationsServiceDimensionHelper.kt
@@ -44,9 +44,10 @@ import org.hisp.dhis.android.core.visualization.DataDimensionItemType
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticsVisualizationsServiceDimensionHelper @Inject constructor(
+@Singleton
+internal class AnalyticsVisualizationsServiceDimensionHelper(
     private val categoryStore: CategoryStore,
     private val categoryOptionLinkStore: CategoryCategoryOptionLinkStore,
     private val organisationUnitLevelStore: OrganisationUnitLevelStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
index a635dd6599..891a5e6f22 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/DataElementSQLEvaluator.kt
@@ -39,11 +39,12 @@ import org.hisp.dhis.android.core.common.AggregationType
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.period.PeriodTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo.Columns as dvColumns
 import org.hisp.dhis.android.core.period.PeriodTableInfo.Columns as peColumns
 
-internal class DataElementSQLEvaluator @Inject constructor(
+@Singleton
+internal class DataElementSQLEvaluator(
     private val databaseAdapter: DatabaseAdapter,
 ) : AnalyticsEvaluator {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
index bb4054d97a..31c3e0e844 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/EventDataItemSQLEvaluator.kt
@@ -41,11 +41,12 @@ import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo.Columns as tavColumns
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo.Columns as dvColumns
 
-internal class EventDataItemSQLEvaluator @Inject constructor(
+@Singleton
+internal class EventDataItemSQLEvaluator(
     private val databaseAdapter: DatabaseAdapter,
 ) : AnalyticsEvaluator {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
index d731951c36..6df9ca0719 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ExpressionDimensionItemEvaluator.kt
@@ -32,9 +32,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.expressiondimensionitemengine.ExpressionDimensionItemEngine
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class ExpressionDimensionItemEvaluator @Inject constructor(
+@Singleton
+internal class ExpressionDimensionItemEvaluator(
     private val expressionDimensionItemEngine: ExpressionDimensionItemEngine,
 ) : AnalyticsEvaluator {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
index d73a9266d4..25c707c939 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorEvaluator.kt
@@ -32,9 +32,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine.IndicatorEngine
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class IndicatorEvaluator @Inject constructor(
+@Singleton
+internal class IndicatorEvaluator(
     private val indicatorEngine: IndicatorEngine,
 ) : AnalyticsEvaluator {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
index 78bb9fed25..bcb86b5e69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/IndicatorSQLEvaluator.kt
@@ -31,9 +31,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indicatorengine.IndicatorSQLEngine
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class IndicatorSQLEvaluator @Inject constructor(
+@Singleton
+internal class IndicatorSQLEvaluator(
     private val indicatorEngine: IndicatorSQLEngine,
 ) : AnalyticsEvaluator {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
index 31f1ab20a1..aee15146bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorEvaluator.kt
@@ -42,9 +42,10 @@ import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.enrollment
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLUtils.event
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class ProgramIndicatorEvaluator @Inject constructor(
+@Singleton
+internal class ProgramIndicatorEvaluator(
     private val eventStore: EventStore,
     private val enrollmentStore: EnrollmentStore,
     private val programIndicatorEngine: ProgramIndicatorEngine,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
index ce3ad0e7a7..393cc19d0c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/ProgramIndicatorSQLEvaluator.kt
@@ -32,9 +32,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.parser.internal.expression.QueryMods
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorSQLExecutor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class ProgramIndicatorSQLEvaluator @Inject constructor(
+@Singleton
+internal class ProgramIndicatorSQLEvaluator(
     private val programIndicatorSQLExecutor: ProgramIndicatorSQLExecutor,
 ) : AnalyticsEvaluator {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
index ed26822b84..e68f411a46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngine.kt
@@ -29,9 +29,10 @@ package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analy
 
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.CommonParser
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticExpressionEngine @Inject constructor(
+@Singleton
+internal class AnalyticExpressionEngine(
     private val visitor: CommonExpressionVisitor,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
index 10755b4b11..674cd58e2e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/analyticexpressionengine/AnalyticExpressionEngineFactory.kt
@@ -44,9 +44,10 @@ import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItemMetho
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class AnalyticExpressionEngineFactory @Inject constructor(
+@Singleton
+internal class AnalyticExpressionEngineFactory(
     private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt
index 6045b4d30f..a2c507dcd3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/expressiondimensionitemengine/ExpressionDimensionItemEngine.kt
@@ -34,9 +34,10 @@ import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.analyt
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class ExpressionDimensionItemEngine @Inject constructor(
+@Singleton
+internal class ExpressionDimensionItemEngine(
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
     private val expressionService: ExpressionService,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
index c9d9b2c34e..387ca84000 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorContext.kt
@@ -31,16 +31,15 @@ package org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.indic
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.evaluator.AnalyticsEvaluator
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.internal.ProgramStore
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 
 internal data class IndicatorContext(
-    val dataElementStore: IdentifiableObjectStore<DataElement>,
-    val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
+    val dataElementStore: DataElementStore,
+    val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     val categoryOptionComboStore: CategoryOptionComboStore,
     val programStore: ProgramStore,
     val programIndicatorRepository: ProgramIndicatorCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
index 159697294b..288cdf9dd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorEngine.kt
@@ -35,9 +35,10 @@ import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class IndicatorEngine @Inject constructor(
+@Singleton
+internal class IndicatorEngine(
     private val indicatorTypeStore: IndicatorTypeStore,
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
     private val expressionService: ExpressionService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
index 9484f52feb..e015134468 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/internal/evaluator/indicatorengine/IndicatorSQLEngine.kt
@@ -35,9 +35,10 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class IndicatorSQLEngine @Inject constructor(
+@Singleton
+internal class IndicatorSQLEngine(
     private val indicatorTypeStore: IndicatorTypeStore,
     private val analyticExpressionEngineFactory: AnalyticExpressionEngineFactory,
     private val databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt
deleted file mode 100644
index 871bcc6ed0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsRepository.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.analytics.aggregated.mock
-
-import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.analytics.AnalyticsException
-import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
-import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsRepository
-import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
-import org.hisp.dhis.android.core.analytics.aggregated.DimensionalResponse
-import org.hisp.dhis.android.core.arch.helpers.Result
-import org.hisp.dhis.android.core.common.AggregationType
-import javax.inject.Inject
-
-@Reusable
-class MockAnalyticsRepository @Inject constructor() : AnalyticsRepository {
-
-    override fun withDimension(dimensionItem: DimensionItem): AnalyticsRepository = this
-
-    override fun withFilter(dimensionItem: DimensionItem): AnalyticsRepository = this
-
-    override fun withLegendStrategy(analyticsLegendStrategy: AnalyticsLegendStrategy): AnalyticsRepository = this
-
-    override fun withAggregationType(aggregationType: AggregationType): AnalyticsRepository = this
-
-    override fun evaluate(): Single<Result<DimensionalResponse, AnalyticsException>> {
-        return Single.fromCallable { blockingEvaluate() }
-    }
-
-    override fun blockingEvaluate(): Result<DimensionalResponse, AnalyticsException> =
-        Result.Success(DimensionalResponseSamples.sample1)
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt
deleted file mode 100644
index 869527f8da..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/aggregated/mock/MockAnalyticsVisualizationsRepository.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.analytics.aggregated.mock
-
-import dagger.Reusable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.analytics.AnalyticsException
-import org.hisp.dhis.android.core.analytics.aggregated.AnalyticsVisualizationsRepository
-import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
-import org.hisp.dhis.android.core.analytics.aggregated.GridAnalyticsResponse
-import org.hisp.dhis.android.core.arch.helpers.Result
-import javax.inject.Inject
-
-@Reusable
-class MockAnalyticsVisualizationsRepository @Inject constructor() : AnalyticsVisualizationsRepository {
-
-    override fun withVisualization(visualization: String): AnalyticsVisualizationsRepository {
-        return MockAnalyticsVisualizationsRepository()
-    }
-
-    override fun withPeriods(periods: List<DimensionItem.PeriodItem>): AnalyticsVisualizationsRepository {
-        return MockAnalyticsVisualizationsRepository()
-    }
-
-    override fun withOrganisationUnits(
-        orgUnits: List<DimensionItem.OrganisationUnitItem>,
-    ): AnalyticsVisualizationsRepository {
-        return MockAnalyticsVisualizationsRepository()
-    }
-
-    override fun evaluate(): Single<Result<GridAnalyticsResponse, AnalyticsException>> {
-        return Single.fromCallable { blockingEvaluate() }
-    }
-
-    override fun blockingEvaluate(): Result<GridAnalyticsResponse, AnalyticsException> =
-        Result.Success(GridAnalyticsResponseSamples.sample1)
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt
index 2d87583587..1151499ac6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListRepositoryImpl.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.analytics.linelist
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.analytics.AnalyticsLegendStrategy
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.OrganisationUnitFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.PeriodsFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventLineListRepositoryImpl @Inject constructor(
+@Singleton
+internal class EventLineListRepositoryImpl(
     private val eventLineListService: EventLineListService,
     private val eventLineListParams: EventLineListParams,
 ) : EventLineListRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
index 2724266ce4..67a66a37c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/EventLineListServiceImpl.kt
@@ -43,10 +43,11 @@ import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("LongParameterList")
-internal class EventLineListServiceImpl @Inject constructor(
+internal class EventLineListServiceImpl(
     private val eventRepository: EventCollectionRepository,
     private val dataValueRepository: TrackedEntityDataValueCollectionRepository,
     private val dataElementRepository: DataElementCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListEntityDIModule.kt
deleted file mode 100644
index 0e66324117..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/analytics/linelist/LineListEntityDIModule.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.analytics.linelist
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-
-@Module
-internal class LineListEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun eventLineListService(impl: EventLineListServiceImpl): EventLineListService {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun eventLineListRepository(impl: EventLineListRepositoryImpl): EventLineListRepository {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun eventLineListParams(): EventLineListParams {
-        return EventLineListParams()
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/ArchDIModule.kt
similarity index 72%
rename from core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/ArchDIModule.kt
index ab46501185..9c3ee033b7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/ArchDIModule.kt
@@ -25,30 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.fileresource.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.fileresource.FileResourceModule
-import retrofit2.Retrofit
+package org.hisp.dhis.android.core.arch
+
+import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule
+import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseDIModule
+import org.hisp.dhis.android.core.arch.json.internal.JSONSerializationDIModule
+import org.hisp.dhis.android.core.arch.repositories.di.internal.RepositoriesDIModule
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
 
 @Module(
     includes = [
-        FileResourceEntityDIModule::class,
+        APIClientDIModule::class,
+        DatabaseDIModule::class,
+        JSONSerializationDIModule::class,
+        RepositoriesDIModule::class,
     ],
 )
-internal class FileResourcePackageDIModule {
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): FileResourceService {
-        return retrofit.create(FileResourceService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: FileResourceModuleImpl): FileResourceModule {
-        return impl
-    }
-}
+@ComponentScan
+internal class ArchDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt
index fe5441a9b3..abfb1d6ed0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/CookieAuthenticatorHelper.kt
@@ -29,11 +29,10 @@ package org.hisp.dhis.android.core.arch.api.authentication.internal
 
 import okhttp3.Request
 import okhttp3.Response
-import javax.inject.Inject
-import javax.inject.Singleton
+import org.koin.core.annotation.Singleton
 
 @Singleton
-internal class CookieAuthenticatorHelper @Inject constructor() {
+internal class CookieAuthenticatorHelper {
 
     companion object {
         private const val COOKIE_KEY = "Cookie"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
index 0694a033a1..fd04377432 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/OpenIDConnectAuthenticator.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
-import dagger.Reusable
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
@@ -35,12 +34,12 @@ import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectLogoutHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectTokenRefresher
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 private const val UNAUTHORIZED = 401
 
-@Reusable
-internal class OpenIDConnectAuthenticator @Inject constructor(
+@Singleton
+internal class OpenIDConnectAuthenticator(
     private val credentialsSecureStore: CredentialsSecureStore,
     private val tokenRefresher: OpenIDConnectTokenRefresher,
     private val userIdHelper: UserIdAuthenticatorHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt
index bcd4e7b4ec..d990f35046 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/ParentAuthenticator.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
-import dagger.Reusable
 import okhttp3.Interceptor
 import okhttp3.Response
 import org.hisp.dhis.android.core.arch.api.authentication.internal.UserIdAuthenticatorHelper.Companion.AUTHORIZATION_KEY
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
+import org.koin.core.annotation.Singleton
 import java.io.IOException
-import javax.inject.Inject
 
-@Reusable
-internal class ParentAuthenticator @Inject constructor(
+@Singleton
+internal class ParentAuthenticator(
     private val credentialsSecureStore: CredentialsSecureStore,
     private val passwordAndCookieAuthenticator: PasswordAndCookieAuthenticator,
     private val openIDConnectAuthenticator: OpenIDConnectAuthenticator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
index 7aa0e492e8..22ffa65a92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/PasswordAndCookieAuthenticator.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
-import dagger.Reusable
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class PasswordAndCookieAuthenticator @Inject constructor(
+@Singleton
+internal class PasswordAndCookieAuthenticator(
     private val userIdHelper: UserIdAuthenticatorHelper,
     private val cookieHelper: CookieAuthenticatorHelper,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt
index d26ae43572..209e4bc8fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/authentication/internal/UserIdAuthenticatorHelper.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.arch.api.authentication.internal
 
-import dagger.Reusable
 import okhttp3.Interceptor
 import okhttp3.Request
 import org.hisp.dhis.android.core.arch.helpers.UserHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
 import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserIdAuthenticatorHelper @Inject constructor(
+@Singleton
+internal class UserIdAuthenticatorHelper(
     private val userIdStore: UserIdInMemoryStore,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
index 4f648da883..8b41df5589 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
@@ -41,20 +41,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
 import retrofit2.Call;
 import retrofit2.Response;
 
-@Reusable
 public final class APICallExecutorImpl implements APICallExecutor {
 
     private final D2ErrorStore errorStore;
     private final UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher;
     private final APIErrorMapper errorMapper = new APIErrorMapper();
 
-    @Inject
     public APICallExecutorImpl(D2ErrorStore errorStore,
                                UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher) {
         this.errorStore = errorStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index b025af9ec3..1f87837f49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import androidx.annotation.VisibleForTesting
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
@@ -37,12 +36,12 @@ import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.CoreObject
 import org.hisp.dhis.android.core.resource.internal.Resource
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @VisibleForTesting
 @Suppress("TooManyFunctions")
-internal class APIDownloaderImpl @Inject constructor(private val resourceHandler: ResourceHandler) : APIDownloader {
+internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) : APIDownloader {
 
     override suspend fun <P> downloadPartitioned(
         uids: Set<String>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
index 56db3a7a69..25c1b5407c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIErrorMapper.kt
@@ -28,12 +28,12 @@
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import android.util.Log
-import dagger.Reusable
 import okhttp3.Request
 import org.hisp.dhis.android.core.arch.api.internal.DynamicServerURLInterceptor
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.koin.core.annotation.Singleton
 import retrofit2.Call
 import retrofit2.HttpException
 import retrofit2.Response
@@ -41,12 +41,11 @@ import java.io.IOException
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
-import javax.inject.Inject
 import javax.net.ssl.SSLException
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-internal class APIErrorMapper @Inject constructor() {
+internal class APIErrorMapper {
 
     fun mapRetrofitException(throwable: Throwable, errorBuilder: D2Error.Builder): D2Error {
         return when (throwable) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIExecutorsDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIExecutorsDIModule.java
deleted file mode 100644
index 7628b6ecd7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIExecutorsDIModule.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.api.executors.internal;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public class APIExecutorsDIModule {
-
-    @Provides
-    @Reusable
-    APICallExecutor apiCallExecutor(APICallExecutorImpl impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    RxAPICallExecutor rxApiCallExecutor(RxAPICallExecutorImpl impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    CoroutineAPICallExecutor coroutineAPICallExecutor(CoroutineAPICallExecutorImpl impl) {
-        return impl;
-    }
-
-    @Provides
-    @Reusable
-    APIDownloader apiDownloader(APIDownloaderImpl impl) {
-        return impl;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
index 12dc922e8d..57b6cf1dfa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/CoroutineAPICallExecutorImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.*
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.Transaction
@@ -37,12 +36,12 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
+import org.koin.core.annotation.Singleton
 import retrofit2.HttpException
 import retrofit2.Response
-import javax.inject.Inject
 
-@Reusable
-internal class CoroutineAPICallExecutorImpl @Inject constructor(
+@Singleton
+internal class CoroutineAPICallExecutorImpl(
     private val errorMapper: APIErrorMapper,
     private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher,
     private val errorStore: D2ErrorStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
index b7d640a3ec..7458fac215 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
 import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RxAPICallExecutorImpl @Inject constructor(
+@Singleton
+internal class RxAPICallExecutorImpl(
     private val databaseAdapter: DatabaseAdapter,
     private val errorStore: D2ErrorStore,
     private val errorMapper: APIErrorMapper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.kt
index 529b1c2e6c..a25087a284 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/APIClientDIModule.kt
@@ -25,42 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.api.internal
 
-package org.hisp.dhis.android.core.arch.api.internal;
-
-import android.util.Log;
-
-import org.hisp.dhis.android.core.D2Configuration;
-import org.hisp.dhis.android.core.arch.api.authentication.internal.ParentAuthenticator;
-import org.hisp.dhis.android.core.arch.api.executors.internal.APIExecutorsDIModule;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-import okhttp3.OkHttpClient;
-import retrofit2.Retrofit;
-
-@Module(includes = {
-        APIExecutorsDIModule.class
-})
-public class APIClientDIModule {
+import android.util.Log
+import okhttp3.OkHttpClient
+import org.hisp.dhis.android.core.D2Configuration
+import org.hisp.dhis.android.core.arch.api.authentication.internal.ParentAuthenticator
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
+import retrofit2.Retrofit
 
+@Module
+internal class APIClientDIModule {
     @Singleton
-    @Provides
-    OkHttpClient okHttpClient(D2Configuration d2Configuration, ParentAuthenticator authenticator) {
-        return OkHttpClientFactory.okHttpClient(d2Configuration, authenticator);
+    fun okHttpClient(d2Configuration: D2Configuration, authenticator: ParentAuthenticator): OkHttpClient {
+        return OkHttpClientFactory.okHttpClient(d2Configuration, authenticator)
     }
+
     @Singleton
-    @Provides
-    @SuppressWarnings({"PMD.PreserveStackTrace"})
-    Retrofit retrofit(OkHttpClient okHttpClient) {
-        try {
-            return RetrofitFactory.retrofit(okHttpClient);
-        } catch (D2Error d2Error) {
-            Log.e("APIClientDIModule", d2Error.getMessage());
-            throw new RuntimeException("Can't instantiate retrofit");
+    @Suppress("TooGenericExceptionThrown")
+    fun retrofit(okHttpClient: OkHttpClient): Retrofit {
+        return try {
+            RetrofitFactory.retrofit(okHttpClient)
+        } catch (d2Error: D2Error) {
+            Log.e("APIClientDIModule", d2Error.message!!)
+            throw RuntimeException("Can't instantiate retrofit")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt
new file mode 100644
index 0000000000..e32c655192
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt
@@ -0,0 +1,102 @@
+package org.hisp.dhis.android.core.arch.api.internal
+
+import org.hisp.dhis.android.core.category.internal.CategoryComboService
+import org.hisp.dhis.android.core.category.internal.CategoryOptionService
+import org.hisp.dhis.android.core.category.internal.CategoryService
+import org.hisp.dhis.android.core.constant.internal.ConstantService
+import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalService
+import org.hisp.dhis.android.core.dataelement.internal.DataElementService
+import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationService
+import org.hisp.dhis.android.core.dataset.internal.DataSetService
+import org.hisp.dhis.android.core.datavalue.internal.DataValueService
+import org.hisp.dhis.android.core.enrollment.internal.EnrollmentService
+import org.hisp.dhis.android.core.event.internal.EventFilterService
+import org.hisp.dhis.android.core.event.internal.EventService
+import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemService
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceService
+import org.hisp.dhis.android.core.indicator.internal.IndicatorService
+import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeService
+import org.hisp.dhis.android.core.legendset.internal.LegendSetService
+import org.hisp.dhis.android.core.map.layer.internal.bing.BingService
+import org.hisp.dhis.android.core.option.internal.OptionGroupService
+import org.hisp.dhis.android.core.option.internal.OptionService
+import org.hisp.dhis.android.core.option.internal.OptionSetService
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelService
+import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitService
+import org.hisp.dhis.android.core.program.internal.ProgramIndicatorService
+import org.hisp.dhis.android.core.program.internal.ProgramRuleService
+import org.hisp.dhis.android.core.program.internal.ProgramService
+import org.hisp.dhis.android.core.program.internal.ProgramStageService
+import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListService
+import org.hisp.dhis.android.core.relationship.internal.RelationshipService
+import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeService
+import org.hisp.dhis.android.core.settings.internal.SettingService
+import org.hisp.dhis.android.core.sms.data.webapirepository.internal.ApiService
+import org.hisp.dhis.android.core.systeminfo.internal.PingService
+import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeService
+import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipService
+import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
+import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterService
+import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseService
+import org.hisp.dhis.android.core.user.internal.AuthorityService
+import org.hisp.dhis.android.core.user.internal.UserService
+import org.hisp.dhis.android.core.validation.internal.ValidationRuleService
+import org.hisp.dhis.android.core.visualization.internal.VisualizationService
+import org.koin.dsl.module
+import retrofit2.Retrofit
+
+internal val servicesDIModule = module {
+    single { get<Retrofit>().create(ApiService::class.java) }
+    single { get<Retrofit>().create(ApiService::class.java) }
+    single { get<Retrofit>().create(BingService::class.java) }
+    single { get<Retrofit>().create(CategoryComboService::class.java) }
+    single { get<Retrofit>().create(CategoryOptionService::class.java) }
+    single { get<Retrofit>().create(CategoryService::class.java) }
+    single { get<Retrofit>().create(ConstantService::class.java) }
+    single { get<Retrofit>().create(DataApprovalService::class.java) }
+    single { get<Retrofit>().create(DataElementService::class.java) }
+    single { get<Retrofit>().create(DataSetService::class.java) }
+    single { get<Retrofit>().create(DataSetCompleteRegistrationService::class.java) }
+    single { get<Retrofit>().create(DataValueService::class.java) }
+    single { get<Retrofit>().create(EnrollmentService::class.java) }
+    single { get<Retrofit>().create(EventFilterService::class.java) }
+    single { get<Retrofit>().create(EventService::class.java) }
+    single { get<Retrofit>().create(ExpressionDimensionItemService::class.java) }
+    single { get<Retrofit>().create(FileResourceService::class.java) }
+    single { get<Retrofit>().create(IndicatorService::class.java) }
+    single { get<Retrofit>().create(IndicatorTypeService::class.java) }
+    single { get<Retrofit>().create(LegendSetService::class.java) }
+    single { get<Retrofit>().create(OptionGroupService::class.java) }
+    single { get<Retrofit>().create(OptionService::class.java) }
+    single { get<Retrofit>().create(OptionSetService::class.java) }
+    single { get<Retrofit>().create(OrganisationUnitLevelService::class.java) }
+    single { get<Retrofit>().create(OrganisationUnitService::class.java) }
+    single { get<Retrofit>().create(ProgramIndicatorService::class.java) }
+    single { get<Retrofit>().create(ProgramService::class.java) }
+    single { get<Retrofit>().create(ProgramRuleService::class.java) }
+    single { get<Retrofit>().create(ProgramStageService::class.java) }
+    single { get<Retrofit>().create(ProgramStageWorkingListService::class.java) }
+    single { get<Retrofit>().create(RelationshipService::class.java) }
+    single { get<Retrofit>().create(RelationshipTypeService::class.java) }
+    single { get<Retrofit>().create(SettingService::class.java) }
+    single { get<Retrofit>().create(OwnershipService::class.java) }
+    single { get<Retrofit>().create(PingService::class.java) }
+    single { get<Retrofit>().create(SystemInfoService::class.java) }
+    single { get<Retrofit>().create(TrackedEntityAttributeReservedValueService::class.java) }
+    single { get<Retrofit>().create(TrackedEntityAttributeService::class.java) }
+    single { get<Retrofit>().create(TrackedEntityInstanceFilterService::class.java) }
+    single { get<Retrofit>().create(TrackedEntityInstanceService::class.java) }
+    single { get<Retrofit>().create(TrackedEntityTypeService::class.java) }
+    single { get<Retrofit>().create(TrackerExporterService::class.java) }
+    single { get<Retrofit>().create(TrackerImporterService::class.java) }
+    single { get<Retrofit>().create(StockUseCaseService::class.java) }
+    single { get<Retrofit>().create(AuthorityService::class.java) }
+    single { get<Retrofit>().create(UserService::class.java) }
+    single { get<Retrofit>().create(ValidationRuleService::class.java) }
+    single { get<Retrofit>().create(VisualizationService::class.java) }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt
index 70c615f79a..0baab6db2a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/cache/internal/ExpirableCache.kt
@@ -29,7 +29,7 @@ package org.hisp.dhis.android.core.arch.cache.internal
 
 import java.util.concurrent.TimeUnit
 
-internal class ExpirableCache<K, V>(
+internal open class ExpirableCache<K, V>(
     private val flushInterval: Long = TimeUnit.MINUTES.toMillis(2),
 ) : D2Cache<K, V> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java
index d2812ee404..a7bdae48d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/executors/internal/D2CallExecutor.java
@@ -40,12 +40,7 @@
 
 import java.util.concurrent.Callable;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
 @SuppressWarnings({"PMD.PreserveStackTrace"})
-@Reusable
 public final class D2CallExecutor {
 
     private final D2Error.Builder exceptionBuilder = D2Error
@@ -55,7 +50,6 @@ public final class D2CallExecutor {
     private final DatabaseAdapter databaseAdapter;
     private final D2ErrorStore errorStore;
 
-    @Inject
     public D2CallExecutor(DatabaseAdapter databaseAdapter, D2ErrorStore errorStore) {
         this.databaseAdapter = databaseAdapter;
         this.errorStore = errorStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt
index 9b61d3428f..bc8883ebb3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/AppContextDIModule.kt
@@ -27,23 +27,12 @@
  */
 package org.hisp.dhis.android.core.arch.d2.internal
 
-import android.content.Context
-import dagger.Module
-import dagger.Provides
 import org.hisp.dhis.android.core.D2Configuration
+import org.koin.dsl.module
 
-@Module
-internal class AppContextDIModule(
-    private val d2Configuration: D2Configuration,
-) {
-
-    @Provides
-    fun appContext(): Context {
-        return d2Configuration.context().applicationContext
-    }
-
-    @Provides
-    fun d2Configuration(): D2Configuration {
-        return d2Configuration
-    }
+internal fun appContextDIModule(
+    d2Configuration: D2Configuration,
+) = module {
+    single { d2Configuration.context() }
+    single { d2Configuration }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
index ec08247c27..7b83997877 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponent.kt
@@ -29,235 +29,79 @@ package org.hisp.dhis.android.core.arch.d2.internal
 
 import android.content.Context
 import androidx.annotation.VisibleForTesting
-import dagger.Component
-import org.hisp.dhis.android.core.D2Configuration
-import org.hisp.dhis.android.core.analytics.AnalyticsPackageDIModule
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.api.internal.APIClientDIModule
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseDIModule
-import org.hisp.dhis.android.core.arch.json.internal.JSONSerializationDIModule
-import org.hisp.dhis.android.core.arch.repositories.di.internal.RepositoriesDIModule
 import org.hisp.dhis.android.core.arch.storage.internal.*
-import org.hisp.dhis.android.core.attribute.internal.AttributePackageDIModule
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
-import org.hisp.dhis.android.core.category.internal.CategoryPackageDIModule
-import org.hisp.dhis.android.core.common.internal.CommonPackageDIModule
-import org.hisp.dhis.android.core.configuration.internal.ConfigurationPackageDIModule
 import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManagerForD2Manager
-import org.hisp.dhis.android.core.constant.internal.ConstantPackageDIModule
-import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalPackageDIModule
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataelement.internal.DataElementPackageDIModule
-import org.hisp.dhis.android.core.dataset.DataSet
-import org.hisp.dhis.android.core.dataset.internal.DataSetPackageDIModule
-import org.hisp.dhis.android.core.datastore.internal.DataStorePackageDIModule
-import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictEntityDIModule
-import org.hisp.dhis.android.core.datavalue.internal.DataValuePackageDIModule
-import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataPackageDIModule
+import org.hisp.dhis.android.core.dataelement.internal.DataElementEndpointCallFactory
+import org.hisp.dhis.android.core.dataset.internal.DataSetEndpointCallFactory
 import org.hisp.dhis.android.core.domain.aggregated.internal.AggregatedModuleImpl
 import org.hisp.dhis.android.core.domain.metadata.internal.MetadataModuleImpl
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentPackageDIModule
-import org.hisp.dhis.android.core.event.internal.EventPackageDIModule
-import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemPackageDIModule
-import org.hisp.dhis.android.core.fileresource.internal.FileResourcePackageDIModule
-import org.hisp.dhis.android.core.imports.internal.ImportPackageDIModule
-import org.hisp.dhis.android.core.indicator.internal.IndicatorPackageDIModule
-import org.hisp.dhis.android.core.legendset.internal.LegendPackageDIModule
-import org.hisp.dhis.android.core.maintenance.internal.MaintenancePackageDIModule
-import org.hisp.dhis.android.core.map.internal.MapPackageDIModule
-import org.hisp.dhis.android.core.note.internal.NotePackageDIModule
 import org.hisp.dhis.android.core.option.internal.OptionCall
-import org.hisp.dhis.android.core.option.internal.OptionPackageDIModule
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
-import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitPackageDIModule
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
-import org.hisp.dhis.android.core.period.internal.PeriodPackageDIModule
 import org.hisp.dhis.android.core.program.internal.ProgramCall
-import org.hisp.dhis.android.core.program.internal.ProgramPackageDIModule
-import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListPackageDIModule
-import org.hisp.dhis.android.core.relationship.internal.RelationshipPackageDIModule
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeHandler
-import org.hisp.dhis.android.core.resource.internal.ResourcePackageDIModule
-import org.hisp.dhis.android.core.settings.internal.SettingPackageDIModule
-import org.hisp.dhis.android.core.sms.internal.SmsDIModule
-import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoPackageDIModule
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityPackageDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.OldTrackerImporterPayloadGenerator
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeLegendSetDIModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeHandler
-import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterPackageDIModule
-import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterPackageDIModule
 import org.hisp.dhis.android.core.tracker.importer.internal.interpreters.InterpreterSelector
-import org.hisp.dhis.android.core.usecase.internal.UseCasePackageDIModule
-import org.hisp.dhis.android.core.user.internal.UserPackageDIModule
-import org.hisp.dhis.android.core.validation.internal.ValidationPackageDIModule
-import org.hisp.dhis.android.core.visualization.internal.VisualizationPackageDIModule
-import org.hisp.dhis.android.core.wipe.internal.WipeDIModule
 import org.hisp.dhis.android.core.wipe.internal.WipeModule
+import org.koin.core.annotation.Singleton
 import retrofit2.Retrofit
-import javax.inject.Singleton
 
 @Singleton
-@Component(
-    modules = [
-        AppContextDIModule::class,
-        APIClientDIModule::class,
-        AttributePackageDIModule::class,
-        DatabaseDIModule::class,
-        JSONSerializationDIModule::class,
-        KeyValueStorageDIModule::class,
-        WipeDIModule::class,
-        RepositoriesDIModule::class,
-        AggregatedDataPackageDIModule::class,
-        AnalyticsPackageDIModule::class,
-        CategoryPackageDIModule::class,
-        CommonPackageDIModule::class,
-        ConfigurationPackageDIModule::class,
-        ConstantPackageDIModule::class,
-        DataElementPackageDIModule::class,
-        DataSetPackageDIModule::class,
-        DataApprovalPackageDIModule::class,
-        DataValuePackageDIModule::class,
-        EnrollmentPackageDIModule::class,
-        EventPackageDIModule::class,
-        ExpressionDimensionItemPackageDIModule::class,
-        FileResourcePackageDIModule::class,
-        ImportPackageDIModule::class,
-        IndicatorPackageDIModule::class,
-        LegendPackageDIModule::class,
-        DataStorePackageDIModule::class,
-        MaintenancePackageDIModule::class,
-        MaintenancePackageDIModule::class,
-        NotePackageDIModule::class,
-        OptionPackageDIModule::class,
-        OrganisationUnitPackageDIModule::class,
-        PeriodPackageDIModule::class,
-        ProgramPackageDIModule::class,
-        TrackedEntityAttributeLegendSetDIModule::class,
-        RelationshipPackageDIModule::class,
-        ResourcePackageDIModule::class,
-        SystemInfoPackageDIModule::class,
-        SettingPackageDIModule::class,
-        UseCasePackageDIModule::class,
-        TrackedEntityPackageDIModule::class,
-        TrackerExporterPackageDIModule::class,
-        TrackerImporterPackageDIModule::class,
-        SmsDIModule::class,
-        UserPackageDIModule::class,
-        ValidationPackageDIModule::class,
-        VisualizationPackageDIModule::class,
-        DataValueConflictEntityDIModule::class,
-        MapPackageDIModule::class,
-        ProgramStageWorkingListPackageDIModule::class,
-    ],
-)
-@Suppress("TooManyFunctions")
-internal interface D2DIComponent {
-    fun modules(): D2Modules
-    fun metadataModule(): MetadataModuleImpl
-    fun aggregatedModule(): AggregatedModuleImpl
-    fun wipeModule(): WipeModule
-    fun databaseAdapter(): DatabaseAdapter
-    fun userIdInMemoryStore(): UserIdInMemoryStore
-    fun multiUserDatabaseManagerForD2Manager(): MultiUserDatabaseManagerForD2Manager
-    fun credentialsSecureStore(): CredentialsSecureStore
-    fun appContext(): Context
-
-    @VisibleForTesting
-    fun retrofit(): Retrofit
+@Suppress("LongParameterList")
+internal class D2DIComponent(
+    val modules: D2Modules,
+    val metadataModule: MetadataModuleImpl,
+    val aggregatedModule: AggregatedModuleImpl,
+    val wipeModule: WipeModule,
+    val databaseAdapter: DatabaseAdapter,
+    val userIdInMemoryStore: UserIdInMemoryStore,
+    val multiUserDatabaseManagerForD2Manager: MultiUserDatabaseManagerForD2Manager,
+    val credentialsSecureStore: CredentialsSecureStore,
+    val appContext: Context,
 
-    @VisibleForTesting
-    fun coroutineApiCallExecutor(): CoroutineAPICallExecutor
+    @get:VisibleForTesting
+    val retrofit: Retrofit,
 
-    @VisibleForTesting
-    fun internalModules(): D2InternalModules
+    @get:VisibleForTesting
+    val coroutineApiCallExecutor: CoroutineAPICallExecutor,
 
-    @VisibleForTesting
-    fun programCall(): ProgramCall
+    @get:VisibleForTesting
+    val internalModules: D2InternalModules,
 
-    @VisibleForTesting
-    fun optionSetCall(): OptionSetCall
+    @get:VisibleForTesting
+    val programCall: ProgramCall,
 
-    @VisibleForTesting
-    fun optionCall(): OptionCall
+    @get:VisibleForTesting
+    val optionSetCall: OptionSetCall,
 
-    @VisibleForTesting
-    fun dataElementCallFactory(): UidsCallFactory<DataElement>
+    @get:VisibleForTesting
+    val optionCall: OptionCall,
 
-    @VisibleForTesting
-    fun dataSetCallFactory(): UidsCallFactory<DataSet>
+    @get:VisibleForTesting
+    val dataElementCallFactory: DataElementEndpointCallFactory,
 
-    @VisibleForTesting
-    fun relationshipTypeHandler(): RelationshipTypeHandler
+    @get:VisibleForTesting
+    val dataSetCallFactory: DataSetEndpointCallFactory,
 
-    @VisibleForTesting
-    fun trackedEntityTypeHandler(): TrackedEntityTypeHandler
+    @get:VisibleForTesting
+    val relationshipTypeHandler: RelationshipTypeHandler,
 
-    @VisibleForTesting
-    fun oldTrackerImporterPayloadGenerator(): OldTrackerImporterPayloadGenerator
+    @get:VisibleForTesting
+    val trackedEntityTypeHandler: TrackedEntityTypeHandler,
 
-    @VisibleForTesting
-    fun categoryOptionStore(): CategoryOptionStore
+    @get:VisibleForTesting
+    val oldTrackerImporterPayloadGenerator: OldTrackerImporterPayloadGenerator,
 
-    @VisibleForTesting
-    fun periodHandler(): PeriodHandler
+    @get:VisibleForTesting
+    val categoryOptionStore: CategoryOptionStore,
 
-    @VisibleForTesting
-    fun interpreterSelector(): InterpreterSelector
+    @get:VisibleForTesting
+    val periodHandler: PeriodHandler,
 
-    @Component.Builder
-    interface Builder {
-        fun appContextDIModule(appContextDIModule: AppContextDIModule): Builder
-        fun secureStorageDIModule(secureStoregeDIModule: KeyValueStorageDIModule): Builder
-        fun wipeDIModule(wipeDIModule: WipeDIModule): Builder
-        fun repositoriesDIModule(repositoriesDIModule: RepositoriesDIModule): Builder
-        fun analyticsPackageDIModule(analyticsPackageDIModule: AnalyticsPackageDIModule): Builder
-        fun categoryPackageDIModule(categoryPackageDIModule: CategoryPackageDIModule): Builder
-        fun commonPackageDIModule(commonPackageDIModule: CommonPackageDIModule): Builder
-        fun configurationPackageDIModule(configurationPackageDIModule: ConfigurationPackageDIModule): Builder
-        fun constantPackageDIModule(constantPackageDIModule: ConstantPackageDIModule): Builder
-        fun dataElementPackageDIModule(dataElementPackageDIModule: DataElementPackageDIModule): Builder
-        fun dataSetPackageDIModule(dataSetPackageDIModule: DataSetPackageDIModule): Builder
-        fun dataApprovalPackageDIModule(dataApprovalPackageDIModule: DataApprovalPackageDIModule): Builder
-        fun dataValuePackageDIModule(dataValuePackageDIModule: DataValuePackageDIModule): Builder
-        fun enrollmentPackageDIModule(enrollmentPackageDIModule: EnrollmentPackageDIModule): Builder
-        fun eventPackageDIModule(eventPackageDIModule: EventPackageDIModule): Builder
-        fun fileResourcePackageDIModule(fileResourcePackageDIModule: FileResourcePackageDIModule): Builder
-        fun importPackageDIModule(importPackageDIModule: ImportPackageDIModule): Builder
-        fun indicatorPackageDIModule(indicatorPackageDIModule: IndicatorPackageDIModule): Builder
-        fun legendPackageDIModule(legendPackageDIModule: LegendPackageDIModule): Builder
-        fun dataStorePackageDIModule(dataStorePackageDIModule: DataStorePackageDIModule): Builder
-        fun maintenancePackageDIModule(maintenancePackageDIModule: MaintenancePackageDIModule): Builder
-        fun optionPackageDIModule(optionPackageDIModule: OptionPackageDIModule): Builder
-        fun organisationUnitPackageDIModule(organisationUnitPackageDIModule: OrganisationUnitPackageDIModule): Builder
-        fun periodPackageDIModule(periodPackageDIModule: PeriodPackageDIModule): Builder
-        fun programPackageDIModule(programPackageDIModule: ProgramPackageDIModule): Builder
-        fun relationshipDIModule(relationshipPackageDIModule: RelationshipPackageDIModule): Builder
-        fun resourcePackageDIModule(resourcePackageDIModule: ResourcePackageDIModule): Builder
-        fun systemInfoPackageDIModule(systemInfoPackageDIModule: SystemInfoPackageDIModule): Builder
-        fun systemSettingPackageDIModule(settingPackageDIModule: SettingPackageDIModule): Builder
-        fun useCasePackageDIModule(useCasePackageDIModule: UseCasePackageDIModule): Builder
-        fun trackedEntityPackageDIModule(trackedEntityPackageDIModule: TrackedEntityPackageDIModule): Builder
-        fun trackerImporterPackageDIModule(trackerImporterPackageDIModule: TrackerImporterPackageDIModule): Builder
-        fun userPackageDIModule(userPackageDIModule: UserPackageDIModule): Builder
-        fun validationPackageDIModule(validationPackageDIModule: ValidationPackageDIModule): Builder
-        fun visualizationPackageDIModule(visualizationPackageDIModule: VisualizationPackageDIModule): Builder
-        fun dataValueConflictDIModule(dataValueConflictDIModule: DataValueConflictEntityDIModule): Builder
-        fun build(): D2DIComponent
-    }
-
-    companion object {
-        fun create(
-            d2Configuration: D2Configuration,
-            secureStore: SecureStore,
-            insecureStore: InsecureStore,
-        ): D2DIComponent {
-            return DaggerD2DIComponent.builder()
-                .appContextDIModule(AppContextDIModule(d2Configuration))
-                .secureStorageDIModule(KeyValueStorageDIModule(secureStore, insecureStore))
-                .build()
-        }
-    }
-}
+    @get:VisibleForTesting
+    val interpreterSelector: InterpreterSelector,
+)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponentFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponentFactory.kt
new file mode 100644
index 0000000000..e717822123
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2DIComponentFactory.kt
@@ -0,0 +1,142 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.d2.internal
+
+import org.hisp.dhis.android.core.D2Configuration
+import org.hisp.dhis.android.core.analytics.AnalyticsDIModule
+import org.hisp.dhis.android.core.arch.ArchDIModule
+import org.hisp.dhis.android.core.arch.api.internal.servicesDIModule
+import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
+import org.hisp.dhis.android.core.arch.storage.internal.SecureStore
+import org.hisp.dhis.android.core.arch.storage.internal.keyValueStorageDIModule
+import org.hisp.dhis.android.core.attribute.AttributeDIModule
+import org.hisp.dhis.android.core.category.CategoryDIModule
+import org.hisp.dhis.android.core.common.CommonDIModule
+import org.hisp.dhis.android.core.configuration.internal.ConfigurationDIModule
+import org.hisp.dhis.android.core.constant.ConstantDIModule
+import org.hisp.dhis.android.core.dataapproval.DataApprovalDIModule
+import org.hisp.dhis.android.core.dataelement.DataElementDIModule
+import org.hisp.dhis.android.core.dataset.DataSetDIModule
+import org.hisp.dhis.android.core.datastore.DataStoreDIModule
+import org.hisp.dhis.android.core.datavalue.DataValueDIModule
+import org.hisp.dhis.android.core.domain.DomainDIModule
+import org.hisp.dhis.android.core.enrollment.EnrollmentDIModule
+import org.hisp.dhis.android.core.event.EventDIModule
+import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemDIModule
+import org.hisp.dhis.android.core.fileresource.FileResourceDIModule
+import org.hisp.dhis.android.core.imports.ImportsDIModule
+import org.hisp.dhis.android.core.indicator.IndicatorDIModule
+import org.hisp.dhis.android.core.legendset.LegendSetDIModule
+import org.hisp.dhis.android.core.maintenance.MaintenanceDIModule
+import org.hisp.dhis.android.core.map.MapDIModule
+import org.hisp.dhis.android.core.note.NoteDIModule
+import org.hisp.dhis.android.core.option.OptionDIModule
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitDIModule
+import org.hisp.dhis.android.core.parser.internal.ParserDIModule
+import org.hisp.dhis.android.core.period.PeriodDIModule
+import org.hisp.dhis.android.core.program.ProgramDIModule
+import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListDIModule
+import org.hisp.dhis.android.core.relationship.RelationshipDIModule
+import org.hisp.dhis.android.core.resource.internal.ResourceDIModule
+import org.hisp.dhis.android.core.settings.SettingsDIModule
+import org.hisp.dhis.android.core.sms.SmsDIModule
+import org.hisp.dhis.android.core.systeminfo.SystemInfoDIModule
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDIModule
+import org.hisp.dhis.android.core.tracker.TrackerDIModule
+import org.hisp.dhis.android.core.usecase.UseCaseDIModule
+import org.hisp.dhis.android.core.user.UserDIModule
+import org.hisp.dhis.android.core.validation.ValidationDIModule
+import org.hisp.dhis.android.core.visualization.VisualizationDIModule
+import org.hisp.dhis.android.core.wipe.internal.WipeDIModule
+import org.koin.core.context.startKoin
+import org.koin.ksp.generated.module
+
+internal object D2DIComponentFactory {
+
+    fun create(
+        d2Config: D2Configuration,
+        secureStore: SecureStore,
+        insecureStore: InsecureStore,
+    ): D2DIComponent {
+        val koinApp = startKoin {
+            modules(
+                listOf(
+                    appContextDIModule(d2Config),
+                    keyValueStorageDIModule(secureStore, insecureStore),
+                    javaDIClasses,
+                    servicesDIModule,
+
+                    AnalyticsDIModule().module,
+                    ArchDIModule().module,
+                    AttributeDIModule().module,
+                    CategoryDIModule().module,
+                    CommonDIModule().module,
+                    ConfigurationDIModule().module,
+                    ConstantDIModule().module,
+                    DataApprovalDIModule().module,
+                    DataElementDIModule().module,
+                    DataSetDIModule().module,
+                    DataStoreDIModule().module,
+                    DataValueDIModule().module,
+                    DomainDIModule().module,
+                    EnrollmentDIModule().module,
+                    EventDIModule().module,
+                    ExpressionDimensionItemDIModule().module,
+                    FileResourceDIModule().module,
+                    ImportsDIModule().module,
+                    IndicatorDIModule().module,
+                    LegendSetDIModule().module,
+                    MaintenanceDIModule().module,
+                    MapDIModule().module,
+                    NoteDIModule().module,
+                    OptionDIModule().module,
+                    OrganisationUnitDIModule().module,
+                    ParserDIModule().module,
+                    PeriodDIModule().module,
+                    ProgramDIModule().module,
+                    ProgramStageWorkingListDIModule().module,
+                    RelationshipDIModule().module,
+                    ResourceDIModule().module,
+                    SettingsDIModule().module,
+                    SmsDIModule().module,
+                    SystemInfoDIModule().module,
+                    TrackedEntityDIModule().module,
+                    TrackerDIModule().module,
+                    UseCaseDIModule().module,
+                    UserDIModule().module,
+                    ValidationDIModule().module,
+                    VisualizationDIModule().module,
+                    WipeDIModule().module,
+                ),
+            )
+        }
+
+        return koinApp.koin.get<D2DIComponent>()
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt
index f22da1e7bb..c05980694f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2InternalModules.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.arch.d2.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.category.internal.CategoryInternalModule
 import org.hisp.dhis.android.core.user.internal.UserInternalModule
 import org.hisp.dhis.android.core.visualization.internal.VisualizationInternalModule
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class D2InternalModules @Inject constructor(
+@Singleton
+internal class D2InternalModules(
     val category: CategoryInternalModule,
     val visualization: VisualizationInternalModule,
     val user: UserInternalModule,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt
index eeb172d0f4..8496cd8f9a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/D2Modules.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.d2.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.analytics.AnalyticsModule
 import org.hisp.dhis.android.core.category.CategoryModule
 import org.hisp.dhis.android.core.constant.ConstantModule
@@ -58,11 +57,11 @@ import org.hisp.dhis.android.core.usecase.UseCaseModule
 import org.hisp.dhis.android.core.user.UserModule
 import org.hisp.dhis.android.core.validation.ValidationModule
 import org.hisp.dhis.android.core.visualization.VisualizationModule
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList")
-internal class D2Modules @Inject constructor(
+internal class D2Modules(
     val analytics: AnalyticsModule,
     val category: CategoryModule,
     val constant: ConstantModule,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt
new file mode 100644
index 0000000000..8fe9ea50d6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.d2.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
+import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
+import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseExport
+import org.hisp.dhis.android.core.configuration.internal.DatabaseEncryptionPasswordGenerator
+import org.hisp.dhis.android.core.configuration.internal.DatabaseEncryptionPasswordManager
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
+import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleanerImpl
+import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
+import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import org.hisp.dhis.android.core.period.internal.PeriodParser
+import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.DataSetsStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.FileResourceCleaner
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceService
+import org.koin.dsl.module
+
+internal val javaDIClasses = module {
+    single<ForeignKeyCleaner> { ForeignKeyCleanerImpl(get(), get()) }
+    single { FileResourceCleaner(get(), get(), get()) }
+    single { NoteUniquenessManager(get()) }
+    single { PeriodHelper(get(), get(), get(), get(), get()) }
+    single { PeriodParser(get()) }
+    single { DatabaseEncryptionPasswordManager(get(), get()) }
+    single { DatabaseEncryptionPasswordGenerator() }
+    single { TrackedEntityInstanceService(get(), get(), get(), get()) }
+    single<APICallExecutor> { APICallExecutorImpl(get(), get()) }
+    single { DatabaseAdapterFactory(get(), get()) }
+    single { DatabaseExport(get(), get(), get()) }
+    single { D2CallExecutor(get(), get()) }
+    single { RelationshipDHISVersionManager(get()) }
+    single { DataSetsStore(get(), get(), get(), get()) }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index 25695e8daf..0d14633ef0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -59,6 +59,6 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     }
 
     companion object {
-        const val VERSION = 151
+        const val VERSION = 152
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseAdapterFactory.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseAdapterFactory.java
index 3eaf183865..2879a22a8f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseAdapterFactory.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseAdapterFactory.java
@@ -40,11 +40,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
 public class DatabaseAdapterFactory {
 
     private static Map<String, UnencryptedDatabaseOpenHelper> unencryptedOpenHelpers = new HashMap<>();
@@ -54,9 +49,8 @@ public class DatabaseAdapterFactory {
     private final Context context;
     private final DatabaseEncryptionPasswordManager passwordManager;
 
-    @Inject
-    DatabaseAdapterFactory(Context context,
-                           DatabaseEncryptionPasswordManager passwordManager) {
+    public DatabaseAdapterFactory(Context context,
+                                  DatabaseEncryptionPasswordManager passwordManager) {
         this.context = context;
         this.passwordManager = passwordManager;
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.java
deleted file mode 100644
index 62c303ead6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.db.access.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseImportExport;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class DatabaseDIModule {
-
-    @Provides
-    @Singleton
-    DatabaseAdapter databaseAdapter(DatabaseAdapterFactory adapterFactory) {
-        return adapterFactory.newParentDatabaseAdapter();
-    }
-
-    @Provides
-    DatabaseImportExport databaseImportExport(DatabaseImportExportImpl impl) {
-        return impl;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.kt
similarity index 83%
rename from core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.kt
index 734a30aea0..25e9b4fc20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseDIModule.kt
@@ -25,18 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.resource.internal
+package org.hisp.dhis.android.core.arch.db.access.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-internal class ResourceEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ResourceStore {
-        return ResourceStoreImpl(databaseAdapter)
+internal class DatabaseDIModule {
+
+    @Singleton
+    fun databaseAdapter(adapterFactory: DatabaseAdapterFactory): DatabaseAdapter {
+        return adapterFactory.newParentDatabaseAdapter()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseExport.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseExport.java
index 53e88d12e6..2da940aa6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseExport.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseExport.java
@@ -40,23 +40,17 @@
 
 import java.io.File;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
 import io.reactivex.functions.Action;
 
 @SuppressWarnings("PMD.ExcessiveImports")
-@Reusable
 public class DatabaseExport {
 
     private final Context context;
     private final DatabaseEncryptionPasswordManager passwordManager;
     private final DatabaseConfigurationHelper configurationHelper;
 
-
-    @Inject
-    DatabaseExport(Context context, DatabaseEncryptionPasswordManager passwordManager,
-                   DatabaseConfigurationHelper configurationHelper) {
+    public DatabaseExport(Context context, DatabaseEncryptionPasswordManager passwordManager,
+                          DatabaseConfigurationHelper configurationHelper) {
         this.context = context;
         this.passwordManager = passwordManager;
         this.configurationHelper = configurationHelper;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
index 74302c9a9d..668551d8e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/DatabaseImportExportImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.arch.db.access.internal
 
 import android.content.Context
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.DatabaseImportExport
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -44,11 +43,11 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStoreImpl
 import org.hisp.dhis.android.core.user.UserModule
 import org.hisp.dhis.android.core.user.internal.UserStoreImpl
+import org.koin.core.annotation.Singleton
 import java.io.File
-import javax.inject.Inject
 
-@Reusable
-internal class DatabaseImportExportImpl @Inject constructor(
+@Singleton
+internal class DatabaseImportExportImpl(
     private val context: Context,
     private val nameGenerator: DatabaseNameGenerator,
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt
index b7e46fad33..1d86c13f56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/helpers/internal/MultiDimensionalPartitioner.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.arch.helpers.internal
 
-import dagger.Reusable
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class MultiDimensionalPartitioner @Inject constructor() {
+@Singleton
+internal class MultiDimensionalPartitioner {
 
     fun partitionForSize(size: Int, vararg partitions: Collection<String>): List<List<List<String>>> {
         return partitionInternal(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.java
deleted file mode 100644
index d302d1febd..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.json.internal;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.Reusable;
-
-@Module
-public class JSONSerializationDIModule {
-
-    @Provides
-    @Reusable
-    ObjectMapper objectMapper() {
-        return ObjectMapperFactory.objectMapper();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.kt
index 19fd3a9dc4..e7388725c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/json/internal/JSONSerializationDIModule.kt
@@ -25,19 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.map.layer.internal.bing
+package org.hisp.dhis.android.core.arch.json.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import retrofit2.Retrofit
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-internal class BingEntityDIModule {
+internal class JSONSerializationDIModule {
 
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): BingService {
-        return retrofit.create(BingService::class.java)
+    @Singleton
+    fun objectMapper(): ObjectMapper {
+        return ObjectMapperFactory.objectMapper()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt
index 884ec06d56..f312349272 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/di/internal/RepositoriesDIModule.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.arch.repositories.di.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-class RepositoriesDIModule {
-    @Provides
-    @Reusable
+internal class RepositoriesDIModule {
+
+    @Singleton
     fun emptyScope(): RepositoryScope {
         return RepositoryScope.empty()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStore.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStore.kt
index 80e6afd98c..13ffbe32a1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/ChunkedSecureStore.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.arch.storage.internal
 
-import javax.inject.Inject
-import javax.inject.Singleton
+import org.koin.core.annotation.Singleton
 
 private const val SIZE_IN_CHARACTERS = 200
 
 @Singleton
-class ChunkedSecureStore @Inject constructor(private val internalStore: SecureStore) : SecureStore {
+class ChunkedSecureStore(private val internalStore: SecureStore) : KeyValueStore {
 
     override fun setData(key: String, data: String?) {
         removeData(key)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt
index 0612a71612..8a6a4c201d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/CredentialsSecureStoreImpl.kt
@@ -28,12 +28,10 @@
 package org.hisp.dhis.android.core.arch.storage.internal
 
 import net.openid.appauth.AuthState
-import java.lang.RuntimeException
-import javax.inject.Inject
-import javax.inject.Singleton
+import org.koin.core.annotation.Singleton
 
 @Singleton
-internal class CredentialsSecureStoreImpl @Inject constructor(private val secureStore: ChunkedSecureStore) :
+internal class CredentialsSecureStoreImpl(private val secureStore: ChunkedSecureStore) :
     CredentialsSecureStore {
 
     private var credentials: Credentials? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.java b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.java
deleted file mode 100644
index ff0e940b79..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.storage.internal;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class KeyValueStorageDIModule {
-    private final SecureStore secureStore;
-    private final InsecureStore insecureStore;
-
-    public KeyValueStorageDIModule(SecureStore secureStore,
-                                   InsecureStore insecureStore) {
-        this.secureStore = secureStore;
-        this.insecureStore = insecureStore;
-    }
-
-    @Provides
-    @Singleton
-    SecureStore secureStore() {
-        return secureStore;
-    }
-
-    @Provides
-    @Singleton
-    InsecureStore insecureStore() {
-        return insecureStore;
-    }
-
-    @Provides
-    @Singleton
-    CredentialsSecureStore credentialsSecureStore(CredentialsSecureStoreImpl impl) {
-        return impl;
-    }
-
-    @Provides
-    @Singleton
-    UserIdInMemoryStore userIdStore() {
-        return new UserIdInMemoryStore();
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.kt
new file mode 100644
index 0000000000..1f8bb86fa4
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/KeyValueStorageDIModule.kt
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.arch.storage.internal
+
+import org.koin.dsl.module
+
+fun keyValueStorageDIModule(
+    secureStore: SecureStore,
+    insecureStore: InsecureStore,
+) = module {
+    single { secureStore }
+    single { insecureStore }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/UserIdInMemoryStore.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/UserIdInMemoryStore.kt
index d93b275fc4..a0d7150971 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/UserIdInMemoryStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/storage/internal/UserIdInMemoryStore.kt
@@ -27,6 +27,9 @@
  */
 package org.hisp.dhis.android.core.arch.storage.internal
 
+import org.koin.core.annotation.Single
+
+@Single
 class UserIdInMemoryStore : ObjectKeyValueStore<String> {
     private var userId: String? = null
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/IndicatorEngineEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/AttributeDIModule.kt
similarity index 83%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/IndicatorEngineEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/AttributeDIModule.kt
index 593eb3f430..eb831e6186 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/IndicatorEngineEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/AttributeDIModule.kt
@@ -25,18 +25,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator.datasetindicatorengine
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+package org.hisp.dhis.android.core.attribute
 
-@Module
-internal class IndicatorEngineEntityDIModule {
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
 
-    @Provides
-    @Reusable
-    fun engine(impl: DataSetIndicatorEngineImpl): DataSetIndicatorEngine {
-        return impl
-    }
-}
+@Module
+@ComponentScan
+internal class AttributeDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
index 756558a880..e7667dbd29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeHandler.kt
@@ -28,10 +28,11 @@
 
 package org.hisp.dhis.android.core.attribute.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class AttributeHandler(
-    store: IdentifiableObjectStore<Attribute>,
+    store: AttributeStore,
 ) : IdentifiableHandlerImpl<Attribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.java
deleted file mode 100644
index e93e36908f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.attribute.internal;
-
-import org.hisp.dhis.android.core.attribute.AttributeTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class AttributeModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    AttributeModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(
-                AttributeTableInfo.TABLE_INFO
-        );
-    }
-
-    @Override
-    public void wipeData() {
-        // No data to wipe
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.kt
similarity index 76%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.kt
index 102e659842..ff21a3b38e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeModuleWiper.kt
@@ -27,22 +27,22 @@
  */
 package org.hisp.dhis.android.core.attribute.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.attribute.AttributeTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class AttributeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): AttributeStore {
-        return AttributeStoreImpl(databaseAdapter)
+@Singleton
+internal class AttributeModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(
+            AttributeTableInfo.TABLE_INFO,
+        )
     }
 
-    @Provides
-    @Reusable
-    fun handler(store: AttributeStore): AttributeHandler {
-        return AttributeHandler(store)
+    override fun wipeData() {
+        // No data to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
index 667d75ffbb..570b89c1a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributeStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.AttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AttributeStoreImpl(databaseAdapter: DatabaseAdapter) : AttributeStore,
     IdentifiableObjectStoreImpl<Attribute>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
index 977477f17f..d82b03790d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.attribute.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementAttributeValueLinkHandler(
     store: DataElementAttributeValueLinkStore,
 ) : LinkHandlerImpl<Attribute, DataElementAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
index 72f0a44137..1d099f7cab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/DataElementAttributeValueLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
 import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementAttributeValueLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataElementAttributeValueLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
index 87f82beb8e..9f7162f616 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.attribute.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramAttributeValueLinkHandler(
     store: ProgramAttributeValueLinkStore,
 ) : LinkHandlerImpl<Attribute, ProgramAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
index 5eb27bb40c..b33f55401a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramAttributeValueLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLink
 import org.hisp.dhis.android.core.attribute.ProgramAttributeValueLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramAttributeValueLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramAttributeValueLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
index b0bd323dce..6d0d97f1ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.attribute.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageAttributeValueLinkHandler(
     store: ProgramStageAttributeValueLinkStore,
 ) : LinkHandlerImpl<Attribute, ProgramStageAttributeValueLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
index 2128a1f89e..8c9deb7de0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/ProgramStageAttributeValueLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
 import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageAttributeValueLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramStageAttributeValueLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
index 9d85c00a36..c09a45983f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.internal.CategoryCategoryOptionChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryFields
 import org.hisp.dhis.android.core.category.internal.CategoryStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class CategoryCollectionRepository @Inject internal constructor(
+@Singleton
+class CategoryCollectionRepository internal constructor(
     store: CategoryStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
index aa29dc35bd..d8daf663c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryComboCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.internal.CategoryCategoryComboChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryComboFields
 import org.hisp.dhis.android.core.category.internal.CategoryComboStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class CategoryComboCollectionRepository @Inject internal constructor(
+@Singleton
+class CategoryComboCollectionRepository internal constructor(
     store: CategoryComboStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDIModule.kt
new file mode 100644
index 0000000000..e0e2736146
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.category
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class CategoryDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
index 3b60717aee..b30f732363 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.category.internal.CategoryOptionFields
 import org.hisp.dhis.android.core.category.internal.CategoryOptionOrganisationUnitChildrenAppender
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.common.IdentifiableColumns
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class CategoryOptionCollectionRepository @Inject internal constructor(
+@Singleton
+class CategoryOptionCollectionRepository internal constructor(
     store: CategoryOptionStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
index 010b4aa0f4..85cbd4c375 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.category.internal.CategoryOptionComboCategoryO
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboFields
 import org.hisp.dhis.android.core.category.internal.CategoryOptionComboStore
 import org.hisp.dhis.android.core.common.IdentifiableColumns
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class CategoryOptionComboCollectionRepository @Inject internal constructor(
+@Singleton
+class CategoryOptionComboCollectionRepository internal constructor(
     store: CategoryOptionComboStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
index b265bbe708..a38b766632 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/CategoryOptionComboService.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.category
 
-import dagger.Reusable
 import io.reactivex.Single
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-class CategoryOptionComboService @Inject constructor(
+@Singleton
+class CategoryOptionComboService(
     private val categoryOptionRepository: CategoryOptionCollectionRepository,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
index 2a1f530635..79e71fec16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.category.Category
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryCall @Inject constructor(
+@Singleton
+internal class CategoryCall(
     private val handler: CategoryHandler,
     private val service: CategoryService,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
deleted file mode 100644
index 9b5076d3a3..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryCategoryComboEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryCategoryComboLinkStore {
-        return CategoryCategoryComboLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: CategoryCategoryComboLinkStore,
-    ): CategoryCategoryComboLinkHandler {
-        return CategoryCategoryComboLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
index eea660008a..30ba933ed2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkHandler.kt
@@ -28,11 +28,12 @@
 
 package org.hisp.dhis.android.core.category.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStore
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryCategoryComboLinkHandler(
-    store: LinkStore<CategoryCategoryComboLink>,
+    store: CategoryCategoryComboLinkStore,
 ) : OrderedLinkHandlerImpl<Category, CategoryCategoryComboLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
index ac385081b9..2702d42fb1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryComboLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLink
 import org.hisp.dhis.android.core.category.CategoryCategoryComboLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryCategoryComboLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
deleted file mode 100644
index 67324fc6d2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryCategoryOptionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryCategoryOptionLinkStore {
-        return CategoryCategoryOptionLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: CategoryCategoryOptionLinkStore,
-    ): CategoryCategoryOptionLinkHandler {
-        return CategoryCategoryOptionLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
index 76479995fd..1dd8bc7d07 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.category.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOption
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryCategoryOptionLinkHandler(
     store: CategoryCategoryOptionLinkStore,
 ) : OrderedLinkHandlerImpl<CategoryOption, CategoryCategoryOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
index 1529bb0ef2..db86475ad8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkPersistor.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOption
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryCategoryOptionLinkPersistor @Inject constructor(
+@Singleton
+internal class CategoryCategoryOptionLinkPersistor(
     private val categoryCategoryOptionLinkHandler: CategoryCategoryOptionLinkHandler,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
index 4f30b47ea6..908bf66dbf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryCategoryOptionLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryCategoryOptionLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryCategoryOptionLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
index 14d1ce74c5..ba36092e18 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.category.CategoryCombo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryComboCall @Inject constructor(
+@Singleton
+internal class CategoryComboCall(
     private val service: CategoryComboService,
     private val handler: CategoryComboHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
deleted file mode 100644
index 2e6c5f695c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboEntityDIModule.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryComboEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryComboStore {
-        return CategoryComboStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: CategoryComboStore,
-        optionComboHandler: CategoryOptionComboHandler,
-        categoryCategoryComboLinkHandler: CategoryCategoryComboLinkHandler,
-        categoryOptionCleaner: CategoryOptionComboOrphanCleaner,
-    ): CategoryComboHandler {
-        return CategoryComboHandler(store, optionComboHandler, categoryCategoryComboLinkHandler, categoryOptionCleaner)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
index a168858f69..017d83ca78 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboHandler.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryComboInternalAccessor
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.common.ObjectWithUid
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryComboHandler constructor(
     store: CategoryComboStore,
     private val optionComboHandler: CategoryOptionComboHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
index 5717a560a9..dafdded8b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryComboStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt
index 209beba55a..ca9c6bbc2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeeker.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
 import org.hisp.dhis.android.core.program.ProgramTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryComboUidsSeeker @Inject constructor(
+@Singleton
+internal class CategoryComboUidsSeeker(
     databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
     fun seekUids(): Set<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
index 5f8906fe4c..e7edd09cd8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.category.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.Category
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryHandler(
     store: CategoryStore,
 ) : IdentifiableHandlerImpl<Category>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
index f9bbea844b..feff185ba3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryInternalModule.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryInternalModule @Inject constructor(
+@Singleton
+internal class CategoryInternalModule(
     val categoryCall: CategoryCall,
     val categoryComboCall: CategoryComboCall,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
index 0d33a82892..5bf6c34f53 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleDownloader.kt
@@ -27,12 +27,11 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class CategoryModuleDownloader @Inject internal constructor(
+@Singleton
+class CategoryModuleDownloader internal constructor(
     private val categoryCall: CategoryCall,
     private val categoryComboCall: CategoryComboCall,
     private val categoryOptionCall: CategoryOptionCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt
index 706e3f8560..82b014ac84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleImpl.kt
@@ -27,12 +27,16 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
-import org.hisp.dhis.android.core.category.*
-import javax.inject.Inject
+import org.hisp.dhis.android.core.category.CategoryCollectionRepository
+import org.hisp.dhis.android.core.category.CategoryComboCollectionRepository
+import org.hisp.dhis.android.core.category.CategoryModule
+import org.hisp.dhis.android.core.category.CategoryOptionCollectionRepository
+import org.hisp.dhis.android.core.category.CategoryOptionComboCollectionRepository
+import org.hisp.dhis.android.core.category.CategoryOptionComboService
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class CategoryModuleImpl @Inject internal constructor(
+@Singleton
+internal class CategoryModuleImpl(
     private val categories: CategoryCollectionRepository,
     private val categoryOptions: CategoryOptionCollectionRepository,
     private val categoryOptionCombos: CategoryOptionComboCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt
index f2f58e511a..9843602447 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryModuleWiper.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.category.*
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryModuleWiper @Inject constructor(
+@Singleton
+internal class CategoryModuleWiper(
     private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
index 01ef7f6c03..91ff173a3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionCall.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryOptionCall @Inject constructor(
+@Singleton
+internal class CategoryOptionCall(
     private val handler: CategoryOptionHandler,
     private val service: CategoryOptionService,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
deleted file mode 100644
index 1f5962feb6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryOptionComboCategoryOptionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionComboCategoryOptionLinkStore {
-        return CategoryOptionComboCategoryOptionLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun categoryOptionComboCategoryOptionLinkHandler(
-        store: CategoryOptionComboCategoryOptionLinkStore,
-    ): CategoryOptionComboCategoryOptionHandler {
-        return CategoryOptionComboCategoryOptionHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
index dc6beeca84..202d2d2f82 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.category.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryOptionComboCategoryOptionHandler(
     store: CategoryOptionComboCategoryOptionLinkStore,
 ) : LinkHandlerImpl<CategoryOption, CategoryOptionComboCategoryOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
index 9f2b7c6529..373b8c872d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboCategoryOptionLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryOptionComboCategoryOptionLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
deleted file mode 100644
index 22b42e0af5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboEntityDIModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryOptionComboEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionComboStore {
-        return CategoryOptionComboStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: CategoryOptionComboStore,
-        categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler,
-    ): CategoryOptionComboHandler {
-        return CategoryOptionComboHandler(store, categoryOptionComboCategoryOptionLinkHandler)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
index 11a8548697..49bb55da8b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboHandler.kt
@@ -32,7 +32,9 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryOptionComboHandler constructor(
     store: CategoryOptionComboStore,
     private val categoryOptionComboCategoryOptionLinkHandler: CategoryOptionComboCategoryOptionHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt
index 597cbcc1bb..5d79ecd594 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboIntegrityChecker.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.category.CategoryOptionComboCategoryOptionLinkTableInfo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
 import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryOptionComboIntegrityChecker @Inject constructor(
+@Singleton
+internal class CategoryOptionComboIntegrityChecker(
     private val databaseAdapter: DatabaseAdapter,
 ) {
     /**
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
index 955e665696..c9ae29714d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryOptionComboOrphanCleaner @Inject constructor(
+@Singleton
+internal class CategoryOptionComboOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<CategoryCombo, CategoryOptionCombo>(
     tableName = CategoryOptionComboTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
index 06e3d52939..5315aedb51 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionComboStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.category.CategoryOptionComboTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryOptionComboStoreImpl constructor(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
deleted file mode 100644
index 2f58805f73..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryOptionEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionStore {
-        return CategoryOptionStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: CategoryOptionStore): CategoryOptionHandler {
-        return CategoryOptionHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
index 866d1bb2d2..71a148f49c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionHandler.kt
@@ -27,10 +27,11 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOption
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryOptionHandler constructor(
-    categoryOptionStore: IdentifiableObjectStore<CategoryOption>,
+    categoryOptionStore: CategoryOptionStore,
 ) : IdentifiableHandlerImpl<CategoryOption>(categoryOptionStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt
deleted file mode 100644
index 5d11b3eff5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class CategoryOptionOrganisationUnitEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryOptionOrganisationUnitLinkStore {
-        return CategoryOptionOrganisationUnitLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: CategoryOptionOrganisationUnitLinkStore): CategoryOptionOrganisationUnitLinkHandler {
-        return CategoryOptionOrganisationUnitLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
index e1e13d80b2..78ca9040ea 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.category.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class CategoryOptionOrganisationUnitLinkHandler(
     store: CategoryOptionOrganisationUnitLinkStore,
 ) : LinkHandlerImpl<CategoryOptionOrganisationUnitsCall.CategoryOptionRestriction, CategoryOptionOrganisationUnitLink>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
index fdcc3a611d..fc0df21e03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryOptionOrganisationUnitLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
index 9268d5a146..d98cca0bbc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionOrganisationUnitsCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.category.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.helpers.internal.UrlLengthHelper
 import org.hisp.dhis.android.core.category.CategoryOptionOrganisationUnitLink
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class CategoryOptionOrganisationUnitsCall @Inject constructor(
+@Singleton
+internal class CategoryOptionOrganisationUnitsCall(
     private val handler: CategoryOptionOrganisationUnitLinkHandler,
     private val service: CategoryOptionService,
     private val dhisVersionManager: DHISVersionManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
index e3b39b2c90..8f26c6c541 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryOptionStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryOptionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
deleted file mode 100644
index 64152c313e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryPackageDIModule.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.category.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.category.CategoryModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        CategoryEntityDIModule::class,
-        CategoryCategoryComboEntityDIModule::class,
-        CategoryCategoryOptionEntityDIModule::class,
-        CategoryComboEntityDIModule::class,
-        CategoryOptionEntityDIModule::class,
-        CategoryOptionOrganisationUnitEntityDIModule::class,
-        CategoryOptionComboEntityDIModule::class,
-        CategoryOptionComboCategoryOptionEntityDIModule::class,
-    ],
-)
-internal class CategoryPackageDIModule {
-
-    @Provides
-    @Reusable
-    fun categoryService(retrofit: Retrofit): CategoryService {
-        return retrofit.create(CategoryService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun categoryOptionService(retrofit: Retrofit): CategoryOptionService {
-        return retrofit.create(CategoryOptionService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun categoryComboService(retrofit: Retrofit): CategoryComboService {
-        return retrofit.create(CategoryComboService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: CategoryModuleImpl): CategoryModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
index 03af67d9a3..4d2e913956 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.category.Category
 import org.hisp.dhis.android.core.category.CategoryTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class CategoryStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/common/CommonDIModule.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/common/CommonDIModule.kt
index a25ad596f4..ea7901d56e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/CommonDIModule.kt
@@ -25,28 +25,21 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.common.internal
+package org.hisp.dhis.android.core.common
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingEntityDIModule
-import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingEntityDIModule
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 import retrofit2.Retrofit
 
-@Module(
-    includes = [
-        ValueTypeDeviceRenderingEntityDIModule::class,
-        ValueTypeRenderingEntityDIModule::class,
-    ],
-)
-internal class CommonPackageDIModule {
-    @Provides
-    @Reusable
+@Module
+@ComponentScan
+internal class CommonDIModule {
+    @Singleton
     fun genericCallData(
         databaseAdapter: DatabaseAdapter,
         retrofit: Retrofit,
@@ -60,16 +53,4 @@ internal class CommonPackageDIModule {
             versionManager,
         )
     }
-
-    @Provides
-    @Reusable
-    fun dataStatePropagator(impl: DataStatePropagatorImpl): DataStatePropagator {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun trackerDataManager(impl: TrackerDataManagerImpl): TrackerDataManager {
-        return impl
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt
index 302fc00647..17a74f0f08 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/DateFilterPeriodHelper.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.common
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.event.EventDataFilter
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.internal.CalendarProvider
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
-import java.util.*
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
+import java.util.Calendar
+import java.util.Date
 
-@Reusable
-internal class DateFilterPeriodHelper @Inject constructor(
+@Singleton
+internal class DateFilterPeriodHelper(
     private val calendarProvider: CalendarProvider,
     private val parentPeriodGenerator: ParentPeriodGenerator,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonModuleWiper.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonModuleWiper.kt
index f6ecde5eb2..85d3ae46aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/CommonModuleWiper.kt
@@ -25,34 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.common.internal;
-
-import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class CommonModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    CommonModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(ValueTypeDeviceRenderingTableInfo.TABLE_INFO);
+package org.hisp.dhis.android.core.common.internal
+
+import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class CommonModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(ValueTypeDeviceRenderingTableInfo.TABLE_INFO)
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No metadata to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
index 1a230afbe5..2a1aa1a37a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/DataStatePropagatorImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.common.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -48,12 +47,12 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-internal class DataStatePropagatorImpl @Inject internal constructor(
+internal class DataStatePropagatorImpl(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
index 7abb9bfaff..f77ea72a59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/internal/TrackerDataManagerImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.common.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDeletableDataObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
@@ -49,11 +48,11 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSt
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-internal class TrackerDataManagerImpl @Inject constructor(
+internal class TrackerDataManagerImpl(
     private val trackedEntityStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt
deleted file mode 100644
index 32a20a31b4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ValueTypeDeviceRenderingEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ValueTypeDeviceRenderingStore {
-        return ValueTypeDeviceRenderingStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ValueTypeDeviceRenderingStore): ValueTypeDeviceRenderingHandler {
-        return ValueTypeDeviceRenderingHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
index 74a4012187..f150317bde 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.common.valuetype.devicerendering.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ValueTypeDeviceRenderingHandler(
     store: ValueTypeDeviceRenderingStore,
 ) : ObjectWithoutUidHandlerImpl<ValueTypeDeviceRendering>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
index 40cc2ba2d6..e77e42891c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/devicerendering/internal/ValueTypeDeviceRenderingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRenderingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ValueTypeDeviceRenderingStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ValueTypeDeviceRenderingStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt
deleted file mode 100644
index 615b79e545..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.common.valuetype.rendering.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingHandler
-
-@Module
-internal class ValueTypeRenderingEntityDIModule {
-    @Provides
-    @Reusable
-    fun handler(deviceRenderingHandler: ValueTypeDeviceRenderingHandler): ValueTypeRenderingHandler {
-        return ValueTypeRenderingHandler(deviceRenderingHandler)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
index b6b983dfb3..fbfd9c0480 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/common/valuetype/rendering/internal/ValueTypeRenderingHandler.kt
@@ -31,7 +31,9 @@ import org.hisp.dhis.android.core.arch.handlers.internal.DictionaryTableHandler
 import org.hisp.dhis.android.core.common.ValueTypeDeviceRendering
 import org.hisp.dhis.android.core.common.ValueTypeRendering
 import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingHandler
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ValueTypeRenderingHandler(
     private val valueTypeDeviceRenderingHandler: ValueTypeDeviceRenderingHandler,
 ) : DictionaryTableHandler<ValueTypeRendering> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationDIModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationDIModule.kt
index 1841eb1c1d..f26b42a4ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/category/internal/CategoryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationDIModule.kt
@@ -25,24 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.category.internal
+package org.hisp.dhis.android.core.configuration.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
+import java.util.Date
 
 @Module
-internal class CategoryEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): CategoryStore {
-        return CategoryStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: CategoryStore): CategoryHandler {
-        return CategoryHandler(store)
+@ComponentScan
+internal class ConfigurationDIModule {
+    @Singleton
+    fun dateProvider(): DateProvider {
+        return object : DateProvider {
+            override val dateStr: String
+                get() = DateUtils.DATE_FORMAT.format(Date())
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
index 7b451d7954..a0ca76bbf8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationHelper.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.configuration.internal
 
-import dagger.Reusable
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DatabaseConfigurationHelper @Inject constructor(
+@Singleton
+internal class DatabaseConfigurationHelper(
     private val databaseNameGenerator: DatabaseNameGenerator,
     private val dateProvider: DateProvider,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
index 4e77a2ae6d..b20c28987a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationInsecureStoreImpl.kt
@@ -29,7 +29,9 @@ package org.hisp.dhis.android.core.configuration.internal
 
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.JsonKeyValueStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DatabaseConfigurationInsecureStoreImpl(
     insecureStore: InsecureStore,
 ) : DatabaseConfigurationInsecureStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
index 2897ae4a3d..9ee336a334 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseConfigurationMigration.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.configuration.internal
 
 import android.content.Context
 import android.database.sqlite.SQLiteException
-import dagger.Reusable
 import org.hisp.dhis.android.BuildConfig
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
 import org.hisp.dhis.android.core.configuration.internal.migration.DatabaseConfigurationInsecureStoreOld
 import org.hisp.dhis.android.core.configuration.internal.migration.Migration260
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DatabaseConfigurationMigration @Inject constructor(
+@Singleton
+internal class DatabaseConfigurationMigration(
     private val context: Context,
     private val databaseConfigurationStore: DatabaseConfigurationInsecureStore,
     private val credentialsStore: CredentialsSecureStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java
index a60ccdbca2..e28ba6fbae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java
@@ -31,12 +31,7 @@
 import java.security.SecureRandom;
 import java.util.Random;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-class DatabaseEncryptionPasswordGenerator {
+public class DatabaseEncryptionPasswordGenerator {
     private final Random random = new SecureRandom();
 
     private static final String ALLOWED_CHARS = "0123456789" + "abcdefghijklmnopqrstuvwxyz"
@@ -52,7 +47,6 @@ public String generate() {
         return new String(randomChars);
     }
 
-    @Inject
-    DatabaseEncryptionPasswordGenerator() {
+    public DatabaseEncryptionPasswordGenerator() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java
index 62749e5cd7..abf559e9d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordManager.java
@@ -35,8 +35,8 @@ public final class DatabaseEncryptionPasswordManager {
     private final SecureStore secureStore;
     private final DatabaseEncryptionPasswordGenerator passwordGenerator;
 
-    DatabaseEncryptionPasswordManager(SecureStore secureStore,
-                                      DatabaseEncryptionPasswordGenerator passwordGenerator) {
+    public DatabaseEncryptionPasswordManager(SecureStore secureStore,
+                                             DatabaseEncryptionPasswordGenerator passwordGenerator) {
         this.secureStore = secureStore;
         this.passwordGenerator = passwordGenerator;
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseNameGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseNameGenerator.kt
index e70de96681..64e388cfa7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseNameGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseNameGenerator.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.configuration.internal
 
-import dagger.Reusable
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DatabaseNameGenerator @Inject constructor() {
+@Singleton
+internal class DatabaseNameGenerator {
     fun getDatabaseName(serverUrl: String, username: String, encrypt: Boolean): String {
         val encryptedStr = if (encrypt) "encrypted" else "unencrypted"
         return processServerUrl(serverUrl) + "_" + username + "_" + encryptedStr + DbSuffix
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseRenamer.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseRenamer.kt
index 9a2ff6d05d..27de8e6c2a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseRenamer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseRenamer.kt
@@ -28,12 +28,11 @@
 package org.hisp.dhis.android.core.configuration.internal
 
 import android.content.Context
-import dagger.Reusable
+import org.koin.core.annotation.Singleton
 import java.io.File
-import javax.inject.Inject
 
-@Reusable
-internal class DatabaseRenamer @Inject constructor(private val context: Context) {
+@Singleton
+internal class DatabaseRenamer(private val context: Context) {
 
     fun renameDatabase(from: String, to: String): Boolean {
         val fromFile = context.getDatabasePath(from)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
index afd8b22787..d890eea172 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManager.kt
@@ -29,16 +29,15 @@ package org.hisp.dhis.android.core.configuration.internal
 
 import android.content.Context
 import android.util.Log
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseExport
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class MultiUserDatabaseManager @Inject internal constructor(
+@Singleton
+internal class MultiUserDatabaseManager(
     private val context: Context,
     private val databaseAdapter: DatabaseAdapter,
     private val databaseConfigurationSecureStore: DatabaseConfigurationInsecureStore,
@@ -188,5 +187,6 @@ internal class MultiUserDatabaseManager @Inject internal constructor(
 
     companion object {
         const val DefaultMaxAccounts = 1
+        internal val DefaultTestMaxAccounts = null
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
index 964be38f97..3a4887caa5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/MultiUserDatabaseManagerForD2Manager.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.configuration.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.storage.internal.Credentials
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class MultiUserDatabaseManagerForD2Manager @Inject constructor(
+@Singleton
+internal class MultiUserDatabaseManagerForD2Manager(
     private val databaseAdapter: DatabaseAdapter,
     private val migration: DatabaseConfigurationMigration,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
index 9733e48ca2..7b34fa29dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.constant
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.DoubleFilte
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.constant.internal.ConstantStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ConstantCollectionRepository @Inject internal constructor(
+@Singleton
+class ConstantCollectionRepository internal constructor(
     store: ConstantStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantDIModule.kt
new file mode 100644
index 0000000000..9753fe0d03
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/ConstantDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.constant
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ConstantDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
index b3878fea8c..affea0b414 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.constant.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ConstantCollectionCleaner @Inject constructor(
+@Singleton
+internal class ConstantCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<Constant>(
     tableName = ConstantTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 22620233d9..4015519fec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.constant.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
 import org.hisp.dhis.android.core.constant.Constant
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ConstantCoroutineCallFactory @Inject constructor(
+@Singleton
+internal class ConstantCoroutineCallFactory(
     data: GenericCallData,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: ConstantService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
index 77df37f955..bc095944b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantHandler.kt
@@ -29,7 +29,9 @@ package org.hisp.dhis.android.core.constant.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.constant.Constant
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ConstantHandler constructor(
     optionStore: ConstantStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
index 0956a2fe7d..57f668b1f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleDownloader.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.constant.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.constant.Constant
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ConstantModuleDownloader @Inject internal constructor(
+@Singleton
+internal class ConstantModuleDownloader(
     private val constantCallFactory: ConstantCoroutineCallFactory,
 ) :
     TypedModuleDownloader<List<Constant>> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.java
deleted file mode 100644
index 0909efc274..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.constant.ConstantCollectionRepository;
-import org.hisp.dhis.android.core.constant.ConstantModule;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ConstantModuleImpl implements ConstantModule {
-
-    private final ConstantCollectionRepository constants;
-
-    @Inject
-    ConstantModuleImpl(ConstantCollectionRepository constantsRepository) {
-        this.constants = constantsRepository;
-    }
-
-    @Override
-    public ConstantCollectionRepository constants() {
-        return constants;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.kt
index 147d8d769b..9a63a36896 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleImpl.kt
@@ -25,18 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataapproval.internal
+package org.hisp.dhis.android.core.constant.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.constant.ConstantCollectionRepository
+import org.hisp.dhis.android.core.constant.ConstantModule
+import org.koin.core.annotation.Singleton
 
-@Module(includes = [DataApprovalEntityDIModule::class])
-internal class DataApprovalPackageDIModule {
-    @Provides
-    @Reusable
-    fun dataApprovalService(retrofit: Retrofit): DataApprovalService {
-        return retrofit.create(DataApprovalService::class.java)
+@Singleton
+internal class ConstantModuleImpl(
+    private val constants: ConstantCollectionRepository,
+) : ConstantModule {
+    override fun constants(): ConstantCollectionRepository {
+        return constants
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.java
deleted file mode 100644
index 3111a524bc..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.constant.internal;
-
-import org.hisp.dhis.android.core.constant.ConstantTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ConstantModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    ConstantModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTable(ConstantTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // No data to wipe
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.kt
index 6469acbd08..a27b2b9022 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantModuleWiper.kt
@@ -25,24 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.legendset.internal
+package org.hisp.dhis.android.core.constant.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.constant.ConstantTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class LegendEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LegendStore {
-        return LegendStoreImpl(databaseAdapter)
+@Singleton
+internal class ConstantModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTable(ConstantTableInfo.TABLE_INFO)
     }
 
-    @Provides
-    @Reusable
-    fun handler(store: LegendStore): LegendHandler {
-        return LegendHandler(store)
+    override fun wipeData() {
+        // No data to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
deleted file mode 100644
index 22f09ae269..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantPackageDIModule.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.constant.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactory
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.constant.ConstantModule
-import retrofit2.Retrofit
-
-@Module
-internal class ConstantPackageDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ConstantStore {
-        return ConstantStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        optionStore: ConstantStore,
-        collectionCleaner: ConstantCollectionCleaner,
-    ): ConstantHandler {
-        return ConstantHandler(optionStore, collectionCleaner)
-    }
-
-    @Provides
-    @Reusable
-    fun constantCallFactory(impl: ConstantCoroutineCallFactory): ListCoroutineCallFactory<Constant> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): ConstantService {
-        return retrofit.create(ConstantService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: ConstantModuleImpl): ConstantModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
index cb99933216..c2cf5767bb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.ConstantTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ConstantStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
index b43ede96b8..f398e2526c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataapproval
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EnumFilterConnector
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.dataapproval.internal.DataApprovalStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataApprovalCollectionRepository @Inject internal constructor(
+@Singleton
+class DataApprovalCollectionRepository internal constructor(
     dataApprovalStore: DataApprovalStore,
     databaseAdapter: DatabaseAdapter,
     repositoryScope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalDIModule.kt
new file mode 100644
index 0000000000..79da3fbb1a
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/DataApprovalDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataapproval
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class DataApprovalDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
index e934485ce3..f4b7c45e16 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.dataapproval.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.internal.MultiDimensionalPartitioner
 import org.hisp.dhis.android.core.dataapproval.DataApproval
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataApprovalCall @Inject constructor(
+@Singleton
+internal class DataApprovalCall(
     private val service: DataApprovalService,
     private val handler: DataApprovalHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
deleted file mode 100644
index 6e3f45780c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataapproval.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataApprovalEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataApprovalStore {
-        return DataApprovalStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(dataApprovalStore: DataApprovalStore): DataApprovalHandler {
-        return DataApprovalHandler(dataApprovalStore)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
index c1729444ec..91fe8657ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.dataapproval.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.dataapproval.DataApproval
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataApprovalHandler(
     dataApprovalStore: DataApprovalStore,
 ) : ObjectWithoutUidHandlerImpl<DataApproval>(dataApprovalStore)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
index 057c57e681..62ee8bd9cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataapproval/internal/DataApprovalStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.dataapproval.DataApproval
 import org.hisp.dhis.android.core.dataapproval.DataApprovalTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataApprovalStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataApprovalStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
index 049f5705c1..64c5bf6154 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataelement
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -40,11 +39,11 @@ import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.dataelement.internal.DataElementFields
 import org.hisp.dhis.android.core.dataelement.internal.DataElementLegendSetChildrenAppender
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class DataElementCollectionRepository @Inject internal constructor(
+class DataElementCollectionRepository internal constructor(
     store: DataElementStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementDIModule.kt
new file mode 100644
index 0000000000..d6ccdf6731
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/DataElementDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataelement
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class DataElementDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
deleted file mode 100644
index b5d0e694a1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementAttributeValueEntityDIModule.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
-import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkStore
-import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkStoreImpl
-
-@Module
-internal class DataElementAttributeValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataElementAttributeValueLinkStore {
-        return DataElementAttributeValueLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: DataElementAttributeValueLinkStore,
-    ): DataElementAttributeValueLinkHandler {
-        return DataElementAttributeValueLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
index d39a8fff38..16405f5dc7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataelement.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
@@ -39,11 +38,11 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoR
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.dataelement.DataElement
+import org.koin.core.annotation.Singleton
 import retrofit2.Call
-import javax.inject.Inject
 
-@Reusable
-internal class DataElementEndpointCallFactory @Inject constructor(
+@Singleton
+internal class DataElementEndpointCallFactory(
     data: GenericCallData,
     apiCallExecutor: APICallExecutor,
     private val service: DataElementService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
deleted file mode 100644
index 02a6a37b01..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEntityDIModule.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
-import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
-
-@Module
-internal class DataElementEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataElementStore {
-        return DataElementStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        dataElementStore: DataElementStore,
-        attributeHandler: AttributeHandler,
-        dataElementAttributeLinkHandler: DataElementAttributeValueLinkHandler,
-        dataElementLegendSetLinkHandler: DataElementLegendSetLinkHandler,
-    ): DataElementHandler {
-        return DataElementHandler(
-            dataElementStore,
-            attributeHandler,
-            dataElementAttributeLinkHandler,
-            dataElementLegendSetLinkHandler,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
index d44502046c..f8017473de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementHandler.kt
@@ -29,21 +29,23 @@ package org.hisp.dhis.android.core.dataelement.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
-import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandler
 import org.hisp.dhis.android.core.attribute.Attribute
 import org.hisp.dhis.android.core.attribute.AttributeValueUtils
 import org.hisp.dhis.android.core.attribute.DataElementAttributeValueLink
 import org.hisp.dhis.android.core.attribute.internal.AttributeHandler
+import org.hisp.dhis.android.core.attribute.internal.DataElementAttributeValueLinkHandler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
+import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementHandler constructor(
     dataElementStore: DataElementStore,
     private val attributeHandler: AttributeHandler,
-    private val dataElementAttributeLinkHandler: LinkHandler<Attribute, DataElementAttributeValueLink>,
-    private val dataElementLegendSetLinkHandler: OrderedLinkHandler<ObjectWithUid, DataElementLegendSetLink>,
+    private val dataElementAttributeLinkHandler: DataElementAttributeValueLinkHandler,
+    private val dataElementLegendSetLinkHandler: DataElementLegendSetLinkHandler,
 ) : IdentifiableHandlerImpl<DataElement>(dataElementStore) {
 
     override fun afterObjectHandled(o: DataElement, action: HandleAction) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
deleted file mode 100644
index d27f316e9e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementLegendSetEntityDIModule.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkHandler
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStore
-import org.hisp.dhis.android.core.legendset.internal.DataElementLegendSetLinkStoreImpl
-
-@Module
-internal class DataElementLegendSetEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataElementLegendSetLinkStore {
-        return DataElementLegendSetLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: DataElementLegendSetLinkStore,
-    ): DataElementLegendSetLinkHandler {
-        return DataElementLegendSetLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.java
deleted file mode 100644
index 88789b6267..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.dataelement.DataElementCollectionRepository;
-import org.hisp.dhis.android.core.dataelement.DataElementModule;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class DataElementModuleImpl implements DataElementModule {
-
-    private final DataElementCollectionRepository dataElements;
-
-    @Inject
-    DataElementModuleImpl(DataElementCollectionRepository dataElementsRepository) {
-        this.dataElements = dataElementsRepository;
-    }
-
-    @Override
-    public DataElementCollectionRepository dataElements() {
-        return dataElements;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.kt
index 0a12d5a43d..7b5e75d8b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleImpl.kt
@@ -25,18 +25,17 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.systeminfo.internal
+package org.hisp.dhis.android.core.dataelement.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.dataelement.DataElementCollectionRepository
+import org.hisp.dhis.android.core.dataelement.DataElementModule
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class SystemInfoEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SystemInfoStore {
-        return SystemInfoStoreImpl(databaseAdapter)
+@Singleton
+internal class DataElementModuleImpl(
+    private val dataElements: DataElementCollectionRepository,
+) : DataElementModule {
+    override fun dataElements(): DataElementCollectionRepository {
+        return dataElements
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleWiper.kt
similarity index 72%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleWiper.kt
index 1a27f8f6f1..b55a86d714 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementModuleWiper.kt
@@ -25,36 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataelement.internal;
-
-import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo;
-import org.hisp.dhis.android.core.dataelement.DataElementTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class DataElementModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    DataElementModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+package org.hisp.dhis.android.core.dataelement.internal
+
+import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo
+import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class DataElementModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                DataElementTableInfo.TABLE_INFO,
-                DataElementOperandTableInfo.TABLE_INFO);
+            DataElementTableInfo.TABLE_INFO,
+            DataElementOperandTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No data to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt
deleted file mode 100644
index 8c78c780b5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataElementOperandEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataElementOperandStore {
-        return DataElementOperandStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: DataElementOperandStore): DataElementOperandHandler {
-        return DataElementOperandHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
index e9dcea0b21..3649a3a681 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandHandler.kt
@@ -27,10 +27,11 @@
  */
 package org.hisp.dhis.android.core.dataelement.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementOperandHandler constructor(
-    store: IdentifiableObjectStore<DataElementOperand>,
+    store: DataElementOperandStore,
 ) : IdentifiableHandlerImpl<DataElementOperand>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
index 5c38528897..db3a057c4e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementOperandStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataelement.DataElementOperandTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementOperandStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataElementOperandStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
deleted file mode 100644
index 24b4d26b72..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementPackageDIModule.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataelement.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataelement.DataElementModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        DataElementEntityDIModule::class,
-        DataElementOperandEntityDIModule::class,
-        DataElementAttributeValueEntityDIModule::class,
-        DataElementLegendSetEntityDIModule::class,
-    ],
-)
-internal class DataElementPackageDIModule {
-    @Provides
-    @Reusable
-    fun dataElementEndpointCallFactory(impl: DataElementEndpointCallFactory): UidsCallFactory<DataElement> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): DataElementService {
-        return retrofit.create(DataElementService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: DataElementModuleImpl): DataElementModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java
index 2b9c6b35ac..3b15746004 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java
@@ -38,7 +38,7 @@
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
-interface DataElementService {
+public interface DataElementService {
     @GET("dataElements")
     Call<Payload<DataElement>> getDataElements(@Query("fields") @Which Fields<DataElement> fields,
                                                @Query("filter") @Where Filter<DataElement, String> uids,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
index 722247a0d1..de1720e20a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class DataElementStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
index ccf7754801..15f4e770d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -47,11 +46,11 @@ import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorChildrenApp
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class DataSetCollectionRepository @Inject internal constructor(
+class DataSetCollectionRepository internal constructor(
     store: DataSetStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
index c3fd6483b4..227add00aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetCompleteRegistrationCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -49,11 +48,11 @@ import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationHa
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationPostCall
 import org.hisp.dhis.android.core.dataset.internal.DataSetCompleteRegistrationStore
 import org.hisp.dhis.android.core.user.UserCredentialsObjectRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("SpreadOperator", "TooManyFunctions")
-class DataSetCompleteRegistrationCollectionRepository @Inject internal constructor(
+class DataSetCompleteRegistrationCollectionRepository internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDIModule.kt
new file mode 100644
index 0000000000..b897924ff3
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.dataset
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class DataSetDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
index 81899c69a8..96a3b7a645 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSQLStatementBuilder
 import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceStore
 import org.hisp.dhis.android.core.period.PeriodType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataSetInstanceCollectionRepository @Inject internal constructor(
+@Singleton
+class DataSetInstanceCollectionRepository internal constructor(
     store: DataSetInstanceStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
index 382b6ae691..e290ef8328 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceSummaryCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.DateFilterConnector
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSQLStatementBuilder
 import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceSummaryStore
 import org.hisp.dhis.android.core.period.PeriodType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataSetInstanceSummaryCollectionRepository @Inject internal constructor(
+@Singleton
+class DataSetInstanceSummaryCollectionRepository internal constructor(
     store: DataSetInstanceSummaryStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
index 487dcd0885..1de495b54f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/SectionCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.dataset.internal.SectionFields
 import org.hisp.dhis.android.core.dataset.internal.SectionGreyedFieldsChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.SectionIndicatorsChildrenAppender
 import org.hisp.dhis.android.core.dataset.internal.SectionStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SectionCollectionRepository @Inject internal constructor(
+@Singleton
+class SectionCollectionRepository internal constructor(
     store: SectionStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt
deleted file mode 100644
index b934b30e5a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataInputPeriodEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataInputPeriodStore {
-        return DataInputPeriodStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: DataInputPeriodStore): DataInputPeriodHandler {
-        return DataInputPeriodHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
index ad8ee5ca53..2daeeaa0d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.dataset.DataInputPeriod
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataInputPeriodHandler(
     store: DataInputPeriodStore,
 ) : LinkHandlerImpl<DataInputPeriod, DataInputPeriod>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
index cff57f4fcf..15efb196cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataInputPeriodStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.dataset.DataInputPeriod
 import org.hisp.dhis.android.core.dataset.DataInputPeriodTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataInputPeriodStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataInputPeriodStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
index 4fcedda82a..59e7bbd9c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetCollectionCleaner @Inject constructor(
+@Singleton
+internal class DataSetCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<DataSet>(
     tableName = DataSetTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
index 82d408e3e0..bcd5bf0439 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.internal.MultiDimensionalPartitioner
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetCompleteRegistrationCall @Inject constructor(
+@Singleton
+internal class DataSetCompleteRegistrationCall(
     private val service: DataSetCompleteRegistrationService,
     private val multiDimensionalPartitioner: MultiDimensionalPartitioner,
     private val processor: DataSetCompleteRegistrationCallProcessor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
index 12d8ab3f65..8d13605be2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationCallProcessor.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetCompleteRegistrationCallProcessor @Inject internal constructor(
+@Singleton
+internal class DataSetCompleteRegistrationCallProcessor internal constructor(
     private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
     private val handler: DataSetCompleteRegistrationHandler,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
deleted file mode 100644
index 8d3bf4958c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetCompleteRegistrationEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetCompleteRegistrationStore {
-        return DataSetCompleteRegistrationStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: DataSetCompleteRegistrationStore): DataSetCompleteRegistrationHandler {
-        return DataSetCompleteRegistrationHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
index 494930b29e..503166b457 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetCompleteRegistrationHandler(
     store: DataSetCompleteRegistrationStore,
 ) : ObjectWithoutUidHandlerImpl<DataSetCompleteRegistration>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.java
deleted file mode 100644
index d779dce8b9..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import androidx.annotation.NonNull;
-
-import org.hisp.dhis.android.core.common.State;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration;
-import org.hisp.dhis.android.core.imports.ImportStatus;
-import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary;
-import org.hisp.dhis.android.core.imports.internal.ImportConflict;
-import org.hisp.dhis.android.core.imports.internal.ImportCount;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-final class DataSetCompleteRegistrationImportHandler {
-
-    private final DataSetCompleteRegistrationStore dataSetCompleteRegistrationStore;
-
-    @Inject
-    DataSetCompleteRegistrationImportHandler(
-            DataSetCompleteRegistrationStore dataSetCompleteRegistrationStore) {
-        this.dataSetCompleteRegistrationStore = dataSetCompleteRegistrationStore;
-    }
-
-    DataValueImportSummary handleImportSummary(
-            @NonNull DataSetCompleteRegistrationPayload dataSetCompleteRegistrationPayload,
-            @NonNull DataValueImportSummary dataValueImportSummary,
-            @NonNull List<DataSetCompleteRegistration> deletedDataSetCompleteRegistrations,
-            @NonNull List<DataSetCompleteRegistration> withErrorDataSetCompleteRegistrations) {
-        State newState = dataValueImportSummary.importStatus() == ImportStatus.ERROR ? State.ERROR : State.SYNCED;
-
-        for (DataSetCompleteRegistration dataSetCompleteRegistration :
-                dataSetCompleteRegistrationPayload.dataSetCompleteRegistrations) {
-            if (dataSetCompleteRegistrationStore.isBeingUpload(dataSetCompleteRegistration)) {
-                dataSetCompleteRegistrationStore.setState(dataSetCompleteRegistration, newState);
-            }
-        }
-
-        List<ImportConflict> conflicts = handleDeletedDataSetCompleteRegistrations(deletedDataSetCompleteRegistrations,
-                withErrorDataSetCompleteRegistrations);
-
-        if (dataValueImportSummary.importConflicts() != null) {
-            conflicts.addAll(dataValueImportSummary.importConflicts());
-        }
-
-        return recreateDataValueImportSummary(dataValueImportSummary, conflicts,
-                deletedDataSetCompleteRegistrations.size());
-    }
-
-    private List<ImportConflict> handleDeletedDataSetCompleteRegistrations(
-            @NonNull List<DataSetCompleteRegistration> deletedDataSetCompleteRegistrations,
-            @NonNull List<DataSetCompleteRegistration> withErrorDataSetCompleteRegistrations) {
-
-        List<ImportConflict> conflicts = new ArrayList<>();
-        for (DataSetCompleteRegistration dataSetCompleteRegistration : withErrorDataSetCompleteRegistrations) {
-            if (dataSetCompleteRegistrationStore.isBeingUpload(dataSetCompleteRegistration)) {
-                dataSetCompleteRegistrationStore.setState(dataSetCompleteRegistration, State.ERROR);
-                conflicts.add(ImportConflict.create(
-                        dataSetCompleteRegistration.toString(), "Error marking as incomplete"));
-            }
-        }
-
-        for (DataSetCompleteRegistration dataSetCompleteRegistration : deletedDataSetCompleteRegistrations) {
-            if (dataSetCompleteRegistrationStore.isBeingUpload(dataSetCompleteRegistration)) {
-                dataSetCompleteRegistrationStore.deleteById(dataSetCompleteRegistration);
-            }
-        }
-        return conflicts;
-    }
-
-    private DataValueImportSummary recreateDataValueImportSummary(DataValueImportSummary dataValueImportSummary,
-                                                                  List<ImportConflict> conflicts,
-                                                                  int deletedDataSetCompleteRegistrationsSize) {
-
-        ImportCount ic = dataValueImportSummary.importCount();
-        return DataValueImportSummary.create(ImportCount.create(ic.imported(), ic.updated(),
-                ic.deleted() + deletedDataSetCompleteRegistrationsSize, ic.ignored()),
-                dataValueImportSummary.importStatus(),
-                dataValueImportSummary.responseType(),
-                dataValueImportSummary.reference(),
-                conflicts.isEmpty() ? null : conflicts);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.kt
new file mode 100644
index 0000000000..2f105a8526
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationImportHandler.kt
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.common.State
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
+import org.hisp.dhis.android.core.imports.ImportStatus
+import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary
+import org.hisp.dhis.android.core.imports.internal.ImportConflict
+import org.hisp.dhis.android.core.imports.internal.ImportCount
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class DataSetCompleteRegistrationImportHandler(
+    private val dataSetCompleteRegistrationStore: DataSetCompleteRegistrationStore,
+) {
+    fun handleImportSummary(
+        dataSetCompleteRegistrationPayload: DataSetCompleteRegistrationPayload,
+        dataValueImportSummary: DataValueImportSummary,
+        deletedDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
+        withErrorDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
+    ): DataValueImportSummary {
+        val newState = if (dataValueImportSummary.importStatus() == ImportStatus.ERROR) State.ERROR else State.SYNCED
+        for (dataSetCompleteRegistration in dataSetCompleteRegistrationPayload.dataSetCompleteRegistrations) {
+            if (dataSetCompleteRegistrationStore.isBeingUpload(dataSetCompleteRegistration!!)) {
+                dataSetCompleteRegistrationStore.setState(dataSetCompleteRegistration, newState)
+            }
+        }
+        val deletedDatasetConflicts = handleDeletedDataSetCompleteRegistrations(
+            deletedDataSetCompleteRegistrations,
+            withErrorDataSetCompleteRegistrations,
+        )
+        val importConflicts = dataValueImportSummary.importConflicts() ?: emptyList()
+
+        val allConflicts = deletedDatasetConflicts + importConflicts
+
+        return recreateDataValueImportSummary(
+            dataValueImportSummary,
+            allConflicts,
+            deletedDataSetCompleteRegistrations.size,
+        )
+    }
+
+    private fun handleDeletedDataSetCompleteRegistrations(
+        deletedDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
+        withErrorDataSetCompleteRegistrations: List<DataSetCompleteRegistration>,
+    ): List<ImportConflict> {
+        val conflicts = withErrorDataSetCompleteRegistrations
+            .filter { dataSetCompleteRegistrationStore.isBeingUpload(it) }
+            .map {
+                dataSetCompleteRegistrationStore.setState(it, State.ERROR)
+                ImportConflict.create(
+                    it.toString(),
+                    "Error marking as incomplete",
+                )
+            }
+
+        deletedDataSetCompleteRegistrations
+            .filter { dataSetCompleteRegistrationStore.isBeingUpload(it) }
+            .forEach { dataSetCompleteRegistrationStore.deleteById(it) }
+
+        return conflicts
+    }
+
+    private fun recreateDataValueImportSummary(
+        dataValueImportSummary: DataValueImportSummary,
+        conflicts: List<ImportConflict>,
+        deletedDataSetCompleteRegistrationsSize: Int,
+    ): DataValueImportSummary {
+        val ic = dataValueImportSummary.importCount()
+        return DataValueImportSummary.create(
+            ImportCount.create(
+                ic.imported(),
+                ic.updated(),
+                ic.deleted() + deletedDataSetCompleteRegistrationsSize,
+                ic.ignored(),
+            ),
+            dataValueImportSummary.importStatus(),
+            dataValueImportSummary.responseType(),
+            dataValueImportSummary.reference(),
+            conflicts.ifEmpty { null },
+        )
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
index 8d823bd583..035f98a2f8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flow
@@ -47,11 +46,11 @@ import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResp
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class DataSetCompleteRegistrationPostCall @Inject constructor(
+@Singleton
+internal class DataSetCompleteRegistrationPostCall(
     private val dataSetCompleteRegistrationService: DataSetCompleteRegistrationService,
     private val dataSetCompleteRegistrationImportHandler: DataSetCompleteRegistrationImportHandler,
     private val categoryOptionComboCollectionRepository: CategoryOptionComboCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
index bc1562160b..df4987808f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompleteRegistrationStoreImpl.kt
@@ -38,7 +38,9 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistration
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetCompleteRegistrationStoreImpl constructor(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetCompleteRegistrationStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
deleted file mode 100644
index ba5b63edc1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetCompulsoryDataElementOperandEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetCompulsoryDataElementOperandLinkStore {
-        return DataSetCompulsoryDataElementOperandLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: DataSetCompulsoryDataElementOperandLinkStore,
-    ): DataSetCompulsoryDataElementOperandHandler {
-        return DataSetCompulsoryDataElementOperandHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
index 66f8b4adee..7833fbddf2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetCompulsoryDataElementOperandHandler(
     store: DataSetCompulsoryDataElementOperandLinkStore,
 ) : LinkHandlerImpl<DataElementOperand, DataSetCompulsoryDataElementOperandLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
index 59c795d42a..a1ad879db0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetCompulsoryDataElementOperandLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLink
 import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetCompulsoryDataElementOperandLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetCompulsoryDataElementOperandLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt
deleted file mode 100644
index 6d52ada78e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetElementEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetElementStore {
-        return DataSetElementStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: DataSetElementStore): DataSetElementHandler {
-        return DataSetElementHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
index e574e21339..61fb2b0bc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.dataset.DataSetElement
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetElementHandler(
     store: DataSetElementStore,
 ) : LinkHandlerImpl<DataSetElement, DataSetElement>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
index 0500c1957c..8581eaa2dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetElementStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.dataset.DataSetElement
 import org.hisp.dhis.android.core.dataset.DataSetElementLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetElementStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetElementStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
index 449807369a..f56a650e84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
@@ -40,11 +39,11 @@ import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.resource.internal.Resource
+import org.koin.core.annotation.Singleton
 import retrofit2.Call
-import javax.inject.Inject
 
-@Reusable
-internal class DataSetEndpointCallFactory @Inject constructor(
+@Singleton
+internal class DataSetEndpointCallFactory(
     data: GenericCallData,
     apiCallExecutor: APICallExecutor,
     private val dataSetService: DataSetService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
deleted file mode 100644
index 335ec89c88..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEntityDIModule.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.dataelement.internal.DataElementOperandHandler
-import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
-
-@Module
-internal class DataSetEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetStore {
-        return DataSetStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    @Suppress("LongParameterList")
-    fun handler(
-        dataSetStore: DataSetStore,
-        sectionHandler: SectionHandler,
-        sectionOrphanCleaner: SectionOrphanCleaner,
-        compulsoryDataElementOperandHandler: DataElementOperandHandler,
-        dataSetCompulsoryDataElementOperandLinkHandler: DataSetCompulsoryDataElementOperandHandler,
-        dataInputPeriodHandler: DataInputPeriodHandler,
-        dataSetElementLinkHandler: DataSetElementHandler,
-        dataSetIndicatorLinkHandler: DataSetIndicatorLinkHandler,
-        collectionCleaner: DataSetCollectionCleaner,
-        linkCleaner: DataSetOrganisationUnitLinkCleaner,
-    ): DataSetHandler {
-        return DataSetHandler(
-            dataSetStore,
-            sectionHandler,
-            sectionOrphanCleaner,
-            compulsoryDataElementOperandHandler,
-            dataSetCompulsoryDataElementOperandLinkHandler,
-            dataInputPeriodHandler,
-            dataSetElementLinkHandler,
-            dataSetIndicatorLinkHandler,
-            collectionCleaner,
-            linkCleaner,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
index d0f4c5f4f2..79cd9834ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetHandler.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.dataset.*
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.internal.DataSetIndicatorLinkHandler
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("LongParameterList")
 internal class DataSetHandler constructor(
     dataSetStore: DataSetStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt
deleted file mode 100644
index 40cd03a2c1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetInstanceEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetInstanceStore {
-        return DataSetInstanceStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun summaryStore(databaseAdapter: DatabaseAdapter): DataSetInstanceSummaryStore {
-        return DataSetInstanceSummaryStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index 1a27439156..7a174d7dac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionCollectionRepository
@@ -43,12 +42,12 @@ import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-internal class DataSetInstanceServiceImpl @Inject constructor(
+internal class DataSetInstanceServiceImpl(
     private val dataSetCollectionRepository: DataSetCollectionRepository,
     private val categoryOptionRepository: CategoryOptionCollectionRepository,
     private val organisationUnitService: OrganisationUnitService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
index 2a0e76bdbe..c84b050f1e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceStoreImpl.kt
@@ -31,7 +31,9 @@ import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl
 import org.hisp.dhis.android.core.dataset.DataSetInstance
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetInstanceStoreImpl constructor(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetInstanceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
index a8904c3c79..d05c02eebb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceSummaryStoreImpl.kt
@@ -31,7 +31,9 @@ import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.internal.ReadableStoreImpl
 import org.hisp.dhis.android.core.dataset.DataSetInstanceSummary
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetInstanceSummaryStoreImpl constructor(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetInstanceSummaryStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index 5ed6b8dd30..b3c218508f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -27,27 +27,23 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import kotlinx.coroutines.runBlocking
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataelement.internal.DataElementEndpointCallFactory
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCallCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Suppress("LongParameterList")
-@Reusable
-internal class DataSetModuleDownloader @Inject internal constructor(
-    private val dataSetCallFactory: UidsCallFactory<DataSet>,
-    private val dataElementCallFactory: UidsCallFactory<DataElement>,
+@Singleton
+internal class DataSetModuleDownloader internal constructor(
+    private val dataSetCallFactory: DataSetEndpointCallFactory,
+    private val dataElementCallFactory: DataElementEndpointCallFactory,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val validationRuleCall: ValidationRuleCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.java
deleted file mode 100644
index 12e7529afb..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.dataapproval.DataApprovalCollectionRepository;
-import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationCollectionRepository;
-import org.hisp.dhis.android.core.dataset.DataSetInstanceCollectionRepository;
-import org.hisp.dhis.android.core.dataset.DataSetInstanceSummaryCollectionRepository;
-import org.hisp.dhis.android.core.dataset.DataSetModule;
-import org.hisp.dhis.android.core.dataset.SectionCollectionRepository;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class DataSetModuleImpl implements DataSetModule {
-
-    private final DataSetCompleteRegistrationCollectionRepository dataSetCompleteRegistrations;
-    private final DataSetCollectionRepository dataSets;
-    private final SectionCollectionRepository sections;
-    private final DataApprovalCollectionRepository dataApprovals;
-    private final DataSetInstanceCollectionRepository dataSetInstances;
-    private final DataSetInstanceSummaryCollectionRepository dataSetInstanceSummaries;
-
-    @Inject
-    DataSetModuleImpl(DataSetCompleteRegistrationCollectionRepository dataSetCompleteRegistrations,
-                      DataSetCollectionRepository dataSets,
-                      SectionCollectionRepository sections,
-                      DataApprovalCollectionRepository dataApprovalCollectionRepository,
-                      DataSetInstanceCollectionRepository dataSetInstanceCollectionRepository,
-                      DataSetInstanceSummaryCollectionRepository dataSetInstanceSummaries) {
-        this.dataSetCompleteRegistrations = dataSetCompleteRegistrations;
-        this.dataSets = dataSets;
-        this.sections = sections;
-        this.dataApprovals = dataApprovalCollectionRepository;
-        this.dataSetInstances = dataSetInstanceCollectionRepository;
-        this.dataSetInstanceSummaries = dataSetInstanceSummaries;
-    }
-
-    @Override
-    public DataSetCompleteRegistrationCollectionRepository dataSetCompleteRegistrations() {
-        return dataSetCompleteRegistrations;
-    }
-
-    @Override
-    public DataSetCollectionRepository dataSets() {
-        return dataSets;
-    }
-
-    @Override
-    public SectionCollectionRepository sections() {
-        return sections;
-    }
-
-    @Override
-    public DataApprovalCollectionRepository dataApprovals() {
-        return dataApprovals;
-    }
-
-    @Override
-    public DataSetInstanceCollectionRepository dataSetInstances() {
-        return dataSetInstances;
-    }
-
-    @Override
-    public DataSetInstanceSummaryCollectionRepository dataSetInstanceSummaries() {
-        return dataSetInstanceSummaries;
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt
similarity index 50%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt
index 08ee72dd2f..2478954e51 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt
@@ -27,51 +27,45 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
-import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataapproval.DataApprovalCollectionRepository
+import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationCollectionRepository
+import org.hisp.dhis.android.core.dataset.DataSetInstanceCollectionRepository
+import org.hisp.dhis.android.core.dataset.DataSetInstanceSummaryCollectionRepository
 import org.hisp.dhis.android.core.dataset.DataSetModule
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.dataset.SectionCollectionRepository
+import org.koin.core.annotation.Singleton
 
-@Module(
-    includes = [
-        DataInputPeriodEntityDIModule::class,
-        DataSetElementEntityDIModule::class,
-        DataSetCompulsoryDataElementOperandEntityDIModule::class,
-        DataSetEntityDIModule::class,
-        DataSetCompleteRegistrationEntityDIModule::class,
-        DataSetInstanceEntityDIModule::class,
-        DataSetOrganisationUnitLinkEntityDIModule::class,
-        SectionEntityDIModule::class,
-        SectionIndicatorEntityDIModule::class,
-        SectionDataElementEntityDIModule::class,
-        SectionGreyedFieldsEntityDIModule::class,
-    ],
-)
-internal class DataSetPackageDIModule {
-    @Provides
-    @Reusable
-    fun dataSetEndpointCallFactory(impl: DataSetEndpointCallFactory): UidsCallFactory<DataSet> {
-        return impl
+@Singleton
+class DataSetModuleImpl(
+    private val dataSetCompleteRegistrations: DataSetCompleteRegistrationCollectionRepository,
+    private val dataSets: DataSetCollectionRepository,
+    private val sections: SectionCollectionRepository,
+    private val dataApprovals: DataApprovalCollectionRepository,
+    private val dataSetInstances: DataSetInstanceCollectionRepository,
+    private val dataSetInstanceSummaries: DataSetInstanceSummaryCollectionRepository,
+) : DataSetModule {
+    override fun dataSetCompleteRegistrations(): DataSetCompleteRegistrationCollectionRepository {
+        return dataSetCompleteRegistrations
     }
 
-    @Provides
-    @Reusable
-    fun dataSetService(retrofit: Retrofit): DataSetService {
-        return retrofit.create(DataSetService::class.java)
+    override fun dataSets(): DataSetCollectionRepository {
+        return dataSets
     }
 
-    @Provides
-    @Reusable
-    fun dataSetCompleteRegistrationService(retrofit: Retrofit): DataSetCompleteRegistrationService {
-        return retrofit.create(DataSetCompleteRegistrationService::class.java)
+    override fun sections(): SectionCollectionRepository {
+        return sections
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: DataSetModuleImpl): DataSetModule {
-        return impl
+    override fun dataApprovals(): DataApprovalCollectionRepository {
+        return dataApprovals
+    }
+
+    override fun dataSetInstances(): DataSetInstanceCollectionRepository {
+        return dataSetInstances
+    }
+
+    override fun dataSetInstanceSummaries(): DataSetInstanceSummaryCollectionRepository {
+        return dataSetInstanceSummaries
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleWiper.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleWiper.kt
index 49496e1b5c..12b79dd0fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleWiper.kt
@@ -25,50 +25,39 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
-
-import org.hisp.dhis.android.core.dataset.DataInputPeriodTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetDataElementLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.DataSetTableInfo;
-import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo;
-import org.hisp.dhis.android.core.dataset.SectionTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class DataSetModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    DataSetModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+package org.hisp.dhis.android.core.dataset.internal
+
+import org.hisp.dhis.android.core.dataset.DataInputPeriodTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetCompulsoryDataElementOperandLinkTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetDataElementLinkTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import org.hisp.dhis.android.core.dataset.DataSetTableInfo
+import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo
+import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
+import org.hisp.dhis.android.core.dataset.SectionTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class DataSetModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                DataInputPeriodTableInfo.TABLE_INFO,
-                DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
-                DataSetDataElementLinkTableInfo.TABLE_INFO,
-                DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
-                DataSetTableInfo.TABLE_INFO,
-                SectionDataElementLinkTableInfo.TABLE_INFO,
-                SectionTableInfo.TABLE_INFO,
-                SectionGreyedFieldsLinkTableInfo.TABLE_INFO
-        );
+            DataInputPeriodTableInfo.TABLE_INFO,
+            DataSetCompulsoryDataElementOperandLinkTableInfo.TABLE_INFO,
+            DataSetDataElementLinkTableInfo.TABLE_INFO,
+            DataSetOrganisationUnitLinkTableInfo.TABLE_INFO,
+            DataSetTableInfo.TABLE_INFO,
+            SectionDataElementLinkTableInfo.TABLE_INFO,
+            SectionTableInfo.TABLE_INFO,
+            SectionGreyedFieldsLinkTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
-        tableWiper.wipeTable(DataSetCompleteRegistrationTableInfo.TABLE_INFO);
+    override fun wipeData() {
+        tableWiper.wipeTable(DataSetCompleteRegistrationTableInfo.TABLE_INFO)
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
index 460ecfb105..cd0fe942ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetOrganisationUnitLinkCleaner @Inject constructor(
+@Singleton
+internal class DataSetOrganisationUnitLinkCleaner(
     programStore: DataSetStore,
     databaseAdapter: DatabaseAdapter,
 ) : LinkCleanerImpl<DataSet>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt
deleted file mode 100644
index 4bc5db2b8c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetOrganisationUnitLinkEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetOrganisationUnitLinkStore {
-        return DataSetOrganisationUnitLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: DataSetOrganisationUnitLinkStore): DataSetOrganisationUnitLinkHandler {
-        return DataSetOrganisationUnitLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
index 72716f3af6..87badf0887 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetOrganisationUnitLinkHandler(
     store: DataSetOrganisationUnitLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, DataSetOrganisationUnitLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
index 0e30fd97b6..e836fdea56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetOrganisationUnitLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetOrganisationUnitLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetOrganisationUnitLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java
index f1681ab8e0..d1482ed18f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java
@@ -38,7 +38,7 @@
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
-interface DataSetService {
+public interface DataSetService {
     @GET("dataSets")
     Call<Payload<DataSet>> getDataSets(@Query("fields") @Which Fields<DataSet> fields,
                                        @Query("filter") @Where Filter<DataSet, String> uids,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
index 397020c47a..57f3c9d70d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class DataSetStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt
deleted file mode 100644
index 81e46677c5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class SectionDataElementEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SectionDataElementLinkStore {
-        return SectionDataElementLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: SectionDataElementLinkStore): SectionDataElementLinkHandler {
-        return SectionDataElementLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
index 2794548963..c50ac8c9f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.dataset.SectionDataElementLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SectionDataElementLinkHandler(
     store: SectionDataElementLinkStore,
 ) : OrderedLinkHandlerImpl<DataElement, SectionDataElementLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
index 664e0f78e0..8097590437 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionDataElementLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.dataset.SectionDataElementLink
 import org.hisp.dhis.android.core.dataset.SectionDataElementLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SectionDataElementLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : SectionDataElementLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
deleted file mode 100644
index 799085cf44..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class SectionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SectionStore {
-        return SectionStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt
deleted file mode 100644
index 8035307bd1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class SectionGreyedFieldsEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SectionGreyedFieldsLinkStore {
-        return SectionGreyedFieldsLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: SectionGreyedFieldsLinkStore): SectionGreyedFieldsLinkHandler {
-        return SectionGreyedFieldsLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
index a239d50a56..b4e7c42d3d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElementOperand
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SectionGreyedFieldsLinkHandler(
     store: SectionGreyedFieldsLinkStore,
 ) : LinkHandlerImpl<DataElementOperand, SectionGreyedFieldsLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
index 8bfecedef7..faffdfc140 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionGreyedFieldsLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SectionGreyedFieldsLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : SectionGreyedFieldsLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
index 303e74ba2e..df8add947b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionDataElementLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLink
 import org.hisp.dhis.android.core.dataset.SectionGreyedFieldsLinkTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SectionHandler @Inject constructor(
+@Singleton
+internal class SectionHandler(
     sectionStore: SectionStore,
     private val sectionDataElementLinkHandler: SectionDataElementLinkHandler,
     private val greyedFieldsHandler: DataElementOperandHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt
deleted file mode 100644
index 8457cee740..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.dataset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class SectionIndicatorEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SectionIndicatorLinkStore {
-        return SectionIndicatorLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: SectionIndicatorLinkStore): SectionIndicatorLinkHandler {
-        return SectionIndicatorLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
index 9e24b31c0f..62c80414c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.dataset.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.indicator.Indicator
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SectionIndicatorLinkHandler(
     store: SectionIndicatorLinkStore,
 ) : LinkHandlerImpl<Indicator, SectionIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
index 5677874b69..e93ec725b4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionIndicatorLinkStoreImpl.kt
@@ -32,7 +32,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SectionIndicatorLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : SectionIndicatorLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
index 023297032f..77929911f7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SectionOrphanCleaner @Inject constructor(
+@Singleton
+internal class SectionOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<DataSet, Section>(
     tableName = SectionTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
index a64824451f..e03949bbf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/SectionStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.dataset.Section
 import org.hisp.dhis.android.core.dataset.SectionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class SectionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
index 3c0913dd6b..6b566fea83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreCollectionRepository.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.datastore
 
-import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
@@ -45,10 +44,10 @@ import org.hisp.dhis.android.core.common.DeletableColumns
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.internal.DataStoreEntryStore
 import org.hisp.dhis.android.core.datastore.internal.DataStorePostCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataStoreCollectionRepository @Inject internal constructor(
+@Singleton
+class DataStoreCollectionRepository internal constructor(
     private val store: DataStoreEntryStore,
     private val call: DataStorePostCall,
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDIModule.kt
similarity index 79%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDIModule.kt
index b3b4af40db..06d66a4c18 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDIModule.kt
@@ -25,20 +25,19 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.datastore
 
-package org.hisp.dhis.android.core.datavalue.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.datastore.internal.DataStoreDownloadParams
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-internal class DataValueConflictEntityDIModule {
+@ComponentScan
+internal class DataStoreDIModule {
 
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataValueConflictStore {
-        return DataValueConflictStoreImpl(databaseAdapter)
+    @Singleton
+    fun downloaderParams(): DataStoreDownloadParams {
+        return DataStoreDownloadParams()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
index 4f71bdfbfa..fa42c2f54b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreDownloader.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.datastore
 
-import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.repositories.collection.BaseRepository
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterC
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.datastore.internal.DataStoreDownloadCall
 import org.hisp.dhis.android.core.datastore.internal.DataStoreDownloadParams
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataStoreDownloader @Inject internal constructor(
+@Singleton
+class DataStoreDownloader internal constructor(
     private val call: DataStoreDownloadCall,
     private val params: DataStoreDownloadParams,
 ) : BaseRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
index 3fdb67f753..95e7498b7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/DataStoreObjectRepository.kt
@@ -28,21 +28,18 @@
 
 package org.hisp.dhis.android.core.datastore
 
-import dagger.Reusable
 import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.ReadWriteValueObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadWriteWithValueObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.State
-import javax.inject.Inject
+import org.hisp.dhis.android.core.datastore.internal.DataStoreEntryStore
 
-@Reusable
-class DataStoreObjectRepository @Inject internal constructor(
-    store: ObjectWithoutUidStore<DataStoreEntry>,
+class DataStoreObjectRepository internal constructor(
+    store: DataStoreEntryStore,
     databaseAdapter: DatabaseAdapter,
     childrenAppenders: ChildrenAppenderGetter<DataStoreEntry>,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
index 2da1526831..ebaebd93d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/LocalDataStoreCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datastore
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.datastore.internal.LocalDataStoreStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class LocalDataStoreCollectionRepository @Inject internal constructor(
+@Singleton
+class LocalDataStoreCollectionRepository internal constructor(
     private val store: LocalDataStoreStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
index 8e046b04c7..291bf6de85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreDownloadCall.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.datastore.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.rxObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataStoreDownloadCall @Inject constructor(
+@Singleton
+internal class DataStoreDownloadCall(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataStoreEntryService: DataStoreService,
     private val dataStoreEntryHandler: DataStoreHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
deleted file mode 100644
index f7b085ea63..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntityDIModule.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.datastore.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataStoreEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataStoreEntryStore {
-        return DataStoreEntryStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: DataStoreEntryStore): DataStoreHandler {
-        return DataStoreHandler(store)
-    }
-
-    @Provides
-    @Reusable
-    fun downloaderParams(): DataStoreDownloadParams {
-        return DataStoreDownloadParams()
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
index 8327c45b7a..60327d8ca5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreEntryStoreImpl.kt
@@ -39,7 +39,9 @@ import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class DataStoreEntryStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
index 0e0b4764c4..906dd64fc2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreHandler.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataStoreHandler constructor(
     private val store: DataStoreEntryStore,
 ) : LinkHandler<DataStoreEntry, DataStoreEntry>, HandlerBaseImpl<DataStoreEntry>() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt
index ea2bdaa9e5..2867a3e1b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreImportHandler.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.datastore.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("MagicNumber")
-internal class DataStoreImportHandler @Inject constructor(
+internal class DataStoreImportHandler(
     private val store: DataStoreEntryStore,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt
index 2e6532dc06..c79a5efc23 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleImpl.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.datastore.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.datastore.DataStoreCollectionRepository
 import org.hisp.dhis.android.core.datastore.DataStoreDownloader
 import org.hisp.dhis.android.core.datastore.DataStoreModule
 import org.hisp.dhis.android.core.datastore.LocalDataStoreCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataStoreModuleImpl @Inject internal constructor(
+@Singleton
+internal class DataStoreModuleImpl(
     private val localDataStore: LocalDataStoreCollectionRepository,
     private val dataStoreEntryCollectionRepository: DataStoreCollectionRepository,
     private val dataStoreDownloader: DataStoreDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt
index 7e3b6af0e3..a42925f2af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreModuleWiper.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.datastore.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.datastore.DataStoreEntryTableInfo
 import org.hisp.dhis.android.core.datastore.LocalDataStoreTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataStoreModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
+@Singleton
+class DataStoreModuleWiper internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
     override fun wipeMetadata() {
         // No metadata to wipe
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt
deleted file mode 100644
index acc5eb865e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePackageDIModule.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.datastore.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.datastore.DataStoreModule
-
-@Module(
-    includes = [
-        DataStoreEntityDIModule::class,
-        LocalDataStoreEntityDIModule::class,
-    ],
-)
-class DataStorePackageDIModule {
-    @Provides
-    @Reusable
-    fun module(impl: DataStoreModuleImpl): DataStoreModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt
index 1cf1527219..54249d189d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStorePostCall.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.datastore.internal
 
 import com.fasterxml.jackson.databind.JsonNode
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.rxObservable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -42,11 +41,11 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.DataStoreEntry
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("MagicNumber")
-internal class DataStorePostCall @Inject constructor(
+internal class DataStorePostCall(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataStoreEntryService: DataStoreService,
     private val dataStoreEntryImportHandler: DataStoreImportHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt
index d68eacd74c..6729206acf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/DataStoreService.kt
@@ -28,6 +28,8 @@
 package org.hisp.dhis.android.core.datastore.internal
 
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
+import org.koin.core.annotation.Singleton
+import retrofit2.Retrofit
 import retrofit2.http.*
 
 internal interface DataStoreService {
@@ -79,3 +81,6 @@ internal interface DataStoreService {
         private const val KEY = "key"
     }
 }
+
+@Singleton
+internal fun service(retrofit: Retrofit): DataStoreService = retrofit.create(DataStoreService::class.java)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
deleted file mode 100644
index ba386c3ef8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.datastore.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class LocalDataStoreEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): DataStoreService {
-        return retrofit.create(DataStoreService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LocalDataStoreStore {
-        return LocalDataStoreStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
index 7e39ffda67..15788865ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datastore/internal/LocalDataStoreStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.datastore.KeyValuePair
 import org.hisp.dhis.android.core.datastore.LocalDataStoreTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class LocalDataStoreStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
index 831f651d97..bf2989bb84 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -45,11 +44,11 @@ import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.operat
 import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
 import org.hisp.dhis.android.core.datavalue.internal.DataValuePostCall
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 @Suppress("TooManyFunctions")
-@Reusable
-class DataValueCollectionRepository @Inject internal constructor(
+@Singleton
+class DataValueCollectionRepository internal constructor(
     private val store: DataValueStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
index d237876524..c677253106 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueConflictCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyCollectionRepository
@@ -42,11 +41,11 @@ import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.operat
 import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
 import org.hisp.dhis.android.core.datavalue.internal.DataValueConflictStore
 import org.hisp.dhis.android.core.imports.ImportStatus
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class DataValueConflictCollectionRepository @Inject internal constructor(
+class DataValueConflictCollectionRepository internal constructor(
     store: DataValueConflictStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueDIModule.kt
new file mode 100644
index 0000000000..2e06b4e5a7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/DataValueDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.datavalue
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class DataValueDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
index 2362bb9cc2..ed70f2bafe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCall
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedCollectionValues
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper.commaSeparatedUids
 import org.hisp.dhis.android.core.datavalue.DataValue
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataValueCall @Inject constructor(
+@Singleton
+internal class DataValueCall(
     private val service: DataValueService,
     private val handler: DataValueHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
index 18cb3328ce..febb590b47 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictParser.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.dataset.internal.DataSetStore
 import org.hisp.dhis.android.core.datavalue.DataValue
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.datavalue.internal.conflicts.PeriodAfterLatest
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataValueConflictParser @Inject constructor(
+@Singleton
+internal class DataValueConflictParser(
     dataElementStore: DataElementStore,
     dataValueStore: DataValueStore,
     dataSetStore: DataSetStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
index 7d829ea56d..6300d2a488 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueConflictStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class DataValueConflictStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
index 02c2efb1ee..a642b2e675 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueFileResourcePostCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceHelper
 import org.hisp.dhis.android.core.fileresource.internal.FileResourcePostCall
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceValue
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataValueFileResourcePostCall @Inject constructor(
+@Singleton
+internal class DataValueFileResourcePostCall(
     private val fileResourceHelper: FileResourceHelper,
     private val fileResourcePostCall: FileResourcePostCall,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
index 09ab327901..c3c2ef5b0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueHandler.kt
@@ -28,17 +28,18 @@
 package org.hisp.dhis.android.core.datavalue.internal
 
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
-import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStore
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.Arrays
 
+@Singleton
 internal class DataValueHandler(
-    store: ObjectWithoutUidStore<DataValue>,
+    store: DataValueStore,
 ) : ObjectWithoutUidHandlerImpl<DataValue>(store) {
     override fun deleteOrPersist(o: DataValue): HandleAction {
         return if (CollectionsHelper.isDeleted(o)) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
index c09e389fd2..85a915243e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueImportHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.State.ERROR
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.internal.DataValueImportSummary
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataValueImportHandler @Inject constructor(
+@Singleton
+internal class DataValueImportHandler(
     private val dataValueStore: DataValueStore,
     private val dataValueConflictParser: DataValueConflictParser,
     private val dataValueConflictStore: DataValueConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.java
deleted file mode 100644
index fb5181d98b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.datavalue.internal;
-
-import org.hisp.dhis.android.core.datavalue.DataValueCollectionRepository;
-import org.hisp.dhis.android.core.datavalue.DataValueConflictCollectionRepository;
-import org.hisp.dhis.android.core.datavalue.DataValueModule;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class DataValueModuleImpl implements DataValueModule {
-
-    private final DataValueCollectionRepository dataValues;
-    private final DataValueConflictCollectionRepository dataValueConflicts;
-
-    @Inject
-    DataValueModuleImpl(DataValueCollectionRepository dataValueCollectionRepository,
-                        DataValueConflictCollectionRepository dataValueConflicts) {
-        this.dataValues = dataValueCollectionRepository;
-        this.dataValueConflicts = dataValueConflicts;
-    }
-
-    @Override
-    public DataValueCollectionRepository dataValues() {
-        return dataValues;
-    }
-
-    @Override
-    public DataValueConflictCollectionRepository dataValueConflicts() {
-        return dataValueConflicts;
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.kt
index d4e5839dca..8b4e695e87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleImpl.kt
@@ -27,23 +27,21 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.datavalue.DataValueCollectionRepository
+import org.hisp.dhis.android.core.datavalue.DataValueConflictCollectionRepository
 import org.hisp.dhis.android.core.datavalue.DataValueModule
-import retrofit2.Retrofit
+import org.koin.core.annotation.Singleton
 
-@Module(includes = [DataValueEntityDIModule::class])
-internal class DataValuePackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): DataValueService {
-        return retrofit.create(DataValueService::class.java)
+@Singleton
+internal class DataValueModuleImpl(
+    private val dataValues: DataValueCollectionRepository,
+    private val dataValueConflicts: DataValueConflictCollectionRepository,
+) : DataValueModule {
+    override fun dataValues(): DataValueCollectionRepository {
+        return dataValues
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: DataValueModuleImpl): DataValueModule {
-        return impl
+    override fun dataValueConflicts(): DataValueConflictCollectionRepository {
+        return dataValueConflicts
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt
index dc82d657f9..2823f53010 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueModuleWiper.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.datavalue.DataValueConflictTableInfo
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
 import org.hisp.dhis.android.core.domain.aggregated.data.internal.AggregatedDataSyncTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataValueModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
+@Singleton
+class DataValueModuleWiper internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
     override fun wipeMetadata() {
         // No metadata to wipe
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
index 8ac463eb24..7d0ca62e6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValuePostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.datavalue.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -43,11 +42,11 @@ import org.hisp.dhis.android.core.imports.internal.DataValueImportSummaryWebResp
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class DataValuePostCall @Inject constructor(
+@Singleton
+internal class DataValuePostCall(
     private val dataValueService: DataValueService,
     private val dataValueImportHandler: DataValueImportHandler,
     private val fileResourcePostCall: DataValueFileResourcePostCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
index ac01b39a0a..2d08aaf825 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueStoreImpl.kt
@@ -39,7 +39,9 @@ import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.dataValueKey
 import org.hisp.dhis.android.core.datavalue.DataValueByDataSetQueryHelper.whereClause
 import org.hisp.dhis.android.core.datavalue.DataValueTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataValueStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataValueStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt
index f6f3bcb54e..b9a6f2bb5e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementType37Conflict.kt
@@ -28,15 +28,13 @@
 
 package org.hisp.dhis.android.core.datavalue.internal.conflicts
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
-import java.util.ArrayList
 
 internal class InvalidDataElementType37Conflict(
-    dataElementStore: IdentifiableObjectStore<DataElement>,
+    dataElementStore: DataElementStore,
 ) : InvalidDataElementTypeConflict(dataElementStore) {
 
     override val regex: Regex
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt
index eaf5ca1690..dd591a3183 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/conflicts/InvalidDataElementTypeConflict.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.datavalue.DataValueConflict
 import org.hisp.dhis.android.core.imports.internal.ImportConflict
-import java.util.ArrayList
 
 internal open class InvalidDataElementTypeConflict(
     private val dataElementStore: IdentifiableObjectStore<DataElement>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/DomainDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/DomainDIModule.kt
new file mode 100644
index 0000000000..830645d5af
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/DomainDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.domain
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class DomainDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
index 69b6210343..fd49a6faf4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -50,11 +49,11 @@ import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoModuleDownloader
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList")
-internal class AggregatedDataCall @Inject constructor(
+internal class AggregatedDataCall constructor(
     private val systemInfoModuleDownloader: SystemInfoModuleDownloader,
     private val dataValueCall: DataValueCall,
     private val dsCompleteRegistrationCall: DataSetCompleteRegistrationCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
index b4e10c75d5..e790ccbb21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataCallBundleFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.period.internal.PeriodForDataSetManager
 import org.hisp.dhis.android.core.settings.DataSetSetting
 import org.hisp.dhis.android.core.settings.DataSetSettings
 import org.hisp.dhis.android.core.settings.DataSetSettingsObjectRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AggregatedDataCallBundleFactory @Inject constructor(
+@Singleton
+internal class AggregatedDataCallBundleFactory(
     private val dataSetRepository: DataSetCollectionRepository,
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
     private val dataSetSettingsObjectRepository: DataSetSettingsObjectRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
index 72354ad966..c3f82137fc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataDownloaderImpl.kt
@@ -28,15 +28,14 @@
 
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedD2Progress
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AggregatedDataDownloaderImpl @Inject constructor(
+@Singleton
+internal class AggregatedDataDownloaderImpl(
     private val dataCall: AggregatedDataCall,
 ) : AggregatedDataDownloader {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt
deleted file mode 100644
index 004be750dc..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataPackageDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.domain.aggregated.data.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
-
-@Module
-internal class AggregatedDataPackageDIModule {
-
-    @Provides
-    @Reusable
-    fun downloader(downloaderImpl: AggregatedDataDownloaderImpl): AggregatedDataDownloader {
-        return downloaderImpl
-    }
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): AggregatedDataSyncStore {
-        return AggregatedDataSyncStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt
index a7b0e6227c..703a3cff04 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncHashHelper.kt
@@ -27,12 +27,11 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.dataset.DataSet
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AggregatedDataSyncHashHelper @Inject constructor() {
+@Singleton
+internal class AggregatedDataSyncHashHelper {
     fun getDataSetDataElementsHash(dataSet: DataSet): Int {
         return dataSet.dataSetElements()!!
             .map { it.dataElement().uid() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt
index ace66dc0af..1ee4f8574c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncLastUpdatedCalculator.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.data.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.dataset.DataSet
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-internal class AggregatedDataSyncLastUpdatedCalculator @Inject constructor(
+@Singleton
+internal class AggregatedDataSyncLastUpdatedCalculator(
     private val hashHelper: AggregatedDataSyncHashHelper,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
index a4cf49e846..4d5b5376e3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/data/internal/AggregatedDataSyncStoreImpl.kt
@@ -33,7 +33,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AggregatedDataSyncStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt
index f2c578e2ce..2356bfa21e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/aggregated/internal/AggregatedModuleImpl.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.domain.aggregated.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.domain.aggregated.AggregatedModule
 import org.hisp.dhis.android.core.domain.aggregated.data.AggregatedDataDownloader
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AggregatedModuleImpl @Inject constructor(
+@Singleton
+internal class AggregatedModuleImpl(
     private val dataDownloader: AggregatedDataDownloader,
 ) : AggregatedModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 2e3329c50a..111d6b60eb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.domain.metadata
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.collect
@@ -70,11 +69,11 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserModuleDownloader
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleDownloader
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 @Suppress("LongParameterList")
-@Reusable
-internal class MetadataCall @Inject constructor(
+@Singleton
+internal class MetadataCall(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val systemInfoDownloader: SystemInfoModuleDownloader,
     private val systemSettingDownloader: SettingModuleDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
index ebaf168a90..c156c3ac21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/internal/MetadataModuleImpl.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.domain.metadata.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.modules.internal.WithProgressDownloader
 import org.hisp.dhis.android.core.domain.metadata.MetadataCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class MetadataModuleImpl @Inject internal constructor(
+@Singleton
+internal class MetadataModuleImpl(
     private val metadataCall: MetadataCall,
 ) : WithProgressDownloader {
     override fun download(): Observable<D2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
index 27461e5c72..6cce30f5ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.enrollment
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
@@ -48,11 +47,11 @@ import org.hisp.dhis.android.core.enrollment.internal.EnrollmentFields
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentProjectionTransformer
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.note.internal.NoteForEnrollmentChildrenAppender
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class EnrollmentCollectionRepository @Inject internal constructor(
+class EnrollmentCollectionRepository internal constructor(
     private val enrollmentStore: EnrollmentStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentDIModule.kt
new file mode 100644
index 0000000000..0b8a6312dc
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.enrollment
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class EnrollmentDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
deleted file mode 100644
index db982c6fb3..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentEntityDIModule.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.enrollment.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.event.internal.EventHandler
-import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
-import org.hisp.dhis.android.core.note.internal.NoteHandler
-import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
-import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
-import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
-
-@Module
-internal class EnrollmentEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): EnrollmentStore {
-        return EnrollmentStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    @Suppress("LongParameterList")
-    fun handler(
-        relationshipVersionManager: RelationshipDHISVersionManager,
-        relationshipHandler: RelationshipHandler,
-        noteVersionManager: NoteDHISVersionManager,
-        enrollmentStore: EnrollmentStore,
-        eventHandler: EventHandler,
-        eventOrphanCleaner: EventOrphanCleaner,
-        noteHandler: NoteHandler,
-        noteUniquenessManager: NoteUniquenessManager,
-        relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner,
-    ): EnrollmentHandler {
-        return EnrollmentHandler(
-            relationshipVersionManager,
-            relationshipHandler,
-            noteVersionManager,
-            enrollmentStore,
-            eventHandler,
-            eventOrphanCleaner,
-            noteHandler,
-            noteUniquenessManager,
-            relationshipOrphanCleaner,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
index 59f40f71f8..07b395c73a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandler.kt
@@ -28,32 +28,33 @@
 package org.hisp.dhis.android.core.enrollment.internal
 
 import android.util.Log
-import org.hisp.dhis.android.core.arch.handlers.internal.*
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
+import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
-import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.internal.EventHandler
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
+import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
 import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class EnrollmentHandler constructor(
     relationshipVersionManager: RelationshipDHISVersionManager,
     relationshipHandler: RelationshipHandler,
     private val noteVersionManager: NoteDHISVersionManager,
     enrollmentStore: EnrollmentStore,
-    private val eventHandler: IdentifiableDataHandler<Event>,
+    private val eventHandler: EventHandler,
     private val eventOrphanCleaner: EventOrphanCleaner,
-    private val noteHandler: Handler<Note>,
+    private val noteHandler: NoteHandler,
     private val noteUniquenessManager: NoteUniquenessManager,
     private val relationshipOrphanCleaner: EnrollmentRelationshipOrphanCleaner,
 ) : IdentifiableDataHandlerImpl<Enrollment>(enrollmentStore, relationshipVersionManager, relationshipHandler) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
index 4cf4fb0d3e..a4de26a463 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentImportHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
@@ -44,11 +43,11 @@ import org.hisp.dhis.android.core.imports.internal.TEIWebResponseHandlerSummary
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictParser
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
 import org.hisp.dhis.android.core.tracker.importer.internal.JobReportEnrollmentHandler
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-internal class EnrollmentImportHandler @Inject constructor(
+@Singleton
+internal class EnrollmentImportHandler(
     private val enrollmentStore: EnrollmentStore,
     private val eventImportHandler: EventImportHandler,
     private val trackerImportConflictStore: TrackerImportConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt
index 7a509f6356..482d022b7c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleImpl.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.EnrollmentCollectionRepository
 import org.hisp.dhis.android.core.enrollment.EnrollmentModule
 import org.hisp.dhis.android.core.enrollment.EnrollmentService
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EnrollmentModuleImpl @Inject constructor(
+@Singleton
+internal class EnrollmentModuleImpl(
     private val enrollments: EnrollmentCollectionRepository,
     private val enrollmentService: EnrollmentServiceImpl,
 ) : EnrollmentModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleWiper.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleWiper.kt
index ab25c01c29..d5abedb9b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleWiper.kt
@@ -27,23 +27,24 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.enrollment.EnrollmentModule
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
+import org.hisp.dhis.android.core.note.NoteTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module(includes = [EnrollmentEntityDIModule::class])
-internal class EnrollmentPackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): EnrollmentService {
-        return retrofit.create(EnrollmentService::class.java)
+@Singleton
+internal class EnrollmentModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        // No metadata to wipe
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: EnrollmentModuleImpl): EnrollmentModule {
-        return impl
+    override fun wipeData() {
+        tableWiper.wipeTables(
+            EnrollmentTableInfo.TABLE_INFO,
+            NoteTableInfo.TABLE_INFO,
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
index 4d051d716e..6ce828266a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentPersistenceCallFactory.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.enrollment.Enrollment
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EnrollmentPersistenceCallFactory @Inject constructor(
+@Singleton
+internal class EnrollmentPersistenceCallFactory(
     private val enrollmentHandler: EnrollmentHandler,
 ) {
     fun persistAsRelationships(enrollments: List<Enrollment>): Completable {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
index 1978d22a13..ec2ee0d1dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentProjectionTransformer.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentCreateProjection
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class EnrollmentProjectionTransformer @Inject constructor() :
+@Singleton
+internal class EnrollmentProjectionTransformer :
     Transformer<EnrollmentCreateProjection, Enrollment> {
     override fun transform(o: EnrollmentCreateProjection): Enrollment {
         val generatedUid = UidGeneratorImpl().generate()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
index ee88c9fa2d..0fc9014b38 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentServiceImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
@@ -46,11 +45,11 @@ import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class EnrollmentServiceImpl @Inject constructor(
+@Singleton
+internal class EnrollmentServiceImpl(
     private val enrollmentRepository: EnrollmentCollectionRepository,
     private val trackedEntityInstanceRepository: TrackedEntityInstanceCollectionRepository,
     private val programRepository: ProgramCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
index e08f259b16..62defff0ba 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentStoreImpl.kt
@@ -42,7 +42,9 @@ import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class EnrollmentStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : EnrollmentStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
index fb3f9fb531..38e7817842 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EventOrphanCleaner.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.DataOrphanCleaner
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventOrphanCleaner @Inject constructor(
+@Singleton
+internal class EventOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : DataOrphanCleaner<Enrollment, Event>(
     tableName = EventTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
index 75416c2408..03dbf2f46b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/NewEnrollmentEndpointCallFactory.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollmentTransformer
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class NewEnrollmentEndpointCallFactory @Inject constructor(
+@Singleton
+internal class NewEnrollmentEndpointCallFactory(
     private val service: TrackerExporterService,
 ) : EnrollmentEndpointCallFactory {
     override suspend fun getRelationshipEntityCall(uid: String): Enrollment {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
index 64580b17bf..8383e5421c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/OldEnrollmentEndpointCallFactory.kt
@@ -27,12 +27,11 @@
  */
 package org.hisp.dhis.android.core.enrollment.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.Enrollment
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OldEnrollmentEndpointCallFactory @Inject constructor(
+@Singleton
+internal class OldEnrollmentEndpointCallFactory(
     private val service: EnrollmentService,
 ) : EnrollmentEndpointCallFactory {
     override suspend fun getRelationshipEntityCall(uid: String): Enrollment {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
index 7ab2aac616..1ae4095c2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event
 
-import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
@@ -60,11 +59,11 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueChildrenAppender
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
 import org.hisp.dhis.android.core.user.internal.UserStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class EventCollectionRepository @Inject internal constructor(
+class EventCollectionRepository internal constructor(
     private val eventStore: EventStore,
     private val userStore: UserStore,
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDIModule.kt
similarity index 84%
rename from core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/event/EventDIModule.kt
index 7909175d6c..a2a5c7f087 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventDIModule.kt
@@ -25,17 +25,18 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event.search
+package org.hisp.dhis.android.core.event
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.event.search.EventQueryRepositoryScope
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-internal class EventQueryEntityDIModule {
+@ComponentScan
+internal class EventDIModule {
 
-    @Provides
-    @Reusable
+    @Singleton
     fun empty(): EventQueryRepositoryScope {
         return EventQueryRepositoryScope.empty()
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
index 57227d7b2f..73a712f078 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventDownloader.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.event.internal.EventDownloadCall
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams
 import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class EventDownloader @Inject internal constructor(
+@Singleton
+class EventDownloader internal constructor(
     scope: RepositoryScope,
     private val callFactory: EventDownloadCall,
 ) : BaseRepositoryImpl<EventDownloader>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
index 0b2c8dc70c..4878dbb58c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/EventFilterCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -41,11 +40,11 @@ import org.hisp.dhis.android.core.event.internal.EventFilterEventDataFilterChild
 import org.hisp.dhis.android.core.event.internal.EventFilterStore
 import org.hisp.dhis.android.core.event.internal.EventQueryCriteriaFields
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class EventFilterCollectionRepository @Inject internal constructor(
+class EventFilterCollectionRepository internal constructor(
     store: EventFilterStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
index 76803ca187..4b6e2030e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.event.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.event.EventDataFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class EventDataFilterHandler(
     store: EventDataFilterStore,
 ) : ObjectWithoutUidHandlerImpl<EventDataFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
index 8db6929a02..6820f6443c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.event.EventDataFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class EventDataFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt
index 52c667e1ca..dcaa926a3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDateUtils.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
+import org.koin.core.annotation.Singleton
 import java.util.*
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
 
-@Reusable
-class EventDateUtils @Inject constructor(
+@Singleton
+class EventDateUtils(
     private val periodHelper: PeriodHelper,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 32cde047e9..56e5858e65 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -42,10 +41,10 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactor
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerDownloadCall
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventDownloadCall @Inject internal constructor(
+@Singleton
+internal class EventDownloadCall internal constructor(
     userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
index a27ebbef70..46818056ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEndpointCallFactory.kt
@@ -27,12 +27,10 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 
-@Reusable
 internal abstract class EventEndpointCallFactory {
 
     abstract suspend fun getCollectionCall(eventQuery: TrackerAPIQuery): Payload<Event>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
deleted file mode 100644
index cb2dc2e0b0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventEntityDIModule.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.event.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
-import org.hisp.dhis.android.core.note.internal.NoteHandler
-import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
-import org.hisp.dhis.android.core.relationship.internal.EventRelationshipOrphanCleaner
-import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
-import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
-
-@Module
-internal class EventEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): EventStore {
-        return EventStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    @Suppress("LongParameterList")
-    fun handler(
-        relationshipVersionManager: RelationshipDHISVersionManager,
-        relationshipHandler: RelationshipHandler,
-        eventStore: EventStore,
-        trackedEntityDataValueHandler: TrackedEntityDataValueHandler,
-        noteHandler: NoteHandler,
-        noteVersionManager: NoteDHISVersionManager,
-        noteUniquenessManager: NoteUniquenessManager,
-        relationshipOrphanCleaner: EventRelationshipOrphanCleaner,
-    ): EventHandler {
-        return EventHandler(
-            relationshipVersionManager,
-            relationshipHandler,
-            eventStore,
-            trackedEntityDataValueHandler,
-            noteHandler,
-            noteVersionManager,
-            noteUniquenessManager,
-            relationshipOrphanCleaner,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
index 420266b2e6..70a77800b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterCall.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventFilterCall @Inject internal constructor(
+@Singleton
+internal class EventFilterCall internal constructor(
     private val service: EventFilterService,
     val handler: EventFilterHandler,
     val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
deleted file mode 100644
index 6b94a4b637..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterEntityDIModule.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.event.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class EventFilterEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): EventFilterStore {
-        return EventFilterStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        eventFilterStore: EventFilterStore,
-        eventDataFilterHandler: EventDataFilterHandler,
-    ): EventFilterHandler {
-        return EventFilterHandler(
-            eventFilterStore,
-            eventDataFilterHandler,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
index db1cd9b7ad..07eadbd16e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterHandler.kt
@@ -31,7 +31,9 @@ import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.event.EventDataFilter
 import org.hisp.dhis.android.core.event.EventFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class EventFilterHandler constructor(
     eventFilterStore: EventFilterStore,
     private val eventDataFilterHandler: EventDataFilterHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
index 4fb181daaf..704a389e49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventFilterStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.event.EventFilter
 import org.hisp.dhis.android.core.event.EventFilterTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class EventFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
index e1af0155aa..39e8e207f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.event.internal
 
 import android.util.Log
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -47,10 +46,10 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipHandler
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventHandler @Inject constructor(
+@Singleton
+internal class EventHandler(
     relationshipVersionManager: RelationshipDHISVersionManager,
     relationshipHandler: RelationshipHandler,
     eventStore: EventStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
index cf9ed5b548..56800079b1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventImportHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
@@ -42,11 +41,11 @@ import org.hisp.dhis.android.core.imports.internal.TEIWebResponseHandlerSummary
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictParser
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
 import org.hisp.dhis.android.core.tracker.importer.internal.JobReportEventHandler
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-internal class EventImportHandler @Inject constructor(
+@Singleton
+internal class EventImportHandler constructor(
     private val eventStore: EventStore,
     private val enrollmentStore: EnrollmentStore,
     private val trackerImportConflictStore: TrackerImportConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
index 7cd40b01b2..bd0377a134 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventLastUpdatedManager.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerSyncLastUpdatedManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventLastUpdatedManager @Inject constructor(
+@Singleton
+internal class EventLastUpdatedManager(
     store: EventSyncStore,
     private val resourceHandler: ResourceHandler,
 ) : TrackerSyncLastUpdatedManager<EventSync>(store) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt
index 79f54f8384..3067e4353f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleImpl.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.event.EventCollectionRepository
 import org.hisp.dhis.android.core.event.EventDownloader
 import org.hisp.dhis.android.core.event.EventFilterCollectionRepository
 import org.hisp.dhis.android.core.event.EventModule
 import org.hisp.dhis.android.core.event.EventService
 import org.hisp.dhis.android.core.event.search.EventQueryCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventModuleImpl @Inject internal constructor(
+@Singleton
+internal class EventModuleImpl(
     private val events: EventCollectionRepository,
     private val eventFilters: EventFilterCollectionRepository,
     private val eventDownloader: EventDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.java
deleted file mode 100644
index a23b91d3bb..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.event.internal;
-
-import org.hisp.dhis.android.core.event.EventTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class EventModuleWiper implements ModuleWiper {
-    private final TableWiper tableWiper;
-
-    @Inject
-    EventModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        // No metadata to wipe
-    }
-
-    @Override
-    public void wipeData() {
-        tableWiper.wipeTable(EventTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(EventSyncTableInfo.TABLE_INFO);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.kt
index 95f3b6ee84..e6732d515a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDataFilterEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventModuleWiper.kt
@@ -27,22 +27,21 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.event.EventTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class EventDataFilterEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): EventDataFilterStore {
-        return EventDataFilterStoreImpl(databaseAdapter)
+@Singleton
+internal class EventModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        // No metadata to wipe
     }
 
-    @Provides
-    @Reusable
-    fun handler(store: EventDataFilterStore): EventDataFilterHandler {
-        return EventDataFilterHandler(store)
+    override fun wipeData() {
+        tableWiper.wipeTable(EventTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(EventSyncTableInfo.TABLE_INFO)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
deleted file mode 100644
index 72d089ee3c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPackageDIModule.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.event.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.event.EventModule
-import org.hisp.dhis.android.core.event.search.EventQueryEntityDIModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        EventEntityDIModule::class,
-        EventFilterEntityDIModule::class,
-        EventDataFilterEntityDIModule::class,
-        EventSyncEntityDIModule::class,
-        EventQueryEntityDIModule::class,
-    ],
-)
-internal class EventPackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): EventService {
-        return retrofit.create(EventService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: EventModuleImpl): EventModule {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun eventFilterService(retrofit: Retrofit): EventFilterService {
-        return retrofit.create(EventFilterService::class.java)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
index 89532cd06b..8b9575e9e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventPersistenceCallFactory @Inject constructor(
+@Singleton
+internal class EventPersistenceCallFactory(
     private val eventHandler: EventHandler,
     private val organisationUnitStore: OrganisationUnitStore,
     private val organisationUnitDownloader: OrganisationUnitModuleDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
index cd38e02ec9..a5aaf00393 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostParentCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.trackedentity.internal.OldTrackerImporterPostCall
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterPostCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventPostParentCall @Inject internal constructor(
+@Singleton
+internal class EventPostParentCall internal constructor(
     private val oldTrackerImporterCall: OldTrackerImporterPostCall,
     private val trackerImporterCall: TrackerImporterPostCall,
     private val trackerParentCallHelper: TrackerPostParentCallHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt
index a9a873643f..ed26bb5da8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPostStateManager.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.internal.DataStateHelper
 import org.hisp.dhis.android.core.common.DataObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventPostStateManager @Inject internal constructor(
+@Singleton
+internal class EventPostStateManager internal constructor(
     private val eventStore: EventStore,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
index 24171992c1..a026cd130b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventProjectionTransformer.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventCreateProjection
 import org.hisp.dhis.android.core.event.EventStatus
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class EventProjectionTransformer @Inject constructor() : Transformer<EventCreateProjection, Event> {
+@Singleton
+internal class EventProjectionTransformer : Transformer<EventCreateProjection, Event> {
     override fun transform(o: EventCreateProjection): Event {
         val generatedUid = UidGeneratorImpl().generate()
         val creationDate = Date()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
index 79bd229545..0e56ddcf92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventQueryBundleFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramStore
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerQueryFactoryCommonHelper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventQueryBundleFactory @Inject constructor(
+@Singleton
+internal class EventQueryBundleFactory(
     programStore: ProgramStore,
     programSettingsObjectRepository: ProgramSettingsObjectRepository,
     lastUpdatedManager: EventLastUpdatedManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
index f9bb0c04d3..4003cf3ca4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventServiceImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.category.CategoryOptionComboService
 import org.hisp.dhis.android.core.enrollment.EnrollmentCollectionRepository
@@ -38,11 +37,11 @@ import org.hisp.dhis.android.core.event.EventService
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitService
 import org.hisp.dhis.android.core.program.ProgramCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList", "TooManyFunctions")
-internal class EventServiceImpl @Inject constructor(
+internal class EventServiceImpl(
     private val enrollmentRepository: EnrollmentCollectionRepository,
     private val eventRepository: EventCollectionRepository,
     private val programRepository: ProgramCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
index 7bda54203f..41086d426c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventStoreImpl.kt
@@ -43,8 +43,10 @@ import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludi
 import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.*
 
+@Singleton
 @Suppress("TooManyFunctions")
 internal class EventStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
index 312f4582f5..b2f31af287 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncStoreImpl.kt
@@ -33,7 +33,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class EventSyncStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : EventSyncStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
index 37dbc32f00..9f5a6f59cc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/NewEventEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.event.NewTrackerImporterEventTransformer
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class NewEventEndpointCallFactory @Inject constructor(
+@Singleton
+internal class NewEventEndpointCallFactory(
     private val service: TrackerExporterService,
 ) : EventEndpointCallFactory() {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
index acb1370afa..8d5bc99f39 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/OldEventEndpointCallFactory.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OldEventEndpointCallFactory @Inject constructor(
+@Singleton
+internal class OldEventEndpointCallFactory(
     private val service: EventService,
 ) : EventEndpointCallFactory() {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
index a351736a69..d82a11b8d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventCollectionRepositoryAdapter.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.search
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.AssignedUserMode
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
@@ -37,12 +36,12 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.user.AuthenticatedUserObjectRepository
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 import org.hisp.dhis.android.core.event.search.EventQueryScopeOrderColumn.Type as OrderColumnType
 
-@Reusable
-internal class EventCollectionRepositoryAdapter @Inject constructor(
+@Singleton
+internal class EventCollectionRepositoryAdapter(
     private val eventCollectionRepository: EventCollectionRepository,
     private val organisationUnitCollectionRepository: OrganisationUnitCollectionRepository,
     private val userRepository: AuthenticatedUserObjectRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
index 673419c86e..74ab69e752 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryCollectionRepository.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.event.search
 import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.PagedList
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.EqFilterConnector
@@ -52,11 +51,11 @@ import org.hisp.dhis.android.core.event.EventFilterCollectionRepository
 import org.hisp.dhis.android.core.event.EventObjectRepository
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class EventQueryCollectionRepository @Inject internal constructor(
+class EventQueryCollectionRepository internal constructor(
     private val eventCollectionRepositoryAdapter: EventCollectionRepositoryAdapter,
     private val eventFilterRepository: EventFilterCollectionRepository,
     @JvmField val scope: EventQueryRepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScope.java b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScope.java
index 5690c1dd59..ba54dcbe5b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScope.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/search/EventQueryRepositoryScope.java
@@ -117,7 +117,7 @@ static Builder builder() {
                 .includeDeleted(false);
     }
 
-    static EventQueryRepositoryScope empty() {
+    public static EventQueryRepositoryScope empty() {
         return builder().build();
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
index 3f296477e1..a6a434ef59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.expressiondimensionitem
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.expressiondimensionitem.internal.ExpressionDimensionItemStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ExpressionDimensionItemCollectionRepository @Inject internal constructor(
+@Singleton
+class ExpressionDimensionItemCollectionRepository internal constructor(
     store: ExpressionDimensionItemStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemDIModule.kt
new file mode 100644
index 0000000000..3b25db0422
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/ExpressionDimensionItemDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.expressiondimensionitem
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ExpressionDimensionItemDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
index 1676dae0d3..9375c18b2a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ExpressionDimensionItemCall @Inject constructor(
+@Singleton
+internal class ExpressionDimensionItemCall(
     private val service: ExpressionDimensionItemService,
     private val handler: ExpressionDimensionItemHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
deleted file mode 100644
index e005a2a879..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemEntityDIModule.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.expressiondimensionitem.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class ExpressionDimensionItemEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ExpressionDimensionItemStore {
-        return ExpressionDimensionItemStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ExpressionDimensionItemStore): ExpressionDimensionItemHandler {
-        return ExpressionDimensionItemHandler(store)
-    }
-
-    @Reusable
-    @Provides
-    fun service(retrofit: Retrofit): ExpressionDimensionItemService {
-        return retrofit.create(ExpressionDimensionItemService::class.java)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
index 7423ed517e..a5ed7416da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemHandler.kt
@@ -29,7 +29,9 @@ package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ExpressionDimensionItemHandler constructor(
     store: ExpressionDimensionItemStore,
 ) : IdentifiableHandlerImpl<ExpressionDimensionItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
index d42289f7c1..fc1806ae86 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleDownloader.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ExpressionDimensionItemModuleDownloader @Inject internal constructor(
+@Singleton
+internal class ExpressionDimensionItemModuleDownloader internal constructor(
     private val expressionDimensionItemUidsSeeker: ExpressionDimensionItemUidsSeeker,
     private val expressionDimensionItemCall: ExpressionDimensionItemCall,
 ) : UntypedModuleDownloaderCoroutines {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt
index 0cc0619924..100014f373 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleImpl.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemCollectionRepository
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemModule
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ExpressionDimensionItemModuleImpl @Inject internal constructor(
+@Singleton
+internal class ExpressionDimensionItemModuleImpl(
     private val expressionDimensionItems: ExpressionDimensionItemCollectionRepository,
 ) : ExpressionDimensionItemModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt
index 2684c3fe11..4e322cdc5f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemModuleWiper.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ExpressionDimensionItemModuleWiper @Inject constructor(
+@Singleton
+internal class ExpressionDimensionItemModuleWiper(
     private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt
deleted file mode 100644
index 8370f665dc..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemPackageDIModule.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.expressiondimensionitem.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemModule
-
-@Module(
-    includes = [
-        ExpressionDimensionItemEntityDIModule::class,
-    ],
-)
-internal class ExpressionDimensionItemPackageDIModule {
-
-    @Provides
-    @Reusable
-    fun module(impl: ExpressionDimensionItemModuleImpl): ExpressionDimensionItemModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
index 1089ae9421..dd1ab6ecab 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItem
 import org.hisp.dhis.android.core.expressiondimensionitem.ExpressionDimensionItemTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ExpressionDimensionItemStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt
index e938640b8e..29ae6b703a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/expressiondimensionitem/internal/ExpressionDimensionItemUidsSeeker.kt
@@ -28,15 +28,14 @@
 
 package org.hisp.dhis.android.core.expressiondimensionitem.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ExpressionDimensionItemUidsSeeker @Inject constructor(
+@Singleton
+internal class ExpressionDimensionItemUidsSeeker(
     databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
index 78581a7e07..c87dab581e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceCollectionRepository.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.fileresource
 
 import android.content.Context
-import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -52,12 +51,12 @@ import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.saveFil
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.koin.core.annotation.Singleton
 import java.io.File
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class FileResourceCollectionRepository @Inject internal constructor(
+class FileResourceCollectionRepository internal constructor(
     private val fileResourceStore: FileResourceStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDIModule.kt
similarity index 78%
rename from core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDIModule.kt
index 9c70a5ae6f..6e2a7b241d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventSyncEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDIModule.kt
@@ -25,18 +25,19 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.event.internal
+package org.hisp.dhis.android.core.fileresource
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.fileresource.internal.FileResourceDownloadParams
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
-internal class EventSyncEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): EventSyncStore {
-        return EventSyncStoreImpl(databaseAdapter)
+@ComponentScan
+internal class FileResourceDIModule {
+
+    @Singleton
+    fun downloadParams(): FileResourceDownloadParams {
+        return FileResourceDownloadParams()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
index 1fbcad8dbe..7440d0432d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceDownloader.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.fileresource
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.ListFilterC
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.ScopedFilterConnectorFactory
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceDownloadCall
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceDownloadParams
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class FileResourceDownloader @Inject internal constructor(
+@Singleton
+class FileResourceDownloader internal constructor(
     private val call: FileResourceDownloadCall,
     private val params: FileResourceDownloadParams,
 ) : BaseRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
index 9450c4c5d3..3de9eede42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/FileResourceRoutine.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.fileresource
 
-import dagger.Reusable
 import io.reactivex.Completable
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.dataelement.DataElement
@@ -42,13 +41,13 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
+import org.koin.core.annotation.Singleton
 import java.io.File
 import java.util.Calendar
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class FileResourceRoutine @Inject constructor(
+@Singleton
+internal class FileResourceRoutine(
     private val dataValueCollectionRepository: DataValueCollectionRepository,
     private val dataElementCollectionRepository: DataElementCollectionRepository,
     private val fileResourceCollectionRepository: FileResourceCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
index 823954f2f9..4267623b55 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCall.kt
@@ -29,7 +29,6 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import android.content.Context
 import android.util.Log
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import okhttp3.ResponseBody
@@ -46,11 +45,11 @@ import org.hisp.dhis.android.core.fileresource.FileResourceInternalAccessor
 import org.hisp.dhis.android.core.fileresource.FileResourceRoutine
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 @SuppressWarnings("LongParameterList")
-@Reusable
-internal class FileResourceDownloadCall @Inject constructor(
+@Singleton
+internal class FileResourceDownloadCall(
     private val fileResourceStore: FileResourceStore,
     private val helper: FileResourceDownloadCallHelper,
     private val fileResourceService: FileResourceService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
index a89e0a4248..0061c75476 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceDownloadCallHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.fileresource.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.dataelement.DataElementTableInfo
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
@@ -44,10 +43,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class FileResourceDownloadCallHelper @Inject constructor(
+@Singleton
+internal class FileResourceDownloadCallHelper(
     private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
deleted file mode 100644
index 3facb66e11..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceEntityDIModule.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.fileresource.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class FileResourceEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): FileResourceStore {
-        return FileResourceStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: FileResourceStore): FileResourceHandler {
-        return FileResourceHandler(store)
-    }
-
-    @Provides
-    @Reusable
-    fun downloadParams(): FileResourceDownloadParams {
-        return FileResourceDownloadParams()
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
index f1829b1ef6..b94e739501 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.fileresource.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
 import org.hisp.dhis.android.core.fileresource.FileResource
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class FileResourceHandler(
     store: FileResourceStore,
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<FileResource>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
index a552ed0a9d..012f4989d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceHelper.kt
@@ -42,10 +42,11 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeS
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("TooManyFunctions")
-internal class FileResourceHelper @Inject constructor(
+internal class FileResourceHelper(
     private val dataElementStore: DataElementStore,
     private val attributeStore: TrackedEntityAttributeStore,
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt
index a6b5688f49..a0331c9e20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleImpl.kt
@@ -27,14 +27,17 @@
  */
 package org.hisp.dhis.android.core.fileresource.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.fileresource.*
-import javax.inject.Inject
+import org.hisp.dhis.android.core.fileresource.FileResourceCollectionRepository
+import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
+import org.hisp.dhis.android.core.fileresource.FileResourceDownloader
+import org.hisp.dhis.android.core.fileresource.FileResourceModule
+import org.hisp.dhis.android.core.fileresource.FileResourceValueType
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class FileResourceModuleImpl @Inject internal constructor(
+@Singleton
+internal class FileResourceModuleImpl(
     private val fileResources: FileResourceCollectionRepository,
     private val fileResourceDownloader: FileResourceDownloader,
 ) : FileResourceModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt
index 21dd853866..978e269b76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceModuleWiper.kt
@@ -28,15 +28,14 @@
 package org.hisp.dhis.android.core.fileresource.internal
 
 import android.content.Context
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.FileResourceDirectoryHelper
 import org.hisp.dhis.android.core.fileresource.FileResourceTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class FileResourceModuleWiper @Inject constructor(
+@Singleton
+internal class FileResourceModuleWiper(
     private val tableWiper: TableWiper,
     private val context: Context,
 ) : ModuleWiper {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
index ee27e6dc66..b91903ef55 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourcePostCall.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.fileresource.internal
 import android.content.Context
 import android.util.Log
 import android.webkit.MimeTypeMap
-import dagger.Reusable
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
@@ -47,12 +46,12 @@ import org.hisp.dhis.android.core.systeminfo.internal.PingCall
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
+import org.koin.core.annotation.Singleton
 import java.io.File
 import java.io.IOException
-import javax.inject.Inject
 
-@Reusable
-internal class FileResourcePostCall @Inject constructor(
+@Singleton
+internal class FileResourcePostCall(
     private val fileResourceService: FileResourceService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataValueStore: DataValueStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
index 5a9e48ab6b..b950e630d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceProjectionTransformer.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.fileresource.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomain
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceUtil.getContentTypeFromName
+import org.koin.core.annotation.Singleton
 import java.io.File
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class FileResourceProjectionTransformer @Inject constructor() : Transformer<File, FileResource> {
+@Singleton
+internal class FileResourceProjectionTransformer : Transformer<File, FileResource> {
     override fun transform(o: File): FileResource {
         val creationDate = Date()
         return FileResource.builder()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
index 42b0e256f8..2d72c04d6b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/fileresource/internal/FileResourceStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStoreImpl
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class FileResourceStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : FileResourceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/ImportsDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/ImportsDIModule.kt
new file mode 100644
index 0000000000..49bf5e27c6
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/ImportsDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.imports
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ImportsDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
index 000236f0b9..3fd2ff8136 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerImportConflictCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.imports
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackerImportConflictCollectionRepository @Inject internal constructor(
+@Singleton
+class TrackerImportConflictCollectionRepository internal constructor(
     store: TrackerImportConflictStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt
index d51bdaa247..81eba0bf73 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/TrackerJobManager.kt
@@ -31,9 +31,10 @@ package org.hisp.dhis.android.core.imports
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-class TrackerJobManager @Inject internal constructor(
+@Singleton
+class TrackerJobManager internal constructor(
     private val jobQueryCall: JobQueryCall,
 ) {
     fun resumePendingJobs(): Observable<D2Progress> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.java
deleted file mode 100644
index 26339f02db..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.imports.internal;
-
-import org.hisp.dhis.android.core.imports.TrackerImportConflictCollectionRepository;
-import org.hisp.dhis.android.core.imports.TrackerJobManager;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ImportModuleImpl implements ImportModule {
-
-    private final TrackerImportConflictCollectionRepository trackerImportConflicts;
-    private final TrackerJobManager trackerJobManager;
-
-    @Inject
-    ImportModuleImpl(TrackerImportConflictCollectionRepository trackerImportConflicts,
-                     TrackerJobManager trackerJobManager) {
-        this.trackerImportConflicts = trackerImportConflicts;
-        this.trackerJobManager = trackerJobManager;
-    }
-
-    @Override
-    public TrackerImportConflictCollectionRepository trackerImportConflicts() {
-        return trackerImportConflicts;
-    }
-
-    @Override
-    public TrackerJobManager jobManager() {
-        return trackerJobManager;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.kt
similarity index 73%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.kt
index 7939646a55..0a62e91421 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleImpl.kt
@@ -27,16 +27,20 @@
  */
 package org.hisp.dhis.android.core.imports.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.imports.TrackerImportConflictCollectionRepository
+import org.hisp.dhis.android.core.imports.TrackerJobManager
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class TrackerImportConflictEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackerImportConflictStore {
-        return TrackerImportConflictStoreImpl(databaseAdapter)
+@Singleton
+internal class ImportModuleImpl(
+    private val trackerImportConflicts: TrackerImportConflictCollectionRepository,
+    private val trackerJobManager: TrackerJobManager,
+) : ImportModule {
+    override fun trackerImportConflicts(): TrackerImportConflictCollectionRepository {
+        return trackerImportConflicts
+    }
+
+    override fun jobManager(): TrackerJobManager {
+        return trackerJobManager
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleWiper.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleWiper.kt
index 40f2c384d2..42c794859f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleWiper.kt
@@ -27,15 +27,22 @@
  */
 package org.hisp.dhis.android.core.imports.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module(includes = [TrackerImportConflictEntityDIModule::class])
-internal class ImportPackageDIModule {
-    @Provides
-    @Reusable
-    fun module(impl: ImportModuleImpl): ImportModule {
-        return impl
+@Singleton
+internal class ImportModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        // No metadata to wipe
+    }
+
+    override fun wipeData() {
+        tableWiper.wipeTables(
+            TrackerImportConflictTableInfo.TABLE_INFO,
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
index c7d9d1d9f9..94924fd326 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TEIWebResponseHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.imports.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceImportHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TEIWebResponseHandler @Inject constructor(
+@Singleton
+internal class TEIWebResponseHandler(
     private val trackedEntityInstanceImportHandler: TrackedEntityInstanceImportHandler,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
index 1543590891..a230d6942c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictParser.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.imports.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
 import org.hisp.dhis.android.core.imports.internal.conflicts.BadAttributePatternConflict
@@ -52,10 +51,10 @@ import org.hisp.dhis.android.core.imports.internal.conflicts.TrackerImportConfli
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerImportConflictParser @Inject constructor(
+@Singleton
+internal class TrackerImportConflictParser(
     attributeStore: TrackedEntityAttributeStore,
     dataElementStore: DataElementStore,
     private val trackedEntityAttributeValueRepository: TrackedEntityAttributeValueCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
index 85e3fa6116..6e7c1c9894 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/TrackerImportConflictStoreImpl.kt
@@ -39,7 +39,9 @@ import org.hisp.dhis.android.core.event.EventTableInfo
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
 import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class TrackerImportConflictStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : TrackerImportConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt
index e2ad962c69..4644e4b8a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/imports/internal/conflicts/TrackerImportConflictItemContext.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.imports.internal.conflicts
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 
 internal class TrackerImportConflictItemContext(
-    val attributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
-    val dataElementStore: IdentifiableObjectStore<DataElement>,
+    val attributeStore: TrackedEntityAttributeStore,
+    val dataElementStore: DataElementStore,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
index 9e01cc0cf4..f8af3664d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
@@ -41,11 +40,11 @@ import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
 import org.hisp.dhis.android.core.indicator.internal.IndicatorFields
 import org.hisp.dhis.android.core.indicator.internal.IndicatorLegendSetChildrenAppender
 import org.hisp.dhis.android.core.indicator.internal.IndicatorStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class IndicatorCollectionRepository @Inject internal constructor(
+class IndicatorCollectionRepository internal constructor(
     store: IndicatorStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorDIModule.kt
new file mode 100644
index 0000000000..bd327fc7d0
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.indicator
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class IndicatorDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
index c467855de9..21794817e3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/IndicatorTypeCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.indicator.internal.IndicatorTypeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class IndicatorTypeCollectionRepository @Inject internal constructor(
+@Singleton
+class IndicatorTypeCollectionRepository internal constructor(
     store: IndicatorTypeStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
index 229dd4aa78..d85fbbc84e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEngineImpl.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator.datasetindicatorengine
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.mapByUid
 import org.hisp.dhis.android.core.constant.Constant
@@ -44,10 +43,10 @@ import org.hisp.dhis.android.core.parser.internal.service.dataobject.Dimensional
 import org.hisp.dhis.android.core.parser.internal.service.utils.ExpressionHelper
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.internal.PeriodHelper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetIndicatorEngineImpl @Inject constructor(
+@Singleton
+internal class DataSetIndicatorEngineImpl(
     private val indicatorRepository: IndicatorCollectionRepository,
     private val indicatorTypeRepository: IndicatorTypeCollectionRepository,
     private val dataValueRepository: DataValueCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
index 7157502826..8ee69e1452 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/datasetindicatorengine/DataSetIndicatorEvaluator.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.indicator.datasetindicatorengine
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorType
 import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionService
 import org.hisp.dhis.android.core.parser.internal.service.ExpressionServiceContext
 import org.hisp.dhis.android.core.validation.MissingValueStrategy
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetIndicatorEvaluator @Inject constructor(private val expressionService: ExpressionService) {
+@Singleton
+internal class DataSetIndicatorEvaluator(private val expressionService: ExpressionService) {
 
     fun evaluate(
         indicator: Indicator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
index de4f5e30fc..cd1eee405c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.Indicator
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetIndicatorLinkHandler @Inject constructor(
+@Singleton
+internal class DataSetIndicatorLinkHandler(
     store: DataSetIndicatorLinkStore,
 ) : LinkHandlerImpl<Indicator, DataSetIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
index 72121d5d07..cd3581e897 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLink
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetIndicatorLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetIndicatorLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
index 05a237a51d..d6f2f70ff8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
@@ -38,11 +37,11 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.indicator.Indicator
+import org.koin.core.annotation.Singleton
 import retrofit2.Call
-import javax.inject.Inject
 
-@Reusable
-internal class IndicatorEndpointCallFactory @Inject constructor(
+@Singleton
+internal class IndicatorEndpointCallFactory(
     data: GenericCallData,
     apiCallExecutor: APICallExecutor,
     private val service: IndicatorService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
deleted file mode 100644
index f22259f661..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.indicator.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class IndicatorEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IndicatorStore {
-        return IndicatorStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
index 556502aac0..785327052a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorHandler.kt
@@ -28,16 +28,15 @@
 
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.internal.IndicatorLegendSetLinkHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class IndicatorHandler @Inject constructor(
+@Singleton
+internal class IndicatorHandler(
     indicatorStore: IndicatorStore,
     private val indicatorLegendSetLinkHandler: IndicatorLegendSetLinkHandler,
 ) : IdentifiableHandlerImpl<Indicator>(indicatorStore) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
index 7691c9f388..9b763974ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
@@ -27,18 +27,14 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.indicator.Indicator
-import org.hisp.dhis.android.core.indicator.IndicatorType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class IndicatorModuleDownloader @Inject internal constructor(
-    private val indicatorCallFactory: UidsCallFactory<Indicator>,
-    private val indicatorTypeCallFactory: UidsCallFactory<IndicatorType>,
+@Singleton
+class IndicatorModuleDownloader internal constructor(
+    private val indicatorCallFactory: IndicatorEndpointCallFactory,
+    private val indicatorTypeCallFactory: IndicatorTypeEndpointCallFactory,
     private val indicatorUidsSeeker: IndicatorUidsSeeker,
 ) : UntypedModuleDownloader {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.java
deleted file mode 100644
index c07e9e777a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.indicator.IndicatorCollectionRepository;
-import org.hisp.dhis.android.core.indicator.IndicatorModule;
-import org.hisp.dhis.android.core.indicator.IndicatorTypeCollectionRepository;
-import org.hisp.dhis.android.core.indicator.datasetindicatorengine.DataSetIndicatorEngine;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class IndicatorModuleImpl implements IndicatorModule {
-
-    private final IndicatorCollectionRepository indicators;
-    private final IndicatorTypeCollectionRepository indicatorTypes;
-
-    private final DataSetIndicatorEngine dataSetIndicatorEngine;
-
-    @Inject
-    IndicatorModuleImpl(IndicatorCollectionRepository indicators,
-                        IndicatorTypeCollectionRepository indicatorTypes,
-                        DataSetIndicatorEngine dataSetIndicatorEngine) {
-        this.indicators = indicators;
-        this.indicatorTypes = indicatorTypes;
-        this.dataSetIndicatorEngine = dataSetIndicatorEngine;
-    }
-
-    @Override
-    public IndicatorCollectionRepository indicators() {
-        return indicators;
-    }
-
-    @Override
-    public IndicatorTypeCollectionRepository indicatorTypes() {
-        return indicatorTypes;
-    }
-
-    @Override
-    public DataSetIndicatorEngine dataSetIndicatorEngine() {
-        return dataSetIndicatorEngine;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.kt
index 40aaea0bd0..dc15508370 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/DataSetIndicatorEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleImpl.kt
@@ -27,16 +27,27 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.indicator.IndicatorCollectionRepository
+import org.hisp.dhis.android.core.indicator.IndicatorModule
+import org.hisp.dhis.android.core.indicator.IndicatorTypeCollectionRepository
+import org.hisp.dhis.android.core.indicator.datasetindicatorengine.DataSetIndicatorEngine
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class DataSetIndicatorEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetIndicatorLinkStore {
-        return DataSetIndicatorLinkStoreImpl(databaseAdapter)
+@Singleton
+internal class IndicatorModuleImpl(
+    private val indicators: IndicatorCollectionRepository,
+    private val indicatorTypes: IndicatorTypeCollectionRepository,
+    private val dataSetIndicatorEngine: DataSetIndicatorEngine,
+) : IndicatorModule {
+    override fun indicators(): IndicatorCollectionRepository {
+        return indicators
+    }
+
+    override fun indicatorTypes(): IndicatorTypeCollectionRepository {
+        return indicatorTypes
+    }
+
+    override fun dataSetIndicatorEngine(): DataSetIndicatorEngine {
+        return dataSetIndicatorEngine
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java
deleted file mode 100644
index 15850eed29..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.indicator.internal;
-
-import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo;
-import org.hisp.dhis.android.core.indicator.IndicatorTableInfo;
-import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class IndicatorModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    IndicatorModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(
-                IndicatorTableInfo.INSTANCE.getTABLE_INFO(),
-                IndicatorTypeTableInfo.INSTANCE.getTABLE_INFO(),
-                DataSetIndicatorLinkTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // No metadata to wipe
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.kt
similarity index 68%
rename from core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.kt
index 98b6ed23b7..193dec4d14 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/imports/internal/ImportModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleWiper.kt
@@ -25,34 +25,28 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.imports.internal;
-
-import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ImportModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    ImportModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
+package org.hisp.dhis.android.core.indicator.internal
+
+import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
+import org.hisp.dhis.android.core.indicator.IndicatorTableInfo
+import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class IndicatorModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(
+            IndicatorTableInfo.TABLE_INFO,
+            IndicatorTypeTableInfo.TABLE_INFO,
+            DataSetIndicatorLinkTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeMetadata() {
+    override fun wipeData() {
         // No metadata to wipe
     }
-
-    @Override
-    public void wipeData() {
-        tableWiper.wipeTables(
-                TrackerImportConflictTableInfo.TABLE_INFO);
-    }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
deleted file mode 100644
index 8d4bcf58bf..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorPackageDIModule.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.indicator.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
-import org.hisp.dhis.android.core.indicator.Indicator
-import org.hisp.dhis.android.core.indicator.IndicatorModule
-import org.hisp.dhis.android.core.indicator.IndicatorType
-import org.hisp.dhis.android.core.indicator.datasetindicatorengine.IndicatorEngineEntityDIModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        DataSetIndicatorEntityDIModule::class,
-        IndicatorEntityDIModule::class,
-        IndicatorTypeEntityDIModule::class,
-        IndicatorEngineEntityDIModule::class,
-    ],
-)
-internal class IndicatorPackageDIModule {
-    @Provides
-    @Reusable
-    fun indicatorCallFactory(impl: IndicatorEndpointCallFactory): UidsCallFactory<Indicator> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun indicatorTypeCallFactory(impl: IndicatorTypeEndpointCallFactory): UidsCallFactory<IndicatorType> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun indicatorService(retrofit: Retrofit): IndicatorService {
-        return retrofit.create(IndicatorService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun indicatorTypeService(retrofit: Retrofit): IndicatorTypeService {
-        return retrofit.create(IndicatorTypeService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: IndicatorModuleImpl): IndicatorModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
index f0b94d319f..62410033c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.hisp.dhis.android.core.indicator.IndicatorTableInfo.TABLE_INFO
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class IndicatorStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
index bbe5e11289..25c2276ae4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
@@ -38,11 +37,11 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.indicator.IndicatorType
+import org.koin.core.annotation.Singleton
 import retrofit2.Call
-import javax.inject.Inject
 
-@Reusable
-internal class IndicatorTypeEndpointCallFactory @Inject constructor(
+@Singleton
+internal class IndicatorTypeEndpointCallFactory(
     data: GenericCallData,
     apiCallExecutor: APICallExecutor,
     private val service: IndicatorTypeService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
deleted file mode 100644
index cfed6946bf..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.indicator.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class IndicatorTypeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): IndicatorTypeStore {
-        return IndicatorTypeStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
index 48c472b3e1..a22ea54429 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.indicator.IndicatorType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class IndicatorTypeHandler @Inject constructor(
+@Singleton
+internal class IndicatorTypeHandler(
     store: IndicatorTypeStore,
 ) : IdentifiableHandlerImpl<IndicatorType>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
index 296358608a..e631a0cd3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.indicator.IndicatorType
 import org.hisp.dhis.android.core.indicator.IndicatorTypeTableInfo.TABLE_INFO
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class IndicatorTypeStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt
index d876a032c2..7ae3436769 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeeker.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.dataset.SectionIndicatorLinkTableInfo
 import org.hisp.dhis.android.core.indicator.DataSetIndicatorLinkTableInfo
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class IndicatorUidsSeeker @Inject constructor(
+@Singleton
+internal class IndicatorUidsSeeker(
     databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
index 54580201ed..46a92b9a4c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.legendset
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.legendset.internal.LegendStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class LegendCollectionRepository @Inject internal constructor(
+@Singleton
+class LegendCollectionRepository internal constructor(
     store: LegendStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
index bdf10cc50a..08c5b65eb0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.legendset
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.legendset.internal.LegendChildrenAppender
 import org.hisp.dhis.android.core.legendset.internal.LegendSetFields
 import org.hisp.dhis.android.core.legendset.internal.LegendSetStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class LegendSetCollectionRepository @Inject internal constructor(
+@Singleton
+class LegendSetCollectionRepository internal constructor(
     store: LegendSetStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetDIModule.kt
new file mode 100644
index 0000000000..4a2bb2c1ad
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/LegendSetDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.legendset
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class LegendSetDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
index c286a58c44..626822a88a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.legendset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementLegendSetLinkHandler(
     store: DataElementLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, DataElementLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
index 43ff6bea49..eaf2ac2d21 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/DataElementLegendSetLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLink
 import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataElementLegendSetLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataElementLegendSetLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt
deleted file mode 100644
index aca90da0ab..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.legendset.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class IndicatorLegendSetEntityDIModule {
-
-    @Provides
-    @Reusable
-    internal fun store(databaseAdapter: DatabaseAdapter): IndicatorLegendSetLinkStore {
-        return IndicatorLegendSetLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    internal fun handler(store: IndicatorLegendSetLinkStore): IndicatorLegendSetLinkHandler {
-        return IndicatorLegendSetLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
index 423ba66a8c..65f84e3a4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.legendset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class IndicatorLegendSetLinkHandler(
     store: IndicatorLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, IndicatorLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
index 3d7a75e965..495c53b30e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/IndicatorLegendSetLinkStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.indicator.IndicatorLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.legendset.IndicatorLegendSetLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class IndicatorLegendSetLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : IndicatorLegendSetLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
index d348838f34..dcb49d5a59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.legendset.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.legendset.Legend
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class LegendHandler(
     store: LegendStore,
 ) : IdentifiableHandlerImpl<Legend>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
index d622e3735b..5800076bd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetCall.kt
@@ -28,14 +28,13 @@
 
 package org.hisp.dhis.android.core.legendset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.legendset.LegendSet
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LegendSetCall @Inject constructor(
+@Singleton
+internal class LegendSetCall(
     private val service: LegendSetService,
     private val handler: LegendSetHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
index 008a905364..81d86d78f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetHandler.kt
@@ -32,7 +32,9 @@ import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendSet
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class LegendSetHandler constructor(
     legendSetStore: LegendSetStore,
     private val legendHandler: LegendHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
index c842d855e5..b1e60cacfc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetLegendOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.legendset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendSet
 import org.hisp.dhis.android.core.legendset.LegendTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LegendSetLegendOrphanCleaner @Inject constructor(
+@Singleton
+internal class LegendSetLegendOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<LegendSet, Legend>(
     tableName = LegendTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
index 7f2596e98c..b63fdf1289 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleDownloader.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.legendset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LegendSetModuleDownloader @Inject internal constructor(
+@Singleton
+internal class LegendSetModuleDownloader internal constructor(
     private val legendSetUidsSeeker: LegendSetUidsSeeker,
     private val legendSetCall: LegendSetCall,
 ) : UntypedModuleDownloaderCoroutines {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.java
deleted file mode 100644
index 2586af5f81..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.legendset.internal;
-
-import org.hisp.dhis.android.core.legendset.LegendCollectionRepository;
-import org.hisp.dhis.android.core.legendset.LegendSetCollectionRepository;
-import org.hisp.dhis.android.core.legendset.LegendSetModule;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class LegendSetModuleImpl implements LegendSetModule {
-
-    private final LegendSetCollectionRepository legendSets;
-    private final LegendCollectionRepository legends;
-
-    @Inject
-    LegendSetModuleImpl(LegendSetCollectionRepository legendSets,
-                        LegendCollectionRepository legends) {
-        this.legendSets = legendSets;
-        this.legends = legends;
-    }
-
-    @Override
-    public LegendSetCollectionRepository legendSets() {
-        return legendSets;
-    }
-
-    @Override
-    public LegendCollectionRepository legends() {
-        return legends;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.kt
index 774e46568a..306d6f153d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleImpl.kt
@@ -27,29 +27,21 @@
  */
 package org.hisp.dhis.android.core.legendset.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.legendset.LegendCollectionRepository
+import org.hisp.dhis.android.core.legendset.LegendSetCollectionRepository
 import org.hisp.dhis.android.core.legendset.LegendSetModule
-import retrofit2.Retrofit
+import org.koin.core.annotation.Singleton
 
-@Module(
-    includes = [
-        LegendEntityDIModule::class,
-        LegendSetEntityDIModule::class,
-        IndicatorLegendSetEntityDIModule::class,
-    ],
-)
-internal class LegendPackageDIModule {
-    @Provides
-    @Reusable
-    fun module(impl: LegendSetModuleImpl): LegendSetModule {
-        return impl
+@Singleton
+internal class LegendSetModuleImpl(
+    private val legendSets: LegendSetCollectionRepository,
+    private val legends: LegendCollectionRepository,
+) : LegendSetModule {
+    override fun legendSets(): LegendSetCollectionRepository {
+        return legendSets
     }
 
-    @Provides
-    @Reusable
-    fun legendSetService(retrofit: Retrofit): LegendSetService {
-        return retrofit.create(LegendSetService::class.java)
+    override fun legends(): LegendCollectionRepository {
+        return legends
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.java
deleted file mode 100644
index c5218f653c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.legendset.internal;
-
-import org.hisp.dhis.android.core.legendset.LegendSetTableInfo;
-import org.hisp.dhis.android.core.legendset.LegendTableInfo;
-import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class LegendSetModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    LegendSetModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(
-                LegendTableInfo.TABLE_INFO,
-                LegendSetTableInfo.TABLE_INFO,
-                ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // No metadata to wipe
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.kt
similarity index 69%
rename from core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.kt
index 56e841397e..9667ec5849 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetModuleWiper.kt
@@ -27,30 +27,26 @@
  */
 package org.hisp.dhis.android.core.legendset.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.legendset.LegendSetTableInfo
+import org.hisp.dhis.android.core.legendset.LegendTableInfo
+import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class LegendSetEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LegendSetStore {
-        return LegendSetStoreImpl(databaseAdapter)
+@Singleton
+internal class LegendSetModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(
+            LegendTableInfo.TABLE_INFO,
+            LegendSetTableInfo.TABLE_INFO,
+            ProgramIndicatorLegendSetLinkTableInfo.TABLE_INFO,
+        )
     }
 
-    @Provides
-    @Reusable
-    fun handler(
-        legendSetStore: LegendSetStore,
-        legendHandler: LegendHandler,
-        legendCleaner: LegendSetLegendOrphanCleaner,
-    ): LegendSetHandler {
-        return LegendSetHandler(
-            legendSetStore,
-            legendHandler,
-            legendCleaner,
-        )
+    override fun wipeData() {
+        // No metadata to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
index 9a51ba3d70..31dc3c618c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.legendset.LegendSet
 import org.hisp.dhis.android.core.legendset.LegendSetTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class LegendSetStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
index 944ca5b939..f97b11ec70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeeker.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.legendset.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.MultipleTableQueryBuilder
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.legendset.DataElementLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLinkTableInfo
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LegendSetUidsSeeker @Inject constructor(
+@Singleton
+internal class LegendSetUidsSeeker(
     databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
index 110f97240b..749ddd106e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/LegendStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.legendset.Legend
 import org.hisp.dhis.android.core.legendset.LegendTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class LegendStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
index 2937f78048..be1ee5c280 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.legendset.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramIndicatorLegendSetLinkHandler(
     store: ProgramIndicatorLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, ProgramIndicatorLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
index 0d0b447f79..83e37acc6f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/legendset/internal/ProgramIndicatorLegendSetLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramIndicatorLegendSetLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramIndicatorLegendSetLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
index 0c4b39efa6..bd226d0449 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/D2ErrorCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.maintenance
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilt
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class D2ErrorCollectionRepository @Inject internal constructor(
+@Singleton
+class D2ErrorCollectionRepository internal constructor(
     store: D2ErrorStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
index 3e2d64a9a1..928f2966ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/ForeignKeyViolationCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.maintenance
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyViolationStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ForeignKeyViolationCollectionRepository @Inject internal constructor(
+@Singleton
+class ForeignKeyViolationCollectionRepository internal constructor(
     store: ForeignKeyViolationStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenanceDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenanceDIModule.kt
new file mode 100644
index 0000000000..be9ecb62c9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/MaintenanceDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.maintenance
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class MaintenanceDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
deleted file mode 100644
index 358be003a0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.maintenance.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class D2ErrorEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): D2ErrorStore {
-        return D2ErrorStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
index 4564d8d8cf..a6fdeea590 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/D2ErrorStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class D2ErrorStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : D2ErrorStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java
index 046d54ae83..eb57b39e12 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyCleanerImpl.java
@@ -45,8 +45,8 @@ public final class ForeignKeyCleanerImpl implements ForeignKeyCleaner {
     private final DatabaseAdapter databaseAdapter;
     private final ForeignKeyViolationStore foreignKeyViolationStore;
 
-    ForeignKeyCleanerImpl(DatabaseAdapter databaseAdapter,
-                          ForeignKeyViolationStore foreignKeyViolationStore) {
+    public ForeignKeyCleanerImpl(DatabaseAdapter databaseAdapter,
+                                 ForeignKeyViolationStore foreignKeyViolationStore) {
         this.databaseAdapter = databaseAdapter;
         this.foreignKeyViolationStore = foreignKeyViolationStore;
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
index f10c5b864e..5935b9bb4b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectStoreImpl
 import org.hisp.dhis.android.core.maintenance.ForeignKeyViolation
 import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ForeignKeyViolationStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ForeignKeyViolationStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.java
deleted file mode 100644
index 19bf1b123f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.maintenance.internal;
-
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCollectionRepository;
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationCollectionRepository;
-import org.hisp.dhis.android.core.maintenance.MaintenanceModule;
-import org.hisp.dhis.android.core.maintenance.PerformanceHintsService;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class MaintenanceModuleImpl implements MaintenanceModule {
-
-    private final DatabaseAdapter databaseAdapter;
-    private final ForeignKeyViolationCollectionRepository foreignKeyViolations;
-    private final D2ErrorCollectionRepository d2Errors;
-
-    @Inject
-    MaintenanceModuleImpl(DatabaseAdapter databaseAdapter,
-                          ForeignKeyViolationCollectionRepository foreignKeyViolations,
-                          D2ErrorCollectionRepository d2Errors) {
-        this.databaseAdapter = databaseAdapter;
-        this.foreignKeyViolations = foreignKeyViolations;
-        this.d2Errors = d2Errors;
-    }
-
-    @Override
-    public PerformanceHintsService getPerformanceHintsService(int organisationUnitThreshold,
-                                                              int programRulesPerProgramThreshold) {
-        return PerformanceHintsService.create(databaseAdapter, organisationUnitThreshold,
-                programRulesPerProgramThreshold);
-    }
-
-    @Override
-    public ForeignKeyViolationCollectionRepository foreignKeyViolations() {
-        return foreignKeyViolations;
-    }
-
-    @Override
-    public D2ErrorCollectionRepository d2Errors() {
-        return d2Errors;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.kt
similarity index 62%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.kt
index 78c7f3d7ee..a388f4c777 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenancePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleImpl.kt
@@ -27,31 +27,35 @@
  */
 package org.hisp.dhis.android.core.maintenance.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.maintenance.D2ErrorCollectionRepository
+import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationCollectionRepository
 import org.hisp.dhis.android.core.maintenance.MaintenanceModule
+import org.hisp.dhis.android.core.maintenance.PerformanceHintsService
+import org.koin.core.annotation.Singleton
 
-@Module(
-    includes = [
-        D2ErrorEntityDIModule::class,
-        ForeignKeyViolationEntityDIModule::class,
-    ],
-)
-internal class MaintenancePackageDIModule {
-    @Provides
-    @Reusable
-    fun cleaner(
-        databaseAdapter: DatabaseAdapter,
-        foreignKeyViolationStore: ForeignKeyViolationStore,
-    ): ForeignKeyCleaner {
-        return ForeignKeyCleanerImpl(databaseAdapter, foreignKeyViolationStore)
+@Singleton
+internal class MaintenanceModuleImpl(
+    private val databaseAdapter: DatabaseAdapter,
+    private val foreignKeyViolations: ForeignKeyViolationCollectionRepository,
+    private val d2Errors: D2ErrorCollectionRepository,
+) : MaintenanceModule {
+    override fun getPerformanceHintsService(
+        organisationUnitThreshold: Int,
+        programRulesPerProgramThreshold: Int,
+    ): PerformanceHintsService {
+        return PerformanceHintsService.create(
+            databaseAdapter,
+            organisationUnitThreshold,
+            programRulesPerProgramThreshold,
+        )
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: MaintenanceModuleImpl): MaintenanceModule {
-        return impl
+    override fun foreignKeyViolations(): ForeignKeyViolationCollectionRepository {
+        return foreignKeyViolations
+    }
+
+    override fun d2Errors(): D2ErrorCollectionRepository {
+        return d2Errors
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.java
deleted file mode 100644
index 7c69e6841c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.maintenance.internal;
-
-import org.hisp.dhis.android.core.maintenance.D2ErrorTableInfo;
-import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class MaintenanceModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    MaintenanceModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        // No metadata to wipe
-    }
-
-    @Override
-    public void wipeData() {
-        tableWiper.wipeTables(
-                D2ErrorTableInfo.TABLE_INFO,
-                ForeignKeyViolationTableInfo.TABLE_INFO);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.kt
similarity index 71%
rename from core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.kt
index f6ea2df281..80208b8374 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/ForeignKeyViolationEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/maintenance/internal/MaintenanceModuleWiper.kt
@@ -27,16 +27,24 @@
  */
 package org.hisp.dhis.android.core.maintenance.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.maintenance.D2ErrorTableInfo
+import org.hisp.dhis.android.core.maintenance.ForeignKeyViolationTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class ForeignKeyViolationEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ForeignKeyViolationStore {
-        return ForeignKeyViolationStoreImpl(databaseAdapter)
+@Singleton
+internal class MaintenanceModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        // No metadata to wipe
+    }
+
+    override fun wipeData() {
+        tableWiper.wipeTables(
+            D2ErrorTableInfo.TABLE_INFO,
+            ForeignKeyViolationTableInfo.TABLE_INFO,
+        )
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/MapDIModule.kt
similarity index 90%
rename from core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/map/MapDIModule.kt
index 8cb81c7639..519db179f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/attribute/internal/AttributePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/MapDIModule.kt
@@ -25,9 +25,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.attribute.internal
 
-import dagger.Module
+package org.hisp.dhis.android.core.map
 
-@Module(includes = [AttributeEntityDIModule::class])
-class AttributePackageDIModule
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class MapDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt
index c174345eba..5fc690d08a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleImpl.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.map.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.map.MapModule
 import org.hisp.dhis.android.core.map.layer.MapLayerCollectionRepository
 import org.hisp.dhis.android.core.map.layer.MapLayerDownloader
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class MapModuleImpl @Inject internal constructor(
+@Singleton
+internal class MapModuleImpl(
     private val mapLayerCollectionRepository: MapLayerCollectionRepository,
     private val mapLayerModuleDownloader: MapLayerDownloader,
 ) : MapModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt
index 5d64373c58..82602c373c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapModuleWiper.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.map.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
 import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class MapModuleWiper @Inject internal constructor(
+@Singleton
+class MapModuleWiper internal constructor(
     private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
deleted file mode 100644
index 203bbf78e5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/map/internal/MapPackageDIModule.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.map.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.map.MapModule
-import org.hisp.dhis.android.core.map.layer.internal.MapLayerEntityDIModule
-import org.hisp.dhis.android.core.map.layer.internal.MapLayerImageryProviderEntityDIModule
-import org.hisp.dhis.android.core.map.layer.internal.bing.BingEntityDIModule
-
-@Module(
-    includes = [
-        MapLayerEntityDIModule::class,
-        MapLayerImageryProviderEntityDIModule::class,
-        BingEntityDIModule::class,
-    ],
-)
-internal class MapPackageDIModule {
-
-    @Provides
-    @Reusable
-    fun module(impl: MapModuleImpl): MapModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
index 87f323cb2e..f45fad005a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.map.layer
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyWithUidCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerImagerProviderChildrenAppender
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class MapLayerCollectionRepository @Inject internal constructor(
+@Singleton
+class MapLayerCollectionRepository internal constructor(
     store: MapLayerStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
index 216cbd8efc..a9d2a63cf2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/MapLayerDownloader.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.map.layer
 
-import dagger.Reusable
 import io.reactivex.Completable
 import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerCallFactory
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class MapLayerDownloader @Inject internal constructor(
+@Singleton
+class MapLayerDownloader internal constructor(
     private val mapLayerCallFactory: MapLayerCallFactory,
 ) : UntypedModuleDownloader {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
index 77c5be2bd4..6831154055 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerCallFactory.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.map.layer.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.internal.bing.BingCallFactory
 import org.hisp.dhis.android.core.map.layer.internal.osm.OSMCallFactory
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class MapLayerCallFactory @Inject constructor(
+@Singleton
+internal class MapLayerCallFactory(
     private val osmCallFactory: OSMCallFactory,
     private val bingCallFactory: BingCallFactory,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
deleted file mode 100644
index c16dee99f4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerEntityDIModule.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.map.layer.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class MapLayerEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): MapLayerStore {
-        return MapLayerStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: MapLayerStore,
-        imageryProviderHandler: MapLayerImageryProviderHandler,
-    ): MapLayerHandler {
-        return MapLayerHandler(store, imageryProviderHandler)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
index bee0608c97..f4d01fd29a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.map.layer.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
 import org.hisp.dhis.android.core.map.layer.MapLayer
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class MapLayerHandler constructor(
     store: MapLayerStore,
     private val imagerProviderHandler: MapLayerImageryProviderHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt
deleted file mode 100644
index fd06e1546d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.map.layer.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class MapLayerImageryProviderEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): MapLayerImageryProviderStore {
-        return MapLayerImageryProviderStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: MapLayerImageryProviderStore): MapLayerImageryProviderHandler {
-        return MapLayerImageryProviderHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
index e77c4c3db3..f31a1f7ed1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.map.layer.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class MapLayerImageryProviderHandler(
     store: MapLayerImageryProviderStore,
 ) : LinkHandlerImpl<MapLayerImageryProvider, MapLayerImageryProvider>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
index ef02bbe4f3..104cd788be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerImageryProviderStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProviderTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class MapLayerImageryProviderStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
index 2a1724eebe..7fc34ad18c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/MapLayerStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class MapLayerStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
index 602ea3084c..db86eb15ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/bing/BingCallFactory.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.map.layer.internal.bing
 
-import dagger.Reusable
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.withTimeout
 import org.hisp.dhis.android.core.D2Manager
@@ -42,11 +41,11 @@ import org.hisp.dhis.android.core.settings.internal.SettingService
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 import kotlin.time.Duration.Companion.seconds
 
-@Reusable
-internal class BingCallFactory @Inject constructor(
+@Singleton
+internal class BingCallFactory(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val mapLayerHandler: MapLayerHandler,
     private val versionManager: DHISVersionManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
index 039e4966ce..b0469f3527 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/map/layer/internal/osm/OSMCallFactory.kt
@@ -28,15 +28,14 @@
 
 package org.hisp.dhis.android.core.map.layer.internal.osm
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.map.layer.MapLayer
 import org.hisp.dhis.android.core.map.layer.MapLayerImageryProvider
 import org.hisp.dhis.android.core.map.layer.MapLayerPosition
 import org.hisp.dhis.android.core.map.layer.internal.MapLayerHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OSMCallFactory @Inject constructor(
+@Singleton
+internal class OSMCallFactory(
     private val mapLayerHandler: MapLayerHandler,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
index 81a18f81ee..a1503bc274 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/NoteCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.note
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
@@ -45,10 +44,10 @@ import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.note.Note.NoteType
 import org.hisp.dhis.android.core.note.internal.NoteProjectionTransformer
 import org.hisp.dhis.android.core.note.internal.NoteStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class NoteCollectionRepository @Inject internal constructor(
+@Singleton
+class NoteCollectionRepository internal constructor(
     store: NoteStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/NoteDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/note/NoteDIModule.kt
new file mode 100644
index 0000000000..20bf4af4a7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/NoteDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.note
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class NoteDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.java
deleted file mode 100644
index 83e772b001..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.note.internal;
-
-import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl;
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
-import org.hisp.dhis.android.core.note.Note;
-
-import java.text.ParseException;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public class NoteDHISVersionManager {
-
-    @Inject
-    NoteDHISVersionManager() {
-    }
-
-    public Note transform(Note.NoteType noteType, String ownerUid, Note note) {
-        if (noteType == null) {
-            throw new IllegalArgumentException("Note type is null");
-        }
-
-        Note.Builder builder = noteType == Note.NoteType.ENROLLMENT_NOTE ?
-                Note.builder().noteType(noteType).enrollment(ownerUid) :
-                Note.builder().noteType(noteType).event(ownerUid);
-
-        try {
-            builder
-                    .storedDate(BaseIdentifiableObject.dateToDateStr(
-                            BaseIdentifiableObject.parseDate(note.storedDate())))
-                    .uid(note.uid());
-        } catch (ParseException ignored) {
-            builder
-                    .storedDate(null)
-                    .uid(new UidGeneratorImpl().generate());
-        }
-
-        return builder
-                .value(note.value())
-                .storedBy(note.storedBy())
-                .build();
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.kt
index bd3dfe09bf..eeedeada03 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/ConfigurationPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteDHISVersionManager.kt
@@ -25,36 +25,41 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.configuration.internal
+package org.hisp.dhis.android.core.note.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
-import org.hisp.dhis.android.core.arch.storage.internal.InsecureStore
-import org.hisp.dhis.android.core.arch.storage.internal.SecureStore
-import java.util.Date
+import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
+import org.hisp.dhis.android.core.note.Note
+import org.hisp.dhis.android.core.note.Note.NoteType
+import org.koin.core.annotation.Singleton
+import java.text.ParseException
 
-@Module
-internal class ConfigurationPackageDIModule {
-    @Provides
-    @Reusable
-    fun configurationSecureStore(secureStore: InsecureStore): DatabaseConfigurationInsecureStore {
-        return DatabaseConfigurationInsecureStoreImpl(secureStore)
-    }
+@Singleton
+internal class NoteDHISVersionManager {
+    fun transform(noteType: NoteType, ownerUid: String?, note: Note): Note {
+        val builder =
+            if (noteType == NoteType.ENROLLMENT_NOTE) {
+                Note.builder().noteType(noteType)
+                    .enrollment(ownerUid)
+            } else {
+                Note.builder().noteType(noteType)
+                    .event(ownerUid)
+            }
 
-    @Provides
-    @Reusable
-    fun dateProvider(): DateProvider {
-        return object : DateProvider {
-            override val dateStr: String
-                get() = DateUtils.DATE_FORMAT.format(Date())
+        try {
+            builder
+                .storedDate(
+                    note.storedDate()?.let { DateUtils.DATE_FORMAT.format(DateUtils.DATE_FORMAT.parse(it)) },
+                )
+                .uid(note.uid())
+        } catch (ignored: ParseException) {
+            builder
+                .storedDate(null)
+                .uid(UidGeneratorImpl().generate())
         }
-    }
-
-    @Provides
-    @Reusable
-    fun passwordManager(secureStore: SecureStore): DatabaseEncryptionPasswordManager {
-        return DatabaseEncryptionPasswordManager.create(secureStore)
+        return builder
+            .value(note.value())
+            .storedBy(note.storedBy())
+            .build()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
index a9f65ef50a..43383c7929 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.note.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.note.Note
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class NoteHandler(
     store: NoteStore,
 ) : IdentifiableHandlerImpl<Note>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.java
deleted file mode 100644
index e89612b23f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.note.internal;
-
-import org.hisp.dhis.android.core.note.NoteCollectionRepository;
-import org.hisp.dhis.android.core.note.NoteModule;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class NoteModuleImpl implements NoteModule {
-
-    private final NoteCollectionRepository notes;
-
-    @Inject
-    NoteModuleImpl(NoteCollectionRepository notes) {
-        this.notes = notes;
-    }
-
-    @Override
-    public NoteCollectionRepository notes() {
-        return notes;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.kt
similarity index 85%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.kt
index b35bb7a4d0..a4c5b460dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NotePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteModuleImpl.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.note.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.note.NoteCollectionRepository
 import org.hisp.dhis.android.core.note.NoteModule
+import org.koin.core.annotation.Singleton
 
-@Module(includes = [NoteEntityDIModule::class])
-internal class NotePackageDIModule {
-    @Provides
-    @Reusable
-    fun module(impl: NoteModuleImpl): NoteModule {
-        return impl
+@Singleton
+internal class NoteModuleImpl(
+    private val notes: NoteCollectionRepository,
+) : NoteModule {
+    override fun notes(): NoteCollectionRepository {
+        return notes
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
index c0cd91768e..26bc7d58e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteProjectionTransformer.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.note.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
@@ -35,11 +34,11 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteCreateProjection
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class NoteProjectionTransformer @Inject constructor(
+@Singleton
+internal class NoteProjectionTransformer(
     private val credentialsSecureStore: CredentialsSecureStore,
 ) : Transformer<NoteCreateProjection, Note> {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
index 017bcd49b1..87ffd441c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.NoteTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class NoteStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : NoteStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java
index 220720547d..e9ebd1151a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteUniquenessManager.java
@@ -39,17 +39,11 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
 public class NoteUniquenessManager {
 
     private final NoteStore noteStore;
 
-    @Inject
-    NoteUniquenessManager(NoteStore noteStore) {
+    public NoteUniquenessManager(NoteStore noteStore) {
         this.noteStore = noteStore;
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
index 4ef96ade32..8699b6f6bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderByDirection
 import org.hisp.dhis.android.core.option.internal.OptionStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OptionCollectionRepository @Inject internal constructor(
+@Singleton
+class OptionCollectionRepository internal constructor(
     store: OptionStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionDIModule.kt
new file mode 100644
index 0000000000..ca6f8ccbaf
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.option
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class OptionDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
index 57a0f2efdb..4ab5111b9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionGroupCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.option.internal.OptionGroupFields
 import org.hisp.dhis.android.core.option.internal.OptionGroupOptionChildrenAppender
 import org.hisp.dhis.android.core.option.internal.OptionGroupStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OptionGroupCollectionRepository @Inject internal constructor(
+@Singleton
+class OptionGroupCollectionRepository internal constructor(
     store: OptionGroupStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
index 33035939ea..cc0ea5fca9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionServiceImpl.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.option
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OptionServiceImpl @Inject constructor(
+@Singleton
+class OptionServiceImpl(
     private val optionRepository: OptionCollectionRepository,
 ) : OptionService {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
index 0d9014816b..1c589c5203 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/OptionSetCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.option
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilt
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.option.internal.OptionSetStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OptionSetCollectionRepository @Inject internal constructor(
+@Singleton
+class OptionSetCollectionRepository internal constructor(
     store: OptionSetStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
index a8f3c69b53..6d76baa8d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.Option
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OptionCall @Inject internal constructor(
+@Singleton
+class OptionCall internal constructor(
     private val service: OptionService,
     private val handler: OptionHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
deleted file mode 100644
index 5938639dec..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionEntityDIModule.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.option.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OptionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OptionStore {
-        return OptionStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        optionStore: OptionStore,
-        optionCleaner: OptionSubCollectionCleaner,
-    ): OptionHandler {
-        return OptionHandler(
-            optionStore,
-            optionCleaner,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index 3bbc9e886b..12371cbaf8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -27,15 +27,15 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.option.OptionGroup
+import org.koin.core.annotation.Singleton
 import java.lang.Boolean
-import javax.inject.Inject
+import kotlin.String
 
-@Reusable
-class OptionGroupCall @Inject internal constructor(
+@Singleton
+class OptionGroupCall internal constructor(
     private val service: OptionGroupService,
     private val handler: OptionGroupHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
index bafb50407f..5db2fc871b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionGroupTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OptionGroupCollectionCleaner @Inject constructor(
+@Singleton
+internal class OptionGroupCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<OptionGroup>(
     tableName = OptionGroupTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
deleted file mode 100644
index 90c23150c7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupEntityDIModule.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.option.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OptionGroupEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OptionGroupStore {
-        return OptionGroupStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        optionStore: OptionGroupStore,
-        optionGroupOptionLinkHandler: OptionGroupOptionLinkHandler,
-        collectionCleaner: OptionGroupCollectionCleaner,
-    ): OptionGroupHandler {
-        return OptionGroupHandler(
-            optionStore,
-            optionGroupOptionLinkHandler,
-            collectionCleaner,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
index 420224be7d..f495af2ac7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupHandler.kt
@@ -29,14 +29,15 @@ package org.hisp.dhis.android.core.option.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionGroupOptionLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OptionGroupHandler(
     optionStore: OptionGroupStore,
-    private val optionGroupOptionLinkHandler: LinkHandler<ObjectWithUid, OptionGroupOptionLink>,
+    private val optionGroupOptionLinkHandler: OptionGroupOptionLinkHandler,
     private val collectionCleaner: OptionGroupCollectionCleaner,
 ) : IdentifiableHandlerImpl<OptionGroup>(optionStore) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt
deleted file mode 100644
index 73472d98f5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.option.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OptionGroupOptionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OptionGroupOptionLinkStore {
-        return OptionGroupOptionLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: OptionGroupOptionLinkStore): OptionGroupOptionLinkHandler {
-        return OptionGroupOptionLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
index 7ed60cccab..ef906b3684 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.option.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.option.OptionGroupOptionLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OptionGroupOptionLinkHandler(
     store: OptionGroupOptionLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, OptionGroupOptionLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
index ec11b101b7..6c44535cc6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupOptionLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.option.OptionGroupOptionLink
 import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OptionGroupOptionLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : OptionGroupOptionLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
index dc4c076ec9..41e14681df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.hisp.dhis.android.core.option.OptionGroupTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OptionGroupStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
index c8b998bc1f..182a11dc41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionHandler.kt
@@ -29,7 +29,9 @@ package org.hisp.dhis.android.core.option.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.option.Option
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OptionHandler constructor(
     optionStore: OptionStore,
     private val optionCleaner: OptionSubCollectionCleaner,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.java
deleted file mode 100644
index 459f812b21..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.option.OptionCollectionRepository;
-import org.hisp.dhis.android.core.option.OptionGroupCollectionRepository;
-import org.hisp.dhis.android.core.option.OptionModule;
-import org.hisp.dhis.android.core.option.OptionService;
-import org.hisp.dhis.android.core.option.OptionServiceImpl;
-import org.hisp.dhis.android.core.option.OptionSetCollectionRepository;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class OptionModuleImpl implements OptionModule {
-
-    private final OptionGroupCollectionRepository optionGroups;
-    private final OptionSetCollectionRepository optionSets;
-    private final OptionCollectionRepository options;
-    private final OptionServiceImpl optionService;
-
-    @Inject
-    OptionModuleImpl(OptionGroupCollectionRepository optionGroups,
-                     OptionSetCollectionRepository optionSets,
-                     OptionCollectionRepository options,
-                     OptionServiceImpl optionService) {
-        this.optionGroups = optionGroups;
-        this.optionSets = optionSets;
-        this.options = options;
-        this.optionService = optionService;
-    }
-
-    @Override
-    public OptionGroupCollectionRepository optionGroups() {
-        return optionGroups;
-    }
-
-    @Override
-    public OptionSetCollectionRepository optionSets() {
-        return optionSets;
-    }
-
-    @Override
-    public OptionCollectionRepository options() {
-        return options;
-    }
-
-    @Override
-    public OptionService optionService(){
-        return optionService;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.kt
similarity index 63%
rename from core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.kt
index 7cea1ca6d1..e8ef02993a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleImpl.kt
@@ -27,42 +27,34 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.option.OptionCollectionRepository
+import org.hisp.dhis.android.core.option.OptionGroupCollectionRepository
 import org.hisp.dhis.android.core.option.OptionModule
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.option.OptionService
+import org.hisp.dhis.android.core.option.OptionServiceImpl
+import org.hisp.dhis.android.core.option.OptionSetCollectionRepository
+import org.koin.core.annotation.Singleton
 
-@Module(
-    includes = [
-        OptionEntityDIModule::class,
-        OptionGroupEntityDIModule::class,
-        OptionGroupOptionEntityDIModule::class,
-        OptionSetEntityDIModule::class,
-    ],
-)
-internal class OptionPackageDIModule {
-    @Provides
-    @Reusable
-    fun optionSetService(retrofit: Retrofit): OptionSetService {
-        return retrofit.create(OptionSetService::class.java)
+@Singleton
+internal class OptionModuleImpl(
+    private val optionGroups: OptionGroupCollectionRepository,
+    private val optionSets: OptionSetCollectionRepository,
+    private val options: OptionCollectionRepository,
+    private val optionService: OptionServiceImpl,
+) : OptionModule {
+    override fun optionGroups(): OptionGroupCollectionRepository {
+        return optionGroups
     }
 
-    @Provides
-    @Reusable
-    fun optionService(retrofit: Retrofit): OptionService {
-        return retrofit.create(OptionService::class.java)
+    override fun optionSets(): OptionSetCollectionRepository {
+        return optionSets
     }
 
-    @Provides
-    @Reusable
-    fun optionGroupService(retrofit: Retrofit): OptionGroupService {
-        return retrofit.create(OptionGroupService::class.java)
+    override fun options(): OptionCollectionRepository {
+        return options
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: OptionModuleImpl): OptionModule {
-        return impl
+    override fun optionService(): OptionService {
+        return optionService
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.java
deleted file mode 100644
index e33ab86808..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.option.internal;
-
-import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo;
-import org.hisp.dhis.android.core.option.OptionGroupTableInfo;
-import org.hisp.dhis.android.core.option.OptionSetTableInfo;
-import org.hisp.dhis.android.core.option.OptionTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class OptionModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    OptionModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(
-                OptionTableInfo.TABLE_INFO,
-                OptionGroupTableInfo.TABLE_INFO,
-                OptionGroupOptionLinkTableInfo.TABLE_INFO,
-                OptionSetTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // No metadata to wipe
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.kt
index 2da61b24ea..d37e0fb28e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionModuleWiper.kt
@@ -25,38 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.enrollment.internal;
-
-import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo;
-import org.hisp.dhis.android.core.note.NoteTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class EnrollmentModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    EnrollmentModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
+package org.hisp.dhis.android.core.option.internal
+
+import org.hisp.dhis.android.core.option.OptionGroupOptionLinkTableInfo
+import org.hisp.dhis.android.core.option.OptionGroupTableInfo
+import org.hisp.dhis.android.core.option.OptionSetTableInfo
+import org.hisp.dhis.android.core.option.OptionTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class OptionModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(
+            OptionTableInfo.TABLE_INFO,
+            OptionGroupTableInfo.TABLE_INFO,
+            OptionGroupOptionLinkTableInfo.TABLE_INFO,
+            OptionSetTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeMetadata() {
+    override fun wipeData() {
         // No metadata to wipe
     }
-
-    @Override
-    public void wipeData() {
-        tableWiper.wipeTables(
-                EnrollmentTableInfo.TABLE_INFO,
-                NoteTableInfo.TABLE_INFO
-        );
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
index 5897b19b66..e7678dcf25 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.option.OptionSet
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OptionSetCall @Inject constructor(
+@Singleton
+internal class OptionSetCall(
     private val service: OptionSetService,
     private val handler: OptionSetHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
deleted file mode 100644
index eb9f38db21..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.option.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OptionSetEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OptionSetStore {
-        return OptionSetStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: OptionSetStore): OptionSetHandler {
-        return OptionSetHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
index 2e0919651d..549118db41 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.option.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.option.OptionSet
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OptionSetHandler(
     store: OptionSetStore,
 ) : IdentifiableHandlerImpl<OptionSet>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
index a5ff438dea..e2f05c49e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSetStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.option.OptionSet
 import org.hisp.dhis.android.core.option.OptionSetTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OptionSetStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
index 428f5c9a8a..0855d843b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OptionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
index 06ae04a0bf..e167cb6fe5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionSubCollectionCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.option.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.option.Option
 import org.hisp.dhis.android.core.option.OptionTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OptionSubCollectionCleaner @Inject constructor(
+@Singleton
+internal class OptionSubCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : SubCollectionCleanerImpl<Option>(
     tableName = OptionTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
index 76f04f6606..96def8ce17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -46,11 +45,11 @@ import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitOrga
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitProgramChildrenAppender
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class OrganisationUnitCollectionRepository @Inject internal constructor(
+class OrganisationUnitCollectionRepository internal constructor(
     store: OrganisationUnitStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDIModule.kt
new file mode 100644
index 0000000000..1d39592e4b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.organisationunit
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class OrganisationUnitDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
index 7fecf09f21..eecc92df9d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitGroupCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitGroupStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OrganisationUnitGroupCollectionRepository @Inject internal constructor(
+@Singleton
+class OrganisationUnitGroupCollectionRepository internal constructor(
     store: OrganisationUnitGroupStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
index 8f446c8d8d..bd9c60fb81 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitLevelCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitLevelStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class OrganisationUnitLevelCollectionRepository @Inject internal constructor(
+@Singleton
+class OrganisationUnitLevelCollectionRepository internal constructor(
     store: OrganisationUnitLevelStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt
index cf81b37df0..b8ca5664f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/OrganisationUnitService.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.organisationunit
 
-import dagger.Reusable
 import io.reactivex.Single
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-class OrganisationUnitService @Inject constructor(
+@Singleton
+class OrganisationUnitService(
     private val organisationUnitRepository: OrganisationUnitCollectionRepository,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index b145e82a73..9506a7a1f3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Single
@@ -38,11 +37,11 @@ import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import org.koin.core.annotation.Singleton
 import java.util.concurrent.atomic.AtomicInteger
-import javax.inject.Inject
 
-@Reusable
-internal class OrganisationUnitCall @Inject constructor(
+@Singleton
+internal class OrganisationUnitCall(
     private val organisationUnitService: OrganisationUnitService,
     private val handler: OrganisationUnitHandler,
     private val pathTransformer: OrganisationUnitDisplayPathTransformer,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
index 1ccdbff0fc..af44925793 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OrganisationUnitCollectionCleaner @Inject constructor(
+@Singleton
+internal class OrganisationUnitCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<OrganisationUnit>(
     tableName = OrganisationUnitTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDisplayPathTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDisplayPathTransformer.kt
index 93789ccecc..059cc149b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDisplayPathTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitDisplayPathTransformer.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 internal class OrganisationUnitDisplayPathTransformer : Function1<OrganisationUnit, OrganisationUnit> {
 
     override operator fun invoke(organisationUnit: OrganisationUnit): OrganisationUnit {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
deleted file mode 100644
index 136058590f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitEntityDIModule.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.organisationunit.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
-import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
-
-@Module
-internal class OrganisationUnitEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitStore {
-        return OrganisationUnitStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    @Suppress("LongParameterList")
-    fun handler(
-        organisationUnitStore: OrganisationUnitStore,
-        userOrganisationUnitLinkHandler: UserOrganisationUnitLinkHandler,
-        organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler,
-        dataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler,
-        organisationUnitGroupHandler: OrganisationUnitGroupHandler,
-        organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler,
-    ): OrganisationUnitHandler {
-        return OrganisationUnitHandler(
-            organisationUnitStore,
-            userOrganisationUnitLinkHandler,
-            organisationUnitProgramLinkHandler,
-            dataSetOrganisationUnitLinkHandler,
-            organisationUnitGroupHandler,
-            organisationUnitGroupLinkHandler,
-        )
-    }
-
-    @Provides
-    @Reusable
-    fun pathTransformer(): OrganisationUnitDisplayPathTransformer {
-        return OrganisationUnitDisplayPathTransformer()
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
deleted file mode 100644
index 7de062a942..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.organisationunit.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OrganisationUnitGroupEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitGroupStore {
-        return OrganisationUnitGroupStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: OrganisationUnitGroupStore): OrganisationUnitGroupHandler {
-        return OrganisationUnitGroupHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
index 62973b7ccc..f16eaa8b29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.organisationunit.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OrganisationUnitGroupHandler(
     store: OrganisationUnitGroupStore,
 ) : IdentifiableHandlerImpl<OrganisationUnitGroup>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
index ef17e70669..e2b3e7f91c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitGroupStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OrganisationUnitGroupStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
index 10c19b43fb..04c91ea8be 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandler.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import android.util.Log
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLink
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
@@ -39,11 +38,14 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationU
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHelper
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OrganisationUnitHandler constructor(
     organisationUnitStore: OrganisationUnitStore,
-    private val userOrganisationUnitLinkHandler: LinkHandler<OrganisationUnit, UserOrganisationUnitLink>,
+    private val userOrganisationUnitLinkHandler: UserOrganisationUnitLinkHandler,
     private val organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler,
     private val dataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler,
     private val organisationUnitGroupHandler: OrganisationUnitGroupHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
index 1e64934f5e..1a62aa0ffa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import org.koin.core.annotation.Singleton
 import java.lang.Boolean
-import javax.inject.Inject
 
-@Reusable
-internal class OrganisationUnitLevelEndpointCall @Inject constructor(
+@Singleton
+internal class OrganisationUnitLevelEndpointCall(
     private val service: OrganisationUnitLevelService,
     private val handler: OrganisationUnitLevelHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
deleted file mode 100644
index d4d6e84c8c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEntityDIModule.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.organisationunit.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class OrganisationUnitLevelEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitLevelStore {
-        return OrganisationUnitLevelStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: OrganisationUnitLevelStore): OrganisationUnitLevelHandler {
-        return OrganisationUnitLevelHandler(store)
-    }
-
-    @Provides
-    @Reusable
-    fun organisationUnitLevelService(retrofit: Retrofit): OrganisationUnitLevelService {
-        return retrofit.create(OrganisationUnitLevelService::class.java)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
index 56ff119038..01f03158ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.organisationunit.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OrganisationUnitLevelHandler(
     store: OrganisationUnitLevelStore,
 ) : IdentifiableHandlerImpl<OrganisationUnitLevel>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
index 24286d92d1..43158a307b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OrganisationUnitLevelStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index e71692d8ff..7cf9f27657 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkCl
 import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.UserCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OrganisationUnitModuleDownloader @Inject constructor(
+@Singleton
+internal class OrganisationUnitModuleDownloader(
     private val organisationUnitCall: OrganisationUnitCall,
     private val userCall: UserCall,
     private val organisationUnitLevelEndpointCall: OrganisationUnitLevelEndpointCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.java
deleted file mode 100644
index d603bf041b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitCollectionRepository;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupCollectionRepository;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelCollectionRepository;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModule;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitService;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class OrganisationUnitModuleImpl implements OrganisationUnitModule {
-
-    private final OrganisationUnitCollectionRepository organisationUnits;
-    private final OrganisationUnitGroupCollectionRepository organisationUnitGroups;
-    private final OrganisationUnitLevelCollectionRepository organisationUnitLevels;
-    private final OrganisationUnitService organisationUnitService;
-
-    @Inject
-    OrganisationUnitModuleImpl(OrganisationUnitCollectionRepository organisationUnits,
-                               OrganisationUnitGroupCollectionRepository organisationUnitGroups,
-                               OrganisationUnitLevelCollectionRepository organisationUnitLevels,
-                               OrganisationUnitService organisationUnitService) {
-        this.organisationUnits = organisationUnits;
-        this.organisationUnitGroups = organisationUnitGroups;
-        this.organisationUnitLevels = organisationUnitLevels;
-        this.organisationUnitService = organisationUnitService;
-    }
-
-    @Override
-    public OrganisationUnitCollectionRepository organisationUnits() {
-        return organisationUnits;
-    }
-
-    @Override
-    public OrganisationUnitGroupCollectionRepository organisationUnitGroups() {
-        return organisationUnitGroups;
-    }
-
-    @Override
-    public OrganisationUnitLevelCollectionRepository organisationUnitLevels() {
-        return organisationUnitLevels;
-    }
-
-    @Override
-    public OrganisationUnitService organisationUnitService() {
-        return organisationUnitService;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.kt
similarity index 57%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.kt
index e90b8fc407..8666a353b3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleImpl.kt
@@ -27,31 +27,33 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitCollectionRepository
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupCollectionRepository
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelCollectionRepository
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitModule
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitService
+import org.koin.core.annotation.Singleton
 
-@Module(
-    includes = [
-        OrganisationUnitEntityDIModule::class,
-        OrganisationUnitLevelEntityDIModule::class,
-        OrganisationUnitGroupEntityDIModule::class,
-        OrganisationUnitProgramLinkEntityDIModule::class,
-        OrganisationUnitOrganisationUnitGroupLinkEntityDIModule::class,
-    ],
-)
-internal class OrganisationUnitPackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): OrganisationUnitService {
-        return retrofit.create(OrganisationUnitService::class.java)
+@Singleton
+internal class OrganisationUnitModuleImpl(
+    private val organisationUnits: OrganisationUnitCollectionRepository,
+    private val organisationUnitGroups: OrganisationUnitGroupCollectionRepository,
+    private val organisationUnitLevels: OrganisationUnitLevelCollectionRepository,
+    private val organisationUnitService: OrganisationUnitService,
+) : OrganisationUnitModule {
+    override fun organisationUnits(): OrganisationUnitCollectionRepository {
+        return organisationUnits
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: OrganisationUnitModuleImpl): OrganisationUnitModule {
-        return impl
+    override fun organisationUnitGroups(): OrganisationUnitGroupCollectionRepository {
+        return organisationUnitGroups
+    }
+
+    override fun organisationUnitLevels(): OrganisationUnitLevelCollectionRepository {
+        return organisationUnitLevels
+    }
+
+    override fun organisationUnitService(): OrganisationUnitService {
+        return organisationUnitService
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleWiper.kt
similarity index 66%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleWiper.kt
index 5c9fc194a1..6ec5fc2c4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleWiper.kt
@@ -25,43 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.organisationunit.internal;
-
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class OrganisationUnitModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    OrganisationUnitModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+package org.hisp.dhis.android.core.organisationunit.internal
+
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroupTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevelTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class OrganisationUnitModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                OrganisationUnitTableInfo.TABLE_INFO,
-                OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
-                OrganisationUnitGroupTableInfo.TABLE_INFO,
-                OrganisationUnitLevelTableInfo.TABLE_INFO,
-                OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO);
+            OrganisationUnitTableInfo.TABLE_INFO,
+            OrganisationUnitProgramLinkTableInfo.TABLE_INFO,
+            OrganisationUnitGroupTableInfo.TABLE_INFO,
+            OrganisationUnitLevelTableInfo.TABLE_INFO,
+            OrganisationUnitOrganisationUnitGroupLinkTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No data to wipe
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
deleted file mode 100644
index 344bf91965..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkEntityDIModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.organisationunit.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OrganisationUnitOrganisationUnitGroupLinkEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitOrganisationUnitGroupLinkStore {
-        return OrganisationUnitOrganisationUnitGroupLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: OrganisationUnitOrganisationUnitGroupLinkStore,
-    ): OrganisationUnitOrganisationUnitGroupLinkHandler {
-        return OrganisationUnitOrganisationUnitGroupLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
index ce36f06898..67c1232b3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OrganisationUnitOrganisationUnitGroupLinkHandler(
     store: OrganisationUnitOrganisationUnitGroupLinkStore,
 ) : LinkHandlerImpl<OrganisationUnitGroup, OrganisationUnitOrganisationUnitGroupLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
index 5673bca519..c84f8ad1d7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitOrganisationUnitGroupLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitOrganisationUnitGroupLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OrganisationUnitOrganisationUnitGroupLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt
deleted file mode 100644
index dc2e0d1079..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.organisationunit.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class OrganisationUnitProgramLinkEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): OrganisationUnitProgramLinkStore {
-        return OrganisationUnitProgramLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: OrganisationUnitProgramLinkStore): OrganisationUnitProgramLinkHandler {
-        return OrganisationUnitProgramLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
index d3a11e14c9..05b7d18af4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.organisationunit.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OrganisationUnitProgramLinkHandler(
     store: OrganisationUnitProgramLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, OrganisationUnitProgramLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
index 0fb7639e68..f277d8a394 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitProgramLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLink
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class OrganisationUnitProgramLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : OrganisationUnitProgramLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.java
index 56bc9dfa32..119f0a2b40 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.java
@@ -38,7 +38,7 @@
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
-interface OrganisationUnitService {
+public interface OrganisationUnitService {
     String ORGANISATION_UNITS = "organisationUnits";
 
     String FIELDS = "fields";
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
index 67342bb004..1659b0a4ee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class OrganisationUnitStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/ParserDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/ParserDIModule.kt
new file mode 100644
index 0000000000..dd30ad8468
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/ParserDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.parser.internal
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ParserDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonParser.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonParser.kt
index c8577f23ce..a551f105c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonParser.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/expression/CommonParser.kt
@@ -32,7 +32,6 @@ import org.hisp.dhis.antlr.Parser
 
 internal object CommonParser {
 
-    @JvmStatic
     fun visit(expression: String?, visitor: CommonExpressionVisitor): Any? {
         val sdkVersion = Build.VERSION.SDK_INT
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
index a2f242bc33..fadf434e17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/ExpressionService.kt
@@ -50,9 +50,10 @@ import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import org.hisp.dhis.android.core.validation.MissingValueStrategy
 import org.hisp.dhis.antlr.ParserException
 import org.hisp.dhis.parser.expression.antlr.ExpressionParser
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class ExpressionService @Inject constructor(
+@Singleton
+internal class ExpressionService(
     private val dataElementStore: DataElementStore,
     private val categoryOptionComboStore: CategoryOptionComboStore,
     private val organisationUnitGroupStore: OrganisationUnitGroupStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt
index 1940a1f1fa..9d89b921c2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/parser/internal/service/utils/ExpressionHelper.kt
@@ -35,7 +35,6 @@ import java.lang.NumberFormatException
 
 internal object ExpressionHelper {
 
-    @JvmStatic
     fun getValueMap(dataValues: List<DataValue>): Map<DimensionalItemObject, Double> {
         val valueMap: MutableMap<DimensionalItemObject, Double> = HashMap()
         for (dataValue in dataValues) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
index ea511a8819..22173b4a7a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.period
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.period.internal.PeriodStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class PeriodCollectionRepository @Inject internal constructor(
+@Singleton
+class PeriodCollectionRepository internal constructor(
     store: PeriodStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodDIModule.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/period/PeriodDIModule.kt
index e472dd3865..a1b73277b2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/PeriodDIModule.kt
@@ -25,29 +25,27 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.period.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.period.PeriodModule
+package org.hisp.dhis.android.core.period
 
-@Module(includes = [PeriodEntityDIModule::class])
-internal class PeriodPackageDIModule {
-    @Provides
-    @Reusable
+import org.hisp.dhis.android.core.period.internal.CalendarProvider
+import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
+import org.hisp.dhis.android.core.period.internal.ParentPeriodGenerator
+import org.hisp.dhis.android.core.period.internal.ParentPeriodGeneratorImpl
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
+
+@Module
+@ComponentScan
+internal class PeriodDIModule {
+
+    @Singleton
     fun parentPeriodGenerator(calendarProvider: CalendarProvider): ParentPeriodGenerator {
         return ParentPeriodGeneratorImpl.create(calendarProvider)
     }
 
-    @Provides
-    @Reusable
-    fun periodModule(impl: PeriodModuleImpl): PeriodModule {
-        return impl
-    }
-
-    @Provides
-    @Reusable
+    @Singleton
     fun calendarProvider(): CalendarProvider {
         return CalendarProviderFactory.calendarProvider
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt
index 966dd43aed..302e1302e4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/ParentPeriodGeneratorImpl.kt
@@ -32,7 +32,7 @@ import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodType
 import java.util.*
 
-internal class ParentPeriodGeneratorImpl(
+internal class ParentPeriodGeneratorImpl constructor(
     private val daily: PeriodGenerator,
     private val weekly: WeeklyPeriodGenerators,
     private val biWeekly: PeriodGenerator,
@@ -103,7 +103,6 @@ internal class ParentPeriodGeneratorImpl(
     }
 
     companion object {
-        @JvmStatic
         fun create(calendarProvider: CalendarProvider): ParentPeriodGeneratorImpl {
             val calendar = calendarProvider.calendar
             return ParentPeriodGeneratorImpl(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodForDataSetManager.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodForDataSetManager.kt
similarity index 50%
rename from core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodForDataSetManager.java
rename to core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodForDataSetManager.kt
index f7ee3c8a51..c592dc7708 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodForDataSetManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodForDataSetManager.kt
@@ -25,65 +25,52 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.period.internal
 
-package org.hisp.dhis.android.core.period.internal;
+import io.reactivex.Single
+import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
+import org.hisp.dhis.android.core.period.Period
+import org.hisp.dhis.android.core.period.PeriodType
+import org.koin.core.annotation.Singleton
 
-import org.hisp.dhis.android.core.dataset.DataSet;
-import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository;
-import org.hisp.dhis.android.core.period.Period;
-import org.hisp.dhis.android.core.period.PeriodType;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-import io.reactivex.Single;
-
-@Reusable
-public class PeriodForDataSetManager {
-
-    private final DataSetCollectionRepository dataSetCollectionRepository;
-    private final ParentPeriodGenerator parentPeriodGenerator;
-    private final PeriodStore periodStore;
-
-    @Inject
-    PeriodForDataSetManager(DataSetCollectionRepository dataSetCollectionRepository,
-                            ParentPeriodGenerator parentPeriodGenerator,
-                            PeriodStore periodStore) {
-        this.dataSetCollectionRepository = dataSetCollectionRepository;
-        this.parentPeriodGenerator = parentPeriodGenerator;
-        this.periodStore = periodStore;
-    }
-
-    Single<List<Period>> getPeriodsForDataSet(String dataSetUid) {
-        return dataSetCollectionRepository.uid(dataSetUid).get().map(dataSet -> {
-            Integer dataSetFuturePeriods = dataSet.openFuturePeriods();
-            int endPeriods = dataSetFuturePeriods == null ? 0 : dataSetFuturePeriods;
-
-            List<Period> periods = parentPeriodGenerator.generatePeriods(dataSet.periodType(), endPeriods);
-            storePeriods(periods);
-            return periods;
-        });
+@Singleton
+internal class PeriodForDataSetManager(
+    private val dataSetCollectionRepository: DataSetCollectionRepository,
+    private val parentPeriodGenerator: ParentPeriodGenerator,
+    private val periodStore: PeriodStore,
+) {
+    fun getPeriodsForDataSet(dataSetUid: String?): Single<List<Period>> {
+        return dataSetCollectionRepository.uid(dataSetUid).get().map { dataSet: DataSet ->
+            val dataSetFuturePeriods = dataSet.openFuturePeriods()
+            val endPeriods = dataSetFuturePeriods ?: 0
+            val periods = parentPeriodGenerator.generatePeriods(
+                dataSet.periodType()!!,
+                endPeriods,
+            )
+            storePeriods(periods)
+            periods
+        }
     }
 
-    public List<Period> getPeriodsForDataSets(PeriodType periodType, List<DataSet> dataSets) {
-        int maxFuturePeriods = 0;
-        boolean someHasOpen = false;
-        for (DataSet dataSet: dataSets) {
+    fun getPeriodsForDataSets(periodType: PeriodType, dataSets: List<DataSet>): List<Period> {
+        var maxFuturePeriods = 0
+        var someHasOpen = false
+        for (dataSet in dataSets) {
             if (dataSet.openFuturePeriods() != null) {
-                maxFuturePeriods = Math.max(maxFuturePeriods, dataSet.openFuturePeriods());
-                someHasOpen = true;
+                maxFuturePeriods = maxFuturePeriods.coerceAtLeast(dataSet.openFuturePeriods()!!)
+                someHasOpen = true
             }
         }
-
         if (!someHasOpen) {
-            maxFuturePeriods = 1;
+            maxFuturePeriods = 1
         }
-
-        List<Period> periods = parentPeriodGenerator.generatePeriods(periodType, maxFuturePeriods);
-        storePeriods(periods);
-        return periods;
+        val periods = parentPeriodGenerator.generatePeriods(
+            periodType,
+            maxFuturePeriods,
+        )
+        storePeriods(periods)
+        return periods
     }
 
     /**
@@ -95,15 +82,19 @@ public List<Period> getPeriodsForDataSets(PeriodType periodType, List<DataSet> d
      * @param endOffset Relative period offset, it could be positive or negative
      * @return List of periods in range
      */
-    public List<Period> getPeriodsInRange(PeriodType periodType, int startOffset, int endOffset) {
-        List<Period> periods = parentPeriodGenerator.generatePeriods(periodType, startOffset, endOffset);
-        storePeriods(periods);
-        return periods;
+    fun getPeriodsInRange(periodType: PeriodType, startOffset: Int, endOffset: Int): List<Period> {
+        val periods = parentPeriodGenerator.generatePeriods(
+            periodType,
+            startOffset,
+            endOffset,
+        )
+        storePeriods(periods)
+        return periods
     }
 
-    private void storePeriods(List<Period> periods) {
-        for (Period period : periods) {
-            periodStore.updateOrInsertWhere(period);
+    private fun storePeriods(periods: List<Period>) {
+        for (period in periods) {
+            periodStore.updateOrInsertWhere(period)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.java
deleted file mode 100644
index a07ae970d2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.period.internal;
-
-import org.hisp.dhis.android.core.period.Period;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class PeriodHandler {
-    private final PeriodStore store;
-    private final ParentPeriodGenerator generator;
-
-    @Inject
-    PeriodHandler(PeriodStore store, ParentPeriodGenerator generator) {
-        this.store = store;
-        this.generator = generator;
-    }
-
-    public void generateAndPersist() {
-        List<Period> periods = generator.generatePeriods();
-        for (Period period : periods) {
-            store.updateOrInsertWhere(period);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.kt
similarity index 82%
rename from core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.kt
index 6d461777f3..14fc8bb3f2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHandler.kt
@@ -27,16 +27,17 @@
  */
 package org.hisp.dhis.android.core.period.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class PeriodEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): PeriodStore {
-        return PeriodStoreImpl(databaseAdapter)
+@Singleton
+internal class PeriodHandler(
+    private val store: PeriodStore,
+    private val generator: ParentPeriodGenerator,
+) {
+    fun generateAndPersist() {
+        val periods = generator.generatePeriods()
+        for (period in periods) {
+            store.updateOrInsertWhere(period)
+        }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHelper.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHelper.java
index ca7f0a5ecf..8ea8e0d4bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHelper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodHelper.java
@@ -35,13 +35,9 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import io.reactivex.Single;
 import io.reactivex.annotations.NonNull;
 
-@Singleton
 public class PeriodHelper {
 
     private final PeriodStore periodStore;
@@ -50,12 +46,11 @@ public class PeriodHelper {
     private final PeriodParser periodParser;
     private final CalendarProvider calendarProvider;
 
-    @Inject
-    PeriodHelper(PeriodStore periodStore,
-                 PeriodForDataSetManager periodForDataSetManager,
-                 ParentPeriodGenerator parentPeriodGenerator,
-                 PeriodParser periodParser,
-                 CalendarProvider calendarProvider) {
+    public PeriodHelper(PeriodStore periodStore,
+                        PeriodForDataSetManager periodForDataSetManager,
+                        ParentPeriodGenerator parentPeriodGenerator,
+                        PeriodParser periodParser,
+                        CalendarProvider calendarProvider) {
         this.periodStore = periodStore;
         this.periodForDataSetManager = periodForDataSetManager;
         this.parentPeriodGenerator = parentPeriodGenerator;
@@ -73,9 +68,8 @@ public static Integer getDays(Period period) {
      * If the period does not exist in the database, it is inserted.
      *
      * @param periodType Period type
-     * @param date Date contained in the period
+     * @param date       Date contained in the period
      * @return Period
-     *
      * @deprecated Use {@link #getPeriodForPeriodTypeAndDate(PeriodType, Date)} instead.
      */
     @Deprecated
@@ -88,7 +82,7 @@ public Period getPeriod(@NonNull PeriodType periodType, @NonNull Date date) {
      * If the period does not exist in the database, it is inserted.
      *
      * @param periodType Period type
-     * @param date Date contained in the period
+     * @param date       Date contained in the period
      * @return Period
      */
     public Period blockingGetPeriodForPeriodTypeAndDate(@NonNull PeriodType periodType, @NonNull Date date) {
@@ -100,8 +94,7 @@ public Period blockingGetPeriodForPeriodTypeAndDate(@NonNull PeriodType periodTy
      * If the period does not exist in the database, it is inserted.
      *
      * @param periodType Period type
-     * @param date Date contained in the period
-     *
+     * @param date       Date contained in the period
      * @return {@code Single} with the generated period.
      */
     public Single<Period> getPeriodForPeriodTypeAndDate(@NonNull PeriodType periodType, @NonNull Date date) {
@@ -112,8 +105,8 @@ public Single<Period> getPeriodForPeriodTypeAndDate(@NonNull PeriodType periodTy
      * Get a period object specifying a periodType and a date in the period.
      * If the period does not exist in the database, it is inserted.
      *
-     * @param periodType Period type
-     * @param date Date contained in the period
+     * @param periodType   Period type
+     * @param date         Date contained in the period
      * @param periodOffset Number of periods backwards or forwards relative to 'date'
      * @return Period
      */
@@ -132,10 +125,9 @@ public Period blockingGetPeriodForPeriodTypeAndDate(@NonNull PeriodType periodTy
      * Get a period object specifying a periodType and a date in the period.
      * If the period does not exist in the database, it is inserted.
      *
-     * @param periodType Period type
-     * @param date Date contained in the period
+     * @param periodType   Period type
+     * @param date         Date contained in the period
      * @param periodOffset Number of periods backwards or forwards relative to 'date'
-     *
      * @return {@code Single} with the generated period.
      */
     public Single<Period> getPeriodForPeriodTypeAndDate(@NonNull PeriodType periodType, @NonNull Date date,
@@ -148,8 +140,8 @@ public Single<Period> getPeriodForPeriodTypeAndDate(@NonNull PeriodType periodTy
      * If the periodId does not exist in the database, it is inserted.
      *
      * @param periodId Period id.
-     * @throws IllegalArgumentException if the periodId does not match any period
      * @return Period
+     * @throws IllegalArgumentException if the periodId does not match any period
      */
     public Period blockingGetPeriodForPeriodId(@NonNull String periodId) throws IllegalArgumentException {
         PeriodType periodType = PeriodType.periodTypeFromPeriodId(periodId);
@@ -163,9 +155,8 @@ public Period blockingGetPeriodForPeriodId(@NonNull String periodId) throws Ille
      * If the periodId does not exist in the database, it is inserted.
      *
      * @param periodId Period id.
-     * @throws IllegalArgumentException if the periodId does not match any period
-     *
      * @return {@code Single} with the generated period.
+     * @throws IllegalArgumentException if the periodId does not match any period
      */
     public Single<Period> getPeriodForPeriodId(@NonNull String periodId) throws IllegalArgumentException {
         return Single.just(blockingGetPeriodForPeriodId(periodId));
@@ -177,6 +168,7 @@ public Single<List<Period>> getPeriodsForDataSet(String dataSetUid) {
 
     /**
      * Get a calendar instance
+     *
      * @return a calendar instance
      */
     public Calendar getCalendar() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.java
deleted file mode 100644
index 746a19c450..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.period.internal;
-
-import org.hisp.dhis.android.core.period.PeriodCollectionRepository;
-import org.hisp.dhis.android.core.period.PeriodModule;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class PeriodModuleImpl implements PeriodModule {
-
-    private final PeriodHelper periodHelper;
-    private final PeriodCollectionRepository periods;
-
-    @Inject
-    PeriodModuleImpl(PeriodHelper periodHelper,
-                     PeriodCollectionRepository periods) {
-        this.periodHelper = periodHelper;
-        this.periods = periods;
-    }
-
-    @Override
-    public PeriodHelper periodHelper() {
-        return periodHelper;
-    }
-
-    @Override
-    public PeriodCollectionRepository periods() {
-        return periods;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.kt
new file mode 100644
index 0000000000..3568072a85
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleImpl.kt
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.period.internal
+
+import org.hisp.dhis.android.core.period.PeriodCollectionRepository
+import org.hisp.dhis.android.core.period.PeriodModule
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class PeriodModuleImpl(
+    private val periodHelper: PeriodHelper,
+    private val periods: PeriodCollectionRepository,
+) : PeriodModule {
+    override fun periodHelper(): PeriodHelper {
+        return periodHelper
+    }
+
+    override fun periods(): PeriodCollectionRepository {
+        return periods
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.java
deleted file mode 100644
index 2cfce0c880..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.period.internal;
-
-import org.hisp.dhis.android.core.period.PeriodTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class PeriodModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    PeriodModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(PeriodTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // No metadata to wipe
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.kt
index 628c134169..472c2cc65a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/datavalue/internal/DataValueEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodModuleWiper.kt
@@ -25,24 +25,22 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.datavalue.internal
+package org.hisp.dhis.android.core.period.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.period.PeriodTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class DataValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataValueStore {
-        return DataValueStoreImpl(databaseAdapter)
+@Singleton
+internal class PeriodModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(PeriodTableInfo.TABLE_INFO)
     }
 
-    @Provides
-    @Reusable
-    fun handler(dataValueStore: DataValueStore): DataValueHandler {
-        return DataValueHandler(dataValueStore)
+    override fun wipeData() {
+        // No metadata to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodParser.java b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodParser.java
index d8319b05b8..9e8190dd91 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodParser.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodParser.java
@@ -37,20 +37,15 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 @SuppressWarnings({
         "PMD.CyclomaticComplexity",
         "PMD.StdCyclomaticComplexity"
 })
-@Singleton
 public class PeriodParser {
 
     private final CalendarProvider calendarProvider;
 
-    @Inject
-    PeriodParser(CalendarProvider calendarProvider) {
+    public PeriodParser(CalendarProvider calendarProvider) {
         this.calendarProvider = calendarProvider;
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
index 02a597292c..a366fb4e3e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/period/internal/PeriodStoreImpl.kt
@@ -39,8 +39,10 @@ import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.period.Period
 import org.hisp.dhis.android.core.period.PeriodTableInfo
 import org.hisp.dhis.android.core.period.PeriodType
+import org.koin.core.annotation.Singleton
 import java.util.Date
 
+@Singleton
 internal class PeriodStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : PeriodStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
index 7b34645709..df9789184c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -45,11 +44,11 @@ import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityTypeChildrenAppender
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class ProgramCollectionRepository @Inject internal constructor(
+class ProgramCollectionRepository internal constructor(
     store: ProgramStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramDIModule.kt
new file mode 100644
index 0000000000..98966fa866
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.program
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ProgramDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
index e2837bc1a8..d9349d491f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramIndicatorCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -42,10 +41,10 @@ import org.hisp.dhis.android.core.program.internal.ProgramIndicatorAnalyticsPeri
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorFields
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorLegendSetChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramIndicatorStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramIndicatorCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramIndicatorCollectionRepository internal constructor(
     store: ProgramIndicatorStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
index ff0ac3dfd0..83b9a0ee68 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleActionCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -36,11 +35,11 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.program.internal.ProgramRuleActionStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class ProgramRuleActionCollectionRepository @Inject internal constructor(
+class ProgramRuleActionCollectionRepository internal constructor(
     store: ProgramRuleActionStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
index 18210b11ab..a322328045 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.program.internal.ProgramRuleActionChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramRuleFields
 import org.hisp.dhis.android.core.program.internal.ProgramRuleStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramRuleCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramRuleCollectionRepository internal constructor(
     store: ProgramRuleStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
index f1446a2f28..243433ef50 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramRuleVariableCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.program.internal.ProgramRuleVariableStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramRuleVariableCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramRuleVariableCollectionRepository internal constructor(
     store: ProgramRuleVariableStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
index 610e0fcd44..3eab129907 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramSectionCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.program.internal.ProgramSectionAttributeChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramSectionFields
 import org.hisp.dhis.android.core.program.internal.ProgramSectionStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramSectionCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramSectionCollectionRepository internal constructor(
     store: ProgramSectionStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
index c82aa58637..67f79111a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -43,11 +42,11 @@ import org.hisp.dhis.android.core.common.FormType
 import org.hisp.dhis.android.core.common.ValidationStrategy
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.program.internal.ProgramStageStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class ProgramStageCollectionRepository @Inject internal constructor(
+class ProgramStageCollectionRepository internal constructor(
     store: ProgramStageStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
index 44607810c4..420a0a4342 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageDataElementCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -40,10 +39,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderB
 import org.hisp.dhis.android.core.program.internal.DataElementValueTypeRenderingChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementFields
 import org.hisp.dhis.android.core.program.internal.ProgramStageDataElementStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramStageDataElementCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramStageDataElementCollectionRepository internal constructor(
     store: ProgramStageDataElementStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
index 88648f0352..e978804d24 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramStageSectionsCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.program.internal.ProgramStageSectionDataElemen
 import org.hisp.dhis.android.core.program.internal.ProgramStageSectionFields
 import org.hisp.dhis.android.core.program.internal.ProgramStageSectionProgramIndicatorChildrenAppender
 import org.hisp.dhis.android.core.program.internal.ProgramStageSectionStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramStageSectionsCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramStageSectionsCollectionRepository internal constructor(
     store: ProgramStageSectionStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
index 34604b1604..0884beb86c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/ProgramTrackedEntityAttributeCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
@@ -40,10 +39,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope.OrderB
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeFields
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramTrackedEntityAttributeCollectionRepository @Inject internal constructor(
+@Singleton
+class ProgramTrackedEntityAttributeCollectionRepository internal constructor(
     store: ProgramTrackedEntityAttributeStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt
deleted file mode 100644
index e745ce4605..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class AnalyticsPeriodBoundaryEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter?): AnalyticsPeriodBoundaryStore {
-        return AnalyticsPeriodBoundaryStoreImpl(databaseAdapter!!)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: AnalyticsPeriodBoundaryStore): AnalyticsPeriodBoundaryHandler {
-        return AnalyticsPeriodBoundaryHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
index 09c2505e35..d83b2c0b98 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.program.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class AnalyticsPeriodBoundaryHandler(
     store: AnalyticsPeriodBoundaryStore,
 ) : LinkHandlerImpl<AnalyticsPeriodBoundary, AnalyticsPeriodBoundary>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
index 0f76ab5472..5a4cb19beb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/AnalyticsPeriodBoundaryStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundary
 import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsPeriodBoundaryStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
index fabf5c959f..559a306bdd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/DataElementValueTypeRenderingChildrenAppender.kt
@@ -27,14 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStoreImpl
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
-import javax.inject.Inject
 
-@Reusable
-internal class DataElementValueTypeRenderingChildrenAppender @Inject constructor(
+internal class DataElementValueTypeRenderingChildrenAppender(
     databaseAdapter: DatabaseAdapter,
 ) : ValueTypeRenderingChildrenAppender<ProgramStageDataElement>(ValueTypeDeviceRenderingStoreImpl(databaseAdapter)) {
     override fun appendChildren(m: ProgramStageDataElement): ProgramStageDataElement {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt
deleted file mode 100644
index 474b8c5a72..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramAttributeValueEntityDIModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHandler
-import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkStore
-import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkStoreImpl
-
-@Module
-internal class ProgramAttributeValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramAttributeValueLinkStore {
-        return ProgramAttributeValueLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramAttributeValueLinkStore): ProgramAttributeValueLinkHandler {
-        return ProgramAttributeValueLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
index 5631c49aa6..0d157daf42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.Program
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramCall @Inject internal constructor(
+@Singleton
+internal class ProgramCall internal constructor(
     private val service: ProgramService,
     val handler: ProgramHandler,
     val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
index af772215a0..d65c2e2d83 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramCollectionCleaner @Inject constructor(
+@Singleton
+internal class ProgramCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<Program>(
     tableName = ProgramTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
deleted file mode 100644
index e07ae78e23..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStore {
-        return ProgramStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
index d542c9b5c8..ee96ea66a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.attribute.internal.ProgramAttributeValueLinkHa
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramHandler @Inject constructor(
+@Singleton
+internal class ProgramHandler(
     programStore: ProgramStore,
     private val programRuleVariableHandler: ProgramRuleVariableHandler,
     private val programTrackedEntityAttributeHandler: ProgramTrackedEntityAttributeHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
index fd459f7cfc..43d73bcb9b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorCall.kt
@@ -28,15 +28,14 @@
 
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramIndicatorCall @Inject constructor(
+@Singleton
+internal class ProgramIndicatorCall(
     private val service: ProgramIndicatorService,
     private val handler: ProgramIndicatorHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
deleted file mode 100644
index 718413766d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramIndicatorEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramIndicatorStore {
-        return ProgramIndicatorStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
index c24e5dbf88..b9b5cddd87 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.legendset.ProgramIndicatorLegendSetLink
 import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkHandler
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramIndicatorHandler @Inject constructor(
+@Singleton
+internal class ProgramIndicatorHandler(
     private val programIndicatorStore: ProgramIndicatorStore,
     private val programIndicatorLegendSetLinkHandler: ProgramIndicatorLegendSetLinkHandler,
     private val analyticsPeriodBoundaryHandler: AnalyticsPeriodBoundaryHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt
deleted file mode 100644
index 12d0da9bf6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorLegendSetEntityDIModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkHandler
-import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStore
-import org.hisp.dhis.android.core.legendset.internal.ProgramIndicatorLegendSetLinkStoreImpl
-
-@Module
-internal class ProgramIndicatorLegendSetEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramIndicatorLegendSetLinkStore {
-        return ProgramIndicatorLegendSetLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramIndicatorLegendSetLinkStore): ProgramIndicatorLegendSetLinkHandler {
-        return ProgramIndicatorLegendSetLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
index a796914461..0c0c60e323 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorModuleDownloader.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramIndicatorModuleDownloader @Inject constructor(
+@Singleton
+internal class ProgramIndicatorModuleDownloader(
     private val programIndicatorCall: ProgramIndicatorCall,
     private val programIndicatorUidsSeeker: ProgramIndicatorUidsSeeker,
 ) : UntypedModuleDownloaderCoroutines {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
index 52521d9c45..e1ea308210 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramIndicatorStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
index 4a1f6023db..82cd268db6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeeker.kt
@@ -28,16 +28,15 @@
 
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.uidseeker.internal.BaseUidsSeeker
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
 import org.hisp.dhis.android.core.visualization.DimensionItemType
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramIndicatorUidsSeeker @Inject constructor(
+@Singleton
+internal class ProgramIndicatorUidsSeeker(
     databaseAdapter: DatabaseAdapter,
 ) : BaseUidsSeeker(databaseAdapter) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
index 6fa40aef83..7add70b94a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleDownloader.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.event.internal.EventFilterCall
@@ -41,11 +40,11 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterCall
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList")
-internal class ProgramModuleDownloader @Inject constructor(
+internal class ProgramModuleDownloader(
     private val programCall: ProgramCall,
     private val programStageCall: ProgramStageCall,
     private val programRuleCall: ProgramRuleCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt
index cae8aff7ad..d16c466e57 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleImpl.kt
@@ -27,15 +27,24 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
-import org.hisp.dhis.android.core.program.*
+import org.hisp.dhis.android.core.program.ProgramCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramModule
+import org.hisp.dhis.android.core.program.ProgramRuleActionCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramRuleCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramRuleVariableCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramSectionCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramStageDataElementCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramStageSectionsCollectionRepository
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeCollectionRepository
 import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList", "TooManyFunctions")
-internal class ProgramModuleImpl @Inject constructor(
+internal class ProgramModuleImpl(
     private val programs: ProgramCollectionRepository,
     private val programIndicators: ProgramIndicatorCollectionRepository,
     private val programRules: ProgramRuleCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleWiper.kt
similarity index 58%
rename from core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleWiper.kt
index 75f8ffd27e..c3fc4ee824 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramModuleWiper.kt
@@ -25,62 +25,50 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.program.internal
 
-package org.hisp.dhis.android.core.program.internal;
+import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo
+import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo
+import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
+import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
+import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
+import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo
+import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
+import org.hisp.dhis.android.core.program.ProgramStageTableInfo
+import org.hisp.dhis.android.core.program.ProgramTableInfo
+import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-import org.hisp.dhis.android.core.program.AnalyticsPeriodBoundaryTableInfo;
-import org.hisp.dhis.android.core.program.ProgramIndicatorTableInfo;
-import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo;
-import org.hisp.dhis.android.core.program.ProgramRuleTableInfo;
-import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo;
-import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo;
-import org.hisp.dhis.android.core.program.ProgramSectionTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo;
-import org.hisp.dhis.android.core.program.ProgramStageTableInfo;
-import org.hisp.dhis.android.core.program.ProgramTableInfo;
-import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ProgramModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    ProgramModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+@Singleton
+internal class ProgramModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
-                ProgramTableInfo.TABLE_INFO,
-                ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
-                ProgramRuleVariableTableInfo.TABLE_INFO,
-                ProgramIndicatorTableInfo.TABLE_INFO,
-                ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
-                ProgramRuleActionTableInfo.TABLE_INFO,
-                ProgramRuleTableInfo.TABLE_INFO,
-                ProgramSectionTableInfo.TABLE_INFO,
-                ProgramStageDataElementTableInfo.TABLE_INFO,
-                ProgramStageSectionTableInfo.TABLE_INFO,
-                ProgramStageTableInfo.TABLE_INFO,
-                ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
-                ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO
-        );
+            AnalyticsPeriodBoundaryTableInfo.TABLE_INFO,
+            ProgramTableInfo.TABLE_INFO,
+            ProgramTrackedEntityAttributeTableInfo.TABLE_INFO,
+            ProgramRuleVariableTableInfo.TABLE_INFO,
+            ProgramIndicatorTableInfo.TABLE_INFO,
+            ProgramStageSectionProgramIndicatorLinkTableInfo.TABLE_INFO,
+            ProgramRuleActionTableInfo.TABLE_INFO,
+            ProgramRuleTableInfo.TABLE_INFO,
+            ProgramSectionTableInfo.TABLE_INFO,
+            ProgramStageDataElementTableInfo.TABLE_INFO,
+            ProgramStageSectionTableInfo.TABLE_INFO,
+            ProgramStageTableInfo.TABLE_INFO,
+            ProgramSectionAttributeLinkTableInfo.TABLE_INFO,
+            ProgramStageSectionDataElementLinkTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No metadata to wipe
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
index f5f5245079..abbd5b50b1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrganisationUnitLinkCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.LinkCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitProgramLinkTableInfo
 import org.hisp.dhis.android.core.program.Program
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramOrganisationUnitLinkCleaner @Inject constructor(
+@Singleton
+internal class ProgramOrganisationUnitLinkCleaner(
     programStore: ProgramStore,
     databaseAdapter: DatabaseAdapter,
 ) : LinkCleanerImpl<Program>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
index 7af52b7ab5..60579db6ef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramOrphanCleaner.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.ParentOrphanCleaner
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramOrphanCleaner(
     private val programRuleVariableCleaner: ProgramRuleVariableOrphanCleaner,
     private val programTrackedEntityAttributeCleaner: ProgramTrackedEntityAttributeOrphanCleaner,
     private val programSectionCleaner: ProgramSectionOrphanCleaner,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
deleted file mode 100644
index 1193ce785d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramPackageDIModule.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.program.ProgramModule
-import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorEngineEntityDIModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        AnalyticsPeriodBoundaryEntityDIModule::class,
-        ProgramEntityDIModule::class,
-        ProgramIndicatorEngineEntityDIModule::class,
-        ProgramIndicatorEntityDIModule::class,
-        ProgramIndicatorLegendSetEntityDIModule::class,
-        ProgramRuleActionEntityDIModule::class,
-        ProgramRuleEntityDIModule::class,
-        ProgramRuleVariableEntityDIModule::class,
-        ProgramSectionEntityDIModule::class,
-        ProgramStageDataElementEntityDIModule::class,
-        ProgramStageAttributeValueEntityDIModule::class,
-        ProgramStageSectionDataElementEntityDIModule::class,
-        ProgramSectionAttributeEntityDIModule::class,
-        ProgramStageSectionEntityDIModule::class,
-        ProgramStageSectionProgramIndicatorEntityDIModule::class,
-        ProgramStageEntityDIModule::class,
-        ProgramTrackedEntityAttributeEntityDIModule::class,
-        ProgramAttributeValueEntityDIModule::class,
-    ],
-)
-internal class ProgramPackageDIModule {
-    @Provides
-    @Reusable
-    fun programRuleService(retrofit: Retrofit): ProgramRuleService {
-        return retrofit.create(ProgramRuleService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun programIndicatorService(retrofit: Retrofit): ProgramIndicatorService {
-        return retrofit.create(ProgramIndicatorService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun programService(retrofit: Retrofit): ProgramService {
-        return retrofit.create(ProgramService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun programStageService(retrofit: Retrofit): ProgramStageService {
-        return retrofit.create(ProgramStageService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: ProgramModuleImpl): ProgramModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
deleted file mode 100644
index f6e3b9cd15..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramRuleActionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramRuleActionStore {
-        return ProgramRuleActionStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramRuleActionStore): ProgramRuleActionHandler {
-        return ProgramRuleActionHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
index 84d7dac5bc..80c435e849 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.program.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramRuleAction
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramRuleActionHandler(
     store: ProgramRuleActionStore,
 ) : IdentifiableHandlerImpl<ProgramRuleAction>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
index e988383195..e99e62bc4a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramRuleActionOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramRuleActionOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<ProgramRule, ProgramRuleAction>(
     tableName = ProgramRuleActionTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
index 03fba00942..9a5f8647e3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleActionStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramRuleAction
 import org.hisp.dhis.android.core.program.ProgramRuleActionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramRuleActionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
index a59a6dfcf8..930e2ea783 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramRuleCall @Inject constructor(
+@Singleton
+internal class ProgramRuleCall(
     private val service: ProgramRuleService,
     private val handler: ProgramRuleHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
deleted file mode 100644
index bb27e2c122..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramRuleEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramRuleStore {
-        return ProgramRuleStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
index 56f3f54504..51a40eaa56 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleHandler.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleAction
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramRuleHandler @Inject constructor(
+@Singleton
+internal class ProgramRuleHandler(
     programRuleStore: ProgramRuleStore,
     private val programRuleActionHandler: ProgramRuleActionHandler,
     private val programRuleCleaner: ProgramRuleSubCollectionCleaner,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
index 46bd7367a8..8e1a01cb42 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramRuleStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
index aa6c6c4776..f73d8a59c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleSubCollectionCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.program.ProgramRule
 import org.hisp.dhis.android.core.program.ProgramRuleTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramRuleSubCollectionCleaner @Inject constructor(
+@Singleton
+internal class ProgramRuleSubCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : SubCollectionCleanerImpl<ProgramRule>(
     tableName = ProgramRuleTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
deleted file mode 100644
index daaa95ace2..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramRuleVariableEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramRuleVariableStore {
-        return ProgramRuleVariableStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramRuleVariableStore): ProgramRuleVariableHandler {
-        return ProgramRuleVariableHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
index 3abd98e699..5b206f8716 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.program.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramRuleVariable
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramRuleVariableHandler(
     store: ProgramRuleVariableStore,
 ) : IdentifiableHandlerImpl<ProgramRuleVariable>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
index 749bda5f01..a788542b96 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramRuleVariable
 import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramRuleVariableOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramRuleVariableOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<Program, ProgramRuleVariable>(
     tableName = ProgramRuleVariableTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
index 5b44022525..24d295ef81 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramRuleVariableStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramRuleVariable
 import org.hisp.dhis.android.core.program.ProgramRuleVariableTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramRuleVariableStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt
deleted file mode 100644
index 6109671464..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramSectionAttributeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramSectionAttributeLinkStore {
-        return ProgramSectionAttributeLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramSectionAttributeLinkStore): ProgramSectionAttributeLinkHandler {
-        return ProgramSectionAttributeLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
index c4fa86bcf9..7d4df36cd5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.program.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramSectionAttributeLinkHandler(
     store: ProgramSectionAttributeLinkStore,
 ) : OrderedLinkHandlerImpl<TrackedEntityAttribute, ProgramSectionAttributeLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
index 0a8b32cc4e..3239fc9cd4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionAttributeLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
 import org.hisp.dhis.android.core.program.ProgramSectionAttributeLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramSectionAttributeLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramSectionAttributeLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
deleted file mode 100644
index e16b95c768..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramSectionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramSectionStore {
-        return ProgramSectionStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
index 5406e78975..72bc20b0f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionHandler.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionAttributeLink
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramSectionHandler @Inject constructor(
+@Singleton
+internal class ProgramSectionHandler(
     programSectionStore: ProgramSectionStore,
     private val programSectionAttributeLinkHandler: ProgramSectionAttributeLinkHandler,
 ) : IdentifiableHandlerImpl<ProgramSection>(programSectionStore) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
index 42615cdb67..a4cb4b08d1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramSectionOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramSectionOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<Program, ProgramSection>(
     tableName = ProgramSectionTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
index 362156d330..da2d1ba085 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramSectionStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramSection
 import org.hisp.dhis.android.core.program.ProgramSectionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramSectionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt
deleted file mode 100644
index 66691b7728..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageAttributeValueEntityDIModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler
-import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkStore
-import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkStoreImpl
-
-@Module
-internal class ProgramStageAttributeValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageAttributeValueLinkStore {
-        return ProgramStageAttributeValueLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramStageAttributeValueLinkStore): ProgramStageAttributeValueLinkHandler {
-        return ProgramStageAttributeValueLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
index 8b3b71e02b..539783865c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageCall @Inject internal constructor(
+@Singleton
+internal class ProgramStageCall internal constructor(
     private val service: ProgramStageService,
     private val handler: ProgramStageHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
deleted file mode 100644
index 9c98a9a06e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageDataElementEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageDataElementStore {
-        return ProgramStageDataElementStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
index 841ba78edf..029f6a721f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementHandler.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler
 import org.hisp.dhis.android.core.dataelement.internal.DataElementHandler
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageDataElementHandler @Inject constructor(
+@Singleton
+internal class ProgramStageDataElementHandler(
     programStageDataElementStore: ProgramStageDataElementStore,
     private val dataElementHandler: DataElementHandler,
     private val valueTypeRenderingHandler: ValueTypeRenderingHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
index e385d3a901..5169f9e00b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageDataElementOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramStageDataElementOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<ProgramStage, ProgramStageDataElement>(
     tableName = ProgramStageDataElementTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
index 54d32db20f..f6ec00b011 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageDataElementStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramStageDataElement
 import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStageDataElementStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
deleted file mode 100644
index 498014d252..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageStore {
-        return ProgramStageStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
index 4ab7a57d24..d4108afac3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.attribute.Attribute
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageInternalAccessor
 import org.hisp.dhis.android.core.program.ProgramStageSection
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageHandler @Inject constructor(
+@Singleton
+internal class ProgramStageHandler(
     programStageStore: ProgramStageStore,
     private val programStageSectionHandler: ProgramStageSectionHandler,
     private val programStageDataElementHandler: ProgramStageDataElementHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt
deleted file mode 100644
index a4a1d7ac4d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageSectionDataElementEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionDataElementLinkStore {
-        return ProgramStageSectionDataElementLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramStageSectionDataElementLinkStore): ProgramStageSectionDataElementLinkHandler {
-        return ProgramStageSectionDataElementLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
index 6abf8e15ef..7b2c794d14 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.program.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageSectionDataElementLinkHandler(
     store: ProgramStageSectionDataElementLinkStore,
 ) : OrderedLinkHandlerImpl<DataElement, ProgramStageSectionDataElementLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
index a4c6d60809..6bbcb10a6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionDataElementLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageSectionDataElementLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramStageSectionDataElementLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
deleted file mode 100644
index fd6fe4b0e1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageSectionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionStore {
-        return ProgramStageSectionStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
index 6336958751..c76ef3baa9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.dataelement.DataElement
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionDataElementLink
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageSectionHandler @Inject constructor(
+@Singleton
+internal class ProgramStageSectionHandler(
     programStageSectionStore: ProgramStageSectionStore,
     private val programStageSectionProgramIndicatorLinkHandler: ProgramStageSectionProgramIndicatorLinkHandler,
     private val programStageSectionDataElementLinkHandler: ProgramStageSectionDataElementLinkHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
index b2e21e8e18..cce34053a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageSectionOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramStageSectionOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<ProgramStage, ProgramStageSection>(
     tableName = ProgramStageSectionTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
deleted file mode 100644
index 94dfece086..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageSectionProgramIndicatorEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageSectionProgramIndicatorLinkStore {
-        return ProgramStageSectionProgramIndicatorLinkStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: ProgramStageSectionProgramIndicatorLinkStore,
-    ): ProgramStageSectionProgramIndicatorLinkHandler {
-        return ProgramStageSectionProgramIndicatorLinkHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
index 340a84c5cf..1142867fee 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkHandler.kt
@@ -31,7 +31,9 @@ package org.hisp.dhis.android.core.program.internal
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageSectionProgramIndicatorLinkHandler(
     store: ProgramStageSectionProgramIndicatorLinkStore,
 ) : LinkHandlerImpl<ProgramIndicator, ProgramStageSectionProgramIndicatorLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
index 9fa531730b..c91ef0b6b1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionProgramIndicatorLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLink
 import org.hisp.dhis.android.core.program.ProgramStageSectionProgramIndicatorLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageSectionProgramIndicatorLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramStageSectionProgramIndicatorLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
index a1a423d4f8..ce10e0ca5d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSectionStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.core.program.ProgramStageSectionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStageSectionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
index 0136bc7e01..d1b6e976f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStageStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
index 4c39db02b5..84724abdc8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageSubCollectionCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.SubCollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.program.ProgramStage
 import org.hisp.dhis.android.core.program.ProgramStageTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageSubCollectionCleaner @Inject constructor(
+@Singleton
+internal class ProgramStageSubCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : SubCollectionCleanerImpl<ProgramStage>(
     tableName = ProgramStageTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
index db1427210c..1fb5c4dbcf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStoreImpl.kt
@@ -39,7 +39,9 @@ import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTableInfo
 import org.hisp.dhis.android.core.program.ProgramType
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
deleted file mode 100644
index 77e3e83b48..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramTrackedEntityAttributeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramTrackedEntityAttributeStore {
-        return ProgramTrackedEntityAttributeStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
index 1cc8296f6e..684d7a748e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeHandler.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.valuetype.rendering.internal.ValueTypeRenderingHandler
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramTrackedEntityAttributeHandler @Inject constructor(
+@Singleton
+internal class ProgramTrackedEntityAttributeHandler(
     store: ProgramTrackedEntityAttributeStore,
     private val renderTypeHandler: ValueTypeRenderingHandler,
 ) : IdentifiableHandlerImpl<ProgramTrackedEntityAttribute>(store) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
index b3e7de02b3..1af3f4a7c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.OrphanCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramTrackedEntityAttributeOrphanCleaner @Inject constructor(
+@Singleton
+internal class ProgramTrackedEntityAttributeOrphanCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : OrphanCleanerImpl<Program, ProgramTrackedEntityAttribute>(
     tableName = ProgramTrackedEntityAttributeTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
index bac75c264f..fde635213e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SinglePare
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramTrackedEntityAttributeStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
index a0b0022015..0d49ca8e20 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender.kt
@@ -27,14 +27,11 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.common.valuetype.devicerendering.internal.ValueTypeDeviceRenderingStoreImpl
 import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttribute
-import javax.inject.Inject
 
-@Reusable
-internal class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender @Inject constructor(
+internal class ProgramTrackedEntityAttributeValueTypeRenderingChildrenAppender(
     databaseAdapter: DatabaseAdapter,
 ) : ValueTypeRenderingChildrenAppender<ProgramTrackedEntityAttribute>(
     ValueTypeDeviceRenderingStoreImpl(databaseAdapter),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
index 34ee862078..0581467278 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramTrackedEntityTypeChildrenAppender.kt
@@ -27,15 +27,12 @@
  */
 package org.hisp.dhis.android.core.program.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.program.Program
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStoreImpl
-import javax.inject.Inject
 
-@Reusable
-internal class ProgramTrackedEntityTypeChildrenAppender @Inject constructor(
+internal class ProgramTrackedEntityTypeChildrenAppender(
     databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<Program>() {
     private val store = TrackedEntityTypeStoreImpl(databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineEntityDIModule.kt
deleted file mode 100644
index 9b4e95bd3d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineEntityDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.program.programindicatorengine.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicatorEngine
-
-@Module
-internal class ProgramIndicatorEngineEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun programIndicatorEngine(impl: ProgramIndicatorEngineImpl): ProgramIndicatorEngine {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
index e2df27f912..89d280ac67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorEngineImpl.kt
@@ -43,10 +43,11 @@ import org.hisp.dhis.android.core.program.programindicatorengine.ProgramIndicato
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-internal class ProgramIndicatorEngineImpl @Inject constructor(
+@Singleton
+internal class ProgramIndicatorEngineImpl(
     private val programIndicatorStore: ProgramIndicatorStore,
     private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt
index efde162f24..05e6081def 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutor.kt
@@ -27,25 +27,25 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal
 
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.constant.Constant
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.parser.internal.expression.*
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitor
 import org.hisp.dhis.android.core.parser.internal.expression.CommonExpressionVisitorScope
 import org.hisp.dhis.android.core.parser.internal.expression.CommonParser
+import org.hisp.dhis.android.core.parser.internal.expression.ExpressionItemMethod
+import org.hisp.dhis.android.core.parser.internal.expression.ParserUtils
 import org.hisp.dhis.android.core.program.ProgramIndicator
-import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.antlr.AntlrParserUtils
 import org.hisp.dhis.antlr.ParserException
 
 internal class ProgramIndicatorExecutor constructor(
     private val constantMap: Map<String, Constant>,
     private val programIndicatorContext: ProgramIndicatorContext,
-    private val dataElementStore: IdentifiableObjectStore<DataElement>,
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute>,
-    private val programStageStore: IdentifiableObjectStore<ProgramStage>,
+    private val dataElementStore: DataElementStore,
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
+    private val programStageStore: ProgramStageStore,
 ) {
     fun getProgramIndicatorValue(programIndicator: ProgramIndicator): String? {
         val visitor = newVisitor(ParserUtils.ITEM_EVALUATE)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
index 7475653559..3fc8a909cd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorSQLExecutor.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.program.programindicatorengine.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.analytics.aggregated.DimensionItem
 import org.hisp.dhis.android.core.analytics.aggregated.MetadataItem
 import org.hisp.dhis.android.core.analytics.aggregated.internal.AnalyticsServiceEvaluationItem
@@ -52,10 +51,10 @@ import org.hisp.dhis.android.core.program.programindicatorengine.internal.Progra
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.literal.ProgramIndicatorSQLLiteral
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.antlr.Parser
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramIndicatorSQLExecutor @Inject constructor(
+@Singleton
+internal class ProgramIndicatorSQLExecutor(
     private val constantStore: ConstantStore,
     private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt b/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
index ca882d6312..41206ef20e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/program/trackerheaderengine/internal/TrackerHeaderEngine.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.program.trackerheaderengine.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.constant.internal.ConstantStore
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.program.programindicatorengine.internal.Progra
 import org.hisp.dhis.android.core.program.programindicatorengine.internal.ProgramIndicatorExecutor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerHeaderEngine @Inject constructor(
+@Singleton
+internal class TrackerHeaderEngine(
     private val dataElementStore: DataElementStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val programStageStore: ProgramStageStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
index 4dfc97df1b..fffae3c1e2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.programstageworkinglist
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -44,11 +43,11 @@ import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageW
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListDataFilterChildrenAppender
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListStore
 import org.hisp.dhis.android.core.programstageworkinglist.internal.ProgramStageWorkingListTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class ProgramStageWorkingListCollectionRepository @Inject internal constructor(
+class ProgramStageWorkingListCollectionRepository internal constructor(
     store: ProgramStageWorkingListStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListDIModule.kt
new file mode 100644
index 0000000000..68faac828f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.programstageworkinglist
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ProgramStageWorkingListDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
deleted file mode 100644
index 5025b1c15e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterEntityDIModule.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.programstageworkinglist.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageWorkingListAttributeValueFilterEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageWorkingListAttributeValueFilterStore {
-        return ProgramStageWorkingListAttributeValueFilterStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        store: ProgramStageWorkingListAttributeValueFilterStore,
-    ): ProgramStageWorkingListAttributeValueFilterHandler {
-        return ProgramStageWorkingListAttributeValueFilterHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
index 3fd002060d..d8ac4777e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageWorkingListAttributeValueFilterHandler(
     store: ProgramStageWorkingListAttributeValueFilterStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramStageWorkingListAttributeValueFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
index 3ea77b54cf..a4e5f3f1ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListAttributeValueFilterStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListAttributeValueFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStageWorkingListAttributeValueFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
index cea4b57221..5d53147fbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListCall.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageWorkingListCall @Inject internal constructor(
+@Singleton
+internal class ProgramStageWorkingListCall(
     private val service: ProgramStageWorkingListService,
     private val handler: ProgramStageWorkingListHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
deleted file mode 100644
index 60f825c9d1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEntityDIModule.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.programstageworkinglist.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class ProgramStageWorkingListEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageWorkingListStore {
-        return ProgramStageWorkingListStoreImpl(databaseAdapter)
-    }
-
-    @Reusable
-    @Provides
-    fun service(retrofit: Retrofit): ProgramStageWorkingListService {
-        return retrofit.create(ProgramStageWorkingListService::class.java)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt
deleted file mode 100644
index ffc0529db5..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.programstageworkinglist.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramStageWorkingListEventDataFilterEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramStageWorkingListEventDataFilterStore {
-        return ProgramStageWorkingListEventDataFilterStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: ProgramStageWorkingListEventDataFilterStore): ProgramStageWorkingListEventDataFilterHandler {
-        return ProgramStageWorkingListEventDataFilterHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
index 75871ce926..7ce5219ad8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.programstageworkinglist.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramStageWorkingListEventDataFilterHandler(
     store: ProgramStageWorkingListEventDataFilterStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramStageWorkingListEventDataFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
index 0415fa401e..52214de56b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListEventDataFilterStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingListEventDataFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStageWorkingListEventDataFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
index 06724524cd..08e3bf3968 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageWorkingListHandler @Inject constructor(
+@Singleton
+internal class ProgramStageWorkingListHandler(
     store: ProgramStageWorkingListStore,
     private val eventDataFilterHandler: ProgramStageWorkingListEventDataFilterHandler,
     private val attributeValueFilterHandler: ProgramStageWorkingListAttributeValueFilterHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt
index 84f2f66af9..ab5ea4d10f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListModuleWiper.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.programstageworkinglist.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramStageWorkingListModuleWiper @Inject constructor(
+@Singleton
+internal class ProgramStageWorkingListModuleWiper(
     private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
deleted file mode 100644
index fe732c8874..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListPackageDIModule.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.programstageworkinglist.internal
-
-import dagger.Module
-
-@Module(
-    includes = [
-        ProgramStageWorkingListEntityDIModule::class,
-        ProgramStageWorkingListEventDataFilterEntityDIModule::class,
-        ProgramStageWorkingListAttributeValueFilterEntityDIModule::class,
-    ],
-)
-internal class ProgramStageWorkingListPackageDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
index 95adb26edd..3cc4071324 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/programstageworkinglist/internal/ProgramStageWorkingListStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.programstageworkinglist.ProgramStageWorkingList
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramStageWorkingListStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
index 948729bc8b..18263340cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.relationship
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
@@ -53,11 +52,11 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipItemChildren
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemElementStoreSelector
 import org.hisp.dhis.android.core.relationship.internal.RelationshipManager
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class RelationshipCollectionRepository @Inject internal constructor(
+class RelationshipCollectionRepository internal constructor(
     private val relationshipStore: RelationshipStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipDIModule.kt
new file mode 100644
index 0000000000..238646fce5
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.relationship
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class RelationshipDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
index ab9b5bcd21..edbe7385ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipServiceImpl.kt
@@ -28,14 +28,13 @@
 
 package org.hisp.dhis.android.core.relationship
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.program.ProgramCollectionRepository
 import org.hisp.dhis.android.core.program.ProgramStageCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RelationshipServiceImpl @Inject constructor(
+@Singleton
+internal class RelationshipServiceImpl(
     private val programRepository: ProgramCollectionRepository,
     private val programStageRepository: ProgramStageCollectionRepository,
     private val trackedEntityTypeRepository: TrackedEntityTypeCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
index 7fb3a59254..b6f2b804a5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/RelationshipTypeCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.relationship
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
@@ -46,10 +45,10 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeCollecti
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeFields
 import org.hisp.dhis.android.core.relationship.internal.RelationshipTypeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class RelationshipTypeCollectionRepository @Inject internal constructor(
+@Singleton
+class RelationshipTypeCollectionRepository internal constructor(
     store: RelationshipTypeStore,
     private val teiStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
index b7399102c2..064c0f723c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EnrollmentRelationshipOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EnrollmentRelationshipOrphanCleaner @Inject constructor(
+@Singleton
+internal class EnrollmentRelationshipOrphanCleaner(
     relationshipStore: RelationshipStore,
     relationshipRepository: RelationshipCollectionRepository,
 ) : RelationshipOrphanCleaner<Enrollment, Relationship>(relationshipStore, relationshipRepository) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
index 7b4b7df86d..7281d1d092 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/EventRelationshipOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class EventRelationshipOrphanCleaner @Inject internal constructor(
+@Singleton
+internal class EventRelationshipOrphanCleaner internal constructor(
     relationshipStore: RelationshipStore,
     relationshipRepository: RelationshipCollectionRepository,
 ) : RelationshipOrphanCleaner<Event, Relationship>(relationshipStore, relationshipRepository) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt
deleted file mode 100644
index 597d5d3b16..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintEntityDIModule.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class RelationshipConstraintEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): RelationshipConstraintStore {
-        return RelationshipConstraintStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: RelationshipConstraintStore): RelationshipConstraintHandler {
-        return RelationshipConstraintHandler(store)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
index 519b2daca0..10015e33c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.relationship.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.relationship.RelationshipConstraint
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class RelationshipConstraintHandler(
     store: RelationshipConstraintStore,
 ) : ObjectWithoutUidHandlerImpl<RelationshipConstraint>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
index 86b795705e..19b9b54e2f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipConstraintStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.relationship.RelationshipConstraint
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class RelationshipConstraintStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : RelationshipConstraintStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java
index 2a41447430..71229dc69f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDHISVersionManager.java
@@ -42,16 +42,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
 public class RelationshipDHISVersionManager {
 
     private final RelationshipTypeStore relationshipTypeStore;
 
-    @Inject
     public RelationshipDHISVersionManager(RelationshipTypeStore relationshipTypeStore) {
         this.relationshipTypeStore = relationshipTypeStore;
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
index 7a86a5eaa6..9badfb6421 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentPersistenceCallFactory
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.relationship.*
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePersistenceCallFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RelationshipDownloadAndPersistCallFactory @Inject constructor(
+@Singleton
+internal class RelationshipDownloadAndPersistCallFactory(
     private val relationshipStore: RelationshipStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val teiPersistenceCallFactory: TrackedEntityInstancePersistenceCallFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
deleted file mode 100644
index 70565765a0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class RelationshipEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): RelationshipStore {
-        return RelationshipStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
index 42b5bea240..d5db5e2796 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipHandler.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RelationshipHandler @Inject constructor(
+@Singleton
+internal class RelationshipHandler(
     relationshipStore: RelationshipStore,
     private val relationshipItemStore: RelationshipItemStore,
     private val relationshipItemHandler: RelationshipItemHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
index c11db11906..6cad607942 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipImportHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
@@ -35,9 +34,10 @@ import org.hisp.dhis.android.core.imports.internal.BaseImportSummaryHelper.getRe
 import org.hisp.dhis.android.core.imports.internal.RelationshipImportSummary
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable class RelationshipImportHandler @Inject internal constructor(
+@Singleton
+internal class RelationshipImportHandler internal constructor(
     private val relationshipStore: RelationshipStore,
     private val dataStatePropagator: DataStatePropagator,
     private val relationshipRepository: RelationshipCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
index 8535910b87..a8f6e73dae 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemChildrenAppender.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RelationshipItemChildrenAppender @Inject constructor(
+@Singleton
+internal class RelationshipItemChildrenAppender(
     databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<Relationship>() {
     private val store = RelationshipItemStoreImpl(databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
index ef561a4236..92ab65d988 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemElementStoreSelectorImpl.kt
@@ -32,7 +32,9 @@ import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class RelationshipItemElementStoreSelectorImpl(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
deleted file mode 100644
index b29a8ceb2d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemEntityDIModule.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
-import org.hisp.dhis.android.core.event.internal.EventStore
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-
-@Module
-internal class RelationshipItemEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): RelationshipItemStore {
-        return RelationshipItemStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(store: RelationshipItemStore): RelationshipItemHandler {
-        return RelationshipItemHandler(store)
-    }
-
-    @Provides
-    @Reusable
-    fun storeSelector(
-        trackedEntityInstanceStore: TrackedEntityInstanceStore,
-        enrollmentStore: EnrollmentStore,
-        eventStore: EventStore,
-    ): RelationshipItemElementStoreSelector {
-        return RelationshipItemElementStoreSelectorImpl(
-            trackedEntityInstanceStore,
-            enrollmentStore,
-            eventStore,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
index c1e458b1d7..51d6389632 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemHandler.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.relationship.internal
 
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.relationship.RelationshipItem
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class RelationshipItemHandler(
     store: RelationshipItemStore,
 ) : ObjectWithoutUidHandlerImpl<RelationshipItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
index 36685142c8..ddaddeef1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipItemStoreImpl.kt
@@ -38,8 +38,10 @@ import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.*
 
+@Singleton
 internal class RelationshipItemStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : RelationshipItemStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt
index b07163ff85..58ebd9b091 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipManager.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RelationshipManager @Inject constructor(
+@Singleton
+internal class RelationshipManager(
     private var relationshipStore: RelationshipStore,
     private val relationshipItemStore: RelationshipItemStore,
     private val relationshipVersionManager: RelationshipDHISVersionManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.java
deleted file mode 100644
index 4f59b09cf3..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository;
-import org.hisp.dhis.android.core.relationship.RelationshipModule;
-import org.hisp.dhis.android.core.relationship.RelationshipService;
-import org.hisp.dhis.android.core.relationship.RelationshipServiceImpl;
-import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class RelationshipModuleImpl implements RelationshipModule {
-
-    private final RelationshipTypeCollectionRepository relationshipTypes;
-
-    private final RelationshipCollectionRepository relationships;
-    private final RelationshipService relationshipService;
-
-    @Inject
-    RelationshipModuleImpl(
-            RelationshipTypeCollectionRepository relationshipTypeRepository,
-            RelationshipCollectionRepository relationshipRepository,
-            RelationshipServiceImpl relationshipService) {
-        this.relationshipTypes = relationshipTypeRepository;
-        this.relationships = relationshipRepository;
-        this.relationshipService = relationshipService;
-    }
-
-    @Override
-    public RelationshipTypeCollectionRepository relationshipTypes() {
-        return relationshipTypes;
-    }
-
-    @Override
-    public RelationshipCollectionRepository relationships() {
-        return relationships;
-    }
-
-    @Override
-    public RelationshipService relationshipService() {
-        return relationshipService;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.kt
similarity index 65%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.kt
index 517d2a31ed..7711c2f910 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleImpl.kt
@@ -27,36 +27,29 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipModule
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.relationship.RelationshipService
+import org.hisp.dhis.android.core.relationship.RelationshipServiceImpl
+import org.hisp.dhis.android.core.relationship.RelationshipTypeCollectionRepository
+import org.koin.core.annotation.Singleton
 
-@Module(
-    includes = [
-        RelationshipConstraintEntityDIModule::class,
-        RelationshipEntityDIModule::class,
-        RelationshipItemEntityDIModule::class,
-        RelationshipTypeEntityDIModule::class,
-    ],
-)
-internal class RelationshipPackageDIModule {
-    @Provides
-    @Reusable
-    fun relationshipTypeService(retrofit: Retrofit): RelationshipTypeService {
-        return retrofit.create(RelationshipTypeService::class.java)
+@Singleton
+internal class RelationshipModuleImpl(
+    private val relationshipTypes: RelationshipTypeCollectionRepository,
+    private val relationships: RelationshipCollectionRepository,
+    private val relationshipService: RelationshipServiceImpl,
+) : RelationshipModule {
+
+    override fun relationshipTypes(): RelationshipTypeCollectionRepository {
+        return relationshipTypes
     }
 
-    @Provides
-    @Reusable
-    fun relationshipService(retrofit: Retrofit): RelationshipService {
-        return retrofit.create(RelationshipService::class.java)
+    override fun relationships(): RelationshipCollectionRepository {
+        return relationships
     }
 
-    @Provides
-    @Reusable
-    fun module(impl: RelationshipModuleImpl): RelationshipModule {
-        return impl
+    override fun relationshipService(): RelationshipService {
+        return relationshipService
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleWiper.kt
similarity index 70%
rename from core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleWiper.kt
index 7669149166..1f93416244 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipModuleWiper.kt
@@ -25,40 +25,31 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.relationship.internal;
-
-import org.hisp.dhis.android.core.relationship.RelationshipConstraintTableInfo;
-import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo;
-import org.hisp.dhis.android.core.relationship.RelationshipTableInfo;
-import org.hisp.dhis.android.core.relationship.RelationshipTypeTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class RelationshipModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    RelationshipModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+package org.hisp.dhis.android.core.relationship.internal
+
+import org.hisp.dhis.android.core.relationship.RelationshipConstraintTableInfo
+import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
+import org.hisp.dhis.android.core.relationship.RelationshipTableInfo
+import org.hisp.dhis.android.core.relationship.RelationshipTypeTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class RelationshipModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                RelationshipTypeTableInfo.TABLE_INFO,
-                RelationshipConstraintTableInfo.TABLE_INFO);
+            RelationshipTypeTableInfo.TABLE_INFO,
+            RelationshipConstraintTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         tableWiper.wipeTables(
-                RelationshipTableInfo.TABLE_INFO,
-                RelationshipItemTableInfo.TABLE_INFO);
+            RelationshipTableInfo.TABLE_INFO,
+            RelationshipItemTableInfo.TABLE_INFO,
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
index c3a0a1e627..25d7771bb7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
@@ -40,11 +39,11 @@ import org.hisp.dhis.android.core.imports.internal.RelationshipDeleteWebResponse
 import org.hisp.dhis.android.core.imports.internal.RelationshipWebResponse
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerPostStateManager
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection.*
-import javax.inject.Inject
 
-@Reusable
-internal class RelationshipPostCall @Inject internal constructor(
+@Singleton
+internal class RelationshipPostCall internal constructor(
     private val relationshipService: RelationshipService,
     private val relationshipStore: RelationshipStore,
     private val relationshipImportHandler: RelationshipImportHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
index fc02ceb644..7f6df5f8dc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipStoreImpl.kt
@@ -38,7 +38,9 @@ import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.relationship.RelationshipItemTableInfo
 import org.hisp.dhis.android.core.relationship.RelationshipTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class RelationshipStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : RelationshipStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
index a3a7998100..16210032b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.resource.internal.Resource
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class RelationshipTypeCall @Inject internal constructor(
+@Singleton
+internal class RelationshipTypeCall(
     private val service: RelationshipTypeService,
     private val handler: RelationshipTypeHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
deleted file mode 100644
index 4c84df6e0b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeEntityDIModule.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.relationship.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class RelationshipTypeEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): RelationshipTypeStore {
-        return RelationshipTypeStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun handler(
-        relationshipTypeStore: RelationshipTypeStore,
-        relationshipConstraintHandler: RelationshipConstraintHandler,
-    ): RelationshipTypeHandler {
-        return RelationshipTypeHandler(
-            relationshipTypeStore,
-            relationshipConstraintHandler,
-        )
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
index 7e301b8198..11bc951e8a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeHandler.kt
@@ -33,7 +33,9 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.relationship.RelationshipConstraint
 import org.hisp.dhis.android.core.relationship.RelationshipConstraintType
 import org.hisp.dhis.android.core.relationship.RelationshipType
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class RelationshipTypeHandler constructor(
     relationshipTypeStore: RelationshipTypeStore,
     private val relationshipConstraintHandler: RelationshipConstraintHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
index af38c7bbcf..b0dbaf6f62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipTypeStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.relationship.RelationshipType
 import org.hisp.dhis.android.core.relationship.RelationshipTypeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class RelationshipTypeStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
index a5798ee51c..a7c5f8486f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/TEIRelationshipOrphanCleaner.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.relationship.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.RelationshipCollectionRepository
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.RelationshipItem
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TEIRelationshipOrphanCleaner @Inject internal constructor(
+@Singleton
+internal class TEIRelationshipOrphanCleaner internal constructor(
     relationshipStore: RelationshipStore,
     relationshipRepository: RelationshipCollectionRepository,
 ) : RelationshipOrphanCleaner<TrackedEntityInstance, Relationship>(relationshipStore, relationshipRepository) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceDIModule.kt
similarity index 92%
rename from core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceDIModule.kt
index 4cb10dc692..1307bc942a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourcePackageDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceDIModule.kt
@@ -25,9 +25,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package org.hisp.dhis.android.core.resource.internal
 
-import dagger.Module
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
 
-@Module(includes = [ResourceEntityDIModule::class])
-internal class ResourcePackageDIModule
+@Module
+@ComponentScan
+internal class ResourceDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
index babbcb6956..69c66c4f81 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceHandler.kt
@@ -29,12 +29,11 @@ package org.hisp.dhis.android.core.resource.internal
 
 import androidx.annotation.VisibleForTesting
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
-internal class ResourceHandler @Inject constructor(private val resourceStore: ResourceStore) {
+internal class ResourceHandler(private val resourceStore: ResourceStore) {
     internal var serverDate: Date? = null
 
     fun setServerDate(serverDate: Date) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.java
deleted file mode 100644
index 043d1dc891..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.resource.internal;
-
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ResourceModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    ResourceModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTables(ResourceTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // Nothing to wipe
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.kt
index 1e27288d88..082f6ec624 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/note/internal/NoteEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceModuleWiper.kt
@@ -25,24 +25,21 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.note.internal
+package org.hisp.dhis.android.core.resource.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class NoteEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): NoteStore {
-        return NoteStoreImpl(databaseAdapter)
+@Singleton
+internal class ResourceModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTables(ResourceTableInfo.TABLE_INFO)
     }
 
-    @Provides
-    @Reusable
-    fun handler(store: NoteStore): NoteHandler {
-        return NoteHandler(store)
+    override fun wipeData() {
+        // Nothing to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
index 44797a9b8a..cabd1d58b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/resource/internal/ResourceStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ResourceStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ResourceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
index 5ec9205721..68232c9804 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsDhisVisualizationsSettingObjectRepository.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class AnalyticsDhisVisualizationsSettingObjectRepository @Inject internal constructor(
+@Singleton(binds = [AnalyticsDhisVisualizationsSettingObjectRepository::class])
+class AnalyticsDhisVisualizationsSettingObjectRepository internal constructor(
     private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore,
     analyticsSettingCall: AnalyticsSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<AnalyticsDhisVisualizationsSetting>(analyticsSettingCall),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
index 786bfb7e10..1b65510af9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsSettingObjectRepository.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.AnalyticsSettingCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class AnalyticsSettingObjectRepository @Inject internal constructor(
+@Singleton(binds = [AnalyticsSettingObjectRepository::class])
+class AnalyticsSettingObjectRepository internal constructor(
     private val analyticsTeiSettingRepository: AnalyticsTeiSettingCollectionRepository,
     analyticsSettingCall: AnalyticsSettingCall,
     private val analyticsDhisVisualizationsSettingObjectRepository: AnalyticsDhisVisualizationsSettingObjectRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
index e480b2be3a..4904edf92d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AnalyticsTeiSettingCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.settings.internal.AnalyticsTeiDataChildrenAppender
 import org.hisp.dhis.android.core.settings.internal.AnalyticsTeiSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class AnalyticsTeiSettingCollectionRepository @Inject internal constructor(
+@Singleton
+class AnalyticsTeiSettingCollectionRepository internal constructor(
     store: AnalyticsTeiSettingStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
index 4343e52620..6737205985 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.AppearanceSettingsHelper.getGlobal
@@ -37,11 +36,11 @@ import org.hisp.dhis.android.core.settings.AppearanceSettingsHelper.toCompletion
 import org.hisp.dhis.android.core.settings.internal.AppearanceSettingCall
 import org.hisp.dhis.android.core.settings.internal.FilterSettingStore
 import org.hisp.dhis.android.core.settings.internal.ProgramConfigurationSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton(binds = [AppearanceSettingsObjectRepository::class])
 @Suppress("TooManyFunctions")
-class AppearanceSettingsObjectRepository @Inject internal constructor(
+class AppearanceSettingsObjectRepository internal constructor(
     private val filterSettingStore: FilterSettingStore,
     private val programConfigurationSettingStore: ProgramConfigurationSettingStore,
     appearanceSettingCall: AppearanceSettingCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
index 1c559615c6..5bc8d9ccda 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/DataSetSettingsObjectRepository.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.DataSetSettingCall
 import org.hisp.dhis.android.core.settings.internal.DataSetSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class DataSetSettingsObjectRepository @Inject internal constructor(
+@Singleton(binds = [DataSetSettingsObjectRepository::class])
+class DataSetSettingsObjectRepository internal constructor(
     private val store: DataSetSettingStore,
     dataSetSettingCall: DataSetSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<DataSetSettings>(dataSetSettingCall),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
index aae5118d06..0191b460c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingStore
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class GeneralSettingObjectRepository @Inject internal constructor(
+@Singleton(binds = [GeneralSettingObjectRepository::class])
+class GeneralSettingObjectRepository internal constructor(
     private val store: GeneralSettingStore,
     private val syncStore: SynchronizationSettingStore,
     generalSettingCall: GeneralSettingCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
index 369b30fdf1..2ead9c3676 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/LatestAppVersionObjectRepository.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.LatestAppVersionCall
 import org.hisp.dhis.android.core.settings.internal.LatestAppVersionStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class LatestAppVersionObjectRepository @Inject internal constructor(
+@Singleton(binds = [LatestAppVersionObjectRepository::class])
+class LatestAppVersionObjectRepository internal constructor(
     private val store: LatestAppVersionStore,
     latestAppVersionCall: LatestAppVersionCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<LatestAppVersion>(latestAppVersionCall),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
index d2bf794c88..cab9d31d6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ProgramSettingsObjectRepository.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.ProgramSettingCall
 import org.hisp.dhis.android.core.settings.internal.ProgramSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class ProgramSettingsObjectRepository @Inject internal constructor(
+@Singleton(binds = [ProgramSettingsObjectRepository::class])
+class ProgramSettingsObjectRepository internal constructor(
     private val store: ProgramSettingStore,
     programSettingCall: ProgramSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<ProgramSettings>(programSettingCall),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SettingsDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SettingsDIModule.kt
new file mode 100644
index 0000000000..461b2dfbe7
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SettingsDIModule.kt
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.settings
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class SettingsDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
index 898eebaf6c..57ad26813f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SynchronizationSettingObjectRepository.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingCall
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SynchronizationSettingObjectRepository @Inject internal constructor(
+@Singleton(binds = [SynchronizationSettingObjectRepository::class])
+class SynchronizationSettingObjectRepository internal constructor(
     private val syncStore: SynchronizationSettingStore,
     private val dataSetSettingsRepository: DataSetSettingsObjectRepository,
     private val programSettingsRepository: ProgramSettingsObjectRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
index 66e86dc4d0..c6cd919f98 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/SystemSettingCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.`object`.ReadOnlyOneObjectRe
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.settings.SystemSetting.SystemSettingKey
 import org.hisp.dhis.android.core.settings.internal.SystemSettingStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SystemSettingCollectionRepository @Inject internal constructor(
+@Singleton
+class SystemSettingCollectionRepository internal constructor(
     store: SystemSettingStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
index ba84c1eb20..9b7de327a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/UserSettingsObjectRepository.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
 import org.hisp.dhis.android.core.settings.internal.UserSettingsStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class UserSettingsObjectRepository @Inject internal constructor(
+@Singleton(binds = [UserSettingsObjectRepository::class])
+class UserSettingsObjectRepository internal constructor(
     private val store: UserSettingsStore,
     generalSettingCall: GeneralSettingCall,
 ) : ReadOnlyAnyObjectWithDownloadRepositoryImpl<UserSettings>(generalSettingCall),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
index a50e12bad4..fefb0d06de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationSettingHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsDhisVisualizationSettingHandler @Inject constructor(
+@Singleton
+internal class AnalyticsDhisVisualizationSettingHandler(
     store: AnalyticsDhisVisualizationStore,
 ) : ObjectWithoutUidHandlerImpl<AnalyticsDhisVisualization>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
index 12e2b44178..46b703c7aa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsDhisVisualizationStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsDhisVisualizationStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
index 5fb21a0252..713c15b66b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingCall.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualization
 import org.hisp.dhis.android.core.settings.AnalyticsSettings
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class AnalyticsSettingCall @Inject constructor(
+@Singleton
+internal class AnalyticsSettingCall(
     private val analyticsTeiSettingHandler: AnalyticsTeiSettingHandler,
     private val analyticsDhisVisualizationsSettingHandler: AnalyticsDhisVisualizationSettingHandler,
     private val settingAppService: SettingAppService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
deleted file mode 100644
index a48e51ef63..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsSettingEntityDIModule.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class AnalyticsSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun analyticsSettingStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiSettingStore {
-        return AnalyticsTeiSettingStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsDhisVisualizationStore(databaseAdapter: DatabaseAdapter): AnalyticsDhisVisualizationStore {
-        return AnalyticsDhisVisualizationStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiDataElementStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiDataElementStore {
-        return AnalyticsTeiDataElementStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiIndicatorStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiIndicatorStore {
-        return AnalyticsTeiIndicatorStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiAttributeStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiAttributeStore {
-        return AnalyticsTeiAttributeStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun analyticsTeiWHONutritionDataStore(databaseAdapter: DatabaseAdapter): AnalyticsTeiWHONutritionDataStore {
-        return AnalyticsTeiWHONutritionDataStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
index c254d4f5ba..e77b2f15cb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsTeiAttributeHandler @Inject constructor(
+@Singleton
+internal class AnalyticsTeiAttributeHandler(
     store: AnalyticsTeiAttributeStore,
 ) : LinkHandlerImpl<AnalyticsTeiAttribute, AnalyticsTeiAttribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
index d1098987e2..3cf5523688 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiAttributeStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsTeiAttributeStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
index d3f451c990..a32dae6524 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataChildrenAppender.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.settings.AnalyticsTeiAttribute
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.hisp.dhis.android.core.settings.internal.SettingsAppHelper.buildAnalyticsTeiSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsTeiDataChildrenAppender @Inject constructor(
+@Singleton
+internal class AnalyticsTeiDataChildrenAppender(
     databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<AnalyticsTeiSetting>() {
     private val analyticsTeiDataElementStore = AnalyticsTeiDataElementStoreImpl(databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
index 7cc7d5f0e4..0c7558bdb1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsTeiDataElementHandler @Inject constructor(
+@Singleton
+internal class AnalyticsTeiDataElementHandler(
     store: AnalyticsTeiDataElementStore,
 ) : LinkHandlerImpl<AnalyticsTeiDataElement, AnalyticsTeiDataElement>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
index ca14be182e..52d85842a6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiDataElementStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElementTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsTeiDataElementStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
index fca605c530..07fdd2594b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsTeiIndicatorHandler @Inject constructor(
+@Singleton
+internal class AnalyticsTeiIndicatorHandler(
     store: AnalyticsTeiIndicatorStore,
 ) : LinkHandlerImpl<AnalyticsTeiIndicator, AnalyticsTeiIndicator>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
index 061fea00c2..ea81feca82 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiIndicatorStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicatorTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsTeiIndicatorStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
index 7e88551ca3..26c5c5427b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsTeiSettingHandler @Inject constructor(
+@Singleton
+internal class AnalyticsTeiSettingHandler(
     store: AnalyticsTeiSettingStore,
     private val teiDataElementHandler: AnalyticsTeiDataElementHandler,
     private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
index 591306a863..138de141c5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiSettingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSetting
 import org.hisp.dhis.android.core.settings.AnalyticsTeiSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsTeiSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
index 26e6007bb5..40d9b059ce 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataHandler.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElement
 import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicator
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionItem
 import org.hisp.dhis.android.core.settings.WHONutritionComponent
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AnalyticsTeiWHONutritionDataHandler @Inject constructor(
+@Singleton
+internal class AnalyticsTeiWHONutritionDataHandler(
     store: AnalyticsTeiWHONutritionDataStore,
     private val teiDataElementHandler: AnalyticsTeiDataElementHandler,
     private val teiIndicatorHandler: AnalyticsTeiIndicatorHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
index 4feac35168..c538ccdc2d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AnalyticsTeiWHONutritionDataStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionData
 import org.hisp.dhis.android.core.settings.AnalyticsTeiWHONutritionDataTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AnalyticsTeiWHONutritionDataStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
index 6150b28d08..260bc06d67 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/AppearanceSettingCall.kt
@@ -28,17 +28,16 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.AppearanceSettings
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class AppearanceSettingCall @Inject constructor(
+@Singleton
+internal class AppearanceSettingCall(
     private val filterSettingHandler: FilterSettingHandler,
     private val programConfigurationSettingHandler: ProgramConfigurationSettingHandler,
     private val settingAppService: SettingAppService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
index 4f79a49d5b..3483d68dd0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.DataSetSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetSettingCall @Inject constructor(
+@Singleton
+internal class DataSetSettingCall(
     private val dataSetSettingHandler: DataSetSettingHandler,
     private val settingAppService: SettingAppService,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt
deleted file mode 100644
index 665841f0e1..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetSettingEntityDIModule {
-    @Provides
-    @Reusable
-    fun dataSetSettingStore(databaseAdapter: DatabaseAdapter): DataSetSettingStore {
-        return DataSetSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
index fdba162a3c..20dce4b24f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.DataSetSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetSettingHandler @Inject constructor(
+@Singleton
+internal class DataSetSettingHandler(
     store: DataSetSettingStore,
 ) : ObjectWithoutUidHandlerImpl<DataSetSetting>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
index 29c11ad5bb..98266b36b1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/DataSetSettingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.DataSetSetting
 import org.hisp.dhis.android.core.settings.DataSetSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetSettingStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt
deleted file mode 100644
index c5e876d331..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingEntityDIModule.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class FilterSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): FilterSettingStore {
-        return FilterSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
index 21677335d9..da9c7cb9c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.FilterSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class FilterSettingHandler @Inject constructor(
+@Singleton
+internal class FilterSettingHandler(
     store: FilterSettingStore,
 ) : ObjectWithoutUidHandlerImpl<FilterSetting>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
index 4db3d28ede..5a5bea5018 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/FilterSettingStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.FilterSetting
 import org.hisp.dhis.android.core.settings.FilterSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class FilterSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
index 6443e00e30..42bbc74cb6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.GeneralSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class GeneralSettingCall @Inject constructor(
+@Singleton
+internal class GeneralSettingCall(
     private val generalSettingHandler: GeneralSettingHandler,
     private val settingAppService: SettingAppService,
     private val appVersionManager: SettingsAppInfoManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt
deleted file mode 100644
index cbc1363fa0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingEntityDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class GeneralSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun generalSettingStore(databaseAdapter: DatabaseAdapter): GeneralSettingStore {
-        return GeneralSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
index 6f6a9846ad..a7d4d59023 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.GeneralSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class GeneralSettingHandler @Inject constructor(store: GeneralSettingStore) :
+@Singleton
+internal class GeneralSettingHandler(store: GeneralSettingStore) :
     ObjectWithoutUidHandlerImpl<GeneralSettings>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<GeneralSettings>): Collection<GeneralSettings> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
index c3fac7b89c..eb8a838c75 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.GeneralSettingTableInfo
 import org.hisp.dhis.android.core.settings.GeneralSettings
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class GeneralSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
index 0640909566..3a129961ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionCall.kt
@@ -28,15 +28,14 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.LatestAppVersion
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LatestAppVersionCall @Inject constructor(
+@Singleton
+internal class LatestAppVersionCall(
     private val latestAppVersionHandler: LatestAppVersionHandler,
     private val settingAppService: SettingAppService,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt
deleted file mode 100644
index db61bd54aa..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionDIModule.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class LatestAppVersionDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): LatestAppVersionStore {
-        return LatestAppVersionStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
index faba797617..6c397ca981 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.LatestAppVersion
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LatestAppVersionHandler @Inject constructor(store: LatestAppVersionStore) :
+@Singleton
+internal class LatestAppVersionHandler(store: LatestAppVersionStore) :
     ObjectWithoutUidHandlerImpl<LatestAppVersion>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<LatestAppVersion>): Collection<LatestAppVersion> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
index 2dd97bfe8b..c7d931dcd5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/LatestAppVersionStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.LatestAppVersion
 import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class LatestAppVersionStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt
deleted file mode 100644
index 51b9d1b270..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingEntityDIModule.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramConfigurationSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ProgramConfigurationSettingStore {
-        return ProgramConfigurationSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
index 2b86def64c..585977b866 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramConfigurationSettingHandler @Inject constructor(
+@Singleton
+internal class ProgramConfigurationSettingHandler(
     store: ProgramConfigurationSettingStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramConfigurationSetting>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
index 4a2d9ce5b4..77c67c22fe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramConfigurationSettingStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSetting
 import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramConfigurationSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
index b137c9c7bc..61ff36ca13 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.ProgramSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramSettingCall @Inject constructor(
+@Singleton
+internal class ProgramSettingCall(
     private val programSettingHandler: ProgramSettingHandler,
     private val settingAppService: SettingAppService,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt
deleted file mode 100644
index 9d6203d715..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ProgramSettingEntityDIModule {
-    @Provides
-    @Reusable
-    fun programSettingStore(databaseAdapter: DatabaseAdapter): ProgramSettingStore {
-        return ProgramSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
index 168e783869..b8316cc9cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.ProgramSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramSettingHandler @Inject constructor(store: ProgramSettingStore) :
+@Singleton
+internal class ProgramSettingHandler(store: ProgramSettingStore) :
     ObjectWithoutUidHandlerImpl<ProgramSetting>(store) {
 
     override fun beforeCollectionHandled(oCollection: Collection<ProgramSetting>): Collection<ProgramSetting> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
index 4f5f60b573..8d2df093d0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/ProgramSettingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ProgramSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ProgramSettingStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
index ef6aeb1102..31d96802de 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingAppService.kt
@@ -35,9 +35,10 @@ import org.hisp.dhis.android.core.settings.LatestAppVersion
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.SettingsAppInfo
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class SettingAppService @Inject constructor(
+@Singleton
+internal class SettingAppService(
     private val settingService: SettingService,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
index 0552e6f260..cd8bff060e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleDownloader.kt
@@ -27,12 +27,11 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SettingModuleDownloader @Inject constructor(
+@Singleton
+internal class SettingModuleDownloader(
     private val systemSettingCall: SystemSettingCall,
     private val generalSettingCall: GeneralSettingCall,
     private val synchronizationSettingCall: SynchronizationSettingCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.java
deleted file mode 100644
index 6f170e9100..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.settings.internal;
-
-import org.hisp.dhis.android.core.settings.AppearanceSettingsObjectRepository;
-import org.hisp.dhis.android.core.settings.AnalyticsSettingObjectRepository;
-import org.hisp.dhis.android.core.settings.DataSetSettingsObjectRepository;
-import org.hisp.dhis.android.core.settings.GeneralSettingObjectRepository;
-import org.hisp.dhis.android.core.settings.LatestAppVersionObjectRepository;
-import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository;
-import org.hisp.dhis.android.core.settings.SettingModule;
-import org.hisp.dhis.android.core.settings.SynchronizationSettingObjectRepository;
-import org.hisp.dhis.android.core.settings.SystemSettingCollectionRepository;
-import org.hisp.dhis.android.core.settings.UserSettingsObjectRepository;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class SettingModuleImpl implements SettingModule {
-
-    private final SystemSettingCollectionRepository systemSetting;
-
-    private final GeneralSettingObjectRepository generalSetting;
-    private final DataSetSettingsObjectRepository dataSetSetting;
-    private final ProgramSettingsObjectRepository programSetting;
-    private final SynchronizationSettingObjectRepository synchronizationSetting;
-    private final AnalyticsSettingObjectRepository analyticsSetting;
-    private final UserSettingsObjectRepository userSettings;
-    private final AppearanceSettingsObjectRepository appearanceSettings;
-    private final LatestAppVersionObjectRepository latestAppVersion;
-
-    @Inject
-    SettingModuleImpl(SystemSettingCollectionRepository systemSettingRepository,
-                      GeneralSettingObjectRepository generalSetting,
-                      DataSetSettingsObjectRepository dataSetSetting,
-                      ProgramSettingsObjectRepository programSetting,
-                      SynchronizationSettingObjectRepository synchronizationSetting,
-                      AnalyticsSettingObjectRepository analyticsSetting,
-                      UserSettingsObjectRepository userSettings,
-                      AppearanceSettingsObjectRepository appearanceSettings,
-                      LatestAppVersionObjectRepository latestAppVersion) {
-        this.systemSetting = systemSettingRepository;
-        this.generalSetting = generalSetting;
-        this.dataSetSetting = dataSetSetting;
-        this.programSetting = programSetting;
-        this.synchronizationSetting = synchronizationSetting;
-        this.analyticsSetting = analyticsSetting;
-        this.userSettings = userSettings;
-        this.appearanceSettings = appearanceSettings;
-        this.latestAppVersion = latestAppVersion;
-    }
-
-    @Override
-    public SystemSettingCollectionRepository systemSetting() {
-        return systemSetting;
-    }
-
-    @Override
-    public GeneralSettingObjectRepository generalSetting() {
-        return generalSetting;
-    }
-
-    @Override
-    public DataSetSettingsObjectRepository dataSetSetting() {
-        return dataSetSetting;
-    }
-
-    @Override
-    public ProgramSettingsObjectRepository programSetting() {
-        return programSetting;
-    }
-
-    @Override
-    public SynchronizationSettingObjectRepository synchronizationSettings() {
-        return synchronizationSetting;
-    }
-
-    @Override
-    public AnalyticsSettingObjectRepository analyticsSetting() {
-        return analyticsSetting;
-    }
-
-    @Override
-    public UserSettingsObjectRepository userSettings() {
-        return userSettings;
-    }
-
-    @Override
-    public AppearanceSettingsObjectRepository appearanceSettings() {
-        return appearanceSettings;
-    }
-
-    @Override
-    public LatestAppVersionObjectRepository latestAppVersion() {
-        return latestAppVersion;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.kt
new file mode 100644
index 0000000000..964c91b06c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleImpl.kt
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.settings.internal
+
+import org.hisp.dhis.android.core.settings.AnalyticsSettingObjectRepository
+import org.hisp.dhis.android.core.settings.AppearanceSettingsObjectRepository
+import org.hisp.dhis.android.core.settings.DataSetSettingsObjectRepository
+import org.hisp.dhis.android.core.settings.GeneralSettingObjectRepository
+import org.hisp.dhis.android.core.settings.LatestAppVersionObjectRepository
+import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
+import org.hisp.dhis.android.core.settings.SettingModule
+import org.hisp.dhis.android.core.settings.SynchronizationSettingObjectRepository
+import org.hisp.dhis.android.core.settings.SystemSettingCollectionRepository
+import org.hisp.dhis.android.core.settings.UserSettingsObjectRepository
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class SettingModuleImpl(
+    private val systemSetting: SystemSettingCollectionRepository,
+    private val generalSetting: GeneralSettingObjectRepository,
+    private val dataSetSetting: DataSetSettingsObjectRepository,
+    private val programSetting: ProgramSettingsObjectRepository,
+    private val synchronizationSetting: SynchronizationSettingObjectRepository,
+    private val analyticsSetting: AnalyticsSettingObjectRepository,
+    private val userSettings: UserSettingsObjectRepository,
+    private val appearanceSettings: AppearanceSettingsObjectRepository,
+    private val latestAppVersion: LatestAppVersionObjectRepository,
+) : SettingModule {
+    override fun systemSetting(): SystemSettingCollectionRepository {
+        return systemSetting
+    }
+
+    override fun generalSetting(): GeneralSettingObjectRepository {
+        return generalSetting
+    }
+
+    override fun dataSetSetting(): DataSetSettingsObjectRepository {
+        return dataSetSetting
+    }
+
+    override fun programSetting(): ProgramSettingsObjectRepository {
+        return programSetting
+    }
+
+    override fun synchronizationSettings(): SynchronizationSettingObjectRepository {
+        return synchronizationSetting
+    }
+
+    override fun analyticsSetting(): AnalyticsSettingObjectRepository {
+        return analyticsSetting
+    }
+
+    override fun userSettings(): UserSettingsObjectRepository {
+        return userSettings
+    }
+
+    override fun appearanceSettings(): AppearanceSettingsObjectRepository {
+        return appearanceSettings
+    }
+
+    override fun latestAppVersion(): LatestAppVersionObjectRepository {
+        return latestAppVersion
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleWiper.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleWiper.kt
index 19bc35bd4c..68f94d3594 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingModuleWiper.kt
@@ -25,59 +25,48 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.settings.internal;
+package org.hisp.dhis.android.core.settings.internal
 
-import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationTableInfo;
-import org.hisp.dhis.android.core.settings.AnalyticsTeiAttributeTableInfo;
-import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElementTableInfo;
-import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicatorTableInfo;
-import org.hisp.dhis.android.core.settings.AnalyticsTeiSettingTableInfo;
-import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo;
-import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo;
-import org.hisp.dhis.android.core.settings.DataSetSettingTableInfo;
-import org.hisp.dhis.android.core.settings.FilterSettingTableInfo;
-import org.hisp.dhis.android.core.settings.GeneralSettingTableInfo;
-import org.hisp.dhis.android.core.settings.ProgramSettingTableInfo;
-import org.hisp.dhis.android.core.settings.SynchronizationSettingTableInfo;
-import org.hisp.dhis.android.core.settings.SystemSettingTableInfo;
-import org.hisp.dhis.android.core.settings.UserSettingsTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
+import org.hisp.dhis.android.core.settings.AnalyticsDhisVisualizationTableInfo
+import org.hisp.dhis.android.core.settings.AnalyticsTeiAttributeTableInfo
+import org.hisp.dhis.android.core.settings.AnalyticsTeiDataElementTableInfo
+import org.hisp.dhis.android.core.settings.AnalyticsTeiIndicatorTableInfo
+import org.hisp.dhis.android.core.settings.AnalyticsTeiSettingTableInfo
+import org.hisp.dhis.android.core.settings.DataSetSettingTableInfo
+import org.hisp.dhis.android.core.settings.FilterSettingTableInfo
+import org.hisp.dhis.android.core.settings.GeneralSettingTableInfo
+import org.hisp.dhis.android.core.settings.LatestAppVersionTableInfo
+import org.hisp.dhis.android.core.settings.ProgramConfigurationSettingTableInfo
+import org.hisp.dhis.android.core.settings.ProgramSettingTableInfo
+import org.hisp.dhis.android.core.settings.SynchronizationSettingTableInfo
+import org.hisp.dhis.android.core.settings.SystemSettingTableInfo
+import org.hisp.dhis.android.core.settings.UserSettingsTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class SettingModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    SettingModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTable(SystemSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(GeneralSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(DataSetSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(ProgramSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(SynchronizationSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(FilterSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(ProgramConfigurationSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(AnalyticsTeiSettingTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(AnalyticsTeiDataElementTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(AnalyticsTeiIndicatorTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(AnalyticsTeiAttributeTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(UserSettingsTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(AnalyticsDhisVisualizationTableInfo.TABLE_INFO);
-        tableWiper.wipeTable(LatestAppVersionTableInfo.TABLE_INFO);
+@Singleton
+internal class SettingModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTable(SystemSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(GeneralSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(DataSetSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(ProgramSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(SynchronizationSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(FilterSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(ProgramConfigurationSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(AnalyticsTeiSettingTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(AnalyticsTeiDataElementTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(AnalyticsTeiIndicatorTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(AnalyticsTeiAttributeTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(UserSettingsTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(AnalyticsDhisVisualizationTableInfo.TABLE_INFO)
+        tableWiper.wipeTable(LatestAppVersionTableInfo.TABLE_INFO)
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No data to wipe
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt
deleted file mode 100644
index 6d8b365c33..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingPackageDIModule.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.settings.SettingModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        AnalyticsSettingEntityDIModule::class,
-        GeneralSettingEntityDIModule::class,
-        DataSetSettingEntityDIModule::class,
-        ProgramSettingEntityDIModule::class,
-        UserSettingsEntityDIModule::class,
-        SynchronizationSettingEntityDIModule::class,
-        FilterSettingEntityDIModule::class,
-        SystemSettingEntityDIModule::class,
-        ProgramConfigurationSettingEntityDIModule::class,
-        LatestAppVersionDIModule::class,
-    ],
-)
-internal class SettingPackageDIModule {
-
-    @Provides
-    @Reusable
-    fun settingService(retrofit: Retrofit): SettingService {
-        return retrofit.create(SettingService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun settingAppService(settingService: SettingService): SettingAppService {
-        return SettingAppService(settingService)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: SettingModuleImpl): SettingModule {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun versionManager(impl: SettingsAppInfoManagerImpl): SettingsAppInfoManager {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
index 295e2c52ff..4e892287c6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoCall.kt
@@ -28,14 +28,13 @@
 package org.hisp.dhis.android.core.settings.internal
 
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class SettingsAppInfoCall @Inject constructor(
+@Singleton
+internal class SettingsAppInfoCall(
     private val settingAppService: SettingAppService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
index f96caa6f90..c00095b340 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SettingsAppInfoManagerImpl.kt
@@ -29,11 +29,10 @@ package org.hisp.dhis.android.core.settings.internal
 
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
-import javax.inject.Inject
-import javax.inject.Singleton
+import org.koin.core.annotation.Singleton
 
 @Singleton
-internal class SettingsAppInfoManagerImpl @Inject constructor(
+internal class SettingsAppInfoManagerImpl(
     private val settingsAppInfoCall: SettingsAppInfoCall,
 ) : SettingsAppInfoManager {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
index 55e8e2ee00..9476897917 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingCall.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class SynchronizationSettingCall @Inject constructor(
+@Singleton
+internal class SynchronizationSettingCall(
     private val synchronizationSettingHandler: SynchronizationSettingHandler,
     private val settingAppService: SettingAppService,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt
deleted file mode 100644
index aa0d8c7ff3..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingEntityDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class SynchronizationSettingEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SynchronizationSettingStore {
-        return SynchronizationSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
index 2694f881fe..ebff36f295 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SynchronizationSettingHandler @Inject constructor(
+@Singleton
+internal class SynchronizationSettingHandler(
     store: SynchronizationSettingStore,
     private val dataSetSettingHandler: DataSetSettingHandler,
     private val programSettingHandler: ProgramSettingHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
index 78a0480ad2..bcffc16a46 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SynchronizationSettingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.SynchronizationSettingTableInfo
 import org.hisp.dhis.android.core.settings.SynchronizationSettings
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class SynchronizationSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
index c3d3ab78cf..09648ddbd4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingCall.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallCoroutines
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.internal.SystemSettingsFields.allFields
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SystemSettingCall @Inject constructor(
+@Singleton
+internal class SystemSettingCall(
     private val apiDownloader: APIDownloader,
     private val handler: SystemSettingHandler,
     private val service: SettingService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
deleted file mode 100644
index c03526af2e..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class SystemSettingEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): SystemSettingStore {
-        return SystemSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
index cedf263a91..c21375c60d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.SystemSetting
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SystemSettingHandler @Inject constructor(
+@Singleton
+internal class SystemSettingHandler(
     store: SystemSettingStore,
 ) : ObjectWithoutUidHandlerImpl<SystemSetting>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
index 9782d32178..ba2d702d8b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.SystemSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SystemSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : SystemSettingStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt
index a104c48103..1fc6606b85 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/SystemSettingsSplitter.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.settings.SystemSetting
 import org.hisp.dhis.android.core.settings.SystemSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SystemSettingsSplitter @Inject constructor() {
+@Singleton
+internal class SystemSettingsSplitter {
     fun splitSettings(settings: SystemSettings): List<SystemSetting> {
         val flag = SystemSetting.builder()
             .key(SystemSetting.SystemSettingKey.FLAG)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
index b610bb7a7e..a3f10c89b5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.ObjectCall
 import org.hisp.dhis.android.core.settings.UserSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserSettingsCall @Inject internal constructor(
+@Singleton
+internal class UserSettingsCall internal constructor(
     private val handler: UserSettingsHandler,
     private val service: SettingService,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
deleted file mode 100644
index 23583ef905..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.settings.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class UserSettingsEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): UserSettingsStore {
-        return UserSettingsStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
index 829b50647a..8851457ced 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.settings.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.settings.UserSettings
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserSettingsHandler @Inject constructor(
+@Singleton
+internal class UserSettingsHandler(
     store: UserSettingsStore,
 ) : ObjectWithoutUidHandlerImpl<UserSettings>(store) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
index 613c1dc0e8..95b4e0b7c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/UserSettingsStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.settings.UserSettings
 import org.hisp.dhis.android.core.settings.UserSettingsTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class UserSettingsStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : UserSettingsStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.kt
similarity index 87%
rename from core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.kt
index d834dc492c..431d4d1087 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/SmsDIModule.kt
@@ -25,14 +25,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.sms.internal
+package org.hisp.dhis.android.core.sms
 
 import android.content.Context
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.sms.SmsModule
 import org.hisp.dhis.android.core.sms.data.internal.DeviceStateRepositoryImpl
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.LocalDbRepositoryImpl
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStore
@@ -49,56 +45,45 @@ import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository
 import org.hisp.dhis.android.core.sms.domain.repository.internal.DeviceStateRepository
 import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import retrofit2.Retrofit
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 
 @Module
+@ComponentScan
 internal class SmsDIModule {
-    @Provides
+    @Singleton
     fun deviceStateRepository(context: Context): DeviceStateRepository {
         return DeviceStateRepositoryImpl(context)
     }
 
-    @Provides
+    @Singleton
     fun localDbRepository(impl: LocalDbRepositoryImpl): LocalDbRepository {
         return impl
     }
 
-    @Provides
+    @Singleton
     fun smsRepository(context: Context): SmsRepository {
         return SmsRepositoryImpl(context)
     }
 
-    @Provides
+    @Singleton
     fun webApiRepository(apiService: ApiService, dhisVersionManager: DHISVersionManager): WebApiRepository {
         return WebApiRepositoryImpl(apiService, dhisVersionManager)
     }
 
-    @Provides
-    @Reusable
+    @Singleton
     fun smsMetadataIdStore(databaseAdapter: DatabaseAdapter): SMSMetadataIdStore {
         return SMSMetadataIdStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
+    @Singleton
     fun smsConfigStore(databaseAdapter: DatabaseAdapter): SMSConfigStore {
         return SMSConfigStoreImpl(databaseAdapter)
     }
 
-    @Provides
-    @Reusable
+    @Singleton
     fun smsOngoingSubmissionStore(databaseAdapter: DatabaseAdapter): SMSOngoingSubmissionStore {
         return SMSOngoingSubmissionStoreImpl(databaseAdapter)
     }
-
-    @Provides
-    fun apiService(retrofit: Retrofit): ApiService {
-        return retrofit.create(ApiService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: SmsModuleImpl): SmsModule {
-        return impl
-    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/DataSetsStore.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/DataSetsStore.java
index 93a594d68a..a73ae61044 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/DataSetsStore.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/DataSetsStore.java
@@ -40,22 +40,19 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import io.reactivex.Completable;
 import io.reactivex.Single;
 
-class DataSetsStore {
+public class DataSetsStore {
     private final DataValueModule dataValueModule;
     private final DataValueStore dataValueStore;
     private final DataSetCompleteRegistrationStore dataSetStore;
     private final DataSetCompleteRegistrationCollectionRepository completeRegistrationRepository;
 
-    @Inject
-    DataSetsStore(DataValueModule dataValueModule,
-                  DataValueStore dataValueStore,
-                  DataSetCompleteRegistrationStore dataSetStore,
-                  DataSetCompleteRegistrationCollectionRepository completeRegistrationRepository) {
+    public DataSetsStore(DataValueModule dataValueModule,
+                         DataValueStore dataValueStore,
+                         DataSetCompleteRegistrationStore dataSetStore,
+                         DataSetCompleteRegistrationCollectionRepository completeRegistrationRepository) {
         this.dataValueModule = dataValueModule;
         this.dataValueStore = dataValueStore;
         this.dataSetStore = dataSetStore;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/FileResourceCleaner.java b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/FileResourceCleaner.java
index ac810060fd..9cafcac57b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/FileResourceCleaner.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/FileResourceCleaner.java
@@ -42,19 +42,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import io.reactivex.Single;
 
-class FileResourceCleaner {
+public class FileResourceCleaner {
     private final DataElementModule dataElementModule;
     private final TrackedEntityModule trackedEntityModule;
     private final FileResourceModule fileResourceModule;
 
-    @Inject
-    FileResourceCleaner(DataElementModule dataElementModule,
-                        TrackedEntityModule trackedEntityModule,
-                        FileResourceModule fileResourceModule) {
+    public FileResourceCleaner(DataElementModule dataElementModule,
+                               TrackedEntityModule trackedEntityModule,
+                               FileResourceModule fileResourceModule) {
         this.dataElementModule = dataElementModule;
         this.trackedEntityModule = trackedEntityModule;
         this.fileResourceModule = fileResourceModule;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
index e51d0442a7..f4a2e42195 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/LocalDbRepositoryImpl.kt
@@ -58,10 +58,11 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityModule
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.user.AuthenticatedUserObjectRepository
 import org.hisp.dhis.smscompression.models.SMSMetadata
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
-internal class LocalDbRepositoryImpl @Inject constructor(
+internal class LocalDbRepositoryImpl(
     private val userRepository: AuthenticatedUserObjectRepository,
     private val trackedEntityModule: TrackedEntityModule,
     private val eventModule: EventModule,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
index ee221b3bb0..fe256d22ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/MetadataIdsStore.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.smscompression.SMSConsts
 import org.hisp.dhis.smscompression.models.SMSMetadata
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class MetadataIdsStore @Inject constructor(
+@Singleton
+internal class MetadataIdsStore(
     private val smsMetadataIdsStore: SMSMetadataIdStore,
     private val smsConfigStore: SMSConfigStore,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
index 8e053ba439..57c54d7ba0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/data/localdbrepository/internal/OngoingSubmissionsStore.kt
@@ -29,16 +29,15 @@ package org.hisp.dhis.android.core.sms.data.localdbrepository.internal
 
 import android.util.Log
 import android.util.Pair
-import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository.TooManySubmissionsException
 import org.hisp.dhis.android.core.sms.domain.repository.internal.SubmissionType
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OngoingSubmissionsStore @Inject constructor(
+@Singleton
+internal class OngoingSubmissionsStore(
     private val smsOngoingSubmissionStore: SMSOngoingSubmissionStore,
     private val smsConfigStore: SMSConfigStore,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt
index 5640d5e793..5fd09559c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SMSModuleWiper.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.sms.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigTableInfo
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdTableInfo
 import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SMSModuleWiper @Inject internal constructor(
+@Singleton
+class SMSModuleWiper internal constructor(
     private val tableWiper: TableWiper,
 ) : ModuleWiper {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsModuleImpl.kt
similarity index 56%
rename from core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsModuleImpl.java
rename to core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsModuleImpl.kt
index 9dde26045b..71ace519f5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsModuleImpl.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/sms/internal/SmsModuleImpl.kt
@@ -25,54 +25,36 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.sms.internal;
-
-import org.hisp.dhis.android.core.sms.SmsModule;
-import org.hisp.dhis.android.core.sms.domain.interactor.ConfigCase;
-import org.hisp.dhis.android.core.sms.domain.interactor.QrCodeCase;
-import org.hisp.dhis.android.core.sms.domain.interactor.SmsSubmitCase;
-import org.hisp.dhis.android.core.sms.domain.repository.SmsRepository;
-import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository;
-import org.hisp.dhis.android.core.sms.domain.repository.internal.DeviceStateRepository;
-import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository;
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-class SmsModuleImpl implements SmsModule {
-    private final DeviceStateRepository deviceStateRepository;
-    private final LocalDbRepository localDbRepository;
-    private final SmsRepository smsRepository;
-    private final WebApiRepository webApiRepository;
-    private final DHISVersionManager dhisVersionManager;
-
-    @Inject
-    SmsModuleImpl(DeviceStateRepository deviceStateRepository, LocalDbRepository localDbRepository,
-                  SmsRepository smsRepository, WebApiRepository webApiRepository,
-                  DHISVersionManager dhisVersionManager) {
-        this.deviceStateRepository = deviceStateRepository;
-        this.localDbRepository = localDbRepository;
-        this.smsRepository = smsRepository;
-        this.webApiRepository = webApiRepository;
-        this.dhisVersionManager = dhisVersionManager;
-    }
-
-    @Override
-    public ConfigCase configCase() {
-        return new ConfigCase(webApiRepository, localDbRepository);
+package org.hisp.dhis.android.core.sms.internal
+
+import org.hisp.dhis.android.core.sms.SmsModule
+import org.hisp.dhis.android.core.sms.domain.interactor.ConfigCase
+import org.hisp.dhis.android.core.sms.domain.interactor.QrCodeCase
+import org.hisp.dhis.android.core.sms.domain.interactor.SmsSubmitCase
+import org.hisp.dhis.android.core.sms.domain.repository.SmsRepository
+import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository
+import org.hisp.dhis.android.core.sms.domain.repository.internal.DeviceStateRepository
+import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository
+import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class SmsModuleImpl(
+    private val deviceStateRepository: DeviceStateRepository,
+    private val localDbRepository: LocalDbRepository,
+    private val smsRepository: SmsRepository,
+    private val webApiRepository: WebApiRepository,
+    private val dhisVersionManager: DHISVersionManager,
+) : SmsModule {
+    override fun configCase(): ConfigCase {
+        return ConfigCase(webApiRepository, localDbRepository)
     }
 
-    @Override
-    public QrCodeCase qrCodeCase() {
-        return new QrCodeCase(localDbRepository, dhisVersionManager);
+    override fun qrCodeCase(): QrCodeCase {
+        return QrCodeCase(localDbRepository, dhisVersionManager)
     }
 
-    @Override
-    public SmsSubmitCase smsSubmitCase() {
-        return new SmsSubmitCase(localDbRepository, smsRepository, deviceStateRepository, dhisVersionManager);
+    override fun smsSubmitCase(): SmsSubmitCase {
+        return SmsSubmitCase(localDbRepository, smsRepository, deviceStateRepository, dhisVersionManager)
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoDIModule.kt
new file mode 100644
index 0000000000..5e106b885f
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoDIModule.kt
@@ -0,0 +1,88 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.systeminfo
+
+import android.content.Context
+import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.sms.data.internal.DeviceStateRepositoryImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.LocalDbRepositoryImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSConfigStoreImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSMetadataIdStoreImpl
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStore
+import org.hisp.dhis.android.core.sms.data.localdbrepository.internal.SMSOngoingSubmissionStoreImpl
+import org.hisp.dhis.android.core.sms.data.smsrepository.internal.SmsRepositoryImpl
+import org.hisp.dhis.android.core.sms.data.webapirepository.internal.ApiService
+import org.hisp.dhis.android.core.sms.data.webapirepository.internal.WebApiRepositoryImpl
+import org.hisp.dhis.android.core.sms.domain.repository.SmsRepository
+import org.hisp.dhis.android.core.sms.domain.repository.WebApiRepository
+import org.hisp.dhis.android.core.sms.domain.repository.internal.DeviceStateRepository
+import org.hisp.dhis.android.core.sms.domain.repository.internal.LocalDbRepository
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
+
+@Module
+@ComponentScan
+internal class SystemInfoDIModule {
+    @Singleton
+    fun deviceStateRepository(context: Context): DeviceStateRepository {
+        return DeviceStateRepositoryImpl(context)
+    }
+
+    @Singleton
+    fun localDbRepository(impl: LocalDbRepositoryImpl): LocalDbRepository {
+        return impl
+    }
+
+    @Singleton
+    fun smsRepository(context: Context): SmsRepository {
+        return SmsRepositoryImpl(context)
+    }
+
+    @Singleton
+    fun webApiRepository(apiService: ApiService, dhisVersionManager: DHISVersionManager): WebApiRepository {
+        return WebApiRepositoryImpl(apiService, dhisVersionManager)
+    }
+
+    @Singleton
+    fun smsMetadataIdStore(databaseAdapter: DatabaseAdapter): SMSMetadataIdStore {
+        return SMSMetadataIdStoreImpl(databaseAdapter)
+    }
+
+    @Singleton
+    fun smsConfigStore(databaseAdapter: DatabaseAdapter): SMSConfigStore {
+        return SMSConfigStoreImpl(databaseAdapter)
+    }
+
+    @Singleton
+    fun smsOngoingSubmissionStore(databaseAdapter: DatabaseAdapter): SMSOngoingSubmissionStore {
+        return SMSOngoingSubmissionStoreImpl(databaseAdapter)
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
index 25d0aa8a97..b835ba9935 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/SystemInfoObjectRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.systeminfo
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyFi
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoCall
 import org.hisp.dhis.android.core.systeminfo.internal.SystemInfoStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SystemInfoObjectRepository @Inject internal constructor(
+@Singleton(binds = [SystemInfoObjectRepository::class])
+class SystemInfoObjectRepository internal constructor(
     store: SystemInfoStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
index 1d3e2874dc..74b0115a17 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionManagerImpl.kt
@@ -34,11 +34,10 @@ import org.hisp.dhis.android.core.systeminfo.DHISPatchVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SMSVersion
-import javax.inject.Inject
-import javax.inject.Singleton
+import org.koin.core.annotation.Singleton
 
 @Singleton
-class DHISVersionManagerImpl @Inject internal constructor(
+internal class DHISVersionManagerImpl internal constructor(
     private val systemInfoStore: SystemInfoStore,
 ) : DHISVersionManager {
     private var version: DHISVersion? = null
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
index fef2489a03..361404e417 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingCall.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class PingCall @Inject internal constructor(
+@Singleton
+class PingCall internal constructor(
     private val pingService: PingService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : DownloadProvider {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
index a1f9a6b517..e76ee45e50 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.DownloadProvider
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.resource.internal.ResourceHandler
 import org.hisp.dhis.android.core.systeminfo.DHISVersion.Companion.allowedVersionsAsStr
 import org.hisp.dhis.android.core.systeminfo.DHISVersion.Companion.isAllowedVersion
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SystemInfoCall @Inject internal constructor(
+@Singleton
+class SystemInfoCall internal constructor(
     private val systemInfoHandler: SystemInfoHandler,
     private val systemInfoService: SystemInfoService,
     private val resourceHandler: ResourceHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
index d6609a5927..9aacbc18ed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SystemInfoHandler @Inject constructor(
+@Singleton
+internal class SystemInfoHandler(
     store: SystemInfoStore,
 ) : ObjectWithoutUidHandlerImpl<SystemInfo>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
index 10fd4f6ef9..d715a13ce8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleDownloader.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedSuspendModuleDownloader
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class SystemInfoModuleDownloader @Inject internal constructor(
+@Singleton
+internal class SystemInfoModuleDownloader internal constructor(
     private val systemInfoCall: SystemInfoCall,
 ) : UntypedSuspendModuleDownloader {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
index dd4c510a34..31d14d589b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleImpl.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.systeminfo.SystemInfoModule
 import org.hisp.dhis.android.core.systeminfo.SystemInfoObjectRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class SystemInfoModuleImpl @Inject internal constructor(
+@Singleton
+internal class SystemInfoModuleImpl(
     private val versionManager: DHISVersionManager,
     private val systemInfo: SystemInfoObjectRepository,
 ) : SystemInfoModule {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.java
deleted file mode 100644
index 69c28ddfff..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.systeminfo.internal;
-
-import org.hisp.dhis.android.core.systeminfo.SystemInfoTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class SystemInfoModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    SystemInfoModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
-        tableWiper.wipeTable(SystemInfoTableInfo.TABLE_INFO);
-    }
-
-    @Override
-    public void wipeData() {
-        // No data to wipe
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.kt
similarity index 77%
rename from core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.kt
index b032d9790c..5961513949 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoModuleWiper.kt
@@ -27,17 +27,20 @@
  */
 package org.hisp.dhis.android.core.systeminfo.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import retrofit2.Retrofit
+import org.hisp.dhis.android.core.systeminfo.SystemInfoTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class PingEntityDIModule {
+@Singleton
+internal class SystemInfoModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
+        tableWiper.wipeTable(SystemInfoTableInfo.TABLE_INFO)
+    }
 
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): PingService {
-        return retrofit.create(PingService::class.java)
+    override fun wipeData() {
+        // No data to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
deleted file mode 100644
index 5aa982bafa..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoPackageDIModule.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.systeminfo.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import org.hisp.dhis.android.core.systeminfo.SystemInfoModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        PingEntityDIModule::class,
-        SystemInfoEntityDIModule::class,
-    ],
-)
-internal class SystemInfoPackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): SystemInfoService {
-        return retrofit.create(SystemInfoService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun systemInfoModule(impl: SystemInfoModuleImpl): SystemInfoModule {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun versionManager(impl: DHISVersionManagerImpl): DHISVersionManager {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
index e7e6fac3f8..b195575309 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.systeminfo.SystemInfo
 import org.hisp.dhis.android.core.systeminfo.SystemInfoTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class SystemInfoStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : SystemInfoStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
index 0eb7ff806c..af7232a62e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
@@ -41,11 +40,11 @@ import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeLegendSetChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class TrackedEntityAttributeCollectionRepository @Inject internal constructor(
+class TrackedEntityAttributeCollectionRepository internal constructor(
     store: TrackedEntityAttributeStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 1c94822fb4..229d61fa70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import kotlinx.coroutines.coroutineScope
@@ -40,7 +39,6 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.rx2.asObservable
 import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.arch.call.D2Progress
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.OrderByClauseBuilder
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
@@ -60,16 +58,17 @@ import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 import org.hisp.dhis.android.core.program.internal.ProgramTrackedEntityAttributeStore
 import org.hisp.dhis.android.core.settings.GeneralSettingObjectRepository
 import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingStore
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEndpointCallFactory
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
 @SuppressWarnings("LongParameterList", "TooManyFunctions")
-@Reusable
-class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
+@Singleton
+class TrackedEntityAttributeReservedValueManager internal constructor(
     private val store: TrackedEntityAttributeReservedValueStore,
     private val organisationUnitStore: OrganisationUnitStore,
     private val trackedEntityAttributeStore: TrackedEntityAttributeStore,
@@ -78,10 +77,7 @@ class TrackedEntityAttributeReservedValueManager @Inject internal constructor(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val generalSettingObjectRepository: GeneralSettingObjectRepository,
     private val reservedValueSettingStore: ReservedValueSettingStore,
-    private val reservedValueQueryCallFactory: QueryCallFactory<
-        TrackedEntityAttributeReservedValue,
-        TrackedEntityAttributeReservedValueQuery,
-        >,
+    private val reservedValueQueryCallFactory: TrackedEntityAttributeReservedValueEndpointCallFactory,
 ) {
     private val d2ProgressManager = D2ProgressManager(null)
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
index 7ae1fe165d..fdde08579e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeValueCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackedEntityAttributeValueCollectionRepository @Inject internal constructor(
+@Singleton
+class TrackedEntityAttributeValueCollectionRepository internal constructor(
     private val store: TrackedEntityAttributeValueStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDIModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDIModule.kt
index 729f0d2cda..e24454c366 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDIModule.kt
@@ -25,27 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.trackedentity.search
+package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
-import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceOnlineCache
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryRepositoryScope
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+import org.koin.core.annotation.Singleton
 import java.util.concurrent.TimeUnit
 
 @Module
-internal class TrackedEntityInstanceQueryEntityDIModule {
-    @Provides
-    @Reusable
+@ComponentScan
+internal class TrackedEntityDIModule {
+    @Singleton
     fun empty(): TrackedEntityInstanceQueryRepositoryScope {
         return TrackedEntityInstanceQueryRepositoryScope.empty()
     }
 
-    @Provides
-    @Reusable
+    @Singleton
     @Suppress("MagicNumber")
-    fun onlineCache(): D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult> {
-        return ExpirableCache(TimeUnit.MINUTES.toMillis(5))
+    fun onlineCache(): TrackedEntityInstanceOnlineCache {
+        return TrackedEntityInstanceOnlineCache(TimeUnit.MINUTES.toMillis(5))
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
index 29545fa89c..f02fb3fbc4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityDataValueCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilte
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackedEntityDataValueCollectionRepository @Inject internal constructor(
+@Singleton
+class TrackedEntityDataValueCollectionRepository internal constructor(
     private val store: TrackedEntityDataValueStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
index 09a4018077..8a8f9e9d38 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import io.reactivex.Observable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
@@ -55,11 +54,11 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstancePo
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceProjectionTransformer
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.tracker.importer.internal.JobQueryCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class TrackedEntityInstanceCollectionRepository @Inject internal constructor(
+class TrackedEntityInstanceCollectionRepository internal constructor(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
index 4146ce037b..d68e1522ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceFilterCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -46,11 +45,11 @@ import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFi
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterEvenFilterChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class TrackedEntityInstanceFilterCollectionRepository @Inject internal constructor(
+class TrackedEntityInstanceFilterCollectionRepository internal constructor(
     store: TrackedEntityInstanceFilterStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
index 1946cad142..c065b2c88e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityInstanceService.java
@@ -39,12 +39,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
 import io.reactivex.Single;
 
-@Reusable
 public class TrackedEntityInstanceService {
 
     private final TrackedEntityAttributeCollectionRepository trackedEntityAttributeRepository;
@@ -52,12 +48,12 @@ public class TrackedEntityInstanceService {
     private final ProgramTrackedEntityAttributeCollectionRepository programTrackedEntityAttributeRepository;
     private final FileResourceCollectionRepository fileResourceCollectionRepository;
 
-    @Inject
-    TrackedEntityInstanceService(TrackedEntityAttributeCollectionRepository trackedEntityAttributeRepository,
-                                 TrackedEntityAttributeValueCollectionRepository trackedEntityAttributeValueRepository,
-                                 ProgramTrackedEntityAttributeCollectionRepository
-                                         programTrackedEntityAttributeRepository,
-                                 FileResourceCollectionRepository fileResourceCollectionRepository) {
+    public TrackedEntityInstanceService(TrackedEntityAttributeCollectionRepository trackedEntityAttributeRepository,
+                                        TrackedEntityAttributeValueCollectionRepository
+                                                trackedEntityAttributeValueRepository,
+                                        ProgramTrackedEntityAttributeCollectionRepository
+                                                programTrackedEntityAttributeRepository,
+                                        FileResourceCollectionRepository fileResourceCollectionRepository) {
         this.trackedEntityAttributeRepository = trackedEntityAttributeRepository;
         this.trackedEntityAttributeValueRepository = trackedEntityAttributeValueRepository;
         this.programTrackedEntityAttributeRepository = programTrackedEntityAttributeRepository;
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
deleted file mode 100644
index f7e3b99463..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityPackageDIModule.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCallFactory
-import org.hisp.dhis.android.core.trackedentity.internal.AttributeValueFilterEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.ReservedValueSettingDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEndpointCallFactory
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeReservedValueQuery
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeService
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceEventFilterEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceFilterService
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceSyncEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityModuleImpl
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeService
-import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipEntityDIModule
-import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryEntityDIModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        OwnershipEntityDIModule::class,
-        ReservedValueSettingDIModule::class,
-        TrackedEntityAttributeEntityDIModule::class,
-        TrackedEntityAttributeReservedValueEntityDIModule::class,
-        TrackedEntityAttributeValueEntityDIModule::class,
-        TrackedEntityDataValueEntityDIModule::class,
-        TrackedEntityInstanceEntityDIModule::class,
-        TrackedEntityInstanceEventFilterEntityDIModule::class,
-        TrackedEntityInstanceFilterEntityDIModule::class,
-        TrackedEntityInstanceQueryEntityDIModule::class,
-        TrackedEntityInstanceSyncEntityDIModule::class,
-        TrackedEntityTypeEntityDIModule::class,
-        TrackedEntityTypeAttributeEntityDIModule::class,
-        AttributeValueFilterEntityDIModule::class,
-    ],
-)
-internal class TrackedEntityPackageDIModule {
-    @Provides
-    @Reusable
-    fun trackedEntityTypeService(retrofit: Retrofit): TrackedEntityTypeService {
-        return retrofit.create(TrackedEntityTypeService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun trackedEntityAttributeService(retrofit: Retrofit): TrackedEntityAttributeService {
-        return retrofit.create(TrackedEntityAttributeService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun dataValueCallFactory(
-        impl: TrackedEntityAttributeReservedValueEndpointCallFactory,
-    ): QueryCallFactory<TrackedEntityAttributeReservedValue, TrackedEntityAttributeReservedValueQuery> {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun trackedEntityInstanceFilterService(retrofit: Retrofit): TrackedEntityInstanceFilterService {
-        return retrofit.create(TrackedEntityInstanceFilterService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: TrackedEntityModuleImpl): TrackedEntityModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
index 9f048127e7..355e5aeb26 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeAttributeCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.IntegerFilt
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackedEntityTypeAttributeCollectionRepository @Inject internal constructor(
+@Singleton
+class TrackedEntityTypeAttributeCollectionRepository internal constructor(
     store: TrackedEntityTypeAttributeStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
index 6269348ba2..ebf6096f02 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityTypeCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.common.FeatureType
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeAttributeChildrenAppender
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeFields
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackedEntityTypeCollectionRepository @Inject internal constructor(
+@Singleton
+class TrackedEntityTypeCollectionRepository internal constructor(
     store: TrackedEntityTypeStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt
deleted file mode 100644
index fbec9c832b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class AttributeValueFilterEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): AttributeValueFilterStore {
-        return AttributeValueFilterStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
index ead0c64f5a..50c370a13f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AttributeValueFilterHandler @Inject constructor(
+@Singleton
+internal class AttributeValueFilterHandler(
     store: AttributeValueFilterStore,
 ) : ObjectWithoutUidHandlerImpl<AttributeValueFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
index 17765672c8..76aee8faf9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/AttributeValueFilterStoreImpl.kt
@@ -37,7 +37,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.common.tableinfo.ItemFilterTableInfo
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class AttributeValueFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index 0fc57778a0..2ab97ff225 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.NTIPayload
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -45,10 +44,10 @@ import org.hisp.dhis.android.core.trackedentity.search.TrackerQueryResult
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
 import org.hisp.dhis.android.core.util.simpleDateFormat
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class NewTrackedEntityEndpointCallFactory @Inject constructor(
+@Singleton
+internal class NewTrackedEntityEndpointCallFactory(
     private val trackedExporterService: TrackerExporterService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : TrackedEntityEndpointCallFactory() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
index 81d699d039..66b2513109 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostPayloadGenerator.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor.accessEvents
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityT
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor.accessEnrollments
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class NewTrackerImporterTrackedEntityPostPayloadGenerator @Inject internal constructor(
+@Singleton
+internal class NewTrackerImporterTrackedEntityPostPayloadGenerator internal constructor(
     private val programTrackedEntityAttributeStore: ProgramTrackedEntityAttributeStore,
     private val trackedEntityTypeAttributeStore: TrackedEntityTypeAttributeStore,
     private val oldTrackerImporterPayloadGenerator: OldTrackerImporterPayloadGenerator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
index f65ded479c..584f646fb5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackerImporterTrackedEntityPostStateManager.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.event.internal.EventStore
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.fileresource.internal.FileResourceStore
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerJobObject
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class NewTrackerImporterTrackedEntityPostStateManager @Inject internal constructor(
+@Singleton
+internal class NewTrackerImporterTrackedEntityPostStateManager internal constructor(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
index 8f857e7192..42b7fcf45b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQuer
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryScopeOrderByItem
 import org.hisp.dhis.android.core.trackedentity.search.TrackerQueryResult
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OldTrackedEntityEndpointCallFactory @Inject constructor(
+@Singleton
+internal class OldTrackedEntityEndpointCallFactory(
     private val trackedEntityInstanceService: TrackedEntityInstanceService,
     private val queryCallFactory: TrackedEntityInstanceQueryCallFactory,
 ) : TrackedEntityEndpointCallFactory() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
index 37a7225e20..23580db8f9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterFileResourcesPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.event.Event
@@ -40,10 +39,10 @@ import org.hisp.dhis.android.core.imports.internal.ItemsWithFileResources
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OldTrackerImporterFileResourcesPostCall @Inject internal constructor(
+@Singleton
+internal class OldTrackerImporterFileResourcesPostCall internal constructor(
     private val fileResourcePostCall: FileResourcePostCall,
     private val fileResourceHelper: FileResourceHelper,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
index cd779e417e..fded4e758a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPayloadGenerator.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.DataColumns
 import org.hisp.dhis.android.core.common.State
@@ -49,11 +48,11 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions", "LongParameterList")
-internal class OldTrackerImporterPayloadGenerator @Inject internal constructor(
+internal class OldTrackerImporterPayloadGenerator internal constructor(
     private val versionManager: DHISVersionManager,
     private val relationshipRepository: RelationshipCollectionRepository,
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
index 011cbf173e..1a46cf8992 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackerImporterPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -48,12 +47,12 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipPostCall
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterProgramOwnerPostCall
+import org.koin.core.annotation.Singleton
 import java.net.HttpURLConnection.HTTP_CONFLICT
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList")
-internal class OldTrackerImporterPostCall @Inject internal constructor(
+internal class OldTrackerImporterPostCall internal constructor(
     private val trackerImporterPayloadGenerator: OldTrackerImporterPayloadGenerator,
     private val trackerStateManager: TrackerPostStateManager,
     private val trackedEntityInstanceService: TrackedEntityInstanceService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt
deleted file mode 100644
index d2420d95ba..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ReservedValueSettingDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ReservedValueSettingStore {
-        return ReservedValueSettingStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
index 2f79c02005..f8d73db1ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/ReservedValueSettingStoreImpl.kt
@@ -32,7 +32,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.trackedentity.ReservedValueSetting
 import org.hisp.dhis.android.core.trackedentity.ReservedValueSettingTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class ReservedValueSettingStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : ReservedValueSettingStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt
index 3975a4c2bb..409068a553 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/StatePersistorHelper.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableDataObjectStore
 import org.hisp.dhis.android.core.common.DataObject
 import org.hisp.dhis.android.core.common.ObjectWithUidInterface
 import org.hisp.dhis.android.core.common.State
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-internal class StatePersistorHelper @Inject internal constructor() {
+@Singleton
+internal class StatePersistorHelper internal constructor() {
 
     fun <O> addState(
         stateMap: MutableMap<State, MutableList<String>>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
index 6b0cabae50..0fe6faf823 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityAttributeCall @Inject internal constructor(
+@Singleton
+internal class TrackedEntityAttributeCall(
     private val service: TrackedEntityAttributeService,
     private val handler: TrackedEntityAttributeHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt
deleted file mode 100644
index bae74b5ad7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityAttributeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeStore {
-        return TrackedEntityAttributeStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
index f8f1d304e3..84aff2a99a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeHandler.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityAttributeHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityAttributeHandler(
     trackedEntityAttributeStore: TrackedEntityAttributeStore,
     private val trackedEntityAttributeLegendSetLinkHandler: TrackedEntityAttributeLegendSetLinkHandler,
 ) : IdentifiableHandlerImpl<TrackedEntityAttribute>(trackedEntityAttributeStore) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
deleted file mode 100644
index e9730f5381..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityAttributeLegendSetDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeLegendSetLinkStore {
-        return TrackedEntityAttributeLegendSetLinkStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
index 224a919fd8..b818d74cd4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityAttributeLegendSetLinkHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityAttributeLegendSetLinkHandler(
     store: TrackedEntityAttributeLegendSetLinkStore,
 ) : OrderedLinkHandlerImpl<ObjectWithUid, TrackedEntityAttributeLegendSetLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
index 136de7b962..6be45fe744 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeLegendSetLinkStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLink
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeLegendSetLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackedEntityAttributeLegendSetLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
index 0b61ff0f99..bddba524e9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.QueryCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.call.fetchers.internal.ListNoResourceWith
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityAttributeReservedValueEndpointCallFactory @Inject internal constructor(
+@Singleton
+internal class TrackedEntityAttributeReservedValueEndpointCallFactory internal constructor(
     data: GenericCallData,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: TrackedEntityAttributeReservedValueService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt
deleted file mode 100644
index aea807e4fa..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueEntityDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class TrackedEntityAttributeReservedValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeReservedValueStore {
-        return TrackedEntityAttributeReservedValueStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): TrackedEntityAttributeReservedValueService {
-        return retrofit.create(TrackedEntityAttributeReservedValueService::class.java)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
index 272b399027..cc8cb13ed7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityAttributeReservedValueHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityAttributeReservedValueHandler(
     store: TrackedEntityAttributeReservedValueStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeReservedValue>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
index 3653514f68..9c43566d59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeReservedValueStoreImpl.kt
@@ -38,8 +38,10 @@ import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueTableInfo.Columns
+import org.koin.core.annotation.Singleton
 import java.util.Date
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackedEntityAttributeReservedValueStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
index 2e0307cd31..2518ef24ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackedEntityAttributeStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
deleted file mode 100644
index 68226961a4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityAttributeValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityAttributeValueStore {
-        return TrackedEntityAttributeValueStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
index adaab84918..45dd7f8852 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueHandler.kt
@@ -27,12 +27,11 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityAttributeValueHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityAttributeValueHandler(
     store: TrackedEntityAttributeValueStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityAttributeValue>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
index cbc552e1ec..a8de994bdb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityAttributeValueStoreImpl.kt
@@ -43,7 +43,9 @@ import org.hisp.dhis.android.core.program.ProgramTrackedEntityAttributeTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class TrackedEntityAttributeValueStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityAttributeValueStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
deleted file mode 100644
index 4a7ce1f8a6..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityDataValueEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityDataValueStore {
-        return TrackedEntityDataValueStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
index 9e3b751767..00d5a49211 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityDataValueHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityDataValueHandler(
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityDataValue>(trackedEntityDataValueStore) {
     fun removeEventDataValues(eventUid: String?) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
index 2dd0f5747a..834b9eba3f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityDataValueStoreImpl.kt
@@ -42,7 +42,9 @@ import org.hisp.dhis.android.core.program.ProgramStageDataElementTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueTableInfo
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("TooManyFunctions")
 internal class TrackedEntityDataValueStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
index f29a9384d8..b789d271c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityEnrollmentOrphanCleaner.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentTableInfo
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterBreakTheGlassHelper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityEnrollmentOrphanCleaner @Inject constructor(
+@Singleton
+internal class TrackedEntityEnrollmentOrphanCleaner(
     private val enrollmentStore: EnrollmentStore,
     private val breakTheGlassHelper: TrackerImporterBreakTheGlassHelper,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index a03680b4af..4310271d06 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerDownloadCall
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceDownloadCall @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceDownloadCall(
     userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     systemInfoModuleDownloader: SystemInfoModuleDownloader,
     relationshipDownloadAndPersistCallFactory: RelationshipDownloadAndPersistCallFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
index c2ce313af4..c495746796 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloader.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.BaseRepositoryImpl
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams.QueryParams
 import org.hisp.dhis.android.core.settings.EnrollmentScope
 import org.hisp.dhis.android.core.tracker.exporter.TrackerD2Progress
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackedEntityInstanceDownloader @Inject internal constructor(
+@Singleton
+class TrackedEntityInstanceDownloader internal constructor(
     scope: RepositoryScope,
     private val downloadCall: TrackedEntityInstanceDownloadCall,
 ) : BaseRepositoryImpl<TrackedEntityInstanceDownloader>(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
deleted file mode 100644
index 0d32d71ef4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEntityDIModule.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class TrackedEntityInstanceEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceStore {
-        return TrackedEntityInstanceStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): TrackedEntityInstanceService {
-        return retrofit.create(TrackedEntityInstanceService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun uidHelper(impl: TrackedEntityInstanceUidHelperImpl): TrackedEntityInstanceUidHelper {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt
deleted file mode 100644
index bdde177d51..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityInstanceEventFilterEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceEventFilterStore {
-        return TrackedEntityInstanceEventFilterStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
index 17205d4ace..00b2e6b07b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceEventFilterHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceEventFilterHandler(
     store: TrackedEntityInstanceEventFilterStore,
 ) : ObjectWithoutUidHandlerImpl<TrackedEntityInstanceEventFilter>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
index a140f85576..a2d21187c0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceEventFilterStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreI
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilterTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackedEntityInstanceEventFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
index a55687acda..ac53db208d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterCall.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackedEntityInstanceFilterCall @Inject internal constructor(
+@Singleton
+class TrackedEntityInstanceFilterCall internal constructor(
     private val service: TrackedEntityInstanceFilterService,
     private val handler: TrackedEntityInstanceFilterHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
deleted file mode 100644
index b0c2bc811a..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterEntityDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityInstanceFilterEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceFilterStore {
-        return TrackedEntityInstanceFilterStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
index 044b31f8b6..2e2815194f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterHandler.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceFilterHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceFilterHandler(
     trackedEntityInstanceFilterStore: TrackedEntityInstanceFilterStore,
     private val trackedEntityInstanceEventFilterHandler: TrackedEntityInstanceEventFilterHandler,
     private val attributeValueFilterHandler: AttributeValueFilterHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
index b776437be5..c52a6d3d7d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceFilterStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUidOrNull
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackedEntityInstanceFilterStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
index 9fa6ad4e75..8557ff57b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceHandler.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.internal
 
 import android.util.Log
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerImpl
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
@@ -43,10 +42,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceHandler(
     relationshipVersionManager: RelationshipDHISVersionManager,
     relationshipHandler: RelationshipHandler,
     trackedEntityInstanceStore: TrackedEntityInstanceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt
index 0cf49c13e7..65c8c35c6a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceImportHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.stores.internal.StoreUtils.getSyncState
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
@@ -46,11 +45,11 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-internal class TrackedEntityInstanceImportHandler @Inject internal constructor(
+@Singleton
+internal class TrackedEntityInstanceImportHandler internal constructor(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val enrollmentImportHandler: EnrollmentImportHandler,
     private val trackerImportConflictStore: TrackerImportConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
index 385ca3e9bd..fd9905ff57 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceLastUpdatedManager.kt
@@ -27,12 +27,11 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.resource.internal.ResourceHandler
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceLastUpdatedManager @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceLastUpdatedManager(
     store: TrackedEntityInstanceSyncStore,
     private val resourceHandler: ResourceHandler,
 ) : TrackerSyncLastUpdatedManager<TrackedEntityInstanceSync>(store) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
index f6d1c88835..8838d632d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstancePersistenceCallFactory @Inject constructor(
+@Singleton
+internal class TrackedEntityInstancePersistenceCallFactory(
     private val trackedEntityInstanceHandler: TrackedEntityInstanceHandler,
     private val uidsHelper: TrackedEntityInstanceUidHelper,
     private val organisationUnitDownloader: OrganisationUnitModuleDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
index b41daf91f0..485c51d8d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePostParentCall.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.rx2.asObservable
 import org.hisp.dhis.android.core.arch.call.D2Progress
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterPostCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstancePostParentCall @Inject internal constructor(
+@Singleton
+internal class TrackedEntityInstancePostParentCall internal constructor(
     private val oldTrackerImporterCall: OldTrackerImporterPostCall,
     private val trackerImporterCall: TrackerImporterPostCall,
     private val trackerParentCallHelper: TrackerPostParentCallHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
index 4e72c9af86..6b8e2f307f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceProjectionTransformer.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCreateProjection
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class TrackedEntityInstanceProjectionTransformer @Inject constructor() :
+@Singleton
+internal class TrackedEntityInstanceProjectionTransformer :
     Transformer<TrackedEntityInstanceCreateProjection, TrackedEntityInstance> {
     override fun transform(o: TrackedEntityInstanceCreateProjection): TrackedEntityInstance {
         val generatedUid = UidGeneratorImpl().generate()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
index 297e8fd099..4af5db67df 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceStoreImpl.kt
@@ -40,7 +40,9 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.State.Companion.uploadableStatesIncludingError
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class TrackedEntityInstanceStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityInstanceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt
deleted file mode 100644
index 6182c5546d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityInstanceSyncEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityInstanceSyncStore {
-        return TrackedEntityInstanceSyncStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
index 31b4352c41..a30ba7786e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceSyncStoreImpl.kt
@@ -33,7 +33,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class TrackedEntityInstanceSyncStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityInstanceSyncStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
index 998088e316..8524d32c70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceUidHelperImpl.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceUidHelperImpl @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceUidHelperImpl(
     private val organisationUnitStore: OrganisationUnitStore,
 ) : TrackedEntityInstanceUidHelper {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
index 7bba679f08..8cfc5a862f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleImpl.kt
@@ -27,17 +27,24 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
-import org.hisp.dhis.android.core.trackedentity.*
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeReservedValueManager
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValueCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValueCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceService
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityModule
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeCollectionRepository
+import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipManager
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntitySearchCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList", "TooManyFunctions")
-internal class TrackedEntityModuleImpl @Inject constructor(
+internal class TrackedEntityModuleImpl(
     private val trackedEntityTypes: TrackedEntityTypeCollectionRepository,
     private val trackedEntityInstances: TrackedEntityInstanceCollectionRepository,
     private val trackedEntityDataValues: TrackedEntityDataValueCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt
index 6da04f7699..ce09a9817b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityModuleWiper.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.trackedentity.*
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityModuleWiper @Inject constructor(private val tableWiper: TableWiper) : ModuleWiper {
+@Singleton
+internal class TrackedEntityModuleWiper(private val tableWiper: TableWiper) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             ProgramTempOwnerTableInfo.TABLE_INFO,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
deleted file mode 100644
index ffd6cef168..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityTypeAttributeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityTypeAttributeStore {
-        return TrackedEntityTypeAttributeStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
index a7efe07aaa..a10e312f72 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.OrderedLinkHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityTypeAttributeHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityTypeAttributeHandler(
     store: TrackedEntityTypeAttributeStore,
 ) : OrderedLinkHandlerImpl<TrackedEntityTypeAttribute, TrackedEntityTypeAttribute>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
index 96a041c939..b5eafcaa29 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeAttributeStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class TrackedEntityTypeAttributeStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : TrackedEntityTypeAttributeStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
index 7daf36f389..c0c532d8b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityTypeCall @Inject internal constructor(
+@Singleton
+internal class TrackedEntityTypeCall(
     private val service: TrackedEntityTypeService,
     private val handler: TrackedEntityTypeHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
index 987e7d4a23..de796ffb88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityTypeCollectionCleaner @Inject constructor(
+@Singleton
+internal class TrackedEntityTypeCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<TrackedEntityType>(
     tableName = TrackedEntityTypeTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
deleted file mode 100644
index 3c85adc170..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class TrackedEntityTypeEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackedEntityTypeStore {
-        return TrackedEntityTypeStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
index ab11a31417..6a8423b469 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeHandler.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttribute
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityTypeHandler @Inject constructor(
+@Singleton
+internal class TrackedEntityTypeHandler(
     trackedEntityTypeStore: TrackedEntityTypeStore,
     private val attributeHandler: TrackedEntityTypeAttributeHandler,
     private val collectionCleaner: TrackedEntityTypeCollectionCleaner,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
index d02d5daa6b..fc2bca1a2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityTypeStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackedEntityTypeStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt
index baf97a3cdb..30dff76385 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerParentCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentEndpointCallFactory
 import org.hisp.dhis.android.core.enrollment.internal.NewEnrollmentEndpointCallFactory
 import org.hisp.dhis.android.core.enrollment.internal.OldEnrollmentEndpointCallFactory
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.event.internal.EventEndpointCallFactory
 import org.hisp.dhis.android.core.event.internal.NewEventEndpointCallFactory
 import org.hisp.dhis.android.core.event.internal.OldEventEndpointCallFactory
 import org.hisp.dhis.android.core.tracker.TrackerPostParentCallHelper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerParentCallFactory @Inject constructor(
+@Singleton
+internal class TrackerParentCallFactory(
     private val oldTrackedEntityCallFactory: OldTrackedEntityEndpointCallFactory,
     private val newTrackedEntityEndpointCallFactory: NewTrackedEntityEndpointCallFactory,
     private val oldEnrollmentEndpointCallFactory: OldEnrollmentEndpointCallFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
index ecf347894a..204fc6ace4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerPostStateManager.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.relationship.Relationship
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerPostStateManager @Inject internal constructor(
+@Singleton
+internal class TrackerPostStateManager internal constructor(
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
     private val enrollmentStore: EnrollmentStore,
     private val eventStore: EventStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
index eaf0c47e64..f1da92af62 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryBundleFactory.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.program.ProgramType
 import org.hisp.dhis.android.core.program.internal.ProgramDataDownloadParams
 import org.hisp.dhis.android.core.program.internal.ProgramStore
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.settings.ProgramSettingsObjectRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerQueryBundleFactory @Inject constructor(
+@Singleton
+internal class TrackerQueryBundleFactory(
     programStore: ProgramStore,
     programSettingsObjectRepository: ProgramSettingsObjectRepository,
     lastUpdatedManager: TrackedEntityInstanceLastUpdatedManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
index 99ef96a049..ed48cb501d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackerQueryFactoryCommonHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
@@ -40,12 +39,12 @@ import org.hisp.dhis.android.core.settings.LimitScope
 import org.hisp.dhis.android.core.settings.ProgramSetting
 import org.hisp.dhis.android.core.settings.ProgramSettings
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
-@Reusable
-internal class TrackerQueryFactoryCommonHelper @Inject constructor(
+@Singleton
+internal class TrackerQueryFactoryCommonHelper(
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt
deleted file mode 100644
index 3f0fa3f362..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipEntityDIModule.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.trackedentity.ownership
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class OwnershipEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun empty(impl: OwnershipManagerImpl): OwnershipManager {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): OwnershipService {
-        return retrofit.create(OwnershipService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun programTempOwnerStore(databaseAdapter: DatabaseAdapter): ProgramTempOwnerStore {
-        return ProgramTempOwnerStoreImpl(databaseAdapter)
-    }
-
-    @Provides
-    @Reusable
-    fun programOwnerStore(databaseAdapter: DatabaseAdapter): ProgramOwnerStore {
-        return ProgramOwnerStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
index a98401b708..66c9d985ad 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/OwnershipManagerImpl.kt
@@ -40,10 +40,11 @@ import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-internal class OwnershipManagerImpl @Inject constructor(
+@Singleton
+internal class OwnershipManagerImpl(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val ownershipService: OwnershipService,
     private val dataStatePropagator: DataStatePropagator,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
index 7deef8994b..70a7168f8f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerHandler.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.trackedentity.ownership
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramOwnerHandler @Inject constructor(
+@Singleton
+internal class ProgramOwnerHandler(
     store: ProgramOwnerStore,
 ) : ObjectWithoutUidHandlerImpl<ProgramOwner>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
index 7a313e649b..de7d6226a8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerPostCall.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.trackedentity.ownership
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ProgramOwnerPostCall @Inject constructor(
+@Singleton
+internal class ProgramOwnerPostCall(
     private val ownershipService: OwnershipService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val programOwnerStore: ProgramOwnerStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
index 1d977f9cf9..359e98c8c3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramOwnerStoreImpl.kt
@@ -31,7 +31,9 @@ import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramOwnerStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
index 6e90876f0c..17aa0c9e51 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/ownership/ProgramTempOwnerStoreImpl.kt
@@ -32,7 +32,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ProgramTempOwnerStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/SearchGridMapper.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/SearchGridMapper.java
index daf8e63637..d87af3e4da 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/SearchGridMapper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/SearchGridMapper.java
@@ -31,21 +31,17 @@
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue;
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance;
+import org.koin.core.annotation.Singleton;
 
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-class SearchGridMapper {
+@Singleton
+public class SearchGridMapper {
     private static final Integer NON_ATTRIBUTE_LENGTH = 7;
 
-    @Inject
-    SearchGridMapper() {
+    public SearchGridMapper() {
         // Empty constructor to add Dagger annotation
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
index f2676c418e..bdff5148ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
@@ -51,12 +50,12 @@ import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramTempOwnerTableInfo
 import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-internal class TrackedEntityInstanceLocalQueryHelper @Inject constructor(
+internal class TrackedEntityInstanceLocalQueryHelper(
     private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
     private val teiAlias = "tei"
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineCache.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineCache.kt
new file mode 100644
index 0000000000..900b965b43
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceOnlineCache.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
+
+internal class TrackedEntityInstanceOnlineCache(
+    flushInterval: Long,
+) : ExpirableCache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>(flushInterval)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index 37f2afeb5c..e0a0ba1d49 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventInternalAccessor
@@ -43,11 +42,11 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnlineHelper.Companion.toAPIFilterFormat
 import org.hisp.dhis.android.core.util.simpleDateFormat
+import org.koin.core.annotation.Singleton
 import java.text.ParseException
-import javax.inject.Inject
 
-@Reusable
-internal class TrackedEntityInstanceQueryCallFactory @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceQueryCallFactory(
     private val trackedEntityService: TrackedEntityInstanceService,
     private val eventService: EventService,
     private val mapper: SearchGridMapper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 10962f1403..054d6953d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -31,9 +31,7 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import dagger.Reusable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -52,12 +50,12 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionR
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions", "LongParameterList")
-class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructor(
+class TrackedEntityInstanceQueryCollectionRepository internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val databaseAdapter: DatabaseAdapter,
@@ -66,7 +64,7 @@ class TrackedEntityInstanceQueryCollectionRepository @Inject internal constructo
     versionManager: DHISVersionManager,
     filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
     workingListRepository: ProgramStageWorkingListCollectionRepository,
-    private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    private val onlineCache: TrackedEntityInstanceOnlineCache,
     private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
 ) : ReadOnlyWithUidCollectionRepository<TrackedEntityInstance>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
index 5e9fe601a3..9678e0ab3c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataFetcher.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.trackedentity.search
 
 import kotlinx.coroutines.runBlocking
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderExecutor
@@ -49,7 +48,7 @@ internal class TrackedEntityInstanceQueryDataFetcher constructor(
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val scope: TrackedEntityInstanceQueryRepositoryScope,
     private val childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance>,
-    private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    private val onlineCache: TrackedEntityInstanceOnlineCache,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index bff411024d..68f9826f4f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -33,10 +33,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
 import org.hisp.dhis.android.core.common.FilterOperatorsHelper
 import org.hisp.dhis.android.core.event.EventStatus
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-internal class TrackedEntityInstanceQueryOnlineHelper @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceQueryOnlineHelper(
     private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java
index 3114c259c1..bedfb64867 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScope.java
@@ -149,7 +149,7 @@ static Builder builder() {
                 .allowOnlineCache(false);
     }
 
-    static TrackedEntityInstanceQueryRepositoryScope empty() {
+    public static TrackedEntityInstanceQueryRepositoryScope empty() {
         return builder().build();
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
index 4154ffd1e8..c23d0b6c6c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryRepositoryScopeHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.search
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.arch.repositories.scope.internal.FilterItemOperator
@@ -42,10 +41,10 @@ import org.hisp.dhis.android.core.programstageworkinglist.internal.AttributeValu
 import org.hisp.dhis.android.core.trackedentity.AttributeValueFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceEventFilter
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilter
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntityInstanceQueryRepositoryScopeHelper @Inject constructor(
+@Singleton
+internal class TrackedEntityInstanceQueryRepositoryScopeHelper(
     private val dateFilterPeriodHelper: DateFilterPeriodHelper,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
index 08740641a8..1dd52a86d4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -32,9 +32,7 @@ import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import dagger.Reusable
 import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.handlers.internal.Transformer
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -50,11 +48,11 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceCollectionR
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceFilterCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackerParentCallFactory
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions", "LongParameterList")
-class TrackedEntitySearchCollectionRepository @Inject internal constructor(
+class TrackedEntitySearchCollectionRepository internal constructor(
     private val store: TrackedEntityInstanceStore,
     private val trackerParentCallFactory: TrackerParentCallFactory,
     private val databaseAdapter: DatabaseAdapter,
@@ -63,7 +61,7 @@ class TrackedEntitySearchCollectionRepository @Inject internal constructor(
     versionManager: DHISVersionManager,
     filtersRepository: TrackedEntityInstanceFilterCollectionRepository,
     workingListRepository: ProgramStageWorkingListCollectionRepository,
-    private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    private val onlineCache: TrackedEntityInstanceOnlineCache,
     private val onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     private val localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
     private val searchDataFetcherHelper: TrackedEntitySearchDataFetcherHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
index db26e82081..0ab619e7b0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcher.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.trackedentity.search
 
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
 import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.helpers.Result
@@ -47,7 +46,7 @@ internal class TrackedEntitySearchDataFetcher(
     trackerParentCallFactory: TrackerParentCallFactory,
     scope: TrackedEntityInstanceQueryRepositoryScope,
     childrenAppenders: ChildrenAppenderGetter<TrackedEntityInstance>,
-    onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult>,
+    onlineCache: TrackedEntityInstanceOnlineCache,
     onlineHelper: TrackedEntityInstanceQueryOnlineHelper,
     localQueryHelper: TrackedEntityInstanceLocalQueryHelper,
     private val helper: TrackedEntitySearchDataFetcherHelper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
index f9c214a5c1..4e8d39db09 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchDataFetcherHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.trackedentity.search
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.program.ProgramIndicatorCollectionRepository
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityType
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeAttributeCollectionRepository
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityTypeCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackedEntitySearchDataFetcherHelper @Inject constructor(
+@Singleton
+internal class TrackedEntitySearchDataFetcherHelper(
     private val trackerHeaderEngine: TrackerHeaderEngine,
     private val trackedEntityTypeAttributeCollectionRepository: TrackedEntityTypeAttributeCollectionRepository,
     private val programTrackedEntityAttributeCollectionRepository: ProgramTrackedEntityAttributeCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerDIModule.kt
new file mode 100644
index 0000000000..d3205426d8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.tracker
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class TrackerDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
index 952531cbaf..e480951928 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/TrackerPostParentCallHelper.kt
@@ -31,9 +31,10 @@ package org.hisp.dhis.android.core.tracker
 import org.hisp.dhis.android.core.settings.internal.SynchronizationSettingStore
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class TrackerPostParentCallHelper @Inject constructor(
+@Singleton
+internal class TrackerPostParentCallHelper(
     private val dhisVersionManager: DHISVersionManager,
     private val synchronizationSettingStore: SynchronizationSettingStore,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterPackageDIModule.kt
deleted file mode 100644
index 45d1ab2c89..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerExporterPackageDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.tracker.exporter
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import retrofit2.Retrofit
-
-@Module
-internal class TrackerExporterPackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): TrackerExporterService {
-        return retrofit.create(TrackerExporterService::class.java)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
index e5edee7aaa..afb5374f9e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobQueryCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import io.reactivex.Observable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -42,7 +41,7 @@ import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterTrackedEntityPostStateManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 import kotlin.time.Duration.Companion.seconds
 
 internal const val ATTEMPTS_AFTER_UPLOAD = 90
@@ -50,8 +49,8 @@ internal const val ATTEMPTS_WHEN_QUERYING = 1
 internal val ATTEMPTS_INITIAL_DELAY = 1.seconds
 internal val ATTEMPTS_INTERVAL = 2.seconds
 
-@Reusable
-internal class JobQueryCall @Inject internal constructor(
+@Singleton
+internal class JobQueryCall internal constructor(
     private val service: TrackerImporterService,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val trackerJobObjectStore: TrackerJobObjectStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
index 37e58d34b0..c5e0b7f224 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEnrollmentHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DataColumns
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.note.NoteTableInfo
 import org.hisp.dhis.android.core.note.internal.NoteStore
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class JobReportEnrollmentHandler @Inject internal constructor(
+@Singleton
+internal class JobReportEnrollmentHandler internal constructor(
     private val noteStore: NoteStore,
     private val enrollmentStore: EnrollmentStore,
     private val conflictStore: TrackerImportConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
index 6b93b2e728..f55ea51b76 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportEventHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.DataColumns
@@ -41,10 +40,10 @@ import org.hisp.dhis.android.core.note.internal.NoteStore
 import org.hisp.dhis.android.core.relationship.RelationshipHelper
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityDataValueStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class JobReportEventHandler @Inject internal constructor(
+@Singleton
+internal class JobReportEventHandler internal constructor(
     private val trackedEntityDataValueStore: TrackedEntityDataValueStore,
     private val noteStore: NoteStore,
     private val conflictStore: TrackerImportConflictStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
index fc2f839c45..df58c91c59 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportFileResourceHandler.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.call.internal.D2ProgressManager
 import org.hisp.dhis.android.core.fileresource.FileResource
 import org.hisp.dhis.android.core.fileresource.FileResourceDomainType
 import org.hisp.dhis.android.core.fileresource.internal.FileResourceHelper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class JobReportFileResourceHandler @Inject internal constructor(
+@Singleton
+internal class JobReportFileResourceHandler internal constructor(
     private val fileResourceHelper: FileResourceHelper,
 ) {
     fun updateFileResourceStates(jobObjects: List<TrackerJobObject>) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
index 7184d9ab89..78f74793a4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.common.internal.DataStatePropagator
 import org.hisp.dhis.android.core.common.internal.DataStateUidHolder
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.*
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class JobReportHandler @Inject internal constructor(
+@Singleton
+internal class JobReportHandler internal constructor(
     private val eventHandler: JobReportEventHandler,
     private val enrollmentHandler: JobReportEnrollmentHandler,
     private val trackedEntityHandler: JobReportTrackedEntityHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt
index 8d062e71d5..5b6a5a55c8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportRelationshipHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class JobReportRelationshipHandler @Inject internal constructor(
+@Singleton
+internal class JobReportRelationshipHandler internal constructor(
     relationshipStore: RelationshipStore,
 ) : JobReportTypeHandler(relationshipStore) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt
index 88c9d25a94..e093742f5c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/JobReportTrackedEntityHandler.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.imports.internal.TrackerImportConflictStore
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.relationship.internal.RelationshipStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceTableInfo
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeValueStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class JobReportTrackedEntityHandler @Inject internal constructor(
+@Singleton
+internal class JobReportTrackedEntityHandler internal constructor(
     private val trackedEntityAttributeValueStore: TrackedEntityAttributeValueStore,
     private val conflictStore: TrackerImportConflictStore,
     private val trackedEntityStore: TrackedEntityInstanceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt
index fef02bd120..4f066c904a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerConflictHelper.kt
@@ -28,15 +28,14 @@
 package org.hisp.dhis.android.core.tracker.importer.internal
 
 import android.content.Context
-import dagger.Reusable
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.imports.TrackerImportConflict
 import org.hisp.dhis.android.core.tracker.importer.internal.interpreters.InterpreterSelector
+import org.koin.core.annotation.Singleton
 import java.util.*
-import javax.inject.Inject
 
-@Reusable
-internal class TrackerConflictHelper @Inject constructor(
+@Singleton
+internal class TrackerConflictHelper(
     val context: Context,
     private val interpreterSelector: InterpreterSelector,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
index 93e98ac9ec..1868f8b013 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterBreakTheGlassHelper.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.querybuilders.internal.WhereClauseBuilder
 import org.hisp.dhis.android.core.enrollment.internal.EnrollmentStore
 import org.hisp.dhis.android.core.imports.TrackerImportConflictTableInfo
@@ -40,10 +39,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstanceInternalAcc
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
 import org.hisp.dhis.android.core.trackedentity.ownership.OwnershipManagerImpl
 import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerImporterBreakTheGlassHelper @Inject constructor(
+@Singleton
+internal class TrackerImporterBreakTheGlassHelper(
     private val conflictStore: TrackerImportConflictStore,
     private val userOrganisationUnitLinkStore: UserOrganisationUnitLinkStore,
     private val enrollmentStore: EnrollmentStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
index f8f5f666e1..b43af7e996 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterFileResourcesPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.enrollment.NewTrackerImporterEnrollment
 import org.hisp.dhis.android.core.event.NewTrackerImporterEvent
 import org.hisp.dhis.android.core.fileresource.FileResource
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntity
 import org.hisp.dhis.android.core.trackedentity.NewTrackerImporterTrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayload
 import org.hisp.dhis.android.core.trackedentity.internal.NewTrackerImporterPayloadWrapper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerImporterFileResourcesPostCall @Inject internal constructor(
+@Singleton
+internal class TrackerImporterFileResourcesPostCall internal constructor(
     private val fileResourcePostCall: FileResourcePostCall,
     private val fileResourceHelper: FileResourceHelper,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt
deleted file mode 100644
index 5cffad520b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPackageDIModule.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.tracker.importer.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import retrofit2.Retrofit
-
-@Module
-internal class TrackerImporterPackageDIModule {
-    @Provides
-    @Reusable
-    fun service(retrofit: Retrofit): TrackerImporterService {
-        return retrofit.create(TrackerImporterService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): TrackerJobObjectStore {
-        return TrackerJobObjectStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
index 3fc7d64f8b..3b95d3425c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
@@ -48,11 +47,11 @@ import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjec
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.EVENT
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.RELATIONSHIP
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType.TRACKED_ENTITY
+import org.koin.core.annotation.Singleton
 import java.util.Date
-import javax.inject.Inject
 
-@Reusable
-internal class TrackerImporterPostCall @Inject internal constructor(
+@Singleton
+internal class TrackerImporterPostCall internal constructor(
     private val payloadGenerator: NewTrackerImporterTrackedEntityPostPayloadGenerator,
     private val stateManager: NewTrackerImporterTrackedEntityPostStateManager,
     private val service: TrackerImporterService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
index 4edec20796..f7600537e5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerImporterProgramOwnerPostCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.hisp.dhis.android.core.arch.call.D2Progress
@@ -39,10 +38,10 @@ import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwner
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerPostCall
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerStore
 import org.hisp.dhis.android.core.trackedentity.ownership.ProgramOwnerTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerImporterProgramOwnerPostCall @Inject constructor(
+@Singleton
+internal class TrackerImporterProgramOwnerPostCall(
     private val programOwnerPostCall: ProgramOwnerPostCall,
     private val programOwnerStore: ProgramOwnerStore,
     private val trackedEntityInstanceStore: TrackedEntityInstanceStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt
index 6badd2a3a0..f4199d62ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobModuleWiper.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TrackerJobModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
+@Singleton
+class TrackerJobModuleWiper internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
     override fun wipeMetadata() {
         // No metadata to wipe
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
index 2cf8ddeaa8..42d6051b63 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectHandler.kt
@@ -28,11 +28,10 @@
 
 package org.hisp.dhis.android.core.tracker.importer.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class TrackerJobObjectHandler @Inject constructor(
+@Singleton
+internal class TrackerJobObjectHandler(
     store: TrackerJobObjectStore,
 ) : ObjectWithoutUidHandlerImpl<TrackerJobObject>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
index 36348b0783..ab4b52f405 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/TrackerJobObjectStoreImpl.kt
@@ -33,7 +33,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinde
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class TrackerJobObjectStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
index 4e98381607..a14ec3e32b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterHelper.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.tracker.importer.internal.interpreters
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.event.internal.EventStore
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitStore
 import org.hisp.dhis.android.core.program.internal.ProgramStageStore
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStore
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityTypeStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class InterpreterHelper @Inject internal constructor(
+@Singleton
+internal class InterpreterHelper internal constructor(
     private val teiStore: TrackedEntityInstanceStore,
     private val eventStore: EventStore,
     private val programStore: ProgramStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt
index 58cc7e5938..b101fc5f0d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/importer/internal/interpreters/InterpreterSelector.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.tracker.importer.internal.interpreters
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.tracker.importer.internal.ImporterError
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class InterpreterSelector @Inject internal constructor(
+@Singleton
+internal class InterpreterSelector internal constructor(
     private val interpreterHelper: InterpreterHelper,
 ) {
     fun getInterpreter(error: ImporterError): ErrorCodeInterpreter {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseDIModule.kt
new file mode 100644
index 0000000000..68943e8ef8
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.usecase
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class UseCaseDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
index 959785281f..8cd2d7d4d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/UseCaseModuleDownloader.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.usecase
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UseCaseModuleDownloader @Inject constructor(
+@Singleton
+internal class UseCaseModuleDownloader(
     private val stockUseCaseCall: StockUseCaseCall,
 ) : UntypedModuleDownloaderCoroutines {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt
index b04069943b..fcc36607ec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleImpl.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.usecase.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.usecase.UseCaseModule
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseCollectionRepository
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UseCaseModuleImpl @Inject internal constructor(
+@Singleton
+internal class UseCaseModuleImpl(
     private val stockUseCases: StockUseCaseCollectionRepository,
 ) : UseCaseModule {
     override fun stockUseCases(): StockUseCaseCollectionRepository {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt
index 0a006f2614..55b10ce874 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCaseModuleWiper.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.usecase.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class UseCaseModuleWiper @Inject internal constructor(
+@Singleton
+class UseCaseModuleWiper internal constructor(
     private val tableWiper: TableWiper,
 ) : ModuleWiper {
     override fun wipeMetadata() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
deleted file mode 100644
index 240f5bc68b..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/internal/UseCasePackageDIModule.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.usecase.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.usecase.UseCaseModule
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseEntityDIModule
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseService
-import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransactionEntityDIModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        StockUseCaseEntityDIModule::class,
-        StockUseCaseTransactionEntityDIModule::class,
-    ],
-)
-internal class UseCasePackageDIModule {
-
-    @Provides
-    @Reusable
-    fun stockUseCaseService(retrofit: Retrofit): StockUseCaseService {
-        return retrofit.create(StockUseCaseService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: UseCaseModuleImpl): UseCaseModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
index bbcfe119da..1c5fde3927 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/StockUseCaseCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.usecase.stock
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithUidCollectionRepository
@@ -37,10 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseStore
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransactionChildrenAppender
 import org.hisp.dhis.android.core.usecase.stock.internal.StockUseCaseTransformer
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class StockUseCaseCollectionRepository @Inject internal constructor(
+@Singleton
+class StockUseCaseCollectionRepository internal constructor(
     store: StockUseCaseStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
index 7f036ed508..c9b8659eec 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseCall.kt
@@ -27,16 +27,15 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.helpers.Result
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.settings.internal.BaseSettingCall
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class StockUseCaseCall @Inject constructor(
+@Singleton
+internal class StockUseCaseCall(
     private val stockUseCaseHandler: StockUseCaseHandler,
     private val stockUseCaseService: StockUseCaseService,
     coroutineAPICallExecutor: CoroutineAPICallExecutor,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
deleted file mode 100644
index e9bd202828..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.usecase.stock.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class StockUseCaseEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): StockUseCaseStore {
-        return StockUseCaseStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
index 6cf0e9c435..2d8274bbbe 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseHandler.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableWithoutDeleteInterfaceHandlerImpl
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class StockUseCaseHandler @Inject constructor(
+@Singleton
+internal class StockUseCaseHandler(
     store: StockUseCaseStore,
     private val transactionLinkHandler: StockUseCaseTransactionLinkHandler,
 ) : IdentifiableWithoutDeleteInterfaceHandlerImpl<InternalStockUseCase>(store) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
index 3188d4dc6f..b75cd240db 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class StockUseCaseStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt
deleted file mode 100644
index a0e3af2be9..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.usecase.stock.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class StockUseCaseTransactionEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): StockUseCaseTransactionLinkStore {
-        return StockUseCaseTransactionLinkStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
index 6cf53815d5..089f3e7ec2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class StockUseCaseTransactionLinkHandler @Inject constructor(
+@Singleton
+internal class StockUseCaseTransactionLinkHandler(
     store: StockUseCaseTransactionLinkStore,
 ) : LinkHandlerImpl<InternalStockUseCaseTransaction, InternalStockUseCaseTransaction>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
index 864e1b1ff6..3e03e844f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransactionLinkStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.arch.db.stores.projections.internal.SingleParentChildProjection
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCaseTransaction
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransactionTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class StockUseCaseTransactionLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
index 16357ff57a..9169ea7365 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/usecase/stock/internal/StockUseCaseTransformer.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.usecase.stock.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.usecase.stock.InternalStockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCase
 import org.hisp.dhis.android.core.usecase.stock.StockUseCaseTransaction
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class StockUseCaseTransformer @Inject constructor() : TwoWayTransformer<InternalStockUseCase, StockUseCase> {
+@Singleton
+internal class StockUseCaseTransformer : TwoWayTransformer<InternalStockUseCase, StockUseCase> {
     override fun transform(o: InternalStockUseCase): StockUseCase {
         return StockUseCase(
             o.uid(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
index b76ebf71dd..b0c7dbd435 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthenticatedUserObjectRepository.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.user
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyOneObjectRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.AuthenticatedUserStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class AuthenticatedUserObjectRepository @Inject internal constructor(
+@Singleton(binds = [AuthenticatedUserObjectRepository::class])
+class AuthenticatedUserObjectRepository internal constructor(
     store: AuthenticatedUserStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
index 09574142a3..e7da26a38b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/AuthorityCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.user
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyCollectionRepositoryImpl
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConne
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.StringFilterConnector
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.AuthorityStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class AuthorityCollectionRepository @Inject internal constructor(
+@Singleton
+class AuthorityCollectionRepository internal constructor(
     store: AuthorityStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
index f923522922..a1cc86211a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserCredentialsObjectRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.user
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
@@ -38,10 +37,10 @@ import org.hisp.dhis.android.core.user.internal.UserCredentialsFields
 import org.hisp.dhis.android.core.user.internal.UserRoleChildrenAppender
 import org.hisp.dhis.android.core.user.internal.UserStore
 import org.hisp.dhis.android.core.user.internal.UserUserCredentialsTransformer
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class UserCredentialsObjectRepository @Inject internal constructor(
+@Singleton(binds = [UserCredentialsObjectRepository::class])
+class UserCredentialsObjectRepository internal constructor(
     store: UserStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserDIModule.kt
new file mode 100644
index 0000000000..ae3334796e
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.user
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class UserDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
index 12b17863db..11f6afefb1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserObjectRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.user
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ObjectRepositoryFactory
@@ -36,10 +35,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserFields
 import org.hisp.dhis.android.core.user.internal.UserRoleChildrenAppender
 import org.hisp.dhis.android.core.user.internal.UserStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class UserObjectRepository @Inject internal constructor(
+@Singleton(binds = [UserObjectRepository::class])
+class UserObjectRepository internal constructor(
     store: UserStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
index 3a1bf9ad2b..383d4bfa05 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/UserRoleCollectionRepository.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.user
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
 import org.hisp.dhis.android.core.arch.repositories.filters.internal.FilterConnectorFactory
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.user.internal.UserRoleStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class UserRoleCollectionRepository @Inject internal constructor(
+@Singleton
+class UserRoleCollectionRepository internal constructor(
     store: UserRoleStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
index d031772615..e9b69d877c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AccountManagerImpl.kt
@@ -29,7 +29,6 @@
 package org.hisp.dhis.android.core.user.internal
 
 import android.content.Context
-import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
@@ -45,11 +44,11 @@ import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
 import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AccountManager
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-internal class AccountManagerImpl @Inject constructor(
+internal class AccountManagerImpl constructor(
     private val databasesConfigurationStore: DatabaseConfigurationInsecureStore,
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
deleted file mode 100644
index 7d06aa24a3..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class AuthenticatedUserEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): AuthenticatedUserStore {
-        return AuthenticatedUserStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
index 6286d1e05f..312f92ce88 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthenticatedUserStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class AuthenticatedUserStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : AuthenticatedUserStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
index 63b937b124..cf32c20e79 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
@@ -35,11 +34,11 @@ import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.user.Authority
+import org.koin.core.annotation.Singleton
 import retrofit2.Call
-import javax.inject.Inject
 
-@Reusable
-internal class AuthorityEndpointCallFactory @Inject constructor(
+@Singleton
+internal class AuthorityEndpointCallFactory constructor(
     data: GenericCallData,
     apiCallExecutor: APICallExecutor,
     handler: AuthorityHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
deleted file mode 100644
index 0faa61c0a4..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class AuthorityEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): AuthorityStore {
-        return AuthorityStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
index 6928def29f..c5c108e63a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.ObjectWithoutUidHandlerImpl
 import org.hisp.dhis.android.core.user.Authority
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class AuthorityHandler @Inject constructor(
+@Singleton
+internal class AuthorityHandler(
     store: AuthorityStore,
 ) : ObjectWithoutUidHandlerImpl<Authority>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java
index 16facb8bf2..f1e4b283f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java
@@ -33,7 +33,7 @@
 import retrofit2.Call;
 import retrofit2.http.GET;
 
-interface AuthorityService {
+public interface AuthorityService {
 
     @GET("me/authorization")
     Call<List<String>> getAuthorities();
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
index e3a9a8c6bd..7a47995672 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatement
 import org.hisp.dhis.android.core.arch.db.stores.internal.ObjectWithoutUidStoreImpl
 import org.hisp.dhis.android.core.user.Authority
 import org.hisp.dhis.android.core.user.AuthorityTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class AuthorityStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : AuthorityStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt
index 19c0d8ff11..d862850564 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/IsUserLoggedInCallableFactory.kt
@@ -29,9 +29,10 @@ package org.hisp.dhis.android.core.user.internal
 
 import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class IsUserLoggedInCallableFactory @Inject constructor(
+@Singleton
+internal class IsUserLoggedInCallableFactory constructor(
     private val credentialsSecureStore: CredentialsSecureStore,
     private val authenticatedUserStore: AuthenticatedUserStore,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
index 344bdb7ad4..29cc2ea43c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import net.openid.appauth.AuthState
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.internal.ServerURLWrapper
@@ -43,11 +42,11 @@ import org.hisp.dhis.android.core.user.AccountDeletionReason
 import org.hisp.dhis.android.core.user.AuthenticatedUser
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList")
-internal class LogInCall @Inject internal constructor(
+internal class LogInCall(
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
     private val credentialsSecureStore: CredentialsSecureStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
index 0417d57876..c99f61d65b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInDatabaseManager.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.configuration.internal.MultiUserDatabaseManager
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LogInDatabaseManager @Inject internal constructor(
+@Singleton
+internal class LogInDatabaseManager(
     private val multiUserDatabaseManager: MultiUserDatabaseManager,
     private val generalSettingCall: GeneralSettingCall,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt
index 0fd61c9a4f..7a1efff8ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogInExceptions.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class LogInExceptions @Inject internal constructor(
+@Singleton
+internal class LogInExceptions internal constructor(
     private val credentialsSecureStore: CredentialsSecureStore,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt
index 69f9ee2973..166b75acb9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/LogOutCall.kt
@@ -35,9 +35,10 @@ import org.hisp.dhis.android.core.arch.storage.internal.UserIdInMemoryStore
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.maintenance.D2ErrorComponent
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-class LogOutCall @Inject internal constructor(
+@Singleton
+class LogOutCall internal constructor(
     private val databaseAdapter: DatabaseAdapter,
     private val databaseAdapterFactory: DatabaseAdapterFactory,
     private val credentialsSecureStore: CredentialsSecureStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt
index 1c62c762b4..6172717048 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAccountDisabledErrorCatcher.kt
@@ -28,20 +28,19 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIErrorMapper
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
 import org.hisp.dhis.android.core.user.AccountDeletionReason
+import org.koin.core.annotation.Singleton
 import retrofit2.HttpException
 import retrofit2.Response
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
+@Singleton
 @Suppress("TooGenericExceptionCaught")
-internal class UserAccountDisabledErrorCatcher @Inject constructor(
+internal class UserAccountDisabledErrorCatcher(
     private val objectMapper: ObjectMapper,
     private val accountManager: AccountManagerImpl,
 ) : APICallErrorCatcher {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt
index b52afa719c..ed3acae0bf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserAuthenticateCallErrorCatcher.kt
@@ -29,18 +29,17 @@ package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
 import com.fasterxml.jackson.databind.ObjectMapper
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallErrorCatcher
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIErrorMapper
 import org.hisp.dhis.android.core.imports.internal.HttpMessageResponse
 import org.hisp.dhis.android.core.maintenance.D2ErrorCode
+import org.koin.core.annotation.Singleton
 import retrofit2.Response
 import java.lang.Exception
 import java.net.HttpURLConnection
-import javax.inject.Inject
 
-@Reusable
-internal class UserAuthenticateCallErrorCatcher @Inject constructor(private val objectMapper: ObjectMapper) :
+@Singleton
+internal class UserAuthenticateCallErrorCatcher(private val objectMapper: ObjectMapper) :
     APICallErrorCatcher {
     override fun mustBeStored(): Boolean {
         return true
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index b7d3ae3321..b0370e26d5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -28,18 +28,17 @@
 package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
-import dagger.Reusable
 import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
+import org.koin.core.annotation.Singleton
 import java.util.concurrent.Callable
-import javax.inject.Inject
 
-@Reusable
-internal class UserCall @Inject constructor(
+@Singleton
+internal class UserCall(
     private val genericCallData: GenericCallData,
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val userService: UserService,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
deleted file mode 100644
index 03ef318c6f..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class UserEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): UserStore {
-        return UserStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
index a0d296ce3f..40227e8e9c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserHandler.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserInternalAccessor
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserHandler @Inject constructor(
+@Singleton
+internal class UserHandler(
     userStore: UserStore,
     private val userRoleHandler: UserRoleHandler,
     private val userRoleCollectionCleaner: UserRoleCollectionCleaner,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
index 1eb709d94c..2999872871 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserInternalModule.kt
@@ -27,11 +27,10 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserInternalModule @Inject constructor(
+@Singleton
+internal class UserInternalModule(
     val userCall: UserCall,
     val logInCall: LogInCall,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index 3ace1f0e89..f656305b69 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.user.User
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserModuleDownloader @Inject internal constructor(
+@Singleton
+internal class UserModuleDownloader(
     private val userCall: UserCall,
     private val authorityCallFactory: AuthorityEndpointCallFactory,
 ) : TypedModuleDownloader<User> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
index 34c512478b..6189a705e7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleImpl.kt
@@ -27,18 +27,17 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import io.reactivex.Completable
 import io.reactivex.Single
 import kotlinx.coroutines.rx2.rxSingle
 import org.hisp.dhis.android.core.user.*
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandler
 import org.hisp.dhis.android.core.user.openid.OpenIDConnectHandlerImpl
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions", "LongParameterList")
-internal class UserModuleImpl @Inject constructor(
+internal class UserModuleImpl(
     private val isUserLoggedInCallFactory: IsUserLoggedInCallableFactory,
     private val logoutCallCallFactory: LogOutCall,
     private val logInCall: LogInCall,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleWiper.kt
similarity index 64%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleWiper.kt
index 69f8fd6202..33e21fe9b9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleWiper.kt
@@ -25,44 +25,32 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package org.hisp.dhis.android.core.user.internal;
-
-import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo;
-import org.hisp.dhis.android.core.user.AuthorityTableInfo;
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo;
-import org.hisp.dhis.android.core.user.UserRoleTableInfo;
-import org.hisp.dhis.android.core.user.UserTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class UserModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    UserModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+package org.hisp.dhis.android.core.user.internal
+
+import org.hisp.dhis.android.core.user.AuthenticatedUserTableInfo
+import org.hisp.dhis.android.core.user.AuthorityTableInfo
+import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import org.hisp.dhis.android.core.user.UserRoleTableInfo
+import org.hisp.dhis.android.core.user.UserTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class UserModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                UserTableInfo.TABLE_INFO,
-                UserOrganisationUnitLinkTableInfo.TABLE_INFO,
-                AuthenticatedUserTableInfo.TABLE_INFO,
-                AuthorityTableInfo.TABLE_INFO,
-                UserRoleTableInfo.TABLE_INFO
-        );
+            UserTableInfo.TABLE_INFO,
+            UserOrganisationUnitLinkTableInfo.TABLE_INFO,
+            AuthenticatedUserTableInfo.TABLE_INFO,
+            AuthorityTableInfo.TABLE_INFO,
+            UserRoleTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No data to wipe
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt
deleted file mode 100644
index 278899945d..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class UserOrganisationUnitLinkEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): UserOrganisationUnitLinkStore {
-        return UserOrganisationUnitLinkStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
index 3a9ebc493d..a4958833bd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserOrganisationUnitLinkHandler @Inject constructor(
+@Singleton
+internal class UserOrganisationUnitLinkHandler(
     store: UserOrganisationUnitLinkStore,
 ) : LinkHandlerImpl<OrganisationUnit, UserOrganisationUnitLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
index 48432a318f..e34c948a2b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserOrganisationUnitLinkStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
 import org.hisp.dhis.android.core.user.UserOrganisationUnitLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class UserOrganisationUnitLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : UserOrganisationUnitLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt
deleted file mode 100644
index 6d966b6ec9..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserPackageDIModule.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.user.UserModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        AuthenticatedUserEntityDIModule::class,
-        AuthorityEntityDIModule::class,
-        UserRoleEntityDIModule::class,
-        UserEntityDIModule::class,
-        UserOrganisationUnitLinkEntityDIModule::class,
-    ],
-)
-internal class UserPackageDIModule {
-    @Provides
-    @Reusable
-    fun userService(retrofit: Retrofit): UserService {
-        return retrofit.create(UserService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun authorityService(retrofit: Retrofit): AuthorityService {
-        return retrofit.create(AuthorityService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: UserModuleImpl): UserModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
index 7703b88914..a8abf4687b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleChildrenAppender.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.user.User
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserRoleChildrenAppender @Inject constructor(
+@Singleton
+internal class UserRoleChildrenAppender(
     databaseAdapter: DatabaseAdapter,
 ) : ChildrenAppender<User>() {
     private val store = UserRoleStoreImpl(databaseAdapter)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
index c14704eb7b..c6e46ff795 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.user.UserRole
 import org.hisp.dhis.android.core.user.UserRoleTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserRoleCollectionCleaner @Inject constructor(
+@Singleton
+internal class UserRoleCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<UserRole>(
     tableName = UserRoleTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
deleted file mode 100644
index 3cc32c0fd0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class UserRoleEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): UserRoleStore {
-        return UserRoleStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
index 9f089951a7..132744edc3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.user.UserRole
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserRoleHandler @Inject constructor(
+@Singleton
+internal class UserRoleHandler(
     store: UserRoleStore,
 ) : IdentifiableHandlerImpl<UserRole>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
index faa8429f59..6780303618 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserRoleStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.user.UserRole
 import org.hisp.dhis.android.core.user.UserRoleTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class UserRoleStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : UserRoleStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
index ad5a14291d..84a8e773fb 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class UserStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
index 5c14af9be0..ff59ac45bc 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserUserCredentialsTransformer.kt
@@ -28,14 +28,13 @@
 
 package org.hisp.dhis.android.core.user.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.TwoWayTransformer
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.UserCredentials
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class UserUserCredentialsTransformer @Inject constructor() : TwoWayTransformer<User, UserCredentials> {
+@Singleton
+internal class UserUserCredentialsTransformer : TwoWayTransformer<User, UserCredentials> {
     override fun transform(o: User): UserCredentials {
         return UserCredentials.builder()
             .name(o.name())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
index 8882dde1e1..dccc3b8423 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectHandlerImpl.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.user.openid
 
 import android.content.Context
 import android.content.Intent
-import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
@@ -38,12 +37,12 @@ import kotlinx.coroutines.runBlocking
 import net.openid.appauth.*
 import org.hisp.dhis.android.core.user.User
 import org.hisp.dhis.android.core.user.internal.LogInCall
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 private const val RC_AUTH = 2021
 
-@Reusable
-internal class OpenIDConnectHandlerImpl @Inject constructor(
+@Singleton
+internal class OpenIDConnectHandlerImpl(
     private val context: Context,
     private val logInCall: LogInCall,
     private val logoutHandler: OpenIDConnectLogoutHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt
index 19567b281a..904664162d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectLogoutHandler.kt
@@ -28,14 +28,15 @@
 
 package org.hisp.dhis.android.core.user.openid
 
-import dagger.Reusable
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import org.hisp.dhis.android.core.arch.storage.internal.CredentialsSecureStore
-import javax.inject.Inject
+import org.koin.core.annotation.Single
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OpenIDConnectLogoutHandler @Inject constructor(
+@Singleton
+@Single
+internal class OpenIDConnectLogoutHandler(
     private val credentialsSecureStore: CredentialsSecureStore,
 ) {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt
index 3bc93be92d..75a465685e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/openid/OpenIDConnectTokenRefresher.kt
@@ -29,15 +29,14 @@
 package org.hisp.dhis.android.core.user.openid
 
 import android.content.Context
-import dagger.Reusable
 import io.reactivex.Single
 import net.openid.appauth.AuthState
 import net.openid.appauth.AuthorizationException
 import net.openid.appauth.AuthorizationService
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class OpenIDConnectTokenRefresher @Inject constructor(
+@Singleton
+internal class OpenIDConnectTokenRefresher(
     private val context: Context,
     private val logoutHandler: OpenIDConnectLogoutHandler,
 ) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationDIModule.kt
new file mode 100644
index 0000000000..86cc3c63ee
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.validation
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class ValidationDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
index 2a772dda54..f49853683b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/ValidationRuleCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.validation
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyNameableCollectionRepositoryImpl
@@ -39,11 +38,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.common.IdentifiableColumns
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class ValidationRuleCollectionRepository @Inject internal constructor(
+class ValidationRuleCollectionRepository internal constructor(
     store: ValidationRuleStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
index 82fa48f7eb..334539d98b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineImpl.kt
@@ -46,9 +46,10 @@ import org.hisp.dhis.android.core.validation.ValidationRuleCollectionRepository
 import org.hisp.dhis.android.core.validation.engine.ValidationEngine
 import org.hisp.dhis.android.core.validation.engine.ValidationResult
 import org.hisp.dhis.android.core.validation.engine.ValidationResult.ValidationResultStatus
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-internal class ValidationEngineImpl @Inject constructor(
+@Singleton
+internal class ValidationEngineImpl(
     private val validationExecutor: ValidationExecutor,
     private val validationRuleRepository: ValidationRuleCollectionRepository,
     private val dataValueRepository: DataValueCollectionRepository,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
index 70693e5214..771f42db28 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationExecutor.kt
@@ -37,11 +37,10 @@ import org.hisp.dhis.android.core.validation.ValidationRuleExpression
 import org.hisp.dhis.android.core.validation.ValidationRuleOperator
 import org.hisp.dhis.android.core.validation.engine.ValidationResultSideEvaluation
 import org.hisp.dhis.android.core.validation.engine.ValidationResultViolation
-import javax.inject.Inject
-import javax.inject.Singleton
+import org.koin.core.annotation.Singleton
 
 @Singleton
-internal class ValidationExecutor @Inject constructor(private val expressionService: ExpressionService) {
+internal class ValidationExecutor(private val expressionService: ExpressionService) {
     fun evaluateRule(
         rule: ValidationRule,
         organisationUnit: OrganisationUnit?,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt
deleted file mode 100644
index cec156ab96..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.validation.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class DataSetValidationRuleLinkEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): DataSetValidationRuleLinkStore {
-        return DataSetValidationRuleLinkStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
index 598689b8ad..9562828b80 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkHandler.kt
@@ -28,13 +28,12 @@
 
 package org.hisp.dhis.android.core.validation.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class DataSetValidationRuleLinkHandler @Inject constructor(
+@Singleton
+internal class DataSetValidationRuleLinkHandler(
     store: DataSetValidationRuleLinkStore,
 ) : LinkHandlerImpl<ObjectWithUid, DataSetValidationRuleLink>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
index bb0ccf037c..3913d50f7a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/DataSetValidationRuleLinkStoreImpl.kt
@@ -34,7 +34,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLinkTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class DataSetValidationRuleLinkStoreImpl(
     databaseAdapter: DatabaseAdapter,
 ) : DataSetValidationRuleLinkStore,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.java
deleted file mode 100644
index 44386207fd..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.validation.ValidationModule;
-import org.hisp.dhis.android.core.validation.ValidationRuleCollectionRepository;
-import org.hisp.dhis.android.core.validation.engine.ValidationEngine;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ValidationModuleImpl implements ValidationModule {
-
-    private final ValidationRuleCollectionRepository validationRules;
-
-    private final ValidationEngine validationEngine;
-
-    @Inject
-    ValidationModuleImpl(ValidationRuleCollectionRepository validationRules,
-                         ValidationEngine validationEngine) {
-        this.validationRules = validationRules;
-        this.validationEngine = validationEngine;
-    }
-
-    @Override
-    public ValidationRuleCollectionRepository validationRules() {
-        return validationRules;
-    }
-
-    @Override
-    public ValidationEngine validationEngine() {
-        return validationEngine;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.kt
similarity index 72%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineEntityDIModule.kt
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.kt
index 31477fbbdb..2b08dd150a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/engine/internal/ValidationEngineEntityDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleImpl.kt
@@ -25,18 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.validation.engine.internal
+package org.hisp.dhis.android.core.validation.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
+import org.hisp.dhis.android.core.validation.ValidationModule
+import org.hisp.dhis.android.core.validation.ValidationRuleCollectionRepository
 import org.hisp.dhis.android.core.validation.engine.ValidationEngine
+import org.koin.core.annotation.Singleton
 
-@Module
-internal class ValidationEngineEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(impl: ValidationEngineImpl): ValidationEngine {
-        return impl
+@Singleton
+internal class ValidationModuleImpl(
+    private val validationRules: ValidationRuleCollectionRepository,
+    private val validationEngine: ValidationEngine,
+) : ValidationModule {
+    override fun validationRules(): ValidationRuleCollectionRepository {
+        return validationRules
+    }
+
+    override fun validationEngine(): ValidationEngine {
+        return validationEngine
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleWiper.java b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleWiper.kt
similarity index 72%
rename from core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleWiper.java
rename to core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleWiper.kt
index 5e2ff2aa15..3041ab4099 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleWiper.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationModuleWiper.kt
@@ -25,36 +25,26 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.validation.internal;
-
-import org.hisp.dhis.android.core.validation.DataSetValidationRuleLinkTableInfo;
-import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo;
-import org.hisp.dhis.android.core.wipe.internal.ModuleWiper;
-import org.hisp.dhis.android.core.wipe.internal.TableWiper;
-
-import javax.inject.Inject;
-
-import dagger.Reusable;
-
-@Reusable
-public final class ValidationModuleWiper implements ModuleWiper {
-
-    private final TableWiper tableWiper;
-
-    @Inject
-    ValidationModuleWiper(TableWiper tableWiper) {
-        this.tableWiper = tableWiper;
-    }
-
-    @Override
-    public void wipeMetadata() {
+package org.hisp.dhis.android.core.validation.internal
+
+import org.hisp.dhis.android.core.validation.DataSetValidationRuleLinkTableInfo
+import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
+import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
+import org.hisp.dhis.android.core.wipe.internal.TableWiper
+import org.koin.core.annotation.Singleton
+
+@Singleton
+internal class ValidationModuleWiper(
+    private val tableWiper: TableWiper,
+) : ModuleWiper {
+    override fun wipeMetadata() {
         tableWiper.wipeTables(
-                ValidationRuleTableInfo.TABLE_INFO,
-                DataSetValidationRuleLinkTableInfo.TABLE_INFO);
+            ValidationRuleTableInfo.TABLE_INFO,
+            DataSetValidationRuleLinkTableInfo.TABLE_INFO,
+        )
     }
 
-    @Override
-    public void wipeData() {
+    override fun wipeData() {
         // No data to wipe
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
deleted file mode 100644
index e6d4ebd138..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationPackageDIModule.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.validation.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.validation.ValidationModule
-import org.hisp.dhis.android.core.validation.engine.internal.ValidationEngineEntityDIModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        DataSetValidationRuleLinkEntityDIModule::class,
-        ValidationEngineEntityDIModule::class,
-        ValidationRuleEntityDIModule::class,
-    ],
-)
-internal class ValidationPackageDIModule {
-    @Provides
-    @Reusable
-    fun validationRuleUidsCall(impl: ValidationRuleUidsCallImpl): ValidationRuleUidsCallCoroutines {
-        return impl
-    }
-
-    @Provides
-    @Reusable
-    fun validationRuleService(retrofit: Retrofit): ValidationRuleService {
-        return retrofit.create(ValidationRuleService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: ValidationModuleImpl): ValidationModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index 4b5330d8f7..27a061eaf8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -27,16 +27,16 @@
  */
 package org.hisp.dhis.android.core.validation.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.ValidationRule
+import org.koin.core.annotation.Singleton
 import java.lang.Boolean
-import javax.inject.Inject
+import kotlin.String
 
-@Reusable
-class ValidationRuleCall @Inject internal constructor(
+@Singleton
+class ValidationRuleCall internal constructor(
     private val service: ValidationRuleService,
     private val handler: ValidationRuleHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
index 743fab5c38..9e12de2a31 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.validation.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.validation.ValidationRule
 import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ValidationRuleCollectionCleaner @Inject constructor(
+@Singleton
+internal class ValidationRuleCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<ValidationRule>(
     tableName = ValidationRuleTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
deleted file mode 100644
index 0b321c38e0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleEntityDIModule.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.validation.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class ValidationRuleEntityDIModule {
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): ValidationRuleStore {
-        return ValidationRuleStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
index 92f061756b..95076574c4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleHandler.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.validation.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.validation.ValidationRule
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ValidationRuleHandler @Inject constructor(
+@Singleton
+internal class ValidationRuleHandler(
     store: ValidationRuleStore,
     private val collectionCleaner: ValidationRuleCollectionCleaner,
 ) : IdentifiableHandlerImpl<ValidationRule>(store) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
index 067d56dee8..b3a6cb3bf0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleStoreImpl.kt
@@ -36,7 +36,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStoreImpl
 import org.hisp.dhis.android.core.validation.ValidationRule
 import org.hisp.dhis.android.core.validation.ValidationRuleTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class ValidationRuleStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
index 54f538088b..07a83f9416 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCallImpl.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.validation.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.DataSetValidationRuleLink
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class ValidationRuleUidsCallImpl @Inject constructor(
+@Singleton
+internal class ValidationRuleUidsCallImpl(
     private val service: ValidationRuleService,
     private val linkHandler: DataSetValidationRuleLinkHandler,
     private val apiDownloader: APIDownloader,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
index db447f951d..266cab86e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationCollectionRepository.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.visualization
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
 import org.hisp.dhis.android.core.arch.repositories.collection.internal.ReadOnlyIdentifiableCollectionRepositoryImpl
@@ -39,11 +38,11 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.visualization.internal.VisualizationColumnsRowsFiltersChildrenAppender
 import org.hisp.dhis.android.core.visualization.internal.VisualizationFields
 import org.hisp.dhis.android.core.visualization.internal.VisualizationStore
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("TooManyFunctions")
-class VisualizationCollectionRepository @Inject internal constructor(
+class VisualizationCollectionRepository internal constructor(
     store: VisualizationStore,
     databaseAdapter: DatabaseAdapter,
     scope: RepositoryScope,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDIModule.kt
new file mode 100644
index 0000000000..2d4e4ecda9
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/VisualizationDIModule.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.core.visualization
+
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
+
+@Module
+@ComponentScan
+internal class VisualizationDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
index 7470340c2b..fbe5998418 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCall.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutines
@@ -35,10 +34,10 @@ import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.visualization.Visualization
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationCall @Inject constructor(
+@Singleton
+internal class VisualizationCall(
     private val handler: VisualizationHandler,
     private val service: VisualizationService,
     private val dhis2VersionManager: DHISVersionManager,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
index b125064d60..3ee13388f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationCollectionCleaner.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.cleaners.internal.CollectionCleanerImpl
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationCollectionCleaner @Inject constructor(
+@Singleton
+internal class VisualizationCollectionCleaner(
     databaseAdapter: DatabaseAdapter,
 ) : CollectionCleanerImpl<Visualization>(
     tableName = VisualizationTableInfo.TABLE_INFO.name(),
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt
deleted file mode 100644
index 2803cbf411..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemEntityDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.visualization.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class VisualizationDimensionItemEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): VisualizationDimensionItemStore {
-        return VisualizationDimensionItemStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
index 5865931dd0..3a08de84e0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemHandler.kt
@@ -28,12 +28,11 @@
 
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandlerImpl
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationDimensionItemHandler @Inject constructor(
+@Singleton
+internal class VisualizationDimensionItemHandler(
     store: VisualizationDimensionItemStore,
 ) : LinkHandlerImpl<VisualizationDimensionItem, VisualizationDimensionItem>(store)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
index 331f0686d6..73e5b134d2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationDimensionItemStoreImpl.kt
@@ -33,7 +33,9 @@ import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapp
 import org.hisp.dhis.android.core.arch.db.stores.internal.LinkStoreImpl
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class VisualizationDimensionItemStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
deleted file mode 100644
index 226b6bdde8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationEntityDIModule.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.visualization.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-
-@Module
-internal class VisualizationEntityDIModule {
-
-    @Provides
-    @Reusable
-    fun store(databaseAdapter: DatabaseAdapter): VisualizationStore {
-        return VisualizationStoreImpl(databaseAdapter)
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
index 03ad9b9a72..807d2339d9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationHandler.kt
@@ -27,17 +27,16 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableHandlerImpl
 import org.hisp.dhis.android.core.visualization.LayoutPosition
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationDimension
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItem
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationHandler @Inject constructor(
+@Singleton
+internal class VisualizationHandler(
     store: VisualizationStore,
     private val visualizationCollectionCleaner: VisualizationCollectionCleaner,
     private val itemHandler: VisualizationDimensionItemHandler,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
index bbfbf3c5f7..3b268715a0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationInternalModule.kt
@@ -28,10 +28,9 @@
 package org.hisp.dhis.android.core.visualization.internal
 
 import androidx.annotation.VisibleForTesting
-import dagger.Reusable
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationInternalModule @Inject internal constructor(
+@Singleton
+internal class VisualizationInternalModule internal constructor(
     @field:VisibleForTesting val visualizationCall: VisualizationCall,
 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
index 7a60b497cb..5c0a22049c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleDownloader.kt
@@ -27,14 +27,13 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.modules.internal.TypedModuleDownloader
 import org.hisp.dhis.android.core.settings.internal.AnalyticsDhisVisualizationStore
 import org.hisp.dhis.android.core.visualization.Visualization
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationModuleDownloader @Inject internal constructor(
+@Singleton
+internal class VisualizationModuleDownloader internal constructor(
     private val visualizationCall: VisualizationCall,
     private val analyticsDhisVisualizationStore: AnalyticsDhisVisualizationStore,
 ) :
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt
index 523647e5d2..6971804aef 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleImpl.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.visualization.VisualizationCollectionRepository
 import org.hisp.dhis.android.core.visualization.VisualizationModule
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-internal class VisualizationModuleImpl @Inject internal constructor(
+@Singleton
+internal class VisualizationModuleImpl(
     private val visualizations: VisualizationCollectionRepository,
 ) : VisualizationModule {
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
index 94a4f6ba4a..c4f3801fed 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationModuleWiper.kt
@@ -27,15 +27,14 @@
  */
 package org.hisp.dhis.android.core.visualization.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.visualization.VisualizationDimensionItemTableInfo
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
 import org.hisp.dhis.android.core.wipe.internal.ModuleWiper
 import org.hisp.dhis.android.core.wipe.internal.TableWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class VisualizationModuleWiper @Inject internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
+@Singleton
+class VisualizationModuleWiper internal constructor(private val tableWiper: TableWiper) : ModuleWiper {
     override fun wipeMetadata() {
         tableWiper.wipeTables(
             VisualizationTableInfo.TABLE_INFO,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
deleted file mode 100644
index 0557e98fa7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationPackageDIModule.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.visualization.internal
-
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.visualization.VisualizationModule
-import retrofit2.Retrofit
-
-@Module(
-    includes = [
-        VisualizationEntityDIModule::class,
-        VisualizationDimensionItemEntityDIModule::class,
-    ],
-)
-internal class VisualizationPackageDIModule {
-    @Provides
-    @Reusable
-    fun visualizationService(retrofit: Retrofit): VisualizationService {
-        return retrofit.create(VisualizationService::class.java)
-    }
-
-    @Provides
-    @Reusable
-    fun module(impl: VisualizationModuleImpl): VisualizationModule {
-        return impl
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
index fcb4178133..018f382c18 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/visualization/internal/VisualizationStoreImpl.kt
@@ -35,7 +35,9 @@ import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStor
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.visualization.Visualization
 import org.hisp.dhis.android.core.visualization.VisualizationTableInfo
+import org.koin.core.annotation.Singleton
 
+@Singleton
 @Suppress("MagicNumber")
 internal class VisualizationStoreImpl(
     databaseAdapter: DatabaseAdapter,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt
index 0fd655c97c..1c7be2a117 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/D2ModuleWipers.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.wipe.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.attribute.internal.AttributeModuleWiper
 import org.hisp.dhis.android.core.category.internal.CategoryModuleWiper
 import org.hisp.dhis.android.core.common.internal.CommonModuleWiper
@@ -61,11 +60,11 @@ import org.hisp.dhis.android.core.usecase.internal.UseCaseModuleWiper
 import org.hisp.dhis.android.core.user.internal.UserModuleWiper
 import org.hisp.dhis.android.core.validation.internal.ValidationModuleWiper
 import org.hisp.dhis.android.core.visualization.internal.VisualizationModuleWiper
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
+@Singleton
 @Suppress("LongParameterList")
-internal class D2ModuleWipers @Inject constructor(
+internal class D2ModuleWipers(
     attribute: AttributeModuleWiper,
     category: CategoryModuleWiper,
     common: CommonModuleWiper,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt
index 3defe0f4bb..84ad590cb8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/TableWiper.kt
@@ -27,13 +27,12 @@
  */
 package org.hisp.dhis.android.core.wipe.internal
 
-import dagger.Reusable
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
-@Reusable
-class TableWiper @Inject constructor(private val databaseAdapter: DatabaseAdapter) {
+@Singleton
+class TableWiper(private val databaseAdapter: DatabaseAdapter) {
     fun wipeTable(tableInfo: TableInfo) {
         databaseAdapter.delete(tableInfo.name())
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt
index c5a8c20ef2..a6ffbce7a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeDIModule.kt
@@ -27,20 +27,9 @@
  */
 package org.hisp.dhis.android.core.wipe.internal
 
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
+import org.koin.core.annotation.ComponentScan
+import org.koin.core.annotation.Module
 
 @Module
-internal class WipeDIModule {
-
-    @Provides
-    @Reusable
-    fun wipeModule(
-        d2CallExecutor: D2CallExecutor,
-        moduleWipers: D2ModuleWipers,
-    ): WipeModule {
-        return WipeModuleImpl(d2CallExecutor, moduleWipers.wipers)
-    }
-}
+@ComponentScan
+internal class WipeDIModule
diff --git a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt
index 78dce2b498..1c0c2c3aa2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/wipe/internal/WipeModuleImpl.kt
@@ -30,7 +30,9 @@ package org.hisp.dhis.android.core.wipe.internal
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.common.Unit
 import org.hisp.dhis.android.core.maintenance.D2Error
+import org.koin.core.annotation.Singleton
 
+@Singleton
 internal class WipeModuleImpl(
     private val d2CallExecutor: D2CallExecutor,
     private val moduleWipers: List<ModuleWiper>,
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
index 6be3b9b063..49077baa97 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/enrollment/internal/EnrollmentHandlerShould.kt
@@ -29,15 +29,15 @@ package org.hisp.dhis.android.core.enrollment.internal
 
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.Handler
-import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandler
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.event.Event
+import org.hisp.dhis.android.core.event.internal.EventHandler
 import org.hisp.dhis.android.core.note.Note
 import org.hisp.dhis.android.core.note.internal.NoteDHISVersionManager
+import org.hisp.dhis.android.core.note.internal.NoteHandler
 import org.hisp.dhis.android.core.note.internal.NoteUniquenessManager
 import org.hisp.dhis.android.core.relationship.internal.EnrollmentRelationshipOrphanCleaner
 import org.hisp.dhis.android.core.relationship.internal.RelationshipDHISVersionManager
@@ -52,8 +52,8 @@ import org.mockito.ArgumentMatchers
 @RunWith(JUnit4::class)
 class EnrollmentHandlerShould {
     private val enrollmentStore: EnrollmentStore = mock()
-    private val eventHandler: IdentifiableDataHandler<Event> = mock()
-    private val noteHandler: Handler<Note> = mock()
+    private val eventHandler: EventHandler = mock()
+    private val noteHandler: NoteHandler = mock()
     private val noteUniquenessManager: NoteUniquenessManager = mock()
     private val enrollment: Enrollment = mock()
     private val event: Event = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/BaseConflictShould.kt b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/BaseConflictShould.kt
index e842f5338c..3fcbf5d294 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/BaseConflictShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/imports/internal/conflicts/BaseConflictShould.kt
@@ -30,17 +30,18 @@ package org.hisp.dhis.android.core.imports.internal.conflicts
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.junit.Before
 
 internal open class BaseConflictShould {
 
     protected val context: TrackerImportConflictItemContext = mock()
 
-    protected val attributeStore: IdentifiableObjectStore<TrackedEntityAttribute> = mock()
-    protected val dataElementStore: IdentifiableObjectStore<DataElement> = mock()
+    protected val attributeStore: TrackedEntityAttributeStore = mock()
+    protected val dataElementStore: DataElementStore = mock()
 
     protected val attribute: TrackedEntityAttribute = mock()
     protected val dataElement: DataElement = mock()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt b/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt
index e11c44e728..3483919dce 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/program/programindicatorengine/internal/ProgramIndicatorExecutorShould.kt
@@ -31,20 +31,22 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataelement.internal.DataElementStore
 import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.program.ProgramIndicator
 import org.hisp.dhis.android.core.program.ProgramStage
+import org.hisp.dhis.android.core.program.internal.ProgramStageStore
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttribute
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityAttributeValue
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityDataValue
+import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityAttributeStore
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -65,11 +67,11 @@ class ProgramIndicatorExecutorShould {
     private val dataElementUid2 = "JHpWWC1bISq"
     private val constantUid1 = "gzlRs2HEGAf"
 
-    private val dataElementStore: IdentifiableObjectStore<DataElement> = mock()
+    private val dataElementStore: DataElementStore = mock()
 
-    private val trackedEntityAttributeStore: IdentifiableObjectStore<TrackedEntityAttribute> = mock()
+    private val trackedEntityAttributeStore: TrackedEntityAttributeStore = mock()
 
-    private val programStageStore: IdentifiableObjectStore<ProgramStage> = mock()
+    private val programStageStore: ProgramStageStore = mock()
 
     private val programIndicator: ProgramIndicator = mock()
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
index a2f169a8a0..2bfd999739 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryDataSourceShould.kt
@@ -32,8 +32,6 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import org.hisp.dhis.android.core.arch.cache.internal.D2Cache
-import org.hisp.dhis.android.core.arch.cache.internal.ExpirableCache
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppender
 import org.hisp.dhis.android.core.arch.repositories.children.internal.ChildrenAppenderGetter
@@ -53,6 +51,7 @@ import org.junit.runners.JUnit4
 import org.mockito.*
 import org.mockito.ArgumentMatchers.anyString
 import java.util.*
+import java.util.concurrent.TimeUnit
 
 @RunWith(JUnit4::class)
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -79,8 +78,8 @@ class TrackedEntityInstanceQueryDataSourceShould {
     private val periodHelper = DateFilterPeriodHelper(calendarProvider, create(calendarProvider))
     private val onlineHelper = TrackedEntityInstanceQueryOnlineHelper(periodHelper)
     private val localQueryHelper = TrackedEntityInstanceLocalQueryHelper(periodHelper)
-    private val onlineCache: D2Cache<TrackedEntityInstanceQueryOnline, TrackedEntityInstanceOnlineResult> =
-        ExpirableCache()
+    private val onlineCache: TrackedEntityInstanceOnlineCache =
+        TrackedEntityInstanceOnlineCache(TimeUnit.MINUTES.toMillis(5))
     private val initialLoad = 30
 
     @Before

From 58288bf2e82b4517dc3359a298e925118e832b34 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 18 Oct 2023 13:05:20 +0200
Subject: [PATCH 433/478] [ANDROSDK-1699] Fix dependency in unit test

---
 .../internal/OrganisationUnitHandlerShould.kt                | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
index 1da29b2c46..f85dab4241 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitHandlerShould.kt
@@ -29,13 +29,12 @@ package org.hisp.dhis.android.core.organisationunit.internal
 
 import com.nhaarman.mockitokotlin2.*
 import org.hisp.dhis.android.core.arch.handlers.internal.HandleAction
-import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkHandler
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup
 import org.hisp.dhis.android.core.user.User
-import org.hisp.dhis.android.core.user.UserOrganisationUnitLink
+import org.hisp.dhis.android.core.user.internal.UserOrganisationUnitLinkHandler
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,7 +46,7 @@ class OrganisationUnitHandlerShould {
     private val organisationUnitProgramLinkStore: OrganisationUnitProgramLinkStore = mock()
     private val organisationUnitProgramLinkHandler: OrganisationUnitProgramLinkHandler = mock()
     private val dataSetDataSetOrganisationUnitLinkHandler: DataSetOrganisationUnitLinkHandler = mock()
-    private val userOrganisationUnitLinkHandler: LinkHandler<OrganisationUnit, UserOrganisationUnitLink> = mock()
+    private val userOrganisationUnitLinkHandler: UserOrganisationUnitLinkHandler = mock()
     private val organisationUnitGroupHandler: OrganisationUnitGroupHandler = mock()
     private val organisationUnitGroupLinkHandler: OrganisationUnitOrganisationUnitGroupLinkHandler = mock()
     private val organisationUnitGroup: OrganisationUnitGroup = mock()

From 8f3bb01eaca184879e76c7f66bee3fa618aaec74 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 18 Oct 2023 13:30:45 +0200
Subject: [PATCH 434/478] [ANDROSDK-1768-DEFECT] Refactor appearance method
 name

---
 .../core/settings/AppearanceSettingsObjectRepository.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
index 4343e52620..86f502c72e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/AppearanceSettingsObjectRepository.kt
@@ -86,8 +86,9 @@ class AppearanceSettingsObjectRepository @Inject internal constructor(
             ?: dataSetSettings?.globalSettings()
     }
 
-    val trackedEntityTypeFilters: Map<ProgramFilter, FilterSetting>?
-        get() = blockingGet()?.filterSorting()?.programSettings()?.globalSettings()
+    fun getTrackedEntityTypeFilters(): Map<ProgramFilter, FilterSetting>? {
+        return blockingGet()?.filterSorting()?.programSettings()?.globalSettings()
+    }
 
     fun getProgramFiltersByUid(uid: String?): Map<ProgramFilter, FilterSetting>? {
         val programFilters = blockingGet()?.filterSorting()?.programSettings()

From c4b96a71479c4551493b10df690a7e768526fb56 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 18 Oct 2023 13:46:52 +0200
Subject: [PATCH 435/478] [ANDROSDK-1699] Fix code smells

---
 .../internal/DatabaseEncryptionPasswordGenerator.java          | 3 ---
 .../hisp/dhis/android/core/option/internal/OptionGroupCall.kt  | 1 -
 .../android/core/validation/internal/ValidationRuleCall.kt     | 1 -
 3 files changed, 5 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java
index e28ba6fbae..e994c91b65 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/configuration/internal/DatabaseEncryptionPasswordGenerator.java
@@ -46,7 +46,4 @@ public String generate() {
 
         return new String(randomChars);
     }
-
-    public DatabaseEncryptionPasswordGenerator() {
-    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
index 12371cbaf8..90b8c342f6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/option/internal/OptionGroupCall.kt
@@ -32,7 +32,6 @@ import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallCoroutine
 import org.hisp.dhis.android.core.option.OptionGroup
 import org.koin.core.annotation.Singleton
 import java.lang.Boolean
-import kotlin.String
 
 @Singleton
 class OptionGroupCall internal constructor(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
index 27a061eaf8..7912b3b2ff 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleCall.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.validation.ValidationRule
 import org.koin.core.annotation.Singleton
 import java.lang.Boolean
-import kotlin.String
 
 @Singleton
 class ValidationRuleCall internal constructor(

From 041af9337a1409e5a1f7251a454bedbdf23ac9ea Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 19 Oct 2023 10:54:15 +0200
Subject: [PATCH 436/478] [ANDROSDK-1731-BASE-METHODS] Replace RxJava in
 pending tracker methods

---
 .../core/event/internal/EventDownloadCall.kt  |  4 +--
 .../internal/EventPersistenceCallFactory.kt   | 35 ++++++++-----------
 ...lationshipDownloadAndPersistCallFactory.kt |  4 +--
 .../TrackedEntityInstanceDownloadCall.kt      |  4 +--
 ...kedEntityInstancePersistenceCallFactory.kt | 34 ++++++++----------
 .../tracker/exporter/TrackerDownloadCall.kt   |  2 +-
 6 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
index 56e5858e65..553ea360a6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventDownloadCall.kt
@@ -70,12 +70,12 @@ internal class EventDownloadCall internal constructor(
         }
     }
 
-    override fun persistItems(
+    override suspend fun persistItems(
         items: List<Event>,
         params: IdentifiableDataHandlerParams,
         relatives: RelationshipItemRelatives,
     ) {
-        persistenceCallFactory.persistEvents(items, relatives).blockingAwait()
+        persistenceCallFactory.persistEvents(items, relatives)
     }
 
     override fun updateLastUpdated(bundle: EventQueryBundle) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
index 8b9575e9e9..77c38447e6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.event.internal
 
-import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
@@ -41,36 +40,32 @@ internal class EventPersistenceCallFactory(
     private val organisationUnitStore: OrganisationUnitStore,
     private val organisationUnitDownloader: OrganisationUnitModuleDownloader,
 ) {
-    fun persistEvents(events: Collection<Event>, relatives: RelationshipItemRelatives?): Completable {
-        return persistEventsInternal(events, asRelationship = false, relatives)
+    suspend fun persistEvents(events: Collection<Event>, relatives: RelationshipItemRelatives?) {
+        persistEventsInternal(events, asRelationship = false, relatives)
     }
 
-    fun persistAsRelationships(events: List<Event>): Completable {
-        return persistEventsInternal(events, asRelationship = true, relatives = null)
+    suspend fun persistAsRelationships(events: List<Event>) {
+        persistEventsInternal(events, asRelationship = true, relatives = null)
     }
 
-    private fun persistEventsInternal(
+    private suspend fun persistEventsInternal(
         events: Collection<Event>,
         asRelationship: Boolean,
         relatives: RelationshipItemRelatives?,
-    ): Completable {
-        return Completable.defer {
-            val params = IdentifiableDataHandlerParams(
-                hasAllAttributes = false,
-                overwrite = false,
-                asRelationship = asRelationship,
-            )
-            eventHandler.handleMany(events, params, relatives)
-            if (hasMissingOrganisationUnitUids(events)) {
-                organisationUnitDownloader.refreshOrganisationUnits()
-            } else {
-                Completable.complete()
-            }
+    ) {
+        val params = IdentifiableDataHandlerParams(
+            hasAllAttributes = false,
+            overwrite = false,
+            asRelationship = asRelationship,
+        )
+        eventHandler.handleMany(events, params, relatives)
+        if (hasMissingOrganisationUnitUids(events)) {
+            organisationUnitDownloader.refreshOrganisationUnits().blockingAwait()
         }
     }
 
     private fun hasMissingOrganisationUnitUids(events: Collection<Event>): Boolean {
         val uids = events.mapNotNull { it.organisationUnit() }.toSet()
-        return (uids - organisationUnitStore.selectUids()).isNotEmpty()
+        return (uids - organisationUnitStore.selectUids().toSet()).isNotEmpty()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
index 9badfb6421..fea875c513 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/relationship/internal/RelationshipDownloadAndPersistCallFactory.kt
@@ -66,7 +66,7 @@ internal class RelationshipDownloadAndPersistCallFactory(
             )
         }
 
-        eventPersistenceCallFactory.persistAsRelationships(events).blockingAwait()
+        eventPersistenceCallFactory.persistAsRelationships(events)
 
         events
             .mapNotNull { it.enrollment() }
@@ -110,7 +110,7 @@ internal class RelationshipDownloadAndPersistCallFactory(
             )
         }
 
-        teiPersistenceCallFactory.persistRelationships(teis).blockingAwait()
+        teiPersistenceCallFactory.persistRelationships(teis)
 
         cleanFailedRelationships(failedTeis, RelationshipItemTableInfo.Columns.TRACKED_ENTITY_INSTANCE)
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
index 4310271d06..9e0b4c545b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstanceDownloadCall.kt
@@ -68,12 +68,12 @@ internal class TrackedEntityInstanceDownloadCall(
         }
     }
 
-    override fun persistItems(
+    override suspend fun persistItems(
         items: List<TrackedEntityInstance>,
         params: IdentifiableDataHandlerParams,
         relatives: RelationshipItemRelatives,
     ) {
-        persistenceCallFactory.persistTEIs(items, params, relatives).blockingAwait()
+        persistenceCallFactory.persistTEIs(items, params, relatives)
     }
 
     override fun updateLastUpdated(bundle: TrackerQueryBundle) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
index 8838d632d5..bf5b79cb7c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.trackedentity.internal
 
-import io.reactivex.Completable
 import org.hisp.dhis.android.core.arch.handlers.internal.IdentifiableDataHandlerParams
 import org.hisp.dhis.android.core.organisationunit.internal.OrganisationUnitModuleDownloader
 import org.hisp.dhis.android.core.relationship.internal.RelationshipItemRelatives
@@ -40,39 +39,36 @@ internal class TrackedEntityInstancePersistenceCallFactory(
     private val uidsHelper: TrackedEntityInstanceUidHelper,
     private val organisationUnitDownloader: OrganisationUnitModuleDownloader,
 ) {
-    fun persistTEIs(
+    suspend fun persistTEIs(
         trackedEntityInstances: List<TrackedEntityInstance>,
         params: IdentifiableDataHandlerParams,
         relatives: RelationshipItemRelatives,
-    ): Completable {
-        return persistTEIsInternal(trackedEntityInstances, params, relatives)
+    ) {
+        persistTEIsInternal(trackedEntityInstances, params, relatives)
     }
 
-    fun persistRelationships(trackedEntityInstances: List<TrackedEntityInstance>): Completable {
+    suspend fun persistRelationships(trackedEntityInstances: List<TrackedEntityInstance>) {
         val params = IdentifiableDataHandlerParams(
             hasAllAttributes = false,
             overwrite = false,
             asRelationship = true,
         )
-        return persistTEIsInternal(trackedEntityInstances, params, relatives = null)
+
+        persistTEIsInternal(trackedEntityInstances, params, relatives = null)
     }
 
-    private fun persistTEIsInternal(
+    private suspend fun persistTEIsInternal(
         trackedEntityInstances: List<TrackedEntityInstance>,
         params: IdentifiableDataHandlerParams,
         relatives: RelationshipItemRelatives?,
-    ): Completable {
-        return Completable.defer {
-            trackedEntityInstanceHandler.handleMany(
-                trackedEntityInstances,
-                params,
-                relatives,
-            )
-            if (uidsHelper.hasMissingOrganisationUnitUids(trackedEntityInstances)) {
-                organisationUnitDownloader.refreshOrganisationUnits()
-            } else {
-                Completable.complete()
-            }
+    ) {
+        trackedEntityInstanceHandler.handleMany(
+            trackedEntityInstances,
+            params,
+            relatives,
+        )
+        if (uidsHelper.hasMissingOrganisationUnitUids(trackedEntityInstances)) {
+            organisationUnitDownloader.refreshOrganisationUnits().blockingAwait()
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
index 2480f344ac..c4cba08dd9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/tracker/exporter/TrackerDownloadCall.kt
@@ -369,7 +369,7 @@ internal abstract class TrackerDownloadCall<T, Q : BaseTrackerQueryBundle>(
 
     protected abstract suspend fun getPayloadResult(query: TrackerAPIQuery): Result<Payload<T>, D2Error>
 
-    protected abstract fun persistItems(
+    protected abstract suspend fun persistItems(
         items: List<T>,
         params: IdentifiableDataHandlerParams,
         relatives: RelationshipItemRelatives,

From d7035d08ce211634edf0556c70b021cfd3e06686 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 06:55:47 +0200
Subject: [PATCH 437/478] Rename .java to .kt

---
 ...ationUnitLevelService.java => OrganisationUnitLevelService.kt} | 0
 .../{OrganisationUnitService.java => OrganisationUnitService.kt}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitLevelService.java => OrganisationUnitLevelService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/{OrganisationUnitService.java => OrganisationUnitService.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.java b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.java
rename to core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt

From 0eccb65fc6c100cdb762344b5d1f5051e138f031 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 06:55:47 +0200
Subject: [PATCH 438/478] [ANDROSDK-1755] refactor: -
 OrganisationUnitModuleDownloader to coroutines

---
 ...ganisationUnitCallMockIntegrationShould.kt |  33 ++---
 .../api/executors/internal/APIDownloader.kt   |   2 +
 .../executors/internal/APIDownloaderImpl.kt   |  23 ++--
 .../core/domain/metadata/MetadataCall.kt      |   2 +-
 .../internal/OrganisationUnitCall.kt          | 114 +++++++++---------
 .../OrganisationUnitLevelEndpointCall.kt      |  14 +--
 .../internal/OrganisationUnitLevelService.kt  |  29 ++---
 .../OrganisationUnitModuleDownloader.kt       |  38 +++---
 .../internal/OrganisationUnitService.kt       |  70 +++++------
 .../domain/metadata/MetadataCallShould.kt     |  10 +-
 .../OrganisationUnitCallUnitShould.kt         |  64 +++++-----
 11 files changed, 202 insertions(+), 197 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
index 143dcfdac3..1df1dff5d7 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallMockIntegrationShould.kt
@@ -29,7 +29,8 @@ package org.hisp.dhis.android.core.organisationunit.internal
 
 import android.content.ContentValues
 import com.google.common.truth.Truth.assertThat
-import io.reactivex.Completable
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.db.tableinfos.TableInfo
 import org.hisp.dhis.android.core.category.CategoryComboTableInfo
 import org.hisp.dhis.android.core.common.IdentifiableColumns
@@ -52,10 +53,11 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(D2JunitRunner::class)
 class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
     // The return of the organisationUnitCall to be tested:
-    private lateinit var organisationUnitCall: Completable
+    private lateinit var organisationUnitCall: suspend () -> Unit
     private val expectedAfroArabicClinic = OrganisationUnitSamples.getAfroArabClinic()
     private val expectedAdonkiaCHP = OrganisationUnitSamples.getAdonkiaCHP()
 
@@ -94,15 +96,16 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
         )
         val organisationUnitCollectionCleaner = OrganisationUnitCollectionCleaner(databaseAdapter)
         val pathTransformer = OrganisationUnitDisplayPathTransformer()
-        organisationUnitCall = OrganisationUnitCall(
-            organisationUnitService,
-            organisationUnitHandler,
-            pathTransformer,
-            UserOrganisationUnitLinkStoreImpl(databaseAdapter),
-            OrganisationUnitStoreImpl(databaseAdapter),
-            organisationUnitCollectionCleaner,
-        )
-            .download(user)
+        organisationUnitCall = {
+            OrganisationUnitCall(
+                organisationUnitService,
+                organisationUnitHandler,
+                pathTransformer,
+                UserOrganisationUnitLinkStoreImpl(databaseAdapter),
+                OrganisationUnitStoreImpl(databaseAdapter),
+                organisationUnitCollectionCleaner,
+            ).download(user)
+        }
     }
 
     private fun insertObjectWithUid(uid: String, tableInfo: TableInfo) {
@@ -122,8 +125,8 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
     }
 
     @Test
-    fun persist_organisation_unit_tree() {
-        organisationUnitCall.blockingAwait()
+    fun persist_organisation_unit_tree() = runTest {
+        organisationUnitCall.invoke()
         val organisationUnitStore = OrganisationUnitStoreImpl(databaseAdapter)
         val dbAfroArabicClinic = organisationUnitStore.selectByUid(expectedAfroArabicClinic.uid())
         val dbAdonkiaCHP = organisationUnitStore.selectByUid(expectedAdonkiaCHP.uid())
@@ -133,8 +136,8 @@ class OrganisationUnitCallMockIntegrationShould : BaseMockIntegrationTestEmptyEn
     }
 
     @Test
-    fun persist_organisation_unit_user_links() {
-        organisationUnitCall.blockingAwait()
+    fun persist_organisation_unit_user_links() = runTest {
+        organisationUnitCall.invoke()
         val userOrganisationUnitStore = UserOrganisationUnitLinkStoreImpl(databaseAdapter)
         val userOrganisationUnitLinks = userOrganisationUnitStore.selectAll()
         val linkOrganisationUnits: MutableSet<String> = HashSet(2)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index 874b61827e..0ee467977a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -79,6 +79,8 @@ internal interface APIDownloader {
     ): List<P>
 
     fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>>
+    suspend fun <P> downloadCoroutines(handler: Handler<P>, downloader: suspend() -> Payload<P>): List<P>
+
     fun <P> downloadList(handler: Handler<P>, downloader: Single<List<P>>): Single<List<P>>
 
     suspend fun <P> downloadListAsCoroutine(handler: Handler<P>, downloader: suspend () -> List<P>): List<P>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index 1f87837f49..f71e150ff4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -47,7 +47,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: suspend(Set<String>) -> Payload<P>,
+        pageDownloader: suspend (Set<String>) -> Payload<P>,
     ): List<P> {
         return downloadPartitionedWithCustomHandling(
             uids,
@@ -61,7 +61,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: suspend(Set<String>) -> Payload<O>,
+        pageDownloader: suspend (Set<String>) -> Payload<O>,
         transform: (O) -> P,
     ): List<P> {
         return downloadPartitionedWithCustomHandling(
@@ -76,7 +76,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
     override suspend fun <P> downloadPartitioned(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: suspend(Set<String>) -> Payload<P>,
+        pageDownloader: suspend (Set<String>) -> Payload<P>,
     ): List<P> {
         return downloadPartitionedWithoutHandling(
             uids = uids,
@@ -89,7 +89,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
     private suspend fun <P, O> downloadPartitionedWithoutHandling(
         uids: Set<String>,
         pageSize: Int,
-        pageDownloader: suspend(Set<String>) -> Payload<O>,
+        pageDownloader: suspend (Set<String>) -> Payload<O>,
         transform: (O) -> P,
     ): List<P> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
@@ -108,7 +108,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
         uids: Set<String>,
         pageSize: Int,
         handler: Handler<P>,
-        pageDownloader: suspend(Set<String>) -> Payload<O>,
+        pageDownloader: suspend (Set<String>) -> Payload<O>,
         transform: (O) -> P,
     ): List<P> {
         val oCollection = downloadPartitionedWithoutHandling(
@@ -125,7 +125,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
         uids: Set<String>,
         pageSize: Int,
         handler: (Map<K, V>) -> Any,
-        pageDownloader: suspend(Set<String>) -> Map<K, V>,
+        pageDownloader: suspend (Set<String>) -> Map<K, V>,
     ): Map<K, V> {
         val partitions = CollectionsHelper.setPartition(uids, pageSize)
 
@@ -142,7 +142,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
     override suspend fun <P, O : CoreObject> downloadLink(
         masterUid: String,
         handler: LinkHandler<P, O>,
-        downloader: suspend(String) -> Payload<P>,
+        downloader: suspend (String) -> Payload<P>,
         transform: (P) -> O,
     ): List<P> {
         val items = downloader.invoke(masterUid).items()
@@ -154,7 +154,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
     override suspend fun <P> downloadWithLastUpdated(
         handler: Handler<P>,
         resourceType: Resource.Type,
-        downloader: suspend(String?) -> Payload<P>,
+        downloader: suspend (String?) -> Payload<P>,
     ): List<P> {
         val items = downloader(
             resourceHandler.getLastUpdated(resourceType),
@@ -171,6 +171,11 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
             .doOnSuccess { oCollection: List<P> -> handler.handleMany(oCollection) }
     }
 
+    override suspend fun <P> downloadCoroutines(handler: Handler<P>, downloader: suspend () -> Payload<P>): List<P> {
+        return downloader.invoke().items()
+            .also { handler.handleMany(it) }
+    }
+
     override fun <P> downloadList(handler: Handler<P>, downloader: Single<List<P>>): Single<List<P>> {
         return downloader
             .doOnSuccess { oCollection: List<P> -> handler.handleMany(oCollection) }
@@ -193,7 +198,7 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
 
     override suspend fun <P> downloadPagedPayload(
         pageSize: Int,
-        downloader: suspend(page: Int, pageSize: Int) -> Payload<P>,
+        downloader: suspend (page: Int, pageSize: Int) -> Payload<P>,
     ): Payload<P> {
         var page = 1
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 111d6b60eb..de7f760302 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -141,7 +141,7 @@ internal class MetadataCall(
         val user = userModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(User::class.java, false))
 
-        organisationUnitModuleDownloader.downloadMetadata(user).blockingAwait()
+        organisationUnitModuleDownloader.downloadMetadata(user)
         emit(progressManager.increaseProgress(OrganisationUnit::class.java, false))
 
         programDownloader.downloadMetadata()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
index 9506a7a1f3..71708d410c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCall.kt
@@ -27,9 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitTree
@@ -49,47 +46,45 @@ internal class OrganisationUnitCall(
     private val organisationUnitStore: OrganisationUnitStore,
     private val collectionCleaner: OrganisationUnitCollectionCleaner,
 ) {
-    fun download(user: User): Completable {
-        return Completable.defer {
-            handler.resetLinks()
-            val rootSearchOrgUnits =
-                OrganisationUnitTree.findRoots(UserInternalAccessor.accessTeiSearchOrganisationUnits(user))
 
-            downloadSearchOrgUnits(rootSearchOrgUnits, user)
-                .andThen(
-                    Completable.defer {
-                        val searchOrgUnitIds = userOrganisationUnitLinkStore
-                            .queryOrganisationUnitUidsByScope(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
-                        val searchOrgUnits = organisationUnitStore.selectByUids(searchOrgUnitIds)
-                        downloadDataCaptureOrgUnits(
-                            rootSearchOrgUnits,
-                            searchOrgUnits,
-                            user,
-                        )
-                    },
-                ).doOnComplete {
-                    val assignedOrgunitIds = userOrganisationUnitLinkStore
-                        .selectStringColumnsWhereClause(
-                            UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
-                            "1",
-                        )
-                    collectionCleaner.deleteNotPresentByUid(assignedOrgunitIds)
-                }
-        }
+    companion object {
+        private const val PAGE_SIZE = 500
+    }
+
+    suspend fun download(user: User) {
+        handler.resetLinks()
+        val rootSearchOrgUnits =
+            OrganisationUnitTree.findRoots(UserInternalAccessor.accessTeiSearchOrganisationUnits(user))
+
+        downloadSearchOrgUnits(rootSearchOrgUnits, user)
+        val searchOrgUnitIds = userOrganisationUnitLinkStore
+            .queryOrganisationUnitUidsByScope(OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
+        val searchOrgUnits = organisationUnitStore.selectByUids(searchOrgUnitIds)
+        downloadDataCaptureOrgUnits(
+            rootSearchOrgUnits,
+            searchOrgUnits,
+            user,
+        )
+        val assignedOrgunitIds = userOrganisationUnitLinkStore
+            .selectStringColumnsWhereClause(
+                UserOrganisationUnitLinkTableInfo.Columns.ORGANISATION_UNIT,
+                "1",
+            )
+        collectionCleaner.deleteNotPresentByUid(assignedOrgunitIds)
     }
 
-    private fun downloadSearchOrgUnits(
+    private suspend fun downloadSearchOrgUnits(
         rootSearchOrgUnits: Set<OrganisationUnit>,
         user: User,
-    ): Completable {
+    ) {
         return downloadOrgUnits(getUids(rootSearchOrgUnits), user, OrganisationUnit.Scope.SCOPE_TEI_SEARCH)
     }
 
-    private fun downloadDataCaptureOrgUnits(
+    private suspend fun downloadDataCaptureOrgUnits(
         rootSearchOrgUnits: Set<OrganisationUnit>,
         searchOrgUnits: List<OrganisationUnit>,
         user: User,
-    ): Completable {
+    ) {
         val allRootCaptureOrgUnits = OrganisationUnitTree.findRoots(UserInternalAccessor.accessOrganisationUnits(user))
         val rootCaptureOrgUnitsOutsideSearchScope =
             OrganisationUnitTree.findRootsOutsideSearchScope(allRootCaptureOrgUnits, rootSearchOrgUnits)
@@ -101,24 +96,23 @@ internal class OrganisationUnitCall(
             ),
             user,
         )
-        return downloadOrgUnits(
+        downloadOrgUnits(
             getUids(rootCaptureOrgUnitsOutsideSearchScope),
             user,
             OrganisationUnit.Scope.SCOPE_DATA_CAPTURE,
         )
     }
 
-    private fun downloadOrgUnits(
+    private suspend fun downloadOrgUnits(
         orgUnits: Set<String>,
         user: User,
         scope: OrganisationUnit.Scope,
-    ): Completable {
-        return if (orgUnits.isEmpty()) {
-            Completable.complete()
+    ) {
+        if (orgUnits.isEmpty()) {
+            return
         } else {
             handler.setData(user, scope)
-            Flowable.fromIterable(orgUnits)
-                .flatMapCompletable { orgUnit -> downloadOrganisationUnitAndDescendants(orgUnit) }
+            orgUnits.forEach { orgUnit -> downloadOrganisationUnitAndDescendants(orgUnit) }
         }
     }
 
@@ -127,30 +121,30 @@ internal class OrganisationUnitCall(
         handler.addUserOrganisationUnitLinks(orgUnits)
     }
 
-    private fun downloadOrganisationUnitAndDescendants(orgUnit: String): Completable {
+    private suspend fun downloadOrganisationUnitAndDescendants(orgUnit: String) {
         val page = AtomicInteger(1)
-        return downloadPage(orgUnit, page)
-            .repeat()
-            .takeUntil { organisationUnits -> organisationUnits.size < PAGE_SIZE }
-            .ignoreElements()
-    }
 
-    private fun downloadPage(orgUnit: String, page: AtomicInteger): Single<List<OrganisationUnit>> {
-        return Single.defer {
-            organisationUnitService.getOrganisationUnits(
-                OrganisationUnitFields.allFields,
-                OrganisationUnitFields.path.like(orgUnit),
-                OrganisationUnitFields.ASC_ORDER,
-                true,
-                PAGE_SIZE,
-                page.getAndIncrement(),
-            )
-                .map { obj -> obj.items() }
-                .doOnSuccess { items -> handler.handleMany(items, pathTransformer) }
+        while (true) {
+            val organisationUnits = downloadPage(orgUnit, page)
+            if (organisationUnits.size < PAGE_SIZE) {
+                break
+            }
         }
     }
 
-    companion object {
-        private const val PAGE_SIZE = 500
+    private suspend fun downloadPage(orgUnit: String, page: AtomicInteger): List<OrganisationUnit> {
+        val response = organisationUnitService.getOrganisationUnits(
+            OrganisationUnitFields.allFields,
+            OrganisationUnitFields.path.like(orgUnit),
+            OrganisationUnitFields.ASC_ORDER,
+            true,
+            PAGE_SIZE,
+            page.getAndIncrement(),
+        )
+
+        val items = response.items()
+        handler.handleMany(items, pathTransformer)
+
+        return items
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
index 1a62aa0ffa..8b35bd551f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelEndpointCall.kt
@@ -27,23 +27,21 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.executors.internal.APIDownloader
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCall
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallCoroutines
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
 import org.koin.core.annotation.Singleton
-import java.lang.Boolean
 
 @Singleton
 internal class OrganisationUnitLevelEndpointCall(
     private val service: OrganisationUnitLevelService,
     private val handler: OrganisationUnitLevelHandler,
     private val apiDownloader: APIDownloader,
-) : ListCall<OrganisationUnitLevel> {
-    override fun download(): Single<List<OrganisationUnitLevel>> {
-        return apiDownloader.download(
+) : ListCallCoroutines<OrganisationUnitLevel> {
+    override suspend fun download(): List<OrganisationUnitLevel> {
+        return apiDownloader.downloadCoroutines(
             handler,
-            service.getOrganisationUnitLevels(OrganisationUnitLevelFields.allFields, Boolean.FALSE),
-        )
+
+        ) { service.getOrganisationUnitLevels(OrganisationUnitLevelFields.allFields, false) }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.kt
index 50dc16659d..713d866456 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitLevelService.kt
@@ -25,22 +25,19 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.organisationunit.internal;
+package org.hisp.dhis.android.core.organisationunit.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel;
-
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface OrganisationUnitLevelService {
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnitLevel
+import retrofit2.http.GET
+import retrofit2.http.Query
 
+fun interface OrganisationUnitLevelService {
     @GET("organisationUnitLevels")
-    Single<Payload<OrganisationUnitLevel>> getOrganisationUnitLevels(
-            @Query("fields") @Which Fields<OrganisationUnitLevel> fields,
-            @Query("paging") Boolean paging);
-
-}
\ No newline at end of file
+    suspend fun getOrganisationUnitLevels(
+        @Query("fields") @Which fields: Fields<OrganisationUnitLevel>,
+        @Query("paging") paging: Boolean,
+    ): Payload<OrganisationUnitLevel>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index 7cf9f27657..0be959d6c9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -28,8 +28,8 @@
 package org.hisp.dhis.android.core.organisationunit.internal
 
 import io.reactivex.Completable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.api.executors.internal.RxAPICallExecutor
+import kotlinx.coroutines.rx2.rxCompletable
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.user.User
@@ -41,29 +41,29 @@ internal class OrganisationUnitModuleDownloader(
     private val organisationUnitCall: OrganisationUnitCall,
     private val userCall: UserCall,
     private val organisationUnitLevelEndpointCall: OrganisationUnitLevelEndpointCall,
-    private val rxCallExecutor: RxAPICallExecutor,
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataSetLinkCleaner: DataSetOrganisationUnitLinkCleaner,
     private val programLinkCleaner: ProgramOrganisationUnitLinkCleaner,
 ) {
-    fun downloadMetadata(user: User): Completable {
-        return organisationUnitLevelEndpointCall.download()
-            .flatMapCompletable { organisationUnitCall.download(user) }
+    suspend fun downloadMetadata(user: User) {
+        organisationUnitLevelEndpointCall.download()
+        organisationUnitCall.download(user)
+    }
+
+     fun refreshOrganisationUnits(): Completable {
+        return rxCompletable {
+            coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+                val user = userCall.call()
+                downloadMetadata(user)
+                cleanLinksFromDB()
+            }
+
     }
 
-    fun refreshOrganisationUnits(): Completable {
-        return rxCallExecutor.wrapCompletableTransactionally(
-            Single
-                .fromCallable { userCall.call() }
-                .flatMapCompletable { user -> downloadMetadata(user) }
-                .andThen(cleanLinksFromDB()),
-            cleanForeignKeys = true,
-        )
     }
 
-    private fun cleanLinksFromDB(): Completable {
-        return Completable.fromCallable {
-            dataSetLinkCleaner.deleteNotPresentInDb()
-            programLinkCleaner.deleteNotPresentInDb()
-        }
+    private fun cleanLinksFromDB() {
+        dataSetLinkCleaner.deleteNotPresentInDb()
+        programLinkCleaner.deleteNotPresentInDb()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
index 119f0a2b40..7713b9ebca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
@@ -25,44 +25,44 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.organisationunit.internal;
+package org.hisp.dhis.android.core.organisationunit.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.organisationunit.OrganisationUnit;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import io.reactivex.Single;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface OrganisationUnitService {
-    String ORGANISATION_UNITS = "organisationUnits";
-
-    String FIELDS = "fields";
-    String FILTER = "filter";
-    String PAGING = "paging";
-    String ORDER = "order";
-    String PAGE = "page";
-    String PAGE_SIZE = "pageSize";
+internal interface OrganisationUnitService {
 
     @GET(ORGANISATION_UNITS)
-    Single<Payload<OrganisationUnit>> getOrganisationUnits(
-            @Query(FIELDS) @Which Fields<OrganisationUnit> fields,
-            @Query(FILTER) @Where Filter<OrganisationUnit, String> filter,
-            @Query(ORDER) String order,
-            @Query(PAGING) Boolean paging,
-            @Query(PAGE_SIZE) Integer pageSize,
-            @Query(PAGE) Integer page
-    );
+    suspend fun getOrganisationUnits(
+        @Query(FIELDS) @Which fields: Fields<OrganisationUnit>,
+        @Query(FILTER) @Where filter: Filter<OrganisationUnit, String>,
+        @Query(ORDER) order: String,
+        @Query(PAGING) paging: Boolean,
+        @Query(PAGE_SIZE) pageSize: Int,
+        @Query(PAGE) page: Int,
+    ): Payload<OrganisationUnit>
 
     @GET(ORGANISATION_UNITS)
-    Single<Payload<OrganisationUnit>> getSearchOrganisationUnits(
-            @Query(FIELDS) @Which Fields<OrganisationUnit> fields,
-            @Query(FILTER) @Where Filter<OrganisationUnit, String> filter,
-            @Query(ORDER) String order,
-            @Query(PAGING) Boolean paging
-    );
-}
\ No newline at end of file
+    suspend fun getSearchOrganisationUnits(
+        @Query(FIELDS) @Which fields: Fields<OrganisationUnit>,
+        @Query(FILTER) @Where filter: Filter<OrganisationUnit, String>,
+        @Query(ORDER) order: String,
+        @Query(PAGING) paging: Boolean,
+    ): Payload<OrganisationUnit>
+
+    companion object {
+        const val ORGANISATION_UNITS = "organisationUnits"
+        const val FIELDS = "fields"
+        const val FILTER = "filter"
+        const val PAGING = "paging"
+        const val ORDER = "order"
+        const val PAGE = "page"
+        const val PAGE_SIZE = "pageSize"
+    }
+}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 70ef5dc445..6cdbfb1992 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -121,10 +121,10 @@ class MetadataCallShould : BaseCallShould() {
         programDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(Unit)
         }
+        organisationUnitDownloader.stub {
+            onBlocking { downloadMetadata(same(user)) }.doReturn(Unit)
+        }
 
-        whenever(organisationUnitDownloader.downloadMetadata(same(user))).thenReturn(
-            Completable.complete(),
-        )
         whenever(dataSetDownloader.downloadMetadata()).thenReturn(
             Completable.complete(),
         )
@@ -226,8 +226,8 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_organisation_unit_call_fail() {
-        whenever(organisationUnitDownloader.downloadMetadata(user)).thenReturn(Completable.error(networkError))
+    fun fail_when_organisation_unit_call_fail() = runTest {
+        whenever(organisationUnitDownloader.downloadMetadata(user)) doAnswer { throw networkError }
         downloadAndAssertError()
     }
 
diff --git a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
index 614aa3c020..08a7260f4a 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitCallUnitShould.kt
@@ -29,8 +29,8 @@ package org.hisp.dhis.android.core.organisationunit.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.*
-import io.reactivex.Completable
-import io.reactivex.Single
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
 import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
@@ -45,6 +45,7 @@ import org.junit.runners.JUnit4
 import java.io.IOException
 import java.util.*
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class OrganisationUnitCallUnitShould {
     private val organisationUnitPayload: Payload<OrganisationUnit> = mock()
@@ -69,7 +70,7 @@ class OrganisationUnitCallUnitShould {
 
     // the call we are testing:
     private lateinit var lastUpdated: Date
-    private lateinit var organisationUnitCall: Completable
+    private lateinit var organisationUnitCall: suspend () -> Unit
 
     @Suppress("LongMethod")
     @Before
@@ -114,35 +115,40 @@ class OrganisationUnitCallUnitShould {
         whenever(user.phoneNumber()).doReturn("user_phone_number")
         whenever(user.nationality()).doReturn("user_nationality")
 
-        organisationUnitCall = OrganisationUnitCall(
-            organisationUnitService,
-            organisationUnitHandler,
-            organisationUnitDisplayPathTransformer,
-            userOrganisationUnitLinkStore,
-            organisationUnitStore,
-            collectionCleaner,
-        )
-            .download(user)
+        organisationUnitCall = {
+            OrganisationUnitCall(
+                organisationUnitService,
+                organisationUnitHandler,
+                organisationUnitDisplayPathTransformer,
+                userOrganisationUnitLinkStore,
+                organisationUnitStore,
+                collectionCleaner,
+            ).download(user)
+        }
 
         // Return only one organisationUnit.
         val organisationUnits = listOf(organisationUnit)
         whenever(UserInternalAccessor.accessOrganisationUnits(user)).doReturn(organisationUnits)
-        whenever(
-            organisationUnitService.getOrganisationUnits(
-                fieldsCaptor.capture(),
-                filtersCaptor.capture(),
-                orderCaptor.capture(),
-                pagingCaptor.capture(),
-                pageSizeCaptor.capture(),
-                pageCaptor.capture(),
-            ),
-        ).doReturn(Single.just(organisationUnitPayload))
+
+        organisationUnitService.stub {
+            onBlocking {
+                organisationUnitService.getOrganisationUnits(
+                    fieldsCaptor.capture(),
+                    filtersCaptor.capture(),
+                    orderCaptor.capture(),
+                    pagingCaptor.capture(),
+                    pageSizeCaptor.capture(),
+                    pageCaptor.capture(),
+                )
+            } doReturn organisationUnitPayload
+        }
+
         whenever(organisationUnitPayload.items()).doReturn(organisationUnits)
     }
 
     @Test
-    fun invoke_server_with_correct_parameters() {
-        organisationUnitCall.blockingGet()
+    fun invoke_server_with_correct_parameters() = runTest {
+        organisationUnitCall.invoke()
 
         assertThat(fieldsCaptor.firstValue).isEqualTo(OrganisationUnitFields.allFields)
         assertThat(filtersCaptor.firstValue.operator()).isEqualTo("like")
@@ -153,16 +159,16 @@ class OrganisationUnitCallUnitShould {
     }
 
     @Test
-    fun invoke_handler_if_request_succeeds() {
-        organisationUnitCall.blockingGet()
+    fun invoke_handler_if_request_succeeds() = runTest {
+        organisationUnitCall.invoke()
 
         verify(organisationUnitHandler, times(1)).handleMany(any(), any())
     }
 
     @Test
-    fun perform_call_twice_on_consecutive_calls() {
-        organisationUnitCall.blockingGet()
-        organisationUnitCall.blockingGet()
+    fun perform_call_twice_on_consecutive_calls() = runTest {
+        organisationUnitCall.invoke()
+        organisationUnitCall.invoke()
 
         verify(organisationUnitHandler, times(2)).handleMany(any(), any())
     }

From c98e726e3d61faea5efbbed5788a6d64270c8f0b Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 07:04:05 +0200
Subject: [PATCH 439/478] [ANDROSDK-1755] refactor: - Remove rxCompletable from
 OrganisationUnitModuleDownloader

---
 .../internal/EventPersistenceCallFactory.kt    |  2 +-
 .../OrganisationUnitModuleDownloader.kt        | 18 ++++++------------
 .../internal/OrganisationUnitService.kt        |  1 +
 ...ckedEntityInstancePersistenceCallFactory.kt |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
index 77c38447e6..88d335ceaa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/event/internal/EventPersistenceCallFactory.kt
@@ -60,7 +60,7 @@ internal class EventPersistenceCallFactory(
         )
         eventHandler.handleMany(events, params, relatives)
         if (hasMissingOrganisationUnitUids(events)) {
-            organisationUnitDownloader.refreshOrganisationUnits().blockingAwait()
+            organisationUnitDownloader.refreshOrganisationUnits()
         }
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
index 0be959d6c9..cb0f008529 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitModuleDownloader.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.organisationunit.internal
 
-import io.reactivex.Completable
-import kotlinx.coroutines.rx2.rxCompletable
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.dataset.internal.DataSetOrganisationUnitLinkCleaner
 import org.hisp.dhis.android.core.program.internal.ProgramOrganisationUnitLinkCleaner
@@ -50,16 +48,12 @@ internal class OrganisationUnitModuleDownloader(
         organisationUnitCall.download(user)
     }
 
-     fun refreshOrganisationUnits(): Completable {
-        return rxCompletable {
-            coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
-                val user = userCall.call()
-                downloadMetadata(user)
-                cleanLinksFromDB()
-            }
-
-    }
-
+    suspend fun refreshOrganisationUnits() {
+        coroutineAPICallExecutor.wrapTransactionally(cleanForeignKeyErrors = true) {
+            val user = userCall.call()
+            downloadMetadata(user)
+            cleanLinksFromDB()
+        }
     }
 
     private fun cleanLinksFromDB() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
index 7713b9ebca..8cd7d1bda3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/organisationunit/internal/OrganisationUnitService.kt
@@ -38,6 +38,7 @@ import retrofit2.http.Query
 
 internal interface OrganisationUnitService {
 
+    @Suppress("LongParameterList")
     @GET(ORGANISATION_UNITS)
     suspend fun getOrganisationUnits(
         @Query(FIELDS) @Which fields: Fields<OrganisationUnit>,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
index bf5b79cb7c..be87f4519e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/TrackedEntityInstancePersistenceCallFactory.kt
@@ -68,7 +68,7 @@ internal class TrackedEntityInstancePersistenceCallFactory(
             relatives,
         )
         if (uidsHelper.hasMissingOrganisationUnitUids(trackedEntityInstances)) {
-            organisationUnitDownloader.refreshOrganisationUnits().blockingAwait()
+            organisationUnitDownloader.refreshOrganisationUnits()
         }
     }
 }

From 625fbca219f231ee27427b9a4b4ac60a43ae699b Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 19 Oct 2023 09:07:32 +0200
Subject: [PATCH 440/478] [ANDROSDK-1757] refactor: - DataSetModuleDownloader
 to coroutines

---
 .../internal/UidsCallFactoryCoroutines.kt     | 35 ++++++++++++
 .../internal/UidsCallFactoryCoroutinesImpl.kt | 51 +++++++++++++++++
 .../internal/DataSetModuleDownloader.kt       | 57 ++++++++++---------
 .../core/domain/metadata/MetadataCall.kt      |  2 +-
 4 files changed, 118 insertions(+), 27 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
new file mode 100644
index 0000000000..1083e25f8c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import java.util.concurrent.Callable
+
+internal fun interface UidsCallFactoryCoroutines<P> {
+    suspend fun create(uids: Set<String>): List<P>
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
new file mode 100644
index 0000000000..a3c2215704
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
+
+internal abstract class UidsCallFactoryCoroutinesImpl<P> protected constructor(
+    protected val data: GenericCallData,
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
+) : UidsCallFactoryCoroutines<P> {
+    override suspend fun create(uids: Set<String>): List<P> {
+        val objects: List<P> = fetcher(uids)
+        processor().process(objects)
+        return objects
+    }
+
+    protected abstract suspend fun fetcher(uids: Set<String>): List<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index b3c218508f..620e7b6669 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -27,52 +27,57 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
+import dagger.Reusable
 import io.reactivex.Completable
 import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryCoroutines
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.dataelement.internal.DataElementEndpointCallFactory
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCallCoroutines
-import org.koin.core.annotation.Singleton
+import javax.inject.Inject
 
-@Singleton
-internal class DataSetModuleDownloader internal constructor(
-    private val dataSetCallFactory: DataSetEndpointCallFactory,
-    private val dataElementCallFactory: DataElementEndpointCallFactory,
+@Suppress("LongParameterList")
+@Reusable
+internal class DataSetModuleDownloader @Inject internal constructor(
+    private val dataSetCallFactory: UidsCallFactoryCoroutines<DataSet>,
+    private val dataElementCallFactory: UidsCallFactoryCoroutines<DataElement>,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val validationRuleCall: ValidationRuleCall,
     private val validationRuleUidsCall: ValidationRuleUidsCallCoroutines,
     private val periodHandler: PeriodHandler,
     private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Completable.fromCallable {
-            val orgUnitDataSetUids = dataSetOrganisationUnitLinkStore
-                .selectDistinctSlaves(DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET)
-            val dataSets = dataSetCallFactory.create(orgUnitDataSetUids).call()
+    override suspend fun downloadMetadata() {
 
-            val dataElements = dataElementCallFactory.create(
-                DataSetParentUidsHelper.getDataElementUids(dataSets),
-            ).call()
+        val orgUnitDataSetUids = dataSetOrganisationUnitLinkStore
+            .selectDistinctSlaves(DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET)
+        val dataSets = dataSetCallFactory.create(orgUnitDataSetUids)
 
-            val optionSetUids = DataSetParentUidsHelper.getAssignedOptionSetUids(dataElements)
-            runBlocking {
-                optionSetCall.download(optionSetUids)
-                optionCall.download(optionSetUids)
-            }
+        val dataElements = dataElementCallFactory.create(
+            DataSetParentUidsHelper.getDataElementUids(dataSets),
+        )
+
+        val optionSetUids = DataSetParentUidsHelper.getAssignedOptionSetUids(dataElements)
+        optionSetCall.download(optionSetUids)
+        optionCall.download(optionSetUids)
+
+
+        val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
+        validationRuleCall.download(getUids(validationRuleUids))
+
+        periodHandler.generateAndPersist()
 
-            runBlocking {
-                val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
-                validationRuleCall.download(getUids(validationRuleUids))
-            }
-            periodHandler.generateAndPersist()
-        }
     }
+
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 111d6b60eb..571d0b61d6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -147,7 +147,7 @@ internal class MetadataCall(
         programDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Program::class.java, false))
 
-        dataSetDownloader.downloadMetadata().blockingAwait()
+        dataSetDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(DataSet::class.java, false))
 
         categoryDownloader.downloadMetadata()

From e298c7faf7932b4239f5257251bd45489157d8c3 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 08:37:56 +0200
Subject: [PATCH 441/478] Rename .java to .kt

---
 ...idsNoResourceCallFetcher.java => UidsNoResourceCallFetcher.kt} | 0
 .../internal/{DataElementService.java => DataElementService.kt}   | 0
 .../dataset/internal/{DataSetService.java => DataSetService.kt}   | 0
 .../internal/{IndicatorService.java => IndicatorService.kt}       | 0
 .../{IndicatorTypeService.java => IndicatorTypeService.kt}        | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{UidsNoResourceCallFetcher.java => UidsNoResourceCallFetcher.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementService.java => DataElementService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetService.java => DataSetService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorService.java => IndicatorService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorTypeService.java => IndicatorTypeService.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt

From a7502496aa9818d9f3904e5511b6ba72af35ce6d Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 08:37:56 +0200
Subject: [PATCH 442/478] [ANDROSDK-1757] refactor: - DataSetModuleDownloader
 from RxJava to Coroutines [ANDROSDK-1761] - IndicatorModuleDownloader  from
 RxJava to Coroutines

---
 ...lementEndpointCallRealIntegrationShould.kt | 11 ++-
 ...ataSetEndpointCallRealIntegrationShould.kt | 11 ++-
 .../factories/internal/UidsCallFactory.kt     |  4 +-
 .../internal/UidsCallFactoryCoroutines.kt     | 35 ----------
 .../internal/UidsCallFactoryCoroutinesImpl.kt | 51 --------------
 .../factories/internal/UidsCallFactoryImpl.kt | 18 ++---
 .../internal/UidsNoResourceCallFetcher.kt     | 68 ++++++++-----------
 .../DataElementEndpointCallFactory.kt         | 20 +++---
 .../internal/DataElementService.kt            | 36 +++++-----
 .../internal/DataSetEndpointCallFactory.kt    | 17 +++--
 .../internal/DataSetModuleDownloader.kt       | 23 ++-----
 .../core/dataset/internal/DataSetService.kt   | 32 ++++-----
 .../core/domain/metadata/MetadataCall.kt      |  2 +-
 .../internal/IndicatorEndpointCallFactory.kt  | 18 ++---
 .../internal/IndicatorModuleDownloader.kt     | 19 +++---
 .../indicator/internal/IndicatorService.kt    | 33 +++++----
 .../IndicatorTypeEndpointCallFactory.kt       | 18 ++---
 .../internal/IndicatorTypeService.kt          | 33 +++++----
 .../domain/metadata/MetadataCallShould.kt     | 15 ++--
 19 files changed, 173 insertions(+), 291 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
index 43b0602222..43ab497023 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
@@ -30,22 +30,21 @@ package org.hisp.dhis.android.core.dataelement.internal
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.junit.Before
-import java.util.concurrent.Callable
 
 class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     /**
      * A quick integration test that is probably flaky, but will help with finding bugs related to the
      * metadataSyncCall. It works against the demo server.
      */
-    private var dataElementCall: Callable<List<DataElement>>? = null
+    private lateinit var dataElementCall: suspend () -> List<DataElement>
 
     @Before
     override fun setUp() {
         super.setUp()
-        dataElementCall = createCall()
+        dataElementCall = { createCall() }
     }
 
-    private fun createCall(): Callable<List<DataElement>> {
+    private suspend fun createCall(): List<DataElement> {
         val uids = setOf(
             "FTRrcoaog83",
             "P3jJH5Tu5VC",
@@ -55,7 +54,7 @@ class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     // @Test
-    fun download_data_elements() {
+    suspend fun download_data_elements() {
         d2.userModule().logIn(username, password, url).blockingGet()
 
         /*  This test won't pass independently of DataElementEndpointCallFactory and
@@ -63,6 +62,6 @@ class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             To run the test, you will need to disable foreign key support in database in
             DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
             uncomment the @Test tag */
-        dataElementCall!!.call()
+        dataElementCall.invoke()
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
index 70b2409ce9..8b2ed3f8e6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.junit.Before
-import java.util.concurrent.Callable
 
 class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
@@ -38,21 +37,21 @@ class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
      * A quick integration test that is probably flaky, but will help with finding bugs related to the
      * metadataSyncCall. It works against the demo server.
      */
-    private var dataSetCall: Callable<List<DataSet>>? = null
+    private lateinit var dataSetCall: suspend () -> List<DataSet>
 
     @Before
     override fun setUp() {
         super.setUp()
-        dataSetCall = createCall()
+        dataSetCall = { createCall() }
     }
 
-    private fun createCall(): Callable<List<DataSet>> {
+    private suspend fun createCall(): List<DataSet> {
         return getD2DIComponent(d2).dataSetCallFactory.create(setOf("lyLU2wR22tC", "BfMAe6Itzgt"))
     }
 
     // @Test
     @Throws(Exception::class)
-    fun download_data_sets() {
+    suspend fun download_data_sets() {
         if (!d2.userModule().isLogged().blockingGet()) {
             d2.userModule().logIn(username, password, url).blockingGet()
         }
@@ -62,6 +61,6 @@ class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             To run the test, you will need to disable foreign key support in database in
             DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
             uncomment the @Test tag */
-        dataSetCall!!.call()
+        dataSetCall.invoke()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
index f86de19f91..0a2b0d7aaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import java.util.concurrent.Callable
-
 internal fun interface UidsCallFactory<P> {
-    fun create(uids: Set<String>): Callable<List<P>>
+    suspend fun create(uids: Set<String>): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
deleted file mode 100644
index 1083e25f8c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import java.util.concurrent.Callable
-
-internal fun interface UidsCallFactoryCoroutines<P> {
-    suspend fun create(uids: Set<String>): List<P>
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
deleted file mode 100644
index a3c2215704..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
-
-internal abstract class UidsCallFactoryCoroutinesImpl<P> protected constructor(
-    protected val data: GenericCallData,
-    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
-) : UidsCallFactoryCoroutines<P> {
-    override suspend fun create(uids: Set<String>): List<P> {
-        val objects: List<P> = fetcher(uids)
-        processor().process(objects)
-        return objects
-    }
-
-    protected abstract suspend fun fetcher(uids: Set<String>): List<P>
-    protected abstract fun processor(): CallProcessor<P>
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
index 11da4da267..379448978f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
@@ -27,21 +27,21 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
 
-abstract class UidsCallFactoryImpl<P> protected constructor(
+internal abstract class UidsCallFactoryImpl<P> protected constructor(
     @JvmField protected val data: GenericCallData,
-    @JvmField protected val apiCallExecutor: APICallExecutor,
+    @JvmField protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : UidsCallFactory<P> {
-    override fun create(uids: Set<String>): Callable<List<P>> {
-        return EndpointCall(fetcher(uids), processor())
+    override suspend fun create(uids: Set<String>): List<P> {
+        val objects: List<P> = fetcher(uids).fetch()
+        processor().process(objects)
+        return objects
     }
 
-    protected abstract fun fetcher(uids: Set<String>): CallFetcher<P>
+    protected abstract suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<P>
     protected abstract fun processor(): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
index e8315b17b9..1ddd056ccf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
@@ -25,54 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
-package org.hisp.dhis.android.core.arch.call.fetchers.internal;
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
-import org.hisp.dhis.android.core.maintenance.D2Error;
+internal abstract class UidsNoResourceCallFetcher<P> protected constructor(
+    private val uids: Set<String>,
+    private val limit: Int,
+    private val apiCallExecutor: CoroutineAPICallExecutor,
+) : CoroutineCallFetcher<P> {
+    protected abstract suspend fun getCall(query: UidsQuery?): Payload<P>
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public abstract class UidsNoResourceCallFetcher<P> implements CallFetcher<P> {
-
-    private final Set<String> uids;
-    private final int limit;
-    private final APICallExecutor apiCallExecutor;
-
-    protected UidsNoResourceCallFetcher(Set<String> uids, int limit, APICallExecutor apiCallExecutor) {
-        this.uids = uids;
-        this.limit = limit;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    protected abstract retrofit2.Call<Payload<P>> getCall(UidsQuery query);
-
-    @Override
-    public final List<P> fetch() throws D2Error {
+    @Throws(D2Error::class)
+    override suspend fun fetch(): List<P> {
         if (uids.isEmpty()) {
-            return Collections.emptyList();
+            return emptyList()
         }
-
-        List<P> objects = new ArrayList<>();
+        val objects: MutableList<P> = ArrayList()
         if (!uids.isEmpty()) {
-            List<Set<String>> partitions = CollectionsHelper.setPartition(uids, limit);
-
-            for (Set<String> partitionUids : partitions) {
-                UidsQuery uidQuery = UidsQuery.create(partitionUids);
-                List<P> callObjects = apiCallExecutor.executePayloadCall(getCall(uidQuery));
-                objects.addAll(transform(callObjects));
+            val partitions = CollectionsHelper.setPartition(
+                uids,
+                limit,
+            )
+            for (partitionUids in partitions) {
+                val uidQuery = UidsQuery.create(partitionUids)
+                val callObjects: List<P> = apiCallExecutor.wrap { getCall(uidQuery) }.getOrThrow().items()
+                objects.addAll(transform(callObjects))
             }
         }
-        return objects;
+        return objects
     }
 
-    protected List<P> transform(List<P> list) {
-        return list;
+    protected fun transform(list: List<P>): List<P> {
+        return list
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
index 16405f5dc7..75850929b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.dataelement.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -39,26 +39,24 @@ import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class DataElementEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: DataElementService,
     private val handler: DataElementHandler,
-) : UidsCallFactoryImpl<DataElement>(data, apiCallExecutor) {
-    override fun fetcher(uids: Set<String>): CallFetcher<DataElement> {
-        return object :
-            UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+) : UidsCallFactoryImpl<DataElement>(data, coroutineAPICallExecutor) {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<DataElement> {
+        return object : UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
             var accessReadFilter = "access." + AccessFields.read.eq(true).generateString()
-            override fun getCall(query: UidsQuery): Call<Payload<DataElement>> {
+            override suspend fun getCall(query: UidsQuery?): Payload<DataElement> {
                 return service.getDataElements(
                     DataElementFields.allFields,
-                    DataElementFields.uid.`in`(query.uids()),
+                    DataElementFields.uid.`in`(query?.uids()),
                     DataElementFields.lastUpdated.gt(null),
                     accessReadFilter,
-                    query.paging(),
+                    query?.paging() ?: false,
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
index 3b15746004..37a58adc5b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
@@ -25,24 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataelement.internal;
+package org.hisp.dhis.android.core.dataelement.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.dataelement.DataElement;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.dataelement.DataElement
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface DataElementService {
+internal fun interface DataElementService {
     @GET("dataElements")
-    Call<Payload<DataElement>> getDataElements(@Query("fields") @Which Fields<DataElement> fields,
-                                               @Query("filter") @Where Filter<DataElement, String> uids,
-                                               @Query("filter") @Where Filter<DataElement, String> lastUpdated,
-                                               @Query("filter") String accessReadFilter,
-                                               @Query("paging") Boolean paging);
-}
\ No newline at end of file
+    suspend fun getDataElements(
+        @Query("fields") @Which fields: Fields<DataElement>,
+        @Query("filter") @Where uids: Filter<DataElement?, String>,
+        @Query("filter") @Where lastUpdated: Filter<DataElement, String>?,
+        @Query("filter") accessReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<DataElement>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
index f56a650e84..fbcaef42dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -40,26 +40,25 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.resource.internal.Resource
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class DataSetEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataSetService: DataSetService,
     private val dataSetHandler: DataSetHandler,
-) : UidsCallFactoryImpl<DataSet>(data, apiCallExecutor) {
+) : UidsCallFactoryImpl<DataSet>(data, coroutineAPICallExecutor) {
     private val resourceType = Resource.Type.DATA_SET
-    override fun fetcher(uids: Set<String>): CallFetcher<DataSet> {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<DataSet> {
         return object :
-            UidsNoResourceCallFetcher<DataSet>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+            UidsNoResourceCallFetcher<DataSet>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
             var accessDataReadFilter =
                 "access.data." + DataAccessFields.read.eq(true).generateString()
 
-            override fun getCall(query: UidsQuery): Call<Payload<DataSet>> {
+            override suspend fun getCall(query: UidsQuery?): Payload<DataSet> {
                 return dataSetService.getDataSets(
                     DataSetFields.allFields,
-                    DataSetFields.uid.`in`(query.uids()),
+                    DataSetFields.uid.`in`(query?.uids()),
                     accessDataReadFilter,
                     false,
                 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index 620e7b6669..9c6d19cc0a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -27,29 +27,22 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
-import io.reactivex.Completable
-import kotlinx.coroutines.runBlocking
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryCoroutines
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataelement.internal.DataElementEndpointCallFactory
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCallCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 @Suppress("LongParameterList")
-@Reusable
-internal class DataSetModuleDownloader @Inject internal constructor(
-    private val dataSetCallFactory: UidsCallFactoryCoroutines<DataSet>,
-    private val dataElementCallFactory: UidsCallFactoryCoroutines<DataElement>,
+@Singleton
+internal class DataSetModuleDownloader(
+    private val dataSetCallFactory: DataSetEndpointCallFactory,
+    private val dataElementCallFactory: DataElementEndpointCallFactory,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val validationRuleCall: ValidationRuleCall,
@@ -59,7 +52,6 @@ internal class DataSetModuleDownloader @Inject internal constructor(
 ) : UntypedModuleDownloaderCoroutines {
 
     override suspend fun downloadMetadata() {
-
         val orgUnitDataSetUids = dataSetOrganisationUnitLinkStore
             .selectDistinctSlaves(DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET)
         val dataSets = dataSetCallFactory.create(orgUnitDataSetUids)
@@ -72,12 +64,9 @@ internal class DataSetModuleDownloader @Inject internal constructor(
         optionSetCall.download(optionSetUids)
         optionCall.download(optionSetUids)
 
-
         val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
         validationRuleCall.download(getUids(validationRuleUids))
 
         periodHandler.generateAndPersist()
-
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
index d1482ed18f..8e392c132d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
@@ -25,23 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.dataset.DataSet;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.dataset.DataSet
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface DataSetService {
+internal fun interface DataSetService {
     @GET("dataSets")
-    Call<Payload<DataSet>> getDataSets(@Query("fields") @Which Fields<DataSet> fields,
-                                       @Query("filter") @Where Filter<DataSet, String> uids,
-                                       @Query("filter") String accessDataReadFilter,
-                                       @Query("paging") Boolean paging);
+    suspend fun getDataSets(
+        @Query("fields") @Which fields: Fields<DataSet>,
+        @Query("filter") @Where uids: Filter<DataSet, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<DataSet>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 571d0b61d6..075e5e5fe5 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -159,7 +159,7 @@ internal class MetadataCall(
         programIndicatorModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(ProgramIndicator::class.java, false))
 
-        indicatorModuleDownloader.downloadMetadata().blockingAwait()
+        indicatorModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Indicator::class.java, false))
 
         legendSetModuleDownloader.downloadMetadata()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
index d6f2f70ff8..66d196a06d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -38,23 +38,23 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoR
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class IndicatorEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: IndicatorService,
     private val handler: IndicatorHandler,
-) : UidsCallFactoryImpl<Indicator>(data, apiCallExecutor) {
-    override fun fetcher(uids: Set<String>): CallFetcher<Indicator> {
+) : UidsCallFactoryImpl<Indicator>(data, coroutineAPICallExecutor) {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<Indicator> {
         return object :
-            UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-            override fun getCall(query: UidsQuery): Call<Payload<Indicator>> {
+            UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
+
+            override suspend fun getCall(query: UidsQuery?): Payload<Indicator> {
                 return service.getIndicators(
                     IndicatorFields.allFields,
                     IndicatorFields.lastUpdated.gt(null),
-                    IndicatorFields.uid.`in`(query.uids()),
+                    IndicatorFields.uid.`in`(query?.uids()),
                     false,
                 )
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
index 9b763974ef..129adf10f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
@@ -27,8 +27,7 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.koin.core.annotation.Singleton
 
 @Singleton
@@ -36,19 +35,17 @@ class IndicatorModuleDownloader internal constructor(
     private val indicatorCallFactory: IndicatorEndpointCallFactory,
     private val indicatorTypeCallFactory: IndicatorTypeEndpointCallFactory,
     private val indicatorUidsSeeker: IndicatorUidsSeeker,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Completable.fromCallable {
-            val indicatorUids = indicatorUidsSeeker.seekUids()
+    override suspend fun downloadMetadata() {
+        val indicatorUids = indicatorUidsSeeker.seekUids()
 
-            if (!indicatorUids.isNullOrEmpty()) {
-                val indicators = indicatorCallFactory.create(indicatorUids).call()
+        if (!indicatorUids.isNullOrEmpty()) {
+            val indicators = indicatorCallFactory.create(indicatorUids)
 
-                val typeUids = indicators.mapNotNull { it.indicatorType()?.uid() }.toSet()
+            val typeUids = indicators.mapNotNull { it.indicatorType()?.uid() }.toSet()
 
-                indicatorTypeCallFactory.create(typeUids).call()
-            }
+            indicatorTypeCallFactory.create(typeUids)
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
index fbb231c7c9..d12a7765ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
@@ -25,24 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator.internal;
+package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.indicator.Indicator;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.indicator.Indicator
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface IndicatorService {
+internal fun interface IndicatorService {
     @GET("indicators")
-    Call<Payload<Indicator>> getIndicators(@Query("fields") @Which Fields<Indicator> fields,
-                                           @Query("filter") @Where Filter<Indicator, String> lastUpdated,
-                                           @Query("filter") @Where Filter<Indicator, String> uids,
-                                           @Query("paging") Boolean paging);
-
+    suspend fun getIndicators(
+        @Query("fields") @Which fields: Fields<Indicator>,
+        @Query("filter") @Where lastUpdated: Filter<Indicator, String>,
+        @Query("filter") @Where uids: Filter<Indicator, String>,
+        @Query("paging") paging: Boolean,
+    ): Payload<Indicator>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
index 25c2276ae4..8b7983f6dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -38,23 +38,23 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoR
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.indicator.IndicatorType
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class IndicatorTypeEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: IndicatorTypeService,
     private val handler: IndicatorTypeHandler,
-) : UidsCallFactoryImpl<IndicatorType>(data, apiCallExecutor) {
-    override fun fetcher(uids: Set<String>): CallFetcher<IndicatorType> {
+) : UidsCallFactoryImpl<IndicatorType>(data, coroutineAPICallExecutor) {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<IndicatorType> {
         return object :
-            UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-            override fun getCall(query: UidsQuery): Call<Payload<IndicatorType>> {
+            UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
+
+            override suspend fun getCall(query: UidsQuery?): Payload<IndicatorType> {
                 return service.getIndicatorTypes(
                     IndicatorTypeFields.allFields,
                     IndicatorTypeFields.lastUpdated.gt(null),
-                    IndicatorTypeFields.uid.`in`(query.uids()),
+                    IndicatorTypeFields.uid.`in`(query?.uids()),
                     false,
                 )
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
index 6d9c215757..33efe7f5e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
@@ -25,24 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator.internal;
+package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.indicator.IndicatorType;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.indicator.IndicatorType
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface IndicatorTypeService {
+internal fun interface IndicatorTypeService {
     @GET("indicatorTypes")
-    Call<Payload<IndicatorType>> getIndicatorTypes(@Query("fields") @Which Fields<IndicatorType> fields,
-                                                   @Query("filter") @Where Filter<IndicatorType, String> lastUpdated,
-                                                   @Query("filter") @Where Filter<IndicatorType, String> uids,
-                                                   @Query("paging") Boolean paging);
-
+    suspend fun getIndicatorTypes(
+        @Query("fields") @Which fields: Fields<IndicatorType>,
+        @Query("filter") @Where lastUpdated: Filter<IndicatorType, String>,
+        @Query("filter") @Where uids: Filter<IndicatorType, String>,
+        @Query("paging") paging: Boolean,
+    ): Payload<IndicatorType>
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 70ef5dc445..9b38958112 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -125,9 +125,10 @@ class MetadataCallShould : BaseCallShould() {
         whenever(organisationUnitDownloader.downloadMetadata(same(user))).thenReturn(
             Completable.complete(),
         )
-        whenever(dataSetDownloader.downloadMetadata()).thenReturn(
-            Completable.complete(),
-        )
+        dataSetDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
+
         programIndicatorModuleDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(Unit)
         }
@@ -143,7 +144,9 @@ class MetadataCallShould : BaseCallShould() {
         constantDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(emptyList())
         }
-        whenever(indicatorDownloader.downloadMetadata()).thenReturn(Completable.complete())
+        indicatorDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
         categoryDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(Unit)
         }
@@ -232,8 +235,8 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_dataset_parent_call_fail() {
-        whenever(dataSetDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
+    fun fail_when_dataset_parent_call_fail() = runTest {
+        whenever(dataSetDownloader.downloadMetadata()) doAnswer { throw networkError }
         downloadAndAssertError()
     }
 

From c9e2ac1cb61c936df4483a3d13e8edab33956a79 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 20 Oct 2023 09:23:49 +0200
Subject: [PATCH 443/478] [ANDROSDK-1757] Mark lastUpdated as nullable in API
 services

---
 .../dhis/android/core/indicator/internal/IndicatorService.kt    | 2 +-
 .../android/core/indicator/internal/IndicatorTypeService.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
index d12a7765ca..0a7be246dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
@@ -40,7 +40,7 @@ internal fun interface IndicatorService {
     @GET("indicators")
     suspend fun getIndicators(
         @Query("fields") @Which fields: Fields<Indicator>,
-        @Query("filter") @Where lastUpdated: Filter<Indicator, String>,
+        @Query("filter") @Where lastUpdated: Filter<Indicator, String>?,
         @Query("filter") @Where uids: Filter<Indicator, String>,
         @Query("paging") paging: Boolean,
     ): Payload<Indicator>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
index 33efe7f5e1..e14499081f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
@@ -40,7 +40,7 @@ internal fun interface IndicatorTypeService {
     @GET("indicatorTypes")
     suspend fun getIndicatorTypes(
         @Query("fields") @Which fields: Fields<IndicatorType>,
-        @Query("filter") @Where lastUpdated: Filter<IndicatorType, String>,
+        @Query("filter") @Where lastUpdated: Filter<IndicatorType, String>?,
         @Query("filter") @Where uids: Filter<IndicatorType, String>,
         @Query("paging") paging: Boolean,
     ): Payload<IndicatorType>

From 66e2439dddaaff9d732890315cfbd90ab40a8f25 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Thu, 19 Oct 2023 09:07:32 +0200
Subject: [PATCH 444/478] [ANDROSDK-1757] refactor: - DataSetModuleDownloader
 to coroutines

---
 .../internal/UidsCallFactoryCoroutines.kt     | 35 ++++++++++++
 .../internal/UidsCallFactoryCoroutinesImpl.kt | 51 +++++++++++++++++
 .../internal/DataSetModuleDownloader.kt       | 57 ++++++++++---------
 .../core/domain/metadata/MetadataCall.kt      |  2 +-
 4 files changed, 118 insertions(+), 27 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
new file mode 100644
index 0000000000..1083e25f8c
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import java.util.concurrent.Callable
+
+internal fun interface UidsCallFactoryCoroutines<P> {
+    suspend fun create(uids: Set<String>): List<P>
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
new file mode 100644
index 0000000000..a3c2215704
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.arch.call.factories.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
+import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
+import java.util.concurrent.Callable
+
+internal abstract class UidsCallFactoryCoroutinesImpl<P> protected constructor(
+    protected val data: GenericCallData,
+    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
+) : UidsCallFactoryCoroutines<P> {
+    override suspend fun create(uids: Set<String>): List<P> {
+        val objects: List<P> = fetcher(uids)
+        processor().process(objects)
+        return objects
+    }
+
+    protected abstract suspend fun fetcher(uids: Set<String>): List<P>
+    protected abstract fun processor(): CallProcessor<P>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index b3c218508f..620e7b6669 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -27,52 +27,57 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
+import dagger.Reusable
 import io.reactivex.Completable
 import kotlinx.coroutines.runBlocking
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
+import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryCoroutines
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
-import org.hisp.dhis.android.core.dataelement.internal.DataElementEndpointCallFactory
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
+import org.hisp.dhis.android.core.dataelement.DataElement
+import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCallCoroutines
-import org.koin.core.annotation.Singleton
+import javax.inject.Inject
 
-@Singleton
-internal class DataSetModuleDownloader internal constructor(
-    private val dataSetCallFactory: DataSetEndpointCallFactory,
-    private val dataElementCallFactory: DataElementEndpointCallFactory,
+@Suppress("LongParameterList")
+@Reusable
+internal class DataSetModuleDownloader @Inject internal constructor(
+    private val dataSetCallFactory: UidsCallFactoryCoroutines<DataSet>,
+    private val dataElementCallFactory: UidsCallFactoryCoroutines<DataElement>,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val validationRuleCall: ValidationRuleCall,
     private val validationRuleUidsCall: ValidationRuleUidsCallCoroutines,
     private val periodHandler: PeriodHandler,
     private val dataSetOrganisationUnitLinkStore: DataSetOrganisationUnitLinkStore,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Completable.fromCallable {
-            val orgUnitDataSetUids = dataSetOrganisationUnitLinkStore
-                .selectDistinctSlaves(DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET)
-            val dataSets = dataSetCallFactory.create(orgUnitDataSetUids).call()
+    override suspend fun downloadMetadata() {
 
-            val dataElements = dataElementCallFactory.create(
-                DataSetParentUidsHelper.getDataElementUids(dataSets),
-            ).call()
+        val orgUnitDataSetUids = dataSetOrganisationUnitLinkStore
+            .selectDistinctSlaves(DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET)
+        val dataSets = dataSetCallFactory.create(orgUnitDataSetUids)
 
-            val optionSetUids = DataSetParentUidsHelper.getAssignedOptionSetUids(dataElements)
-            runBlocking {
-                optionSetCall.download(optionSetUids)
-                optionCall.download(optionSetUids)
-            }
+        val dataElements = dataElementCallFactory.create(
+            DataSetParentUidsHelper.getDataElementUids(dataSets),
+        )
+
+        val optionSetUids = DataSetParentUidsHelper.getAssignedOptionSetUids(dataElements)
+        optionSetCall.download(optionSetUids)
+        optionCall.download(optionSetUids)
+
+
+        val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
+        validationRuleCall.download(getUids(validationRuleUids))
+
+        periodHandler.generateAndPersist()
 
-            runBlocking {
-                val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
-                validationRuleCall.download(getUids(validationRuleUids))
-            }
-            periodHandler.generateAndPersist()
-        }
     }
+
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index de7f760302..8135f52f40 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -147,7 +147,7 @@ internal class MetadataCall(
         programDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Program::class.java, false))
 
-        dataSetDownloader.downloadMetadata().blockingAwait()
+        dataSetDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(DataSet::class.java, false))
 
         categoryDownloader.downloadMetadata()

From ea581bfceaebc137cc2497447ea8ce5db6433397 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 08:37:56 +0200
Subject: [PATCH 445/478] Rename .java to .kt

---
 ...idsNoResourceCallFetcher.java => UidsNoResourceCallFetcher.kt} | 0
 .../internal/{DataElementService.java => DataElementService.kt}   | 0
 .../dataset/internal/{DataSetService.java => DataSetService.kt}   | 0
 .../internal/{IndicatorService.java => IndicatorService.kt}       | 0
 .../{IndicatorTypeService.java => IndicatorTypeService.kt}        | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/{UidsNoResourceCallFetcher.java => UidsNoResourceCallFetcher.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/{DataElementService.java => DataElementService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/internal/{DataSetService.java => DataSetService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorService.java => IndicatorService.kt} (100%)
 rename core/src/main/java/org/hisp/dhis/android/core/indicator/internal/{IndicatorTypeService.java => IndicatorTypeService.kt} (100%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.java b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
similarity index 100%
rename from core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.java
rename to core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt

From b5160b9fc866c70b200830dfa98bfe9c753bf0cc Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 08:37:56 +0200
Subject: [PATCH 446/478] [ANDROSDK-1757] refactor: - DataSetModuleDownloader
 from RxJava to Coroutines [ANDROSDK-1761] - IndicatorModuleDownloader  from
 RxJava to Coroutines

---
 ...lementEndpointCallRealIntegrationShould.kt | 11 ++-
 ...ataSetEndpointCallRealIntegrationShould.kt | 11 ++-
 .../factories/internal/UidsCallFactory.kt     |  4 +-
 .../internal/UidsCallFactoryCoroutines.kt     | 35 ----------
 .../internal/UidsCallFactoryCoroutinesImpl.kt | 51 --------------
 .../factories/internal/UidsCallFactoryImpl.kt | 18 ++---
 .../internal/UidsNoResourceCallFetcher.kt     | 68 ++++++++-----------
 .../DataElementEndpointCallFactory.kt         | 20 +++---
 .../internal/DataElementService.kt            | 36 +++++-----
 .../internal/DataSetEndpointCallFactory.kt    | 17 +++--
 .../internal/DataSetModuleDownloader.kt       | 23 ++-----
 .../core/dataset/internal/DataSetService.kt   | 32 ++++-----
 .../core/domain/metadata/MetadataCall.kt      |  2 +-
 .../internal/IndicatorEndpointCallFactory.kt  | 18 ++---
 .../internal/IndicatorModuleDownloader.kt     | 19 +++---
 .../indicator/internal/IndicatorService.kt    | 33 +++++----
 .../IndicatorTypeEndpointCallFactory.kt       | 18 ++---
 .../internal/IndicatorTypeService.kt          | 33 +++++----
 .../domain/metadata/MetadataCallShould.kt     | 15 ++--
 19 files changed, 173 insertions(+), 291 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
index 43b0602222..43ab497023 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallRealIntegrationShould.kt
@@ -30,22 +30,21 @@ package org.hisp.dhis.android.core.dataelement.internal
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.junit.Before
-import java.util.concurrent.Callable
 
 class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     /**
      * A quick integration test that is probably flaky, but will help with finding bugs related to the
      * metadataSyncCall. It works against the demo server.
      */
-    private var dataElementCall: Callable<List<DataElement>>? = null
+    private lateinit var dataElementCall: suspend () -> List<DataElement>
 
     @Before
     override fun setUp() {
         super.setUp()
-        dataElementCall = createCall()
+        dataElementCall = { createCall() }
     }
 
-    private fun createCall(): Callable<List<DataElement>> {
+    private suspend fun createCall(): List<DataElement> {
         val uids = setOf(
             "FTRrcoaog83",
             "P3jJH5Tu5VC",
@@ -55,7 +54,7 @@ class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
     }
 
     // @Test
-    fun download_data_elements() {
+    suspend fun download_data_elements() {
         d2.userModule().logIn(username, password, url).blockingGet()
 
         /*  This test won't pass independently of DataElementEndpointCallFactory and
@@ -63,6 +62,6 @@ class DataElementEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             To run the test, you will need to disable foreign key support in database in
             DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
             uncomment the @Test tag */
-        dataElementCall!!.call()
+        dataElementCall.invoke()
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
index 70b2409ce9..8b2ed3f8e6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallRealIntegrationShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.dataset.internal
 import org.hisp.dhis.android.core.BaseRealIntegrationTest
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.junit.Before
-import java.util.concurrent.Callable
 
 class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
 
@@ -38,21 +37,21 @@ class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
      * A quick integration test that is probably flaky, but will help with finding bugs related to the
      * metadataSyncCall. It works against the demo server.
      */
-    private var dataSetCall: Callable<List<DataSet>>? = null
+    private lateinit var dataSetCall: suspend () -> List<DataSet>
 
     @Before
     override fun setUp() {
         super.setUp()
-        dataSetCall = createCall()
+        dataSetCall = { createCall() }
     }
 
-    private fun createCall(): Callable<List<DataSet>> {
+    private suspend fun createCall(): List<DataSet> {
         return getD2DIComponent(d2).dataSetCallFactory.create(setOf("lyLU2wR22tC", "BfMAe6Itzgt"))
     }
 
     // @Test
     @Throws(Exception::class)
-    fun download_data_sets() {
+    suspend fun download_data_sets() {
         if (!d2.userModule().isLogged().blockingGet()) {
             d2.userModule().logIn(username, password, url).blockingGet()
         }
@@ -62,6 +61,6 @@ class DataSetEndpointCallRealIntegrationShould : BaseRealIntegrationTest() {
             To run the test, you will need to disable foreign key support in database in
             DbOpenHelper.java replacing 'foreign_keys = ON' with 'foreign_keys = OFF' and
             uncomment the @Test tag */
-        dataSetCall!!.call()
+        dataSetCall.invoke()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
index f86de19f91..0a2b0d7aaf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactory.kt
@@ -27,8 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import java.util.concurrent.Callable
-
 internal fun interface UidsCallFactory<P> {
-    fun create(uids: Set<String>): Callable<List<P>>
+    suspend fun create(uids: Set<String>): List<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
deleted file mode 100644
index 1083e25f8c..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutines.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import java.util.concurrent.Callable
-
-internal fun interface UidsCallFactoryCoroutines<P> {
-    suspend fun create(uids: Set<String>): List<P>
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
deleted file mode 100644
index a3c2215704..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryCoroutinesImpl.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
-
-internal abstract class UidsCallFactoryCoroutinesImpl<P> protected constructor(
-    protected val data: GenericCallData,
-    protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
-) : UidsCallFactoryCoroutines<P> {
-    override suspend fun create(uids: Set<String>): List<P> {
-        val objects: List<P> = fetcher(uids)
-        processor().process(objects)
-        return objects
-    }
-
-    protected abstract suspend fun fetcher(uids: Set<String>): List<P>
-    protected abstract fun processor(): CallProcessor<P>
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
index 11da4da267..379448978f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCallFactoryImpl.kt
@@ -27,21 +27,21 @@
  */
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
 
-abstract class UidsCallFactoryImpl<P> protected constructor(
+internal abstract class UidsCallFactoryImpl<P> protected constructor(
     @JvmField protected val data: GenericCallData,
-    @JvmField protected val apiCallExecutor: APICallExecutor,
+    @JvmField protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : UidsCallFactory<P> {
-    override fun create(uids: Set<String>): Callable<List<P>> {
-        return EndpointCall(fetcher(uids), processor())
+    override suspend fun create(uids: Set<String>): List<P> {
+        val objects: List<P> = fetcher(uids).fetch()
+        processor().process(objects)
+        return objects
     }
 
-    protected abstract fun fetcher(uids: Set<String>): CallFetcher<P>
+    protected abstract suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<P>
     protected abstract fun processor(): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
index e8315b17b9..1ddd056ccf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
@@ -25,54 +25,42 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.arch.call.fetchers.internal
 
-package org.hisp.dhis.android.core.arch.call.fetchers.internal;
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
+import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper
+import org.hisp.dhis.android.core.maintenance.D2Error
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery;
-import org.hisp.dhis.android.core.arch.helpers.CollectionsHelper;
-import org.hisp.dhis.android.core.maintenance.D2Error;
+internal abstract class UidsNoResourceCallFetcher<P> protected constructor(
+    private val uids: Set<String>,
+    private val limit: Int,
+    private val apiCallExecutor: CoroutineAPICallExecutor,
+) : CoroutineCallFetcher<P> {
+    protected abstract suspend fun getCall(query: UidsQuery?): Payload<P>
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-public abstract class UidsNoResourceCallFetcher<P> implements CallFetcher<P> {
-
-    private final Set<String> uids;
-    private final int limit;
-    private final APICallExecutor apiCallExecutor;
-
-    protected UidsNoResourceCallFetcher(Set<String> uids, int limit, APICallExecutor apiCallExecutor) {
-        this.uids = uids;
-        this.limit = limit;
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    protected abstract retrofit2.Call<Payload<P>> getCall(UidsQuery query);
-
-    @Override
-    public final List<P> fetch() throws D2Error {
+    @Throws(D2Error::class)
+    override suspend fun fetch(): List<P> {
         if (uids.isEmpty()) {
-            return Collections.emptyList();
+            return emptyList()
         }
-
-        List<P> objects = new ArrayList<>();
+        val objects: MutableList<P> = ArrayList()
         if (!uids.isEmpty()) {
-            List<Set<String>> partitions = CollectionsHelper.setPartition(uids, limit);
-
-            for (Set<String> partitionUids : partitions) {
-                UidsQuery uidQuery = UidsQuery.create(partitionUids);
-                List<P> callObjects = apiCallExecutor.executePayloadCall(getCall(uidQuery));
-                objects.addAll(transform(callObjects));
+            val partitions = CollectionsHelper.setPartition(
+                uids,
+                limit,
+            )
+            for (partitionUids in partitions) {
+                val uidQuery = UidsQuery.create(partitionUids)
+                val callObjects: List<P> = apiCallExecutor.wrap { getCall(uidQuery) }.getOrThrow().items()
+                objects.addAll(transform(callObjects))
             }
         }
-        return objects;
+        return objects
     }
 
-    protected List<P> transform(List<P> list) {
-        return list;
+    protected fun transform(list: List<P>): List<P> {
+        return list
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
index 16405f5dc7..75850929b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.dataelement.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -39,26 +39,24 @@ import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.common.internal.AccessFields
 import org.hisp.dhis.android.core.dataelement.DataElement
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class DataElementEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: DataElementService,
     private val handler: DataElementHandler,
-) : UidsCallFactoryImpl<DataElement>(data, apiCallExecutor) {
-    override fun fetcher(uids: Set<String>): CallFetcher<DataElement> {
-        return object :
-            UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+) : UidsCallFactoryImpl<DataElement>(data, coroutineAPICallExecutor) {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<DataElement> {
+        return object : UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
             var accessReadFilter = "access." + AccessFields.read.eq(true).generateString()
-            override fun getCall(query: UidsQuery): Call<Payload<DataElement>> {
+            override suspend fun getCall(query: UidsQuery?): Payload<DataElement> {
                 return service.getDataElements(
                     DataElementFields.allFields,
-                    DataElementFields.uid.`in`(query.uids()),
+                    DataElementFields.uid.`in`(query?.uids()),
                     DataElementFields.lastUpdated.gt(null),
                     accessReadFilter,
-                    query.paging(),
+                    query?.paging() ?: false,
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
index 3b15746004..37a58adc5b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementService.kt
@@ -25,24 +25,24 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataelement.internal;
+package org.hisp.dhis.android.core.dataelement.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.dataelement.DataElement;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.dataelement.DataElement
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface DataElementService {
+internal fun interface DataElementService {
     @GET("dataElements")
-    Call<Payload<DataElement>> getDataElements(@Query("fields") @Which Fields<DataElement> fields,
-                                               @Query("filter") @Where Filter<DataElement, String> uids,
-                                               @Query("filter") @Where Filter<DataElement, String> lastUpdated,
-                                               @Query("filter") String accessReadFilter,
-                                               @Query("paging") Boolean paging);
-}
\ No newline at end of file
+    suspend fun getDataElements(
+        @Query("fields") @Which fields: Fields<DataElement>,
+        @Query("filter") @Where uids: Filter<DataElement?, String>,
+        @Query("filter") @Where lastUpdated: Filter<DataElement, String>?,
+        @Query("filter") accessReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<DataElement>
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
index f56a650e84..fbcaef42dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -40,26 +40,25 @@ import org.hisp.dhis.android.core.common.internal.DataAccessFields
 import org.hisp.dhis.android.core.dataset.DataSet
 import org.hisp.dhis.android.core.resource.internal.Resource
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class DataSetEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val dataSetService: DataSetService,
     private val dataSetHandler: DataSetHandler,
-) : UidsCallFactoryImpl<DataSet>(data, apiCallExecutor) {
+) : UidsCallFactoryImpl<DataSet>(data, coroutineAPICallExecutor) {
     private val resourceType = Resource.Type.DATA_SET
-    override fun fetcher(uids: Set<String>): CallFetcher<DataSet> {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<DataSet> {
         return object :
-            UidsNoResourceCallFetcher<DataSet>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
+            UidsNoResourceCallFetcher<DataSet>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
             var accessDataReadFilter =
                 "access.data." + DataAccessFields.read.eq(true).generateString()
 
-            override fun getCall(query: UidsQuery): Call<Payload<DataSet>> {
+            override suspend fun getCall(query: UidsQuery?): Payload<DataSet> {
                 return dataSetService.getDataSets(
                     DataSetFields.allFields,
-                    DataSetFields.uid.`in`(query.uids()),
+                    DataSetFields.uid.`in`(query?.uids()),
                     accessDataReadFilter,
                     false,
                 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
index 620e7b6669..9c6d19cc0a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleDownloader.kt
@@ -27,29 +27,22 @@
  */
 package org.hisp.dhis.android.core.dataset.internal
 
-import dagger.Reusable
-import io.reactivex.Completable
-import kotlinx.coroutines.runBlocking
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactory
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryCoroutines
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper.getUids
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
 import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
-import org.hisp.dhis.android.core.dataelement.DataElement
-import org.hisp.dhis.android.core.dataset.DataSet
+import org.hisp.dhis.android.core.dataelement.internal.DataElementEndpointCallFactory
 import org.hisp.dhis.android.core.dataset.DataSetOrganisationUnitLinkTableInfo
 import org.hisp.dhis.android.core.option.internal.OptionCall
 import org.hisp.dhis.android.core.option.internal.OptionSetCall
 import org.hisp.dhis.android.core.period.internal.PeriodHandler
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleCall
 import org.hisp.dhis.android.core.validation.internal.ValidationRuleUidsCallCoroutines
-import javax.inject.Inject
+import org.koin.core.annotation.Singleton
 
 @Suppress("LongParameterList")
-@Reusable
-internal class DataSetModuleDownloader @Inject internal constructor(
-    private val dataSetCallFactory: UidsCallFactoryCoroutines<DataSet>,
-    private val dataElementCallFactory: UidsCallFactoryCoroutines<DataElement>,
+@Singleton
+internal class DataSetModuleDownloader(
+    private val dataSetCallFactory: DataSetEndpointCallFactory,
+    private val dataElementCallFactory: DataElementEndpointCallFactory,
     private val optionSetCall: OptionSetCall,
     private val optionCall: OptionCall,
     private val validationRuleCall: ValidationRuleCall,
@@ -59,7 +52,6 @@ internal class DataSetModuleDownloader @Inject internal constructor(
 ) : UntypedModuleDownloaderCoroutines {
 
     override suspend fun downloadMetadata() {
-
         val orgUnitDataSetUids = dataSetOrganisationUnitLinkStore
             .selectDistinctSlaves(DataSetOrganisationUnitLinkTableInfo.Columns.DATA_SET)
         val dataSets = dataSetCallFactory.create(orgUnitDataSetUids)
@@ -72,12 +64,9 @@ internal class DataSetModuleDownloader @Inject internal constructor(
         optionSetCall.download(optionSetUids)
         optionCall.download(optionSetUids)
 
-
         val validationRuleUids = validationRuleUidsCall.download(getUids(dataSets))
         validationRuleCall.download(getUids(validationRuleUids))
 
         periodHandler.generateAndPersist()
-
     }
-
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
index d1482ed18f..8e392c132d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetService.kt
@@ -25,23 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.dataset.internal;
+package org.hisp.dhis.android.core.dataset.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.dataset.DataSet;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.dataset.DataSet
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface DataSetService {
+internal fun interface DataSetService {
     @GET("dataSets")
-    Call<Payload<DataSet>> getDataSets(@Query("fields") @Which Fields<DataSet> fields,
-                                       @Query("filter") @Where Filter<DataSet, String> uids,
-                                       @Query("filter") String accessDataReadFilter,
-                                       @Query("paging") Boolean paging);
+    suspend fun getDataSets(
+        @Query("fields") @Which fields: Fields<DataSet>,
+        @Query("filter") @Where uids: Filter<DataSet, String>,
+        @Query("filter") accessDataReadFilter: String,
+        @Query("paging") paging: Boolean,
+    ): Payload<DataSet>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
index 8135f52f40..b24f6103a9 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/domain/metadata/MetadataCall.kt
@@ -159,7 +159,7 @@ internal class MetadataCall(
         programIndicatorModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(ProgramIndicator::class.java, false))
 
-        indicatorModuleDownloader.downloadMetadata().blockingAwait()
+        indicatorModuleDownloader.downloadMetadata()
         emit(progressManager.increaseProgress(Indicator::class.java, false))
 
         legendSetModuleDownloader.downloadMetadata()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
index d6f2f70ff8..66d196a06d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -38,23 +38,23 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoR
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.indicator.Indicator
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class IndicatorEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: IndicatorService,
     private val handler: IndicatorHandler,
-) : UidsCallFactoryImpl<Indicator>(data, apiCallExecutor) {
-    override fun fetcher(uids: Set<String>): CallFetcher<Indicator> {
+) : UidsCallFactoryImpl<Indicator>(data, coroutineAPICallExecutor) {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<Indicator> {
         return object :
-            UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-            override fun getCall(query: UidsQuery): Call<Payload<Indicator>> {
+            UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
+
+            override suspend fun getCall(query: UidsQuery?): Payload<Indicator> {
                 return service.getIndicators(
                     IndicatorFields.allFields,
                     IndicatorFields.lastUpdated.gt(null),
-                    IndicatorFields.uid.`in`(query.uids()),
+                    IndicatorFields.uid.`in`(query?.uids()),
                     false,
                 )
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
index 9b763974ef..129adf10f0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorModuleDownloader.kt
@@ -27,8 +27,7 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import io.reactivex.Completable
-import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloader
+import org.hisp.dhis.android.core.arch.modules.internal.UntypedModuleDownloaderCoroutines
 import org.koin.core.annotation.Singleton
 
 @Singleton
@@ -36,19 +35,17 @@ class IndicatorModuleDownloader internal constructor(
     private val indicatorCallFactory: IndicatorEndpointCallFactory,
     private val indicatorTypeCallFactory: IndicatorTypeEndpointCallFactory,
     private val indicatorUidsSeeker: IndicatorUidsSeeker,
-) : UntypedModuleDownloader {
+) : UntypedModuleDownloaderCoroutines {
 
-    override fun downloadMetadata(): Completable {
-        return Completable.fromCallable {
-            val indicatorUids = indicatorUidsSeeker.seekUids()
+    override suspend fun downloadMetadata() {
+        val indicatorUids = indicatorUidsSeeker.seekUids()
 
-            if (!indicatorUids.isNullOrEmpty()) {
-                val indicators = indicatorCallFactory.create(indicatorUids).call()
+        if (!indicatorUids.isNullOrEmpty()) {
+            val indicators = indicatorCallFactory.create(indicatorUids)
 
-                val typeUids = indicators.mapNotNull { it.indicatorType()?.uid() }.toSet()
+            val typeUids = indicators.mapNotNull { it.indicatorType()?.uid() }.toSet()
 
-                indicatorTypeCallFactory.create(typeUids).call()
-            }
+            indicatorTypeCallFactory.create(typeUids)
         }
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
index fbb231c7c9..d12a7765ca 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
@@ -25,24 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator.internal;
+package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.indicator.Indicator;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.indicator.Indicator
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface IndicatorService {
+internal fun interface IndicatorService {
     @GET("indicators")
-    Call<Payload<Indicator>> getIndicators(@Query("fields") @Which Fields<Indicator> fields,
-                                           @Query("filter") @Where Filter<Indicator, String> lastUpdated,
-                                           @Query("filter") @Where Filter<Indicator, String> uids,
-                                           @Query("paging") Boolean paging);
-
+    suspend fun getIndicators(
+        @Query("fields") @Which fields: Fields<Indicator>,
+        @Query("filter") @Where lastUpdated: Filter<Indicator, String>,
+        @Query("filter") @Where uids: Filter<Indicator, String>,
+        @Query("paging") paging: Boolean,
+    ): Payload<Indicator>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
index 25c2276ae4..8b7983f6dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
@@ -27,10 +27,10 @@
  */
 package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.UidsNoResourceCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
@@ -38,23 +38,23 @@ import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoR
 import org.hisp.dhis.android.core.arch.call.queries.internal.UidsQuery
 import org.hisp.dhis.android.core.indicator.IndicatorType
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class IndicatorTypeEndpointCallFactory(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     private val service: IndicatorTypeService,
     private val handler: IndicatorTypeHandler,
-) : UidsCallFactoryImpl<IndicatorType>(data, apiCallExecutor) {
-    override fun fetcher(uids: Set<String>): CallFetcher<IndicatorType> {
+) : UidsCallFactoryImpl<IndicatorType>(data, coroutineAPICallExecutor) {
+    override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<IndicatorType> {
         return object :
-            UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, apiCallExecutor) {
-            override fun getCall(query: UidsQuery): Call<Payload<IndicatorType>> {
+            UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
+
+            override suspend fun getCall(query: UidsQuery?): Payload<IndicatorType> {
                 return service.getIndicatorTypes(
                     IndicatorTypeFields.allFields,
                     IndicatorTypeFields.lastUpdated.gt(null),
-                    IndicatorTypeFields.uid.`in`(query.uids()),
+                    IndicatorTypeFields.uid.`in`(query?.uids()),
                     false,
                 )
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
index 6d9c215757..33efe7f5e1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
@@ -25,24 +25,23 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.android.core.indicator.internal;
+package org.hisp.dhis.android.core.indicator.internal
 
-import org.hisp.dhis.android.core.arch.api.fields.internal.Fields;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Filter;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Where;
-import org.hisp.dhis.android.core.arch.api.filters.internal.Which;
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.indicator.IndicatorType;
+import org.hisp.dhis.android.core.arch.api.fields.internal.Fields
+import org.hisp.dhis.android.core.arch.api.filters.internal.Filter
+import org.hisp.dhis.android.core.arch.api.filters.internal.Where
+import org.hisp.dhis.android.core.arch.api.filters.internal.Which
+import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
+import org.hisp.dhis.android.core.indicator.IndicatorType
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-
-public interface IndicatorTypeService {
+internal fun interface IndicatorTypeService {
     @GET("indicatorTypes")
-    Call<Payload<IndicatorType>> getIndicatorTypes(@Query("fields") @Which Fields<IndicatorType> fields,
-                                                   @Query("filter") @Where Filter<IndicatorType, String> lastUpdated,
-                                                   @Query("filter") @Where Filter<IndicatorType, String> uids,
-                                                   @Query("paging") Boolean paging);
-
+    suspend fun getIndicatorTypes(
+        @Query("fields") @Which fields: Fields<IndicatorType>,
+        @Query("filter") @Where lastUpdated: Filter<IndicatorType, String>,
+        @Query("filter") @Where uids: Filter<IndicatorType, String>,
+        @Query("paging") paging: Boolean,
+    ): Payload<IndicatorType>
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
index 6cdbfb1992..8214d64088 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/domain/metadata/MetadataCallShould.kt
@@ -125,9 +125,10 @@ class MetadataCallShould : BaseCallShould() {
             onBlocking { downloadMetadata(same(user)) }.doReturn(Unit)
         }
 
-        whenever(dataSetDownloader.downloadMetadata()).thenReturn(
-            Completable.complete(),
-        )
+        dataSetDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
+
         programIndicatorModuleDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(Unit)
         }
@@ -143,7 +144,9 @@ class MetadataCallShould : BaseCallShould() {
         constantDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(emptyList())
         }
-        whenever(indicatorDownloader.downloadMetadata()).thenReturn(Completable.complete())
+        indicatorDownloader.stub {
+            onBlocking { downloadMetadata() }.doReturn(Unit)
+        }
         categoryDownloader.stub {
             onBlocking { downloadMetadata() }.doReturn(Unit)
         }
@@ -232,8 +235,8 @@ class MetadataCallShould : BaseCallShould() {
     }
 
     @Test
-    fun fail_when_dataset_parent_call_fail() {
-        whenever(dataSetDownloader.downloadMetadata()).thenReturn(Completable.error(networkError))
+    fun fail_when_dataset_parent_call_fail() = runTest {
+        whenever(dataSetDownloader.downloadMetadata()) doAnswer { throw networkError }
         downloadAndAssertError()
     }
 

From 947aa6da368b903f4aa54ff9586af9cb5e359483 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 20 Oct 2023 09:23:49 +0200
Subject: [PATCH 447/478] [ANDROSDK-1757] Mark lastUpdated as nullable in API
 services

---
 .../dhis/android/core/indicator/internal/IndicatorService.kt    | 2 +-
 .../android/core/indicator/internal/IndicatorTypeService.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
index d12a7765ca..0a7be246dd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorService.kt
@@ -40,7 +40,7 @@ internal fun interface IndicatorService {
     @GET("indicators")
     suspend fun getIndicators(
         @Query("fields") @Which fields: Fields<Indicator>,
-        @Query("filter") @Where lastUpdated: Filter<Indicator, String>,
+        @Query("filter") @Where lastUpdated: Filter<Indicator, String>?,
         @Query("filter") @Where uids: Filter<Indicator, String>,
         @Query("paging") paging: Boolean,
     ): Payload<Indicator>
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
index 33efe7f5e1..e14499081f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeService.kt
@@ -40,7 +40,7 @@ internal fun interface IndicatorTypeService {
     @GET("indicatorTypes")
     suspend fun getIndicatorTypes(
         @Query("fields") @Which fields: Fields<IndicatorType>,
-        @Query("filter") @Where lastUpdated: Filter<IndicatorType, String>,
+        @Query("filter") @Where lastUpdated: Filter<IndicatorType, String>?,
         @Query("filter") @Where uids: Filter<IndicatorType, String>,
         @Query("paging") paging: Boolean,
     ): Payload<IndicatorType>

From 13a060ef14a6d2bcc096de5bd4d781a342825dfe Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 11:01:46 +0200
Subject: [PATCH 448/478] [ANDROSDK-1757] style: - Remove code smell by
 "isNotEmpty"

---
 .../arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
index 1ddd056ccf..274047faa6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
@@ -46,7 +46,7 @@ internal abstract class UidsNoResourceCallFetcher<P> protected constructor(
             return emptyList()
         }
         val objects: MutableList<P> = ArrayList()
-        if (!uids.isEmpty()) {
+        if (uids.isNotEmpty()) {
             val partitions = CollectionsHelper.setPartition(
                 uids,
                 limit,

From 5ae05412fa372b4840beb1662786e55c3848133f Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 11:38:50 +0200
Subject: [PATCH 449/478] [ANDROSDK-1757] style: - Remove nullable from
 uidQuery

---
 .../arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
index 274047faa6..04b736d12e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
@@ -38,7 +38,7 @@ internal abstract class UidsNoResourceCallFetcher<P> protected constructor(
     private val limit: Int,
     private val apiCallExecutor: CoroutineAPICallExecutor,
 ) : CoroutineCallFetcher<P> {
-    protected abstract suspend fun getCall(query: UidsQuery?): Payload<P>
+    protected abstract suspend fun getCall(query: UidsQuery): Payload<P>
 
     @Throws(D2Error::class)
     override suspend fun fetch(): List<P> {

From 68a9979034c2654a6a2ebd6c74d28d583f0e29bc Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Fri, 20 Oct 2023 11:38:50 +0200
Subject: [PATCH 450/478] [ANDROSDK-1757] style: - Remove nullable from
 uidQuery and implementation

---
 .../call/fetchers/internal/UidsNoResourceCallFetcher.kt     | 2 +-
 .../dataelement/internal/DataElementEndpointCallFactory.kt  | 6 +++---
 .../core/dataset/internal/DataSetEndpointCallFactory.kt     | 4 ++--
 .../core/indicator/internal/IndicatorEndpointCallFactory.kt | 4 ++--
 .../indicator/internal/IndicatorTypeEndpointCallFactory.kt  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
index 274047faa6..04b736d12e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/fetchers/internal/UidsNoResourceCallFetcher.kt
@@ -38,7 +38,7 @@ internal abstract class UidsNoResourceCallFetcher<P> protected constructor(
     private val limit: Int,
     private val apiCallExecutor: CoroutineAPICallExecutor,
 ) : CoroutineCallFetcher<P> {
-    protected abstract suspend fun getCall(query: UidsQuery?): Payload<P>
+    protected abstract suspend fun getCall(query: UidsQuery): Payload<P>
 
     @Throws(D2Error::class)
     override suspend fun fetch(): List<P> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
index 75850929b6..3f7ad5998e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataelement/internal/DataElementEndpointCallFactory.kt
@@ -50,13 +50,13 @@ internal class DataElementEndpointCallFactory(
     override suspend fun fetcher(uids: Set<String>): CoroutineCallFetcher<DataElement> {
         return object : UidsNoResourceCallFetcher<DataElement>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
             var accessReadFilter = "access." + AccessFields.read.eq(true).generateString()
-            override suspend fun getCall(query: UidsQuery?): Payload<DataElement> {
+            override suspend fun getCall(query: UidsQuery): Payload<DataElement> {
                 return service.getDataElements(
                     DataElementFields.allFields,
-                    DataElementFields.uid.`in`(query?.uids()),
+                    DataElementFields.uid.`in`(query.uids()),
                     DataElementFields.lastUpdated.gt(null),
                     accessReadFilter,
-                    query?.paging() ?: false,
+                    query.paging(),
                 )
             }
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
index fbcaef42dd..78e169599e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetEndpointCallFactory.kt
@@ -55,10 +55,10 @@ internal class DataSetEndpointCallFactory(
             var accessDataReadFilter =
                 "access.data." + DataAccessFields.read.eq(true).generateString()
 
-            override suspend fun getCall(query: UidsQuery?): Payload<DataSet> {
+            override suspend fun getCall(query: UidsQuery): Payload<DataSet> {
                 return dataSetService.getDataSets(
                     DataSetFields.allFields,
-                    DataSetFields.uid.`in`(query?.uids()),
+                    DataSetFields.uid.`in`(query.uids()),
                     accessDataReadFilter,
                     false,
                 )
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
index 66d196a06d..8e4fa7e6b7 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorEndpointCallFactory.kt
@@ -50,11 +50,11 @@ internal class IndicatorEndpointCallFactory(
         return object :
             UidsNoResourceCallFetcher<Indicator>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
 
-            override suspend fun getCall(query: UidsQuery?): Payload<Indicator> {
+            override suspend fun getCall(query: UidsQuery): Payload<Indicator> {
                 return service.getIndicators(
                     IndicatorFields.allFields,
                     IndicatorFields.lastUpdated.gt(null),
-                    IndicatorFields.uid.`in`(query?.uids()),
+                    IndicatorFields.uid.`in`(query.uids()),
                     false,
                 )
             }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
index 8b7983f6dd..7d4a12d346 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/indicator/internal/IndicatorTypeEndpointCallFactory.kt
@@ -50,11 +50,11 @@ internal class IndicatorTypeEndpointCallFactory(
         return object :
             UidsNoResourceCallFetcher<IndicatorType>(uids, MAX_UID_LIST_SIZE, coroutineAPICallExecutor) {
 
-            override suspend fun getCall(query: UidsQuery?): Payload<IndicatorType> {
+            override suspend fun getCall(query: UidsQuery): Payload<IndicatorType> {
                 return service.getIndicatorTypes(
                     IndicatorTypeFields.allFields,
                     IndicatorTypeFields.lastUpdated.gt(null),
-                    IndicatorTypeFields.uid.`in`(query?.uids()),
+                    IndicatorTypeFields.uid.`in`(query.uids()),
                     false,
                 )
             }

From fa34a283b5cdd9fe74e8365a3b6b24c212e748a4 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 23 Oct 2023 11:22:10 +0200
Subject: [PATCH 451/478] [ANDROSDK-1741] fix: - Grant unsupported versions are
 not used feature: - Handle unsupported versions smoothly

---
 .../android/core/systeminfo/DHISVersion.kt    |  8 ++--
 .../core/systeminfo/SMSVersionShould.kt       |  2 +-
 .../systeminfo/internal/DHISVersionShould.kt  | 46 +++++++++++++++++++
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
index b6ab8eab72..9d4ca0f9c1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
@@ -27,7 +27,7 @@
  */
 package org.hisp.dhis.android.core.systeminfo
 
-enum class DHISVersion(internal val prefix: String) {
+enum class DHISVersion(internal val prefix: String, internal val supported: Boolean = true) {
     V2_29("2.29"),
     V2_30("2.30"),
     V2_31("2.31"),
@@ -40,13 +40,13 @@ enum class DHISVersion(internal val prefix: String) {
     V2_38("2.38"),
     V2_39("2.39"),
     V2_40("2.40"),
-    V2_41("2.41"),
+    V2_41("2.41", false),
     ;
 
     companion object {
         @JvmStatic
         fun getValue(versionStr: String): DHISVersion? {
-            return values().find { versionStr.startsWith(it.prefix) }
+            return values().find { versionStr.startsWith(it.prefix).and(it.supported) }
         }
 
         @JvmStatic
@@ -56,7 +56,7 @@ enum class DHISVersion(internal val prefix: String) {
 
         @JvmStatic
         fun allowedVersionsAsStr(): Array<String> {
-            return listOf(V2_30, V2_31, V2_32, V2_33, V2_34, V2_35, V2_36, V2_37, V2_38, V2_39, V2_40, V2_41)
+            return values().filter { it.supported }
                 .map { it.prefix }
                 .toTypedArray()
         }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SMSVersionShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SMSVersionShould.kt
index 31c089abb6..5ba5bf262c 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SMSVersionShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/SMSVersionShould.kt
@@ -60,7 +60,7 @@ class SMSVersionShould {
     @Test
     fun return_non_null_for_any_version_greater_than_2_32() {
         DHISVersion.values()
-            .filter { it > DHISVersion.V2_32 }
+            .filter { it > DHISVersion.V2_32 && it.supported }
             .forEach {
                 assertThat(getValue(it.prefix + ".0")).isNotNull()
                 assertThat(getValue(it.prefix + ".9")).isNotNull()
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
new file mode 100644
index 0000000000..eb26f598c3
--- /dev/null
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.systeminfo.internal
+
+import com.google.common.truth.Truth
+import org.hisp.dhis.android.core.systeminfo.DHISVersion
+import org.hisp.dhis.android.core.systeminfo.SMSVersion
+import org.junit.Test
+
+class DHISVersionShould {
+    @Test
+    fun return_non_null_for_any_version_greater_than_2_32() {
+        DHISVersion.values()
+            .filter { it > DHISVersion.V2_32 && it.supported }
+            .forEach {
+                Truth.assertThat(SMSVersion.getValue(it.prefix + ".0")).isNotNull()
+                Truth.assertThat(SMSVersion.getValue(it.prefix + ".9")).isNotNull()
+            }
+    }
+}

From 9cd394e38ab089fca9a039ed2d770b348208ec22 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 23 Oct 2023 12:27:45 +0200
Subject: [PATCH 452/478] [ANDROSDK-1741] fix: - DHISVersionShould to work
 properly - "2.29" version must be excluded

---
 .../org/hisp/dhis/android/core/systeminfo/DHISVersion.kt | 2 +-
 .../core/systeminfo/internal/DHISVersionShould.kt        | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
index 9d4ca0f9c1..f885f73313 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/DHISVersion.kt
@@ -28,7 +28,7 @@
 package org.hisp.dhis.android.core.systeminfo
 
 enum class DHISVersion(internal val prefix: String, internal val supported: Boolean = true) {
-    V2_29("2.29"),
+    V2_29("2.29", false),
     V2_30("2.30"),
     V2_31("2.31"),
     V2_32("2.32"),
diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
index eb26f598c3..12c7fe91b3 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
@@ -35,12 +35,13 @@ import org.junit.Test
 
 class DHISVersionShould {
     @Test
-    fun return_non_null_for_any_version_greater_than_2_32() {
+    fun return_null_for_unsupported_versions() {
+        val supportedVersions = listOf("2.29", "2.41")
         DHISVersion.values()
-            .filter { it > DHISVersion.V2_32 && it.supported }
+            .filter { supportedVersions.contains(it.prefix) }
             .forEach {
-                Truth.assertThat(SMSVersion.getValue(it.prefix + ".0")).isNotNull()
-                Truth.assertThat(SMSVersion.getValue(it.prefix + ".9")).isNotNull()
+                Truth.assertThat(DHISVersion.getValue(it.prefix + ".0")).isNull()
+                Truth.assertThat(DHISVersion.getValue(it.prefix + ".9")).isNull()
             }
     }
 }

From 3232dc8275566f34e12164c81dc9f49c8c2f6d58 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 23 Oct 2023 13:39:10 +0200
Subject: [PATCH 453/478] [ANDROSDK-1741] style: - remove unused import

---
 .../dhis/android/core/systeminfo/internal/DHISVersionShould.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
index 12c7fe91b3..7930d06d40 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/DHISVersionShould.kt
@@ -30,7 +30,6 @@ package org.hisp.dhis.android.core.systeminfo.internal
 
 import com.google.common.truth.Truth
 import org.hisp.dhis.android.core.systeminfo.DHISVersion
-import org.hisp.dhis.android.core.systeminfo.SMSVersion
 import org.junit.Test
 
 class DHISVersionShould {

From 2481411a095c0b2c0ecb2ad03ab158e2d8bf0259 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Mon, 23 Oct 2023 14:39:50 +0200
Subject: [PATCH 454/478] [ANDROSDK-1741] fix: - Upgade DHIS version for
 testing to "2.30" in SystemInfoCallShould

---
 .../android/core/systeminfo/internal/SystemInfoCallShould.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
index 9dfc86ec61..b14ab87523 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/systeminfo/internal/SystemInfoCallShould.kt
@@ -77,7 +77,7 @@ class SystemInfoCallShould {
             coroutineAPICallExecutor,
         )
 
-        whenever(systemInfo.version()).thenReturn("2.29")
+        whenever(systemInfo.version()).thenReturn("2.30")
         whenever(systemInfo.serverDate()).thenReturn(serverDate)
         whenever(databaseAdapter.beginNewTransaction()).thenReturn(transaction)
         systemInfoService.stub {

From 22f96b745be5a75516dcae274aec8cf0b006de64 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 24 Oct 2023 09:25:29 +0200
Subject: [PATCH 455/478] [ANDROSDK-1772] style: - Clean unused, recently
 refactored classes

---
 .../arch/call/factories/internal/UidsCall.kt  | 34 -------------------
 .../internal/ValidationRuleUidsCall.kt        | 33 ------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
deleted file mode 100644
index 9bcb257bc8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import io.reactivex.Single
-
-internal fun interface UidsCall<P> {
-    fun download(uids: Set<String>): Single<List<P>>
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
deleted file mode 100644
index 8659b048c8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.validation.internal
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.common.ObjectWithUid
-
-internal interface ValidationRuleUidsCall : UidsCall<ObjectWithUid>

From 9efa127d50b5c89ac30af6f764123a32117f501d Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 24 Oct 2023 12:36:33 +0200
Subject: [PATCH 456/478] [ANDROSDK-1744] Set default order direction

---
 .../filters/internal/FilterConnectorFactory.kt        | 11 ++++++++---
 .../scope/internal/RepositoryScopeHelper.kt           |  8 +-------
 .../scope/internal/RepositoryScopeOrderByItem.java    | 11 ++++++++---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
index 4d8c1e2cc0..ed8e15fafa 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/filters/internal/FilterConnectorFactory.kt
@@ -115,7 +115,8 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
     }
 
     fun withOrderBy(column: String, direction: OrderByDirection?): R {
-        val item = RepositoryScopeOrderByItem.builder().column(column).direction(direction).build()
+        val orderDirection = direction ?: OrderByDirection.ASC
+        val item = RepositoryScopeOrderByItem.builder().column(column).direction(orderDirection).build()
         return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item))
     }
 
@@ -180,8 +181,12 @@ class FilterConnectorFactory<R : BaseRepository> internal constructor(
                 ifFalseValue,
             )
         }
-        val item =
-            RepositoryScopeOrderByItem.builder().column(column).direction(direction).keyExtractor(extractor).build()
+        val orderDirection = direction ?: OrderByDirection.ASC
+        val item = RepositoryScopeOrderByItem.builder()
+            .column(column)
+            .direction(orderDirection)
+            .keyExtractor(extractor)
+            .build()
         return repositoryFactory.updated(RepositoryScopeHelper.withOrderBy(scope, item))
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
index 3443268f2b..89f099e4a3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeHelper.kt
@@ -63,13 +63,7 @@ internal object RepositoryScopeHelper {
 
     @JvmStatic
     fun withOrderBy(scope: RepositoryScope, item: RepositoryScopeOrderByItem): RepositoryScope {
-        val newItems: MutableList<RepositoryScopeOrderByItem> = ArrayList(scope.orderBy().size + 1)
-        for (i in scope.orderBy()) {
-            if (i.column() != item.column()) {
-                newItems.add(i)
-            }
-        }
-        newItems.add(item)
+        val newItems = scope.orderBy().filter { it.column() != item.column() } + item
         return scope.toBuilder().orderBy(newItems).build()
     }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java
index 2b32724375..8d55dca6b6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/repositories/scope/internal/RepositoryScopeOrderByItem.java
@@ -30,6 +30,8 @@
 
 import android.content.ContentValues;
 
+import androidx.annotation.NonNull;
+
 import com.google.auto.value.AutoValue;
 
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
@@ -37,10 +39,13 @@
 @AutoValue
 public abstract class RepositoryScopeOrderByItem {
 
+    @NonNull
     public abstract String column();
 
+    @NonNull
     public abstract RepositoryScope.OrderByDirection direction();
 
+    @NonNull
     public abstract RepositoryScopeKeyOrderExtractor keyExtractor();
 
     public String getKey(ContentValues contentValues) {
@@ -62,11 +67,11 @@ public static Builder builder() {
     @AutoValue.Builder
     public abstract static class Builder {
 
-        public abstract Builder column(String column);
+        public abstract Builder column(@NonNull String column);
 
-        public abstract Builder direction(RepositoryScope.OrderByDirection direction);
+        public abstract Builder direction(@NonNull RepositoryScope.OrderByDirection direction);
 
-        public abstract Builder keyExtractor(RepositoryScopeKeyOrderExtractor keyExtractor);
+        public abstract Builder keyExtractor(@NonNull RepositoryScopeKeyOrderExtractor keyExtractor);
 
         public abstract RepositoryScopeOrderByItem build();
     }

From 739697460dee103e9c0ae516c547d27d4136f94b Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 25 Oct 2023 08:29:36 +0200
Subject: [PATCH 457/478] [ANDROSDK-1771] build: - Upgrade to Android API 34

---
 core/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 2404072f25..181b10dd15 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -45,7 +45,7 @@ repositories {
     maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
 }
 
-val _targetSdkVersion = 33
+val _targetSdkVersion = 34
 val _minSdkVersion = 21
 val VERSION_CODE: String by project
 val VERSION_NAME: String by project

From 376f9a3ed6b0dc4f206805495d90d2509e755d80 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 25 Oct 2023 08:30:27 +0200
Subject: [PATCH 458/478] [ANDROSDK-1775] refactor: - UserModuleDownloader from
 RxJava to Coroutines

---
 .../internal/UserCallMockIntegrationShould.kt | 11 ++--
 .../internal/ListCoroutineCallFactoryImpl.kt  |  5 +-
 .../constant/internal/ConstantCallFetcher.kt  | 50 +++++++++++++++++++
 .../internal/ConstantCoroutineCallFactory.kt  | 12 +++--
 ...llFetcher.java => AuthorityCallFetcher.kt} | 44 +++++++---------
 .../internal/AuthorityEndpointCallFactory.kt  | 16 +++---
 ...horityService.java => AuthorityService.kt} | 13 ++---
 .../android/core/user/internal/UserCall.kt    | 10 ++--
 .../user/internal/UserModuleDownloader.kt     |  2 +-
 .../internal/AuthorityEndpointCallShould.kt   | 43 ++++++++++------
 .../core/user/internal/UserCallShould.kt      | 11 ++--
 11 files changed, 140 insertions(+), 77 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{AuthorityCallFetcher.java => AuthorityCallFetcher.kt} (61%)
 rename core/src/main/java/org/hisp/dhis/android/core/user/internal/{AuthorityService.java => AuthorityService.kt} (88%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
index 66c834138c..fc2d20cffa 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
@@ -28,6 +28,8 @@
 package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.db.stores.internal.IdentifiableObjectStore
 import org.hisp.dhis.android.core.data.user.UserSamples
 import org.hisp.dhis.android.core.user.User
@@ -38,22 +40,23 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.concurrent.Callable
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(D2JunitRunner::class)
 class UserCallMockIntegrationShould : BaseMockIntegrationTestEmptyEnqueable() {
 
     private lateinit var userStore: IdentifiableObjectStore<User>
-    private lateinit var userCall: Callable<User>
+    private lateinit var userCall: suspend() -> User
 
     @Before
     fun setUp() {
         userStore = UserStoreImpl(databaseAdapter)
-        userCall = objects.d2DIComponent.internalModules.user.userCall
+        userCall = { objects.d2DIComponent.internalModules.user.userCall.call() }
     }
 
     @Test
-    fun persist_user_in_database_when_call() {
+    fun persist_user_in_database_when_call() = runTest {
         dhis2MockServer.enqueueMockResponse("user/user38.json")
-        userCall.call()
+        userCall.invoke()
 
         assertThat(userStore.count()).isEqualTo(1)
         assertThat(userStore.selectFirst()).isEqualTo(UserSamples.getUser())
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
index 4e50243c4f..9cd8b98f09 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCoroutineCallFactoryImpl.kt
@@ -29,6 +29,7 @@
 package org.hisp.dhis.android.core.arch.call.factories.internal
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 
@@ -37,11 +38,11 @@ internal abstract class ListCoroutineCallFactoryImpl<P> protected constructor(
     protected val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : ListCoroutineCallFactory<P> {
     override suspend fun create(): List<P> {
-        val objects: List<P> = fetcher()
+        val objects: List<P> = fetcher().fetch()
         processor().process(objects)
         return objects
     }
 
-    protected abstract suspend fun fetcher(): List<P>
+    protected abstract suspend fun fetcher(): CoroutineCallFetcher<P>
     protected abstract fun processor(): CallProcessor<P>
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt
new file mode 100644
index 0000000000..045258670b
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.constant.internal
+
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
+import org.hisp.dhis.android.core.constant.Constant
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.user.Authority
+
+internal abstract class ConstantCallFetcher(
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : CoroutineCallFetcher<Constant> {
+
+    protected abstract suspend fun getCall(): List<Constant>
+
+
+    @Throws(D2Error::class)
+    override suspend fun fetch(): List<Constant> {
+        return coroutineAPICallExecutor.wrap {
+            getCall()
+        }.getOrThrow()
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
index 4015519fec..3f5a00dc92 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCoroutineCallFactory.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.constant.internal
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.call.processors.internal.TransactionalNoResourceSyncCallProcessor
@@ -42,10 +43,13 @@ internal class ConstantCoroutineCallFactory(
     private val service: ConstantService,
     private val handler: ConstantHandler,
 ) : ListCoroutineCallFactoryImpl<Constant>(data, coroutineAPICallExecutor) {
-    override suspend fun fetcher(): List<Constant> {
-        return coroutineAPICallExecutor.wrap {
-            service.constants(ConstantFields.allFields, false)
-        }.getOrThrow().items()
+
+    override suspend fun fetcher(): CoroutineCallFetcher<Constant> {
+        return object : ConstantCallFetcher(coroutineAPICallExecutor) {
+            override suspend fun getCall(): List<Constant> {
+                return service.constants(ConstantFields.allFields, false).items()
+            }
+        }
     }
 
     override fun processor(): CallProcessor<Constant> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt
similarity index 61%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt
index 1ddc3c7777..5a23473e14 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt
@@ -25,38 +25,30 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user.internal
 
-package org.hisp.dhis.android.core.user.internal;
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
+import org.hisp.dhis.android.core.maintenance.D2Error
+import org.hisp.dhis.android.core.user.Authority
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor;
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.user.Authority;
+internal abstract class AuthorityCallFetcher(
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+) : CoroutineCallFetcher<Authority> {
 
-import java.util.ArrayList;
-import java.util.List;
+    protected abstract suspend fun getCall(): List<String>
 
-import androidx.annotation.NonNull;
 
-abstract class AuthorityCallFetcher implements CallFetcher<Authority> {
+    @Throws(D2Error::class)
+    override suspend fun fetch(): List<Authority> {
+        val authoritiesAsStringList: List<String> = coroutineAPICallExecutor.wrap {
+            getCall()
+        }.getOrThrow()
 
-    private final APICallExecutor apiCallExecutor;
-
-    AuthorityCallFetcher(@NonNull APICallExecutor apiCallExecutor) {
-        this.apiCallExecutor = apiCallExecutor;
-    }
-
-    protected abstract retrofit2.Call<List<String>> getCall();
-
-    @Override
-    public List<Authority> fetch() throws D2Error {
-        List<String> authoritiesAsStringList = apiCallExecutor.executeObjectCall(getCall());
-
-        List<Authority> authorities = new ArrayList<>();
-        for (String authority : authoritiesAsStringList) {
-            authorities.add(Authority.builder().name(authority).build());
+        val authorities: MutableList<Authority> = ArrayList()
+        for (authority in authoritiesAsStringList) {
+            authorities.add(Authority.builder().name(authority).build())
         }
-
-        return authorities;
+        return authorities
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
index cf32c20e79..bbd18b32b8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
@@ -28,8 +28,11 @@
 package org.hisp.dhis.android.core.user.internal
 
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
+import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
@@ -40,10 +43,10 @@ import retrofit2.Call
 @Singleton
 internal class AuthorityEndpointCallFactory constructor(
     data: GenericCallData,
-    apiCallExecutor: APICallExecutor,
+    coroutineAPICallExecutor: CoroutineAPICallExecutor,
     handler: AuthorityHandler,
     service: AuthorityService,
-) : ListCallFactoryImpl<Authority>(data, apiCallExecutor) {
+) : ListCoroutineCallFactoryImpl<Authority>(data, coroutineAPICallExecutor) {
     private val handler: Handler<Authority>
     private val service: AuthorityService
 
@@ -52,10 +55,11 @@ internal class AuthorityEndpointCallFactory constructor(
         this.service = service
     }
 
-    override fun fetcher(): CallFetcher<Authority> {
-        return object : AuthorityCallFetcher(apiCallExecutor) {
-            override fun getCall(): Call<List<String>> {
-                return service.authorities
+
+    override suspend fun fetcher(): CoroutineCallFetcher<Authority> {
+        return object : AuthorityCallFetcher(coroutineAPICallExecutor) {
+            override suspend fun getCall(): List<String> {
+                return service.authorities()
             }
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt
similarity index 88%
rename from core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java
rename to core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt
index f1e4b283f1..2f94a9038d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt
@@ -25,16 +25,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.user.internal
 
-package org.hisp.dhis.android.core.user.internal;
-
-import java.util.List;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-
-public interface AuthorityService {
+import retrofit2.http.GET
 
+internal fun interface AuthorityService {
     @GET("me/authorization")
-    Call<List<String>> getAuthorities();
+    suspend fun authorities(): List<String>
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index b0370e26d5..8454e10544 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -28,14 +28,12 @@
 package org.hisp.dhis.android.core.user.internal
 
 import android.util.Log
-import kotlinx.coroutines.runBlocking
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.user.User
 import org.koin.core.annotation.Singleton
-import java.util.concurrent.Callable
 
 @Singleton
 internal class UserCall(
@@ -44,17 +42,17 @@ internal class UserCall(
     private val userService: UserService,
     private val userHandler: UserHandler,
     private val dhisVersionManager: DHISVersionManager,
-) : Callable<User> {
+) {
 
     @Throws(D2Error::class)
-    override fun call(): User {
-        val user = runBlocking {
+    suspend fun call(): User {
+        val user =
             coroutineAPICallExecutor.wrap {
                 userService.getUser(
                     UserFields.allFieldsWithOrgUnit(dhisVersionManager.getVersion()),
                 )
             }.getOrThrow()
-        }
+
 
         val transaction = genericCallData.databaseAdapter().beginNewTransaction()
         try {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
index f656305b69..a1305663af 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserModuleDownloader.kt
@@ -38,7 +38,7 @@ internal class UserModuleDownloader(
 ) : TypedModuleDownloader<User> {
     override suspend fun downloadMetadata(): User {
         val user = userCall.call()
-        authorityCallFactory.create().call()
+        authorityCallFactory.create()
         return user
     }
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
index c8f0b1cac2..4aa7a7d6a2 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
@@ -29,9 +29,17 @@ package org.hisp.dhis.android.core.user.internal
 
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.stub
 import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
 import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorImpl
+import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
+import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
+import org.hisp.dhis.android.core.arch.call.internal.EndpointCoroutineCall
 import org.hisp.dhis.android.core.common.BaseCallShould
 import org.hisp.dhis.android.core.user.Authority
 import org.junit.Before
@@ -42,47 +50,54 @@ import retrofit2.Call
 import retrofit2.Response
 import java.util.concurrent.Callable
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class AuthorityEndpointCallShould : BaseCallShould() {
     private val authorityService: AuthorityService = mock()
     private val handler: AuthorityHandler = mock()
-    private val retrofitCall: Call<List<String>> = mock()
     private val payload: List<String> = mock()
-    private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher = mock()
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
 
-    private lateinit var endpointCall: Callable<List<Authority>>
+    private lateinit var endpointCall: suspend () -> List<Authority>
 
     @Before
     override fun setUp() {
         super.setUp()
-        val apiCallExecutor = APICallExecutorImpl.create(databaseAdapter, userAccountDisabledErrorCatcher)
-        endpointCall = AuthorityEndpointCallFactory(
+
+        endpointCall = { AuthorityEndpointCallFactory(
             genericCallData,
-            apiCallExecutor,
+            coroutineAPICallExecutor,
             handler,
             retrofit.create(AuthorityService::class.java),
-        ).create()
-        whenever(retrofitCall.execute()).thenReturn(Response.success(payload))
-        whenever(authorityService.authorities).thenReturn(retrofitCall)
+        ).create() }
+        authorityService.stub {
+            onBlocking { authorities() }.thenReturn(payload)
+        }
     }
 
     private fun castedEndpointCall(): EndpointCall<Authority> {
         return endpointCall as EndpointCall<Authority>
     }
 
-    @Test
-    fun extend_endpoint_call() {
+/*    @Test
+    fun have_payload_no_resource_fetcher() = runTest {
+        assertThat(1 + 1 == 2).isTrue()
+    }*/
+
+
+ /*   @Test
+    fun extend_endpoint_call() = runTest {
         assertThat(endpointCall is EndpointCall<*>).isTrue()
     }
 
     @Test
-    fun have_payload_no_resource_fetcher() {
-        assertThat(castedEndpointCall().fetcher is AuthorityCallFetcher).isTrue()
+    fun have_payload_no_resource_fetcher() = runTest {
+        assertThat(castedEndpointCall() is AuthorityCallFetcher).isTrue()
     }
 
     @Test
     fun have_transactional_no_resource_call_processor() {
         val castedEndpointCall = endpointCall as EndpointCall<Authority>
         assertThat(castedEndpointCall.processor is AuthorityCallProcessor).isTrue()
-    }
+    }*/
 }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 9c5a636c6a..222978893b 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -55,14 +55,15 @@ class UserCallShould : BaseCallShould() {
     private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
     private val user: User = mock()
 
-    private lateinit var userSyncCall: Callable<User>
+    private lateinit var userSyncCall: suspend() -> User
 
     @Before
     override fun setUp() {
         super.setUp()
         whenAPICall { userCall }
 
-        userSyncCall = UserCall(genericCallData, coroutineAPICallExecutor, userService, userHandler, dhisVersionManager)
+        userSyncCall = {
+            UserCall(genericCallData, coroutineAPICallExecutor, userService, userHandler, dhisVersionManager).call() }
 
         whenever(dhisVersionManager.getVersion()).thenReturn(DHISVersion.V2_39)
     }
@@ -78,7 +79,7 @@ class UserCallShould : BaseCallShould() {
         whenAPICall { throw d2Error }
 
         try {
-            userSyncCall.call()
+            userSyncCall.invoke()
             Assert.fail("Exception was not thrown")
         } catch (ex: Exception) {
             // verify that handlers was not touched
@@ -93,7 +94,7 @@ class UserCallShould : BaseCallShould() {
     fun not_invoke_handler_after_call_failure() = runTest {
         whenAPICall { throw d2Error }
         try {
-            userSyncCall.call()
+            userSyncCall.invoke()
             Assert.fail("Call should't succeed")
         } catch (d2Exception: D2Error) {
             // verify that database was not touched
@@ -107,7 +108,7 @@ class UserCallShould : BaseCallShould() {
     @Test
     fun invoke_handlers_on_success() = runTest {
         whenAPICall { user }
-        userSyncCall.call()
+        userSyncCall.invoke()
         verify(userHandler).handle(eq(user))
     }
 }

From 54958cb358d1db7253eb17398f67af3b86941f63 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 25 Oct 2023 12:17:44 +0200
Subject: [PATCH 459/478] [ANDROSDK-1775] refactor: - Remove useless test
 AuthorityEndpointCallShould.kt style: - Follow style guidelines

---
 .../internal/UserCallMockIntegrationShould.kt |   1 -
 .../constant/internal/ConstantCallFetcher.kt  |   6 +-
 .../user/internal/AuthorityCallFetcher.kt     |   5 +-
 .../internal/AuthorityEndpointCallFactory.kt  |   5 -
 .../core/user/internal/AuthorityService.kt    |   2 +-
 .../android/core/user/internal/UserCall.kt    |   1 -
 .../internal/AuthorityEndpointCallShould.kt   | 103 ------------------
 .../core/user/internal/UserCallShould.kt      |   4 +-
 8 files changed, 7 insertions(+), 120 deletions(-)
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
index fc2d20cffa..2971fc2ff0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/user/internal/UserCallMockIntegrationShould.kt
@@ -38,7 +38,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.concurrent.Callable
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(D2JunitRunner::class)
diff --git a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt
index 045258670b..d2f1a05503 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/constant/internal/ConstantCallFetcher.kt
@@ -32,19 +32,17 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallEx
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.constant.Constant
 import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.user.Authority
 
 internal abstract class ConstantCallFetcher(
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : CoroutineCallFetcher<Constant> {
 
     protected abstract suspend fun getCall(): List<Constant>
 
-
     @Throws(D2Error::class)
     override suspend fun fetch(): List<Constant> {
         return coroutineAPICallExecutor.wrap {
             getCall()
         }.getOrThrow()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt
index 5a23473e14..cd71d719e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityCallFetcher.kt
@@ -33,12 +33,11 @@ import org.hisp.dhis.android.core.maintenance.D2Error
 import org.hisp.dhis.android.core.user.Authority
 
 internal abstract class AuthorityCallFetcher(
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor
+    private val coroutineAPICallExecutor: CoroutineAPICallExecutor,
 ) : CoroutineCallFetcher<Authority> {
 
     protected abstract suspend fun getCall(): List<String>
 
-
     @Throws(D2Error::class)
     override suspend fun fetch(): List<Authority> {
         val authoritiesAsStringList: List<String> = coroutineAPICallExecutor.wrap {
@@ -51,4 +50,4 @@ internal abstract class AuthorityCallFetcher(
         }
         return authorities
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
index bbd18b32b8..f1eeab78d3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallFactory.kt
@@ -27,18 +27,14 @@
  */
 package org.hisp.dhis.android.core.user.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
 import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.call.factories.internal.ListCallFactoryImpl
 import org.hisp.dhis.android.core.arch.call.factories.internal.ListCoroutineCallFactoryImpl
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
 import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
 import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
 import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.user.Authority
 import org.koin.core.annotation.Singleton
-import retrofit2.Call
 
 @Singleton
 internal class AuthorityEndpointCallFactory constructor(
@@ -55,7 +51,6 @@ internal class AuthorityEndpointCallFactory constructor(
         this.service = service
     }
 
-
     override suspend fun fetcher(): CoroutineCallFetcher<Authority> {
         return object : AuthorityCallFetcher(coroutineAPICallExecutor) {
             override suspend fun getCall(): List<String> {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt
index 2f94a9038d..6abb7b5c00 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/AuthorityService.kt
@@ -32,4 +32,4 @@ import retrofit2.http.GET
 internal fun interface AuthorityService {
     @GET("me/authorization")
     suspend fun authorities(): List<String>
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
index 8454e10544..39a2300eb0 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/user/internal/UserCall.kt
@@ -53,7 +53,6 @@ internal class UserCall(
                 )
             }.getOrThrow()
 
-
         val transaction = genericCallData.databaseAdapter().beginNewTransaction()
         try {
             userHandler.handle(user)
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
deleted file mode 100644
index 4aa7a7d6a2..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/AuthorityEndpointCallShould.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.user.internal
-
-import com.google.common.truth.Truth.assertThat
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.stub
-import com.nhaarman.mockitokotlin2.whenever
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorImpl
-import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallExecutorMock
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CoroutineCallFetcher
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCoroutineCall
-import org.hisp.dhis.android.core.common.BaseCallShould
-import org.hisp.dhis.android.core.user.Authority
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import retrofit2.Call
-import retrofit2.Response
-import java.util.concurrent.Callable
-
-@OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(JUnit4::class)
-class AuthorityEndpointCallShould : BaseCallShould() {
-    private val authorityService: AuthorityService = mock()
-    private val handler: AuthorityHandler = mock()
-    private val payload: List<String> = mock()
-    private val coroutineAPICallExecutor: CoroutineAPICallExecutor = CoroutineAPICallExecutorMock()
-
-    private lateinit var endpointCall: suspend () -> List<Authority>
-
-    @Before
-    override fun setUp() {
-        super.setUp()
-
-        endpointCall = { AuthorityEndpointCallFactory(
-            genericCallData,
-            coroutineAPICallExecutor,
-            handler,
-            retrofit.create(AuthorityService::class.java),
-        ).create() }
-        authorityService.stub {
-            onBlocking { authorities() }.thenReturn(payload)
-        }
-    }
-
-    private fun castedEndpointCall(): EndpointCall<Authority> {
-        return endpointCall as EndpointCall<Authority>
-    }
-
-/*    @Test
-    fun have_payload_no_resource_fetcher() = runTest {
-        assertThat(1 + 1 == 2).isTrue()
-    }*/
-
-
- /*   @Test
-    fun extend_endpoint_call() = runTest {
-        assertThat(endpointCall is EndpointCall<*>).isTrue()
-    }
-
-    @Test
-    fun have_payload_no_resource_fetcher() = runTest {
-        assertThat(castedEndpointCall() is AuthorityCallFetcher).isTrue()
-    }
-
-    @Test
-    fun have_transactional_no_resource_call_processor() {
-        val castedEndpointCall = endpointCall as EndpointCall<Authority>
-        assertThat(castedEndpointCall.processor is AuthorityCallProcessor).isTrue()
-    }*/
-}
diff --git a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
index 222978893b..24092b62ed 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/user/internal/UserCallShould.kt
@@ -44,7 +44,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.mockito.stubbing.Answer
-import java.util.concurrent.Callable
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
 class UserCallShould : BaseCallShould() {
@@ -63,7 +62,8 @@ class UserCallShould : BaseCallShould() {
         whenAPICall { userCall }
 
         userSyncCall = {
-            UserCall(genericCallData, coroutineAPICallExecutor, userService, userHandler, dhisVersionManager).call() }
+            UserCall(genericCallData, coroutineAPICallExecutor, userService, userHandler, dhisVersionManager).call()
+        }
 
         whenever(dhisVersionManager.getVersion()).thenReturn(DHISVersion.V2_39)
     }

From f1045bd572a4624c7feccf0bfc5a949e29c6808c Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 24 Oct 2023 09:25:29 +0200
Subject: [PATCH 460/478] [ANDROSDK-1772] style: - Clean unused, recently
 refactored classes

---
 .../arch/call/factories/internal/UidsCall.kt  | 34 -------------------
 .../internal/ValidationRuleUidsCall.kt        | 33 ------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
deleted file mode 100644
index 9bcb257bc8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/UidsCall.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import io.reactivex.Single
-
-internal fun interface UidsCall<P> {
-    fun download(uids: Set<String>): Single<List<P>>
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt b/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
deleted file mode 100644
index 8659b048c8..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/validation/internal/ValidationRuleUidsCall.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.validation.internal
-
-import org.hisp.dhis.android.core.arch.call.factories.internal.UidsCall
-import org.hisp.dhis.android.core.common.ObjectWithUid
-
-internal interface ValidationRuleUidsCall : UidsCall<ObjectWithUid>

From 7fee7ed83e0fc336789eea43d10f89af76e95cac Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 25 Oct 2023 22:54:30 +0200
Subject: [PATCH 461/478] [ANDROSDK-1772] chore: - Clean unused old java/rxjava
 classes: - - APICallExecutor.java, APICallExecutorImpl.java,
 APICallExecutorShould.java - - APIDownloader old RxJava methods - -
 ListCallFactory.kt, ListCallFactoryImpl.kt - - RxAPICallExecutor.kt,
 RxAPICallExecutorImpl.kt

---
 .../executors/internal/APICallExecutor.java   |  49 ----
 .../internal/APICallExecutorImpl.java         | 145 ------------
 .../api/executors/internal/APIDownloader.kt   |   6 -
 .../executors/internal/APIDownloaderImpl.kt   |  17 --
 .../executors/internal/RxAPICallExecutor.kt   |  38 ----
 .../internal/RxAPICallExecutorImpl.kt         | 105 ---------
 .../factories/internal/ListCallFactory.kt     |  34 ---
 .../factories/internal/ListCallFactoryImpl.kt |  48 ----
 .../core/arch/d2/internal/JavaDIClasses.kt    |   3 -
 .../internal/APICallExecutorShould.java       | 209 ------------------
 10 files changed, 654 deletions(-)
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutor.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt
 delete mode 100644 core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
 delete mode 100644 core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java
deleted file mode 100644
index e344c1cde7..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.api.executors.internal;
-
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-
-import java.util.List;
-
-import retrofit2.Call;
-
-public interface APICallExecutor {
-
-    <P> List<P> executePayloadCall(Call<Payload<P>> call) throws D2Error;
-
-    <P> P executeObjectCall(Call<P> call) throws D2Error;
-
-    <P> P executeObjectCallWithAcceptedErrorCodes(Call<P> call,
-                                                  List<Integer> acceptedErrorCodes,
-                                                  Class<P> errorClass) throws D2Error;
-
-    <P> P executeObjectCallWithErrorCatcher(Call<P> call, APICallErrorCatcher errorCatcher) throws D2Error;
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
deleted file mode 100644
index 8b41df5589..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorImpl.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.api.executors.internal;
-
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter;
-import org.hisp.dhis.android.core.arch.json.internal.ObjectMapperFactory;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStoreImpl;
-import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import retrofit2.Call;
-import retrofit2.Response;
-
-public final class APICallExecutorImpl implements APICallExecutor {
-
-    private final D2ErrorStore errorStore;
-    private final UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher;
-    private final APIErrorMapper errorMapper = new APIErrorMapper();
-
-    public APICallExecutorImpl(D2ErrorStore errorStore,
-                               UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher) {
-        this.errorStore = errorStore;
-        this.userAccountDisabledErrorCatcher = userAccountDisabledErrorCatcher;
-    }
-
-    @Override
-    public <P> List<P> executePayloadCall(Call<Payload<P>> call) throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, null).items();
-    }
-
-    @Override
-    public <P> P executeObjectCall(Call<P> call) throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, null);
-    }
-
-    @Override
-    public <P> P executeObjectCallWithAcceptedErrorCodes(Call<P> call, List<Integer> acceptedErrorCodes,
-                                                         Class<P> errorClass) throws D2Error {
-        return executeObjectCallInternal(call, acceptedErrorCodes, errorClass, null);
-    }
-
-    @Override
-    public <P> P executeObjectCallWithErrorCatcher(Call<P> call, APICallErrorCatcher errorCatcher)
-            throws D2Error {
-        return executeObjectCallInternal(call, new ArrayList<>(), null, errorCatcher);
-    }
-
-    private <P> P executeObjectCallInternal(Call<P> call,
-                                            List<Integer> acceptedErrorCodes,
-                                            Class<P> errorClass,
-                                            APICallErrorCatcher errorCatcher) throws D2Error {
-        try {
-            Response<P> response = call.execute();
-            if (response.isSuccessful()) {
-                return processSuccessfulResponse(errorBuilder(call), response);
-            } else {
-                String errorBody = errorMapper.getErrorBody(response);
-                if (userAccountDisabledErrorCatcher.isUserAccountLocked(response, errorBody)) {
-                    this.catchAndThrow(userAccountDisabledErrorCatcher, errorBuilder(call), response, errorBody);
-                } else if (errorClass != null && acceptedErrorCodes.contains(response.code())) {
-                    return ObjectMapperFactory.objectMapper().readValue(errorBody, errorClass);
-                } else if (errorCatcher != null) {
-                    this.catchAndThrow(errorCatcher, errorBuilder(call), response, errorBody);
-                }
-                throw storeAndReturn(errorMapper.responseException(errorBuilder(call), response, null, errorBody));
-            }
-        } catch (D2Error d2Error) {
-            throw d2Error;
-        } catch (Throwable t) {
-            throw storeAndReturn(errorMapper.mapRetrofitException(t, errorBuilder(call)));
-        }
-    }
-
-    private <P> void catchAndThrow(APICallErrorCatcher errorCatcher, D2Error.Builder errorBuilder,
-                                   Response<P> response, String errorBody) throws IOException, D2Error {
-        D2ErrorCode d2ErrorCode = errorCatcher.catchError(response, errorBody);
-
-        if (d2ErrorCode != null) {
-            D2Error d2error = errorMapper.responseException(errorBuilder, response, d2ErrorCode, errorBody);
-
-            if (errorCatcher.mustBeStored()) {
-                throw storeAndReturn(d2error);
-            } else {
-                throw d2error;
-            }
-        }
-    }
-
-    private <P> P processSuccessfulResponse(D2Error.Builder errorBuilder, Response<P> response) throws D2Error {
-        if (response.body() == null) {
-            throw storeAndReturn(errorMapper.responseException(errorBuilder, response, null, null));
-        } else {
-            return response.body();
-        }
-    }
-
-    private D2Error storeAndReturn(D2Error error) {
-        if (errorStore.isReady()) {
-            errorStore.insert(error);
-        }
-        return error;
-    }
-
-    private <P> D2Error.Builder errorBuilder(Call<P> call) {
-        return errorMapper.getBaseErrorBuilder(call);
-    }
-
-    public static APICallExecutor create(DatabaseAdapter databaseAdapter,
-                                         UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher) {
-        return new APICallExecutorImpl(new D2ErrorStoreImpl(databaseAdapter), userAccountDisabledErrorCatcher);
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
index 0ee467977a..ae2442130a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloader.kt
@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -78,15 +77,10 @@ internal interface APIDownloader {
         downloader: suspend(String?) -> Payload<P>,
     ): List<P>
 
-    fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>>
     suspend fun <P> downloadCoroutines(handler: Handler<P>, downloader: suspend() -> Payload<P>): List<P>
 
-    fun <P> downloadList(handler: Handler<P>, downloader: Single<List<P>>): Single<List<P>>
-
     suspend fun <P> downloadListAsCoroutine(handler: Handler<P>, downloader: suspend () -> List<P>): List<P>
 
-    fun <P> downloadObject(handler: Handler<P>, downloader: Single<P>): Single<P>
-
     suspend fun <P> downloadObjectAsCoroutine(handler: Handler<P>, downloader: suspend () -> P): P
 
     suspend fun <P> downloadPagedPayload(
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
index f71e150ff4..4342c3b85f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/APIDownloaderImpl.kt
@@ -28,7 +28,6 @@
 package org.hisp.dhis.android.core.arch.api.executors.internal
 
 import androidx.annotation.VisibleForTesting
-import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.handlers.internal.Handler
 import org.hisp.dhis.android.core.arch.handlers.internal.LinkHandler
@@ -165,32 +164,16 @@ internal class APIDownloaderImpl(private val resourceHandler: ResourceHandler) :
         return items
     }
 
-    override fun <P> download(handler: Handler<P>, downloader: Single<Payload<P>>): Single<List<P>> {
-        return downloader
-            .map { obj: Payload<P> -> obj.items() }
-            .doOnSuccess { oCollection: List<P> -> handler.handleMany(oCollection) }
-    }
-
     override suspend fun <P> downloadCoroutines(handler: Handler<P>, downloader: suspend () -> Payload<P>): List<P> {
         return downloader.invoke().items()
             .also { handler.handleMany(it) }
     }
 
-    override fun <P> downloadList(handler: Handler<P>, downloader: Single<List<P>>): Single<List<P>> {
-        return downloader
-            .doOnSuccess { oCollection: List<P> -> handler.handleMany(oCollection) }
-    }
-
     override suspend fun <P> downloadListAsCoroutine(handler: Handler<P>, downloader: suspend () -> List<P>): List<P> {
         return downloader.invoke()
             .also { handler.handleMany(it) }
     }
 
-    override fun <P> downloadObject(handler: Handler<P>, downloader: Single<P>): Single<P> {
-        return downloader
-            .doOnSuccess { o: P -> handler.handle(o) }
-    }
-
     override suspend fun <P> downloadObjectAsCoroutine(handler: Handler<P>, downloader: suspend () -> P): P {
         return downloader.invoke()
             .also { handler.handle(it) }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutor.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutor.kt
deleted file mode 100644
index 65058460d0..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutor.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.api.executors.internal
-
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.Single
-
-internal interface RxAPICallExecutor {
-    fun <P> wrapSingle(single: Single<P>, storeError: Boolean): Single<P>
-    fun <P> wrapObservableTransactionally(observable: Observable<P>, cleanForeignKeys: Boolean): Observable<P>
-    fun wrapCompletableTransactionally(completable: Completable, cleanForeignKeys: Boolean): Completable
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
deleted file mode 100644
index 7458fac215..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/executors/internal/RxAPICallExecutorImpl.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.api.executors.internal
-
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.Single
-import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
-import org.hisp.dhis.android.core.arch.db.access.Transaction
-import org.hisp.dhis.android.core.maintenance.D2Error
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore
-import org.hisp.dhis.android.core.maintenance.internal.ForeignKeyCleaner
-import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher
-import org.koin.core.annotation.Singleton
-
-@Singleton
-internal class RxAPICallExecutorImpl(
-    private val databaseAdapter: DatabaseAdapter,
-    private val errorStore: D2ErrorStore,
-    private val errorMapper: APIErrorMapper,
-    private val foreignKeyCleaner: ForeignKeyCleaner,
-    private val userAccountDisabledErrorCatcher: UserAccountDisabledErrorCatcher,
-) : RxAPICallExecutor {
-
-    override fun <P> wrapSingle(single: Single<P>, storeError: Boolean): Single<P> {
-        return single.onErrorResumeNext { throwable: Throwable -> Single.error(mapAndStore(throwable, storeError)) }
-    }
-
-    override fun <P> wrapObservableTransactionally(
-        observable: Observable<P>,
-        cleanForeignKeys: Boolean,
-    ): Observable<P> {
-        return Observable.fromCallable { databaseAdapter.beginNewTransaction() }
-            .flatMap { transaction: Transaction ->
-                observable
-                    .doOnComplete { finishTransaction(transaction, cleanForeignKeys) }
-                    .onErrorResumeNext { throwable: Throwable ->
-                        transaction.end()
-                        Observable.error(mapAndStore(throwable, true))
-                    }
-            }
-    }
-
-    override fun wrapCompletableTransactionally(completable: Completable, cleanForeignKeys: Boolean): Completable {
-        return Single.fromCallable { databaseAdapter.beginNewTransaction() }
-            .flatMapCompletable { transaction: Transaction ->
-                completable
-                    .doOnComplete { finishTransaction(transaction, cleanForeignKeys) }
-                    .onErrorResumeNext { throwable: Throwable ->
-                        transaction.end()
-                        Completable.error(mapAndStore(throwable, true))
-                    }
-            }
-    }
-
-    private fun finishTransaction(t: Transaction, cleanForeignKeys: Boolean) {
-        if (cleanForeignKeys) {
-            foreignKeyCleaner.cleanForeignKeyErrors()
-        }
-        t.setSuccessful()
-        t.end()
-    }
-
-    private fun mapAndStore(throwable: Throwable, storeError: Boolean): D2Error {
-        var d2Error =
-            if (throwable is D2Error) {
-                throwable
-            } else {
-                errorMapper.mapRetrofitException(throwable, errorMapper.getBaseErrorBuilder())
-            }
-        if (userAccountDisabledErrorCatcher.isUserAccountLocked(throwable)) {
-            val errorCode = userAccountDisabledErrorCatcher.catchError(throwable)
-            d2Error = d2Error.toBuilder().errorCode(errorCode).build()
-        }
-        if (storeError) {
-            errorStore.insert(d2Error)
-        }
-        return d2Error
-    }
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt
deleted file mode 100644
index 14058edf31..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactory.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import java.util.concurrent.Callable
-
-internal fun interface ListCallFactory<P> {
-    fun create(): Callable<List<P>>
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
deleted file mode 100644
index cac24c14bc..0000000000
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/call/factories/internal/ListCallFactoryImpl.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2004-2023, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package org.hisp.dhis.android.core.arch.call.factories.internal
-
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.call.fetchers.internal.CallFetcher
-import org.hisp.dhis.android.core.arch.call.internal.EndpointCall
-import org.hisp.dhis.android.core.arch.call.internal.GenericCallData
-import org.hisp.dhis.android.core.arch.call.processors.internal.CallProcessor
-import java.util.concurrent.Callable
-
-internal abstract class ListCallFactoryImpl<P>(
-    protected val data: GenericCallData,
-    protected val apiCallExecutor: APICallExecutor,
-) : ListCallFactory<P> {
-
-    override fun create(): Callable<List<P>> {
-        return EndpointCall(fetcher(), processor())
-    }
-
-    protected abstract fun fetcher(): CallFetcher<P>
-    protected abstract fun processor(): CallProcessor<P>
-}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt
index 8fe9ea50d6..67f6c6d7cf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/d2/internal/JavaDIClasses.kt
@@ -28,8 +28,6 @@
 
 package org.hisp.dhis.android.core.arch.d2.internal
 
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutor
-import org.hisp.dhis.android.core.arch.api.executors.internal.APICallExecutorImpl
 import org.hisp.dhis.android.core.arch.call.executors.internal.D2CallExecutor
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseAdapterFactory
 import org.hisp.dhis.android.core.arch.db.access.internal.DatabaseExport
@@ -55,7 +53,6 @@ internal val javaDIClasses = module {
     single { DatabaseEncryptionPasswordManager(get(), get()) }
     single { DatabaseEncryptionPasswordGenerator() }
     single { TrackedEntityInstanceService(get(), get(), get(), get()) }
-    single<APICallExecutor> { APICallExecutorImpl(get(), get()) }
     single { DatabaseAdapterFactory(get(), get()) }
     single { DatabaseExport(get(), get(), get()) }
     single { D2CallExecutor(get(), get()) }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java b/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java
deleted file mode 100644
index 3818f44bc6..0000000000
--- a/core/src/test/java/org/hisp/dhis/android/core/arch/api/executors/internal/APICallExecutorShould.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  Copyright (c) 2004-2022, University of Oslo
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *  Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *  Neither the name of the HISP project nor the names of its contributors may
- *  be used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.hisp.dhis.android.core.arch.api.executors.internal;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hisp.dhis.android.core.arch.api.payload.internal.Payload;
-import org.hisp.dhis.android.core.maintenance.D2Error;
-import org.hisp.dhis.android.core.maintenance.D2ErrorCode;
-import org.hisp.dhis.android.core.maintenance.internal.D2ErrorStore;
-import org.hisp.dhis.android.core.user.User;
-import org.hisp.dhis.android.core.user.internal.UserAccountDisabledErrorCatcher;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-
-import okhttp3.MediaType;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.Response;
-
-public class APICallExecutorShould {
-
-    @Mock
-    private D2ErrorStore errorStore;
-
-    @Mock
-    private User user;
-    private List<User> users;
-
-    @Mock
-    private Call<User> objectAPICall;
-
-    @Mock
-    private Call<Payload<User>> payloadAPICall;
-
-    @Mock
-    private Payload<User> payload;
-
-    @Mock
-    private IOException ioException;
-
-    @Mock
-    private UserAccountDisabledErrorCatcher userAccountDisabledErrorCatcher;
-
-    private Response conflictResponse;
-
-    private APICallExecutor apiCallExecutor;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        users = Collections.singletonList(user);
-
-        when(errorStore.isReady()).thenReturn(true);
-
-        when(objectAPICall.execute()).thenReturn(Response.success(user));
-        when(payloadAPICall.execute()).thenReturn(Response.success(payload));
-        when(payload.items()).thenReturn(users);
-
-        conflictResponse = Response.error(409, ResponseBody.create(MediaType.get("application/text"),
-                "error_response"));
-
-        apiCallExecutor = new APICallExecutorImpl(errorStore, userAccountDisabledErrorCatcher);
-    }
-
-    @Test
-    public void return_object_when_object_api_call_succeeds() throws D2Error {
-        User responseUser = apiCallExecutor.executeObjectCall(objectAPICall);
-        assertThat(responseUser).isSameInstanceAs(user);
-    }
-
-    @Test
-    public void throw_d2_error_when_object_api_call_fails() throws IOException {
-        when(objectAPICall.execute()).thenThrow(ioException);
-
-        try {
-            apiCallExecutor.executeObjectCall(objectAPICall);
-        } catch (D2Error d2Error) {
-            assertThat(d2Error.errorCode()).isEqualTo(D2ErrorCode.API_RESPONSE_PROCESS_ERROR);
-        }
-    }
-
-    @Test
-    public void persist_thrown_d2_error_when_object_api_call_fails() throws IOException {
-        when(objectAPICall.execute()).thenThrow(ioException);
-
-        try {
-            apiCallExecutor.executeObjectCall(objectAPICall);
-        } catch (D2Error d2Error) {
-            // Empty block
-        }
-        verify(errorStore).isReady();
-        verify(errorStore).insert(any(D2Error.class));
-        verifyNoMoreInteractions(errorStore);
-    }
-
-    @Test
-    public void return_list_when_payload_api_call_succeeds() throws D2Error {
-        List<User> responseUsers = apiCallExecutor.executePayloadCall(payloadAPICall);
-        assertThat(responseUsers).isSameInstanceAs(users);
-    }
-
-    @Test
-    public void throw_d2_error_when_payload_api_call_fails() throws IOException {
-        when(payloadAPICall.execute()).thenThrow(ioException);
-
-        try {
-            apiCallExecutor.executePayloadCall(payloadAPICall);
-        } catch (D2Error d2Error) {
-            assertThat(d2Error.errorCode()).isEqualTo(D2ErrorCode.API_RESPONSE_PROCESS_ERROR);
-        }
-    }
-
-    @Test
-    public void persist_thrown_d2_error_when_payload_api_call_fails() throws IOException {
-        when(payloadAPICall.execute()).thenThrow(ioException);
-
-        try {
-            apiCallExecutor.executePayloadCall(payloadAPICall);
-        } catch (D2Error d2Error) {
-            // Empty block
-        }
-        verify(errorStore).isReady();
-        verify(errorStore).insert(any(D2Error.class));
-        verifyNoMoreInteractions(errorStore);
-    }
-
-    @Test
-    public void persist_thrown_d2_error_when_payload_call_is_conflict() throws IOException {
-        when(payloadAPICall.execute()).thenReturn(conflictResponse);
-
-        try {
-            apiCallExecutor.executePayloadCall(payloadAPICall);
-        } catch (D2Error d2Error) {
-            //Empty block
-        }
-        verify(errorStore).isReady();
-        verify(errorStore).insert(any(D2Error.class));
-        verifyNoMoreInteractions(errorStore);
-    }
-
-    @Test
-    public void persist_thrown_d2_error_when_object_call_is_conflict() throws IOException {
-        when(objectAPICall.execute()).thenReturn(conflictResponse);
-
-        try {
-            apiCallExecutor.executeObjectCall(objectAPICall);
-        } catch (D2Error d2Error) {
-            //Empty block
-        }
-        verify(errorStore).isReady();
-        verify(errorStore).insert(any(D2Error.class));
-        verifyNoMoreInteractions(errorStore);
-    }
-
-    @Test
-    public void call_error_catcher_when_account_disabled() throws IOException {
-        Response disabledResponse = Response.error(401, ResponseBody.create(MediaType.get("application/text"),
-                "Account disabled"));
-
-        when(objectAPICall.execute()).thenReturn(disabledResponse);
-        when(userAccountDisabledErrorCatcher.isUserAccountLocked(any(), any())).thenReturn(true);
-
-        try {
-            apiCallExecutor.executeObjectCall(objectAPICall);
-        } catch (D2Error d2Error) {
-            //Empty block
-        }
-
-        verify(userAccountDisabledErrorCatcher).catchError(any(), any());
-    }
-}
\ No newline at end of file

From a153fd4f158329b7a590d36cfea16eb5312635ab Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 25 Oct 2023 23:50:14 +0200
Subject: [PATCH 462/478] [ANDROSDK-1714] chore: - Custom runner removed in
 Tests based on BaseMockIntegrationTestFullDispatcher and using
 @RunWith(D2JunitRunner::class)

---
 .../collection/PagingMockIntegrationShould.kt |  1 -
 ...oryComboUidsSeekerMockIntegrationShould.kt |  1 -
 ...ndicatorUidsSeekerMockIntegrationShould.kt |  1 -
 ...egendSetUidsSeekerMockIntegrationShould.kt |  1 -
 ...ndicatorUidsSeekerMockIntegrationShould.kt |  1 -
 .../SystemInfoModuleMockIntegrationShould.kt  |  1 -
 ...ceLocalQueryHelperMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  1 -
 .../core/utils/runner/D2JunitTestListener.kt  |  2 ++
 ...llectionRepositoryMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 .../CategoryModuleMockIntegrationShould.kt    | 16 ++++++----
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...ryOptionRepositoryMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  7 +++--
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...llectionRepositoryMockIntegrationShould.kt |  1 -
 ...reObjectRepositoryMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...ueObjectRepositoryMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...llectionRepositoryMockIntegrationShould.kt |  3 +-
 .../testapp/option/OptionServiceShould.kt     | 11 +++++--
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...ngObjectRepositoryMockIntegrationShould.kt | 13 +++++---
 ...gsObjectRepositoryMockIntegrationShould.kt | 31 ++++++++++++-------
 ...llectionRepositoryMockIntegrationShould.kt | 10 +++---
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 ...ckerConflictHelperMockIntegrationShould.kt |  3 +-
 ...lsObjectRepositoryMockIntegrationShould.kt |  4 +--
 ...erObjectRepositoryMockIntegrationShould.kt |  1 -
 ...llectionRepositoryMockIntegrationShould.kt |  4 +--
 34 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index 91630f051f..9f9d045639 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -43,7 +43,6 @@ import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @get:Rule
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt
index 0a5133d125..77890d8ddd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class CategoryComboUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun seek_category_combos_uids() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt
index 9bd2b776a4..1722f69d16 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class IndicatorUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun seek_programIndicator_uids() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt
index bba8d062f9..d67dff79a2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class LegendSetUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
index ca11ca0614..3017d6f6fd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class ProgramIndicatorUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun seek_programIndicator_uids() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
index c8974253f3..f29890a8af 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class SystemInfoModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun allow_access_to_system_info_user() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
index cf51438280..9a21d1e937 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
@@ -43,7 +43,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     private val trackedEntityInstanceStore = TrackedEntityInstanceStoreImpl(databaseAdapter)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index 1d2584cca5..5d12cc2f75 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -38,7 +38,6 @@ import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @get:Rule
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
index c2b2830e5d..9207a95408 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
@@ -45,5 +45,7 @@ class D2JunitTestListener : RunListener() {
         TestDatabaseAdapterFactory.tearDown()
         tearDown()
         DatabaseRemover.removeAllDatabases()
+        Log.i("D2JunitTestListener", "Test run database clearing finished")
+
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
index 7b79908398..d82dbcafb0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class CategoryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
index 84e7a93e9c..cf78528da9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
@@ -34,8 +34,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class CategoryComboCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class CategoryComboCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     private val beforeDate = "2007-12-24T12:24:25.203"
     private val inBetweenDate = "2016-04-16T18:04:34.745"
     private val afterDate = "2017-12-24T12:24:25.203"
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
index fcdfb72368..689ecaf6bc 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
@@ -37,7 +37,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun allow_access_to_combos_without_children() {
@@ -96,7 +95,8 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_combo_by_uid_with_sorted_categories() {
-        val combo = d2.categoryModule().categoryCombos().withCategories().uid("m2jTvAj5kkm").blockingGet()!!
+        val combo =
+            d2.categoryModule().categoryCombos().withCategories().uid("m2jTvAj5kkm").blockingGet()!!
         assertThat(combo.uid()).isEqualTo("m2jTvAj5kkm")
         assertThat(combo.code()).isEqualTo("BIRTHS")
         assertThat(combo.name()).isEqualTo("Births")
@@ -139,7 +139,8 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_by_uid_with_sorted_category_options() {
-        val category = d2.categoryModule().categories().withCategoryOptions().uid("KfdsGBcoiCa").blockingGet()!!
+        val category = d2.categoryModule().categories().withCategoryOptions().uid("KfdsGBcoiCa")
+            .blockingGet()!!
         assertThat(category.uid()).isEqualTo("KfdsGBcoiCa")
         assertThat(category.name()).isEqualTo("Births attended by")
         assertThat(category.dataDimensionType()).isEqualTo("DISAGGREGATION")
@@ -169,7 +170,8 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_option_combos_with_category_options() {
-        val categoryOptionCombos = d2.categoryModule().categoryOptionCombos().withCategoryOptions().blockingGet()
+        val categoryOptionCombos =
+            d2.categoryModule().categoryOptionCombos().withCategoryOptions().blockingGet()
         assertThat(categoryOptionCombos.size).isEqualTo(3)
 
         for (categoryOptionCombo in categoryOptionCombos) {
@@ -179,7 +181,8 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_option_combo_by_uid_without_children() {
-        val categoryOptionCombo = d2.categoryModule().categoryOptionCombos().uid("Gmbgme7z9BF").blockingGet()!!
+        val categoryOptionCombo =
+            d2.categoryModule().categoryOptionCombos().uid("Gmbgme7z9BF").blockingGet()!!
         assertThat(categoryOptionCombo.uid()).isEqualTo("Gmbgme7z9BF")
         assertThat(categoryOptionCombo.name()).isEqualTo("Trained TBA, At PHU")
     }
@@ -213,7 +216,8 @@ class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatche
 
     @Test
     fun allow_access_to_category_combo_by_uid_without_children() {
-        val categoryOption = d2.categoryModule().categoryOptions().uid("apsOixVZlf1").blockingGet()!!
+        val categoryOption =
+            d2.categoryModule().categoryOptions().uid("apsOixVZlf1").blockingGet()!!
         assertThat(categoryOption.uid()).isEqualTo("apsOixVZlf1")
         assertThat(categoryOption.name()).isEqualTo("Female")
         assertThat(categoryOption.code()).isEqualTo("FMLE")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
index 655f6abc04..b10f29dd3b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
@@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class CategoryOptionComboCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class CategoryOptionComboCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
         val categoryOptionCombos = d2.categoryModule().categoryOptionCombos()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt
index af6b229925..7d04f4acb2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class CategoryOptionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
index 88bb79de36..6437062040 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class DataSetInstanceCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class DataSetInstanceCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
         val dataSetInstances = d2.dataSetModule().dataSetInstances()
@@ -75,7 +75,8 @@ class DataSetInstanceCollectionRepositoryMockIntegrationShould : BaseMockIntegra
     @Test
     fun filter_by_period_start_date() {
         val dataSetInstances = d2.dataSetModule().dataSetInstances()
-            .byPeriodStartDate().after(DateUtils.SIMPLE_DATE_FORMAT.parse("2019-06-15T00:00:00.000"))
+            .byPeriodStartDate()
+            .after(DateUtils.SIMPLE_DATE_FORMAT.parse("2019-06-15T00:00:00.000"))
             .blockingGet()
 
         assertThat(dataSetInstances.size).isEqualTo(3)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
index 3a728b60db..cadb61332e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
 
     @Test
     fun find_all() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt
index a83b3a8054..17f7b612f9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class DataStoreCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
index 1f0d596b14..69fc3e1aad 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
index 8922361bd6..005f55d78d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt
index e8447335a7..1166d88418 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class DataValueConflictCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class DataValueConflictCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
 
     @Test
     fun find_all() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
index bbc30703a6..e3a80df9a6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
@@ -36,7 +36,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt
index 71a23b99a2..e28f9dccb4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt
@@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class ExpressionDimensionItemCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class ExpressionDimensionItemCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
         val items = d2.expressionDimensionItemModule().expressionDimensionItems()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt
index 2b5231f08a..2a2b76d0cd 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class FileResourceCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class FileResourceCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
         val fileResources = d2.fileResourceModule().fileResources()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
index a74367a281..6322be5757 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
@@ -75,7 +74,7 @@ class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .byNumerator()
             .eq(
                 "#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}" +
-                    "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
+                        "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
             )
             .blockingGet()
         Truth.assertThat(indicators.size).isEqualTo(1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
index 1d85bbaf8f..81d5f00562 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Test
@@ -59,7 +58,10 @@ class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_option_with_hide_uids() {
         val options = d2.optionModule().optionService()
-            .blockingSearchForOptions(optionSetUid = "VQ2lai3OfVG", optionToHideUids = listOf("Y1ILwhy5VDY"))
+            .blockingSearchForOptions(
+                optionSetUid = "VQ2lai3OfVG",
+                optionToHideUids = listOf("Y1ILwhy5VDY")
+            )
 
         assertThat(options.size).isEqualTo(1)
         assertThat(options[0].uid()).isEqualTo("egT1YqFWsVk")
@@ -68,7 +70,10 @@ class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_option_with_show_uids() {
         val options = d2.optionModule().optionService()
-            .blockingSearchForOptions(optionSetUid = "VQ2lai3OfVG", optionToShowUids = listOf("Y1ILwhy5VDY"))
+            .blockingSearchForOptions(
+                optionSetUid = "VQ2lai3OfVG",
+                optionToShowUids = listOf("Y1ILwhy5VDY")
+            )
 
         assertThat(options.size).isEqualTo(1)
         assertThat(options[0].uid()).isEqualTo("Y1ILwhy5VDY")
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
index 9d41603a07..dbbfd58b64 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
@@ -37,8 +37,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class ProgramStageWorkingListCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class ProgramStageWorkingListCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
         val lists = d2.programModule().programStageWorkingLists()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
index 193864a33a..e4b9f73f92 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
 
@@ -46,7 +45,9 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
             .blockingGet()
 
         assertThat(analyticsDhisVisualizationsSetting.home().size).isEqualTo(2)
-        assertThat(analyticsDhisVisualizationsSetting.home().first().visualizations().first().name()).isNotEmpty()
+        assertThat(
+            analyticsDhisVisualizationsSetting.home().first().visualizations().first().name()
+        ).isNotEmpty()
 
         assertThat(analyticsDhisVisualizationsSetting.program().size).isEqualTo(1)
         assertThat(analyticsDhisVisualizationsSetting.dataSet().size).isEqualTo(1)
@@ -62,7 +63,9 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
 
         assertThat(programSettings?.size).isEqualTo(1)
         assertThat(programSettings?.first()?.visualizations()?.size).isEqualTo(2)
-        assertThat(programSettings?.first()?.visualizations()?.first()?.uid()).isEqualTo("PYBH8ZaAQnC")
+        assertThat(
+            programSettings?.first()?.visualizations()?.first()?.uid()
+        ).isEqualTo("PYBH8ZaAQnC")
     }
 
     @Test
@@ -75,6 +78,8 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
 
         assertThat(programSettings?.size).isEqualTo(1)
         assertThat(programSettings?.first()?.visualizations()?.size).isEqualTo(1)
-        assertThat(programSettings?.first()?.visualizations()?.first()?.uid()).isEqualTo("FAFa11yFeFe")
+        assertThat(
+            programSettings?.first()?.visualizations()?.first()?.uid()
+        ).isEqualTo("FAFa11yFeFe")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
index 313b39d695..52d9a8388a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
@@ -36,8 +36,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class AppearanceSettingsObjectRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_appearance_settings() {
         val appearanceSettings = d2.settingModule().appearanceSettings().blockingGet()!!
@@ -54,14 +54,16 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
 
     @Test
     fun should_return_only_dataSetFilters_for_specific_uid() {
-        val specificFilters = d2.settingModule().appearanceSettings().getDataSetFiltersByUid(program3)
+        val specificFilters =
+            d2.settingModule().appearanceSettings().getDataSetFiltersByUid(program3)
         assertThat(specificFilters?.size).isEqualTo(5)
         assertThat(specificFilters!![DataSetFilter.SYNC_STATUS]!!.uid()).isEqualTo(program3)
     }
 
     @Test
     fun should_return_only_programFilters_for_specific_uid() {
-        val specificFilters = d2.settingModule().appearanceSettings().getProgramFiltersByUid(program1)
+        val specificFilters =
+            d2.settingModule().appearanceSettings().getProgramFiltersByUid(program1)
         assertThat(specificFilters?.size).isEqualTo(7)
         assertThat(specificFilters!![ProgramFilter.ENROLLMENT_STATUS]!!.uid()).isEqualTo(program1)
     }
@@ -91,7 +93,8 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
 
     @Test
     fun should_return_completion_spinner_settings_for_specific_uid() {
-        val completionSpinner = d2.settingModule().appearanceSettings().getCompletionSpinnerByUid(program1)
+        val completionSpinner =
+            d2.settingModule().appearanceSettings().getCompletionSpinnerByUid(program1)
         assertThat(completionSpinner?.uid()).isEqualTo(program1)
         assertThat(completionSpinner?.visible()).isEqualTo(true)
     }
@@ -101,10 +104,12 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
         val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
         assertThat(setting?.disableReferrals()).isEqualTo(true)
 
-        val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        val program1Setting =
+            d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
         assertThat(program1Setting?.disableReferrals()).isEqualTo(true)
 
-        val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
+        val program2Setting =
+            d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
         assertThat(program2Setting?.disableReferrals()).isEqualTo(false)
     }
 
@@ -113,10 +118,12 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
         val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
         assertThat(setting?.disableCollapsibleSections()).isEqualTo(false)
 
-        val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        val program1Setting =
+            d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
         assertThat(program1Setting?.disableCollapsibleSections()).isEqualTo(false)
 
-        val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
+        val program2Setting =
+            d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
         assertThat(program2Setting?.disableCollapsibleSections()).isEqualTo(true)
     }
 
@@ -125,10 +132,12 @@ class AppearanceSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrat
         val setting = d2.settingModule().appearanceSettings().getGlobalProgramConfigurationSetting()
         assertThat(setting?.itemHeader()?.programIndicator()).isNull()
 
-        val program1Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
+        val program1Setting =
+            d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program1)
         assertThat(program1Setting?.itemHeader()?.programIndicator()).isEqualTo("kALwOyvVvdT")
 
-        val program2Setting = d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
+        val program2Setting =
+            d2.settingModule().appearanceSettings().getProgramConfigurationByUid(program2)
         assertThat(program2Setting?.itemHeader()?.programIndicator()).isNull()
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index 1ee1370db7..01db3faabf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_query() {
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
@@ -169,12 +169,14 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : Base
 
         // Transfer ownership
         val teiUid = originalOu.blockingGet()[0].uid()
-        d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "IpHINAT79UW", "g8upMTyEZGZ")
+        d2.trackedEntityModule().ownershipManager()
+            .blockingTransfer(teiUid, "IpHINAT79UW", "g8upMTyEZGZ")
         assertThat(originalOu.blockingCount()).isEqualTo(1)
         assertThat(transferredOu.blockingCount()).isEqualTo(1)
 
         // Undo change
-        d2.trackedEntityModule().ownershipManager().blockingTransfer(teiUid, "IpHINAT79UW", "DiszpKrYNg8")
+        d2.trackedEntityModule().ownershipManager()
+            .blockingTransfer(teiUid, "IpHINAT79UW", "DiszpKrYNg8")
     }
 
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
index d32dee167d..021b682bc6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class TrackedEntitySearchCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class TrackedEntitySearchCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_query() {
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntitySearch()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
index 486f05c89b..d5bbcfd3b8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
@@ -37,7 +37,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
     @Test
@@ -49,7 +48,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo(
                 "The Antenatal care visit - Program rules demo event was not found in the server." +
-                    " (Event: event1)",
+                        " (Event: event1)",
             )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
index 0cb4304813..d58b34c21c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
@@ -33,8 +33,8 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class UserCredentialsObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class UserCredentialsObjectRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_user() {
         val userCredentials = d2.userModule().userCredentials().blockingGet()!!
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
index eed510386f..e8ef5ad0d3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
@@ -33,7 +33,6 @@ import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
 class UserObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_user() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
index 8ab1739c4f..486c024f69 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
@@ -35,8 +35,8 @@ import org.hisp.dhis.android.core.visualization.VisualizationType
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(D2JunitRunner::class)
-class VisualizationCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+class VisualizationCollectionRepositoryMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
     @Test
     fun find_all() {
         val visualizations = d2.visualizationModule().visualizations()

From d47734edc924aec1c8ced0d607cee18094855df5 Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 25 Oct 2023 23:59:50 +0200
Subject: [PATCH 463/478] [ANDROSDK-1714] style: - Enforce styling rules

---
 .../collection/PagingMockIntegrationShould.kt             | 2 --
 .../CategoryComboUidsSeekerMockIntegrationShould.kt       | 2 --
 .../internal/IndicatorUidsSeekerMockIntegrationShould.kt  | 2 --
 .../internal/LegendSetUidsSeekerMockIntegrationShould.kt  | 2 --
 .../ProgramIndicatorUidsSeekerMockIntegrationShould.kt    | 2 --
 .../systeminfo/SystemInfoModuleMockIntegrationShould.kt   | 2 --
 ...EntityInstanceLocalQueryHelperMockIntegrationShould.kt | 2 --
 ...tanceQueryCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../dhis/android/core/utils/runner/D2JunitTestListener.kt | 1 -
 .../CategoryCollectionRepositoryMockIntegrationShould.kt  | 2 --
 ...egoryComboCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../category/CategoryModuleMockIntegrationShould.kt       | 2 --
 ...ptionComboCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../CategoryOptionRepositoryMockIntegrationShould.kt      | 2 --
 ...etInstanceCollectionRepositoryMockIntegrationShould.kt | 2 --
 ...nceSummaryCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../DataStoreCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../DataStoreObjectRepositoryMockIntegrationShould.kt     | 2 --
 .../DataValueCollectionRepositoryMockIntegrationShould.kt | 2 --
 ...ueConflictCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../DataValueObjectRepositoryMockIntegrationShould.kt     | 2 --
 ...ensionItemCollectionRepositoryMockIntegrationShould.kt | 2 --
 ...leResourceCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../IndicatorCollectionRepositoryMockIntegrationShould.kt | 4 +---
 .../dhis/android/testapp/option/OptionServiceShould.kt    | 6 ++----
 ...orkingListCollectionRepositoryMockIntegrationShould.kt | 2 --
 ...zationsSettingObjectRepositoryMockIntegrationShould.kt | 8 +++-----
 ...aranceSettingsObjectRepositoryMockIntegrationShould.kt | 2 --
 ...tanceQueryCollectionRepositoryMockIntegrationShould.kt | 2 --
 ...titySearchCollectionRepositoryMockIntegrationShould.kt | 2 --
 .../TrackerConflictHelperMockIntegrationShould.kt         | 4 +---
 ...serCredentialsObjectRepositoryMockIntegrationShould.kt | 2 --
 .../user/UserObjectRepositoryMockIntegrationShould.kt     | 2 --
 ...ualizationCollectionRepositoryMockIntegrationShould.kt | 2 --
 34 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
index 9f9d045639..46dc2839fe 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/arch/repositories/collection/PagingMockIntegrationShould.kt
@@ -36,12 +36,10 @@ import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.internal.CategoryOptionStore
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 
 class PagingMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt
index 77890d8ddd..37ff30fe35 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/category/internal/CategoryComboUidsSeekerMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.core.category.internal
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class CategoryComboUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt
index 1722f69d16..93203fdee6 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/indicator/internal/IndicatorUidsSeekerMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.indicator.internal
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class IndicatorUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt
index d67dff79a2..79b6f304ab 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/legendset/internal/LegendSetUidsSeekerMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.legendset.internal
 
 import com.google.common.truth.Truth
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class LegendSetUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
index 3017d6f6fd..608d761819 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/program/internal/ProgramIndicatorUidsSeekerMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.core.program.internal
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class ProgramIndicatorUidsSeekerMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
index f29890a8af..171a05913f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/systeminfo/SystemInfoModuleMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.core.systeminfo
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class SystemInfoModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
index 9a21d1e937..0dd16ad38f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceLocalQueryHelperMockIntegrationShould.kt
@@ -39,9 +39,7 @@ import org.hisp.dhis.android.core.period.internal.CalendarProviderFactory
 import org.hisp.dhis.android.core.period.internal.ParentPeriodGeneratorImpl.Companion.create
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class TrackedEntityInstanceLocalQueryHelperMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index 5d12cc2f75..7a9d3545e2 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -32,11 +32,9 @@ import androidx.paging.PagedList
 import com.jraska.livedata.TestObserver
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 
 class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
index 9207a95408..2faa149f27 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/utils/runner/D2JunitTestListener.kt
@@ -46,6 +46,5 @@ class D2JunitTestListener : RunListener() {
         tearDown()
         DatabaseRemover.removeAllDatabases()
         Log.i("D2JunitTestListener", "Test run database clearing finished")
-
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
index d82dbcafb0..01c457d4a3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryCollectionRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.category
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class CategoryCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
index cf78528da9..4ce2cf9d57 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryComboCollectionRepositoryMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.testapp.category
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class CategoryComboCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
index 689ecaf6bc..5356fa6fd1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryModuleMockIntegrationShould.kt
@@ -33,9 +33,7 @@ import org.hisp.dhis.android.core.category.CategoryCombo
 import org.hisp.dhis.android.core.category.CategoryComboInternalAccessor
 import org.hisp.dhis.android.core.category.CategoryOptionCombo
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class CategoryModuleMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
index b10f29dd3b..f5f543ccb3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionComboCollectionRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.category
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class CategoryOptionComboCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt
index 7d04f4acb2..9d5d8d1e10 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/category/CategoryOptionRepositoryMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.testapp.category
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class CategoryOptionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
index 6437062040..65a19b6504 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceCollectionRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataSetInstanceCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
index cadb61332e..5ce2badc3c 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataSetInstanceSummaryCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt
index 17f7b612f9..09306799e1 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreCollectionRepositoryMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.testapp.datastore
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataStoreCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
index 69fc3e1aad..7c8125b91e 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datastore/DataStoreObjectRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datastore.internal.DataStoreEntryStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataStoreObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
index 005f55d78d..b3528bde0b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueCollectionRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataValueCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt
index 1166d88418..81f3eb4edf 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueConflictCollectionRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.imports.ImportStatus
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataValueConflictCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
index e3a80df9a6..27bc021dc0 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/datavalue/DataValueObjectRepositoryMockIntegrationShould.kt
@@ -32,9 +32,7 @@ import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.datavalue.DataValueObjectRepository
 import org.hisp.dhis.android.core.datavalue.internal.DataValueStoreImpl
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class DataValueObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt
index e28f9dccb4..ed35363efa 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/expressiondimensionitem/ExpressionDimensionItemCollectionRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.expressiondimensionitem
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class ExpressionDimensionItemCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt
index 2a2b76d0cd..93566e9de3 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/fileresource/FileResourceCollectionRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.common.State
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class FileResourceCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
index 6322be5757..984d6a0051 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/indicator/IndicatorCollectionRepositoryMockIntegrationShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.testapp.indicator
 
 import com.google.common.truth.Truth
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
@@ -74,7 +72,7 @@ class IndicatorCollectionRepositoryMockIntegrationShould : BaseMockIntegrationTe
             .byNumerator()
             .eq(
                 "#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}" +
-                        "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
+                    "-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
             )
             .blockingGet()
         Truth.assertThat(indicators.size).isEqualTo(1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
index 81d5f00562..dc3d24f0e4 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/option/OptionServiceShould.kt
@@ -30,9 +30,7 @@ package org.hisp.dhis.android.testapp.option
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
 
@@ -60,7 +58,7 @@ class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
         val options = d2.optionModule().optionService()
             .blockingSearchForOptions(
                 optionSetUid = "VQ2lai3OfVG",
-                optionToHideUids = listOf("Y1ILwhy5VDY")
+                optionToHideUids = listOf("Y1ILwhy5VDY"),
             )
 
         assertThat(options.size).isEqualTo(1)
@@ -72,7 +70,7 @@ class OptionServiceShould : BaseMockIntegrationTestFullDispatcher() {
         val options = d2.optionModule().optionService()
             .blockingSearchForOptions(
                 optionSetUid = "VQ2lai3OfVG",
-                optionToShowUids = listOf("Y1ILwhy5VDY")
+                optionToShowUids = listOf("Y1ILwhy5VDY"),
             )
 
         assertThat(options.size).isEqualTo(1)
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
index dbbfd58b64..7fc877e7b9 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/program/ProgramStageWorkingListCollectionRepositoryMockIntegrationShould.kt
@@ -33,9 +33,7 @@ import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class ProgramStageWorkingListCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
index e4b9f73f92..3dc0d1845a 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.settings
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
@@ -46,7 +44,7 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
 
         assertThat(analyticsDhisVisualizationsSetting.home().size).isEqualTo(2)
         assertThat(
-            analyticsDhisVisualizationsSetting.home().first().visualizations().first().name()
+            analyticsDhisVisualizationsSetting.home().first().visualizations().first().name(),
         ).isNotEmpty()
 
         assertThat(analyticsDhisVisualizationsSetting.program().size).isEqualTo(1)
@@ -64,7 +62,7 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
         assertThat(programSettings?.size).isEqualTo(1)
         assertThat(programSettings?.first()?.visualizations()?.size).isEqualTo(2)
         assertThat(
-            programSettings?.first()?.visualizations()?.first()?.uid()
+            programSettings?.first()?.visualizations()?.first()?.uid(),
         ).isEqualTo("PYBH8ZaAQnC")
     }
 
@@ -79,7 +77,7 @@ class AnalyticsDhisVisualizationsSettingObjectRepositoryMockIntegrationShould :
         assertThat(programSettings?.size).isEqualTo(1)
         assertThat(programSettings?.first()?.visualizations()?.size).isEqualTo(1)
         assertThat(
-            programSettings?.first()?.visualizations()?.first()?.uid()
+            programSettings?.first()?.visualizations()?.first()?.uid(),
         ).isEqualTo("FAFa11yFeFe")
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
index 52d9a8388a..20afdcdd1d 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/AppearanceSettingsObjectRepositoryMockIntegrationShould.kt
@@ -32,9 +32,7 @@ import org.hisp.dhis.android.core.settings.DataSetFilter
 import org.hisp.dhis.android.core.settings.HomeFilter
 import org.hisp.dhis.android.core.settings.ProgramFilter
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class AppearanceSettingsObjectRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index 01db3faabf..24b8a3d1d8 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -31,9 +31,7 @@ import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.event.EventStatus
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
index 021b682bc6..c3d2ec69c5 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.trackedentity.search
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class TrackedEntitySearchCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
index d5bbcfd3b8..08d5e01a05 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/tracker/importer/TrackerConflictHelperMockIntegrationShould.kt
@@ -33,9 +33,7 @@ import org.hisp.dhis.android.core.tracker.importer.internal.JobValidationError
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerConflictHelper
 import org.hisp.dhis.android.core.tracker.importer.internal.TrackerImporterObjectType
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
 
@@ -48,7 +46,7 @@ class TrackerConflictHelperMockIntegrationShould : BaseMockIntegrationTestFullDi
         assertThat(trackerImportConflict.displayDescription())
             .isEqualTo(
                 "The Antenatal care visit - Program rules demo event was not found in the server." +
-                        " (Event: event1)",
+                    " (Event: event1)",
             )
     }
 
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
index d58b34c21c..bd4eec90ad 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserCredentialsObjectRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.user
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class UserCredentialsObjectRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
index e8ef5ad0d3..0c06a00b29 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/user/UserObjectRepositoryMockIntegrationShould.kt
@@ -29,9 +29,7 @@ package org.hisp.dhis.android.testapp.user
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class UserObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
     @Test
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
index 486c024f69..3e9f552f69 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/visualization/VisualizationCollectionRepositoryMockIntegrationShould.kt
@@ -29,11 +29,9 @@ package org.hisp.dhis.android.testapp.visualization
 
 import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
 import org.hisp.dhis.android.core.visualization.HideEmptyItemStrategy
 import org.hisp.dhis.android.core.visualization.VisualizationType
 import org.junit.Test
-import org.junit.runner.RunWith
 
 class VisualizationCollectionRepositoryMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {

From c66c0ff6961c43fadfd7de2e9b11aaa5b3885b35 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 27 Oct 2023 10:02:52 +0200
Subject: [PATCH 464/478] [ANDROSDK-1699-DEFECT] Remove duplicated ApiService
 in ServicesDI

---
 .../core/arch/api/internal/ServicesDIModule.kt      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt
index e32c655192..25c7f1c7ac 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/api/internal/ServicesDIModule.kt
@@ -52,7 +52,7 @@ import retrofit2.Retrofit
 
 internal val servicesDIModule = module {
     single { get<Retrofit>().create(ApiService::class.java) }
-    single { get<Retrofit>().create(ApiService::class.java) }
+    single { get<Retrofit>().create(AuthorityService::class.java) }
     single { get<Retrofit>().create(BingService::class.java) }
     single { get<Retrofit>().create(CategoryComboService::class.java) }
     single { get<Retrofit>().create(CategoryOptionService::class.java) }
@@ -60,8 +60,8 @@ internal val servicesDIModule = module {
     single { get<Retrofit>().create(ConstantService::class.java) }
     single { get<Retrofit>().create(DataApprovalService::class.java) }
     single { get<Retrofit>().create(DataElementService::class.java) }
-    single { get<Retrofit>().create(DataSetService::class.java) }
     single { get<Retrofit>().create(DataSetCompleteRegistrationService::class.java) }
+    single { get<Retrofit>().create(DataSetService::class.java) }
     single { get<Retrofit>().create(DataValueService::class.java) }
     single { get<Retrofit>().create(EnrollmentService::class.java) }
     single { get<Retrofit>().create(EventFilterService::class.java) }
@@ -76,16 +76,17 @@ internal val servicesDIModule = module {
     single { get<Retrofit>().create(OptionSetService::class.java) }
     single { get<Retrofit>().create(OrganisationUnitLevelService::class.java) }
     single { get<Retrofit>().create(OrganisationUnitService::class.java) }
+    single { get<Retrofit>().create(OwnershipService::class.java) }
+    single { get<Retrofit>().create(PingService::class.java) }
     single { get<Retrofit>().create(ProgramIndicatorService::class.java) }
-    single { get<Retrofit>().create(ProgramService::class.java) }
     single { get<Retrofit>().create(ProgramRuleService::class.java) }
+    single { get<Retrofit>().create(ProgramService::class.java) }
     single { get<Retrofit>().create(ProgramStageService::class.java) }
     single { get<Retrofit>().create(ProgramStageWorkingListService::class.java) }
     single { get<Retrofit>().create(RelationshipService::class.java) }
     single { get<Retrofit>().create(RelationshipTypeService::class.java) }
     single { get<Retrofit>().create(SettingService::class.java) }
-    single { get<Retrofit>().create(OwnershipService::class.java) }
-    single { get<Retrofit>().create(PingService::class.java) }
+    single { get<Retrofit>().create(StockUseCaseService::class.java) }
     single { get<Retrofit>().create(SystemInfoService::class.java) }
     single { get<Retrofit>().create(TrackedEntityAttributeReservedValueService::class.java) }
     single { get<Retrofit>().create(TrackedEntityAttributeService::class.java) }
@@ -94,8 +95,6 @@ internal val servicesDIModule = module {
     single { get<Retrofit>().create(TrackedEntityTypeService::class.java) }
     single { get<Retrofit>().create(TrackerExporterService::class.java) }
     single { get<Retrofit>().create(TrackerImporterService::class.java) }
-    single { get<Retrofit>().create(StockUseCaseService::class.java) }
-    single { get<Retrofit>().create(AuthorityService::class.java) }
     single { get<Retrofit>().create(UserService::class.java) }
     single { get<Retrofit>().create(ValidationRuleService::class.java) }
     single { get<Retrofit>().create(VisualizationService::class.java) }

From 9cbf4931ef9303691ea90fb5cdd54704afc67173 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 27 Oct 2023 11:51:15 +0200
Subject: [PATCH 465/478] [ANDROSDK-1778] Expose DataSetInstanceService

---
 .../core/dataset/DataSetInstanceService.kt    |  2 ++
 .../{DataSetModule.java => DataSetModule.kt}  | 21 ++++++------
 .../internal/DataSetInstanceServiceImpl.kt    | 32 +++++++++----------
 .../dataset/internal/DataSetModuleImpl.kt     |  6 ++++
 4 files changed, 34 insertions(+), 27 deletions(-)
 rename core/src/main/java/org/hisp/dhis/android/core/dataset/{DataSetModule.java => DataSetModule.kt} (75%)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt
index 4716f41cf7..65ee3dcb0f 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetInstanceService.kt
@@ -47,4 +47,6 @@ interface DataSetInstanceService {
     ): DataSetEditableStatus
 
     fun hasDataWriteAccess(dataSetUid: String): Single<Boolean>
+
+    fun blockingHasDataWriteAccess(dataSetUid: String): Boolean
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModule.java b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModule.kt
similarity index 75%
rename from core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModule.java
rename to core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModule.kt
index 2b1c6cfeac..fd63453c0e 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModule.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/DataSetModule.kt
@@ -25,17 +25,16 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.dataset
 
-package org.hisp.dhis.android.core.dataset;
+import org.hisp.dhis.android.core.dataapproval.DataApprovalCollectionRepository
 
-import org.hisp.dhis.android.core.dataapproval.DataApprovalCollectionRepository;
-
-public interface DataSetModule {
-
-    DataSetCompleteRegistrationCollectionRepository dataSetCompleteRegistrations();
-    DataSetCollectionRepository dataSets();
-    SectionCollectionRepository sections();
-    DataApprovalCollectionRepository dataApprovals();
-    DataSetInstanceCollectionRepository dataSetInstances();
-    DataSetInstanceSummaryCollectionRepository dataSetInstanceSummaries();
+interface DataSetModule {
+    fun dataSetCompleteRegistrations(): DataSetCompleteRegistrationCollectionRepository
+    fun dataSets(): DataSetCollectionRepository
+    fun sections(): SectionCollectionRepository
+    fun dataApprovals(): DataApprovalCollectionRepository
+    fun dataSetInstances(): DataSetInstanceCollectionRepository
+    fun dataSetInstanceSummaries(): DataSetInstanceSummaryCollectionRepository
+    fun dataSetInstanceService(): DataSetInstanceService
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index 7a174d7dac..878b8a06f1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -102,12 +102,21 @@ internal class DataSetInstanceServiceImpl(
         }
     }
 
-    fun blockingIsCategoryOptionHasDataWriteAccess(categoryOptionComboUid: String): Boolean {
+    override fun hasDataWriteAccess(dataSetUid: String): Single<Boolean> {
+        return Single.just(blockingHasDataWriteAccess(dataSetUid))
+    }
+
+    override fun blockingHasDataWriteAccess(dataSetUid: String): Boolean {
+        val dataSet = dataSetCollectionRepository.uid(dataSetUid).blockingGet() ?: return false
+        return dataSet.access().write() ?: false
+    }
+
+    internal fun blockingIsCategoryOptionHasDataWriteAccess(categoryOptionComboUid: String): Boolean {
         val categoryOptions = getCategoryOptions(categoryOptionComboUid)
         return categoryOptionComboService.blockingHasWriteAccess(categoryOptions)
     }
 
-    fun blockingIsPeriodInCategoryOptionRange(period: Period, categoryOptionComboUid: String): Boolean {
+    internal fun blockingIsPeriodInCategoryOptionRange(period: Period, categoryOptionComboUid: String): Boolean {
         val categoryOptions = getCategoryOptions(categoryOptionComboUid)
         val dates = listOf(period.startDate(), period.endDate())
         return dates.all { date ->
@@ -115,11 +124,11 @@ internal class DataSetInstanceServiceImpl(
         }
     }
 
-    fun blockingIsOrgUnitInCaptureScope(orgUnitUid: String): Boolean {
+    internal fun blockingIsOrgUnitInCaptureScope(orgUnitUid: String): Boolean {
         return organisationUnitService.blockingIsInCaptureScope(orgUnitUid)
     }
 
-    fun blockingIsAttributeOptionComboAssignToOrgUnit(
+    internal fun blockingIsAttributeOptionComboAssignToOrgUnit(
         categoryOptionComboUid: String,
         orgUnitUid: String,
     ): Boolean {
@@ -129,7 +138,7 @@ internal class DataSetInstanceServiceImpl(
         )
     }
 
-    fun blockingIsExpired(dataSet: DataSet, period: Period): Boolean {
+    internal fun blockingIsExpired(dataSet: DataSet, period: Period): Boolean {
         val expiryDays = dataSet.expiryDays() ?: return false
         val generatedPeriod = period.endDate()?.let { endDate ->
             periodGenerator.generatePeriod(
@@ -141,7 +150,7 @@ internal class DataSetInstanceServiceImpl(
         return Date().after(generatedPeriod?.endDate())
     }
 
-    fun blockingIsClosed(dataSet: DataSet, period: Period): Boolean {
+    internal fun blockingIsClosed(dataSet: DataSet, period: Period): Boolean {
         val periodType = dataSet.periodType() ?: return true
         val openFuturePeriods = dataSet.openFuturePeriods() ?: 0
         val generatedPeriod = periodGenerator.generatePeriod(
@@ -152,16 +161,7 @@ internal class DataSetInstanceServiceImpl(
         return period.endDate()?.before(generatedPeriod?.endDate()) ?: true
     }
 
-    override fun hasDataWriteAccess(dataSetUid: String): Single<Boolean> {
-        return Single.just(blockingHasDataWriteAccess(dataSetUid))
-    }
-
-    fun blockingHasDataWriteAccess(dataSetUid: String): Boolean {
-        val dataSet = dataSetCollectionRepository.uid(dataSetUid).blockingGet() ?: return false
-        return dataSet.access().write() ?: false
-    }
-
-    fun blockingIsPeriodInOrgUnitRange(period: Period, orgUnitUid: String): Boolean {
+    internal fun blockingIsPeriodInOrgUnitRange(period: Period, orgUnitUid: String): Boolean {
         return listOfNotNull(period.startDate(), period.endDate()).all { date ->
             organisationUnitService.blockingIsDateInOrgunitRange(orgUnitUid, date)
         }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt
index 2478954e51..8189290d70 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetModuleImpl.kt
@@ -31,6 +31,7 @@ import org.hisp.dhis.android.core.dataapproval.DataApprovalCollectionRepository
 import org.hisp.dhis.android.core.dataset.DataSetCollectionRepository
 import org.hisp.dhis.android.core.dataset.DataSetCompleteRegistrationCollectionRepository
 import org.hisp.dhis.android.core.dataset.DataSetInstanceCollectionRepository
+import org.hisp.dhis.android.core.dataset.DataSetInstanceService
 import org.hisp.dhis.android.core.dataset.DataSetInstanceSummaryCollectionRepository
 import org.hisp.dhis.android.core.dataset.DataSetModule
 import org.hisp.dhis.android.core.dataset.SectionCollectionRepository
@@ -44,6 +45,7 @@ class DataSetModuleImpl(
     private val dataApprovals: DataApprovalCollectionRepository,
     private val dataSetInstances: DataSetInstanceCollectionRepository,
     private val dataSetInstanceSummaries: DataSetInstanceSummaryCollectionRepository,
+    private val dataSetInstanceService: DataSetInstanceService,
 ) : DataSetModule {
     override fun dataSetCompleteRegistrations(): DataSetCompleteRegistrationCollectionRepository {
         return dataSetCompleteRegistrations
@@ -68,4 +70,8 @@ class DataSetModuleImpl(
     override fun dataSetInstanceSummaries(): DataSetInstanceSummaryCollectionRepository {
         return dataSetInstanceSummaries
     }
+
+    override fun dataSetInstanceService(): DataSetInstanceService {
+        return dataSetInstanceService
+    }
 }

From 7b4d01cc5928023f2021f01651309fe30b9c344c Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 31 Oct 2023 10:55:11 +0100
Subject: [PATCH 466/478] [ANDROSDK-1746] fix: -
 TrackedEntityAttributeReservedValueManager was refactor from Java/RxJava to
 Kotlin/Coroutines, some RxJava's code "onErrorComplete" was mistakenly
 skipped, so it was needed to add a `try/catch` ignoring the errors

---
 ...ckedEntityAttributeReservedValueManager.kt | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index 229d61fa70..a688d2879b 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -297,29 +297,31 @@ class TrackedEntityAttributeReservedValueManager internal constructor(
         minNumberOfValuesToHave: Int?,
         storeError: Boolean,
     ) = coroutineScope {
-        // Using local date. It's not worth it to make a system info call
-        store.deleteExpired(Date())
-        val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
-        val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
-        val remainingValues = store.count(
-            attribute,
-            if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
-            pattern,
-        )
-
-        // If number of values is explicitly specified, we use that value as threshold.
-        val minNumberToTryFill = minNumberOfValuesToHave ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
-
-        if (remainingValues < minNumberToTryFill) {
-            val numberToReserve = fillUpTo!! - remainingValues
-            downloadValues(
+        try {
+            // Using local date. It's not worth it to make a system info call
+            store.deleteExpired(Date())
+            val fillUpTo = getFillUpToValue(minNumberOfValuesToHave, attribute)
+            val pattern = trackedEntityAttributeStore.selectByUid(attribute)!!.pattern()
+            val remainingValues = store.count(
                 attribute,
-                organisationUnit,
-                numberToReserve,
+                if (isOrgunitDependent(pattern)) getUidOrNull(organisationUnit) else null,
                 pattern,
-                storeError,
             )
-        }
+
+            // If number of values is explicitly specified, we use that value as threshold.
+            val minNumberToTryFill = minNumberOfValuesToHave ?: (fillUpTo!! * FACTOR_TO_REFILL).toInt()
+
+            if (remainingValues < minNumberToTryFill) {
+                val numberToReserve = fillUpTo!! - remainingValues
+                downloadValues(
+                    attribute,
+                    organisationUnit,
+                    numberToReserve,
+                    pattern,
+                    storeError,
+                )
+            }
+        } catch (ignored: Exception) {}
     }
 
     private suspend fun downloadValues(

From 1c7b698f196a99c6469ac7f78f57759f9c3075fd Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Tue, 31 Oct 2023 11:46:50 +0100
Subject: [PATCH 467/478] [ANDROSDK-1746] style: - ignored exception in-line
 catch body not empty

---
 .../TrackedEntityAttributeReservedValueManager.kt             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
index a688d2879b..9c30147b37 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeReservedValueManager.kt
@@ -321,7 +321,9 @@ class TrackedEntityAttributeReservedValueManager internal constructor(
                     storeError,
                 )
             }
-        } catch (ignored: Exception) {}
+        } catch (ignored: Exception) {
+            // Ignored
+        }
     }
 
     private suspend fun downloadValues(

From ab8794dbba7865fd627408a1715f0d271d128369 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 3 Nov 2023 10:54:10 +0100
Subject: [PATCH 468/478] [ANDROSDK-1733] Fix orderBy clauses depending on
 endpoint version

---
 .../core/data/server/RealServerMother.java    |  2 +-
 .../NewTrackedEntityEndpointCallFactory.kt    | 10 ++--
 .../OldTrackedEntityEndpointCallFactory.kt    |  5 +-
 .../TrackedEntityInstanceQueryCallFactory.kt  |  6 ++-
 .../TrackedEntityInstanceQueryOnline.kt       |  2 +-
 .../TrackedEntityInstanceQueryOnlineHelper.kt | 23 +++++----
 ...kedEntityInstanceQueryScopeOrderApiName.kt | 48 +++++++++++++++++++
 ...edEntityInstanceQueryScopeOrderByItem.java |  6 ++-
 ...edEntityInstanceQueryScopeOrderColumn.java | 23 ++++++---
 9 files changed, 97 insertions(+), 28 deletions(-)
 create mode 100644 core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/server/RealServerMother.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/server/RealServerMother.java
index 83d01e1217..980784caee 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/core/data/server/RealServerMother.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/core/data/server/RealServerMother.java
@@ -40,7 +40,7 @@ public class RealServerMother {
     public static String url2_37 = "https://play.dhis2.org/2.37/";
     public static String url2_38 = "https://play.dhis2.org/2.38/";
     public static String url2_39 = "https://play.dhis2.org/2.39/";
-    public static String url2_40 = "https://play.dhis2.org/2.40/";
+    public static String url2_40 = "https://play.dhis2.org/40/";
     public static String url_dev = "https://play.dhis2.org/dev/";
     public static String android_current = "https://play.dhis2.org/android-current/";
     public static String android_previous1 = "https://play.dhis2.org/android-previous1/";
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
index 2ab97ff225..30c0794e05 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/NewTrackedEntityEndpointCallFactory.kt
@@ -39,8 +39,10 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryErrorCatcher
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnline
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnlineHelper.Companion.toAPIFilterFormat
-import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryScopeOrderByItem
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnlineHelper.Companion.toAPIOrderFormat
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER
 import org.hisp.dhis.android.core.trackedentity.search.TrackerQueryResult
+import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.hisp.dhis.android.core.tracker.exporter.TrackerExporterService
 import org.hisp.dhis.android.core.util.simpleDateFormat
@@ -61,7 +63,7 @@ internal class NewTrackedEntityEndpointCallFactory(
             program = query.commonParams.program,
             programStatus = getProgramStatus(query),
             programStartDate = getProgramStartDate(query),
-            order = TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER.toAPIString(),
+            order = DEFAULT_TRACKER_ORDER.toAPIString(TrackerExporterVersion.V2),
             paging = true,
             page = query.page,
             pageSize = query.pageSize,
@@ -153,7 +155,7 @@ internal class NewTrackedEntityEndpointCallFactory(
                 enrollmentEnrolledBefore = query.programEndDate.simpleDateFormat(),
                 enrollmentOccurredAfter = query.incidentStartDate.simpleDateFormat(),
                 enrollmentOccurredBefore = query.incidentEndDate.simpleDateFormat(),
-                order = query.order,
+                order = toAPIOrderFormat(query.order, TrackerExporterVersion.V2),
                 assignedUserMode = query.assignedUserMode?.toString(),
                 paging = query.paging,
                 pageSize = query.pageSize,
@@ -193,7 +195,7 @@ internal class NewTrackedEntityEndpointCallFactory(
                 assignedUserMode = query.assignedUserMode?.toString(),
                 lastUpdatedStartDate = query.lastUpdatedStartDate.simpleDateFormat(),
                 lastUpdatedEndDate = query.lastUpdatedEndDate.simpleDateFormat(),
-                order = query.order,
+                order = toAPIOrderFormat(query.order, TrackerExporterVersion.V2),
                 paging = query.paging,
                 page = query.page,
                 pageSize = query.pageSize,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
index 42b7fcf45b..0144eaace3 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/internal/OldTrackedEntityEndpointCallFactory.kt
@@ -32,8 +32,9 @@ import org.hisp.dhis.android.core.organisationunit.OrganisationUnitMode
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryCallFactory
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnline
-import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryScopeOrderByItem
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER
 import org.hisp.dhis.android.core.trackedentity.search.TrackerQueryResult
+import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.tracker.exporter.TrackerAPIQuery
 import org.koin.core.annotation.Singleton
 
@@ -52,7 +53,7 @@ internal class OldTrackedEntityEndpointCallFactory(
             program = query.commonParams.program,
             programStatus = getProgramStatus(query),
             programStartDate = getProgramStartDate(query),
-            order = TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER.toAPIString(),
+            order = DEFAULT_TRACKER_ORDER.toAPIString(TrackerExporterVersion.V1),
             paging = true,
             page = query.page,
             pageSize = query.pageSize,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
index e0a0ba1d49..c6c6bc4a77 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallFactory.kt
@@ -41,6 +41,8 @@ import org.hisp.dhis.android.core.systeminfo.DHISVersionManager
 import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.hisp.dhis.android.core.trackedentity.internal.TrackedEntityInstanceService
 import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnlineHelper.Companion.toAPIFilterFormat
+import org.hisp.dhis.android.core.trackedentity.search.TrackedEntityInstanceQueryOnlineHelper.Companion.toAPIOrderFormat
+import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.hisp.dhis.android.core.util.simpleDateFormat
 import org.koin.core.annotation.Singleton
 import java.text.ParseException
@@ -111,7 +113,7 @@ internal class TrackedEntityInstanceQueryCallFactory(
                 endDate = query.eventEndDate.simpleDateFormat(),
                 dueDateStart = query.dueStartDate.simpleDateFormat(),
                 dueDateEnd = query.dueEndDate.simpleDateFormat(),
-                order = query.order,
+                order = toAPIOrderFormat(query.order, TrackerExporterVersion.V1),
                 assignedUserMode = query.assignedUserMode?.toString(),
                 paging = query.paging,
                 pageSize = query.pageSize,
@@ -152,7 +154,7 @@ internal class TrackedEntityInstanceQueryCallFactory(
                     assignedUserMode = query.assignedUserMode?.toString(),
                     lastUpdatedStartDate = query.lastUpdatedStartDate.simpleDateFormat(),
                     lastUpdatedEndDate = query.lastUpdatedEndDate.simpleDateFormat(),
-                    order = query.order,
+                    order = toAPIOrderFormat(query.order, TrackerExporterVersion.V1),
                     paging = query.paging,
                     pageSize = query.pageSize,
                     page = query.page,
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
index f3b054a852..0244c00c12 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnline.kt
@@ -63,7 +63,7 @@ internal data class TrackedEntityInstanceQueryOnline(
     val uids: List<String>? = null,
     val lastUpdatedStartDate: Date? = null,
     val lastUpdatedEndDate: Date? = null,
-    val order: String? = null,
+    val order: List<TrackedEntityInstanceQueryScopeOrderByItem> = emptyList(),
 ) {
     fun shouldCallEventFirst(): Boolean {
         return dataValueFilter.isNotEmpty() ||
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index 68f9826f4f..ab0f6e548d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -33,6 +33,7 @@ import org.hisp.dhis.android.core.arch.repositories.scope.internal.RepositorySco
 import org.hisp.dhis.android.core.common.DateFilterPeriodHelper
 import org.hisp.dhis.android.core.common.FilterOperatorsHelper
 import org.hisp.dhis.android.core.event.EventStatus
+import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 import org.koin.core.annotation.Singleton
 import java.util.Date
 
@@ -103,7 +104,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper(
             followUp = scope.followUp(),
             includeDeleted = scope.includeDeleted(),
             trackedEntityType = scope.trackedEntityType(),
-            order = toAPIOrderFormat(scope.order()),
+            order = scope.order(),
         ).run {
             scope.program()?.let {
                 copy(
@@ -128,16 +129,20 @@ internal class TrackedEntityInstanceQueryOnlineHelper(
         return eventStatus.firstOrNull()
     }
 
-    private fun toAPIOrderFormat(orders: List<TrackedEntityInstanceQueryScopeOrderByItem>): String? {
-        return if (orders.isNotEmpty()) {
-            orders.mapNotNull { it.toAPIString() }.joinToString(",")
-        } else {
-            null
-        }
-    }
-
     companion object {
 
+        fun toAPIOrderFormat(
+            orders: List<TrackedEntityInstanceQueryScopeOrderByItem>,
+            version: TrackerExporterVersion
+        ): String? {
+            val apiOrders = orders.mapNotNull { it.toAPIString(version) }
+            return if (apiOrders.isNotEmpty()) {
+                apiOrders.joinToString(",")
+            } else {
+                null
+            }
+        }
+
         fun toAPIFilterFormat(items: List<RepositoryScopeFilterItem>, upper: Boolean): List<String> {
             // Compatibility for the new Tracker (old Tracker will ignore this format)
             // Following characters need to be escaped escaped with a "/" for backend functionality
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt
new file mode 100644
index 0000000000..c0ecab4bac
--- /dev/null
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.core.trackedentity.search
+
+import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
+
+sealed class TrackedEntityInstanceQueryScopeOrderApiName(
+    private val v1Name: String?, 
+    private val v2Name: String?
+) {
+    data object Created : TrackedEntityInstanceQueryScopeOrderApiName("created", "createdAt")
+    data object LastUpdated : TrackedEntityInstanceQueryScopeOrderApiName("lastUpdated", "updatedAt")
+    data object EnrollmentDate : TrackedEntityInstanceQueryScopeOrderApiName(null, "enrolledAt")
+    class Attribute(attributeId: String) : TrackedEntityInstanceQueryScopeOrderApiName(attributeId, attributeId)
+
+    fun getApiName(version: TrackerExporterVersion): String? {
+        return when (version) {
+            TrackerExporterVersion.V1 -> v1Name
+            TrackerExporterVersion.V2 -> v2Name
+        }
+    }
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java
index a670faf49d..0365bb07fd 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java
@@ -31,6 +31,7 @@
 import com.google.auto.value.AutoValue;
 
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope;
+import org.hisp.dhis.android.core.tracker.TrackerExporterVersion;
 
 @AutoValue
 public abstract class TrackedEntityInstanceQueryScopeOrderByItem {
@@ -44,8 +45,9 @@ public abstract class TrackedEntityInstanceQueryScopeOrderByItem {
 
     public abstract RepositoryScope.OrderByDirection direction();
 
-    public String toAPIString() {
-        return column().hasApiName() ? column().apiName() + ":" + direction().getApi() : null;
+    public String toAPIString(TrackerExporterVersion version) {
+        String apiName = column().apiName() != null ? column().apiName().getApiName(version) : null;
+        return apiName != null ? apiName + ":" + direction().getApi() : null;
     }
 
     static Builder builder() {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderColumn.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderColumn.java
index bb077df0c6..1da4ec31e8 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderColumn.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderColumn.java
@@ -42,16 +42,22 @@ enum Type {
     }
 
     public static final TrackedEntityInstanceQueryScopeOrderColumn CREATED =
-            builder().type(Type.CREATED).apiName("created").build();
+            builder().type(Type.CREATED)
+                    .apiName(TrackedEntityInstanceQueryScopeOrderApiName.Created.INSTANCE)
+                    .build();
 
     public static final TrackedEntityInstanceQueryScopeOrderColumn LAST_UPDATED =
-            builder().type(Type.LAST_UPDATED).apiName("lastupdated").build();
+            builder().type(Type.LAST_UPDATED)
+                    .apiName(TrackedEntityInstanceQueryScopeOrderApiName.LastUpdated.INSTANCE)
+                    .build();
 
     public static final TrackedEntityInstanceQueryScopeOrderColumn ORGUNIT_NAME =
-            builder().type(Type.ORGUNIT_NAME).apiName("ouname").build();
+            builder().type(Type.ORGUNIT_NAME).build();
 
     public static final TrackedEntityInstanceQueryScopeOrderColumn ENROLLMENT_DATE =
-            builder().type(Type.ENROLLMENT_DATE).build();
+            builder().type(Type.ENROLLMENT_DATE)
+                    .apiName(TrackedEntityInstanceQueryScopeOrderApiName.EnrollmentDate.INSTANCE)
+                    .build();
 
     public static final TrackedEntityInstanceQueryScopeOrderColumn INCIDENT_DATE =
             builder().type(Type.INCIDENT_DATE).build();
@@ -66,13 +72,16 @@ enum Type {
             builder().type(Type.ENROLLMENT_STATUS).build();
 
     public static TrackedEntityInstanceQueryScopeOrderColumn attribute(String attributeId) {
-        return builder().type(Type.ATTRIBUTE).apiName(attributeId).value(attributeId).build();
+        return builder().type(Type.ATTRIBUTE)
+                .apiName(new TrackedEntityInstanceQueryScopeOrderApiName.Attribute(attributeId))
+                .value(attributeId)
+                .build();
     }
 
     public abstract Type type();
 
     @Nullable
-    public abstract String apiName();
+    public abstract TrackedEntityInstanceQueryScopeOrderApiName apiName();
 
     @Nullable
     public abstract String value();
@@ -90,7 +99,7 @@ abstract static class Builder {
 
         abstract Builder type(Type column);
 
-        abstract Builder apiName(String apiName);
+        abstract Builder apiName(TrackedEntityInstanceQueryScopeOrderApiName apiName);
 
         abstract Builder value(String value);
 

From daba916eb73fad543524a85eeb72a7bb4e235b4f Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 3 Nov 2023 11:50:49 +0100
Subject: [PATCH 469/478] [ANDROSDK-1733] Ktlint

---
 .../search/TrackedEntityInstanceQueryOnlineHelper.kt          | 2 +-
 .../search/TrackedEntityInstanceQueryScopeOrderApiName.kt     | 4 ++--
 .../search/TrackedEntityInstanceQueryScopeOrderByItem.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
index ab0f6e548d..0ef9c9aac2 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryOnlineHelper.kt
@@ -133,7 +133,7 @@ internal class TrackedEntityInstanceQueryOnlineHelper(
 
         fun toAPIOrderFormat(
             orders: List<TrackedEntityInstanceQueryScopeOrderByItem>,
-            version: TrackerExporterVersion
+            version: TrackerExporterVersion,
         ): String? {
             val apiOrders = orders.mapNotNull { it.toAPIString(version) }
             return if (apiOrders.isNotEmpty()) {
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt
index c0ecab4bac..02e72b1af6 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderApiName.kt
@@ -31,8 +31,8 @@ package org.hisp.dhis.android.core.trackedentity.search
 import org.hisp.dhis.android.core.tracker.TrackerExporterVersion
 
 sealed class TrackedEntityInstanceQueryScopeOrderApiName(
-    private val v1Name: String?, 
-    private val v2Name: String?
+    private val v1Name: String?,
+    private val v2Name: String?,
 ) {
     data object Created : TrackedEntityInstanceQueryScopeOrderApiName("created", "createdAt")
     data object LastUpdated : TrackedEntityInstanceQueryScopeOrderApiName("lastUpdated", "updatedAt")
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java
index 0365bb07fd..db45ce0b1d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryScopeOrderByItem.java
@@ -46,8 +46,8 @@ public abstract class TrackedEntityInstanceQueryScopeOrderByItem {
     public abstract RepositoryScope.OrderByDirection direction();
 
     public String toAPIString(TrackerExporterVersion version) {
-        String apiName = column().apiName() != null ? column().apiName().getApiName(version) : null;
-        return apiName != null ? apiName + ":" + direction().getApi() : null;
+        String apiName = column().apiName() == null ? null : column().apiName().getApiName(version);
+        return apiName == null ? null : apiName + ":" + direction().getApi();
     }
 
     static Builder builder() {

From e43634eab0942405a881505b68fa8213acf6e634 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 3 Nov 2023 12:46:08 +0100
Subject: [PATCH 470/478] [ANDROSDK-1733] Fix unit tests

---
 .../search/TrackedEntityInstanceQueryCallShould.kt       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
index 0b4fdb5afd..49f628f6ef 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCallShould.kt
@@ -75,6 +75,8 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
     private val teis: List<TrackedEntityInstance> = mock()
     private val eventPayload: Payload<Event> = mock()
     private val attribute: List<RepositoryScopeFilterItem> = emptyList()
+    private val order: List<TrackedEntityInstanceQueryScopeOrderByItem> =
+        listOf(TrackedEntityInstanceQueryScopeOrderByItem.DEFAULT_TRACKER_ORDER)
 
     private lateinit var query: TrackedEntityInstanceQueryOnline
 
@@ -103,7 +105,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             includeDeleted = false,
             lastUpdatedStartDate = Date(),
             lastUpdatedEndDate = Date(),
-            order = "lastupdated:desc",
+            order = order,
             assignedUserMode = AssignedUserMode.ANY,
             paging = false,
             page = 2,
@@ -250,7 +252,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             eq(query.assignedUserMode?.toString()),
             eq(query.lastUpdatedStartDate.simpleDateFormat()),
             eq(query.lastUpdatedEndDate.simpleDateFormat()),
-            eq(query.order),
+            any(),
             eq(query.paging),
             eq(query.page),
             eq(query.pageSize),
@@ -268,6 +270,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             }
         }
     }
+
     private fun verifyEventServiceForOrgunit(query: TrackedEntityInstanceQueryOnline, orgunit: String?) = runBlocking {
         verify(eventService).getEvents(
             eq(EventFields.teiQueryFields),
@@ -283,7 +286,7 @@ class TrackedEntityInstanceQueryCallShould : BaseCallShould() {
             eq(query.eventEndDate.simpleDateFormat()),
             eq(query.dueStartDate.simpleDateFormat()),
             eq(query.dueEndDate.simpleDateFormat()),
-            eq(query.order),
+            any(),
             eq(query.assignedUserMode?.toString()),
             eq(query.paging),
             eq(query.page),

From 38433a34a31cb781538a00320a2ec627cf61e10f Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Wed, 8 Nov 2023 09:28:57 +0100
Subject: [PATCH 471/478] [ANDROSDK-1782] Support search by trackedEntity in
 TEI search

---
 ...eQueryCollectionRepositoryMockIntegrationShould.kt |  9 +++++++++
 ...SearchCollectionRepositoryMockIntegrationShould.kt | 10 ++++++++++
 .../TrackedEntityInstanceQueryCollectionRepository.kt |  2 +-
 .../search/TrackedEntitySearchCollectionRepository.kt |  2 +-
 .../search/TrackedEntitySearchOperators.kt            | 11 +++++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
index 24b8a3d1d8..d1ce02196f 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould.kt
@@ -126,6 +126,15 @@ class TrackedEntityInstanceQueryCollectionRepositoryMockIntegrationShould :
         assertThat(trackedEntityInstances.size).isEqualTo(1)
     }
 
+    @Test
+    fun find_by_uid() {
+        val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
+            .byTrackedEntities().eq("nWrB0TfWlvh")
+            .blockingGet()
+
+        assertThat(trackedEntityInstances.size).isEqualTo(1)
+    }
+
     @Test
     fun exclude_uids() {
         val trackedEntityInstances = d2.trackedEntityModule().trackedEntityInstanceQuery()
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
index c3d2ec69c5..03c269e854 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/trackedentity/search/TrackedEntitySearchCollectionRepositoryMockIntegrationShould.kt
@@ -80,6 +80,16 @@ class TrackedEntitySearchCollectionRepositoryMockIntegrationShould :
         assertThat(trackedEntityInstances[1].header).isEqualTo("654321, ")
     }
 
+    @Test
+    fun should_return_header_in_object_repository() {
+        val trackedEntity = d2.trackedEntityModule().trackedEntitySearch()
+            .byProgram().eq("IpHINAT79UW")
+            .uid("nWrB0TfWlvh")
+            .blockingGet()
+
+        assertThat(trackedEntity?.header).isEqualTo("4081507, befryEfXge5")
+    }
+
     @Test
     fun should_return_ordered_attributes() {
         val trackedEntity = d2.trackedEntityModule().trackedEntitySearch()
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
index 054d6953d5..6dcaccfc44 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntityInstanceQueryCollectionRepository.kt
@@ -199,7 +199,7 @@ class TrackedEntityInstanceQueryCollectionRepository internal constructor(
     }
 
     override fun uid(uid: String?): ReadOnlyObjectRepository<TrackedEntityInstance> {
-        return objectRepository(
+        return byTrackedEntities().eq(uid).objectRepository(
             object : Transformer<List<TrackedEntityInstance>, TrackedEntityInstance?> {
                 override fun transform(o: List<TrackedEntityInstance>): TrackedEntityInstance? {
                     return o.find { uid == it.uid() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
index 1dd52a86d4..11eb47415c 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchCollectionRepository.kt
@@ -167,7 +167,7 @@ class TrackedEntitySearchCollectionRepository internal constructor(
     }
 
     override fun uid(uid: String?): ReadOnlyObjectRepository<TrackedEntitySearchItem> {
-        return objectRepository(
+        return byTrackedEntities().eq(uid).objectRepository(
             object : Transformer<List<TrackedEntitySearchItem>, TrackedEntitySearchItem?> {
                 override fun transform(o: List<TrackedEntitySearchItem>): TrackedEntitySearchItem? {
                     return o.find { uid == it.uid() }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
index d1a01cf58d..e0ff967c51 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/trackedentity/search/TrackedEntitySearchOperators.kt
@@ -345,6 +345,17 @@ abstract class TrackedEntitySearchOperators<R : BaseRepository> internal constru
         }
     }
 
+    /**
+     * Filter by trackedEntity uid
+     *
+     * @return Repository connector
+     */
+    fun byTrackedEntities(): ListFilterConnector<R, String> {
+        return connectorFactory.listConnector { list: List<String> ->
+            scope.toBuilder().uids(list).build()
+        }
+    }
+
     /**
      * Whether to allow or not cached results for online queries. Its value is 'false' by default.
      *

From eadd84a10bf6e24585f854509fcac40420510918 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Tue, 14 Nov 2023 13:28:06 +0100
Subject: [PATCH 472/478] [ANDROSDK-1786] Implement support for
 ExperimentalFeature

---
 ...gsObjectRepositoryMockIntegrationShould.kt | 60 +++++++++++++++++++
 core/src/main/assets/migrations/153.sql       |  3 +
 core/src/main/assets/snapshots/snapshot.sql   |  2 +-
 .../access/internal/BaseDatabaseOpenHelper.kt |  2 +-
 .../core/settings/ExperimentalFeature.kt}     | 31 +++-------
 .../GeneralSettingObjectRepository.kt         | 17 ++++++
 .../settings/GeneralSettingTableInfo.java     |  4 +-
 .../core/settings/GeneralSettings.java        |  8 +++
 .../internal/GeneralSettingStoreImpl.kt       |  8 ++-
 ...Samples.java => GeneralSettingsSamples.kt} | 37 ++++++------
 .../settings/general_settings_v2.json         |  5 +-
 .../settings/GeneralSettingsV2Should.java     |  2 +
 12 files changed, 130 insertions(+), 49 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.kt
 create mode 100644 core/src/main/assets/migrations/153.sql
 rename core/src/{androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.java => main/java/org/hisp/dhis/android/core/settings/ExperimentalFeature.kt} (63%)
 rename core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/{GeneralSettingsSamples.java => GeneralSettingsSamples.kt} (71%)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.kt
new file mode 100644
index 0000000000..578451e4f4
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.kt
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2004-2022, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.hisp.dhis.android.testapp.settings
+
+import com.google.common.truth.Truth.assertThat
+import org.hisp.dhis.android.core.settings.DataSyncPeriod
+import org.hisp.dhis.android.core.settings.ExperimentalFeature
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
+import org.hisp.dhis.android.core.utils.runner.D2JunitRunner
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(D2JunitRunner::class)
+class GeneralSettingsObjectRepositoryMockIntegrationShould : BaseMockIntegrationTestFullDispatcher() {
+    @Test
+    fun find_android_setting() {
+        val generalSettings = d2.settingModule().generalSetting().blockingGet()
+        assertThat(generalSettings!!.dataSync()).isEqualTo(DataSyncPeriod.EVERY_24_HOURS)
+    }
+
+    @Test
+    fun find_experimental_feature() {
+        assertThat(
+            d2.settingModule().generalSetting().blockingHasExperimentalFeature(ExperimentalFeature.NewFormLayout),
+        ).isTrue()
+
+        assertThat(
+            d2.settingModule().generalSetting().blockingHasExperimentalFeature("newFormLayout"),
+        ).isTrue()
+
+        assertThat(
+            d2.settingModule().generalSetting().blockingHasExperimentalFeature("nonExistingFeature"),
+        ).isFalse()
+    }
+}
diff --git a/core/src/main/assets/migrations/153.sql b/core/src/main/assets/migrations/153.sql
new file mode 100644
index 0000000000..4a506f78f7
--- /dev/null
+++ b/core/src/main/assets/migrations/153.sql
@@ -0,0 +1,3 @@
+# Add experimentalFeatures in GeneralSetting (ANDROSDK-1786)
+
+ALTER TABLE GeneralSetting ADD COLUMN experimentalFeatures TEXT;
diff --git a/core/src/main/assets/snapshots/snapshot.sql b/core/src/main/assets/snapshots/snapshot.sql
index e186f46bdd..3da3373589 100644
--- a/core/src/main/assets/snapshots/snapshot.sql
+++ b/core/src/main/assets/snapshots/snapshot.sql
@@ -79,7 +79,7 @@ CREATE TABLE SectionGreyedFieldsLink (_id INTEGER PRIMARY KEY AUTOINCREMENT, sec
 CREATE TABLE AuthenticatedUser (_id INTEGER PRIMARY KEY AUTOINCREMENT, user TEXT NOT NULL UNIQUE, hash TEXT, FOREIGN KEY (user) REFERENCES User (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE UNIQUE INDEX event_data_element ON TrackedEntityDataValue(event, dataElement);
 CREATE UNIQUE INDEX tracked_entity_instance_attribute ON TrackedEntityAttributeValue(trackedEntityInstance, trackedEntityAttribute);
-CREATE TABLE GeneralSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, encryptDB INTEGER, lastUpdated TEXT, reservedValues INTEGER, smsGateway TEXT, smsResultSender TEXT, matomoID INTEGER, matomoURL TEXT, allowScreenCapture INTEGER, messageOfTheDay TEXT);
+CREATE TABLE GeneralSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, encryptDB INTEGER, lastUpdated TEXT, reservedValues INTEGER, smsGateway TEXT, smsResultSender TEXT, matomoID INTEGER, matomoURL TEXT, allowScreenCapture INTEGER, messageOfTheDay TEXT, experimentalFeatures TEXT);
 CREATE TABLE DataSetSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNIQUE, name TEXT, lastUpdated TEXT, periodDSDownload INTEGER, periodDSDBTrimming INTEGER, FOREIGN KEY (uid) REFERENCES DataSet (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE ProgramSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, uid TEXT UNIQUE, name TEXT, lastUpdated TEXT, teiDownload INTEGER, teiDBTrimming INTEGER, eventsDownload INTEGER, eventsDBTrimming INTEGER, updateDownload TEXT, updateDBTrimming TEXT, settingDownload TEXT, settingDBTrimming TEXT, enrollmentDownload TEXT, enrollmentDBTrimming TEXT, eventDateDownload TEXT, eventDateDBTrimming TEXT, enrollmentDateDownload TEXT, enrollmentDateDBTrimming TEXT, FOREIGN KEY (uid) REFERENCES Program (uid) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED);
 CREATE TABLE SynchronizationSetting (_id INTEGER PRIMARY KEY AUTOINCREMENT, dataSync TEXT, metadataSync TEXT, trackerImporterVersion TEXT, trackerExporterVersion TEXT, fileMaxLengthBytes INTEGER);
diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
index 0d14633ef0..1110228ca1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.kt
@@ -59,6 +59,6 @@ internal class BaseDatabaseOpenHelper(context: Context, targetVersion: Int) {
     }
 
     companion object {
-        const val VERSION = 152
+        const val VERSION = 153
     }
 }
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.java b/core/src/main/java/org/hisp/dhis/android/core/settings/ExperimentalFeature.kt
similarity index 63%
rename from core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.java
rename to core/src/main/java/org/hisp/dhis/android/core/settings/ExperimentalFeature.kt
index 85ecf61c79..5c6e76a2db 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/settings/GeneralSettingsObjectRepositoryMockIntegrationShould.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/ExperimentalFeature.kt
@@ -1,19 +1,19 @@
 /*
- *  Copyright (c) 2004-2022, University of Oslo
+ *  Copyright (c) 2004-2023, University of Oslo
  *  All rights reserved.
- *  
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
  *  Redistributions of source code must retain the above copyright notice, this
  *  list of conditions and the following disclaimer.
- *  
+ *
  *  Redistributions in binary form must reproduce the above copyright notice,
  *  this list of conditions and the following disclaimer in the documentation
  *  and/or other materials provided with the distribution.
  *  Neither the name of the HISP project nor the names of its contributors may
  *  be used to endorse or promote products derived from this software without
  *  specific prior written permission.
- *  
+ *
  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,23 +26,8 @@
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.hisp.dhis.android.testapp.settings;
+package org.hisp.dhis.android.core.settings
 
-import org.hisp.dhis.android.core.settings.DataSyncPeriod;
-import org.hisp.dhis.android.core.settings.GeneralSettings;
-import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher;
-import org.hisp.dhis.android.core.utils.runner.D2JunitRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(D2JunitRunner.class)
-public class GeneralSettingsObjectRepositoryMockIntegrationShould extends BaseMockIntegrationTestFullDispatcher {
-
-    @Test
-    public void find_android_setting() {
-        GeneralSettings generalSettings = d2.settingModule().generalSetting().blockingGet();
-        assertThat(generalSettings.dataSync()).isEqualTo(DataSyncPeriod.EVERY_24_HOURS);
-    }
-}
\ No newline at end of file
+enum class ExperimentalFeature(val jsonName: String) {
+    NewFormLayout("newFormLayout"),
+}
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
index 0191b460c9..34e61ba2f4 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingObjectRepository.kt
@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.android.core.settings
 
+import io.reactivex.Single
 import org.hisp.dhis.android.core.arch.repositories.collection.ReadOnlyWithDownloadObjectRepository
 import org.hisp.dhis.android.core.arch.repositories.`object`.internal.ReadOnlyAnyObjectWithDownloadRepositoryImpl
 import org.hisp.dhis.android.core.settings.internal.GeneralSettingCall
@@ -66,4 +67,20 @@ class GeneralSettingObjectRepository internal constructor(
                 .build()
         }
     }
+
+    fun blockingHasExperimentalFeature(featureName: String): Boolean {
+        return blockingGet()?.experimentalFeatures()?.contains(featureName) ?: false
+    }
+
+    fun hasExperimentalFeature(featureName: String): Single<Boolean> {
+        return Single.fromCallable { blockingHasExperimentalFeature(featureName) }
+    }
+
+    fun blockingHasExperimentalFeature(feature: ExperimentalFeature): Boolean {
+        return blockingGet()?.experimentalFeatures()?.contains(feature.jsonName) ?: false
+    }
+
+    fun hasExperimentalFeature(feature: ExperimentalFeature): Single<Boolean> {
+        return Single.fromCallable { blockingHasExperimentalFeature(feature) }
+    }
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingTableInfo.java b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingTableInfo.java
index b8270771ea..0baa3ce83d 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingTableInfo.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettingTableInfo.java
@@ -60,6 +60,7 @@ public static class Columns extends CoreColumns {
         public static final String MATOMO_URL = "matomoURL";
         public static final String ALLOW_SCREEN_CAPTURE = "allowScreenCapture";
         public static final String MESSAGE_OF_THE_DAY = "messageOfTheDay";
+        public static final String EXPERIMENTAL_FEATURES = "experimentalFeatures";
 
         @Override
         public String[] all() {
@@ -72,7 +73,8 @@ public String[] all() {
                     MATOMO_ID,
                     MATOMO_URL,
                     ALLOW_SCREEN_CAPTURE,
-                    MESSAGE_OF_THE_DAY
+                    MESSAGE_OF_THE_DAY,
+                    EXPERIMENTAL_FEATURES
             );
         }
     }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettings.java b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettings.java
index f3202f9d4d..2acd5b1f5a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettings.java
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/GeneralSettings.java
@@ -39,11 +39,13 @@
 import com.google.auto.value.AutoValue;
 
 import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.DbDateColumnAdapter;
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter;
 import org.hisp.dhis.android.core.arch.db.adapters.ignore.internal.IgnoreDataSyncPeriodColumnAdapter;
 import org.hisp.dhis.android.core.arch.db.adapters.ignore.internal.IgnoreMetadataSyncPeriodColumnAdapter;
 import org.hisp.dhis.android.core.common.CoreObject;
 
 import java.util.Date;
+import java.util.List;
 
 @AutoValue
 @JsonDeserialize(builder = $$AutoValue_GeneralSettings.Builder.class)
@@ -110,6 +112,10 @@ public String numberSmsConfirmation() {
     @Nullable
     public abstract String messageOfTheDay();
 
+    @Nullable
+    @ColumnAdapter(StringListColumnAdapter.class)
+    public abstract List<String> experimentalFeatures();
+
     public static GeneralSettings create(Cursor cursor) {
         return $AutoValue_GeneralSettings.createFromCursor(cursor);
     }
@@ -150,6 +156,8 @@ public abstract static class Builder {
 
         public abstract Builder messageOfTheDay(String messageOfTheDay);
 
+        public abstract Builder experimentalFeatures(List<String> experimentalFeatures);
+
         public abstract GeneralSettings build();
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
index eb8a838c75..0328bd1ac1 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/settings/internal/GeneralSettingStoreImpl.kt
@@ -29,6 +29,7 @@ package org.hisp.dhis.android.core.settings.internal
 
 import android.database.Cursor
 import org.hisp.dhis.android.core.arch.db.access.DatabaseAdapter
+import org.hisp.dhis.android.core.arch.db.adapters.custom.internal.StringListColumnAdapter
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementBinder
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.StatementWrapper
 import org.hisp.dhis.android.core.arch.db.stores.binders.internal.WhereStatementBinder
@@ -52,7 +53,7 @@ internal class GeneralSettingStoreImpl(
     ) {
 
     companion object {
-        private val BINDER = StatementBinder<GeneralSettings> { o: GeneralSettings, w: StatementWrapper ->
+        private val BINDER = StatementBinder { o: GeneralSettings, w: StatementWrapper ->
             w.bind(1, o.encryptDB())
             w.bind(2, o.lastUpdated())
             w.bind(3, o.reservedValues())
@@ -62,13 +63,14 @@ internal class GeneralSettingStoreImpl(
             w.bind(7, o.matomoURL())
             w.bind(8, o.allowScreenCapture())
             w.bind(9, o.messageOfTheDay())
+            w.bind(10, StringListColumnAdapter.serialize(o.experimentalFeatures()))
         }
 
-        private val WHERE_UPDATE_BINDER = WhereStatementBinder<GeneralSettings> {
+        private val WHERE_UPDATE_BINDER = WhereStatementBinder {
                 _: GeneralSettings, _: StatementWrapper ->
         }
 
-        private val WHERE_DELETE_BINDER = WhereStatementBinder<GeneralSettings> {
+        private val WHERE_DELETE_BINDER = WhereStatementBinder {
                 _: GeneralSettings, _: StatementWrapper ->
         }
     }
diff --git a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/GeneralSettingsSamples.java b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/GeneralSettingsSamples.kt
similarity index 71%
rename from core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/GeneralSettingsSamples.java
rename to core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/GeneralSettingsSamples.kt
index 9085cde3be..802de20ade 100644
--- a/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/GeneralSettingsSamples.java
+++ b/core/src/sharedTest/java/org/hisp/dhis/android/core/data/settings/GeneralSettingsSamples.kt
@@ -25,26 +25,25 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package org.hisp.dhis.android.core.data.settings
 
-package org.hisp.dhis.android.core.data.settings;
+import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils
+import org.hisp.dhis.android.core.settings.GeneralSettings
 
-import org.hisp.dhis.android.core.data.utils.FillPropertiesTestUtils;
-import org.hisp.dhis.android.core.settings.GeneralSettings;
-
-public class GeneralSettingsSamples {
-
-    public static GeneralSettings getGeneralSettings() {
+object GeneralSettingsSamples {
+    fun getGeneralSettings(): GeneralSettings {
         return GeneralSettings.builder()
-                .id(1L)
-                .encryptDB(true)
-                .lastUpdated(FillPropertiesTestUtils.LAST_UPDATED)
-                .reservedValues(100)
-                .smsGateway("+34678456123")
-                .smsResultSender("+34654321456")
-                .matomoID(123)
-                .matomoURL("https://www.matomo.org")
-                .allowScreenCapture(true)
-                .messageOfTheDay("Message of the day")
-                .build();
+            .id(1L)
+            .encryptDB(true)
+            .lastUpdated(FillPropertiesTestUtils.LAST_UPDATED)
+            .reservedValues(100)
+            .smsGateway("+34678456123")
+            .smsResultSender("+34654321456")
+            .matomoID(123)
+            .matomoURL("https://www.matomo.org")
+            .allowScreenCapture(true)
+            .messageOfTheDay("Message of the day")
+            .experimentalFeatures(listOf("newFormLayout"))
+            .build()
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/sharedTest/resources/settings/general_settings_v2.json b/core/src/sharedTest/resources/settings/general_settings_v2.json
index b7d1d893de..d66244b75b 100644
--- a/core/src/sharedTest/resources/settings/general_settings_v2.json
+++ b/core/src/sharedTest/resources/settings/general_settings_v2.json
@@ -6,5 +6,8 @@
   "reservedValues": 40,
   "smsResultSender": "+9456498778",
   "allowScreenCapture": true,
-  "messageOfTheDay": "Message of the day"
+  "messageOfTheDay": "Message of the day",
+  "experimentalFeatures": [
+    "newFormLayout"
+  ]
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/hisp/dhis/android/core/settings/GeneralSettingsV2Should.java b/core/src/test/java/org/hisp/dhis/android/core/settings/GeneralSettingsV2Should.java
index 13d6c7f1c0..6eaad1f740 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/settings/GeneralSettingsV2Should.java
+++ b/core/src/test/java/org/hisp/dhis/android/core/settings/GeneralSettingsV2Should.java
@@ -61,5 +61,7 @@ public void map_from_json_string() throws IOException, ParseException {
         assertThat(generalSettings.matomoURL()).isEqualTo("https://www.matomo.org");
         assertThat(generalSettings.allowScreenCapture()).isTrue();
         assertThat(generalSettings.messageOfTheDay()).isEqualTo("Message of the day");
+        assertThat(generalSettings.experimentalFeatures().size()).isEqualTo(1);
+        assertThat(generalSettings.experimentalFeatures().get(0)).isEqualTo("newFormLayout");
     }
 }

From 51ea4bfdfd51d4f6d254b787db1e84b1feed0eee Mon Sep 17 00:00:00 2001
From: dan <dan@dhis2.org>
Date: Wed, 15 Nov 2023 09:46:33 +0100
Subject: [PATCH 473/478] [ANDROSDK-1787] fix: - DataSetInstanceServiceImpl
 `blockingGetEditableStatus` expired and closed checks test: -
 DataSetInstanceServiceImpl `blockingGetEditableStatus` expired and closed
 checks

---
 ...SetInstanceServiceMockIntegrationShould.kt | 69 +++++++++++++++++++
 ...ectionRepositoryMockIntegrationShould.java |  2 +-
 .../internal/DataSetInstanceServiceImpl.kt    |  4 +-
 .../resources/category/category_options.json  |  1 +
 .../organisationunit/organisation_units.json  |  2 +-
 5 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
new file mode 100644
index 0000000000..fb634b3a45
--- /dev/null
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (c) 2004-2023, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.android.testapp.dataset
+
+import com.google.common.truth.Truth
+import org.hisp.dhis.android.core.dataset.DataSetEditableStatus
+import org.hisp.dhis.android.core.dataset.DataSetNonEditableReason
+import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
+import org.junit.Test
+
+class DataSetInstanceServiceMockIntegrationShould :
+    BaseMockIntegrationTestFullDispatcher() {
+
+    @Test
+    fun do_not_allow_edit_expired_periods() {
+        val dataSetInstances = d2.dataSetModule().dataSetInstanceService()
+            .blockingGetEditableStatus(
+                "lyLU2wR22tC",
+                "201206",
+                "DiszpKrYNg8",
+                "bRowv6yZOF2",
+            )
+
+        Truth.assertThat(dataSetInstances).isInstanceOf(
+            DataSetEditableStatus.NonEditable(DataSetNonEditableReason.EXPIRED)::class.java,
+        )
+    }
+
+    @Test
+    fun do_not_allow_edit_closed_periods() {
+        val dataSetInstances = d2.dataSetModule().dataSetInstanceService()
+            .blockingGetEditableStatus(
+                "lyLU2wR22tC",
+                "202311",
+                "DiszpKrYNg8",
+                "bRowv6yZOF2",
+            )
+
+        Truth.assertThat(dataSetInstances).isInstanceOf(
+            DataSetEditableStatus.NonEditable(DataSetNonEditableReason.CLOSED)::class.java,
+        )
+    }
+}
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java b/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java
index 6b09586d98..be8c0d1d5b 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/organisationunit/OrganisationUnitCollectionRepositoryMockIntegrationShould.java
@@ -76,7 +76,7 @@ public void filter_by_opening_date() throws ParseException {
     @Test
     public void filter_by_closed_date() throws ParseException {
         List<OrganisationUnit> organisationUnits = d2.organisationUnitModule().organisationUnits()
-                .byClosedDate().eq(BaseIdentifiableObject.parseDate("2018-05-22T15:21:48.516")).blockingGet();
+                .byClosedDate().eq(BaseIdentifiableObject.parseDate("2025-05-22T15:21:48.516")).blockingGet();
         assertThat(organisationUnits.size()).isEqualTo(1);
     }
 
diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index 878b8a06f1..9dbefceacf 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -94,9 +94,9 @@ internal class DataSetInstanceServiceImpl(
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.ATTRIBUTE_OPTION_COMBO_NO_ASSIGN_TO_ORGUNIT)
             !blockingIsPeriodInOrgUnitRange(period, organisationUnitUid) ->
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.PERIOD_IS_NOT_IN_ORGUNIT_RANGE)
-            dataSet?.let { !blockingIsExpired(dataSet, period) } ?: false ->
+            dataSet?.let { blockingIsExpired(dataSet, period) } ?: false ->
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.EXPIRED)
-            dataSet?.let { !blockingIsClosed(dataSet, period) } ?: false ->
+            dataSet?.let { blockingIsClosed(dataSet, period) } ?: false ->
                 DataSetEditableStatus.NonEditable(DataSetNonEditableReason.CLOSED)
             else -> DataSetEditableStatus.Editable
         }
diff --git a/core/src/sharedTest/resources/category/category_options.json b/core/src/sharedTest/resources/category/category_options.json
index a1e83e58d9..b1c0a61b58 100644
--- a/core/src/sharedTest/resources/category/category_options.json
+++ b/core/src/sharedTest/resources/category/category_options.json
@@ -12,6 +12,7 @@
       "name": "default name",
       "code": "default code",
       "id": "as6ygGvUGNg",
+      "endDate": "2024-06-12T20:37:48.666",
       "shortName": "default short name",
       "displayShortName": "default display short name",
       "description": "default description",
diff --git a/core/src/sharedTest/resources/organisationunit/organisation_units.json b/core/src/sharedTest/resources/organisationunit/organisation_units.json
index a5e6daf343..cc0915ae69 100644
--- a/core/src/sharedTest/resources/organisationunit/organisation_units.json
+++ b/core/src/sharedTest/resources/organisationunit/organisation_units.json
@@ -36,7 +36,7 @@
       "level": 4,
       "created": "2012-02-17T15:54:39.987",
       "lastUpdated": "2017-05-22T15:21:48.516",
-      "closedDate": "2018-05-22T15:21:48.516",
+      "closedDate": "2025-05-22T15:21:48.516",
       "name": "Ngelehun CHC",
       "id": "DiszpKrYNg8",
       "shortName": "Ngelehun CHC",

From df729eb7639426b1c48554167dbfcb44b5689c64 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 16 Nov 2023 09:58:11 +0100
Subject: [PATCH 474/478] [ANDROSDK-1787-2] DataSetInstanceService: fix
 isExpired and isClosed logic

---
 .../internal/DataSetInstanceServiceImpl.kt    | 27 +++++++++++--------
 .../dataset/DataSetInstanceServiceShould.kt   | 26 +++++++++++-------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
index 9dbefceacf..ed3a65371a 100644
--- a/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
+++ b/core/src/main/java/org/hisp/dhis/android/core/dataset/internal/DataSetInstanceServiceImpl.kt
@@ -139,26 +139,31 @@ internal class DataSetInstanceServiceImpl(
     }
 
     internal fun blockingIsExpired(dataSet: DataSet, period: Period): Boolean {
-        val expiryDays = dataSet.expiryDays() ?: return false
-        val generatedPeriod = period.endDate()?.let { endDate ->
-            periodGenerator.generatePeriod(
-                periodType = PeriodType.Daily,
-                date = endDate,
-                offset = expiryDays - 1,
-            )
+        val expiryDays = dataSet.expiryDays()
+        return if (expiryDays == null || expiryDays <= 0) {
+            false
+        } else {
+            val expiryDate = period.endDate()?.let { endDate ->
+                periodGenerator.generatePeriod(
+                    periodType = PeriodType.Daily,
+                    date = endDate,
+                    offset = expiryDays - 1,
+                )
+            }?.endDate()
+
+            expiryDate?.let { Date().after(it) } ?: false
         }
-        return Date().after(generatedPeriod?.endDate())
     }
 
     internal fun blockingIsClosed(dataSet: DataSet, period: Period): Boolean {
-        val periodType = dataSet.periodType() ?: return true
+        val periodType = dataSet.periodType() ?: return false
         val openFuturePeriods = dataSet.openFuturePeriods() ?: 0
-        val generatedPeriod = periodGenerator.generatePeriod(
+        val latestFuturePeriod = periodGenerator.generatePeriod(
             periodType = periodType,
             date = Date(),
             offset = openFuturePeriods - 1,
         )
-        return period.endDate()?.before(generatedPeriod?.endDate()) ?: true
+        return period.endDate()?.after(latestFuturePeriod?.endDate()) ?: false
     }
 
     internal fun blockingIsPeriodInOrgUnitRange(period: Period, orgUnitUid: String): Boolean {
diff --git a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt
index aaa83853a5..6bb8a58060 100644
--- a/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt
+++ b/core/src/test/java/org/hisp/dhis/android/core/dataset/DataSetInstanceServiceShould.kt
@@ -35,10 +35,10 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.datetime.Clock
 import org.hisp.dhis.android.core.arch.helpers.AccessHelper
+import org.hisp.dhis.android.core.arch.helpers.DateUtils
 import org.hisp.dhis.android.core.category.CategoryOption
 import org.hisp.dhis.android.core.category.CategoryOptionCollectionRepository
 import org.hisp.dhis.android.core.category.CategoryOptionComboService
-import org.hisp.dhis.android.core.common.BaseIdentifiableObject
 import org.hisp.dhis.android.core.dataset.internal.DataSetInstanceServiceImpl
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitService
 import org.hisp.dhis.android.core.period.Period
@@ -63,10 +63,10 @@ class DataSetInstanceServiceShould {
 
     private val dataSet: DataSet = mock()
 
-    private val firstJanuary = BaseIdentifiableObject.DATE_FORMAT.parse("2020-01-01T00:00:00.000")
-    private val thirdJanuary = BaseIdentifiableObject.DATE_FORMAT.parse("2020-01-03T00:00:00.000")
-    private val firstFebruary = BaseIdentifiableObject.DATE_FORMAT.parse("2020-02-01T00:00:00.000")
-    private val thirdFebruary = BaseIdentifiableObject.DATE_FORMAT.parse("2020-02-03T00:00:00.000")
+    private val firstJanuary = DateUtils.DATE_FORMAT.parse("2020-01-01T00:00:00.000")
+    private val thirdJanuary = DateUtils.DATE_FORMAT.parse("2020-01-03T00:00:00.000")
+    private val firstFebruary = DateUtils.DATE_FORMAT.parse("2020-02-01T00:00:00.000")
+    private val thirdFebruary = DateUtils.DATE_FORMAT.parse("2020-02-03T00:00:00.000")
 
     private val firstPeriod: Period = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
     private val secondPeriod: Period = mock(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
@@ -156,7 +156,6 @@ class DataSetInstanceServiceShould {
     @Test
     fun `Should return false if dataSet is not closed`() {
         whenever(dataSet.periodType()) doReturn PeriodType.Monthly
-        whenever(periodHelper.getPeriodForPeriodId(firstPeriodId).blockingGet()) doReturn secondPeriod
         whenever(periodGenerator.generatePeriod(any(), any(), any())) doReturn firstPeriod
 
         assertThat(dataSetInstanceService.blockingIsClosed(dataSet, firstPeriod)).isFalse()
@@ -165,16 +164,16 @@ class DataSetInstanceServiceShould {
     @Test
     fun `Should return true if dataSet is closed`() {
         whenever(dataSet.periodType()) doReturn PeriodType.Monthly
-        whenever(periodHelper.getPeriodForPeriodId(firstPeriodId).blockingGet()) doReturn firstPeriod
-        whenever(periodGenerator.generatePeriod(any(), any(), any())) doReturn secondPeriod
+        whenever(periodGenerator.generatePeriod(any(), any(), any())) doReturn firstPeriod
 
-        assertThat(dataSetInstanceService.blockingIsClosed(dataSet, firstPeriod)).isTrue()
+        assertThat(dataSetInstanceService.blockingIsClosed(dataSet, secondPeriod)).isTrue()
     }
 
     @Test
     fun `Should return true if dataSet is expired`() {
         whenever(dataSet.periodType()) doReturn PeriodType.Daily
         whenever(dataSet.openFuturePeriods()) doReturn 20
+        whenever(dataSet.expiryDays()) doReturn 5
         whenever(periodHelper.getPeriodForPeriodId(any()).blockingGet()) doReturn firstPeriod
         whenever(periodGenerator.generatePeriod(any(), any(), any())) doReturn firstPeriod
 
@@ -193,4 +192,13 @@ class DataSetInstanceServiceShould {
 
         assertThat(dataSetInstanceService.blockingIsExpired(dataSet, firstPeriod)).isFalse()
     }
+
+    @Test
+    fun `Should return false if expiry days is 0 or negative`() {
+        whenever(dataSet.expiryDays()) doReturn 0
+        assertThat(dataSetInstanceService.blockingIsExpired(dataSet, firstPeriod)).isFalse()
+
+        whenever(dataSet.expiryDays()) doReturn -15
+        assertThat(dataSetInstanceService.blockingIsExpired(dataSet, firstPeriod)).isFalse()
+    }
 }

From 408056d81073fae0dfdd65279e3f50a193f471e7 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 16 Nov 2023 11:00:13 +0100
Subject: [PATCH 475/478] [ANDROSDK-1787-2] Adapt integration tests

---
 ...SetInstanceServiceMockIntegrationShould.kt | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
index fb634b3a45..0b53ede697 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
@@ -28,18 +28,20 @@
 
 package org.hisp.dhis.android.testapp.dataset
 
-import com.google.common.truth.Truth
+import com.google.common.truth.Truth.assertThat
 import org.hisp.dhis.android.core.dataset.DataSetEditableStatus
 import org.hisp.dhis.android.core.dataset.DataSetNonEditableReason
+import org.hisp.dhis.android.core.period.PeriodType
 import org.hisp.dhis.android.core.utils.integration.mock.BaseMockIntegrationTestFullDispatcher
 import org.junit.Test
+import java.util.Date
 
 class DataSetInstanceServiceMockIntegrationShould :
     BaseMockIntegrationTestFullDispatcher() {
 
     @Test
     fun do_not_allow_edit_expired_periods() {
-        val dataSetInstances = d2.dataSetModule().dataSetInstanceService()
+        val status = d2.dataSetModule().dataSetInstanceService()
             .blockingGetEditableStatus(
                 "lyLU2wR22tC",
                 "201206",
@@ -47,22 +49,27 @@ class DataSetInstanceServiceMockIntegrationShould :
                 "bRowv6yZOF2",
             )
 
-        Truth.assertThat(dataSetInstances).isInstanceOf(
+        assertThat(status).isInstanceOf(
             DataSetEditableStatus.NonEditable(DataSetNonEditableReason.EXPIRED)::class.java,
         )
     }
 
     @Test
     fun do_not_allow_edit_closed_periods() {
-        val dataSetInstances = d2.dataSetModule().dataSetInstanceService()
+        val fivePeriodsInFuture = d2.periodModule().periodHelper().blockingGetPeriodForPeriodTypeAndDate(
+            PeriodType.Monthly,
+            Date(),
+            5
+        )
+        val status = d2.dataSetModule().dataSetInstanceService()
             .blockingGetEditableStatus(
                 "lyLU2wR22tC",
-                "202311",
+                fivePeriodsInFuture.periodId()!!,
                 "DiszpKrYNg8",
                 "bRowv6yZOF2",
             )
 
-        Truth.assertThat(dataSetInstances).isInstanceOf(
+        assertThat(status).isInstanceOf(
             DataSetEditableStatus.NonEditable(DataSetNonEditableReason.CLOSED)::class.java,
         )
     }

From b760c61c47864034e33465a2ec18f577970876d4 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Thu, 16 Nov 2023 11:50:09 +0100
Subject: [PATCH 476/478] [ANDROSDK-1787-2] Ktlint

---
 .../dataset/DataSetInstanceServiceMockIntegrationShould.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
index 0b53ede697..00997450ac 100644
--- a/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
+++ b/core/src/androidTest/java/org/hisp/dhis/android/testapp/dataset/DataSetInstanceServiceMockIntegrationShould.kt
@@ -59,7 +59,7 @@ class DataSetInstanceServiceMockIntegrationShould :
         val fivePeriodsInFuture = d2.periodModule().periodHelper().blockingGetPeriodForPeriodTypeAndDate(
             PeriodType.Monthly,
             Date(),
-            5
+            5,
         )
         val status = d2.dataSetModule().dataSetInstanceService()
             .blockingGetEditableStatus(

From 700c60095b806dc005793568abcacd4e04f65961 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Fri, 17 Nov 2023 10:36:40 +0100
Subject: [PATCH 477/478] [ANDROSDK-1779] Update docs 1.9.0

---
 docs/content/dev/architecture.md              |  6 +--
 docs/content/developer/apk-distribution.md    |  6 +++
 docs/content/developer/compatibility.md       |  1 +
 docs/content/developer/debugging.md           |  9 ++++-
 docs/content/developer/dhis2-services.md      | 37 +++----------------
 docs/content/developer/getting-started.md     |  2 +-
 docs/content/developer/overview.md            |  2 +-
 docs/content/developer/settings.md            |  6 ++-
 .../developer/use-case-configuration.md       |  6 +++
 docs/content/developer/workflow.md            | 20 +++++-----
 docs/dhis2_android_sdk_dev_guide_INDEX.md     |  2 +-
 ...his2_android_sdk_developer_guide_INDEX.yml |  2 +
 12 files changed, 49 insertions(+), 50 deletions(-)
 create mode 100644 docs/content/developer/apk-distribution.md
 create mode 100644 docs/content/developer/use-case-configuration.md

diff --git a/docs/content/dev/architecture.md b/docs/content/dev/architecture.md
index 94fac44d7b..c9414c0053 100644
--- a/docs/content/dev/architecture.md
+++ b/docs/content/dev/architecture.md
@@ -4,10 +4,10 @@
 
 ## Frameworks and auxiliary libraries
 
-- [Dagger](https://google.github.io/dagger/)
+- [Koin](https://insert-koin.io/)
 - [Autovalue](https://github.com/google/auto/blob/master/value/userguide/index.md)
 - [Retrofit](https://square.github.io/retrofit/)/[OkHttp3](https://github.com/square/okhttp)
-- [SQLBrite](https://github.com/square/sqlbrite)
+- [SQLCipher](https://www.zetetic.net/sqlcipher/)
 
 ## Public API overview
 
@@ -38,4 +38,4 @@ Feature packages contain at least:
 
 ## Local database
 
-SQLBrite library is used for migrations. The database has a version number defined in `DbOpenHelper`. In case the device has an outdated database, it will execute the pending migrations up to the current version number. Migrations are defined in `assets/migrations`.
+The SDK runs the DB migrations itself. The database has a version number defined in `DbOpenHelper`. In case the device has an outdated database, it will execute the pending migrations up to the current version number. Migrations are defined in `assets/migrations`.
diff --git a/docs/content/developer/apk-distribution.md b/docs/content/developer/apk-distribution.md
new file mode 100644
index 0000000000..a3d0fdfd7a
--- /dev/null
+++ b/docs/content/developer/apk-distribution.md
@@ -0,0 +1,6 @@
+# APK distributin { #android_sdk_apk_distribution }
+The web app [APK distribution](https://apps.dhis2.org/app/dff273fc-909e-48af-b151-c4d7e9c8a12c) is used to determine the APK that must be used by the Android app. It is a way to control the version of the Android apps.
+
+This parameter is automatically used by the official Android Capture app, which will offer the update when a new version is identified. Other custom applications might use this parameter to control their own updates. This logic must be implemented at application level.
+
+Check more information about the app in the [docs](https://docs.dhis2.org/en/use/android-app/apk-distribution.html).
\ No newline at end of file
diff --git a/docs/content/developer/compatibility.md b/docs/content/developer/compatibility.md
index 6ffd26c93b..45836f9456 100644
--- a/docs/content/developer/compatibility.md
+++ b/docs/content/developer/compatibility.md
@@ -13,3 +13,4 @@ Compatibility table between DHIS2 Android SDK library, DHIS2 core and Android SD
 | 1.6.X    | 2.30 -> 2.38     | 21 - 31     | 2.0.34 - 2.0.35   |
 | 1.7.X    | 2.30 -> 2.39     | 21 - 31     | 2.0.42 - 2.0.43   |
 | 1.8.X    | 2.30 -> 2.40     | 21 - 33     | 2.0.47 - 2.0.48   |
+| 1.9.X    | 2.30 -> 2.40     | 21 - 34     | 2.0.47 - 2.0.48   |
diff --git a/docs/content/developer/debugging.md b/docs/content/developer/debugging.md
index 95a3701f3c..ead27759c8 100644
--- a/docs/content/developer/debugging.md
+++ b/docs/content/developer/debugging.md
@@ -1,9 +1,14 @@
 # Debugging { #android_sdk_debugging }
 
 ## Android Studio
-You can debug your DHIS2 Android App using Android Studio. Follow the [instructions from the Android Developer Portal](https://developer.android.com/studio/debug) 
+You can debug your DHIS2 Android App using Android Studio. Follow the [instructions from the Android Developer Portal](https://developer.android.com/studio/debug)
 
-## Flipper (recommended)
+## HTTP Toolkit
+Using HTTP Toolkit you can explore and mock the HTTP requests when needed. It is easy to install and use ([HTTP toolkit page](https://httptoolkit.com)).
+
+It can be easily attached to emulators and rooted devices; in the case of non-rooted physical devices, it requires additional steps. 
+
+## Flipper
 Flipper is a platform for debugging mobile apps on iOS and Android developed by Facebook. Flipper provides many features, 
 provided by different plugins.
 
diff --git a/docs/content/developer/dhis2-services.md b/docs/content/developer/dhis2-services.md
index fe5d6236af..7ab502e480 100644
--- a/docs/content/developer/dhis2-services.md
+++ b/docs/content/developer/dhis2-services.md
@@ -29,45 +29,20 @@ Check the javadoc documentation in the IDE to know more details about each metho
 ## Value Type helper
 
 The SDK include a enum helper class called `ValueType`. This class defines all the different types of values that you can find in DHIS2. In addition, for each of them you can find a validator for the type of value and information about the type of value it is, whether it is a date, a string, a boolean or other type.
-The ValueTypes offered by the SDK are listed below:
-
-- `TEXT`
-- `LONG_TEXT`
-- `LETTER`
-- `BOOLEAN`
-- `TRUE_ONLY`
-- `DATE`
-- `DATETIME`
-- `TIME`
-- `NUMBER`
-- `UNIT_INTERVAL`
-- `PERCENTAGE`
-- `INTEGER`
-- `INTEGER_POSITIVE`
-- `INTEGER_NEGATIVE`
-- `INTEGER_ZERO_OR_POSITIVE`
-- `FILE_RESOURCE`
-- `COORDINATE`
-- `PHONE_NUMBER`
-- `EMAIL`
-- `USERNAME`
-- `ORGANISATION_UNIT`
-- `TRACKER_ASSOCIATE`
-- `AGE`
-- `URL`
-- `IMAGE(String::class.java, UidValidator)`
 
 To access the type of value you can simply access it through the methods of the valueType.
 
 ```java
-    valueType.isDate();
-    valueType.isCoordinate();
+    valueType.isInteger();
+    valueType.isDecimal();
     valueType.isNumeric();
-    valueType.isText();
     valueType.isBoolean();
+    valueType.isText();
     valueType.isDate();
     valueType.isFile();
-    valueType.isInteger();
+    valueType.isCoordinate();
+    valueType.isGeo();
+    valueType.isJson();
 ```
 
 To validate a value starting from its valueType it can be done in the following way:
diff --git a/docs/content/developer/getting-started.md b/docs/content/developer/getting-started.md
index 50d96b6bdf..921c3b1fa2 100644
--- a/docs/content/developer/getting-started.md
+++ b/docs/content/developer/getting-started.md
@@ -6,7 +6,7 @@ Include dependency in build.gradle.
 
 ```gradle
 dependencies {
-    implementation "org.hisp.dhis:android-core:1.8.2"
+    implementation "org.hisp.dhis:android-core:1.9.0"
     ...
 }
 ```
diff --git a/docs/content/developer/overview.md b/docs/content/developer/overview.md
index e010594da4..b15ab5b605 100644
--- a/docs/content/developer/overview.md
+++ b/docs/content/developer/overview.md
@@ -14,4 +14,4 @@ The SDK is mainly written in Java 8 using the reduced subset of features allowed
 
 It uses [RxJava](https://github.com/ReactiveX/RxJava) to facilitate the asynchronous treatment of some methods. Although it is optional, we recommend this approach to ensure non-blocking calls.
 
-Other libraries internally used by the SDK are: [Dagger](https://github.com/google/dagger) for dependency injection, [Jackson](https://github.com/FasterXML/jackson) for JSON parsing, [Retrofit](https://square.github.io/retrofit/) and [OkHttpClient](https://square.github.io/okhttp/) for API communication or [SQLBrite](https://github.com/square/sqlbrite) for DB migrations.
+Other libraries internally used by the SDK are: [Koin](https://insert-koin.io/) for dependency injection, [Jackson](https://github.com/FasterXML/jackson) for JSON parsing, [Retrofit](https://square.github.io/retrofit/) and [OkHttpClient](https://square.github.io/okhttp/) for API communication or [SQLCipher](https://www.zetetic.net/sqlcipher/) for DB encryption.
diff --git a/docs/content/developer/settings.md b/docs/content/developer/settings.md
index db61629099..15f1b57b02 100644
--- a/docs/content/developer/settings.md
+++ b/docs/content/developer/settings.md
@@ -32,6 +32,7 @@ It gives additional information about app settings:
 - Matomo configuration: if you have your own Matomo instance, you can expose this information to the app in order to configure its Matomo client.
 - AllowScreenCapture: parameter to determine if the application should allow screen capture or not.
 - MessageOfTheDay: a message to show to the users.
+- ExperimentalFeatures: list of experimental features enabled.
 
 ### Synchronization settings { #android_sdk_synchronization_settings }
 
@@ -58,8 +59,11 @@ These settings give control over the appearance of the data entry form.
 - ProgramConfiguration: it defines two properties for programs.
     - CompletionSpinner: show/hide the completion spinner.
     - OptionalSearch: it defines if searching is mandatory or not before creating data.
+    - DisableReferrals: whether referrals must be enabled or not for this program.
+    - DisableCollapsibleSections: whether the sections must be collapsible or not for this program.
+    - ItemHeader: it defines the element (programIndicator) to be used to generate a header for the TEI. This property is automatically consumed by the SDK when using the `TrackedEntitySearchCollectionRepository`.
 
-These settings refer to visual components so they must be consumed by the app.
+Most of the settings refer to visual components so they are usually consumed by the app.
 
 ### Analytic settings { #android_sdk_analytic_settings }
 
diff --git a/docs/content/developer/use-case-configuration.md b/docs/content/developer/use-case-configuration.md
new file mode 100644
index 0000000000..c71b7bc59a
--- /dev/null
+++ b/docs/content/developer/use-case-configuration.md
@@ -0,0 +1,6 @@
+# Use case configuration { #android_sdk_use_cases }
+The web app [Use Case Configuratin](https://apps.dhis2.org/app/7df6f344-0487-469c-abe6-53c6e729abcf) is used to assign use cases to programs/dataSets. This information can be used by the app in order to display the information using a different layout or to apply different business logic.
+
+The SDK downloads the information generated by this app and exposes it in the UseCaseModule. The particular use case logic or UI must be implemented at application level.
+
+Check more information about the app in the [docs](https://docs.dhis2.org/en/use/android-app/use-case-configuration.html).
\ No newline at end of file
diff --git a/docs/content/developer/workflow.md b/docs/content/developer/workflow.md
index a4ffcfb12a..1cc886ccb4 100644
--- a/docs/content/developer/workflow.md
+++ b/docs/content/developer/workflow.md
@@ -276,16 +276,16 @@ Additionally, if you want the images associated to `Image` data values available
 
 DHIS2 has a functionality to filter TrackedEntityInstances by related
 properties, like attributes, organisation units, programs or enrollment
-dates. The Sdk provides the `TrackedEntityInstanceQueryCollectionRepository` 
+dates. The Sdk provides the `TrackedEntitySearchCollectionRepository` 
 with methods that allow the download of tracked entity
 instances within the search scope. It can be found inside the tracked entity instance module.
 
-The tracked entity instance query is a powerful tool that follows a
+The tracked entity instance search is a powerful tool that follows a
 builder pattern and allows the download of tracked entity instances
 filtering by **different parameters**.
 
 ```java
-d2.trackedEntityModule().trackedEntityInstanceQuery()
+d2.trackedEntityModule().trackedEntitySearch()
     .[repository mode]
     .[filters]
     .get()
@@ -316,7 +316,7 @@ Additionally, the repository offers different strategies to fetch data:
   connector. For example:
   
   ```java
-  d2.trackedEntityModule().trackedEntityInstanceQuery()
+  d2.trackedEntityModule().trackedEntitySearch()
       .byAttribute("uid1").eq("value1")
       .byAttribute("uid2").eq("value2")
       .get()
@@ -330,7 +330,7 @@ Additionally, the repository offers different strategies to fetch data:
   connector. For example:
   
   ```java
-  d2.trackedEntityModule().trackedEntityInstanceQuery()
+  d2.trackedEntityModule().trackedEntitySearch()
       .byFilter("uid1").eq("value1")
       .byFilter("uid2").eq("value2")
       .get()
@@ -372,7 +372,7 @@ Additionally, the repository offers different strategies to fetch data:
 Example:
 
 ```java
-d2.trackedEntityModule().trackedEntityInstanceQuery()
+d2.trackedEntityModule().trackedEntitySearch()
                 .byOrgUnits().eq("orgunitUid")
                 .byOrgUnitMode().eq(OrganisationUnitMode.DESCENDANTS)
                 .byProgram().eq("programUid")
@@ -388,12 +388,12 @@ to fully download them using the `byUid()` filter of the `TrackedEntityInstanceD
 It could happen that you add filters to the query repository in different parts of the application and you don't have a clear picture about the filters applied, specially when using working lists because they add a set of parameters. In order to solve this, you can access the filter scope at any moment in the repository:
 
 ```java
-d2.trackedEntityModule().trackedEntityInstanceQuery()
+d2.trackedEntityModule().trackedEntitySearch()
     .[ filters ]
     .getScope();
 ```
 
-In addition to the standard `getPaged(int)` and `getDataSource()` methods that are available in all the repositories, the TrackedEntityInstanceQuery repository exposes a method to wrap the response in a `Result` object: the `getResultDataSource()`. This method is kind of a workaround to deal with the lack of error management in the Version 2 of the Android Paging Library (it is hardly improved in version 3). Using this dataSource you can catch search errors, such as "Min attributes required" or "Max tei count reached". 
+In addition to the standard `getPaged(int)` and `getDataSource()` methods that are available in all the repositories, the TrackedEntitySearch repository exposes a method to wrap the response in a `Result` object: the `getResultDataSource()`. This method is kind of a workaround to deal with the lack of error management in the Version 2 of the Android Paging Library (it is hardly improved in version 3). Using this dataSource you can catch search errors, such as "Min attributes required" or "Max tei count reached". 
 
 
  ### Working lists / Tracker filters
@@ -404,7 +404,7 @@ There are three concepts related to building a predifined filter for tracker obj
 - **EventFilters**: they define filters to be used against Event objects.
 - **ProgramStageWorkingList**: they define filters to be used against TrackedEntity objects and they add support to filter by event-related data. It is mandatory to specify a particular ProgramStage.
 
-As usual, they have their own collection repository and can be applied in "query" repositories. For example:
+As usual, they have their own collection repository and can be applied in "search" repositories. For example:
 
 ```java
 // Get the filters
@@ -413,7 +413,7 @@ List<EventFilter> filters = d2.eventModule().eventFilters().blockingGet();
 List<ProgramStageWorkingList> workingLists = d2.programModule().programStageWorkingLists().blockingGet();
 
 // Apply the filters
-d2.trackedEntityModule().trackedEntityInstanceQuery()
+d2.trackedEntityModule().trackedEntitySearch()
     .byTrackedEntityInstanceFilter().eq("filterUid")
     .byProgramStageWorkingList().eq("workingListUid")
     .get()
diff --git a/docs/dhis2_android_sdk_dev_guide_INDEX.md b/docs/dhis2_android_sdk_dev_guide_INDEX.md
index f3a240f864..efdb673f49 100644
--- a/docs/dhis2_android_sdk_dev_guide_INDEX.md
+++ b/docs/dhis2_android_sdk_dev_guide_INDEX.md
@@ -1,5 +1,5 @@
 <!--DHIS2-SECTION-ID:index-->
 
-!INCLUDE "content/dev/developement.md"
+!INCLUDE "content/dev/development.md"
 !INCLUDE "content/dev/architecture.md"
 !INCLUDE "content/dev/synchronization.md"
\ No newline at end of file
diff --git a/docs/dhis2_android_sdk_developer_guide_INDEX.yml b/docs/dhis2_android_sdk_developer_guide_INDEX.yml
index 2f8a413e7d..d8973b5264 100644
--- a/docs/dhis2_android_sdk_developer_guide_INDEX.yml
+++ b/docs/dhis2_android_sdk_developer_guide_INDEX.yml
@@ -18,6 +18,8 @@
 - Program rule engine: "@github(dhis2/dhis2-android-sdk, docs/content/developer/program-rule-engine.md, master"
 - Program indicator engine: "@github(dhis2/dhis2-android-sdk, docs/content/developer/program-indicator-engine.md, master)"
 - Validation rule engine: "@github(dhis2/dhis2-android-sdk, docs/content/developer/validation-rule-engine.md, master)"
+- Use case configuration: "@github(dhis2/dhis2-android-sdk, docs/content/developer/use-case-configuration.md, master)"
+- APK distribution: "@github(dhis2/dhis2-android-sdk, docs/content/developer/apk-distribution.md, master)"
 - Debugging: "@github(dhis2/dhis2-android-sdk, docs/content/developer/debugging.md, master)"
 - Known issues: "@github(dhis2/dhis2-android-sdk, docs/content/developer/known-issues.md, master)"
 

From ebd662e209725c425a8cabbc71cf7f85b91336e8 Mon Sep 17 00:00:00 2001
From: Victor Garcia <vgarciabnz@gmail.com>
Date: Mon, 20 Nov 2023 09:10:27 +0100
Subject: [PATCH 478/478] [VERSION-1.9.0] Set version 1.9.0

---
 core/gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/gradle.properties b/core/gradle.properties
index bbebc1c830..0c75b66fd0 100644
--- a/core/gradle.properties
+++ b/core/gradle.properties
@@ -29,7 +29,7 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=1.9.0-SNAPSHOT
+VERSION_NAME=1.9.0
 VERSION_CODE=290
 
 GROUP=org.hisp.dhis